From b5af5812054f0f642bd4d3eaeb9ae0fa166db1a5 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 16 Mar 2023 14:53:19 -0300 Subject: [PATCH] Set proper filter labeling on call tab. --- .../org/thoughtcrime/securesms/calls/log/CallLogFragment.kt | 2 ++ .../chatfilter/ConversationListFilterPullView.kt | 5 +++++ app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 9 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt index 0fb8982c43..2d42286bb8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt @@ -119,6 +119,8 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal startActivity(NewCallActivity.createIntent(requireContext())) } + binding.pullView.setPillText(R.string.CallLogFragment__filtered_by_missed) + initializePullToFilter() initializeTapToScrollToTop() diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt index 7f434ada7d..ee37433c8c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt @@ -9,6 +9,7 @@ import android.os.Bundle import android.os.Parcelable import android.util.AttributeSet import android.widget.FrameLayout +import androidx.annotation.StringRes import androidx.core.animation.doOnEnd import androidx.core.content.ContextCompat import androidx.core.os.bundleOf @@ -78,6 +79,10 @@ class ConversationListFilterPullView @JvmOverloads constructor( private val pillDefaultBackgroundTint = ContextCompat.getColor(context, R.color.signal_colorSecondaryContainer) private val pillWillCloseBackgroundTint = ContextCompat.getColor(context, R.color.signal_colorSurface1) + fun setPillText(@StringRes textId: Int) { + binding.filterText.setText(textId) + } + override fun onSaveInstanceState(): Parcelable { val root = super.onSaveInstanceState() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dc64cd106d..8ecc4140b7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5735,6 +5735,8 @@ Notification Profile Start a new call + + Filtered by missed