null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hard coding ripple colors for themes

Browse source 
Fixes Android 9 crash
This commit is contained in:
Jays2Kings 2021-10-15 19:22:40 -04:00
parent 829d636c7d
commit 4361e76b18
8 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/values-night-v31/themes.xml
View file

@ -9,6 +9,7 @@
<item name="colorOnTertiary">@color/md_white_1000</item>
<item name="colorPrimaryVariant">@android:color/system_neutral2_800</item>
<item name="colorSurface">@android:color/system_neutral1_900</item>
<item name="colorControlHighlight">@color/secondary_highlight</item>
<item name="background">@android:color/system_neutral1_900</item>
<item name="colorOnBackground">@android:color/system_neutral1_10</item>
<item name="actionBarTintColor">@android:color/system_accent2_10</item>

9
app/src/main/res/values-night/colors.xml
View file

@ -9,6 +9,7 @@
<color name="colorOnSurface">@color/md_white_1000</color>
<color name="colorOnBackground">@color/md_white_1000</color>
<color name="rippleColorTachiyomi">#1F3399FF</color>
<color name="secondaryTachiyomi">#3399FF</color>
<color name="secondaryVariantTachiyomi">#cce5ff</color>
<color name="splashBackground">#212121</color>
@ -31,8 +32,11 @@
<!-- Chocolate Strawberries Theme -->
<color name="primaryStrawberry">#e14e4e</color>
<color name="primaryInverseStrawberry">#9f1414</color>
<color name="secondaryStrawberry">@color/holo_red</color>
<color name="rippleColorStrawberry">#1FAA2200</color>
<color name="secondaryVariantStrawberry">#f9bab2</color>
<color name="primaryVariantStrawberry">#2B2320</color>
<color name="backgroundStrawberries">#1a1716</color>
<!-- Tako Theme -->
<color name="primaryTako">#fccd9f</color>
@ -42,7 +46,7 @@
<color name="onSecondaryTako">#242431</color>
<color name="secondaryVariantTako">#f4d1af</color>
<color name="tabBarIconColorTako">@color/secondaryTako</color>
<color name="rippleColoredTako">#1FF3B375</color>
<color name="rippleColorTako">#1FF3B375</color>
<color name="surfaceTako">#2A2A3C</color>
<color name="backgroundTako">#21212E</color>
<color name="actionTintTako">#f4ece5</color>
@ -50,6 +54,7 @@
<!-- Midnight Dusk Theme -->
<color name="secondaryDuskDawn">#F02475</color>
<color name="rippleColorDuskDawn">#1FF02475</color>
<color name="primaryInverseDuskDawn">#8d0c3f</color>
<color name="secondaryVariantDuskDawn">#ffc1da</color>
<color name="backgroundDuskDawn">#16151D</color>
@ -60,6 +65,7 @@
<!-- Teal/Sapphire Theme -->
<color name="secondaryTealSapphire">#589ab8</color>
<color name="rippleColorTealSapphire">#1F589ab8</color>
<color name="secondaryVariantTealSapphire">#b5ebff</color>
<color name="primaryTealSapphire">#80b8d1</color>
<color name="primaryInverseTealSapphire">#1d698b</color>
@ -73,6 +79,7 @@
<color name="primaryYinYang">#dcdcdc</color>
<color name="primaryInverseYinYang">#000000</color>
<color name="secondaryYinYang">#FFFFFF</color>
<color name="rippleColorYinYang">#1FFFFFFF</color>
<color name="secondaryVariantYinYang">#FFFFFF</color>
<color name="onSecondaryYinYang">@color/md_black_1000</color>
<color name="primaryVariantYinYang">#2C2C2C</color>

11
app/src/main/res/values-night/themes.xml
View file

@ -1,19 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.Tachiyomi.Strawberries">
<item name="colorPrimary">@color/primaryStrawberry</item>
<item name="colorPrimaryInverse">@color/primaryInverseStrawberry</item>
<item name="colorSecondary">@color/holo_red</item>
<item name="colorSecondaryVariant">@color/secondaryVariantStrawberry</item>
<item name="colorPrimaryVariant">@color/primaryVariantStrawberry</item>
<item name="background">@color/backgroundChocolateStrawberries</item>
<item name="colorSurface">@color/backgroundChocolateStrawberries</item>
</style>
<style name="Theme.Tachiyomi.FlatLime">
<item name="colorPrimary">@color/primaryLime</item>
<item name="colorPrimaryInverse">@color/primaryInverseLime</item>
<item name="colorSecondary">@color/secondaryLime</item>
<item name="colorControlHighlight">@color/rippleColorLime</item>
<item name="colorSecondaryVariant">@color/secondaryVariantLime</item>
<item name="colorPrimaryVariant">@color/dialogLime</item>
<item name="colorSurface">@color/backgroundLime</item>

6
app/src/main/res/values-v28/themes.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.Tachiyomi" parent="Theme.Base">
<item name="colorControlHighlight">@color/secondary_highlight</item>
</style>
</resources>

1
app/src/main/res/values-v31/themes.xml
View file

@ -4,6 +4,7 @@
<item name="colorPrimary">@android:color/system_accent1_500</item>
<item name="colorPrimaryInverse">@android:color/system_accent1_200</item>
<item name="colorSecondary">@android:color/system_accent1_600</item>
<item name="colorControlHighlight">@color/secondary_highlight</item>
<item name="colorTertiary">@android:color/system_accent3_300</item>
<item name="colorOnTertiary">@color/black</item>
<item name="colorSecondaryVariant">@android:color/system_accent2_900</item>

13
app/src/main/res/values/colors.xml
View file

@ -8,6 +8,7 @@
<color name="legacyBlue">#54759E</color>
<color name="splashBackground">@color/primaryTachiyomi</color>
<color name="secondaryTachiyomi">@color/md_blue_A400</color>
<color name="rippleColorTachiyomi">#1F2979FF</color>
<color name="secondaryVariantTachiyomi">#0d2f68</color>
<color name="actionModeShadow">@color/md_black_1000_38</color>
<color name="gray_button">#404040</color>
@ -77,6 +78,7 @@
<color name="primaryDuskDawn">#a149bf</color>
<color name="primaryInverseDuskDawn">#cd95e0</color>
<color name="secondaryDuskDawn">#c43c97</color>
<color name="rippleColorDuskDawn">#1Fc43c97</color>
<color name="secondaryVariantDuskDawn">#4c163a</color>
<color name="backgroundDuskDawn">#f7f4f8</color>
<color name="primaryVariantDuskDawn">#efe3f3</color>
@ -85,6 +87,7 @@
<!-- Teal/Sapphire Theme -->
<color name="secondaryTealSapphire">#05B1A4</color>
<color name="rippleColorTealSapphire">#1F05B1A4</color>
<color name="secondaryVariantTealSapphire">#12524b</color>
<color name="primaryTealSapphire">#5f9c96</color>
<color name="primaryInverseTealSapphire">#a1e1db</color>
@ -98,10 +101,10 @@
<color name="primaryLime">#7CF7A5</color>
<color name="primaryInverseLime">#09933c</color>
<color name="secondaryLime">#4AF88A</color>
<color name="rippleColorLime">#1F4AF88A</color>
<color name="textColorPrimaryLime">@color/md_white_1000</color>
<color name="textColorSecondaryLime">@color/md_white_1000_76</color>
<color name="textColorHintLime">@color/md_white_1000_50</color>
<color name="rippleColorLime">@color/md_white_1000_20</color>
<color name="backgroundLime">#202125</color>
<color name="secondaryVariantLime">#cbffe0</color>
<color name="dialogLime">#282A2E</color>
@ -112,9 +115,9 @@
<color name="primaryVariantStrawberry">#F3E7E7</color>
<color name="primaryInverseStrawberry">#ef8e9e</color>
<color name="secondaryStrawberry">#ED4A65</color>
<color name="rippleColorStrawberry">#1FED4A65</color>
<color name="secondaryVariantStrawberry">#68101f</color>
<color name="backgroundChocolateStrawberries">#1a1716</color>
<color name="backgroundStrawberries">@color/background</color>
<!-- Tako Theme -->
<color name="primaryTako">#463561</color>
@ -124,7 +127,7 @@
<color name="onSecondaryTako">#F3B375</color>
<color name="secondaryVariantTako">#3f2b49</color>
<color name="tabBarIconColorTako">#574360</color>
<color name="rippleColoredTako">#1F66577E</color>
<color name="rippleColorTako">#1F66577E</color>
<color name="surfaceTako">#F7F5FF</color>
<color name="backgroundTako">#F2EDF7</color>
<color name="actionTintTako">#221b28</color>
@ -135,6 +138,7 @@
<color name="primaryVariantYotsuba">#F6EBE7</color>
<color name="primaryInverseYotsuba">#efaa8d</color>
<color name="secondaryYotsuba">#dc6d3d</color>
<color name="rippleColorYotsuba">#1Fdc6d3d</color>
<color name="secondaryVariantYotsuba">#4e1e0a</color>
<!-- Yin Yang Theme -->
@ -142,6 +146,7 @@
<color name="primaryYinYang">#333333</color>
<color name="primaryInverseYinYang">#FFFFFF</color>
<color name="secondaryYinYang">#000000</color>
<color name="rippleColorYinYang">#1F000000</color>
<color name="secondaryVariantYinYang">#000000</color>
<color name="onSecondaryYinYang">@color/md_white_1000</color>
</resources>

2
app/src/main/res/values/styles.xml
View file

@ -12,7 +12,7 @@
</style>
<style name="Theme.ActionBar.DayNight" parent="ThemeOverlay.Material3.ActionBar">
<item name="colorControlHighlight">@color/secondary_highlight</item>
<item name="colorControlHighlight">?colorControlHighlight</item>
<item name="elevationOverlayEnabled">true</item>
<item name="elevationOverlayColor">?colorSecondary</item>
</style>

12
app/src/main/res/values/themes.xml
View file

@ -35,9 +35,9 @@
<item name="android:divider">@color/divider</item>
<item name="android:listDivider">@drawable/line_divider</item>
<item name="actionModeBackground">?colorPrimaryVariant</item>
<item name="colorControlHighlight">@color/legacyRippleColor</item>
<item name="colorControlHighlight">@color/rippleColorTachiyomi</item>
<item name="android:colorBackground">?background</item>
<item name="android:colorControlHighlight">@color/secondary_highlight</item>
<item name="android:colorControlHighlight">?colorControlHighlight</item>
<item name="android:textColorSecondary">@color/text_color_secondary</item>
<item name="android:textColorHint">@color/text_color_hint</item>
<item name="textAppearanceButton">@style/TextAppearance.Tachiyomi.Button</item>
@ -118,6 +118,7 @@
<item name="colorPrimaryInverse">@color/primaryInverseDuskDawn</item>
<item name="colorPrimaryVariant">@color/primaryVariantDuskDawn</item>
<item name="colorSecondary">@color/secondaryDuskDawn</item>
<item name="colorControlHighlight">@color/rippleColorDuskDawn</item>
<item name="colorSecondaryVariant">@color/secondaryVariantDuskDawn</item>
<item name="colorSurface">@color/backgroundDuskDawn</item>
<item name="background">@color/backgroundDuskDawn</item>
@ -130,6 +131,7 @@
<item name="colorPrimaryInverse">@color/primaryInverseTealSapphire</item>
<item name="colorPrimaryVariant">@color/primaryVariantTealSapphire</item>
<item name="colorSecondary">@color/secondaryTealSapphire</item>
<item name="colorControlHighlight">@color/rippleColorTealSapphire</item>
<item name="tabBarIconColor">@color/tabBarIconColorTealSapphire</item>
<item name="colorSecondaryVariant">@color/secondaryVariantTealSapphire</item>
<item name="colorOnSecondary">@color/colorOnDownloadBadgeDayNight</item>
@ -146,7 +148,9 @@
<item name="colorPrimaryVariant">@color/primaryVariantStrawberry</item>
<item name="colorPrimaryInverse">@color/primaryInverseStrawberry</item>
<item name="colorSecondary">@color/secondaryStrawberry</item>
<item name="colorControlHighlight">@color/rippleColorStrawberry</item>
<item name="colorSecondaryVariant">@color/secondaryVariantStrawberry</item>
<item name="background">@color/backgroundStrawberries</item>
</style>
<!--== Tako Theme ==-->
@ -160,7 +164,7 @@
<item name="colorTertiary">@color/downloadBadgeDayNight</item>
<item name="colorOnTertiary">@color/colorOnDownloadBadgeDayNight</item>
<item name="tabBarIconColor">@color/tabBarIconColorTako</item>
<item name="colorControlHighlight">@color/rippleColoredTako</item>
<item name="colorControlHighlight">@color/rippleColorTako</item>
<item name="colorSurface">@color/backgroundTako</item>
<item name="actionBarTintColor">@color/actionTintTako</item>
<item name="background">@color/backgroundTako</item>
@ -172,6 +176,7 @@
<item name="colorPrimaryVariant">@color/primaryVariantYotsuba</item>
<item name="colorPrimaryInverse">@color/primaryInverseYotsuba</item>
<item name="colorSecondary">@color/secondaryYotsuba</item>
<item name="colorControlHighlight">@color/rippleColorYotsuba</item>
<item name="colorSecondaryVariant">@color/secondaryVariantYotsuba</item>
</style>
@ -182,6 +187,7 @@
<item name="colorPrimaryVariant">@color/primaryVariantYinYang</item>
<item name="colorPrimaryInverse">@color/primaryInverseYinYang</item>
<item name="colorSecondary">@color/secondaryYinYang</item>
<item name="colorControlHighlight">@color/rippleColorYinYang</item>
<item name="colorOnSecondary">@color/onSecondaryYinYang</item>
<item name="colorSecondaryVariant">@color/secondaryVariantYinYang</item>
<item name="colorTertiary">@color/downloadBadgeDayNight</item>