diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt index a23562bd..db7450c9 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt @@ -27,6 +27,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { override val messageClickIntent by lazy { messageAdapter.clicks } override val messageMenuIntent by lazy { dialog.adapter.menuItemClicks } + override val composeIntent by lazy { compose.clicks() } override val upgradeIntent by lazy { upgrade.clicks() } private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] } @@ -56,6 +57,8 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { colors.theme().let { theme -> sampleMessage.setBackgroundTint(theme.theme) sampleMessage.setTextColor(theme.textPrimary) + compose.setTint(theme.textPrimary) + compose.setBackgroundTint(theme.theme) upgrade.setBackgroundTint(theme.theme) upgradeIcon.setTint(theme.textPrimary) upgradeLabel.setTextColor(theme.textPrimary) @@ -65,6 +68,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { override fun render(state: ScheduledState) { messageAdapter.updateData(state.scheduledMessages) + compose.isVisible = state.upgraded upgrade.isVisible = !state.upgraded } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt index 51ddaf60..c26e39f9 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt @@ -7,6 +7,7 @@ interface ScheduledView : QkView { val messageClickIntent: Observable val messageMenuIntent: Observable + val composeIntent: Observable<*> val upgradeIntent: Observable<*> fun showMessageOptions() 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 bac20d0d..a08109d9 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 @@ -42,6 +42,10 @@ class ScheduledViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe() + view.composeIntent + .autoDisposable(view.scope()) + .subscribe { navigator.showCompose() } + view.upgradeIntent .autoDisposable(view.scope()) .subscribe { navigator.showQksmsPlusActivity("schedule_fab") } diff --git a/presentation/src/main/res/layout/scheduled_activity.xml b/presentation/src/main/res/layout/scheduled_activity.xml index 1c1f1d1d..4d75dcf1 100644 --- a/presentation/src/main/res/layout/scheduled_activity.xml +++ b/presentation/src/main/res/layout/scheduled_activity.xml @@ -105,6 +105,18 @@ + + It\'s on December 23rd Happy birthday! Look at what a great friend I am, remembering your birthday Sending on December 23rd  + Schedule a message Scheduled message Send now