Refactor tray logic for improved cross-platform consistency

.gitignore

@@ -46,3 +46,6 @@ bin/
 
 .idea
 tray_position.properties
+
+linuxlib/build-x86-64
+linuxlibdbus/build-x86-64

build.gradle.kts

@@ -1,4 +1,3 @@
-import com.vanniktech.maven.publish.SonatypeHost
 import org.jetbrains.dokka.gradle.DokkaTask
 
 plugins {
@@ -38,11 +37,14 @@ kotlin {
         commonMain.dependencies {
             implementation(compose.runtime)
             implementation(compose.foundation)
+            implementation(compose.ui)
             implementation(libs.jna)
             implementation(libs.jna.platform)
             implementation(libs.kotlinx.coroutines.core)
-            implementation(libs.kmp.log)
+            implementation(libs.kotlinx.coroutines.swing)
             implementation(libs.platformtools.core)
+            implementation(libs.platformtools.darkmodedetector)
+
         }
     }
 
@@ -54,8 +56,20 @@ val buildWin: TaskProvider<Exec> = tasks.register<Exec>("buildNativeWin") {
     commandLine("cmd", "/c", "build.bat")
 }
 
+val buildMac: TaskProvider<Exec> = tasks.register<Exec>("buildNativeMac") {
+    onlyIf { System.getProperty("os.name").startsWith("Mac") }
+    workingDir(rootDir.resolve("maclib"))
+    commandLine("sh", "build.sh")
+}
+
+val buildLinux: TaskProvider<Exec> = tasks.register<Exec>("buildNativeLinux") {
+//    onlyIf { System.getProperty("os.name").toLowerCase().contains("linux") }
+//    workingDir(rootDir.resolve("linuxlibdbus"))
+////    commandLine("./build.sh")
+}
+
 tasks.register("buildNativeLibraries") {
-    dependsOn(buildWin)
+    dependsOn(buildWin, buildLinux, buildMac)
 }
 
 mavenPublishing {
@@ -95,7 +109,7 @@ mavenPublishing {
     }
 
     // Configure publishing to Maven Central
-    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
+    publishToMavenCentral()
 
 
     // Enable GPG signing for all publications

demo/build.gradle.kts

@@ -1,4 +1,5 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.gradle.api.tasks.JavaExec
 
 plugins {
     alias(libs.plugins.multiplatform)
@@ -18,8 +19,10 @@ kotlin {
             implementation(compose.desktop.currentOs)
             implementation(compose.components.resources)
             implementation(compose.material3)
-            implementation("org.jetbrains.compose.material:material-icons-core:1.7.3")
-            implementation(libs.kmp.log)
+            implementation(compose.materialIconsExtended)
+            implementation(libs.kermit)
+            implementation(libs.platformtools.darkmodedetector)
+
         }
     }
 }
@@ -41,3 +44,22 @@ compose.desktop {
         }
     }
 }
+
+// Task to build native libraries and run the demo
+tasks.register("buildAndRunDemo") {
+    // Depend on the buildNativeLibraries task from the root project
+    dependsOn(rootProject.tasks.named("buildNativeLibraries"))
+
+    // This task doesn't do anything by itself, it just depends on buildNativeLibraries
+    // and will be followed by the run task
+    doLast {
+        println("Native libraries built successfully. Starting demo application...")
+    }
+
+    // Make sure the run task is executed after this task
+    finalizedBy(tasks.named("run"))
+
+    // Description for the task
+    description = "Builds the native libraries and then runs the demo application"
+    group = "application"
+}

demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/App.kt

@@ -1,12 +1,14 @@
 package com.kdroid.composetray.demo
 
 import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import io.github.kdroidfilter.platformtools.darkmodedetector.isSystemInDarkMode
 import kotlin.system.exitProcess
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -19,14 +21,17 @@ fun App(
     onToggleChange: (Boolean, Boolean) -> Unit
 ) {
     var currentScreen by remember { mutableStateOf(Screen.Screen1) }
+
+    // Automatically detect system theme
+    val isDarkTheme = isSystemInDarkMode()
 
-    // Material3 Theme
+    // Material3 Theme with dark mode support
     MaterialTheme(
-        colorScheme = lightColorScheme(
-            primary = MaterialTheme.colorScheme.primary,
-            secondary = MaterialTheme.colorScheme.secondary,
-            tertiary = MaterialTheme.colorScheme.tertiary
-        )
+        colorScheme = if (isDarkTheme) {
+            darkColorScheme()
+        } else {
+            lightColorScheme()
+        }
     ) {
         Scaffold(
             topBar = {

demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoAdaptivePositionWindows.kt

@@ -11,29 +11,33 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
+import androidx.compose.ui.window.WindowState
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import com.kdroid.composetray.tray.api.Tray
+import com.kdroid.composetray.utils.ComposeNativeTrayLoggingLevel
 import com.kdroid.composetray.utils.SingleInstanceManager
+import com.kdroid.composetray.utils.allowComposeNativeTrayLogging
+import com.kdroid.composetray.utils.composeNativeTrayloggingLevel
 import com.kdroid.composetray.utils.getTrayPosition
 import com.kdroid.composetray.utils.getTrayWindowPosition
-import com.kdroid.kmplog.Log
-import com.kdroid.kmplog.d
-import com.kdroid.kmplog.i
 import composenativetray.demo.generated.resources.Res
 import composenativetray.demo.generated.resources.icon
 import org.jetbrains.compose.resources.painterResource
 
 fun main() = application {
-    Log.setDevelopmentMode(true)
+    allowComposeNativeTrayLogging = false
+    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
     val logTag = "NativeTray"
-
-    Log.d("TrayPosition", getTrayPosition().toString())
+    
+    println("$logTag: TrayPosition: ${getTrayPosition()}")
 
     var isWindowVisible by remember { mutableStateOf(true) }
     var textVisible by remember { mutableStateOf(false) }
-    var alwaysShowTray by remember { mutableStateOf(false) }
+    var alwaysShowTray by remember { mutableStateOf(true) }
     var hideOnClose by remember { mutableStateOf(true) }
+    var notificationsEnabled by remember { mutableStateOf(false) }
+    var initialChecked by remember { mutableStateOf(true) }
 
     val isSingleInstance = SingleInstanceManager.isSingleInstance(onRestoreRequest = {
         isWindowVisible = true
@@ -62,7 +66,7 @@ fun main() = application {
            },
             primaryAction = {
                 isWindowVisible = true
-                Log.i(logTag, "On Primary Clicked")
+                println("$logTag: On Primary Clicked")
             },
             primaryActionLabel = "Open the Application",
             tooltip = "My Application"
@@ -71,46 +75,64 @@ fun main() = application {
             // Tools SubMenu
             SubMenu(label = "Tools") {
                 Item(label = "Calculator") {
-                    Log.i(logTag, "Calculator launched")
+                    println("$logTag: Calculator launched")
                 }
                 Item(label = "Notepad") {
-                    Log.i(logTag, "Notepad opened")
+                    println("$logTag: Notepad opened")
                 }
             }
 
             Divider()
 
             // Checkable Items
-            CheckableItem(label = "Enable notifications") { isChecked ->
-                Log.i(logTag, "Notifications ${if (isChecked) "enabled" else "disabled"}")
-            }
-            CheckableItem(label = "Initial Checked", checked = true) { isChecked ->
-                Log.i(logTag, "Initial Checked ${if (isChecked) "enabled" else "disabled"}")
-            }
+            CheckableItem(
+                label = "Enable notifications",
+                checked = notificationsEnabled,
+                onCheckedChange = { isChecked ->
+                    notificationsEnabled = isChecked
+                    println("$logTag: Notifications ${if (isChecked) "enabled" else "disabled"}")
+                }
+            )
+            CheckableItem(
+                label = "Initial Checked",
+                checked = initialChecked,
+                onCheckedChange = { isChecked ->
+                    initialChecked = isChecked
+                    println("$logTag: Initial Checked ${if (isChecked) "enabled" else "disabled"}")
+                }
+            )
 
             Divider()
 
             Item(label = "About") {
-                Log.i(logTag, "Application v1.0 - Developed by Elyahou")
+                println("$logTag: Application v1.0 - Developed by Elyahou")
             }
 
             Divider()
 
-            CheckableItem(label = "Always show tray", checked = alwaysShowTray) { isChecked ->
-                alwaysShowTray = isChecked
-                Log.i(logTag, "Always show tray ${if (isChecked) "enabled" else "disabled"}")
-            }
-
-            CheckableItem(label = "Hide on close", checked = hideOnClose) { isChecked ->
-                hideOnClose = isChecked
-                Log.i(logTag, "Hide on close ${if (isChecked) "enabled" else "disabled"}")
-            }
+            CheckableItem(
+                label = "Always show tray",
+                checked = alwaysShowTray,
+                onCheckedChange = { isChecked ->
+                    alwaysShowTray = isChecked
+                    println("$logTag: Always show tray ${if (isChecked) "enabled" else "disabled"}")
+                }
+            )
+
+            CheckableItem(
+                label = "Hide on close",
+                checked = hideOnClose,
+                onCheckedChange = { isChecked ->
+                    hideOnClose = isChecked
+                    println("$logTag: Hide on close ${if (isChecked) "enabled" else "disabled"}")
+                }
+            )
 
             Divider()
 
 
             Item(label = "Exit", isEnabled = true) {
-                Log.i(logTag, "Exiting the application")
+                println("$logTag: Exiting the application")
                 dispose()
                 exitApplication()
             }
@@ -120,7 +142,7 @@ fun main() = application {
     }
 
 
-    val windowWidth = 800
+    val windowWidth = 300
     val windowHeight = 600
     val windowPosition = getTrayWindowPosition(windowWidth, windowHeight)
 
@@ -132,7 +154,7 @@ fun main() = application {
                 exitApplication()
             }
         },
-        state = rememberWindowState(
+        state = WindowState(
             width = windowWidth.dp,
             height = windowHeight.dp,
             position = windowPosition
@@ -146,4 +168,4 @@ fun main() = application {
             hideOnClose = hideOnCloseState
         }
     }
-}
+}