Added pure black night mode

This commit is contained in:
Moez Bhatti
2018-03-12 15:04:02 -07:00
parent 167c75cc83
commit 154389b5f1
7 changed files with 67 additions and 12 deletions
+49 -12
View File
@@ -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<Int> = prefs.theme.asObservable()
.distinctUntilChanged()
val appThemeResources: Observable<Int> = 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<Int> = 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<Int> = 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<Int> = prefs.night.asObservable()
.map { night -> if (night) R.color.statusBarDark else R.color.statusBarLight }
val statusBar: Observable<Int> = 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<Int> = prefs.night.asObservable()
.map { night -> if (night) R.color.toolbarDark else R.color.toolbarLight }
val toolbarColor: Observable<Int> = 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<Int> = prefs.night.asObservable()
.map { night -> if (night) R.color.backgroundDark else R.color.white }
val background: Observable<Int> = 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<Int> = prefs.night.asObservable()
.map { night -> if (night) R.color.backgroundDark else R.color.backgroundLight }
val composeBackground: Observable<Int> = 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()
@@ -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)
@@ -108,6 +108,9 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), 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
@@ -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,
@@ -67,6 +67,9 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(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<SettingsView, SettingsState>(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()
@@ -80,6 +80,13 @@
app:title="@string/settings_night_end_title"
tools:summary="9:00AM" />
<presentation.common.widget.PreferenceView
android:id="@+id/black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_black_title"
app:widget="@layout/settings_switch_widget" />
<presentation.common.widget.PreferenceView
android:id="@+id/autoEmoji"
android:layout_width="match_parent"
+1
View File
@@ -78,6 +78,7 @@
<string name="settings_default_sms_summary_false">Set QKSMS as your default SMS app</string>
<string name="settings_theme_title">Theme</string>
<string name="settings_night_title">Night mode</string>
<string name="settings_black_title">Pure black night mode</string>
<string name="settings_night_start_title">Start time</string>
<string name="settings_night_end_title">End time</string>
<string name="settings_auto_emoji_title">Automatic emoji</string>