Merge pull request #276 from zTrap/fix-logs

kdroidFilter · web-flow · commit d74e7bbc9396 · 2025-08-28T12:45:30.000+03:00
Fixed log tags to one style
diff --git a/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoAdaptivePositionWindows.kt b/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoAdaptivePositionWindows.kt
@@ -1,4 +1,5 @@
 package com.kdroid.composetray.demo
+
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.Icon
 import androidx.compose.material.icons.Icons
@@ -18,7 +19,7 @@ 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.composeNativeTrayLoggingLevel
 import com.kdroid.composetray.utils.getTrayPosition
 import com.kdroid.composetray.utils.getTrayWindowPosition
 import composenativetray.demo.generated.resources.Res
@@ -27,7 +28,7 @@ import org.jetbrains.compose.resources.painterResource
 
 fun main() = application {
     allowComposeNativeTrayLogging = false
-    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
+    composeNativeTrayLoggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
     val logTag = "NativeTray"
     
     println("$logTag: TrayPosition: ${getTrayPosition()}")
diff --git a/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoToggleEmptyMenu.kt b/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoToggleEmptyMenu.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.window.application
 import com.kdroid.composetray.tray.api.Tray
 import com.kdroid.composetray.utils.ComposeNativeTrayLoggingLevel
 import com.kdroid.composetray.utils.allowComposeNativeTrayLogging
-import com.kdroid.composetray.utils.composeNativeTrayloggingLevel
+import com.kdroid.composetray.utils.composeNativeTrayLoggingLevel
 import composenativetray.demo.generated.resources.Res
 import composenativetray.demo.generated.resources.icon
 import composenativetray.demo.generated.resources.icon2
@@ -30,7 +30,7 @@ import org.jetbrains.compose.resources.painterResource
 fun main() = application {
     // Enable logging to help diagnose behavior on Linux
     allowComposeNativeTrayLogging = false
-    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
+    composeNativeTrayLoggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
 
     var showMenuItem by remember { mutableStateOf(false) }
     val icon = painterResource(Res.drawable.icon)
diff --git a/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoWithContextMenu.kt b/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoWithContextMenu.kt
@@ -19,7 +19,7 @@ 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.composeNativeTrayLoggingLevel
 import com.kdroid.composetray.utils.getTrayPosition
 import com.kdroid.composetray.utils.isMenuBarInDarkMode
 import composenativetray.demo.generated.resources.Res
@@ -28,7 +28,7 @@ import org.jetbrains.compose.resources.painterResource
 
 fun main() = application {
     allowComposeNativeTrayLogging = true
-    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
+    composeNativeTrayLoggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
 
     val logTag = "NativeTray"
 
diff --git a/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoWithImageVector.kt b/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoWithImageVector.kt
@@ -12,7 +12,7 @@ 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.composeNativeTrayLoggingLevel
 import com.kdroid.composetray.utils.getTrayPosition
 import composenativetray.demo.generated.resources.Res
 import composenativetray.demo.generated.resources.icon
@@ -24,7 +24,7 @@ import org.jetbrains.compose.resources.painterResource
  */
 fun main() = application {
     allowComposeNativeTrayLogging = false
-    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
+    composeNativeTrayLoggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
 
     val logTag = "ImageVectorTrayDemo"
     
diff --git a/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoWithPainter.kt b/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoWithPainter.kt
@@ -10,7 +10,7 @@ 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.composeNativeTrayLoggingLevel
 import com.kdroid.composetray.utils.getTrayPosition
 import composenativetray.demo.generated.resources.Res
 import composenativetray.demo.generated.resources.icon
@@ -23,7 +23,7 @@ import org.jetbrains.compose.resources.painterResource
  */
 fun main() = application {
     allowComposeNativeTrayLogging = true
-    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
+    composeNativeTrayLoggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
 
     val logTag = "PainterTrayDemo"
     
diff --git a/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoWithPlatformSpecificIcons.kt b/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoWithPlatformSpecificIcons.kt
@@ -12,7 +12,7 @@ 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.composeNativeTrayLoggingLevel
 import com.kdroid.composetray.utils.getTrayPosition
 import composenativetray.demo.generated.resources.Res
 import composenativetray.demo.generated.resources.icon
@@ -27,7 +27,7 @@ import org.jetbrains.compose.resources.painterResource
  */
 fun main() = application {
     allowComposeNativeTrayLogging = true
-    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
+    composeNativeTrayLoggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
 
     val logTag = "PlatformSpecificIconsDemo"
     
diff --git a/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoWithoutContextMenu.kt b/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DemoWithoutContextMenu.kt
@@ -17,14 +17,14 @@ 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.composeNativeTrayLoggingLevel
 import com.kdroid.composetray.utils.getTrayPosition
 import composenativetray.demo.generated.resources.Res
 import composenativetray.demo.generated.resources.icon
 
 fun main() = application {
     allowComposeNativeTrayLogging = true
-    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
+    composeNativeTrayLoggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
 
     val logTag = "NativeTray"
     
diff --git a/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DynamicIconsDemo.kt b/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DynamicIconsDemo.kt
@@ -22,7 +22,7 @@ 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.composeNativeTrayLoggingLevel
 import composenativetray.demo.generated.resources.Res
 import composenativetray.demo.generated.resources.icon
 import org.jetbrains.compose.resources.painterResource
@@ -35,7 +35,7 @@ import kotlin.concurrent.fixedRateTimer
 fun main() = application {
     // Enable logging for debugging
     allowComposeNativeTrayLogging = true
-    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
+    composeNativeTrayLoggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
 
     val logTag = "DynamicIconsDemo"
     
diff --git a/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DynamicTrayMenu.kt b/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/DynamicTrayMenu.kt
@@ -11,7 +11,7 @@ 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.composeNativeTrayLoggingLevel
 import com.kdroid.composetray.utils.getTrayPosition
 import composenativetray.demo.generated.resources.Res
 import composenativetray.demo.generated.resources.icon
@@ -29,7 +29,7 @@ private enum class ServiceStatus {
 fun main() = application {
     val logTag = "NativeTray"
     allowComposeNativeTrayLogging = true
-    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
+    composeNativeTrayLoggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
 
     println("$logTag: TrayPosition: ${getTrayPosition()}")
 
diff --git a/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/PainterResourceWorkaroundDemo.kt b/demo/src/jvmMain/kotlin/com/kdroid/composetray/demo/PainterResourceWorkaroundDemo.kt
@@ -10,7 +10,7 @@ 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.composeNativeTrayLoggingLevel
 import composenativetray.demo.generated.resources.Res
 import composenativetray.demo.generated.resources.icon
 import composenativetray.demo.generated.resources.icon2
@@ -23,7 +23,7 @@ import org.jetbrains.compose.resources.painterResource
  */
 fun main() = application {
     allowComposeNativeTrayLogging = true
-    composeNativeTrayloggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
+    composeNativeTrayLoggingLevel = ComposeNativeTrayLoggingLevel.DEBUG
 
     val logTag = "PainterResourceWorkaroundDemo"
     
diff --git a/src/commonMain/kotlin/com/kdroid/composetray/lib/linux/LinuxTrayManager.kt b/src/commonMain/kotlin/com/kdroid/composetray/lib/linux/LinuxTrayManager.kt
@@ -115,7 +115,7 @@ internal class LinuxTrayManager(
 
         if (iconChanged) setIconFromFileSafe(iconPath)
         if (tooltipChanged) runCatching { go.Systray_SetTooltip(tooltip) }
-            .onFailure { e -> warnln { "LinuxGoTrayManager: Failed to set tooltip: ${e.message}" } }
+            .onFailure { e -> warnln { "[LinuxGoTrayManager] Failed to set tooltip: ${e.message}" } }
 
         if (newMenuItems != null) rebuildMenu()
     }
@@ -126,7 +126,7 @@ internal class LinuxTrayManager(
             lifecyclePermit.acquire()
             permitHeld.set(true)
         } catch (t: Throwable) {
-            warnln { "LinuxGoTrayManager: Failed to acquire lifecycle permit: ${t.message}" }
+            warnln { "[LinuxGoTrayManager] Failed to acquire lifecycle permit: ${t.message}" }
             return
         }
 
@@ -147,11 +147,11 @@ internal class LinuxTrayManager(
 
             // Register callbacks (keep strong references to avoid GC)
             cbReady = object : LinuxLibTray.VoidCallback { override fun invoke() {
-                infoln { "LinuxGoTrayManager: systray ready" }
+                infoln { "[LinuxGoTrayManager] systray ready" }
                 readyLatch.countDown()
             } }
             cbExit = object : LinuxLibTray.VoidCallback { override fun invoke() {
-                infoln { "LinuxGoTrayManager: systray exit" }
+                infoln { "[LinuxGoTrayManager] systray exit" }
                 try { exitLatch?.countDown() } catch (_: Throwable) {}
             } }
             cbOnClick = object : LinuxLibTray.VoidCallback { override fun invoke() {
@@ -179,7 +179,7 @@ internal class LinuxTrayManager(
             // Prepare external loop and start it in a daemon thread
             go.Systray_PrepareExternalLoop()
             loopThread = Thread({
-                try { go.Systray_NativeStart() } catch (t: Throwable) { errorln { "LinuxGoTrayManager: loop error: $t" } }
+                try { go.Systray_NativeStart() } catch (t: Throwable) { errorln { "[LinuxGoTrayManager] loop error: $t" } }
             }, "LinuxGoTray-Loop").apply {
                 isDaemon = true
                 start()
@@ -194,7 +194,7 @@ internal class LinuxTrayManager(
             rebuildMenu()
             started = true
         } catch (t: Throwable) {
-            errorln { "LinuxGoTrayManager: startTray failed: $t" }
+            errorln { "[LinuxGoTrayManager] startTray failed: $t" }
         } finally {
             if (!started) {
                 // cleanup partial start and release permit
@@ -236,7 +236,7 @@ internal class LinuxTrayManager(
             loopThread?.join(500)
             if (loopThread?.isAlive == true) {
                 // We can't interrupt native waits; just log and move on
-                warnln { "LinuxGoTrayManager: loop thread still alive after join timeout" }
+                warnln { "[LinuxGoTrayManager] loop thread still alive after join timeout" }
             }
         } catch (_: InterruptedException) {
             Thread.currentThread().interrupt()
@@ -262,13 +262,13 @@ internal class LinuxTrayManager(
                 val bytes = file.readBytes()
                 go.Systray_SetIcon(bytes, bytes.size)
             } else {
-                warnln { "LinuxGoTrayManager: Icon file not found: $path" }
+                warnln { "[LinuxGoTrayManager] Icon file not found: $path" }
             }
-        }.onFailure { e -> warnln { "LinuxGoTrayManager: Failed to set icon from $path: ${e.message}" } }
+        }.onFailure { e -> warnln { "[LinuxGoTrayManager] Failed to set icon from $path: ${e.message}" } }
     }
 
     private fun rebuildMenu() {
-        infoln { "LinuxGoTrayManager: Rebuilding menu" }
+        infoln { "[LinuxGoTrayManager] Rebuilding menu" }
         idByTitle.clear()
         actionById.clear()
         runCatching { go.Systray_ResetMenu() }
@@ -312,15 +312,15 @@ internal class LinuxTrayManager(
                 runCatching {
                     val bytes = File(iconPath).takeIf { it.isFile }?.readBytes()
                     if (bytes != null) go.Systray_SetMenuItemIcon(bytes, bytes.size, id)
-                }.onFailure { e -> warnln { "LinuxGoTrayManager: Failed to set menu item icon: ${e.message}" } }
+                }.onFailure { e -> warnln { "[LinuxGoTrayManager] Failed to set menu item icon: ${e.message}" } }
             }
 
             // Submenu
             if (item.subMenuItems.isNotEmpty()) {
                 item.subMenuItems.forEach { sub -> addMenuItemRecursive(id, sub) }
             }
         } catch (t: Throwable) {
-            errorln { "LinuxGoTrayManager: Error adding menu item '${item.text}': $t" }
+            errorln { "[LinuxGoTrayManager] Error adding menu item '${item.text}': $t" }
         }
     }
 }
diff --git a/src/commonMain/kotlin/com/kdroid/composetray/tray/api/NativeTray.kt b/src/commonMain/kotlin/com/kdroid/composetray/tray/api/NativeTray.kt
@@ -65,7 +65,7 @@ internal class NativeTray {
                 else -> {}
             }
         } catch (th: Throwable) {
-            errorln { "NativeTray: Error updating tray: $th" }
+            errorln { "[NativeTray] Error updating tray: $th" }
         }
     }
 
@@ -101,41 +101,41 @@ internal class NativeTray {
             try {
                 when (os) {
                     LINUX -> {
-                        debugln { "NativeTray: Initializing Linux tray with icon path: $iconPath" }
+                        debugln { "[NativeTray] Initializing Linux tray with icon path: $iconPath" }
                         LinuxTrayInitializer.initialize(instanceId, iconPath, tooltip, primaryAction, menuContent)
                         trayInitialized = true
                     }
 
                     WINDOWS -> {
-                        debugln { "NativeTray: Initializing Windows tray with icon path: $windowsIconPath" }
+                        debugln { "[NativeTray] Initializing Windows tray with icon path: $windowsIconPath" }
                         WindowsTrayInitializer.initialize(instanceId, windowsIconPath, tooltip, primaryAction, menuContent)
                         trayInitialized = true
                     }
 
                     MACOS -> {
-                        debugln { "NativeTray: Initializing macOS tray with icon path: $iconPath" }
+                        debugln { "[NativeTray] Initializing macOS tray with icon path: $iconPath" }
                         MacTrayInitializer.initialize(instanceId, iconPath, tooltip, primaryAction, menuContent)
                         trayInitialized = true
                     }
 
                     else -> {}
                 }
             } catch (th: Throwable) {
-                errorln { "NativeTray: Error initializing tray: $th" }
+                errorln { "[NativeTray] Error initializing tray: $th" }
             }
 
             val awtTrayRequired = os == UNKNOWN || !trayInitialized
             if (awtTrayRequired) {
                 if (AwtTrayInitializer.isSupported()) {
                     try {
-                        debugln { "NativeTray: Initializing AWT tray with icon path: $iconPath" }
+                        debugln { "[NativeTray] Initializing AWT tray with icon path: $iconPath" }
                         AwtTrayInitializer.initialize(iconPath, tooltip, primaryAction, menuContent)
                         awtTrayUsed.set(true)
                     } catch (th: Throwable) {
-                        errorln { "NativeTray: Error initializing AWT tray: $th" }
+                        errorln { "[NativeTray] Error initializing AWT tray: $th" }
                     }
                 } else {
-                    debugln { "NativeTray: AWT tray is not supported" }
+                    debugln { "[NativeTray] AWT tray is not supported" }
                 }
             }
         }
@@ -153,13 +153,13 @@ internal class NativeTray {
     ) {
         // Render the composable to PNG file for general use
         val pngIconPath = ComposableIconUtils.renderComposableToPngFile(iconRenderProperties, iconContent)
-        debugln { "NativeTray: Generated PNG icon path: $pngIconPath" }
+        debugln { "[NativeTray] Generated PNG icon path: $pngIconPath" }
 
         // For Windows, we need an ICO file
         val windowsIconPath = if (getOperatingSystem() == WINDOWS) {
             // Create a temporary ICO file
             ComposableIconUtils.renderComposableToIcoFile(iconRenderProperties, iconContent).also {
-                debugln { "NativeTray: Generated Windows ICO path: $it" }
+                debugln { "[NativeTray] Generated Windows ICO path: $it" }
             }
         } else {
             pngIconPath
@@ -213,7 +213,7 @@ fun ApplicationScope.Tray(
     // Dispose only when Tray is removed from composition
     DisposableEffect(Unit) {
         onDispose {
-            debugln { "NativeTray: onDispose" }
+            debugln { "[NativeTray] onDispose" }
             tray.dispose()
         }
     }
@@ -261,7 +261,7 @@ fun ApplicationScope.Tray(
     // Dispose only when Tray is removed from composition
     DisposableEffect(Unit) {
         onDispose {
-            debugln { "NativeTray: onDispose" }
+            debugln { "[NativeTray] onDispose" }
             tray.dispose()
         }
     }
@@ -327,7 +327,7 @@ fun ApplicationScope.Tray(
     // Dispose only when Tray is removed from composition
     DisposableEffect(Unit) {
         onDispose {
-            debugln { "NativeTray: onDispose" }
+            debugln { "[NativeTray] onDispose" }
             tray.dispose()
         }
     }
@@ -385,7 +385,7 @@ fun ApplicationScope.Tray(
     // Dispose only when Tray is removed from composition
     DisposableEffect(Unit) {
         onDispose {
-            debugln { "NativeTray: onDispose" }
+            debugln { "[NativeTray] onDispose" }
             tray.dispose()
         }
     }
diff --git a/src/commonMain/kotlin/com/kdroid/composetray/utils/AppId.kt b/src/commonMain/kotlin/com/kdroid/composetray/utils/AppId.kt
diff --git a/src/commonMain/kotlin/com/kdroid/composetray/utils/DebugLn.kt b/src/commonMain/kotlin/com/kdroid/composetray/utils/DebugLn.kt
diff --git a/src/commonMain/kotlin/com/kdroid/composetray/utils/SingleInstanceManager.kt b/src/commonMain/kotlin/com/kdroid/composetray/utils/SingleInstanceManager.kt
diff --git a/src/commonMain/kotlin/com/kdroid/composetray/utils/TrayPosition.kt b/src/commonMain/kotlin/com/kdroid/composetray/utils/TrayPosition.kt
