zobrist/TichuCounter
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases 9 Wiki Activity

Fix Theme
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Fabian Zobrist
2023-01-20 08:39:27 +01:00
parent bd19858834
commit 8b4ce20c99
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/me/zobrist/tichucounter/ui/Color.kt
View File

@@ -1,4 +1,5 @@
package me.zobrist.tichucounter.ui package me.zobrist.tichucounter.ui
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
val md_theme_light_primary = Color(0xFFBE0034) val md_theme_light_primary = Color(0xFFBE0034)

29
app/src/main/java/me/zobrist/tichucounter/ui/Theme.kt
View File

@@ -1,11 +1,10 @@
package me.zobrist.tichucounter.ui package me.zobrist.tichucounter.ui
import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.*
import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable
import androidx.compose.material3.darkColorScheme import androidx.compose.ui.platform.LocalContext
import androidx.compose.runtime.*
import com.google.accompanist.systemuicontroller.rememberSystemUiController
private val LightColors = lightColorScheme( private val LightColors = lightColorScheme(
@@ -75,22 +74,22 @@ private val DarkColors = darkColorScheme(
@Composable @Composable
fun AppTheme( fun AppTheme(
useDarkTheme: Boolean = isSystemInDarkTheme(), useDarkTheme: Boolean = isSystemInDarkTheme(),
content: @Composable() () -> Unit 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 -> dynamicDarkColorScheme(LocalContext.current)
dynamicColor && !useDarkTheme -> dynamicLightColorScheme(LocalContext.current) dynamicColor && !useDarkTheme -> dynamicLightColorScheme(LocalContext.current)
darkTheme -> DarkColors useDarkTheme -> DarkColors
else -> LightColors else -> LightColors
} }
MaterialTheme( MaterialTheme(
colorScheme = colors, colorScheme = colors,
content = content content = content
) )
} }