Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1225 from vector-im/feature/bma/forceDarkTheme

Browse source 
Fix system bar color after login on light theme.
This commit is contained in:
Benoit Marty 2023-09-05 17:30:56 +02:00 • committed by GitHub
commit d4b527fb80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libraries/theme/src/main/kotlin/io/element/android/libraries/theme/ElementTheme.kt
View file

@ -92,6 +92,7 @@ internal val LocalCompoundColors = staticCompositionLocalOf { compoundColorsLigh
@Composable
fun ElementTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
lightStatusBar: Boolean = !darkTheme,
dynamicColor: Boolean = false, /* true to enable MaterialYou */
compoundColors: SemanticColors = if (darkTheme) compoundColorsDark else compoundColorsLight,
materialLightColors: ColorScheme = materialColorSchemeLight,
@ -111,8 +112,19 @@ fun ElementTheme(
darkTheme -> materialDarkColors
else -> materialLightColors
}
val statusBarColorScheme = if (lightStatusBar) {
when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
val context = LocalContext.current
dynamicLightColorScheme(context)
}
else -> materialLightColors
}
} else {
colorScheme
}
SideEffect {
systemUiController.applyTheme(colorScheme = colorScheme, darkTheme = darkTheme)
systemUiController.applyTheme(colorScheme = statusBarColorScheme, darkTheme = darkTheme && !lightStatusBar)
}
CompositionLocalProvider(
LocalCompoundColors provides currentCompoundColor,
@ -132,6 +144,7 @@ fun ElementTheme(
*/
@Composable
fun ForcedDarkElementTheme(
lightStatusBar: Boolean = false,
content: @Composable () -> Unit,
) {
val systemUiController = rememberSystemUiController()
@ -142,7 +155,7 @@ fun ForcedDarkElementTheme(
systemUiController.applyTheme(colorScheme, wasDarkTheme)
}
}
ElementTheme(darkTheme = true, content = content)
ElementTheme(darkTheme = true, lightStatusBar = lightStatusBar, content = content)
}
private fun SystemUiController.applyTheme(