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:
5
app/src/main/res/values-night/bools.xml
Normal file
5
app/src/main/res/values-night/bools.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<bool name="lightStatusBar">false</bool>
|
||||
<bool name="lightNavigationBar">false</bool>
|
||||
</resources>
|
||||
@@ -1,4 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="splash">@color/background_dark</color>
|
||||
<color name="splash">@color/background_default</color>
|
||||
|
||||
<color name="accent_default">#3399FF</color>
|
||||
<color name="divider_default">@color/md_white_1000_12</color>
|
||||
<color name="surface_default">#242529</color>
|
||||
<color name="background_default">#202125</color>
|
||||
<color name="ripple_colored_default">#1F3399FF</color>
|
||||
</resources>
|
||||
|
||||
22
app/src/main/res/values-night/themes.xml
Normal file
22
app/src/main/res/values-night/themes.xml
Normal file
@@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<!--== AMOLED theme overlay ==-->
|
||||
<style name="ThemeOverlay.Tachiyomi.Amoled" parent="">
|
||||
<item name="colorSurface">@color/surface_amoled</item>
|
||||
<item name="android:colorBackground">@color/background_amoled</item>
|
||||
<item name="android:divider">@color/divider_amoled</item>
|
||||
<item name="colorFilterActive">@color/filterColorAmoled</item>
|
||||
</style>
|
||||
|
||||
<!--== Midnight Dusk theme ==-->
|
||||
<style name="Theme.Tachiyomi.MidnightDusk">
|
||||
<!-- Theme colors -->
|
||||
<item name="colorPrimary">@color/accent_midnightdusk</item>
|
||||
<item name="colorTertiary">@color/md_blue_A400</item>
|
||||
<item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item>
|
||||
<item name="colorSurface">@color/surface_midnightdusk</item>
|
||||
<item name="android:colorBackground">@color/background_midnightdusk</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
Reference in New Issue
Block a user