From f08bd833f8b82f895d82916d9510b8d82987f7f0 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 7 Feb 2018 03:07:15 -0500 Subject: [PATCH] Enable auto night mode for QKSMS+ --- .../feature/settings/SettingsActivity.kt | 9 +++++++++ .../feature/settings/SettingsView.kt | 2 ++ .../feature/settings/SettingsViewModel.kt | 16 +++++++++++++++- qksms/src/main/res/layout/settings_activity.xml | 1 + qksms/src/main/res/values/strings.xml | 2 ++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt index 539cae37..333d437b 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt @@ -27,6 +27,7 @@ import android.media.RingtoneManager import android.net.Uri import android.os.Build import android.os.Bundle +import android.support.design.widget.Snackbar import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView import com.jakewharton.rxbinding2.view.clicks @@ -54,6 +55,7 @@ class SettingsActivity : QkActivity(), SettingsView { override val viewModelClass = SettingsViewModel::class override val preferenceClickIntent: Subject = PublishSubject.create() override val nightModeSelectedIntent by lazy { nightModeAdapter.menuItemClicks } + override val viewQksmsPlusIntent: Subject = PublishSubject.create() override val startTimeSelectedIntent: Subject> = PublishSubject.create() override val endTimeSelectedIntent: Subject> = PublishSubject.create() override val ringtoneSelectedIntent: Subject = PublishSubject.create() @@ -146,6 +148,13 @@ class SettingsActivity : QkActivity(), SettingsView { nightModeDialog = null } + override fun showQksmsPlusSnackbar() { + Snackbar.make(content, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run { + setAction(R.string.button_more, { viewQksmsPlusIntent.onNext(Unit) }) + show() + } + } + override fun showStartTimePicker(hour: Int, minute: Int) { TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, hour, minute -> startTimeSelectedIntent.onNext(Pair(hour, minute)) diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsView.kt b/qksms/src/main/java/presentation/feature/settings/SettingsView.kt index b64f09ed..b421180f 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsView.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsView.kt @@ -28,6 +28,7 @@ interface SettingsView : QkView { val preferenceClickIntent: Subject val nightModeSelectedIntent: Observable + val viewQksmsPlusIntent: Subject val startTimeSelectedIntent: Subject> val endTimeSelectedIntent: Subject> val ringtoneSelectedIntent: Observable @@ -35,6 +36,7 @@ interface SettingsView : QkView { fun showNightModeDialog() fun dismissNightModeDialog() + fun showQksmsPlusSnackbar() fun showStartTimePicker(hour: Int, minute: Int) fun showEndTimePicker(hour: Int, minute: Int) fun showRingtonePicker(default: Uri) diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt index 5932a1c2..c8b3d7a3 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt @@ -24,11 +24,13 @@ import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent +import common.util.BillingManager import common.util.DateFormatter import common.util.NightModeManager import common.util.Preferences import interactor.FullSync import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxkotlin.withLatestFrom import presentation.common.Navigator import presentation.common.base.QkViewModel import timber.log.Timber @@ -38,6 +40,7 @@ import javax.inject.Inject class SettingsViewModel : QkViewModel(SettingsState()) { @Inject lateinit var context: Context + @Inject lateinit var billingManager: BillingManager @Inject lateinit var dateFormatter: DateFormatter @Inject lateinit var navigator: Navigator @Inject lateinit var nightModeManager: NightModeManager @@ -148,8 +151,19 @@ class SettingsViewModel : QkViewModel(SettingsState view.nightModeSelectedIntent .doOnNext { view.dismissNightModeDialog() } + .withLatestFrom(billingManager.plusStatus, { mode, plusStatus -> + if (plusStatus == BillingManager.UpgradeStatus.REGULAR && mode == Preferences.NIGHT_MODE_AUTO) { + view.showQksmsPlusSnackbar() + } else { + nightModeManager.updateNightMode(mode) + } + }) .autoDisposable(view.scope()) - .subscribe { nightMode -> nightModeManager.updateNightMode(nightMode) } + .subscribe() + + view.viewQksmsPlusIntent + .autoDisposable(view.scope()) + .subscribe { navigator.showQksmsPlusActivity() } view.startTimeSelectedIntent .doOnNext { nightModeManager.updateAlarms() } diff --git a/qksms/src/main/res/layout/settings_activity.xml b/qksms/src/main/res/layout/settings_activity.xml index 850f3cc8..c27eaf38 100644 --- a/qksms/src/main/res/layout/settings_activity.xml +++ b/qksms/src/main/res/layout/settings_activity.xml @@ -27,6 +27,7 @@ diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 66ee5431..c0ac71bc 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -120,10 +120,12 @@ Undo Cancel + More Copied Archived conversation Moved to inbox + You must unlock QKSMS+ to use this Copy text