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
+9 -12
View File
@@ -146,18 +146,15 @@
<string name="theme_system">Follow system</string>
<string name="theme_light">Off</string>
<string name="theme_dark">On</string>
<string name="pref_theme_light">Light theme</string>
<string name="theme_light_default">Default</string>
<string name="theme_light_blue">Light Blue</string>
<string name="theme_light_strawberrydaiquiri">Strawberry Daiquiri</string>
<string name="theme_light_yotsuba">Yotsuba</string>
<string name="pref_theme_dark">Dark theme</string>
<string name="theme_dark_default">Default</string>
<string name="theme_dark_blue">Dark Blue</string>
<string name="theme_dark_greenapple">Green Apple</string>
<string name="theme_dark_midnightdusk">Midnight Dusk</string>
<string name="theme_dark_amoled">AMOLED Black</string>
<string name="theme_dark_amoled_hotpink">AMOLED Hot Pink</string>
<string name="pref_app_theme">App theme</string>
<string name="theme_default">Default</string>
<string name="theme_strawberrydaiquiri">Strawberry Daiquiri</string>
<string name="theme_yotsuba">Yotsuba</string>
<string name="theme_darkblue">Dark Blue</string>
<string name="theme_greenapple">Green Apple</string>
<string name="theme_midnightdusk">Midnight Dusk</string>
<string name="theme_hotpink">Hot Pink</string>
<string name="pref_dark_theme_pure_black">Pure black dark mode</string>
<string name="pref_start_screen">Start screen</string>
<string name="pref_language">Language</string>
<string name="system_default">Default</string>