From c56b7f28837d3328969a4a2a1b7713f33ad22dc7 Mon Sep 17 00:00:00 2001 From: Russell Richardson Date: Mon, 24 Apr 2023 08:07:34 -0400 Subject: [PATCH 1/2] Disable light status bars when system dark theme is active --- app/src/main/java/com/jerboa/ui/theme/Theme.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/src/main/java/com/jerboa/ui/theme/Theme.kt b/app/src/main/java/com/jerboa/ui/theme/Theme.kt index 57b23dfb8..b53d88da9 100644 --- a/app/src/main/java/com/jerboa/ui/theme/Theme.kt +++ b/app/src/main/java/com/jerboa/ui/theme/Theme.kt @@ -1,15 +1,19 @@ package com.jerboa.ui.theme +import android.app.Activity import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView import androidx.compose.ui.unit.sp import androidx.core.graphics.ColorUtils +import androidx.core.view.WindowCompat import com.jerboa.ThemeColor import com.jerboa.ThemeMode import com.jerboa.db.AppSettings @@ -54,6 +58,16 @@ fun JerboaTheme( val typography = generateTypography(fontSize) + val view = LocalView.current + + if(isSystemInDarkTheme()) { + SideEffect { + val window = (view.context as Activity).window + val insets = WindowCompat.getInsetsController(window, view) + insets.isAppearanceLightStatusBars = false + } + } + MaterialTheme( colorScheme = colors, typography = typography, From c0c9aee15ea4ba4dadedf63e5cb3521e2824c2be Mon Sep 17 00:00:00 2001 From: Russell Richardson Date: Mon, 24 Apr 2023 22:29:30 -0400 Subject: [PATCH 2/2] Fix formatting for Theme.kt --- app/src/main/java/com/jerboa/ui/theme/Theme.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/jerboa/ui/theme/Theme.kt b/app/src/main/java/com/jerboa/ui/theme/Theme.kt index b53d88da9..0c1453157 100644 --- a/app/src/main/java/com/jerboa/ui/theme/Theme.kt +++ b/app/src/main/java/com/jerboa/ui/theme/Theme.kt @@ -60,7 +60,7 @@ fun JerboaTheme( val view = LocalView.current - if(isSystemInDarkTheme()) { + if (isSystemInDarkTheme()) { SideEffect { val window = (view.context as Activity).window val insets = WindowCompat.getInsetsController(window, view)