From d79e5abb9f430a309c41bf640e8d0ca8b032a661 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Sun, 26 Jun 2022 01:50:05 +0200 Subject: [PATCH] Fix: Match themes' colors --- .../kotlin/com/looker/droidify/ui/compose/theme/Color.kt | 2 +- .../kotlin/com/looker/droidify/ui/compose/theme/Theme.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Color.kt b/src/main/kotlin/com/looker/droidify/ui/compose/theme/Color.kt index 45e1b452..1a970c46 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Color.kt +++ b/src/main/kotlin/com/looker/droidify/ui/compose/theme/Color.kt @@ -24,7 +24,7 @@ val md_theme_light_onError = Color(0xFFFFFFFF) val md_theme_light_onErrorContainer = Color(0xFF410002) val md_theme_light_background = Color(0xFFFBFDF8) val md_theme_light_onBackground = Color(0xFF191C1A) -val md_theme_light_surface = Color(0xFFFBFDF8) +val md_theme_light_surface = Color(0xFFE8F5E9) val md_theme_light_onSurface = Color(0xFF191C1A) val md_theme_light_surfaceVariant = Color(0xFFDCE5DB) val md_theme_light_onSurfaceVariant = Color(0xFF414942) diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Theme.kt b/src/main/kotlin/com/looker/droidify/ui/compose/theme/Theme.kt index b69d7bce..c4f895a8 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Theme.kt +++ b/src/main/kotlin/com/looker/droidify/ui/compose/theme/Theme.kt @@ -15,6 +15,7 @@ fun AppTheme( ) { MaterialTheme( colorScheme = when { + //dynamicTheme -> dynamicDarkColorScheme(LocalContext.current) darkTheme && blackTheme -> BlackColors darkTheme -> DarkColors else -> LightColors @@ -73,7 +74,7 @@ private val DarkColors = darkColorScheme( onErrorContainer = md_theme_dark_onErrorContainer, background = md_theme_dark_background, onBackground = md_theme_dark_onBackground, - surface = md_theme_dark_surface, + surface = GreyDark, onSurface = md_theme_dark_onSurface, surfaceVariant = md_theme_dark_surfaceVariant, onSurfaceVariant = md_theme_dark_onSurfaceVariant, @@ -102,7 +103,7 @@ private val BlackColors = darkColorScheme( onErrorContainer = md_theme_dark_onErrorContainer, background = PitchBlack, onBackground = md_theme_dark_onBackground, - surface = PitchBlack, + surface = md_theme_dark_surface, onSurface = md_theme_dark_onSurface, surfaceVariant = md_theme_dark_surfaceVariant, onSurfaceVariant = md_theme_dark_onSurfaceVariant,