From 5cda5db7f7e731d74667bd9ee4bb0fb116b7a043 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 11 Mar 2024 11:46:30 -0300 Subject: [PATCH] Disable text field when view-once is selected. --- .../mediasend/v2/review/MediaReviewFragment.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt index 6f855aa22c..ca4cc7c825 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt @@ -35,6 +35,7 @@ import com.google.android.material.imageview.ShapeableImageView import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import org.signal.core.util.concurrent.LifecycleDisposable import org.signal.core.util.concurrent.SimpleTask +import org.signal.core.util.isNotNullOrBlank import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey @@ -466,14 +467,17 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul private fun presentAddMessageEntry(viewOnceState: MediaSelectionState.ViewOnceToggleState, message: CharSequence?) { when (viewOnceState) { MediaSelectionState.ViewOnceToggleState.INFINITE -> { - if (!message.isNullOrEmpty()) { - addMessageButton.gravity = Gravity.CENTER_VERTICAL - addMessageButton.setText(message, TextView.BufferType.SPANNABLE) - } + addMessageButton.gravity = Gravity.CENTER_VERTICAL + addMessageButton.setText( + message.takeIf { it.isNotNullOrBlank() } ?: getString(R.string.MediaReviewFragment__add_a_message), + TextView.BufferType.SPANNABLE + ) + addMessageButton.isClickable = true } MediaSelectionState.ViewOnceToggleState.ONCE -> { addMessageButton.gravity = Gravity.CENTER addMessageButton.setText(R.string.MediaReviewFragment__view_once_message) + addMessageButton.isClickable = false } } }