From ec89c97b45158f04fe605a9d0f2bf4963e223928 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Sun, 9 Jun 2019 00:03:24 -0400 Subject: [PATCH] #1317 - Features on QKSMS+ will link to respective part of app Should help reduce the number of emails telling me the upgrade didn't work --- .../moez/QKSMS/feature/plus/PlusActivity.kt | 13 ++++++++++++ .../com/moez/QKSMS/feature/plus/PlusView.kt | 5 +++++ .../moez/QKSMS/feature/plus/PlusViewModel.kt | 20 +++++++++++++++++++ .../main/res/layout/qksms_plus_activity.xml | 5 +++++ 4 files changed, 43 insertions(+) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt index 316e5103..1df78e04 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt @@ -24,6 +24,7 @@ import androidx.core.view.children import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks +import com.jakewharton.rxbinding2.view.enabled import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkThemedActivity @@ -36,6 +37,7 @@ import com.moez.QKSMS.common.util.extensions.setVisible import com.moez.QKSMS.common.widget.PreferenceView import com.moez.QKSMS.feature.plus.experiment.UpgradeButtonExperiment import dagger.android.AndroidInjection +import io.reactivex.Observable import kotlinx.android.synthetic.main.collapsing_toolbar.* import kotlinx.android.synthetic.main.preference_view.view.* import kotlinx.android.synthetic.main.qksms_plus_activity.* @@ -52,6 +54,11 @@ class PlusActivity : QkThemedActivity(), PlusView { override val upgradeIntent by lazy { upgrade.clicks() } override val upgradeDonateIntent by lazy { upgradeDonate.clicks() } override val donateIntent by lazy { donate.clicks() } + override val themeClicks by lazy { themes.clicks() } + override val scheduleClicks by lazy { schedule.clicks() } + override val backupClicks by lazy { backup.clicks() } + override val delayedClicks by lazy { delayed.clicks() } + override val nightClicks by lazy { night.clicks() } override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) @@ -97,6 +104,12 @@ class PlusActivity : QkThemedActivity(), PlusView { free.setVisible(fdroid) toUpgrade.setVisible(!fdroid && !state.upgraded) upgraded.setVisible(!fdroid && state.upgraded) + + themes.isEnabled = state.upgraded + schedule.isEnabled = state.upgraded + backup.isEnabled = state.upgraded + delayed.isEnabled = state.upgraded + night.isEnabled = state.upgraded } override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt index a1040328..8d7c67e8 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt @@ -27,6 +27,11 @@ interface PlusView : QkView { val upgradeIntent: Observable val upgradeDonateIntent: Observable val donateIntent: Observable<*> + val themeClicks: Observable<*> + val scheduleClicks: Observable<*> + val backupClicks: Observable<*> + val delayedClicks: Observable<*> + val nightClicks: Observable<*> fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt index e7131bc5..eb70e508 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt @@ -62,6 +62,26 @@ class PlusViewModel @Inject constructor( view.donateIntent .autoDisposable(view.scope()) .subscribe { navigator.showDonation() } + + view.themeClicks + .autoDisposable(view.scope()) + .subscribe { navigator.showSettings() } + + view.scheduleClicks + .autoDisposable(view.scope()) + .subscribe { navigator.showScheduled() } + + view.backupClicks + .autoDisposable(view.scope()) + .subscribe { navigator.showBackup() } + + view.delayedClicks + .autoDisposable(view.scope()) + .subscribe { navigator.showSettings() } + + view.nightClicks + .autoDisposable(view.scope()) + .subscribe { navigator.showSettings() } } } \ No newline at end of file diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml index e0602b4e..f5ec288a 100644 --- a/presentation/src/main/res/layout/qksms_plus_activity.xml +++ b/presentation/src/main/res/layout/qksms_plus_activity.xml @@ -162,6 +162,7 @@ android:background="?android:attr/divider" />