From 3bcb0b1a3120575de91066fed15207d8c5b9f3e7 Mon Sep 17 00:00:00 2001 From: Nicole Date: Thu, 28 Nov 2024 20:38:05 +0200 Subject: [PATCH] Add DarkGray color --- .../src/commonMain/kotlin/ui/theme/Colors.kt | 5 ++-- .../src/commonMain/kotlin/ui/theme/Theme.kt | 30 +++++++++---------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/ui/theme/Colors.kt b/composeApp/src/commonMain/kotlin/ui/theme/Colors.kt index 1288ad2..671caaa 100644 --- a/composeApp/src/commonMain/kotlin/ui/theme/Colors.kt +++ b/composeApp/src/commonMain/kotlin/ui/theme/Colors.kt @@ -8,7 +8,8 @@ val Orange = Color(0xFFF59331) val OrangeVariant = Color(0xFFE87A0B) val Red = Color(0xFFF53D3D) val Green = Color(0xFF12B880) +val Light = Color(0xFFEBEBF0) val LightGray = Color(0xFFCBCBD6) val Gray = Color(0xFF74747A) -val Dark = Color(0xFF1C1C1F) -val Light = Color(0xFFEBEBF0) \ No newline at end of file +val DarkGray = Color(0xFF303033) +val Dark = Color(0xFF1C1C1F) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/ui/theme/Theme.kt b/composeApp/src/commonMain/kotlin/ui/theme/Theme.kt index 3c0488f..8b9d517 100644 --- a/composeApp/src/commonMain/kotlin/ui/theme/Theme.kt +++ b/composeApp/src/commonMain/kotlin/ui/theme/Theme.kt @@ -25,6 +25,21 @@ private val LightColorScheme = lightColors( onError = Color.White ) +private val DarkColorScheme = darkColors( + primary = Blue, + primaryVariant = BlueVariant, + secondary = Orange, + secondaryVariant = OrangeVariant, + background = Color.Black, + surface = Color.Black, + error = Red, + onPrimary = Color.White, + onSecondary = Color.White, + onBackground = Color.White, + onSurface = Color.White, + onError = Color.White +) + val MaterialTheme.colorsExt: ExtendedColors @Composable @ReadOnlyComposable @@ -51,21 +66,6 @@ data class ExtendedColors( val onSuccess: Color ) -private val DarkColorScheme = darkColors( - primary = Blue, - primaryVariant = BlueVariant, - secondary = Orange, - secondaryVariant = OrangeVariant, - background = Color.Black, - surface = Color.Black, - error = Red, - onPrimary = Color.White, - onSecondary = Color.White, - onBackground = Color.White, - onSurface = Color.White, - onError = Color.White -) - @Composable fun LearnTheme( darkTheme: Boolean = isSystemInDarkTheme(),