From 154389b5f1ae53e66fafe6999394ecd56316b103 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 12 Mar 2018 15:04:02 -0700 Subject: [PATCH] Added pure black night mode --- qksms/src/main/java/common/util/Colors.kt | 61 +++++++++++++++---- .../src/main/java/common/util/Preferences.kt | 1 + .../feature/settings/SettingsActivity.kt | 3 + .../feature/settings/SettingsState.kt | 1 + .../feature/settings/SettingsViewModel.kt | 5 ++ .../src/main/res/layout/settings_activity.xml | 7 +++ qksms/src/main/res/values/strings.xml | 1 + 7 files changed, 67 insertions(+), 12 deletions(-) diff --git a/qksms/src/main/java/common/util/Colors.kt b/qksms/src/main/java/common/util/Colors.kt index 89611b7e..e0685667 100644 --- a/qksms/src/main/java/common/util/Colors.kt +++ b/qksms/src/main/java/common/util/Colors.kt @@ -26,6 +26,7 @@ import android.support.annotation.ColorRes import android.view.View import com.moez.QKSMS.R import io.reactivex.Observable +import io.reactivex.rxkotlin.Observables import javax.inject.Inject import javax.inject.Singleton @@ -64,11 +65,23 @@ class Colors @Inject constructor(private val context: Context, prefs: Preference val theme: Observable = prefs.theme.asObservable() .distinctUntilChanged() - val appThemeResources: Observable = prefs.night.asObservable() - .map { night -> if (night) R.style.AppThemeDark else R.style.AppThemeLight } + val appThemeResources = Observables.combineLatest(prefs.night.asObservable(), prefs.black.asObservable(), + { night, black -> + when { + night && black -> R.style.AppThemeBlack + night && !black -> R.style.AppThemeDark + else -> R.style.AppThemeLight + } + }) - val popupThemeResource: Observable = prefs.night.asObservable() - .map { night -> if (night) R.style.PopupThemeDark else R.style.PopupThemeLight } + val popupThemeResource = Observables.combineLatest(prefs.night.asObservable(), prefs.black.asObservable(), + { night, black -> + when { + night && black -> R.style.PopupThemeBlack + night && !black -> R.style.PopupThemeDark + else -> R.style.PopupThemeLight + } + }) @SuppressLint("InlinedApi") val statusBarIcons: Observable = prefs.night.asObservable() @@ -76,18 +89,36 @@ class Colors @Inject constructor(private val context: Context, prefs: Preference .map { lightIcons -> if (lightIcons) 0 else View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR } .distinctUntilChanged() - val statusBar: Observable = prefs.night.asObservable() - .map { night -> if (night) R.color.statusBarDark else R.color.statusBarLight } + val statusBar: Observable = Observables.combineLatest(prefs.night.asObservable(), prefs.black.asObservable(), + { night, black -> + when { + night && black -> R.color.black + night && !black -> R.color.statusBarDark + else -> R.color.statusBarLight + } + }) .map { res -> getColor(res) } .distinctUntilChanged() - val toolbarColor: Observable = prefs.night.asObservable() - .map { night -> if (night) R.color.toolbarDark else R.color.toolbarLight } + val toolbarColor: Observable = Observables.combineLatest(prefs.night.asObservable(), prefs.black.asObservable(), + { night, black -> + when { + night && black -> R.color.black + night && !black -> R.color.toolbarDark + else -> R.color.toolbarLight + } + }) .map { res -> getColor(res) } .distinctUntilChanged() - val background: Observable = prefs.night.asObservable() - .map { night -> if (night) R.color.backgroundDark else R.color.white } + val background: Observable = Observables.combineLatest(prefs.night.asObservable(), prefs.black.asObservable(), + { night, black -> + when { + night && black -> R.color.black + night && !black -> R.color.backgroundDark + else -> R.color.white + } + }) .map { res -> getColor(res) } .distinctUntilChanged() @@ -96,8 +127,14 @@ class Colors @Inject constructor(private val context: Context, prefs: Preference .map { res -> getColor(res) } .distinctUntilChanged() - val composeBackground: Observable = prefs.night.asObservable() - .map { night -> if (night) R.color.backgroundDark else R.color.backgroundLight } + val composeBackground: Observable = Observables.combineLatest(prefs.night.asObservable(), prefs.black.asObservable(), + { night, black -> + when { + night && black -> R.color.black + night && !black -> R.color.backgroundDark + else -> R.color.backgroundLight + } + }) .map { res -> getColor(res) } .distinctUntilChanged() diff --git a/qksms/src/main/java/common/util/Preferences.kt b/qksms/src/main/java/common/util/Preferences.kt index 39861edb..4288f0e7 100644 --- a/qksms/src/main/java/common/util/Preferences.kt +++ b/qksms/src/main/java/common/util/Preferences.kt @@ -39,6 +39,7 @@ class Preferences @Inject constructor(private val rxPrefs: RxSharedPreferences) val nightMode = rxPrefs.getInteger("nightModeSummary", NIGHT_MODE_OFF) val nightStart = rxPrefs.getString("nightStart", "6:00 PM") val nightEnd = rxPrefs.getString("nightEnd", "6:00 AM") + val black = rxPrefs.getBoolean("black", false) val autoEmoji = rxPrefs.getBoolean("autoEmoji", true) val delivery = rxPrefs.getBoolean("delivery", false) val unicode = rxPrefs.getBoolean("unicode", false) diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt index 3556417b..ba2c7ce2 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt @@ -108,6 +108,9 @@ class SettingsActivity : QkThemedActivity(), SettingsView { nightEnd.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO) nightEnd.summary = state.nightEnd + black.setVisible(state.nightModeId != Preferences.NIGHT_MODE_OFF) + black.checkbox.isChecked = state.black + autoEmoji.checkbox.isChecked = state.autoEmojiEnabled delivery.checkbox.isChecked = state.deliveryEnabled unicode.checkbox.isChecked = state.stripUnicodeEnabled diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsState.kt b/qksms/src/main/java/presentation/feature/settings/SettingsState.kt index 14da4822..1e15d6e6 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsState.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsState.kt @@ -28,6 +28,7 @@ data class SettingsState( val nightModeId: Int = Preferences.NIGHT_MODE_OFF, val nightStart: String = "", val nightEnd: String = "", + val black: Boolean = false, val autoEmojiEnabled: Boolean = true, val notificationsEnabled: Boolean = true, val deliveryEnabled: Boolean = false, diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt index 427a20d7..91a9cd03 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt @@ -67,6 +67,9 @@ class SettingsViewModel : QkViewModel(SettingsState disposables += prefs.nightEnd.asObservable() .subscribe { nightEnd -> newState { it.copy(nightEnd = nightEnd) } } + disposables += prefs.black.asObservable() + .subscribe { black -> newState { it.copy(black = black) } } + disposables += prefs.autoEmoji.asObservable() .subscribe { enabled -> newState { it.copy(autoEmojiEnabled = enabled) } } @@ -118,6 +121,8 @@ class SettingsViewModel : QkViewModel(SettingsState view.showEndTimePicker(date.get(Calendar.HOUR_OF_DAY), date.get(Calendar.MINUTE)) } + R.id.black -> prefs.black.set(!prefs.black.get()) + R.id.autoEmoji -> prefs.autoEmoji.set(!prefs.autoEmoji.get()) R.id.notifications -> navigator.showNotificationSettings() diff --git a/qksms/src/main/res/layout/settings_activity.xml b/qksms/src/main/res/layout/settings_activity.xml index 57ada9a6..55d2d3d9 100644 --- a/qksms/src/main/res/layout/settings_activity.xml +++ b/qksms/src/main/res/layout/settings_activity.xml @@ -80,6 +80,13 @@ app:title="@string/settings_night_end_title" tools:summary="9:00AM" /> + + Set QKSMS as your default SMS app Theme Night mode + Pure black night mode Start time End time Automatic emoji