From 5919863300bd7416a902e241e85f244c2359f41b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 6 Dec 2017 23:02:06 -0500 Subject: [PATCH] Use specific colour for status bar and toolbar --- .../main/java/com/moez/QKSMS/common/util/Colors.kt | 10 ++++++++++ .../com/moez/QKSMS/presentation/base/QkActivity.kt | 5 ++++- qksms/src/main/res/values/colors.xml | 12 +++++++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt index eff61dbd..46b05a90 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt @@ -12,6 +12,16 @@ class Colors @Inject constructor(context: Context, prefs: Preferences) { val theme: Observable = prefs.theme.asObservable() .distinctUntilChanged() + val statusBar: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.color.statusBarDark else R.color.statusBarLight } + .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() + + val toolbarColor: Observable = prefs.dark.asObservable() + .map { dark -> if (dark) R.color.toolbarDark else R.color.toolbarLight } + .map { res -> context.resources.getColor(res) } + .distinctUntilChanged() + val background: Observable = prefs.dark.asObservable() .map { dark -> if (dark) R.color.backgroundDark else R.color.white } .map { res -> context.resources.getColor(res) } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt index f9cbf04d..fa2336b5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkActivity.kt @@ -53,8 +53,11 @@ abstract class QkActivity> : 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() } diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index 527732f4..e48a6ffd 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -2,6 +2,15 @@ #FFFFFF + #F7F7F7 + #1a1e22 + + #FFFFFF + #1d262b + + #F2F2F2 + #192025 + #49555F #70808D #B7B9C0 @@ -13,9 +22,6 @@ #FFFFFF #333333 - #F2F2F2 - #212121 - #F2F2F2 #333333