From 2eac57f68f94405e4d23efe14394566e69610102 Mon Sep 17 00:00:00 2001
From: HarryJohnso <harry.w.l.johnson@gmail.com>
Date: Sat, 24 Aug 2019 12:13:09 +1000
Subject: [PATCH] Alternative to Simons original proposal

---
 android/src/main/AndroidManifest.xml             |  6 +++---
 android/src/main/res/values-night-v27/styles.xml | 12 ++----------
 android/src/main/res/values-night/colors.xml     |  1 +
 android/src/main/res/values-v27/styles.xml       | 16 ++++------------
 android/src/main/res/values/colors.xml           |  1 +
 android/src/main/res/values/styles.xml           |  4 +++-
 6 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 1aec9cdb..e600d133 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -51,7 +51,7 @@
         <activity
                 android:name=".ui.PassListActivity"
                 android:label="@string/app_name"
-                android:theme="@style/AppBaseThemeNoActionbar">
+                android:theme="@style/AppThemeNoActionbar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -64,7 +64,7 @@
 
         <activity
                 android:name=".ui.HelpActivity"
-                android:theme="@style/AppBaseThemeNoActionbar"/>
+                android:theme="@style/AppThemeNoActionbar"/>
         <activity
                 android:name=".ui.PassEditActivity"/>
         <activity
@@ -1792,7 +1792,7 @@
 
         <activity
                 android:name=".ui.PassViewActivity"
-                android:theme="@style/AppBaseThemeNoActionbar"
+                android:theme="@style/AppThemeNoActionbar"
                 android:label="@string/app_name"
                 android:exported="true"
                 android:parentActivityName=".ui.PassListActivity">
diff --git a/android/src/main/res/values-night-v27/styles.xml b/android/src/main/res/values-night-v27/styles.xml
index eed240cd..fe70e2b7 100755
--- a/android/src/main/res/values-night-v27/styles.xml
+++ b/android/src/main/res/values-night-v27/styles.xml
@@ -1,14 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-
-    <style name="AppBaseTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/secondary</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="color">@color/secondary</item>
-        <item name="actionModeBackground">@color/secondary</item>
-        <item name="android:navigationBarColor">@android:color/black</item>
+    <style name="AppTheme" parent="AppBaseTheme">
+<!--        <item name="android:navigationBarColor">@color/system_navigation_bar</item>-->
         <item name="android:windowLightNavigationBar">false</item>
     </style>
-    
 </resources>
\ No newline at end of file
diff --git a/android/src/main/res/values-night/colors.xml b/android/src/main/res/values-night/colors.xml
index 92c426da..dadc9d83 100644
--- a/android/src/main/res/values-night/colors.xml
+++ b/android/src/main/res/values-night/colors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="card_view_background">#424242</color>
+    <color name="system_navigation_bar">@android:color/black</color>
 </resources>
\ No newline at end of file
diff --git a/android/src/main/res/values-v27/styles.xml b/android/src/main/res/values-v27/styles.xml
index 0edf6203..2baffff1 100755
--- a/android/src/main/res/values-v27/styles.xml
+++ b/android/src/main/res/values-v27/styles.xml
@@ -1,14 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-
-    <style name="AppBaseTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/secondary</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="color">@color/secondary</item>
-        <item name="actionModeBackground">@color/secondary</item>
-        <item name="android:navigationBarColor">@android:color/white</item>
-        <item name="android:windowLightNavigationBar">true</item>
-    </style>
-
+<!--    <style name="AppTheme" parent="AppBaseTheme">-->
+<!--        <item name="android:navigationBarColor">@color/system_navigation_bar</item>-->
+<!--        <item name="android:windowLightNavigationBar">true</item>-->
+<!--    </style>-->
 </resources>
\ No newline at end of file
diff --git a/android/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml
index 5642d7d2..5bcccf11 100644
--- a/android/src/main/res/values/colors.xml
+++ b/android/src/main/res/values/colors.xml
@@ -7,6 +7,7 @@
     <color name="secondary">#ff2c51a7</color>
 
     <color name="card_view_background">#f9f9f9</color>
+    <color name="system_navigation_bar">#ebebeb</color>
 
     <color name="icon_green">#ffbfdf00</color>
 </resources>
\ No newline at end of file
diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
index 1f9f24c1..7292dbaa 100644
--- a/android/src/main/res/values/styles.xml
+++ b/android/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="AppBaseThemeNoActionbar" parent="AppBaseTheme">
+    <style name="AppThemeNoActionbar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
@@ -13,6 +13,8 @@
         <item name="colorAccent">@color/accent</item>
         <item name="color">@color/secondary</item>
         <item name="actionModeBackground">@color/secondary</item>
+        <item name="android:navigationBarColor" tools:targetApi="27">@color/system_navigation_bar</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
     </style>