From b2a6a3828c83ab5054d8810685b1b62e8b89effb Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Wed, 13 Mar 2019 21:10:23 -0600
Subject: [PATCH] Make both navigation and status bar the same color, in day
 mode it is the dark variant of the bitsy blue color and dark in night mode.

---
 .../bitsybitshareswallet/fragments/SettingsFragment.kt    | 8 +-------
 app/src/main/res/values/styles.xml                        | 4 ++++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SettingsFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SettingsFragment.kt
index a5d8f27..4e50efd 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SettingsFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SettingsFragment.kt
@@ -87,16 +87,10 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
         val nightMode = PreferenceManager.getDefaultSharedPreferences(context)
                 .getBoolean(Constants.KEY_NIGHT_MODE_ACTIVATED, false)
 
-        // Make sure both toolbar and navigation bar show the correct colors in both day and night modes
+        // Make sure the toolbar show the correct colors in both day and night modes
         val toolbar: Toolbar? = activity?.findViewById(R.id.toolbar)
         toolbar?.setBackgroundResource(if (!nightMode) R.color.colorPrimary else R.color.colorToolbarDark)
 
-        val window = activity?.window
-        context?.let { context ->
-            window?.statusBarColor = ContextCompat.getColor(context,
-                if (!nightMode) R.color.colorPrimaryDark else R.color.colorStatusBarDark)
-        }
-
         return inflater.inflate(R.layout.fragment_settings, container, false)
     }
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 52978e8..192e9f1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,6 +9,8 @@
         <!--Custom attributes -->
         <item name="android:fontFamily">@font/p_f_beau_sans_pro</item>
         <item name="themedColorBackgroundFloating">@android:color/white</item>
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
     </style>
     <style name="Theme.Bitsy.NoActionBar">
         <item name="windowActionBar">false</item>
@@ -26,6 +28,8 @@
         <!--Custom attributes -->
         <item name="android:fontFamily">@font/p_f_beau_sans_pro</item>
         <item name="themedColorBackgroundFloating">@color/colorBackgroundFloating</item>
+        <item name="android:statusBarColor">@color/colorStatusBarDark</item>
+        <item name="android:navigationBarColor">@color/colorStatusBarDark</item>
     </style>
     <style name="Theme.Bitsy.Dark.NoActionBar">
         <item name="windowActionBar">false</item>