diff --git a/manager/app/build.gradle b/manager/app/build.gradle index 0afaca36..9ad846ca 100644 --- a/manager/app/build.gradle +++ b/manager/app/build.gradle @@ -72,6 +72,8 @@ dependencies { implementation "androidx.navigation:navigation-compose:$nav_version" implementation "com.google.accompanist:accompanist-drawablepainter:0.28.0" + implementation "com.google.accompanist:accompanist-systemuicontroller:0.28.0" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1" diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Home.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Home.kt index 15f8a7cb..022f100b 100644 --- a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Home.kt +++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Home.kt @@ -24,16 +24,17 @@ import me.weishu.kernelsu.getKernelVersion @Composable fun Info(label: String, value: String) { Text( - buildAnnotatedString { + text = buildAnnotatedString { append("$label: ") withStyle( style = SpanStyle( - fontWeight = FontWeight.W900, + fontWeight = FontWeight.W500, ) ) { append(value) } - } + }, + softWrap = true, ) } diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/theme/Theme.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/theme/Theme.kt index f5058cbe..fe81ceb8 100644 --- a/manager/app/src/main/java/me/weishu/kernelsu/ui/theme/Theme.kt +++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/theme/Theme.kt @@ -11,6 +11,7 @@ import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView import androidx.core.view.ViewCompat +import com.google.accompanist.systemuicontroller.rememberSystemUiController private val DarkColorScheme = darkColorScheme( primary = YELLOW, @@ -39,12 +40,13 @@ fun KernelSUTheme( darkTheme -> DarkColorScheme else -> LightColorScheme } - val view = LocalView.current - if (!view.isInEditMode) { - SideEffect { - (view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb() - ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme - } + + val systemUiController = rememberSystemUiController() + SideEffect { + systemUiController.setStatusBarColor( + color = colorScheme.surface, + darkIcons = !darkTheme + ) } MaterialTheme(