admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Themes cleanup (#4894)

Browse Source 
(cherry picked from commit ad57fde1c5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
#	app/src/main/res/values/themes.xml
This commit is contained in:
Ivan Iskandar
2021-04-18 22:29:56 +07:00
committed by Jobobby04
parent 0b3209284a
commit e43777bba7
7 changed files with 65 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/values-v23/themes.xml
+3 -3
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.Tachiyomi.Light.Api23">
<item name="android:statusBarColor">@color/md_white_1000</item>
<style name="Base.V23.Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light">
<item name="android:statusBarColor">?attr/colorPrimary</item>
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="Theme.Tachiyomi.Light" parent="Base.V23.Theme.Tachiyomi.Light" />
</resources>
app/src/main/res/values-v27/themes.xml
+3 -6
View File
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.Tachiyomi.Light.Api27">
<item name="android:statusBarColor">@color/md_white_1000</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:navigationBarColor">@color/md_white_1000</item>
<style name="Base.V27.Theme.Tachiyomi.Light" parent="Base.V23.Theme.Tachiyomi.Light">
<item name="android:navigationBarColor">?attr/colorPrimary</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
<style name="Theme.Tachiyomi.Light" parent="Base.V27.Theme.Tachiyomi.Light" />
</resources>
app/src/main/res/values/themes.xml
+15 -39
View File
@@ -47,8 +47,9 @@
<item name="android:textDirection">locale</item>
<!-- Themes -->
<item name="android:statusBarColor">?attr/colorPrimary</item>
<item name="android:navigationBarColor">?attr/colorPrimary</item>
<item name="android:statusBarColor">@color/md_black_1000</item>
<item name="android:navigationBarColor">@color/md_black_1000</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
<item name="windowActionModeOverlay">true</item>
<item name="elevationOverlayEnabled">false</item>
@@ -84,34 +85,24 @@
<!-- Custom Attributes-->
<item name="colorLibrarySelection">?attr/colorAccent</item>
<item name="colorLibrarySelectionActive">@color/selectorColorLight</item>
<item name="colorFilterActive">@color/filterColorDark</item>
<item name="colorFilterActive">@color/filterColorLight</item>
</style>
<!--===========-->
<!-- Main Theme-->
<!--===========-->
<style name="Theme.Tachiyomi.Light" parent="Theme.Base">
<item name="android:statusBarColor">@color/md_black_1000</item>
<item name="android:navigationBarColor">@color/md_black_1000_54</item>
<item name="background">@color/dialogLight</item>
<style name="Base.Theme.Tachiyomi.Light" parent="Theme.Base" />
<style name="Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light" />
<item name="colorFilterActive">@color/filterColorLight</item>
</style>
<style name="Theme.Tachiyomi.LightBlue" parent="Theme.Base">
<style name="Theme.Tachiyomi.Light.Blue">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
<item name="background">@color/colorPrimary</item>
<item name="colorFilterActive">@color/filterColorDark</item>
<item name="actionBarTheme">@style/Theme.Toolbar.Light</item>
<item name="android:navigationBarColor">@color/colorPrimary_70</item>
</style>
<style name="Theme.EHActivity" parent="Theme.Tachiyomi.Light">
<!-- Attributes specific for SDK 16 to SDK 20 -->
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
</style>
<!--=============-->
@@ -152,6 +143,7 @@
<!-- Themes -->
<item name="android:statusBarColor">?attr/colorPrimary</item>
<item name="android:navigationBarColor">?attr/colorPrimary</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
<item name="windowActionModeOverlay">true</item>
<item name="elevationOverlayEnabled">false</item>
@@ -191,17 +183,16 @@
<item name="colorFilterActive">@color/filterColorDark</item>
</style>
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
</style>
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark" />
<style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Base.Dark">
<style name="Theme.Tachiyomi.Dark.Blue">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorPrimaryVariant">@color/colorPrimary</item>
<item name="background">@color/colorPrimary</item>
</style>
<style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Dark">
<style name="Theme.Tachiyomi.Dark.Amoled">
<item name="colorPrimary">@color/colorAmoledPrimary</item>
<item name="colorPrimaryVariant">@color/colorAmoledPrimary</item>
<item name="colorSurface">@color/colorAmoledPrimary</item>
@@ -217,21 +208,6 @@
<item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
</style>
<style name="Theme.Tachiyomi.Red" parent="Theme.Tachiyomi.Amoled">
<item name="actionBarTheme">@style/Theme.Toolbar.Red</item>
<item name="colorPrimary">@color/md_black_1000</item>
<item name="colorPrimaryVariant">@color/red</item>
<item name="colorSecondary">@color/dark_red</item>
<item name="colorOnSurface">@color/red</item>
<item name="colorAccent">@color/dark_red</item>
<item name="colorOnPrimary">@color/red</item>
<item name="android:textColor">@color/red</item>
<item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorSecondary">@color/dark_red</item>
<item name="android:textColorHint">@color/dark_red</item>
<item name="md_color_title">@color/red</item>
</style>
<!--==============-->
<!-- Reader Theme -->
<!--==============-->
@@ -279,7 +255,7 @@
<!--===============-->
<!-- Launch Screen -->
<!--===============-->
<style name="Theme.Splash" parent="Theme.Tachiyomi.LightBlue">
<style name="Theme.Splash" parent="Theme.Tachiyomi.Light.Blue">
<item name="colorBackgroundSplash">@color/colorPrimary</item>
<item name="android:windowBackground">@drawable/splash_background</item>
app/src/main/res/values/themes_sy.xml
+17 -3
View File
@@ -4,7 +4,22 @@
<!--=============-->
<!-- Dark Themes -->
<!--=============-->
<style name="Theme.Tachiyomi.MidnightDusk" parent="Theme.Base.Dark">
<style name="Theme.Tachiyomi.Dark.Red" parent="Theme.Tachiyomi.Dark.Amoled">
<item name="actionBarTheme">@style/Theme.Toolbar.Red</item>
<item name="colorPrimary">@color/md_black_1000</item>
<item name="colorPrimaryVariant">@color/red</item>
<item name="colorSecondary">@color/dark_red</item>
<item name="colorOnSurface">@color/red</item>
<item name="colorAccent">@color/dark_red</item>
<item name="colorOnPrimary">@color/red</item>
<item name="android:textColor">@color/red</item>
<item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorSecondary">@color/dark_red</item>
<item name="android:textColorHint">@color/dark_red</item>
<item name="md_color_title">@color/red</item>
</style>
<style name="Theme.Tachiyomi.Dark.MidnightDusk" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/dialogDusk</item>
<item name="colorOnPrimary">@color/textColorPrimaryDusk</item>
<item name="colorAccentOnPrimary">@color/colorAccentDusk</item>
@@ -27,8 +42,7 @@
<item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
</style>
<style name="Theme.Tachiyomi.HotPink" parent="Theme.Base.Dark">
<style name="Theme.Tachiyomi.Dark.HotPink" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/dialogPink</item>
<item name="colorPrimaryDark">@color/dialogPink</item>
<item name="colorOnPrimary">@color/textColorPrimaryPink</item>