Use specific colour for status bar and toolbar

This commit is contained in:
Moez Bhatti
2017-12-06 23:02:06 -05:00
parent 6e5f4807f9
commit 5919863300
3 changed files with 23 additions and 4 deletions
@@ -12,6 +12,16 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) {
val theme: Observable<Int> = prefs.theme.asObservable()
.distinctUntilChanged()
val statusBar: Observable<Int> = prefs.dark.asObservable()
.map { dark -> if (dark) R.color.statusBarDark else R.color.statusBarLight }
.map { res -> context.resources.getColor(res) }
.distinctUntilChanged()
val toolbarColor: Observable<Int> = prefs.dark.asObservable()
.map { dark -> if (dark) R.color.toolbarDark else R.color.toolbarLight }
.map { res -> context.resources.getColor(res) }
.distinctUntilChanged()
val background: Observable<Int> = prefs.dark.asObservable()
.map { dark -> if (dark) R.color.backgroundDark else R.color.white }
.map { res -> context.resources.getColor(res) }
@@ -53,8 +53,11 @@ abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
.doOnNext { color -> toolbar?.navigationIcon = toolbar?.navigationIcon?.apply { setTint(color) } }
.subscribe()
disposables += colors.background
disposables += colors.statusBar
.doOnNext { color -> window.statusBarColor = color }
.subscribe()
disposables += colors.toolbarColor
.doOnNext { color -> toolbar?.setBackgroundColor(color) }
.subscribe()
}
+9 -3
View File
@@ -2,6 +2,15 @@
<resources>
<color name="white">#FFFFFF</color>
<color name="statusBarLight">#F7F7F7</color>
<color name="statusBarDark">#1a1e22</color>
<color name="toolbarLight">#FFFFFF</color>
<color name="toolbarDark">#1d262b</color>
<color name="backgroundLight">#F2F2F2</color>
<color name="backgroundDark">#192025</color>
<color name="textPrimary">#49555F</color>
<color name="textSecondary">#70808D</color>
<color name="textTertiary">#B7B9C0</color>
@@ -13,9 +22,6 @@
<color name="bubbleLight">#FFFFFF</color>
<color name="bubbleDark">#333333</color>
<color name="backgroundLight">#F2F2F2</color>
<color name="backgroundDark">#212121</color>
<color name="separatorLight">#F2F2F2</color>
<color name="separatorDark">#333333</color>