From b691cb08b32744d240c8111a4f527e54952f6e13 Mon Sep 17 00:00:00 2001 From: Voine Date: Fri, 12 May 2023 20:48:55 +0800 Subject: [PATCH] try fix dark theme --- .../com/chatwaifu/mobile/ui/setting/SettingFragment.kt | 2 ++ app/src/main/java/com/chatwaifu/mobile/ui/theme/Theme.kt | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/chatwaifu/mobile/ui/setting/SettingFragment.kt b/app/src/main/java/com/chatwaifu/mobile/ui/setting/SettingFragment.kt index 2bbe465..7507bb4 100644 --- a/app/src/main/java/com/chatwaifu/mobile/ui/setting/SettingFragment.kt +++ b/app/src/main/java/com/chatwaifu/mobile/ui/setting/SettingFragment.kt @@ -15,6 +15,7 @@ import com.chatwaifu.mobile.ui.theme.ChatWaifu_MobileTheme import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue +import com.chatwaifu.mobile.ui.theme.globalDarkTheme class SettingFragment : Fragment() { @@ -34,6 +35,7 @@ class SettingFragment : Fragment() { var currentDarkMode by rememberSaveable { mutableStateOf(initData.darkModeSwitch) } + globalDarkTheme = currentDarkMode ChatWaifu_MobileTheme(darkTheme = currentDarkMode) { SettingContentScaffold( settingUIState = SettingUIState(initData), diff --git a/app/src/main/java/com/chatwaifu/mobile/ui/theme/Theme.kt b/app/src/main/java/com/chatwaifu/mobile/ui/theme/Theme.kt index dd7510d..2e99e6b 100644 --- a/app/src/main/java/com/chatwaifu/mobile/ui/theme/Theme.kt +++ b/app/src/main/java/com/chatwaifu/mobile/ui/theme/Theme.kt @@ -6,12 +6,18 @@ import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color +var globalDarkTheme: Boolean = false + @Composable fun ChatWaifu_MobileTheme( darkTheme: Boolean = false, content: @Composable () -> Unit, ) { - val colors = if (darkTheme) { + var showTheme = darkTheme + if (darkTheme != globalDarkTheme) { + showTheme = globalDarkTheme + } + val colors = if (showTheme) { ChatWaifuDarkTheme } else { ChatWaifuLightTheme