From 6f2d47bcd760af42bf0b04f25aa05111339951cc Mon Sep 17 00:00:00 2001 From: gavine99 Date: Sat, 1 Feb 2025 21:18:59 +1100 Subject: [PATCH] changes to enter the compose screen in 'scheduling' mode when launched from the scheduling activity. causes message scheduling to shown be shown after contact is chosen --- .../src/main/java/com/moez/QKSMS/common/Navigator.kt | 3 ++- .../com/moez/QKSMS/feature/compose/ComposeActivity.kt | 7 +++++++ .../QKSMS/feature/compose/ComposeActivityModule.kt | 6 ++++++ .../com/moez/QKSMS/feature/compose/ComposeState.kt | 1 + .../com/moez/QKSMS/feature/compose/ComposeView.kt | 1 + .../moez/QKSMS/feature/compose/ComposeViewModel.kt | 11 +++++++++++ .../QKSMS/feature/scheduled/ScheduledViewModel.kt | 2 +- 7 files changed, 29 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index 15d1c359..888ff2c7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -95,9 +95,10 @@ class Navigator @Inject constructor( } } - fun showCompose(body: String? = null, images: List? = null) { + fun showCompose(body: String? = null, images: List? = null, mode: String? = null) { val intent = Intent(context, ComposeActivity::class.java) intent.putExtra(Intent.EXTRA_TEXT, body) + intent.putExtra("mode", mode) images?.takeIf { it.isNotEmpty() }?.let { intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(images)) 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 213bdd5d..6ce2b9e2 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 @@ -71,10 +71,12 @@ import dev.octoshrimpy.quik.feature.contacts.ContactsActivity import dev.octoshrimpy.quik.model.Attachment import dev.octoshrimpy.quik.model.Recipient import io.reactivex.Observable +import io.reactivex.Single import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.compose_activity.* import kotlinx.android.synthetic.main.main_activity.toolbar +import kotlinx.coroutines.reactive.publish import java.text.SimpleDateFormat import java.util.* import javax.inject.Inject @@ -94,6 +96,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val chipDeletedIntent: Subject by lazy { chipsAdapter.chipDeleted } override val menuReadyIntent: Observable = menu.map { Unit } override val optionsItemIntent: Subject = PublishSubject.create() + override val scheduleAction: Subject = PublishSubject.create() override val sendAsGroupIntent by lazy { sendAsGroupBackground.clicks() } override val messageClickIntent: Subject by lazy { messageAdapter.clicks } override val messagePartClickIntent: Subject by lazy { messageAdapter.partClicks } @@ -323,6 +326,10 @@ class ComposeActivity : QkThemedActivity(), ComposeView { ) constraintSet.applyTo(constraintLayout) } + + // if scheduling mode is set, show schedule dialog + if (state.scheduling) + scheduleAction.onNext(true) } override fun clearSelection() = messageAdapter.clearSelection() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt index 8580cb49..1a599bd8 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt @@ -82,6 +82,12 @@ class ComposeActivityModule { return Attachments(uris.mapNotNull { Attachment(it) }) } + @Provides + @Named("mode") + fun provideSharedAction(activity: ComposeActivity): String { + return activity.intent.getStringExtra("mode") ?: ""; + } + @Provides @IntoMap @ViewModelKey(ComposeViewModel::class) 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 b5bf5a43..ca8f6475 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 @@ -42,6 +42,7 @@ data class ComposeState( val scheduled: Long = 0, val attachments: List = ArrayList(), val attaching: Boolean = false, + val scheduling: Boolean = false, val remaining: String = "", val subscription: SubscriptionInfoCompat? = null, val canSend: Boolean = false, 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 14c2e28e..e8086126 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 @@ -56,6 +56,7 @@ interface ComposeView : QkView { val attachAnyFileIntent: Observable<*> val attachImageFileIntent: Observable<*> val scheduleIntent: Observable<*> + val scheduleAction: Observable<*> val attachContactIntent: Observable<*> val attachAnyFileSelectedIntent: Observable val contactSelectedIntent: 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 dbb67eff..8f11b57f 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 @@ -79,6 +79,7 @@ class ComposeViewModel @Inject constructor( @Named("addresses") private val addresses: List, @Named("text") private val sharedText: String, @Named("attachments") private val sharedAttachments: Attachments, + @Named("mode") private val mode: String, private val contactRepo: ContactRepository, private val context: Context, private val activeConversationManager: ActiveConversationManager, @@ -242,6 +243,10 @@ class ComposeViewModel @Inject constructor( val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null newState { copy(subscription = sub) } }.subscribe() + + // actions + if (mode == "scheduling") + newState { copy(scheduling = true) } } override fun bindView(view: ComposeView) { @@ -574,6 +579,12 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { view.requestDatePicker() } + view.scheduleAction + .take(1) + .doOnNext{ newState { copy(scheduling = false) } } + .autoDisposable(view.scope()) + .subscribe { view.requestDatePicker() } + // a file, photo or otherwise, was picked by the user Observable.merge( view.attachAnyFileSelectedIntent.map { uri -> Attachment(uri) }, diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt index 4324c6da..c2f1489b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt @@ -70,7 +70,7 @@ class ScheduledViewModel @Inject constructor( view.composeIntent .autoDisposable(view.scope()) - .subscribe { navigator.showCompose() } + .subscribe { navigator.showCompose(mode = "scheduling") } view.upgradeIntent .autoDisposable(view.scope())