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 0eadc028b6)

# 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
This commit is contained in:
Ivan Iskandar
2021-07-02 19:44:04 +07:00
committed by Jobobby04
parent 0e636d68c4
commit ad2bbd0e3c
76 changed files with 430 additions and 828 deletions
+4 -4
View File
@@ -33,7 +33,7 @@
android:largeHeap="true"
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/ic_launcher_round"
android:theme="@style/Theme.Base.Light"
android:theme="@style/Theme.Tachiyomi"
android:networkSecurityConfig="@xml/network_security_config">
<activity
android:name=".ui.main.MainActivity"
@@ -85,7 +85,7 @@
</activity>
<activity
android:name=".ui.security.UnlockActivity"
android:theme="@style/Theme.Base.Light" />
android:theme="@style/Theme.Tachiyomi" />
<activity
android:name=".ui.webview.WebViewActivity"
android:configChanges="uiMode|orientation|screenSize" />
@@ -192,7 +192,7 @@
<activity
android:name="exh.ui.intercept.InterceptActivity"
android:label="@string/app_name"
android:theme="@style/Theme.Base.Light">
android:theme="@style/Theme.Tachiyomi">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -366,7 +366,7 @@
</activity>
<activity
android:name="exh.ui.captcha.BrowserActionActivity"
android:theme="@style/Theme.Base.Light" />
android:theme="@style/Theme.Tachiyomi" />
</application>
</manifest>