javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases 3 Wiki Activity

Fix issues on older API versions and tablets (#5433)

Browse Source 
* Fix tablet's navigation rail and toolbar color

* Fix tracking sheet crash on older APIs

* Fix settings crash on older APIs
This commit is contained in:
Ivan Iskandar
2021-06-20 22:05:37 +07:00
committed by GitHub
parent 859e8deb02
commit c3fb5af3fc
5 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/values/themes.xml
+13 -6
View File
@@ -27,7 +27,7 @@
<item name="android:listDivider">@drawable/line_divider</item>
<!-- Ripples -->
<item name="colorControlHighlight">@color/ripple_colored</item>
<item name="colorControlHighlight">@color/ripple_colored_light</item>
<item name="rippleColorToolbar">?attr/colorControlHighlight</item>
<!-- Handles RTL text -->
@@ -58,6 +58,7 @@
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
<item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
<item name="navigationRailStyle">@style/Widget.MaterialComponents.NavigationRailView</item>
<!-- Text Appearances -->
<item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
@@ -110,7 +111,7 @@
<item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
<item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView.Colored</item>
<item name="navigationRailStyle">@style/Widget.MaterialComponents.NavigationRailView.Colored</item>
<!-- Status/Navigation bar -->
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
@@ -124,6 +125,7 @@
<!-- Theme colors -->
<item name="colorPrimary">@color/accent_strawberry</item>
<item name="colorTertiary">@color/md_blue_A400</item>
<item name="colorControlHighlight">@color/ripple_colored_strawberry</item>
</style>
<!--== Yotsuba theme ==-->
@@ -131,6 +133,7 @@
<!-- Theme colors -->
<item name="colorPrimary">@color/accent_yotsuba</item>
<item name="colorTertiary">@color/md_blue_A400</item>
<item name="colorControlHighlight">@color/ripple_colored_yotsuba</item>
</style>
<!--=============-->
@@ -159,7 +162,7 @@
<item name="android:listDivider">@drawable/line_divider</item>
<!-- Ripples -->
<item name="colorControlHighlight">@color/ripple_colored</item>
<item name="colorControlHighlight">@color/ripple_colored_dark</item>
<item name="rippleColorToolbar">?attr/colorControlHighlight</item>
<!-- Handles RTL text -->
@@ -190,6 +193,7 @@
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
<item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
<item name="navigationRailStyle">@style/Widget.MaterialComponents.NavigationRailView</item>
<item name="elevationOverlayEnabled">false</item>
<!-- Text Appearances -->
@@ -231,6 +235,7 @@
<item name="toolbarStyle">@style/Widget.Tachiyomi.Toolbar.Primary</item>
<item name="tabStyle">@style/Widget.Tachiyomi.TabLayout.Colored</item>
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView.Colored</item>
<item name="navigationRailStyle">@style/Widget.MaterialComponents.NavigationRailView.Colored</item>
<!-- Status/Navigation bar -->
<item name="android:statusBarColor">?attr/colorPrimary</item>
@@ -243,6 +248,7 @@
<item name="colorPrimary">@color/accent_greenapple</item>
<item name="colorOnPrimary">@color/md_black_1000</item>
<item name="colorTertiary">@color/md_blue_A400</item>
<item name="colorControlHighlight">@color/ripple_colored_greenapple</item>
</style>
<!--== Midnight Dusk theme ==-->
@@ -251,9 +257,8 @@
<item name="colorPrimary">@color/accent_midnightdusk</item>
<item name="colorTertiary">@color/md_blue_A400</item>
<item name="colorSurface">@color/surface_midnightdusk</item>
<!-- Base background/text colors -->
<item name="android:colorBackground">@color/background_midnightdusk</item>
<item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item>
</style>
<!--===============-->
@@ -282,7 +287,7 @@
<item name="android:listDivider">@drawable/line_divider</item>
<!-- Ripples -->
<item name="colorControlHighlight">@color/ripple_colored</item>
<item name="colorControlHighlight">@color/ripple_colored_amoled</item>
<item name="rippleColorToolbar">?attr/colorControlHighlight</item>
<!-- Handles RTL text -->
@@ -312,6 +317,7 @@
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
<item name="tabStyle">@style/Widget.Tachiyomi.TabLayout</item>
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView</item>
<item name="navigationRailStyle">@style/Widget.MaterialComponents.NavigationRailView</item>
<item name="elevationOverlayEnabled">false</item>
<!-- Some ROMs make black navbars white (e.g. OxygenOS) -->
@@ -340,6 +346,7 @@
<!-- Theme colors -->
<item name="colorPrimary">@color/accent_hotpink</item>
<item name="colorTertiary">@color/md_blue_A400</item>
<item name="colorControlHighlight">@color/ripple_colored_hotpink</item>
</style>
<!--===============-->