Merge light and dark themes (#5470)

* Merge AMOLED and regular dark themes

This allows all variants of dark themes to use black backgrounds as a
separate preference.

* Merge light and dark themes

* Fix ReaderSeekBar color on Dark Blue theme

* Color fixes

* Fix Dark Blue bars ripple

* Simplify night mode check
This commit is contained in:
Ivan Iskandar
2021-07-02 19:44:04 +07:00
committed by GitHub
parent 82f3677168
commit 0eadc028b6
71 changed files with 408 additions and 785 deletions
+27 -1
View File
@@ -9,6 +9,10 @@
<item name="android:colorControlHighlight">?attr/rippleColorToolbar</item>
</style>
<style name="ThemeOverlay.Tachiyomi.ActionBar.Colored" parent="ThemeOverlay.MaterialComponents.ActionBar">
<item name="android:colorControlHighlight">?attr/colorOnPrimary</item>
</style>
<style name="Widget.Tachiyomi.Toolbar.Button.Navigation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
<item name="tint">?attr/colorOnToolbar</item>
</style>
@@ -254,7 +258,29 @@
<item name="tabInlineLabel">true</item>
<item name="tabMinWidth">75dp</item>
<item name="tabMode">scrollable</item>
<item name="tabRippleColor">@color/ripple_toolbar_fainter</item>
<item name="tabRippleColor">?attr/colorOnPrimary</item>
</style>
<!--================-->
<!--Navigation Views-->
<!--================-->
<style name="Widget.Tachiyomi.BottomNavigationView" parent="Widget.MaterialComponents.BottomNavigationView">
<item name="itemRippleColor">@color/ripple_toolbar_fainter</item>
<item name="labelVisibilityMode">labeled</item>
</style>
<style name="Widget.Tachiyomi.BottomNavigationView.Colored" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
<item name="labelVisibilityMode">labeled</item>
</style>
<style name="Widget.Tachiyomi.NavigationRailView" parent="Widget.MaterialComponents.NavigationRailView">
<item name="itemRippleColor">@color/ripple_toolbar_fainter</item>
<item name="labelVisibilityMode">labeled</item>
</style>
<style name="Widget.Tachiyomi.NavigationRailView.Colored" parent="Widget.MaterialComponents.NavigationRailView.Colored">
<item name="labelVisibilityMode">labeled</item>
</style>