color tweaks

app/src/main/java/com/geode/launcher/preferences/SettingsComponents.kt

@@ -974,7 +974,7 @@ fun OptionsTitle(modifier: Modifier = Modifier, title: String, description: Stri
                 Text(
                     description,
                     style = Typography.labelMedium,
-                    color = MaterialTheme.colorScheme.onSecondaryContainer
+                    color = MaterialTheme.colorScheme.onSurface
                 )
             }
         }

app/src/main/java/com/geode/launcher/ui/theme/Color.kt

@@ -2,10 +2,74 @@ package com.geode.launcher.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
-val Purple80 = Color(0xFFD0BCFF)
+val primaryLight = Color(0xFF6D538B)
-val PurpleGrey80 = Color(0xFFCCC2DC)
+val onPrimaryLight = Color(0xFFFFFFFF)
-val Pink80 = Color(0xFFEFB8C8)
+val primaryContainerLight = Color(0xFFEEDBFF)
+val onPrimaryContainerLight = Color(0xFF543B72)
+val secondaryLight = Color(0xFF765A0B)
+val onSecondaryLight = Color(0xFFFFFFFF)
+val secondaryContainerLight = Color(0xFFFFDF9A)
+val onSecondaryContainerLight = Color(0xFF5A4300)
+val tertiaryLight = Color(0xFF904A42)
+val onTertiaryLight = Color(0xFFFFFFFF)
+val tertiaryContainerLight = Color(0xFFFFDAD5)
+val onTertiaryContainerLight = Color(0xFF73342D)
+val errorLight = Color(0xFF8D4A5A)
+val onErrorLight = Color(0xFFFFFFFF)
+val errorContainerLight = Color(0xFFFFD9DF)
+val onErrorContainerLight = Color(0xFF713343)
+val backgroundLight = Color(0xFFFFF7FF)
+val onBackgroundLight = Color(0xFF1D1A20)
+val surfaceLight = Color(0xFFFEF7FF)
+val onSurfaceLight = Color(0xFF1D1A20)
+val surfaceVariantLight = Color(0xFFE8E0EB)
+val onSurfaceVariantLight = Color(0xFF4A454E)
+val outlineLight = Color(0xFF7B757F)
+val outlineVariantLight = Color(0xFFCCC4CF)
+val scrimLight = Color(0xFF000000)
+val inverseSurfaceLight = Color(0xFF322F35)
+val inverseOnSurfaceLight = Color(0xFFF6EEF7)
+val inversePrimaryLight = Color(0xFFD9BAFA)
+val surfaceDimLight = Color(0xFFDFD8E0)
+val surfaceBrightLight = Color(0xFFFEF7FF)
+val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+val surfaceContainerLowLight = Color(0xFFF9F1F9)
+val surfaceContainerLight = Color(0xFFF3ECF4)
+val surfaceContainerHighLight = Color(0xFFEDE6EE)
+val surfaceContainerHighestLight = Color(0xFFE7E0E8)
 
-val Purple40 = Color(0xFF6650a4)
+val primaryDark = Color(0xFFD9BAFA)
-val PurpleGrey40 = Color(0xFF625b71)
+val onPrimaryDark = Color(0xFF3D2459)
-val Pink40 = Color(0xFF7D5260)
+val primaryContainerDark = Color(0xFF543B72)
+val onPrimaryContainerDark = Color(0xFFEEDBFF)
+val secondaryDark = Color(0xFFE7C26C)
+val onSecondaryDark = Color(0xFF3F2E00)
+val secondaryContainerDark = Color(0xFF5A4300)
+val onSecondaryContainerDark = Color(0xFFFFDF9A)
+val tertiaryDark = Color(0xFFFFB4AA)
+val onTertiaryDark = Color(0xFF561E18)
+val tertiaryContainerDark = Color(0xFF73342D)
+val onTertiaryContainerDark = Color(0xFFFFDAD5)
+val errorDark = Color(0xFFFFB1C1)
+val onErrorDark = Color(0xFF551D2D)
+val errorContainerDark = Color(0xFF713343)
+val onErrorContainerDark = Color(0xFFFFD9DF)
+val backgroundDark = Color(0xFF151218)
+val onBackgroundDark = Color(0xFFE8E0E8)
+val surfaceDark = Color(0xFF151218)
+val onSurfaceDark = Color(0xFFE7E0E8)
+val surfaceVariantDark = Color(0xFF4A454E)
+val onSurfaceVariantDark = Color(0xFFCCC4CF)
+val outlineDark = Color(0xFF958E98)
+val outlineVariantDark = Color(0xFF4A454E)
+val scrimDark = Color(0xFF000000)
+val inverseSurfaceDark = Color(0xFFE7E0E8)
+val inverseOnSurfaceDark = Color(0xFF322F35)
+val inversePrimaryDark = Color(0xFF6D538B)
+val surfaceDimDark = Color(0xFF151218)
+val surfaceBrightDark = Color(0xFF3B383E)
+val surfaceContainerLowestDark = Color(0xFF100D12)
+val surfaceContainerLowDark = Color(0xFF1D1A20)
+val surfaceContainerDark = Color(0xFF211E24)
+val surfaceContainerHighDark = Color(0xFF2C292F)
+val surfaceContainerHighestDark = Color(0xFF37333A)

app/src/main/java/com/geode/launcher/ui/theme/Theme.kt

@@ -18,26 +18,80 @@ import androidx.compose.ui.platform.LocalView
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 
-private val DarkColorScheme = darkColorScheme(
+private val lightScheme = lightColorScheme(
-        primary = Purple80,
+    primary = primaryLight,
-        secondary = PurpleGrey80,
+    onPrimary = onPrimaryLight,
-        tertiary = Pink80
+    primaryContainer = primaryContainerLight,
+    onPrimaryContainer = onPrimaryContainerLight,
+    secondary = secondaryLight,
+    onSecondary = onSecondaryLight,
+    secondaryContainer = secondaryContainerLight,
+    onSecondaryContainer = onSecondaryContainerLight,
+    tertiary = tertiaryLight,
+    onTertiary = onTertiaryLight,
+    tertiaryContainer = tertiaryContainerLight,
+    onTertiaryContainer = onTertiaryContainerLight,
+    error = errorLight,
+    onError = onErrorLight,
+    errorContainer = errorContainerLight,
+    onErrorContainer = onErrorContainerLight,
+    background = backgroundLight,
+    onBackground = onBackgroundLight,
+    surface = surfaceLight,
+    onSurface = onSurfaceLight,
+    surfaceVariant = surfaceVariantLight,
+    onSurfaceVariant = onSurfaceVariantLight,
+    outline = outlineLight,
+    outlineVariant = outlineVariantLight,
+    scrim = scrimLight,
+    inverseSurface = inverseSurfaceLight,
+    inverseOnSurface = inverseOnSurfaceLight,
+    inversePrimary = inversePrimaryLight,
+    surfaceDim = surfaceDimLight,
+    surfaceBright = surfaceBrightLight,
+    surfaceContainerLowest = surfaceContainerLowestLight,
+    surfaceContainerLow = surfaceContainerLowLight,
+    surfaceContainer = surfaceContainerLight,
+    surfaceContainerHigh = surfaceContainerHighLight,
+    surfaceContainerHighest = surfaceContainerHighestLight,
 )
 
-private val LightColorScheme = lightColorScheme(
+private val darkScheme = darkColorScheme(
-        primary = Purple40,
+    primary = primaryDark,
-        secondary = PurpleGrey40,
+    onPrimary = onPrimaryDark,
-        tertiary = Pink40
+    primaryContainer = primaryContainerDark,
-
+    onPrimaryContainer = onPrimaryContainerDark,
-        /* Other default colors to override
+    secondary = secondaryDark,
-    background = Color(0xFFFFFBFE),
+    onSecondary = onSecondaryDark,
-    surface = Color(0xFFFFFBFE),
+    secondaryContainer = secondaryContainerDark,
-    onPrimary = Color.White,
+    onSecondaryContainer = onSecondaryContainerDark,
-    onSecondary = Color.White,
+    tertiary = tertiaryDark,
-    onTertiary = Color.White,
+    onTertiary = onTertiaryDark,
-    onBackground = Color(0xFF1C1B1F),
+    tertiaryContainer = tertiaryContainerDark,
-    onSurface = Color(0xFF1C1B1F),
+    onTertiaryContainer = onTertiaryContainerDark,
-    */
+    error = errorDark,
+    onError = onErrorDark,
+    errorContainer = errorContainerDark,
+    onErrorContainer = onErrorContainerDark,
+    background = backgroundDark,
+    onBackground = onBackgroundDark,
+    surface = surfaceDark,
+    onSurface = onSurfaceDark,
+    surfaceVariant = surfaceVariantDark,
+    onSurfaceVariant = onSurfaceVariantDark,
+    outline = outlineDark,
+    outlineVariant = outlineVariantDark,
+    scrim = scrimDark,
+    inverseSurface = inverseSurfaceDark,
+    inverseOnSurface = inverseOnSurfaceDark,
+    inversePrimary = inversePrimaryDark,
+    surfaceDim = surfaceDimDark,
+    surfaceBright = surfaceBrightDark,
+    surfaceContainerLowest = surfaceContainerLowestDark,
+    surfaceContainerLow = surfaceContainerLowDark,
+    surfaceContainer = surfaceContainerDark,
+    surfaceContainerHigh = surfaceContainerHighDark,
+    surfaceContainerHighest = surfaceContainerHighestDark,
 )
 
 enum class Theme {
@@ -74,9 +128,9 @@ fun GeodeLauncherTheme(
             }
         }
         theme == Theme.DARK && blackBackground ->
-            DarkColorScheme.copy(surface = Color.Black, background = Color.Black)
+            darkScheme.copy(surface = Color.Black, background = Color.Black)
-        theme == Theme.DARK -> DarkColorScheme
+        theme == Theme.DARK -> darkScheme
-        else -> LightColorScheme
+        else -> lightScheme
     }
 
     MaterialTheme(