From ade92ac03a9a1f6553af01aad7fa3c5bcbd962ee Mon Sep 17 00:00:00 2001 From: gavine99 Date: Sun, 19 Jan 2025 21:03:28 +1100 Subject: [PATCH] added a 'send now' button to delay sent sms. user can now long press 'send now' to send a delayed message immediately --- .../QKSMS/feature/compose/ComposeActivity.kt | 1 + .../moez/QKSMS/feature/compose/ComposeView.kt | 1 + .../QKSMS/feature/compose/ComposeViewModel.kt | 20 ++ .../QKSMS/feature/compose/MessagesAdapter.kt | 46 ++-- .../main/res/layout/message_list_item_out.xml | 244 ++++++++++-------- presentation/src/main/res/values/strings.xml | 6 + 6 files changed, 198 insertions(+), 120 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 f5f908cb..db635fb8 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 @@ -106,6 +106,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val messagePartClickIntent: Subject by lazy { messageAdapter.partClicks } override val messagesSelectedIntent by lazy { messageAdapter.selectionChanges } override val cancelSendingIntent: Subject by lazy { messageAdapter.cancelSending } + override val sendNowIntent: Subject by lazy { messageAdapter.sendNow } override val attachmentDeletedIntent: Subject by lazy { attachmentAdapter.attachmentDeleted } override val textChangedIntent by lazy { message.textChanges() } override val attachIntent by lazy { Observable.merge(attach.clicks(), attachingBackground.clicks()) } 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 8c15d694..b32ce3b6 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 @@ -39,6 +39,7 @@ interface ComposeView : QkView { val messagePartClickIntent: Subject val messagesSelectedIntent: Observable> val cancelSendingIntent: Subject + val sendNowIntent: Subject val attachmentDeletedIntent: Subject val textChangedIntent: Observable val attachIntent: Observable 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 77eac25a..3e17be20 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 @@ -471,6 +471,26 @@ class ComposeViewModel @Inject constructor( cancelMessage.execute(CancelDelayedMessage.Params(message.id, message.threadId)) } + // send a delayed message now + view.sendNowIntent + .mapNotNull(messageRepo::getMessage) + .autoDisposable(view.scope()) + .subscribe { message -> + cancelMessage.execute(CancelDelayedMessage.Params(message.id, message.threadId)) + val address = listOf(conversationRepo + .getConversation(threadId)?.recipients?.firstOrNull()?.address ?: message.address) + sendMessage.execute( + SendMessage.Params( + message.subId, + message.threadId, + address, + message.body, + listOf(), // sms with attachments (mms) can't be delayed so we can know attachments are empty for a 'send now' delayed sms + 0 + ) + ) + } + // Set the current conversation Observables .combineLatest( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 2bbdd5a0..82b04dbd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -33,6 +33,7 @@ import android.widget.ImageView import android.widget.ProgressBar import androidx.recyclerview.widget.RecyclerView import com.jakewharton.rxbinding2.view.clicks +import com.jakewharton.rxbinding2.view.longClicks import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkRealmAdapter import dev.octoshrimpy.quik.common.base.QkViewHolder @@ -68,6 +69,7 @@ import kotlinx.android.synthetic.main.message_list_item_in.status import kotlinx.android.synthetic.main.message_list_item_in.timestamp import kotlinx.android.synthetic.main.message_list_item_in.view.* import kotlinx.android.synthetic.main.message_list_item_out.* +import kotlinx.android.synthetic.main.message_list_item_out.view.cancel import java.util.* import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -98,6 +100,7 @@ class MessagesAdapter @Inject constructor( val clicks: Subject = PublishSubject.create() val partClicks: Subject = PublishSubject.create() val cancelSending: Subject = PublishSubject.create() + val sendNow: Subject = PublishSubject.create() var data: Pair>? = null set(value) { @@ -148,6 +151,7 @@ class MessagesAdapter @Inject constructor( view = layoutInflater.inflate(R.layout.message_list_item_out, parent, false) view.findViewById(R.id.cancelIcon).setTint(theme.theme) view.findViewById(R.id.cancel).setTint(theme.theme) + view.findViewById(R.id.sendNowIcon).setTint(theme.theme) } else { view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false) } @@ -194,25 +198,37 @@ class MessagesAdapter @Inject constructor( // Update the selected state holder.containerView.isActivated = isSelected(message.id) || highlight == message.id - // Bind the cancel view - holder.cancel?.let { cancel -> - val isCancellable = message.isSending() && message.date > System.currentTimeMillis() - cancel.setVisible(isCancellable) - cancel.clicks().subscribe { cancelSending.onNext(message.id) } - cancel.progress = 2 + // Bind the cancelFrame (cancel button) view + if (holder.cancelFrame != null) { + holder.cancelFrame.let { cancelFrame -> + val isCancellable = message.isSending() && message.date > System.currentTimeMillis() + cancelFrame.visibility = if (isCancellable) View.VISIBLE else View.GONE + cancelFrame.clicks().subscribe { cancelSending.onNext(message.id) } + cancelFrame.cancel.progress = 2 - if (isCancellable) { - val delay = when (prefs.sendDelay.get()) { - Preferences.SEND_DELAY_SHORT -> 3000 - Preferences.SEND_DELAY_MEDIUM -> 5000 - Preferences.SEND_DELAY_LONG -> 10000 - else -> 0 - } - val progress = (1 - (message.date - System.currentTimeMillis()) / delay.toFloat()) * 100 + if (isCancellable) { + val delay = when (prefs.sendDelay.get()) { + Preferences.SEND_DELAY_SHORT -> 3000 + Preferences.SEND_DELAY_MEDIUM -> 5000 + Preferences.SEND_DELAY_LONG -> 10000 + else -> 0 + } + val progress = + (1 - (message.date - System.currentTimeMillis()) / delay.toFloat()) * 100 - ObjectAnimator.ofInt(cancel, "progress", progress.toInt(), 100) + ObjectAnimator.ofInt(cancelFrame.cancel, "progress", progress.toInt(), 100) .setDuration(message.date - System.currentTimeMillis()) .start() + } + } + } + + // Bind the send now icon view + if (holder.sendNowIcon != null) { + holder.sendNowIcon.let { sendNowIcon -> + val isCancellable = message.isSending() && message.date > System.currentTimeMillis() + sendNowIcon.visibility = if (isCancellable) View.VISIBLE else View.GONE + sendNowIcon.longClicks().subscribe { sendNow.onNext(message.id) } } } diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index 649e57d8..92a6071b 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -17,133 +17,167 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + android:orientation="vertical"> - + android:background="?attr/selectableItemBackground" + android:contentDescription="@string/compose_message_item"> - + - + + + + + + + + + android:clipToPadding="false" + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent"> - + - + - + - + + + + + + + + - \ No newline at end of file + + \ 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 386e4a84..62615823 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -148,6 +148,12 @@ %s selected, change SIM card Send message + Cancel + Send now + SIM number + Message item + Attachment + Sending… Delivered %s Failed to send. Tap to try again