From a8b02459c474349d205250324e50498bd3b6b806 Mon Sep 17 00:00:00 2001 From: gavine99 Date: Wed, 19 Feb 2025 12:40:43 +1100 Subject: [PATCH 1/2] changes to enable a delete/clear menu icon on compose screen when there is message contents to clear - ie a schedule set, text input or attachments added --- .../QKSMS/feature/compose/ComposeActivity.kt | 15 +++- .../moez/QKSMS/feature/compose/ComposeView.kt | 3 + .../QKSMS/feature/compose/ComposeViewModel.kt | 74 ++++++++++++++----- presentation/src/main/res/menu/compose.xml | 14 ++-- presentation/src/main/res/values/strings.xml | 4 + 5 files changed, 83 insertions(+), 27 deletions(-) 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 f72df1c5..56d2e315 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 @@ -185,6 +185,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val viewQksmsPlusIntent: Subject = PublishSubject.create() override val backPressedIntent: Subject = PublishSubject.create() override val confirmDeleteIntent: Subject> = PublishSubject.create() + override val confirmClearCurrentMessageIntent: Subject = PublishSubject.create() + override val clearCurrentMessageIntent: Subject = PublishSubject.create() override val messageLinkAskIntent: Subject by lazy { messageAdapter.messageLinkClicks } override val speechRecogniserIntent by lazy { speechToTextIcon.clicks() } override val shadeIntent by lazy { shadeBackground.clicks() } @@ -470,7 +472,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { && state.query.isEmpty() toolbar.menu.findItem(R.id.copy)?.isVisible = !state.editingMode && state.selectedMessages > 0 toolbar.menu.findItem(R.id.details)?.isVisible = !state.editingMode && state.selectedMessages == 1 - toolbar.menu.findItem(R.id.delete)?.isVisible = !state.editingMode && state.selectedMessages > 0 + toolbar.menu.findItem(R.id.delete)?.isVisible = !state.editingMode && ((state.selectedMessages > 0) || state.canSend) toolbar.menu.findItem(R.id.forward)?.isVisible = !state.editingMode && state.selectedMessages == 1 toolbar.menu.findItem(R.id.show_status)?.isVisible = !state.editingMode && state.selectedMessages > 0 toolbar.menu.findItem(R.id.previous)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty() @@ -712,6 +714,17 @@ class ComposeActivity : QkThemedActivity(), ComposeView { .show() } + override fun showClearCurrentMessageDialog() { + android.app.AlertDialog.Builder(this) + .setTitle(R.string.dialog_clear_compose_title) + .setMessage(R.string.dialog_clear_compose) + .setPositiveButton(R.string.button_clear) { _, _ -> + clearCurrentMessageIntent.onNext(Unit) + } + .setNegativeButton(R.string.button_cancel, null) + .show() + } + override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.compose, menu) return super.onCreateOptionsMenu(menu) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt index 6fed5e39..dac6193f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt @@ -75,6 +75,8 @@ interface ComposeView : QkView { val viewQksmsPlusIntent: Subject val backPressedIntent: Observable val confirmDeleteIntent: Observable> + val confirmClearCurrentMessageIntent: Observable + val clearCurrentMessageIntent: Subject val messageLinkAskIntent: Observable val speechRecogniserIntent: Observable<*> val shadeIntent: Observable @@ -109,6 +111,7 @@ interface ComposeView : QkView { fun scrollToMessage(id: Long) fun showQksmsPlusSnackbar(@StringRes message: Int) fun showDeleteDialog( messages: List) + fun showClearCurrentMessageDialog() fun startSpeechRecognition() } \ 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 ca5ef06f..e316f501 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 @@ -388,15 +388,21 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { view.showDetails(it) } - // Show the delete message dialog + // Show the delete message dialog if one or more messages selected view.optionsItemIntent - .filter { it == R.id.delete } - .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } } - .withLatestFrom(view.messagesSelectedIntent, conversation) { _, messages, conversation -> - view.showDeleteDialog(messages) - } - .autoDisposable(view.scope()) - .subscribe() + .filter { it == R.id.delete } + .withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> selectedMessages } + .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } } + .autoDisposable(view.scope()) + .subscribe { view.showDeleteDialog(it) } + + // show the clear current message dialog if no messages selected + view.optionsItemIntent + .filter { it == R.id.delete } + .withLatestFrom(state) { _, state -> state } + .filter { it.selectedMessages == 0 } + .autoDisposable(view.scope()) + .subscribe { view.showClearCurrentMessageDialog() } // Forward the message view.optionsItemIntent @@ -734,16 +740,22 @@ class ComposeViewModel @Inject constructor( } } - // set canSend state depending on if there is text input or an attachment + // set canSend state depending on if there is text input, an attachment or a schedule set Observables.combineLatest( view.textChangedIntent, // input message text changed state .distinctUntilChanged { state -> state.attachments } // attachments changed - .map { it.attachments.size } // number of attachments + .map { it.attachments.size }, // number of attachments + state.distinctUntilChanged { state -> state.scheduled } // schedule set or not + .map { it.scheduled } ) .autoDisposable(view.scope()) .subscribe { - newState { copy(canSend = (it.first.isNotBlank() || (it.second > 0))) } + newState { + copy( + canSend = (it.first.isNotBlank() || (it.second > 0)) || (it.third > 0) + ) + } } // Show the remaining character counter when necessary @@ -1045,13 +1057,8 @@ class ComposeViewModel @Inject constructor( } } - // configure for new message - view.setDraft("") - newState { copy(attachments = listOf()) } - - if (state.editingMode) { - newState { copy(editingMode = false, hasError = !sendAsGroup) } - } + // clear the current message ready for new message composition + view.clearCurrentMessageIntent.onNext(Unit) } .autoDisposable(view.scope()) .subscribe() @@ -1083,6 +1090,37 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { view.clearSelection() } + view.confirmClearCurrentMessageIntent + .autoDisposable(view.scope()) + .subscribe { view.clearCurrentMessageIntent.onNext(Unit) } + + // clear the current message schedule, text and attachments + view.clearCurrentMessageIntent + .withLatestFrom(state) { _, state -> state } + .autoDisposable(view.scope()) + .subscribe { + view.setDraft("") + // if choosing contacts, don't remove attachments. they may have come from an + // external share + if (it.editingMode) + newState { + copy( + editingMode = false, + hasError = !sendAsGroup, + scheduled = 0, + ) + } + else + newState { + copy( + editingMode = false, + hasError = !sendAsGroup, + attachments = listOf(), + scheduled = 0, + ) + } + } + // when activity changes visibility, delete old recording cache files in background thread // generally there won't be any, but under some circumstances some can be left behind view.activityVisibleIntent diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml index 2fbb86c9..711dbe72 100644 --- a/presentation/src/main/res/menu/compose.xml +++ b/presentation/src/main/res/menu/compose.xml @@ -41,26 +41,24 @@ android:visible="false" app:showAsAction="always" /> - - - + Are you sure you would like to delete %d messages? + Clear message + Clear the message? This action can\'t be undone. + Copy text Forward @@ -453,6 +456,7 @@ More Set Undo + Clear Copied From 302dadd077c875e1431ef3a4c65ccd37a84046c4 Mon Sep 17 00:00:00 2001 From: gavine99 Date: Wed, 19 Feb 2025 13:32:35 +1100 Subject: [PATCH 2/2] changed to reset all necessary state, regardless of editingMode, in clearCurrentMessageIntent handler --- .../QKSMS/feature/compose/ComposeViewModel.kt | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) 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 e316f501..daa4ca56 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 @@ -1102,23 +1102,14 @@ class ComposeViewModel @Inject constructor( view.setDraft("") // if choosing contacts, don't remove attachments. they may have come from an // external share - if (it.editingMode) - newState { - copy( - editingMode = false, - hasError = !sendAsGroup, - scheduled = 0, - ) - } - else - newState { - copy( - editingMode = false, - hasError = !sendAsGroup, - attachments = listOf(), - scheduled = 0, - ) - } + newState { + copy( + editingMode = false, + hasError = !sendAsGroup, + attachments = listOf(), + scheduled = 0, + ) + } } // when activity changes visibility, delete old recording cache files in background thread