Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SY themes after custom ripple changes (#332)

Browse Source 
* Fix SY Themes and Ripples

* Slightly increase ripple brightness in AMOLED

* Override AMOLED highlight for the failure that is Hot Pink
This commit is contained in:
Soitora 2021-05-24 00:23:22 +02:00 committed by GitHub
parent 9adbb1b115
commit 38fef11287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/values/colors.xml
View File

@ -40,6 +40,7 @@
<color name="red">#FF0000</color> <color name="red">#FF0000</color>
<color name="dark_red">#880000</color> <color name="dark_red">#880000</color>
<color name="dark_red_6">#0F880000</color>
<!-- Midnight Dusk Theme --> <!-- Midnight Dusk Theme -->
<color name="colorAccentDusk">#F02475</color> <color name="colorAccentDusk">#F02475</color>
@ -47,7 +48,7 @@
<color name="textColorSecondaryDusk">@color/md_white_1000_70</color> <color name="textColorSecondaryDusk">@color/md_white_1000_70</color>
<color name="textColorHintDusk">@color/md_white_1000_50</color> <color name="textColorHintDusk">@color/md_white_1000_50</color>
<color name="dividerDusk">#12ffffff</color> <color name="dividerDusk">#12ffffff</color>
<color name="rippleColorDusk">@color/md_white_1000_20</color> <color name="rippleColorDusk">#0FF02475</color>
<color name="backgroundDusk">#16151D</color> <color name="backgroundDusk">#16151D</color>
<color name="dialogDusk">#201F27</color> <color name="dialogDusk">#201F27</color>
<color name="selectorColorDusk">#80F02475</color> <color name="selectorColorDusk">#80F02475</color>
@ -57,6 +58,7 @@
<color name="textColorPrimaryPink">@color/md_white_1000</color> <color name="textColorPrimaryPink">@color/md_white_1000</color>
<color name="textColorSecondaryPink">@color/md_white_1000_70</color> <color name="textColorSecondaryPink">@color/md_white_1000_70</color>
<color name="textColorHintPink">@color/md_white_1000_50</color> <color name="textColorHintPink">@color/md_white_1000_50</color>
<color name="rippleColorPink">#0FFF3399</color>
<color name="backgroundPink">@color/md_black_1000</color> <color name="backgroundPink">@color/md_black_1000</color>
<color name="dialogPink">@color/md_black_1000</color> <color name="dialogPink">@color/md_black_1000</color>
<color name="selectorColorPink">#80FF69B4</color> <color name="selectorColorPink">#80FF69B4</color>
@ -82,6 +84,7 @@
<color name="md_white_1000_50">#80FFFFFF</color> <color name="md_white_1000_50">#80FFFFFF</color>
<color name="md_white_1000_20">#33FFFFFF</color> <color name="md_white_1000_20">#33FFFFFF</color>
<color name="md_white_1000_12">#1FFFFFFF</color> <color name="md_white_1000_12">#1FFFFFFF</color>
<color name="md_white_1000_8">#14FFFFFF</color>
<color name="md_white_1000_6">#0FFFFFFF</color> <color name="md_white_1000_6">#0FFFFFFF</color>
<!-- Material Design Colors --> <!-- Material Design Colors -->

2
app/src/main/res/values/themes.xml
View File

@ -213,6 +213,8 @@
<item name="colorPrimary">@color/colorAmoledPrimary</item> <item name="colorPrimary">@color/colorAmoledPrimary</item>
<item name="colorPrimaryVariant">@color/colorAmoledPrimary</item> <item name="colorPrimaryVariant">@color/colorAmoledPrimary</item>
<item name="colorSurface">@color/colorAmoledPrimary</item> <item name="colorSurface">@color/colorAmoledPrimary</item>
<item name="rippleColor">@color/md_white_1000_8</item>
<item name="rippleToolbarColor">@color/md_white_1000_8</item>
<item name="background">@color/colorAmoledPrimary</item> <item name="background">@color/colorAmoledPrimary</item>
<item name="android:colorBackground">@color/colorAmoledPrimary</item> <item name="android:colorBackground">@color/colorAmoledPrimary</item>

7
app/src/main/res/values/themes_sy.xml
View File

@ -10,6 +10,8 @@
<item name="colorPrimaryVariant">@color/colorPrimary</item> <item name="colorPrimaryVariant">@color/colorPrimary</item>
<item name="background">@color/colorPrimary</item> <item name="background">@color/colorPrimary</item>
<item name="colorSurface">@color/dialogDark</item> <item name="colorSurface">@color/dialogDark</item>
<item name="rippleSecondaryColor">@color/md_black_1000_6</item>
<item name="rippleToolbarColor">@color/md_black_1000_12</item>
</style> </style>
<style name="Theme.Tachiyomi.Dark.Red" parent="Theme.Tachiyomi.Dark.Amoled"> <style name="Theme.Tachiyomi.Dark.Red" parent="Theme.Tachiyomi.Dark.Amoled">
@ -20,6 +22,7 @@
<item name="colorOnSurface">@color/red</item> <item name="colorOnSurface">@color/red</item>
<item name="colorAccent">@color/dark_red</item> <item name="colorAccent">@color/dark_red</item>
<item name="colorOnPrimary">@color/red</item> <item name="colorOnPrimary">@color/red</item>
<item name="rippleSecondaryColor">@color/dark_red_6</item>
<item name="android:textColor">@color/red</item> <item name="android:textColor">@color/red</item>
<item name="android:textColorPrimary">@color/red</item> <item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorSecondary">@color/dark_red</item> <item name="android:textColorSecondary">@color/dark_red</item>
@ -38,6 +41,7 @@
<item name="colorOnSurface">@color/textColorPrimaryDusk</item> <item name="colorOnSurface">@color/textColorPrimaryDusk</item>
<item name="colorOnBackground">@color/textColorPrimaryDusk</item> <item name="colorOnBackground">@color/textColorPrimaryDusk</item>
<item name="colorAccent">@color/colorAccentDusk</item> <item name="colorAccent">@color/colorAccentDusk</item>
<item name="rippleSecondaryColor">@color/rippleColorDusk</item>
<item name="background">@color/backgroundDusk</item> <item name="background">@color/backgroundDusk</item>
<item name="android:colorBackground">@color/backgroundDusk</item> <item name="android:colorBackground">@color/backgroundDusk</item>
@ -59,6 +63,9 @@
<item name="colorOnSurface">@color/textColorPrimaryPink</item> <item name="colorOnSurface">@color/textColorPrimaryPink</item>
<item name="colorOnBackground">@color/textColorPrimaryPink</item> <item name="colorOnBackground">@color/textColorPrimaryPink</item>
<item name="colorAccent">@color/colorAccentPink</item> <item name="colorAccent">@color/colorAccentPink</item>
<item name="rippleColor">@color/md_white_1000_8</item>
<item name="rippleSecondaryColor">@color/rippleColorPink</item>
<item name="rippleToolbarColor">@color/md_white_1000_8</item>
<item name="background">@color/backgroundPink</item> <item name="background">@color/backgroundPink</item>
<item name="android:colorBackground">@color/backgroundPink</item> <item name="android:colorBackground">@color/backgroundPink</item>