From 88af736065f020432d0363f1bcfb66e704078013 Mon Sep 17 00:00:00 2001
From: ekager <ekager@mozilla.com>
Date: Thu, 9 Jul 2020 17:32:58 -0400
Subject: [PATCH] For #11099 For #12189 For #7532 - Clean up bottom navigation
 bar colors

---
 app/src/main/res/values-night-v23/styles.xml | 19 +++++++++++++
 app/src/main/res/values-v23/styles.xml       |  7 +++++
 app/src/main/res/values-v27/styles.xml       | 26 ++++++++++++++++++
 app/src/main/res/values/styles.xml           | 29 ++++++++++++++------
 4 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/values-night-v23/styles.xml

diff --git a/app/src/main/res/values-night-v23/styles.xml b/app/src/main/res/values-night-v23/styles.xml
new file mode 100644
index 000000000..989c6e6a0
--- /dev/null
+++ b/app/src/main/res/values-night-v23/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<resources>
+    <style name="BottomSheet" parent="BottomSheetBase">
+        <item name="android:windowLightStatusBar">false</item>
+
+        <!-- Style the navigation bar -->
+        <item name="android:navigationBarColor">?foundation</item>
+    </style>
+
+    <style name="TabTrayDialogStyle" parent="TabTrayDialogStyleBase">
+        <item name="android:windowLightStatusBar">false</item>
+
+        <!-- Style the navigation bar -->
+        <item name="android:navigationBarColor">@color/foundation_normal_theme</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index b7f59960f..bfc65cfdd 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -13,4 +13,11 @@
         <!-- Style the navigation bar -->
         <item name="android:navigationBarColor">?foundation</item>
     </style>
+
+    <style name="BottomSheetPrivate" parent="BottomSheetBasePrivate">
+        <item name="android:windowLightStatusBar">false</item>
+
+        <!-- Style the navigation bar -->
+        <item name="android:navigationBarColor">?foundation</item>
+    </style>
 </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 e18af37d9..df118068e 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -24,4 +24,30 @@
         <item name="android:navigationBarDividerColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
+
+    <style name="BottomSheetPrivate" parent="BottomSheetBasePrivate">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">?foundation</item>
+        <item name="android:colorBackground">?foundation</item>
+        <!-- Style the navigation bar -->
+        <item name="android:navigationBarDividerColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="BottomSheet" parent="BottomSheetBase">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">?foundation</item>
+        <item name="android:colorBackground">?foundation</item>
+        <!-- Style the navigation bar -->
+        <item name="android:windowLightNavigationBar">@bool/theme_is_light</item>
+        <item name="android:navigationBarDividerColor">@android:color/transparent</item>
+    </style>
+
+    <style name="TabTrayDialogStyle" parent="TabTrayDialogStyleBase">
+        <item name="android:navigationBarDividerColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar">@bool/theme_is_light</item>
+        <item name="android:navigationBarColor">@color/foundation_normal_theme</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e0ffdcf79..144f053fe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,8 +20,8 @@
         <item name="alertDialogStyle">@style/DialogStyleNormal</item>
         <item name="alertDialogTheme">@style/DialogStyleNormal</item>
         <item name="android:windowEnableSplitTouch">false</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:splitMotionEvents">false</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheet</item>
 
         <item name="mozacInputLayoutErrorTextColor"
             tools:ignore="UnusedResources">@color/destructive_normal_theme</item>
@@ -153,6 +153,7 @@
         <item name="alertDialogTheme">@style/DialogStyleDark</item>
         <item name="android:windowEnableSplitTouch">false</item>
         <item name="android:splitMotionEvents">false</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheetPrivate</item>
 
         <item name="mozacInputLayoutErrorTextColor"
             tools:ignore="UnusedResources">@color/destructive_private_theme</item>
@@ -542,18 +543,30 @@
         <item name="android:textColorHint">@color/search_view_hint_color</item>
     </style>
 
-    <style name="TabTrayDialogStyle" parent="Theme.Design.Light.BottomSheetDialog">
-        <item name="bottomSheetStyle">@style/BottomSheetModal</item>
-<!--        <item name="android:textAppearance">@style/TextAppearance.AppCompat</item>-->
-<!--        <item name="android:colorBackground">?foundation</item>-->
+    <style name="BottomSheetPrivate" parent="@style/BottomSheetBasePrivate" />
 
-<!--        <item name="android:windowAnimationStyle">@style/Animation.Design.BottomSheetDialog</item>-->
+    <style name="BottomSheet" parent="@style/BottomSheetBase" />
+
+    <style name="BottomSheetBasePrivate" parent="Theme.MaterialComponents.BottomSheetDialog">
         <item name="android:windowIsFloating">false</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="android:navigationBarColor">@color/foundation_normal_theme</item>
+        <item name="android:colorBackground">?foundation</item>
     </style>
 
+    <style name="BottomSheetBase" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:colorBackground">?foundation</item>
+    </style>
+
+    <!-- Tab Tray does not present a private theme, so it needs to be separate from other bottom sheet styles -->
+    <style name="TabTrayDialogStyleBase" parent="BottomSheetBase">
+        <item name="bottomSheetStyle">@style/BottomSheetModal</item>
+        <item name="android:colorBackground">@color/foundation_normal_theme</item>
+    </style>
+
+    <style name="TabTrayDialogStyle" parent="TabTrayDialogStyleBase" />
+
     <!-- Stuff to make the bottom sheet with round top borders -->
     <style name="BottomSheetShapeAppearance" parent="ShapeAppearance.MaterialComponents.LargeComponent">
         <item name="cornerFamily">rounded</item>