release/2.0 #21

Merged
fabian merged 137 commits from release/2.0 into master 2023-01-28 23:29:27 +01:00
Showing only changes of commit 395f93ca89 - Show all commits

View File

@@ -78,11 +78,16 @@ fun AppTheme(
useDarkTheme: Boolean = isSystemInDarkTheme(),
content: @Composable() () -> Unit
) {
val colors = if (!useDarkTheme) {
LightColors
} else {
DarkColors
}
val dynamicColor = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
val colors = when {
dynamicColor && useDarkTheme - > dynamicDarkColorScheme(LocalContext.current)
dynamicColor && !useDarkTheme - > dynamicLightColorScheme(LocalContext.current)
darkTheme - > DarkColors
else - > LightColors
}
MaterialTheme(
colorScheme = colors,