From 4d37dbf606169d71c90437628586764ad74e4e9b Mon Sep 17 00:00:00 2001 From: gavine99 Date: Thu, 16 Jan 2025 18:02:26 +1100 Subject: [PATCH] changes to disable reply controls and display a relevant message to the user on compose screen if all other participant numbers are non-replyable (ie alphanumeric sender id) --- .../QKSMS/feature/compose/ComposeActivity.kt | 22 +++++++++++++++++++ .../QKSMS/feature/compose/ComposeState.kt | 3 ++- .../QKSMS/feature/compose/ComposeViewModel.kt | 17 ++++++++++++++ .../src/main/res/layout/compose_activity.xml | 16 ++++++++++++++ presentation/src/main/res/values/strings.xml | 1 + 5 files changed, 58 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 41e3c80c..41c614c4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -40,6 +40,8 @@ import android.view.View import android.view.View.OnTouchListener import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AlertDialog +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.constraintlayout.widget.ConstraintSet import androidx.core.app.ActivityCompat import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider @@ -289,6 +291,26 @@ class ComposeActivity : QkThemedActivity(), ComposeView { send.isEnabled = state.canSend send.imageAlpha = if (state.canSend) 255 else 128 + + // if not in editing mode, and there are no non-me participants that can be sent to, + // hide controls that allow constructing a reply and inform user no valid recipients + if (!state.editingMode && (state.validRecipientNumbers == 0)) { + composeBar.visibility = View.GONE + noValidRecipients.visibility = View.VISIBLE + + // change constraint of messageList to constrain bottom to top of noValidRecipients + val constraintLayout = findViewById(R.id.contentView) + val constraintSet = ConstraintSet() + constraintSet.clone(constraintLayout) + constraintSet.connect( + R.id.messageList, + ConstraintSet.BOTTOM, + R.id.noValidRecipients, + ConstraintSet.TOP, + 0 + ) + constraintSet.applyTo(constraintLayout) + } } override fun clearSelection() = messageAdapter.clearSelection() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt index ae42d702..b5bf5a43 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt @@ -44,5 +44,6 @@ data class ComposeState( val attaching: Boolean = false, val remaining: String = "", val subscription: SubscriptionInfoCompat? = null, - val canSend: Boolean = false + val canSend: Boolean = false, + val validRecipientNumbers: Int = 1, ) \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 7a786893..77eac25a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -207,6 +207,23 @@ class ComposeViewModel @Inject constructor( .filter { messages -> messages.isValid } .subscribe(searchResults::onNext) + // on conversation change/init, work out how many non-me participants of the conversation + // have a valid address (subscriber number) for replying/sending to + disposables += conversation + .distinctUntilChanged { conversation -> conversation.id } + .observeOn(AndroidSchedulers.mainThread()) + .map { conversation -> + var possibleNumbers = 0 + conversation.recipients.forEach { recipient -> + if (phoneNumberUtils.isPossibleNumber(recipient.address)) + ++possibleNumbers + } + possibleNumbers + } + .subscribe { validRecipientNumbers -> + newState { copy(validRecipientNumbers = validRecipientNumbers) } + } + disposables += Observables.combineLatest(searchSelection, searchResults) { selected, messages -> if (selected == -1L) { messages.lastOrNull()?.let { message -> searchSelection.onNext(message.id) } diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index d660ceaf..eac3add4 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -353,12 +353,14 @@ + + \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 41c16463..386e4a84 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -119,6 +119,7 @@ You must unlock QUIK+ to use scheduled messaging Added to scheduled messages Write a message… + Can\'t send to other participants Copy text Forward Delete