Update theme colors

X1nto · Nov 10, 2024 · c6bb619 · c6bb619
1 parent 95fb7e6
commit c6bb619
Show file tree

Hide file tree

Showing 7 changed files with 1,180 additions and 196 deletions.
diff --git a/app/src/main/java/com/xinto/mauth/ui/theme/Theme.kt b/app/src/main/java/com/xinto/mauth/ui/theme/Theme.kt
@@ -10,18 +10,18 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import com.xinto.mauth.core.settings.model.ColorSetting
 import com.xinto.mauth.core.settings.model.ThemeSetting
-import com.xinto.mauth.ui.theme.color.DarkBlueberryBlue
-import com.xinto.mauth.ui.theme.color.DarkLemonYellow
-import com.xinto.mauth.ui.theme.color.DarkLimeGreen
-import com.xinto.mauth.ui.theme.color.DarkMothPurple
-import com.xinto.mauth.ui.theme.color.DarkOrangeOrange
-import com.xinto.mauth.ui.theme.color.DarkSkyCyan
-import com.xinto.mauth.ui.theme.color.LightBlueberryBlue
-import com.xinto.mauth.ui.theme.color.LightLemonYellow
-import com.xinto.mauth.ui.theme.color.LightLimeGreen
-import com.xinto.mauth.ui.theme.color.LightMothPurple
-import com.xinto.mauth.ui.theme.color.LightOrangeOrange
-import com.xinto.mauth.ui.theme.color.LightSkyCyan
+import com.xinto.mauth.ui.theme.color.BlueberryBlueDark
+import com.xinto.mauth.ui.theme.color.LimeGreenDark
+import com.xinto.mauth.ui.theme.color.MothPurpleDark
+import com.xinto.mauth.ui.theme.color.OrangeOrangeDark
+import com.xinto.mauth.ui.theme.color.SkyCyanDark
+import com.xinto.mauth.ui.theme.color.LemonYellowDark
+import com.xinto.mauth.ui.theme.color.BlueberryBlueLight
+import com.xinto.mauth.ui.theme.color.LemonYellowLight
+import com.xinto.mauth.ui.theme.color.LimeGreenLight
+import com.xinto.mauth.ui.theme.color.MothPurpleLight
+import com.xinto.mauth.ui.theme.color.OrangeOrangeLight
+import com.xinto.mauth.ui.theme.color.SkyCyanLight
 
 @Composable
 fun MauthTheme(
@@ -44,28 +44,28 @@ fun MauthTheme(
             }
         }
         color == ColorSetting.BlueberryBlue -> when (isDark) {
-            true -> DarkBlueberryBlue
-            false -> LightBlueberryBlue
+            true -> BlueberryBlueDark
+            false -> BlueberryBlueLight
         }
         color == ColorSetting.PickleYellow -> when (isDark) {
-            true -> DarkLemonYellow
-            false -> LightLemonYellow
+            true -> LemonYellowDark
+            false -> LemonYellowLight
         }
         color == ColorSetting.ToxicGreen -> when (isDark) {
-            true -> DarkLimeGreen
-            false -> LightLimeGreen
+            true -> LimeGreenDark
+            false -> LimeGreenLight
         }
         color == ColorSetting.LeatherOrange -> when (isDark) {
-            true -> DarkOrangeOrange
-            false -> LightOrangeOrange
+            true -> OrangeOrangeDark
+            false -> OrangeOrangeLight
         }
         color == ColorSetting.OceanTurquoise -> when (isDark) {
-            true -> DarkSkyCyan
-            false -> LightSkyCyan
+            true -> SkyCyanDark
+            false -> SkyCyanLight
         }
         else -> when (isDark) {
-            true -> DarkMothPurple
-            false -> LightMothPurple
+            true -> MothPurpleDark
+            false -> MothPurpleLight
         }
     }
     MaterialTheme(

diff --git a/app/src/main/java/com/xinto/mauth/ui/theme/color/BlueberryBlue.kt b/app/src/main/java/com/xinto/mauth/ui/theme/color/BlueberryBlue.kt
@@ -4,68 +4,233 @@ import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.ui.graphics.Color
 
-val LightBlueberryBlue = lightColorScheme(
-    primary = Color(0xFF343DFF),
+val BlueberryBlueLight = lightColorScheme(
+    primary = Color(0xFF475D92),
     onPrimary = Color(0xFFFFFFFF),
-    primaryContainer = Color(0xFFE0E0FF),
-    onPrimaryContainer = Color(0xFF00006E),
-    secondary = Color(0xFF5C5D72),
+    primaryContainer = Color(0xFFD9E2FF),
+    onPrimaryContainer = Color(0xFF001945),
+    secondary = Color(0xFF575E71),
     onSecondary = Color(0xFFFFFFFF),
-    secondaryContainer = Color(0xFFE1E0F9),
-    onSecondaryContainer = Color(0xFF191A2C),
-    tertiary = Color(0xFF78536B),
+    secondaryContainer = Color(0xFFDCE2F9),
+    onSecondaryContainer = Color(0xFF141B2C),
+    tertiary = Color(0xFF725572),
     onTertiary = Color(0xFFFFFFFF),
-    tertiaryContainer = Color(0xFFFFD8EE),
-    onTertiaryContainer = Color(0xFF2E1126),
+    tertiaryContainer = Color(0xFFFDD7FA),
+    onTertiaryContainer = Color(0xFF2A132C),
     error = Color(0xFFBA1A1A),
-    errorContainer = Color(0xFFFFDAD6),
     onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFFFDAD6),
     onErrorContainer = Color(0xFF410002),
-    background = Color(0xFFFFFBFF),
-    onBackground = Color(0xFF1B1B1F),
-    surface = Color(0xFFFFFBFF),
-    onSurface = Color(0xFF1B1B1F),
-    surfaceVariant = Color(0xFFE4E1EC),
-    onSurfaceVariant = Color(0xFF46464F),
-    outline = Color(0xFF777680),
-    inverseOnSurface = Color(0xFFF3EFF4),
-    inverseSurface = Color(0xFF303034),
-    inversePrimary = Color(0xFFBEC2FF),
-    surfaceTint = Color(0xFF343DFF),
-    outlineVariant = Color(0xFFC7C5D0),
+    background = Color(0xFFFAF8FF),
+    onBackground = Color(0xFF1A1B20),
+    surface = Color(0xFFFAF8FF),
+    onSurface = Color(0xFF1A1B20),
+    surfaceVariant = Color(0xFFE1E2EC),
+    onSurfaceVariant = Color(0xFF44464F),
+    outline = Color(0xFF757780),
+    outlineVariant = Color(0xFFC5C6D0),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2F3036),
+    inverseOnSurface = Color(0xFFF1F0F7),
+    inversePrimary = Color(0xFFB0C6FF),
+    surfaceDim = Color(0xFFDAD9E0),
+    surfaceBright = Color(0xFFFAF8FF),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF4F3FA),
+    surfaceContainer = Color(0xFFEEEDF4),
+    surfaceContainerHigh = Color(0xFFE8E7EF),
+    surfaceContainerHighest = Color(0xFFE2E2E9),
 )
 
-val DarkBlueberryBlue = darkColorScheme(
-    primary = Color(0xFFBEC2FF),
-    onPrimary = Color(0xFF0001AC),
-    primaryContainer = Color(0xFF0000EF),
-    onPrimaryContainer = Color(0xFFE0E0FF),
-    secondary = Color(0xFFC5C4DD),
-    onSecondary = Color(0xFF2E2F42),
-    secondaryContainer = Color(0xFF444559),
-    onSecondaryContainer = Color(0xFFE1E0F9),
-    tertiary = Color(0xFFE8B9D5),
-    onTertiary = Color(0xFF46263B),
-    tertiaryContainer = Color(0xFF5E3C52),
-    onTertiaryContainer = Color(0xFFFFD8EE),
+val BlueberryBlueLightMediumContrast = lightColorScheme(
+    primary = Color(0xFF2A4174),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF5D73A9),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF3C4255),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF6E7488),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF553A55),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF8A6A89),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF8C0009),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFFDA342E),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFFAF8FF),
+    onBackground = Color(0xFF1A1B20),
+    surface = Color(0xFFFAF8FF),
+    onSurface = Color(0xFF1A1B20),
+    surfaceVariant = Color(0xFFE1E2EC),
+    onSurfaceVariant = Color(0xFF40434B),
+    outline = Color(0xFF5D5F67),
+    outlineVariant = Color(0xFF797A83),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2F3036),
+    inverseOnSurface = Color(0xFFF1F0F7),
+    inversePrimary = Color(0xFFB0C6FF),
+    surfaceDim = Color(0xFFDAD9E0),
+    surfaceBright = Color(0xFFFAF8FF),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF4F3FA),
+    surfaceContainer = Color(0xFFEEEDF4),
+    surfaceContainerHigh = Color(0xFFE8E7EF),
+    surfaceContainerHighest = Color(0xFFE2E2E9),
+)
+
+val BlueberryBlueLightHighContrast = lightColorScheme(
+    primary = Color(0xFF011F51),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFF2A4174),
+    onPrimaryContainer = Color(0xFFFFFFFF),
+    secondary = Color(0xFF1B2233),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFF3C4255),
+    onSecondaryContainer = Color(0xFFFFFFFF),
+    tertiary = Color(0xFF311933),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFF553A55),
+    onTertiaryContainer = Color(0xFFFFFFFF),
+    error = Color(0xFF4E0002),
+    onError = Color(0xFFFFFFFF),
+    errorContainer = Color(0xFF8C0009),
+    onErrorContainer = Color(0xFFFFFFFF),
+    background = Color(0xFFFAF8FF),
+    onBackground = Color(0xFF1A1B20),
+    surface = Color(0xFFFAF8FF),
+    onSurface = Color(0xFF000000),
+    surfaceVariant = Color(0xFFE1E2EC),
+    onSurfaceVariant = Color(0xFF21242B),
+    outline = Color(0xFF40434B),
+    outlineVariant = Color(0xFF40434B),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFF2F3036),
+    inverseOnSurface = Color(0xFFFFFFFF),
+    inversePrimary = Color(0xFFE7EBFF),
+    surfaceDim = Color(0xFFDAD9E0),
+    surfaceBright = Color(0xFFFAF8FF),
+    surfaceContainerLowest = Color(0xFFFFFFFF),
+    surfaceContainerLow = Color(0xFFF4F3FA),
+    surfaceContainer = Color(0xFFEEEDF4),
+    surfaceContainerHigh = Color(0xFFE8E7EF),
+    surfaceContainerHighest = Color(0xFFE2E2E9),
+)
+
+val BlueberryBlueDark = darkColorScheme(
+
+    primary = Color(0xFFB0C6FF),
+    onPrimary = Color(0xFF152E60),
+    primaryContainer = Color(0xFF2E4578),
+    onPrimaryContainer = Color(0xFFD9E2FF),
+    secondary = Color(0xFFC0C6DC),
+    onSecondary = Color(0xFF293042),
+    secondaryContainer = Color(0xFF404659),
+    onSecondaryContainer = Color(0xFFDCE2F9),
+    tertiary = Color(0xFFE0BBDD),
+    onTertiary = Color(0xFF412742),
+    tertiaryContainer = Color(0xFF593D5A),
+    onTertiaryContainer = Color(0xFFFDD7FA),
     error = Color(0xFFFFB4AB),
-    errorContainer = Color(0xFF93000A),
     onError = Color(0xFF690005),
+    errorContainer = Color(0xFF93000A),
     onErrorContainer = Color(0xFFFFDAD6),
-    background = Color(0xFF1B1B1F),
-    onBackground = Color(0xFFE5E1E6),
-    surface = Color(0xFF1B1B1F),
-    onSurface = Color(0xFFE5E1E6),
-    surfaceVariant = Color(0xFF46464F),
-    onSurfaceVariant = Color(0xFFC7C5D0),
-    outline = Color(0xFF91909A),
-    inverseOnSurface = Color(0xFF1B1B1F),
-    inverseSurface = Color(0xFFE5E1E6),
-    inversePrimary = Color(0xFF343DFF),
-    surfaceTint = Color(0xFFBEC2FF),
-    outlineVariant = Color(0xFF46464F),
+    background = Color(0xFF121318),
+    onBackground = Color(0xFFE2E2E9),
+    surface = Color(0xFF121318),
+    onSurface = Color(0xFFE2E2E9),
+    surfaceVariant = Color(0xFF44464F),
+    onSurfaceVariant = Color(0xFFC5C6D0),
+    outline = Color(0xFF8F9099),
+    outlineVariant = Color(0xFF44464F),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE2E2E9),
+    inverseOnSurface = Color(0xFF2F3036),
+    inversePrimary = Color(0xFF475D92),
+    surfaceDim = Color(0xFF121318),
+    surfaceBright = Color(0xFF38393F),
+    surfaceContainerLowest = Color(0xFF0C0E13),
+    surfaceContainerLow = Color(0xFF1A1B20),
+    surfaceContainer = Color(0xFF1E1F25),
+    surfaceContainerHigh = Color(0xFF282A2F),
+    surfaceContainerHighest = Color(0xFF33353A),
+)
+
+val DarkBlueberryBlueMediumContrast = darkColorScheme(
+    primary = Color(0xFFB6CAFF),
+    onPrimary = Color(0xFF00143A),
+    primaryContainer = Color(0xFF7A90C8),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFC4CAE1),
+    onSecondary = Color(0xFF0F1626),
+    secondaryContainer = Color(0xFF8A90A5),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFE4BFE2),
+    onTertiary = Color(0xFF240D27),
+    tertiaryContainer = Color(0xFFA786A6),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFBAB1),
+    onError = Color(0xFF370001),
+    errorContainer = Color(0xFFFF5449),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF121318),
+    onBackground = Color(0xFFE2E2E9),
+    surface = Color(0xFF121318),
+    onSurface = Color(0xFFFCFAFF),
+    surfaceVariant = Color(0xFF44464F),
+    onSurfaceVariant = Color(0xFFC9CAD4),
+    outline = Color(0xFFA1A2AC),
+    outlineVariant = Color(0xFF81838C),
+    scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE2E2E9),
+    inverseOnSurface = Color(0xFF282A2F),
+    inversePrimary = Color(0xFF304679),
+    surfaceDim = Color(0xFF121318),
+    surfaceBright = Color(0xFF38393F),
+    surfaceContainerLowest = Color(0xFF0C0E13),
+    surfaceContainerLow = Color(0xFF1A1B20),
+    surfaceContainer = Color(0xFF1E1F25),
+    surfaceContainerHigh = Color(0xFF282A2F),
+    surfaceContainerHighest = Color(0xFF33353A),
+)
+
+val DarkBlueberryBlueHighContrast = darkColorScheme(
+    primary = Color(0xFFFCFAFF),
+    onPrimary = Color(0xFF000000),
+    primaryContainer = Color(0xFFB6CAFF),
+    onPrimaryContainer = Color(0xFF000000),
+    secondary = Color(0xFFFCFAFF),
+    onSecondary = Color(0xFF000000),
+    secondaryContainer = Color(0xFFC4CAE1),
+    onSecondaryContainer = Color(0xFF000000),
+    tertiary = Color(0xFFFFF9FA),
+    onTertiary = Color(0xFF000000),
+    tertiaryContainer = Color(0xFFE4BFE2),
+    onTertiaryContainer = Color(0xFF000000),
+    error = Color(0xFFFFF9F9),
+    onError = Color(0xFF000000),
+    errorContainer = Color(0xFFFFBAB1),
+    onErrorContainer = Color(0xFF000000),
+    background = Color(0xFF121318),
+    onBackground = Color(0xFFE2E2E9),
+    surface = Color(0xFF121318),
+    onSurface = Color(0xFFFFFFFF),
+    surfaceVariant = Color(0xFF44464F),
+    onSurfaceVariant = Color(0xFFFCFAFF),
+    outline = Color(0xFFC9CAD4),
+    outlineVariant = Color(0xFFC9CAD4),
     scrim = Color(0xFF000000),
+    inverseSurface = Color(0xFFE2E2E9),
+    inverseOnSurface = Color(0xFF000000),
+    inversePrimary = Color(0xFF0C2859),
+    surfaceDim = Color(0xFF121318),
+    surfaceBright = Color(0xFF38393F),
+    surfaceContainerLowest = Color(0xFF0C0E13),
+    surfaceContainerLow = Color(0xFF1A1B20),
+    surfaceContainer = Color(0xFF1E1F25),
+    surfaceContainerHigh = Color(0xFF282A2F),
+    surfaceContainerHighest = Color(0xFF33353A),
 )
 
-val BlueberryBlue = Color(0xFF0000FF)
+val BlueberryBlue = Color(0xFF4f86f7)