From fd075344db455ec74f6b810d53bc785fec9d96ee Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 22 Nov 2022 20:12:47 +0100 Subject: [PATCH] Fix some theming --- .../main/java/io/element/android/x/designsystem/Color.kt | 2 +- .../main/java/io/element/android/x/designsystem/Theme.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt index 53126611dc..e50976292b 100644 --- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt +++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt @@ -17,7 +17,7 @@ val SystemGrey3Dark = Color(0xFF48484A) val SystemGrey4Light = Color(0xFFD1D1D6) val SystemGrey4Dark = Color(0xFF3A3A3C) val SystemGrey5Light = Color(0xFFE5E5EA) -val SystemGrey5Dark = Color(0xFF2C2C2E) +val SystemGrey5Dark = Color(0xFF1C1C1E) val SystemGrey6Light = Color(0xFFF2F2F7) val SystemGrey6Dark = Color(0xFF1C1C1E) diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Theme.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Theme.kt index 81b8d2f7f0..cb1035f7ad 100644 --- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Theme.kt +++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Theme.kt @@ -16,7 +16,7 @@ private val DarkColorScheme = darkColorScheme( background = Color.Black, onBackground = Color.White, surface = Color.Black, - surfaceVariant = SystemGrey6Dark, + surfaceVariant = SystemGrey5Dark, onSurface = Color.White, onSurfaceVariant = Color.White, ) @@ -28,7 +28,7 @@ private val LightColorScheme = lightColorScheme( background = Color.White, onBackground = Color.Black, surface = Color.White, - surfaceVariant = SystemGrey6Light, + surfaceVariant = SystemGrey5Light, onSurface = Color.Black, onSurfaceVariant = Color.Black, @@ -48,7 +48,7 @@ private val LightColorScheme = lightColorScheme( fun ElementXTheme( darkTheme: Boolean = isSystemInDarkTheme(), // Dynamic color is available on Android 12+ - dynamicColor: Boolean = true, + dynamicColor: Boolean = false, content: @Composable () -> Unit ) { val colorScheme = when {