From 8b4ce20c9952d0335e0c879cc3277b83f4ed38e6 Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Fri, 20 Jan 2023 08:39:27 +0100 Subject: [PATCH] Fix Theme --- .../java/me/zobrist/tichucounter/ui/Color.kt | 1 + .../java/me/zobrist/tichucounter/ui/Theme.kt | 29 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt b/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt index 3b116a5..60a5280 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt @@ -1,4 +1,5 @@ package me.zobrist.tichucounter.ui + import androidx.compose.ui.graphics.Color val md_theme_light_primary = Color(0xFFBE0034) diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/Theme.kt b/app/src/main/java/me/zobrist/tichucounter/ui/Theme.kt index 2dedce5..f128cc7 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/Theme.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/Theme.kt @@ -1,11 +1,10 @@ package me.zobrist.tichucounter.ui +import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.lightColorScheme -import androidx.compose.material3.darkColorScheme -import androidx.compose.runtime.* -import com.google.accompanist.systemuicontroller.rememberSystemUiController +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext private val LightColors = lightColorScheme( @@ -75,22 +74,22 @@ private val DarkColors = darkColorScheme( @Composable fun AppTheme( - useDarkTheme: Boolean = isSystemInDarkTheme(), - content: @Composable() () -> Unit + useDarkTheme: Boolean = isSystemInDarkTheme(), + content: @Composable() () -> Unit ) { - val dynamicColor = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S + val dynamicColor = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S - val colors = when { + val colors = when { dynamicColor && useDarkTheme -> dynamicDarkColorScheme(LocalContext.current) dynamicColor && !useDarkTheme -> dynamicLightColorScheme(LocalContext.current) - darkTheme -> DarkColors + useDarkTheme -> DarkColors else -> LightColors - } + } - MaterialTheme( - colorScheme = colors, - content = content - ) + MaterialTheme( + colorScheme = colors, + content = content + ) } \ No newline at end of file