refactor: Regenerated themes

Lastaapps · Jan 22, 2025 · 6f93762 · 6f93762
1 parent 9e178c5
commit 6f93762
Show file tree

Hide file tree

Showing 20 changed files with 2,651 additions and 655 deletions.
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/ui/theme/Theme.kt b/app/src/main/kotlin/cz/lastaapps/menza/ui/theme/Theme.kt
@@ -39,14 +39,10 @@ import cz.lastaapps.menza.features.settings.domain.model.AppThemeType.System
 import cz.lastaapps.menza.features.settings.domain.model.AppThemeType.Uwu
 import cz.lastaapps.menza.features.settings.domain.model.DarkMode
 import cz.lastaapps.menza.features.settings.domain.model.shouldUseDark
-import cz.lastaapps.menza.ui.theme.generated.agata.AgataDarkColors
-import cz.lastaapps.menza.ui.theme.generated.agata.AgataLightColors
-import cz.lastaapps.menza.ui.theme.generated.ctu.CtuDarkColors
-import cz.lastaapps.menza.ui.theme.generated.ctu.CtuLightColors
-import cz.lastaapps.menza.ui.theme.generated.kitty.KittyDarkColors
-import cz.lastaapps.menza.ui.theme.generated.kitty.KittyLightColors
-import cz.lastaapps.menza.ui.theme.generated.uwu.UwuDarkColors
-import cz.lastaapps.menza.ui.theme.generated.uwu.UwuLightColors
+import cz.lastaapps.menza.ui.theme.generated.NAME.UwUSchemeFamily
+import cz.lastaapps.menza.ui.theme.generated.agata.AgataSchemeFamily
+import cz.lastaapps.menza.ui.theme.generated.ctu.CTUSchemeFamily
+import cz.lastaapps.menza.ui.theme.generated.kitty.KittySchemeFamily
 
 @SuppressLint("NewApi")
 @Composable
@@ -66,33 +62,10 @@ fun AppTheme(
                     dynamicDarkColorScheme(LocalContext.current)
                 }
 
-            Agata ->
-                if (isLightMode) {
-                    AgataLightColors
-                } else {
-                    AgataDarkColors
-                }
-
-            CTU ->
-                if (isLightMode) {
-                    CtuLightColors
-                } else {
-                    CtuDarkColors
-                }
-
-            Uwu ->
-                if (isLightMode) {
-                    UwuLightColors
-                } else {
-                    UwuDarkColors
-                }
-
-            Kitty ->
-                if (isLightMode) {
-                    KittyLightColors
-                } else {
-                    KittyDarkColors
-                }
+            Agata -> AgataSchemeFamily.getSchema(isLightMode)
+            CTU -> CTUSchemeFamily.getSchema(isLightMode)
+            Uwu -> UwUSchemeFamily.getSchema(isLightMode)
+            Kitty -> KittySchemeFamily.getSchema(isLightMode)
         }
             // This somehow magically fixes switching between system and app theme.
             // If this is not present, the whole underlying UI is recomposed in a destructive way
@@ -113,11 +86,11 @@ fun AppTheme(
 
 private val Shapes =
     Shapes(
-    /*extraSmall = ShapeTokens.CornerExtraSmall
-    small = ShapeTokens.CornerSmall,
-    medium = ShapeTokens.CornerMedium,
-    large = ShapeTokens.CornerLarge,
-    extraLarge = ShapeTokens.CornerExtraLarge,*/
+        /*extraSmall = ShapeTokens.CornerExtraSmall
+        small = ShapeTokens.CornerSmall,
+        medium = ShapeTokens.CornerMedium,
+        large = ShapeTokens.CornerLarge,
+        extraLarge = ShapeTokens.CornerExtraLarge,*/
     )
 
 @Suppress("AnimateAsStateLabel")

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/ui/theme/color_sources.md b/app/src/main/kotlin/cz/lastaapps/menza/ui/theme/color_sources.md
@@ -0,0 +1,37 @@
+# Agáta
+
+- FFBB00
+- A58E64
+- 366A21
+
+# CTU
+
+- 045FAE
+- 8591A7
+- A487AD
+
+# Kitty
+
+- 5F6200
+- 939276
+- 9C4140
+
+# UwU
+
+- 9A405A
+- AB888E
+- 804893
+
+```kotlin
+package cz.lastaapps.menza.ui.theme.generated.NAME
+
+val NAMESchemeFamily =
+    SchemeFamily(
+        lightScheme,
+        darkScheme,
+        mediumContrastLightColorScheme,
+        mediumContrastDarkColorScheme,
+        highContrastLightColorScheme,
+        highContrastDarkColorScheme,
+    )
+```