Merge remote-tracking branch 'origin/master'

Author: kdroidFilter

README.md

@@ -22,7 +22,7 @@
 - **Single Instance Management**: Ensures that only one instance of the application can run at a time and allows restoring focus to the running instance when another instance is attempted.
 - **Tray Position Detection**: Allows determining the position of the system tray, which helps in positioning related windows appropriately.
 - **Compose Recomposition Support**: The tray supports Compose recomposition, making it possible to dynamically show or hide the tray icon, for example:
-  
+
 <p align="center">
   <img src="screenshots/demo.gif" alt="demo">
 </p>
@@ -63,7 +63,7 @@ application {
       Icon(
         Icons.Default.Favorite,
         contentDescription = "",
-        tint = Color.White,
+        tint = Color.Unspecified, // If not defined icon will be tinted with LocalContentColor.current
         modifier = Modifier.fillMaxSize() // This is crucial!
       )
     },
@@ -131,6 +131,41 @@ application {
 - **dispose**: Call to remove the system tray icon and exit gracefully.
 - **Primary Action**: An action triggered by a left-click on the tray icon (Windows and macOS) or as a top item in the context menu (Linux).
 
+### 🎨 Icon Rendering Customization
+
+The `IconRenderProperties` class allows you to customize how your tray icon is rendered. This is an optional parameter when using the Tray component, with a default value already provided:
+
+```kotlin
+iconRenderProperties = IconRenderProperties.forCurrentOperatingSystem()
+```
+
+#### Available Factory Methods:
+
+1. **forCurrentOperatingSystem()**: Creates properties optimized for the current operating system:
+   - Windows: 32x32 pixels
+   - macOS: 44x44 pixels
+   - Linux: 24x24 pixels
+
+   ```kotlin
+   IconRenderProperties.forCurrentOperatingSystem(
+       sceneWidth = 192,    // Optional: Width of the compose scene (default: 192)
+       sceneHeight = 192,   // Optional: Height of the compose scene (default: 192)
+       density = Density(2f) // Optional: Density for the compose scene (default: 2f)
+   )
+   ```
+
+2. **withoutScalingAndAliasing()**: Creates properties that don't force icon scaling and aliasing:
+
+   ```kotlin
+   IconRenderProperties.withoutScalingAndAliasing(
+       sceneWidth = 192,    // Optional: Width of the compose scene (default: 192)
+       sceneHeight = 192,   // Optional: Height of the compose scene (default: 192)
+       density = Density(2f) // Optional: Density for the compose scene (default: 2f)
+   )
+   ```
+
+This allows you to fine-tune how your icon appears in the system tray across different platforms.
+
 ### 🔄 Single Instance Management
 
 The `SingleInstanceManager` ensures that only one instance of the application is running at a time. When a second instance tries to start, it sends a restore request to the existing instance to bring it to the foreground.
@@ -153,6 +188,22 @@ if (!isSingleInstance) {
 
 In this example, the `SingleInstanceManager` will check if an instance is already running. If not, it will acquire the lock and start watching for restore requests. If an instance is already running, it will send a restore request to bring the existing window to the foreground, allowing you to focus on the already-running application rather than starting a new instance.
 
+#### Configuration
+
+`SingleInstanceManager` can be configured:
+```kotlin
+SingleInstanceManager.configuration = Configuration(
+    lockFilesDir = Paths.get("path/to/your/app/data/dir/single_instance_manager"),
+    appIdentifier = "app_id"
+)
+```
+This is useful when you need single-instance management but want finer-grained control.
+
+By specifying a custom `lockFilesDir`, you limit the scope of single-instance management
+from every instance of your app on the whole system to only those that share the specified data directory.
+
+Setting the custom `appIdentifier` can be used for even more granular control.
+
 ### 📌 Tray Position Detection
 
 The `getTrayPosition()` function allows you to determine the current position of the system tray on the screen. This information can be useful for aligning application windows relative to the tray icon.
@@ -213,4 +264,4 @@ Feel free to open issues or pull requests if you find any bugs or have suggestio
 
 ## 🙏 Acknowledgements
 
-This library is developed and maintained by Elie G, aiming to provide an easy and cross-platform system tray solution for Kotlin applications.
+This library is developed and maintained by Elie G, aiming to provide an easy and cross-platform system tray solution for Kotlin applications.

build.gradle.kts

@@ -10,7 +10,11 @@ plugins {
 }
 
 group = "com.kdroid.composenativetray"
-version = "0.6.0"
+val ref = System.getenv("GITHUB_REF") ?: ""
+val version = if (ref.startsWith("refs/tags/")) {
+    val tag = ref.removePrefix("refs/tags/")
+    if (tag.startsWith("v")) tag.substring(1) else tag
+} else "dev"
 
 repositories {
     mavenCentral()
@@ -48,7 +52,7 @@ mavenPublishing {
     coordinates(
         groupId = "io.github.kdroidfilter",
         artifactId = "composenativetray",
-        version = version.toString()
+        version = version
     )
 
     // Configure POM metadata for the published artifact

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

@@ -1,6 +1,6 @@
 package com.kdroid.composetray.demo
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.Icon
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Notifications
 import androidx.compose.runtime.getValue
@@ -9,13 +9,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import com.kdroid.composetray.tray.api.Tray
+import com.kdroid.composetray.utils.IconRenderProperties
 import com.kdroid.composetray.utils.SingleInstanceManager
 import com.kdroid.composetray.utils.getTrayPosition
 import com.kdroid.composetray.utils.getTrayWindowPosition
@@ -55,11 +54,11 @@ fun main() = application {
         // Use alwaysShowTray as a key to force recomposition when it changes
         Tray(
            iconContent = {
-               Image(
+               Icon(
                    Icons.Default.Notifications,
                    contentDescription = "Application Icon",
                    modifier = Modifier.fillMaxSize(),
-                   colorFilter = ColorFilter.tint(if (alwaysShowTray) Color.White else Color.White)
+                   tint = Color.White,
                )
            },
             primaryAction = {

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

@@ -13,6 +13,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import com.kdroid.composetray.tray.api.Tray
+import com.kdroid.composetray.utils.IconRenderProperties
 import com.kdroid.composetray.utils.SingleInstanceManager
 import com.kdroid.composetray.utils.getTrayPosition
 import com.kdroid.kmplog.Log
@@ -52,7 +53,7 @@ fun main() = application {
                     Icons.Default.Favorite,
                     contentDescription = "",
                     // Use alwaysShowTray as a key to force recomposition when it changes
-                    tint = if (alwaysShowTray) Color.White else Color.White,
+                    tint = Color.White,
                     modifier = Modifier.fillMaxSize()
                 )
             },

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

@@ -10,7 +10,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application

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

@@ -8,6 +8,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import com.kdroid.composetray.tray.api.Tray
+import com.kdroid.composetray.utils.IconRenderProperties
 import com.kdroid.composetray.utils.SingleInstanceManager
 import com.kdroid.composetray.utils.getTrayPosition
 import com.kdroid.kmplog.Log
@@ -57,7 +58,6 @@ fun main() = application {
                     painter = painterResource(icon),
                     contentDescription = "Application Icon",
                     // Use alwaysShowTray as a key to force recomposition when it changes
-                    colorFilter = if (alwaysShowTray) null else null
                 )
             },
             primaryAction = {

gradle/libs.versions.toml

@@ -1,9 +1,8 @@
 [versions]
 kermit = "2.0.5"
 kotlin = "2.1.20"
-agp = "8.9.2"
 kotlinx-coroutines = "1.10.2"
-compose = "1.7.3"
+compose = "1.8.0"
 jna = "5.17.0"
 platformtools = "0.2.9"
 
@@ -13,15 +12,12 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
 jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
 jna-platform = { module = "net.java.dev.jna:jna-platform", version.ref = "jna" }
 platformtools-core = { module = "io.github.kdroidfilter:platformtools.core", version.ref = "platformtools" }
-platformtools-darkmodedetector = { module = "io.github.kdroidfilter:platformtools.darkmodedetector", version.ref = "platformtools" }
 kmp-log = { module = "io.github.kdroidfilter:kmplog", version = "0.3.0" }
 
 [plugins]
 
 multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-android-library = { id = "com.android.library", version.ref = "agp" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-android-application = { id = "com.android.application", version.ref = "agp" }
 vannitktech-maven-publish = {id = "com.vanniktech.maven.publish", version = "0.31.0"}
 dokka = { id = "org.jetbrains.dokka" , version = "2.0.0"}

src/commonMain/kotlin/com/kdroid/composetray/tray/api/NativeTray.kt

@@ -9,7 +9,7 @@ import com.kdroid.composetray.tray.impl.AwtTrayInitializer
 import com.kdroid.composetray.tray.impl.LinuxTrayInitializer
 import com.kdroid.composetray.tray.impl.WindowsTrayInitializer
 import com.kdroid.composetray.utils.ComposableIconUtils
-
+import com.kdroid.composetray.utils.IconRenderProperties
 import com.kdroid.composetray.utils.extractToTempIfDifferent
 import com.kdroid.kmplog.Log
 import com.kdroid.kmplog.d
@@ -47,37 +47,22 @@ internal class NativeTray {
      */
     constructor(
         iconContent: @Composable () -> Unit,
+        iconRenderProperties: IconRenderProperties = IconRenderProperties(),
         tooltip: String = "",
         primaryAction: (() -> Unit)?,
         primaryActionLinuxLabel: String,
-        menuContent: (TrayMenuBuilder.() -> Unit)? = null,
-        iconWidth: Int = 200,
-        iconHeight: Int = 200,
-        density: Float = 2f
+        menuContent: (TrayMenuBuilder.() -> Unit)? = null
     ) {
         // Render the composable to PNG file for general use
-        val pngIconPath = ComposableIconUtils.renderComposableToPngFile(
-            width = iconWidth,
-            height = iconHeight,
-            density = density,
-            content = iconContent
-        )
+        val pngIconPath = ComposableIconUtils.renderComposableToPngFile(iconRenderProperties, iconContent)
         Log.d("NativeTray", "Generated PNG icon path: $pngIconPath")
 
         // For Windows, we need an ICO file
         val windowsIconPath = if (getOperatingSystem() == OperatingSystem.WINDOWS) {
             // Create a temporary ICO file
-            val tempFile = createTempFile(suffix = ".ico")
-            val icoData = ComposableIconUtils.renderComposableToIcoBytes(
-                width = iconWidth,
-                height = iconHeight,
-                density = density,
-                content = iconContent
-            )
-            tempFile.writeBytes(icoData)
-            val path = tempFile.absolutePath
-            Log.d("NativeTray", "Generated Windows ICO path: $path")
-            path
+            ComposableIconUtils.renderComposableToIcoFile(iconRenderProperties, iconContent).also {
+                Log.d("NativeTray", "Generated Windows ICO path: $it")
+            }
         } else {
             pngIconPath
         }
@@ -193,6 +178,7 @@ fun ApplicationScope.Tray(
  * This version accepts a Composable for the icon instead of file paths.
  *
  * @param iconContent A Composable function that defines the icon to be displayed in the tray.
+ * @param iconRenderProperties Properties for rendering the icon.
  * @param tooltip The tooltip text to be displayed when the user hovers over the tray icon.
  * @param primaryAction An optional callback to be invoked when the tray icon is clicked (handled only on specific platforms).
  * @param primaryActionLinuxLabel The label for the primary action on Linux. Defaults to "Open".
@@ -201,16 +187,18 @@ fun ApplicationScope.Tray(
 @Composable
 fun ApplicationScope.Tray(
     iconContent: @Composable () -> Unit,
+    iconRenderProperties: IconRenderProperties = IconRenderProperties.forCurrentOperatingSystem(),
     tooltip: String,
     primaryAction: (() -> Unit)? = null,
     primaryActionLinuxLabel: String = "Open",
     menuContent: (TrayMenuBuilder.() -> Unit)? = null,
 ) {
     // Calculate a hash of the rendered composable content to detect changes
-    val contentHash = ComposableIconUtils.calculateContentHash(content = iconContent)
+    val contentHash = ComposableIconUtils.calculateContentHash(iconRenderProperties, iconContent)
 
     DisposableEffect(
         iconContent,
+        iconRenderProperties,
         tooltip,
         primaryAction,
         primaryActionLinuxLabel,
@@ -219,6 +207,7 @@ fun ApplicationScope.Tray(
     ) {
         NativeTray(
             iconContent = iconContent,
+            iconRenderProperties = iconRenderProperties,
             tooltip = tooltip,
             primaryAction = primaryAction,
             primaryActionLinuxLabel = primaryActionLinuxLabel,