From e64e6676f3a50e216534bef2accc341b90e06e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 4 Sep 2019 13:52:55 +0200
Subject: [PATCH] Fix status bar color on xiaomi (#484)

---
 app/src/main/res/values-night/styles.xml               | 2 --
 app/src/main/res/{values-v23 => values-v21}/styles.xml | 7 +++----
 app/src/main/res/values-v27/styles.xml                 | 4 +---
 app/src/main/res/values/styles.xml                     | 8 +++-----
 4 files changed, 7 insertions(+), 14 deletions(-)
 rename app/src/main/res/{values-v23 => values-v21}/styles.xml (66%)

diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 30799236..f26e0c45 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -8,8 +8,6 @@
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/black</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
     </style>
 
     <style name="WulkanowyTheme.Black" parent="WulkanowyTheme.NoActionBar">
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v21/styles.xml
similarity index 66%
rename from app/src/main/res/values-v23/styles.xml
rename to app/src/main/res/values-v21/styles.xml
index d1f36273..6b7c7890 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,14 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
-        <item name="android:statusBarColor">@android:color/white</item>
-        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:statusBarColor">@android:color/darker_gray</item>
     </style>
 
     <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
         <item name="android:windowBackground">@drawable/layer_splash_background</item>
         <item name="android:statusBarColor">@color/colorPrimaryDark</item>
-        <item name="android:windowLightStatusBar">false</item>
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
     </style>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index d79e4ee0..d33f6422 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -1,8 +1,7 @@
 <resources>
 
     <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
-        <item name="android:statusBarColor">@android:color/white</item>
-        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:statusBarColor">@android:color/darker_gray</item>
         <item name="android:navigationBarColor">@android:color/white</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
@@ -10,7 +9,6 @@
     <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
         <item name="android:windowBackground">@drawable/layer_splash_background</item>
         <item name="android:statusBarColor">@color/colorPrimaryDark</item>
-        <item name="android:windowLightStatusBar">false</item>
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7edcd89e..c8b41a1a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,4 +1,6 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
+
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme" />
 
     <style name="BaseWulkanowyTheme" parent="@style/Theme.MaterialComponents.Light">
         <item name="colorPrimary">@color/colorPrimary</item>
@@ -6,13 +8,10 @@
         <item name="colorOnSecondary">@android:color/white</item>
         <item name="colorError">@color/colorError</item>
         <item name="colorDivider">@color/colorDivider</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/darker_gray</item>
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:preferenceStyle">@style/PreferenceThemeOverlay</item>
     </style>
 
-    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme" />
-
     <style name="WulkanowyTheme.NoActionBar" parent="WulkanowyTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -20,7 +19,6 @@
 
     <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
         <item name="android:windowBackground">@drawable/layer_splash_background</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">@color/colorPrimaryDark</item>
     </style>
 
     <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.Light.Dialog">