improvement(Windows,UI): Change the Window title basing on the App theme

Author: AChep

common/build.gradle.kts

@@ -136,6 +136,7 @@ kotlin {
                 api(libs.devsrsouza.feather)
                 api(libs.mm2d.touchicon)
                 api(libs.ksoup.html)
+                api(libs.kdroidfilter.platformtools.darkmodedetector)
             }
         }
         commonTest.dependencies {

common/src/commonMain/kotlin/com/artemchep/keyguard/ui/theme/Theme.kt

@@ -11,9 +11,11 @@ import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.graphics.luminance
@@ -31,8 +33,10 @@ import com.artemchep.keyguard.platform.theme.hasDarkThemeEnabled
 import com.artemchep.keyguard.res.Res
 import com.artemchep.keyguard.res.*
 import com.artemchep.keyguard.ui.theme.m3.dynamicColorScheme
+import kotlinx.coroutines.flow.combine
 import org.jetbrains.compose.resources.Font
 import org.kodein.di.compose.rememberInstance
+import kotlin.Boolean
 
 val ColorScheme.selectedContainer
     @ReadOnlyComposable
@@ -259,32 +263,33 @@ val robotoSansFontFamily: FontFamily
         return FontFamily(Font(res))
     }
 
+
+@Composable
+fun KeyguardTheme(
+    content: @Composable () -> Unit,
+) {
+    val theme = rememberThemeConfigState()
+    val dark = rememberThemeDarkState(
+        config = theme.value,
+    )
+    KeyguardTheme(
+        config = theme.value,
+        dark = dark.value,
+        content = content,
+    )
+}
+
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun KeyguardTheme(
+    config: ThemeConfig,
+    dark: Boolean,
     content: @Composable () -> Unit,
 ) {
-    val getTheme by rememberInstance<GetTheme>()
-    val getThemeUseAmoledDark by rememberInstance<GetThemeUseAmoledDark>()
-    val getThemeExpressive by rememberInstance<GetThemeExpressive>()
-    val getColors by rememberInstance<GetColors>()
-    val expressive by remember(getThemeExpressive) {
-        getThemeExpressive()
-    }.collectAsState(true)
-    val theme by remember(getTheme) {
-        getTheme()
-    }.collectAsState(initial = null)
-    val themeBlack by remember(getThemeUseAmoledDark) {
-        getThemeUseAmoledDark()
-    }.collectAsState(initial = false)
-    val colors by remember(getColors) {
-        getColors()
-    }.collectAsState(initial = null)
-    val isDarkColorScheme = when (theme) {
-        AppTheme.DARK -> true
-        AppTheme.LIGHT -> false
-        null -> CurrentPlatform.hasDarkThemeEnabled()
-    }
+    val expressive = config.expressive
+    val themeBlack = config.useAmoledBlack
+    val colors = config.colors
+    val isDarkColorScheme = dark
 
     val scheme = kotlin.run {
         val scheme = appColorScheme(
@@ -360,6 +365,65 @@ fun KeyguardTheme(
     }
 }
 
+data class ThemeConfig(
+    val expressive: Boolean,
+    val colors: AppColors?,
+    val mode: AppTheme?,
+    val useAmoledBlack: Boolean,
+)
+
+@Composable
+fun rememberThemeConfigState(): State<ThemeConfig> {
+    val getTheme by rememberInstance<GetTheme>()
+    val getThemeUseAmoledDark by rememberInstance<GetThemeUseAmoledDark>()
+    val getThemeExpressive by rememberInstance<GetThemeExpressive>()
+    val getColors by rememberInstance<GetColors>()
+    return remember(
+        getTheme,
+        getThemeUseAmoledDark,
+        getThemeExpressive,
+        getColors,
+    ) {
+        val themeExpressiveFlow = getThemeExpressive()
+        val themeColorsFlow = getColors()
+        val themeModeFlow = getTheme()
+        val themeModeAmoledBlackFlow = getThemeUseAmoledDark()
+        combine(
+            themeExpressiveFlow,
+            themeColorsFlow,
+            themeModeFlow,
+            themeModeAmoledBlackFlow,
+        ) { expressive, colors, mode, modeAmoledBlack ->
+            ThemeConfig(
+                expressive = expressive,
+                colors = colors,
+                mode = mode,
+                useAmoledBlack = modeAmoledBlack,
+            )
+        }
+    }.collectAsState(
+        // use sane defaults
+        initial = ThemeConfig(
+            expressive = true,
+            colors = null,
+            mode = null,
+            useAmoledBlack = false,
+        )
+    )
+}
+
+@Composable
+fun rememberThemeDarkState(
+    config: ThemeConfig,
+): State<Boolean> {
+    val dark = when (config.mode) {
+        AppTheme.DARK -> true
+        AppTheme.LIGHT -> false
+        null -> CurrentPlatform.hasDarkThemeEnabled()
+    }
+    return rememberUpdatedState(dark)
+}
+
 @Composable
 private fun appColorScheme(
     colors: AppColors?,

common/src/desktopMain/kotlin/com/artemchep/keyguard/ui/theme/Theme.kt

@@ -3,8 +3,11 @@
 package com.artemchep.keyguard.ui.theme
 
 import androidx.compose.material3.ColorScheme
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.NonRestartableComposable
+import com.artemchep.keyguard.ui.LocalComposeWindow
+import io.github.kdroidfilter.platformtools.darkmodedetector.windows.setWindowsAdaptiveTitleBar
 
 @Composable
 @NonRestartableComposable
@@ -16,5 +19,6 @@ actual fun appDynamicLightColorScheme(): ColorScheme = plainLightColorScheme()
 
 @Composable
 actual fun SystemUiThemeEffect() {
-    // Do nothing.
+    val dark = MaterialTheme.colorScheme.isDark
+    LocalComposeWindow.current.setWindowsAdaptiveTitleBar(dark)
 }

desktopApp/src/jvmMain/kotlin/com/artemchep/keyguard/Main.kt

@@ -12,6 +12,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.window.ApplicationScope
+import androidx.compose.ui.window.FrameWindowScope
 import androidx.compose.ui.window.Tray
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
@@ -50,7 +51,6 @@ import com.artemchep.keyguard.desktop.util.navigateToEmail
 import com.artemchep.keyguard.desktop.util.navigateToFile
 import com.artemchep.keyguard.desktop.util.navigateToFileInFileManager
 import com.artemchep.keyguard.feature.favicon.Favicon
-import com.artemchep.keyguard.feature.favicon.FaviconUrl
 import com.artemchep.keyguard.feature.keyguard.AppRoute
 import com.artemchep.keyguard.feature.navigation.LocalNavigationBackHandler
 import com.artemchep.keyguard.feature.navigation.NavigationController
@@ -69,7 +69,6 @@ import com.artemchep.keyguard.ui.LocalComposeWindow
 import com.artemchep.keyguard.ui.surface.LocalBackgroundManager
 import com.artemchep.keyguard.ui.surface.LocalSurfaceColor
 import com.artemchep.keyguard.ui.theme.KeyguardTheme
-import io.ktor.http.Url
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -310,21 +309,11 @@ private fun ApplicationScope.KeyguardWindow(
     windowStateManager: WindowStateManager,
     onCloseRequest: () -> Unit,
 ) {
-    val windowState = windowStateManager.rememberWindowState()
-    val keyboardShortcutsService by rememberInstance<KeyboardShortcutsService>()
-    Window(
+    KeyguardWindow(
+        processLifecycleProvider = processLifecycleProvider,
+        windowStateManager = windowStateManager,
         onCloseRequest = onCloseRequest,
-        icon = painterResource(Res.drawable.ic_keyguard),
-        state = windowState,
-        title = "Keyguard",
-        onKeyEvent = { event ->
-            keyboardShortcutsService.handle(event)
-        },
     ) {
-        LaunchLifecycleProviderEffect(
-            processLifecycleProvider = processLifecycleProvider,
-        )
-
         KeyguardTheme {
             val containerColor = LocalBackgroundManager.current.colorHighest
             val containerColorAnimatedState = animateColorAsState(containerColor)
@@ -341,7 +330,6 @@ private fun ApplicationScope.KeyguardWindow(
             ) {
                 CompositionLocalProvider(
                     LocalSurfaceColor provides containerColor,
-                    LocalComposeWindow provides this.window,
                 ) {
                     Navigation(
                         exitApplication = ::exitApplication,
@@ -354,6 +342,36 @@ private fun ApplicationScope.KeyguardWindow(
     }
 }
 
+@Composable
+private fun ApplicationScope.KeyguardWindow(
+    processLifecycleProvider: LePlatformLifecycleProvider,
+    windowStateManager: WindowStateManager,
+    onCloseRequest: () -> Unit,
+    content: @Composable FrameWindowScope.() -> Unit,
+) {
+    val windowState = windowStateManager.rememberWindowState()
+    val keyboardShortcutsService by rememberInstance<KeyboardShortcutsService>()
+    Window(
+        onCloseRequest = onCloseRequest,
+        icon = painterResource(Res.drawable.ic_keyguard),
+        state = windowState,
+        title = "Keyguard",
+        onKeyEvent = { event ->
+            keyboardShortcutsService.handle(event)
+        },
+    ) {
+        CompositionLocalProvider(
+            LocalComposeWindow provides this.window,
+        ) {
+            LaunchLifecycleProviderEffect(
+                processLifecycleProvider = processLifecycleProvider,
+            )
+
+            content()
+        }
+    }
+}
+
 @Composable
 private fun Content() {
     CompositionLocalProvider(

gradle/libs.versions.toml

@@ -108,6 +108,8 @@ kotpass = "0.13.0"
 ksoup = "0.6.0"
 # https://github.com/java-native-access/jna
 jna = "5.18.1"
+# https://github.com/kdroidFilter/Platform-Tool
+platformtools = "0.7.4"
 # https://github.com/osipxd/encrypted-datastore
 osipxdCryptoDatastore = "1.1.1-beta03"
 # https://github.com/cashapp/licensee
@@ -276,6 +278,7 @@ ktor-ktor-serialization-kotlinx = { module = "io.ktor:ktor-serialization-kotlinx
 keemobile-kotpass = { module = "app.keemobile:kotpass", version.ref = "kotpass" }
 ksoup-html = { module = "com.mohamedrejeb.ksoup:ksoup-html", version.ref = "ksoup" }
 java-jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+kdroidfilter-platformtools-darkmodedetector = { module = "io.github.kdroidfilter:platformtools.darkmodedetector", version.ref = "platformtools" }
 osipxd-security-crypto-datastore-preferences = { module = "io.github.osipxd:security-crypto-datastore-preferences", version.ref = "osipxdCryptoDatastore" }
 bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bouncycastle" }
 bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncycastle" }