Ivan Iskandar ad2bbd0e3c 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 (cherry picked from commit 0eadc028b6f9daf38cae083cfdc2ff44a1836623) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt		2021-07-03 18:55:12 -04:00
..
src	Merge light and dark themes (#5470)	2021-07-03 18:55:12 -04:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle.kts	Convert EH Gallery Updater from a JobService to WorkManager	2021-07-02 17:50:22 -04:00
proguard-android-optimize.txt	Proguard fixes	2021-05-22 16:07:11 -04:00
proguard-rules.pro	Proguard fixes	2021-05-22 16:07:11 -04:00
shortcuts.xml	Remove more unused strings	2021-05-31 23:48:06 -04:00