fix(desktop, windows): update custom header theme

Author: Irineu333

application/src/desktopMain/kotlin/com/neoutils/neoregex/App.desktop.kt

@@ -59,6 +59,7 @@ import org.koin.compose.koinInject
 
 @Composable
 fun ApplicationScope.DesktopApp() = WithKoin {
+
     val preferencesDataSource = koinInject<PreferencesDataSource>()
     val preferences by preferencesDataSource.flow.collectAsState()
 
@@ -85,68 +86,77 @@ fun ApplicationScope.DesktopApp() = WithKoin {
 }
 
 @Composable
-private fun FrameWindowScope.HeaderImpl() = NeoHeader { padding ->
+private fun FrameWindowScope.HeaderImpl() {
 
     val preferencesDataSource = koinInject<PreferencesDataSource>()
     val preferences by preferencesDataSource.flow.collectAsStateWithLifecycle()
 
-    Text(
-        text = stringResource(Res.string.app_name),
-        modifier = Modifier.align(
-            Alignment.Center
-        )
-    )
-
-    Row(
-        modifier = Modifier
-            .padding(padding)
-            .padding(horizontal = dimensions.medium)
-            .align(Alignment.CenterEnd),
-        horizontalArrangement = Arrangement.spacedBy(dimensions.medium)
-    ) {
-        val uriHandler = LocalUriHandler.current
+    NeoHeader(
+        colorTheme = when (preferences.colorTheme) {
+            Preferences.ColorTheme.SYSTEM -> rememberColorTheme()
+            Preferences.ColorTheme.LIGHT -> ColorTheme.LIGHT
+            Preferences.ColorTheme.DARK -> ColorTheme.DARK
+        }
+    ) { padding ->
 
-        Icon(
-            painter = painterResource(Res.drawable.github),
-            contentDescription = null,
-            tint = colorScheme.onSurface,
-            modifier = Modifier
-                .clip(CircleShape)
-                .clickable(
-                    onClick = {
-                        uriHandler.openUri(
-                            uri = "https://github.com/NeoUtils/NeoRegex"
-                        )
-                    }
-                )
-                .padding(dimensions.medium)
-                .aspectRatio(ratio = 1f)
+        Text(
+            text = stringResource(Res.string.app_name),
+            modifier = Modifier.align(
+                Alignment.Center
+            )
         )
 
-        Icon(
-            painter = when (preferences.colorTheme) {
-                Preferences.ColorTheme.SYSTEM -> painterResource(Res.drawable.contrast)
-                Preferences.ColorTheme.LIGHT -> painterResource(Res.drawable.light_theme)
-                Preferences.ColorTheme.DARK -> painterResource(Res.drawable.dark_theme)
-            },
-            contentDescription = null,
+        Row(
             modifier = Modifier
-                .clip(CircleShape)
-                .clickable(
-                    onClick = {
-                        preferencesDataSource.update {
-                            it.copy(
-                                colorTheme = when (it.colorTheme) {
-                                    Preferences.ColorTheme.SYSTEM -> Preferences.ColorTheme.LIGHT
-                                    Preferences.ColorTheme.LIGHT -> Preferences.ColorTheme.DARK
-                                    Preferences.ColorTheme.DARK -> Preferences.ColorTheme.SYSTEM
-                                }
+                .padding(padding)
+                .padding(horizontal = dimensions.medium)
+                .align(Alignment.CenterEnd),
+            horizontalArrangement = Arrangement.spacedBy(dimensions.medium)
+        ) {
+            val uriHandler = LocalUriHandler.current
+
+            Icon(
+                painter = painterResource(Res.drawable.github),
+                contentDescription = null,
+                tint = colorScheme.onSurface,
+                modifier = Modifier
+                    .clip(CircleShape)
+                    .clickable(
+                        onClick = {
+                            uriHandler.openUri(
+                                uri = "https://github.com/NeoUtils/NeoRegex"
                             )
                         }
-                    }
-                )
-                .padding(dimensions.medium)
-                .aspectRatio(ratio = 1f)
-        )
+                    )
+                    .padding(dimensions.medium)
+                    .aspectRatio(ratio = 1f)
+            )
+
+            Icon(
+                painter = when (preferences.colorTheme) {
+                    Preferences.ColorTheme.SYSTEM -> painterResource(Res.drawable.contrast)
+                    Preferences.ColorTheme.LIGHT -> painterResource(Res.drawable.light_theme)
+                    Preferences.ColorTheme.DARK -> painterResource(Res.drawable.dark_theme)
+                },
+                contentDescription = null,
+                modifier = Modifier
+                    .clip(CircleShape)
+                    .clickable(
+                        onClick = {
+                            preferencesDataSource.update {
+                                it.copy(
+                                    colorTheme = when (it.colorTheme) {
+                                        Preferences.ColorTheme.SYSTEM -> Preferences.ColorTheme.LIGHT
+                                        Preferences.ColorTheme.LIGHT -> Preferences.ColorTheme.DARK
+                                        Preferences.ColorTheme.DARK -> Preferences.ColorTheme.SYSTEM
+                                    }
+                                )
+                            }
+                        }
+                    )
+                    .padding(dimensions.medium)
+                    .aspectRatio(ratio = 1f)
+            )
+        }
     }
-}
+}

core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/DefaultHeader.kt

@@ -50,7 +50,7 @@ import com.neoutils.neoregex.core.common.util.rememberColorTheme
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.dimensions
 import com.neoutils.neoregex.core.sharedui.remember.NeoWindowState
 import com.neoutils.neoregex.core.sharedui.remember.WindowFocus
-import com.neoutils.neoregex.core.sharedui.remember.rememberCompleteWindowState
+import com.neoutils.neoregex.core.sharedui.remember.rememberNeoWindowState
 import com.neoutils.neoregex.core.sharedui.remember.rememberWindowFocus
 import java.awt.Frame
 import java.awt.event.MouseEvent
@@ -66,7 +66,7 @@ fun FrameWindowScope.NeoHeader(
 ) {
 
     val focus = rememberWindowFocus()
-    val state = rememberCompleteWindowState()
+    val state = rememberNeoWindowState()
 
     val dragHandler = remember { DragHandler(window) }
 

core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/NeoWindow.kt

@@ -38,7 +38,7 @@ import com.neoutils.neoregex.core.resources.Res
 import com.neoutils.neoregex.core.resources.app_name
 import com.neoutils.neoregex.core.resources.flavicon
 import com.neoutils.neoregex.core.sharedui.remember.NeoWindowState
-import com.neoutils.neoregex.core.sharedui.remember.rememberCompleteWindowState
+import com.neoutils.neoregex.core.sharedui.remember.rememberNeoWindowState
 import com.neoutils.neoregex.core.sharedui.util.NeoRegexWindowExceptionHandlerFactory
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
@@ -76,7 +76,7 @@ fun ApplicationScope.NeoWindow(
             state = windowState
         ) {
 
-            val completeWindowState = rememberCompleteWindowState()
+            val completeWindowState = rememberNeoWindowState()
 
             Surface(
                 color = colorScheme.background,

core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/remember/WindowState.kt

@@ -29,7 +29,7 @@ import java.awt.event.WindowStateListener
 
 
 @Composable
-fun FrameWindowScope.rememberCompleteWindowState(): NeoWindowState {
+fun FrameWindowScope.rememberNeoWindowState(): NeoWindowState {
 
     var state by remember { mutableStateOf(NeoWindowState.of(window)) }