blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #11099 For #12189 For #7532 - Clean up bottom navigation bar colors

master
ekager 2020-07-09 17:32:58 -04:00 committed by Emily Kager
parent 98ad7ace49
commit 88af736065
4 changed files with 73 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/res/values-night-v23/styles.xml 100644
View File

@ -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>

7
app/src/main/res/values-v23/styles.xml
View File

@ -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>

26
app/src/main/res/values-v27/styles.xml
View File

@ -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>

29
app/src/main/res/values/styles.xml
View File

@ -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>