mirror of
https://github.com/mihonapp/mihon.git
synced 2025-11-06 00:58:55 +01:00
Adapt App Themes to M3 Color System (#6230)
* Adapt Default theme to M3 color system * Adapt Dynamic theme to M3 color system * Adapt Midnight Dusk theme to M3 color system * Adapt Strawberry Daiquiri theme to M3 color system * Adapt Yotsuba theme to M3 color system * Adapt Tako theme to M3 color system * Adapt Green Apple theme to M3 color system * Adapt Teal & Turquoise theme to M3 color system * Adapt Yin & Yang theme to M3 color system * Remove old theme colors * Yotsuba theme adjustments Co-authored-by: ztimms73 <vp1984tanki@gmail.com> * Green Apple theme adjustments Co-authored-by: Soitora <10836780+Soitora@users.noreply.github.com> * Tako theme adjustments * Midnight Dusk theme adjustments * Use colorSurfaceVariant for colorControlHighlight * Nits Co-authored-by: ztimms73 <vp1984tanki@gmail.com> Co-authored-by: Soitora <10836780+Soitora@users.noreply.github.com>
This commit is contained in:
Ivan Iskandar
GitHub
@@ -1,47 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<color name="splash">@color/background_default</color>
|
||||
<resources>
|
||||
<color name="splash">#202125</color>
|
||||
|
||||
<color name="error">#FFB4A9</color>
|
||||
<color name="errorContainer">#930006</color>
|
||||
<color name="onError">#680003</color>
|
||||
<color name="onErrorContainer">#FFDAD4</color>
|
||||
|
||||
<!-- Default Theme -->
|
||||
<color name="accent_default">#3399FF</color>
|
||||
<color name="divider_default">@color/md_white_1000_12</color>
|
||||
<color name="surface_default">#242529</color>
|
||||
<color name="background_default">#202125</color>
|
||||
<color name="ripple_colored_default">#1F3399FF</color>
|
||||
|
||||
<!-- Monet Theme -->
|
||||
<color name="accent_monet" tools:targetApi="31">@android:color/system_accent1_100</color>
|
||||
<color name="on_accent_monet" tools:targetApi="31">@android:color/system_accent1_900</color>
|
||||
<color name="divider_monet" tools:targetApi="31">@android:color/system_neutral1_700</color>
|
||||
<color name="tertiary_monet" tools:targetApi="31">@android:color/system_accent3_100</color>
|
||||
<color name="on_tertiary_monet" tools:targetApi="31">@android:color/system_accent3_900</color>
|
||||
<color name="surface_monet" tools:targetApi="31">@android:color/system_neutral1_900</color>
|
||||
<color name="on_surface_monet" tools:targetApi="31">@android:color/system_neutral1_50</color>
|
||||
|
||||
<!-- Green Apple Theme -->
|
||||
<color name="accent_greenapple">#48E484</color>
|
||||
<color name="color_on_primary_greenapple">@color/md_black_1000</color>
|
||||
<color name="ripple_colored_greenapple">#1F48E484</color>
|
||||
|
||||
<!-- Tako Theme -->
|
||||
<color name="accent_tako">#F3B375</color>
|
||||
<color name="color_on_primary_tako">#242431</color>
|
||||
<color name="tertiary_tako">@color/color_on_primary_tako</color>
|
||||
<color name="color_on_tertiary_tako">@color/accent_tako</color>
|
||||
<color name="ripple_colored_tako">#1FF3B375</color>
|
||||
<color name="surface_tako">#2A2A3C</color>
|
||||
<color name="background_tako">#21212E</color>
|
||||
<color name="filter_tako">@color/accent_tako</color>
|
||||
|
||||
<!-- Teal & Turquoise Theme -->
|
||||
<color name="accent_tealturquoise">#40E0D0</color>
|
||||
<color name="color_on_primary_tealturquoise">#000000</color>
|
||||
<color name="tertiary_tealturquoise">#BF1F2F</color>
|
||||
<color name="color_on_tertiary_tealturquoise">#FFFFFF</color>
|
||||
<color name="ripple_colored_tealturquoise">#1F40E0D0</color>
|
||||
|
||||
<!-- Yin & Yang Theme -->
|
||||
<color name="accent_yinyang">#FFFFFF</color>
|
||||
<color name="color_on_secondary_yinyang">#000000</color>
|
||||
<color name="ripple_colored_yinyang">#777777</color>
|
||||
</resources>
|
||||
|
||||
36
app/src/main/res/values-night/greenapple_colors.xml
Normal file
36
app/src/main/res/values-night/greenapple_colors.xml
Normal file
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Colors for Green Apple theme
|
||||
~ Original color scheme by CarlosEsco, Jays2Kings and CrepeTF
|
||||
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
|
||||
~
|
||||
~ Key colors:
|
||||
~ Primary #188140
|
||||
~ Secondary #188140
|
||||
~ Tertiary #D33131
|
||||
~ Neutral #5D5F5B
|
||||
-->
|
||||
<resources>
|
||||
<color name="greenapple_primary">#7ADB8F</color>
|
||||
<color name="greenapple_onPrimary">#003915</color>
|
||||
<color name="greenapple_primaryContainer">#005322</color>
|
||||
<color name="greenapple_onPrimaryContainer">#96F8A9</color>
|
||||
<color name="greenapple_secondary">#7ADB8F</color>
|
||||
<color name="greenapple_onSecondary">#003915</color>
|
||||
<color name="greenapple_secondaryContainer">#005322</color>
|
||||
<color name="greenapple_onSecondaryContainer">#96F8A9</color>
|
||||
<color name="greenapple_tertiary">#FFB3AA</color>
|
||||
<color name="greenapple_onTertiary">#680006</color>
|
||||
<color name="greenapple_tertiaryContainer">#93000D</color>
|
||||
<color name="greenapple_onTertiaryContainer">#FFDAD5</color>
|
||||
<color name="greenapple_background">#1A1C19</color>
|
||||
<color name="greenapple_onBackground">#E1E3DD</color>
|
||||
<color name="greenapple_surface">#1A1C19</color>
|
||||
<color name="greenapple_onSurface">#E1E3DD</color>
|
||||
<color name="greenapple_surfaceVariant">#414941</color>
|
||||
<color name="greenapple_onSurfaceVariant">#C1C8BE</color>
|
||||
<color name="greenapple_outline">#8B9389</color>
|
||||
<color name="greenapple_inverseOnSurface">#1A1C19</color>
|
||||
<color name="greenapple_inverseSurface">#E1E3DD</color>
|
||||
<color name="greenapple_primaryInverse">#006D2F</color>
|
||||
</resources>
|
||||
36
app/src/main/res/values-night/midnightdusk_colors.xml
Normal file
36
app/src/main/res/values-night/midnightdusk_colors.xml
Normal file
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Colors for Midnight Dusk theme
|
||||
~ Original color scheme by CrepeTF
|
||||
~ M3 color scheme generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
|
||||
~
|
||||
~ Key colors:
|
||||
~ Primary #F02475
|
||||
~ Secondary #F02475
|
||||
~ Tertiary #7A5733
|
||||
~ Neutral #16151D
|
||||
-->
|
||||
<resources>
|
||||
<color name="midnightdusk_primary">#FFB1C4</color>
|
||||
<color name="midnightdusk_onPrimary">#66002A</color>
|
||||
<color name="midnightdusk_primaryContainer">#8F003F</color>
|
||||
<color name="midnightdusk_onPrimaryContainer">#FFD9E1</color>
|
||||
<color name="midnightdusk_secondary">#FFB1C4</color>
|
||||
<color name="midnightdusk_onSecondary">#66002A</color>
|
||||
<color name="midnightdusk_secondaryContainer">#8F003F</color>
|
||||
<color name="midnightdusk_onSecondaryContainer">#FFD9E1</color>
|
||||
<color name="midnightdusk_tertiary">#EDBE91</color>
|
||||
<color name="midnightdusk_onTertiary">#462A09</color>
|
||||
<color name="midnightdusk_tertiaryContainer">#60401D</color>
|
||||
<color name="midnightdusk_onTertiaryContainer">#FFDCBA</color>
|
||||
<color name="midnightdusk_background">#16151D</color>
|
||||
<color name="midnightdusk_onBackground">#E5E1E5</color>
|
||||
<color name="midnightdusk_surface">#16151D</color>
|
||||
<color name="midnightdusk_onSurface">#E5E1E5</color>
|
||||
<color name="midnightdusk_surfaceVariant">#524346</color>
|
||||
<color name="midnightdusk_onSurfaceVariant">#D6C1C4</color>
|
||||
<color name="midnightdusk_outline">#9F8C8F</color>
|
||||
<color name="midnightdusk_inverseOnSurface">#1C1B1F</color>
|
||||
<color name="midnightdusk_inverseSurface">#E5E1E5</color>
|
||||
<color name="midnightdusk_primaryInverse">#BB0054</color>
|
||||
</resources>
|
||||
36
app/src/main/res/values-night/strawberry_colors.xml
Normal file
36
app/src/main/res/values-night/strawberry_colors.xml
Normal file
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Colors for Strawberry Daiquiri theme
|
||||
~ Original color scheme by Soitora
|
||||
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
|
||||
~
|
||||
~ Key colors:
|
||||
~ Primary #ED4A65
|
||||
~ Secondary #ED4A65
|
||||
~ Tertiary #775930
|
||||
~ Neutral #655C5C
|
||||
-->
|
||||
<resources>
|
||||
<color name="strawberry_primary">#FFB2B9</color>
|
||||
<color name="strawberry_onPrimary">#67001B</color>
|
||||
<color name="strawberry_primaryContainer">#91002A</color>
|
||||
<color name="strawberry_onPrimaryContainer">#FFDADD</color>
|
||||
<color name="strawberry_secondary">#FFB2B9</color>
|
||||
<color name="strawberry_onSecondary">#67001B</color>
|
||||
<color name="strawberry_secondaryContainer">#91002A</color>
|
||||
<color name="strawberry_onSecondaryContainer">#FFDADD</color>
|
||||
<color name="strawberry_tertiary">#E8C08E</color>
|
||||
<color name="strawberry_onTertiary">#432C06</color>
|
||||
<color name="strawberry_tertiaryContainer">#5D421B</color>
|
||||
<color name="strawberry_onTertiaryContainer">#FFDDB1</color>
|
||||
<color name="strawberry_background">#201A1A</color>
|
||||
<color name="strawberry_onBackground">#ECDFDF</color>
|
||||
<color name="strawberry_surface">#201A1A</color>
|
||||
<color name="strawberry_onSurface">#ECDFDF</color>
|
||||
<color name="strawberry_surfaceVariant">#534344</color>
|
||||
<color name="strawberry_onSurfaceVariant">#D7C1C2</color>
|
||||
<color name="strawberry_outline">#A08C8D</color>
|
||||
<color name="strawberry_inverseOnSurface">#201A1A</color>
|
||||
<color name="strawberry_inverseSurface">#ECDFDF</color>
|
||||
<color name="strawberry_primaryInverse">#B61E40</color>
|
||||
</resources>
|
||||
35
app/src/main/res/values-night/tachiyomi_colors.xml
Normal file
35
app/src/main/res/values-night/tachiyomi_colors.xml
Normal file
@@ -0,0 +1,35 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Colors for Default theme
|
||||
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
|
||||
~
|
||||
~ Key colors:
|
||||
~ Primary #2979FF
|
||||
~ Secondary #2979FF
|
||||
~ Tertiary #47A84A
|
||||
~ Neutral #5E5E62
|
||||
-->
|
||||
<resources>
|
||||
<color name="tachiyomi_primary">#AEC6FF</color>
|
||||
<color name="tachiyomi_onPrimary">#002C71</color>
|
||||
<color name="tachiyomi_primaryContainer">#00419E</color>
|
||||
<color name="tachiyomi_onPrimaryContainer">#D8E2FF</color>
|
||||
<color name="tachiyomi_secondary">#AEC6FF</color>
|
||||
<color name="tachiyomi_onSecondary">#002C71</color>
|
||||
<color name="tachiyomi_secondaryContainer">#00419E</color>
|
||||
<color name="tachiyomi_onSecondaryContainer">#D8E2FF</color>
|
||||
<color name="tachiyomi_tertiary">#7ADC77</color>
|
||||
<color name="tachiyomi_onTertiary">#003907</color>
|
||||
<color name="tachiyomi_tertiaryContainer">#00530D</color>
|
||||
<color name="tachiyomi_onTertiaryContainer">#95F990</color>
|
||||
<color name="tachiyomi_background">#1B1B1E</color>
|
||||
<color name="tachiyomi_onBackground">#E4E2E6</color>
|
||||
<color name="tachiyomi_surface">#1B1B1E</color>
|
||||
<color name="tachiyomi_onSurface">#E4E2E6</color>
|
||||
<color name="tachiyomi_surfaceVariant">#44464E</color>
|
||||
<color name="tachiyomi_onSurfaceVariant">#C5C6D0</color>
|
||||
<color name="tachiyomi_outline">#8E9099</color>
|
||||
<color name="tachiyomi_inverseOnSurface">#1B1B1E</color>
|
||||
<color name="tachiyomi_inverseSurface">#E4E2E6</color>
|
||||
<color name="tachiyomi_primaryInverse">#0057CE</color>
|
||||
</resources>
|
||||
36
app/src/main/res/values-night/tako_colors.xml
Normal file
36
app/src/main/res/values-night/tako_colors.xml
Normal file
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Colors for Tako theme
|
||||
~ Original color scheme by ghostbear
|
||||
~ M3 color scheme generated by yours truly
|
||||
~
|
||||
~ Key colors:
|
||||
~ Primary #F3B375
|
||||
~ Secondary #F3B375
|
||||
~ Tertiary #66577E
|
||||
~ Neutral #21212E
|
||||
-->
|
||||
<resources>
|
||||
<color name="tako_primary">#F3B375</color>
|
||||
<color name="tako_onPrimary">#38294E</color>
|
||||
<color name="tako_primaryContainer">#F3B375</color>
|
||||
<color name="tako_onPrimaryContainer">#38294E</color>
|
||||
<color name="tako_secondary">#F3B375</color>
|
||||
<color name="tako_onSecondary">#38294E</color>
|
||||
<color name="tako_secondaryContainer">#F3B375</color>
|
||||
<color name="tako_onSecondaryContainer">#38294E</color>
|
||||
<color name="tako_tertiary">#66577E</color>
|
||||
<color name="tako_onTertiary">#F3B375</color>
|
||||
<color name="tako_tertiaryContainer">#4E4065</color>
|
||||
<color name="tako_onTertiaryContainer">#EDDCFF</color>
|
||||
<color name="tako_background">#21212E</color>
|
||||
<color name="tako_onBackground">#E3E0F2</color>
|
||||
<color name="tako_surface">#21212E</color>
|
||||
<color name="tako_onSurface">#E3E0F2</color>
|
||||
<color name="tako_surfaceVariant">#49454E</color>
|
||||
<color name="tako_onSurfaceVariant">#CBC4CE</color>
|
||||
<color name="tako_outline">#958F99</color>
|
||||
<color name="tako_inverseOnSurface">#1B1B1E</color>
|
||||
<color name="tako_inverseSurface">#E5E1E6</color>
|
||||
<color name="tako_primaryInverse">#84531E</color>
|
||||
</resources>
|
||||
36
app/src/main/res/values-night/tealturqoise_colors.xml
Normal file
36
app/src/main/res/values-night/tealturqoise_colors.xml
Normal file
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Colors for Teal & Turquoise theme
|
||||
~ Original color scheme by Riztard
|
||||
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
|
||||
~
|
||||
~ Key colors:
|
||||
~ Primary #008080
|
||||
~ Secondary #008080
|
||||
~ Tertiary #FF7F7F
|
||||
~ Neutral #5B5F5F
|
||||
-->
|
||||
<resources>
|
||||
<color name="tealturquoise_primary">#4DDADA</color>
|
||||
<color name="tealturquoise_onPrimary">#003738</color>
|
||||
<color name="tealturquoise_primaryContainer">#004F50</color>
|
||||
<color name="tealturquoise_onPrimaryContainer">#6EF6F6</color>
|
||||
<color name="tealturquoise_secondary">#4DDADA</color>
|
||||
<color name="tealturquoise_onSecondary">#003738</color>
|
||||
<color name="tealturquoise_secondaryContainer">#004F50</color>
|
||||
<color name="tealturquoise_onSecondaryContainer">#6EF6F6</color>
|
||||
<color name="tealturquoise_tertiary">#FFB3B1</color>
|
||||
<color name="tealturquoise_onTertiary">#640914</color>
|
||||
<color name="tealturquoise_tertiaryContainer">#842328</color>
|
||||
<color name="tealturquoise_onTertiaryContainer">#FFDAD7</color>
|
||||
<color name="tealturquoise_background">#191C1C</color>
|
||||
<color name="tealturquoise_onBackground">#E0E3E2</color>
|
||||
<color name="tealturquoise_surface">#191C1C</color>
|
||||
<color name="tealturquoise_onSurface">#E0E3E2</color>
|
||||
<color name="tealturquoise_surfaceVariant">#3F4848</color>
|
||||
<color name="tealturquoise_onSurfaceVariant">#BEC9C8</color>
|
||||
<color name="tealturquoise_outline">#889392</color>
|
||||
<color name="tealturquoise_inverseOnSurface">#191C1C</color>
|
||||
<color name="tealturquoise_inverseSurface">#E0E3E2</color>
|
||||
<color name="tealturquoise_primaryInverse">#006A6A</color>
|
||||
</resources>
|
||||
@@ -1,16 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<!--== Midnight Dusk Theme ==-->
|
||||
<style name="Theme.Tachiyomi.MidnightDusk">
|
||||
<!-- Theme Colors -->
|
||||
<item name="colorPrimary">@color/accent_midnightdusk</item>
|
||||
<item name="colorTertiary">@color/md_blue_A400</item>
|
||||
<item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item>
|
||||
<item name="colorSurface">@color/surface_midnightdusk</item>
|
||||
<item name="android:colorBackground">@color/background_midnightdusk</item>
|
||||
</style>
|
||||
|
||||
<!--== AMOLED Mode Overlay ==-->
|
||||
<style name="ThemeOverlay.Tachiyomi.Amoled" parent="">
|
||||
<!-- Theme Colors -->
|
||||
|
||||
30
app/src/main/res/values-night/yinyang_colors.xml
Normal file
30
app/src/main/res/values-night/yinyang_colors.xml
Normal file
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Colors for Yin & Yang theme
|
||||
~ Original color scheme by Riztard
|
||||
~ M3 colors generated by yours truly
|
||||
-->
|
||||
<resources>
|
||||
<color name="yinyang_primary">#FFFFFF</color>
|
||||
<color name="yinyang_onPrimary">#5A5A5A</color>
|
||||
<color name="yinyang_primaryContainer">#717171</color>
|
||||
<color name="yinyang_onPrimaryContainer">#E4E4E4</color>
|
||||
<color name="yinyang_secondary">#FFFFFF</color>
|
||||
<color name="yinyang_onSecondary">#5A5A5A</color>
|
||||
<color name="yinyang_secondaryContainer">#717171</color>
|
||||
<color name="yinyang_onSecondaryContainer">#E4E4E4</color>
|
||||
<color name="yinyang_tertiary">#AEC6FF</color>
|
||||
<color name="yinyang_onTertiary">#002C71</color>
|
||||
<color name="yinyang_tertiaryContainer">#00419E</color>
|
||||
<color name="yinyang_onTertiaryContainer">#D8E2FF</color>
|
||||
<color name="yinyang_background">#1E1E1E</color>
|
||||
<color name="yinyang_onBackground">#E6E6E6</color>
|
||||
<color name="yinyang_surface">#1E1E1E</color>
|
||||
<color name="yinyang_onSurface">#E6E6E6</color>
|
||||
<color name="yinyang_surfaceVariant">#4E4E4E</color>
|
||||
<color name="yinyang_onSurfaceVariant">#D1D1D1</color>
|
||||
<color name="yinyang_outline">#999999</color>
|
||||
<color name="yinyang_inverseOnSurface">#1E1E1E</color>
|
||||
<color name="yinyang_inverseSurface">#E6E6E6</color>
|
||||
<color name="yinyang_primaryInverse">#CECECE</color>
|
||||
</resources>
|
||||
36
app/src/main/res/values-night/yotsuba_colors.xml
Normal file
36
app/src/main/res/values-night/yotsuba_colors.xml
Normal file
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Colors for Yotsuba theme
|
||||
~ Original color scheme by ztimms73
|
||||
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
|
||||
~
|
||||
~ Key colors:
|
||||
~ Primary #AE3200
|
||||
~ Secondary #AE3200
|
||||
~ Tertiary #6B5E2F
|
||||
~ Neutral #655C5A
|
||||
-->
|
||||
<resources>
|
||||
<color name="yotsuba_primary">#FFB59D</color>
|
||||
<color name="yotsuba_onPrimary">#5F1600</color>
|
||||
<color name="yotsuba_primaryContainer">#862200</color>
|
||||
<color name="yotsuba_onPrimaryContainer">#FFDBCF</color>
|
||||
<color name="yotsuba_secondary">#FFB59D</color>
|
||||
<color name="yotsuba_onSecondary">#5F1600</color>
|
||||
<color name="yotsuba_secondaryContainer">#862200</color>
|
||||
<color name="yotsuba_onSecondaryContainer">#FFDBCF</color>
|
||||
<color name="yotsuba_tertiary">#D7C68D</color>
|
||||
<color name="yotsuba_onTertiary">#3A2F05</color>
|
||||
<color name="yotsuba_tertiaryContainer">#524619</color>
|
||||
<color name="yotsuba_onTertiaryContainer">#F5E2A7</color>
|
||||
<color name="yotsuba_background">#211A18</color>
|
||||
<color name="yotsuba_onBackground">#EDE0DD</color>
|
||||
<color name="yotsuba_surface">#211A18</color>
|
||||
<color name="yotsuba_onSurface">#EDE0DD</color>
|
||||
<color name="yotsuba_surfaceVariant">#53433F</color>
|
||||
<color name="yotsuba_onSurfaceVariant">#D8C2BC</color>
|
||||
<color name="yotsuba_outline">#A08C87</color>
|
||||
<color name="yotsuba_inverseOnSurface">#211A18</color>
|
||||
<color name="yotsuba_inverseSurface">#EDE0DD</color>
|
||||
<color name="yotsuba_primaryInverse">#AE3200</color>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user