Sync compose theme with MDC theme

mihonapp · Aug 13, 2024 · 9a34ace · 9a34ace
1 parent 124a787
commit 9a34ace
Show file tree

Hide file tree

Showing 27 changed files with 537 additions and 283 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,7 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Key "extension-XXX-YYY" was already used` crash (@AntsyLich)
 - Navigation layout tap zones shifting after zooming out in webtoon readers (@FooIbar)
 - Some extension not loading due to missing classes (@AwkwardPeak7)
-- Theme colors in accordance to upstream changes (@CrepeTF)
+- Theme colors in accordance to upstream changes (@CrepeTF, @AntsyLich)
 - Crash when requesting folder access on non-conforming devices (@mainrs)
 - Bugged color for Date/Scanlator in chapter list for read chapters (@ivaniskandar)
 - Categories having same `order` after restoring backup (@Cologler)

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -4,8 +4,13 @@
     <!--== AMOLED Mode Overlay ==-->
     <style name="ThemeOverlay.Tachiyomi.Amoled" parent="">
         <!-- Theme Colors -->
-        <item name="colorSurface">@color/surface_amoled</item>
-        <item name="android:colorBackground">@color/background_amoled</item>
+        <item name="android:colorBackground">@color/amoled_background</item>
+        <item name="colorOnBackground">@color/amoled_onBackground</item>
+        <item name="colorSurface">@color/amoled_surface</item>
+        <item name="colorOnSurface">@color/amoled_onSurface</item>
+        <item name="colorSurfaceContainer">@color/amoled_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/amoled_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/amoled_surfaceContainerHighest</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
diff --git a/presentation-core/src/main/res/values-night/colors.xml b/presentation-core/src/main/res/values-night/colors.xml
@@ -2,11 +2,6 @@
 <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="divider_default">@color/md_white_1000_12</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_greenapple.xml b/presentation-core/src/main/res/values-night/colors_greenapple.xml
@@ -12,25 +12,38 @@
 -->
 <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_onPrimary">#003917</color>
+    <color name="greenapple_primaryContainer">#017737</color>
+    <color name="greenapple_onPrimaryContainer">#FFFFFF</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>
+    <color name="greenapple_onSecondary">#003917</color>
+    <color name="greenapple_secondaryContainer">#017737</color>
+    <color name="greenapple_onSecondaryContainer">#FFFFFF</color>
+    <color name="greenapple_tertiary">#FFB3AC</color>
+    <color name="greenapple_onTertiary">#680008</color>
+    <color name="greenapple_tertiaryContainer">#C7282A</color>
+    <color name="greenapple_onTertiaryContainer">#FFFFFF</color>
+    <color name="greenapple_error">#FFB4AB</color>
+    <color name="greenapple_onError">#690005</color>
+    <color name="greenapple_errorContainer">#93000A</color>
+    <color name="greenapple_onErrorContainer">#FFDAD6</color>
+    <color name="greenapple_background">#0F1510</color>
+    <color name="greenapple_onBackground">#DFE4DB</color>
+    <color name="greenapple_surface">#0F1510</color>
+    <color name="greenapple_onSurface">#DFE4DB</color>
+    <color name="greenapple_surfaceVariant">#3F493F</color>
+    <color name="greenapple_onSurfaceVariant">#BECABC</color>
+    <color name="greenapple_outline">#889487</color>
+    <color name="greenapple_outlineVariant">#3F493F</color>
+    <color name="greenapple_scrim">#000000</color>
+    <color name="greenapple_inverseSurface">#DFE4DB</color>
+    <color name="greenapple_inverseOnSurface">#2C322C</color>
+    <color name="greenapple_inversePrimary">#006D32</color>
+    <color name="greenapple_surfaceDim">#0F1510</color>
+    <color name="greenapple_surfaceBright">#353B35</color>
+    <color name="greenapple_surfaceContainerLowest">#0A0F0B</color>
+    <color name="greenapple_surfaceContainerLow">#181D18</color>
+    <color name="greenapple_surfaceContainer">#1C211C</color>
+    <color name="greenapple_surfaceContainerHigh">#262B26</color>
+    <color name="greenapple_surfaceContainerHighest">#313630</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_lavender.xml b/presentation-core/src/main/res/values-night/colors_lavender.xml
@@ -12,26 +12,38 @@
 -->
 <resources>
     <color name="lavender_primary">#A177FF</color>
-    <color name="lavender_onPrimary">#111129</color>
+    <color name="lavender_onPrimary">#3D0090</color>
     <color name="lavender_primaryContainer">#A177FF</color>
-    <color name="lavender_onPrimaryContainer">#111129</color>
+    <color name="lavender_onPrimaryContainer">#FFFFFF</color>
     <color name="lavender_secondary">#A177FF</color>
-    <color name="lavender_onSecondary">#111129</color>
+    <color name="lavender_onSecondary">#FFFFFF</color>
     <color name="lavender_secondaryContainer">#423271</color>
-    <color name="lavender_onSecondaryContainer">#111129</color>
-    <color name="lavender_tertiary">#5E25E1</color>
-    <color name="lavender_onTertiary">#E8E8E8</color>
-    <color name="lavender_tertiaryContainer">#111129</color>
-    <color name="lavender_onTertiaryContainer">#DEE8FF</color>
+    <color name="lavender_onSecondaryContainer">#A177FF</color>
+    <color name="lavender_tertiary">#CDBDFF</color>
+    <color name="lavender_onTertiary">#360096</color>
+    <color name="lavender_tertiaryContainer">#5512D8</color>
+    <color name="lavender_onTertiaryContainer">#EFE6FF</color>
+    <color name="lavender_error">#FFB4AB</color>
+    <color name="lavender_onError">#690005</color>
+    <color name="lavender_errorContainer">#93000A</color>
+    <color name="lavender_onErrorContainer">#FFDAD6</color>
     <color name="lavender_background">#111129</color>
-    <color name="lavender_onBackground">#DEE8FF</color>
+    <color name="lavender_onBackground">#E7E0EC</color>
     <color name="lavender_surface">#111129</color>
-    <color name="lavender_onSurface">#DEE8FF</color>
-    <color name="lavender_surfaceVariant">#2CB6B6B6</color>
-    <color name="lavender_onSurfaceVariant">#E8E8E8</color>
-    <color name="lavender_outline">#A8905FFF</color>
-    <color name="lavender_inverseOnSurface">#DEE8FF</color>
-    <color name="lavender_inverseSurface">#221247</color>
-    <color name="lavender_primaryInverse">#A177FF</color>
-    <color name="lavender_elevationOverlay">@color/lavender_primary</color>
+    <color name="lavender_onSurface">#E7E0EC</color>
+    <color name="lavender_surfaceVariant">#3D2F6B</color>
+    <color name="lavender_onSurfaceVariant">#CBC3D6</color>
+    <color name="lavender_outline">#958E9F</color>
+    <color name="lavender_outlineVariant">#4A4453</color>
+    <color name="lavender_scrim">#000000</color>
+    <color name="lavender_inverseSurface">#E7E0EC</color>
+    <color name="lavender_inverseOnSurface">#322F38</color>
+    <color name="lavender_inversePrimary">#6D41C8</color>
+    <color name="lavender_surfaceDim">#111129</color>
+    <color name="lavender_surfaceBright">#3B3841</color>
+    <color name="lavender_surfaceContainerLowest">#15132d</color>
+    <color name="lavender_surfaceContainerLow">#171531</color>
+    <color name="lavender_surfaceContainer">#1D193B</color>
+    <color name="lavender_surfaceContainerHigh">#241f41</color>
+    <color name="lavender_surfaceContainerHighest">#282446</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_midnightdusk.xml b/presentation-core/src/main/res/values-night/colors_midnightdusk.xml
@@ -15,23 +15,28 @@
     <color name="midnightdusk_onPrimary">#FFFFFF</color>
     <color name="midnightdusk_primaryContainer">#BD1C5C</color>
     <color name="midnightdusk_onPrimaryContainer">#FFFFFF</color>
+    <color name="midnightdusk_inversePrimary">#F02475</color>
     <color name="midnightdusk_secondary">#F02475</color>
-    <color name="midnightdusk_onSecondary">#FFFFFF</color>
+    <color name="midnightdusk_onSecondary">#16151D</color>
     <color name="midnightdusk_secondaryContainer">#66183C</color>
-    <color name="midnightdusk_onSecondaryContainer">#FFFFFF</color>
+    <color name="midnightdusk_onSecondaryContainer">#F02475</color>
     <color name="midnightdusk_tertiary">#55971C</color>
-    <color name="midnightdusk_onTertiary">#FFFFFF</color>
+    <color name="midnightdusk_onTertiary">#16151D</color>
     <color name="midnightdusk_tertiaryContainer">#386412</color>
     <color name="midnightdusk_onTertiaryContainer">#E5E1E5</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_surfaceVariant">#281624</color>
     <color name="midnightdusk_onSurfaceVariant">#D6C1C4</color>
-    <color name="midnightdusk_outline">#9F8C8F</color>
+    <color name="midnightdusk_surfaceTint">#F02475</color>
     <color name="midnightdusk_inverseSurface">#333043</color>
     <color name="midnightdusk_inverseOnSurface">#FFFFFF</color>
-    <color name="midnightdusk_primaryInverse">#F02475</color>
-    <color name="midnightdusk_elevationOverlay">#2C0013</color>
+    <color name="midnightdusk_outline">#9F8C8F</color>
+    <color name="midnightdusk_surfaceContainerLowest">#221320</color>
+    <color name="midnightdusk_surfaceContainerLow">#251522</color>
+    <color name="midnightdusk_surfaceContainer">#281624</color>
+    <color name="midnightdusk_surfaceContainerHigh">#2D1C2A</color>
+    <color name="midnightdusk_surfaceContainerHighest">#2F1F2C</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_nord.xml b/presentation-core/src/main/res/values-night/colors_nord.xml
@@ -5,26 +5,32 @@
     <color name="nord_onPrimary">#2E3440</color>
     <color name="nord_primaryContainer">#88C0D0</color>
     <color name="nord_onPrimaryContainer">#2E3440</color>
+    <color name="nord_inversePrimary">#397E91</color>
     <color name="nord_secondary">#81A1C1</color>
     <color name="nord_onSecondary">#2E3440</color>
     <color name="nord_secondaryContainer">#506275</color>
-    <color name="nord_onSecondaryContainer">#2E3440</color>
+    <color name="nord_onSecondaryContainer">#88C0D0</color>
     <color name="nord_tertiary">#5E81AC</color>
     <color name="nord_onTertiary">#000000</color>
     <color name="nord_tertiaryContainer">#5E81AC</color>
     <color name="nord_onTertiaryContainer">#000000</color>
     <color name="nord_background">#2E3440</color>
     <color name="nord_onBackground">#ECEFF4</color>
-    <color name="nord_surface">#3B4252</color>
+    <color name="nord_surface">#2E3440</color>
     <color name="nord_onSurface">#ECEFF4</color>
-    <color name="nord_surfaceVariant">#2E3440</color>
+    <color name="nord_surfaceVariant">#414C5C</color>
     <color name="nord_onSurfaceVariant">#ECEFF4</color>
-    <color name="nord_outline">#D8DEE9</color>
-    <color name="nord_inverseOnSurface">#2E3440</color>
+    <color name="nord_surfaceTint">#88C0D0</color>
     <color name="nord_inverseSurface">#D8DEE9</color>
-    <color name="nord_primaryInverse">#397E91</color>
-    <color name="nord_elevationOverlay">#434C5E</color>
+    <color name="nord_inverseOnSurface">#2E3440</color>
+    <color name="nord_outline">#6d717b</color>
+    <color name="nord_outlineVariant">#90939a</color>
     <color name="nord_onError">#2E3440</color>
     <color name="nord_errorContainer">#BF616A</color>
     <color name="nord_onErrorContainer">#000000</color>
+    <color name="nord_surfaceContainerLowest">#373F4D</color>
+    <color name="nord_surfaceContainerLow">#3E4756</color>
+    <color name="nord_surfaceContainer">#414C5C</color>
+    <color name="nord_surfaceContainerHigh">#4E5766</color>
+    <color name="nord_surfaceContainerHighest">#505968</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_strawberry.xml b/presentation-core/src/main/res/values-night/colors_strawberry.xml
@@ -11,26 +11,39 @@
   ~ 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_primary">#FFB2B8</color>
+    <color name="strawberry_onPrimary">#67001D</color>
+    <color name="strawberry_primaryContainer">#D53855</color>
+    <color name="strawberry_onPrimaryContainer">#FFFFFF</color>
+    <color name="strawberry_secondary">#ED4A65</color>
+    <color name="strawberry_onSecondary">#201A1A</color>
     <color name="strawberry_secondaryContainer">#91002A</color>
-    <color name="strawberry_onSecondaryContainer">#FFDADD</color>
+    <color name="strawberry_onSecondaryContainer">#FFFFFF</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_onTertiary">#201A1A</color>
+    <color name="strawberry_tertiaryContainer">#775930</color>
+    <color name="strawberry_onTertiaryContainer">#FFF7F1</color>
+    <color name="strawberry_error">#FFB4AB</color>
+    <color name="strawberry_onError">#690005</color>
+    <color name="strawberry_errorContainer">#93000A</color>
+    <color name="strawberry_onErrorContainer">#FFDAD6</color>
     <color name="strawberry_background">#201A1A</color>
-    <color name="strawberry_onBackground">#ECDFDF</color>
+    <color name="strawberry_onBackground">#F7DCDD</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>
+    <color name="strawberry_onSurface">#F7DCDD</color>
+    <color name="strawberry_surfaceVariant">#322727</color>
+    <color name="strawberry_onSurfaceVariant">#E1BEC0</color>
+    <color name="strawberry_outline">#A9898B</color>
+    <color name="strawberry_outlineVariant">#594042</color>
+    <color name="strawberry_scrim">#000000</color>
+    <color name="strawberry_inverseSurface">#F7DCDD</color>
+    <color name="strawberry_inverseOnSurface">#3D2C2D</color>
+    <color name="strawberry_inversePrimary">#B61F40</color>
+    <color name="strawberry_surfaceDim">#1D1011</color>
+    <color name="strawberry_surfaceBright">#463536</color>
+    <color name="strawberry_surfaceContainerLowest">#2C2222</color>
+    <color name="strawberry_surfaceContainerLow">#302525</color>
+    <color name="strawberry_surfaceContainer">#322727</color>
+    <color name="strawberry_surfaceContainerHigh">#3C2F2F</color>
+    <color name="strawberry_surfaceContainerHighest">#463737</color>
 </resources>
diff --git a/presentation-core/src/main/res/values-night/colors_tachiyomi.xml b/presentation-core/src/main/res/values-night/colors_tachiyomi.xml
@@ -10,26 +10,37 @@
   ~ 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_primary">#B0C6FF</color>
+    <color name="tachiyomi_onPrimary">#002D6E</color>
+    <color name="tachiyomi_primaryContainer">#00429B</color>
+    <color name="tachiyomi_onPrimaryContainer">#D9E2FF</color>
+    <color name="tachiyomi_inversePrimary">#0058CA</color>
+    <color name="tachiyomi_secondary">#B0C6FF</color>
+    <color name="tachiyomi_onSecondary">#002D6E</color>
+    <color name="tachiyomi_secondaryContainer">#00429B</color>
+    <color name="tachiyomi_onSecondaryContainer">#D9E2FF</color>
     <color name="tachiyomi_tertiary">#7ADC77</color>
-    <color name="tachiyomi_onTertiary">#003907</color>
-    <color name="tachiyomi_tertiaryContainer">#00530D</color>
+    <color name="tachiyomi_onTertiary">#003909</color>
+    <color name="tachiyomi_tertiaryContainer">#005312</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_background">#1B1B1F</color>
+    <color name="tachiyomi_onBackground">#E3E2E6</color>
+    <color name="tachiyomi_surface">#1B1B1F</color>
+    <color name="tachiyomi_onSurface">#E3E2E6</color>
+    <color name="tachiyomi_surfaceVariant">#211F26</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>
+    <color name="tachiyomi_surfaceTint">#B0C6FF</color>
+    <color name="tachiyomi_inverseSurface">#E3E2E6</color>
+    <color name="tachiyomi_inverseOnSurface">#1B1B1F</color>
+    <color name="tachiyomi_error">#FFB4AB</color>
+    <color name="tachiyomi_onError">#690005</color>
+    <color name="tachiyomi_errorContainer">#93000A</color>
+    <color name="tachiyomi_onErrorContainer">#FFDAD6</color>
+    <color name="tachiyomi_outline">#8F9099</color>
+    <color name="tachiyomi_outlineVariant">#44464F</color>
+    <color name="tachiyomi_surfaceContainerLowest">#1A181D</color>
+    <color name="tachiyomi_surfaceContainerLow">#1E1C22</color>
+    <color name="tachiyomi_surfaceContainer">#211F26</color>
+    <color name="tachiyomi_surfaceContainerHigh">#292730</color>
+    <color name="tachiyomi_surfaceContainerHighest">#302E38</color>
 </resources>