From c8c5dd3aad08ed5ddb05a500955f53c311e92847 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 2 Apr 2018 23:58:58 -0400 Subject: [PATCH] Change color of navigation bar based on theme --- .../src/main/java/common/base/QkThemedActivity.kt | 9 +++++++-- presentation/src/main/java/common/util/Colors.kt | 4 ++-- presentation/src/main/res/layout/compose_activity.xml | 5 +++++ .../src/main/res/layout/conversation_info_activity.xml | 5 +++++ presentation/src/main/res/layout/main_activity.xml | 5 +++++ .../src/main/res/layout/notification_prefs_activity.xml | 5 +++++ presentation/src/main/res/layout/settings_activity.xml | 5 +++++ presentation/src/main/res/layout/setup_activity.xml | 4 ++++ .../src/main/res/layout/theme_picker_activity.xml | 5 +++++ 9 files changed, 43 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/common/base/QkThemedActivity.kt b/presentation/src/main/java/common/base/QkThemedActivity.kt index 5c16c7b0..5090875a 100644 --- a/presentation/src/main/java/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/common/base/QkThemedActivity.kt @@ -65,13 +65,17 @@ abstract class QkThemedActivity> : QkActivity() { .autoDisposable(scope()) .subscribe { res -> setTheme(res) } - colors.statusBarIcons + colors.systemBarIcons .autoDisposable(scope()) .subscribe { systemUiVisibility -> window.decorView.systemUiVisibility = systemUiVisibility } colors.statusBar .autoDisposable(scope()) .subscribe { color -> window.statusBarColor = color } + + colors.background + .autoDisposable(scope()) + .subscribe { color -> window.navigationBarColor = color } } override fun onPostCreate(savedInstanceState: Bundle?) { @@ -105,7 +109,8 @@ abstract class QkThemedActivity> : QkActivity() { colors.toolbarColor .doOnNext { color -> toolbar?.setBackgroundTint(color) } - .doOnNext { color -> // Set the color for the recent apps title + .doOnNext { color -> + // Set the color for the recent apps title val icon = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher) val taskDesc = ActivityManager.TaskDescription(getString(R.string.app_name), icon, color) setTaskDescription(taskDesc) diff --git a/presentation/src/main/java/common/util/Colors.kt b/presentation/src/main/java/common/util/Colors.kt index 78df8c25..9895d5b3 100644 --- a/presentation/src/main/java/common/util/Colors.kt +++ b/presentation/src/main/java/common/util/Colors.kt @@ -93,9 +93,9 @@ class Colors @Inject constructor(private val context: Context, private val prefs }) @SuppressLint("InlinedApi") - val statusBarIcons: Observable = prefs.night.asObservable() + val systemBarIcons: Observable = prefs.night.asObservable() .map { night -> night || Build.VERSION.SDK_INT < Build.VERSION_CODES.M } - .map { lightIcons -> if (lightIcons) 0 else View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR } + .map { lightIcons -> if (lightIcons) 0 else View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR} .distinctUntilChanged() val statusBar: Observable = Observables.combineLatest(prefs.night.asObservable(), prefs.black.asObservable(), diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index 7dabebc5..e0c45a4f 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -214,4 +214,9 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar" /> + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/conversation_info_activity.xml b/presentation/src/main/res/layout/conversation_info_activity.xml index 323d4eff..3e0d30c8 100644 --- a/presentation/src/main/res/layout/conversation_info_activity.xml +++ b/presentation/src/main/res/layout/conversation_info_activity.xml @@ -122,4 +122,9 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar" /> + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/main_activity.xml b/presentation/src/main/res/layout/main_activity.xml index 796af8d7..51a06f63 100644 --- a/presentation/src/main/res/layout/main_activity.xml +++ b/presentation/src/main/res/layout/main_activity.xml @@ -135,6 +135,11 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar" /> + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/settings_activity.xml b/presentation/src/main/res/layout/settings_activity.xml index e2201bdc..6078cd6f 100644 --- a/presentation/src/main/res/layout/settings_activity.xml +++ b/presentation/src/main/res/layout/settings_activity.xml @@ -199,4 +199,9 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar" /> + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/setup_activity.xml b/presentation/src/main/res/layout/setup_activity.xml index d0ce5910..d5ad4de8 100644 --- a/presentation/src/main/res/layout/setup_activity.xml +++ b/presentation/src/main/res/layout/setup_activity.xml @@ -83,4 +83,8 @@ + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/theme_picker_activity.xml b/presentation/src/main/res/layout/theme_picker_activity.xml index cb211640..a5b12040 100644 --- a/presentation/src/main/res/layout/theme_picker_activity.xml +++ b/presentation/src/main/res/layout/theme_picker_activity.xml @@ -62,6 +62,11 @@ android:layout_height="8dp" android:background="@drawable/ab_shadow" /> + + \ No newline at end of file