Skip to content

Commit 6526695

Browse files
committed
Refactor tray icons by removing unused properties.
Removed `iconRenderProperties` and redundantly null filters across components. Updated `Image` to `Icon` where applicable and standardized tint to `Color.White` for consistency. Cleaned up redundant imports to simplify code.
1 parent e4da3d7 commit 6526695

4 files changed

Lines changed: 4 additions & 12 deletions

File tree

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.kdroid.composetray.demo
2-
import androidx.compose.foundation.Image
32
import androidx.compose.foundation.layout.fillMaxSize
3+
import androidx.compose.material.Icon
44
import androidx.compose.material.icons.Icons
55
import androidx.compose.material.icons.filled.Notifications
66
import androidx.compose.runtime.getValue
@@ -9,8 +9,6 @@ import androidx.compose.runtime.remember
99
import androidx.compose.runtime.setValue
1010
import androidx.compose.ui.Modifier
1111
import androidx.compose.ui.graphics.Color
12-
import androidx.compose.ui.graphics.ColorFilter
13-
import androidx.compose.ui.res.painterResource
1412
import androidx.compose.ui.unit.dp
1513
import androidx.compose.ui.window.Window
1614
import androidx.compose.ui.window.application
@@ -56,14 +54,13 @@ fun main() = application {
5654
// Use alwaysShowTray as a key to force recomposition when it changes
5755
Tray(
5856
iconContent = {
59-
Image(
57+
Icon(
6058
Icons.Default.Notifications,
6159
contentDescription = "Application Icon",
6260
modifier = Modifier.fillMaxSize(),
63-
colorFilter = ColorFilter.tint(if (alwaysShowTray) Color.Unspecified else Color.Unspecified)
61+
tint = Color.White,
6462
)
6563
},
66-
iconRenderProperties = IconRenderProperties.forCurrentOperatingSystem(),
6764
primaryAction = {
6865
isWindowVisible = true
6966
Log.i(logTag, "On Primary Clicked")

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ fun main() = application {
5353
Icons.Default.Favorite,
5454
contentDescription = "",
5555
// Use alwaysShowTray as a key to force recomposition when it changes
56-
tint = if (alwaysShowTray) Color.Unspecified else Color.Unspecified,
56+
tint = Color.White,
5757
modifier = Modifier.fillMaxSize()
5858
)
5959
},
60-
iconRenderProperties = IconRenderProperties.forCurrentOperatingSystem(),
6160
primaryAction = {
6261
isWindowVisible = true
6362
Log.i(logTag, "On Primary Clicked")

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import androidx.compose.ui.unit.dp
1414
import androidx.compose.ui.window.Window
1515
import androidx.compose.ui.window.application
1616
import com.kdroid.composetray.tray.api.Tray
17-
import com.kdroid.composetray.utils.IconRenderProperties
1817
import com.kdroid.composetray.utils.SingleInstanceManager
1918
import com.kdroid.composetray.utils.getTrayPosition
2019
import com.kdroid.kmplog.Log
@@ -54,7 +53,6 @@ fun main() = application {
5453
val alpha = if (alwaysShowTray) 0.5f else 0.5f
5554
Box(modifier = Modifier.fillMaxSize().clip(RoundedCornerShape(300.dp)).background(Color.Red.copy(alpha = alpha)))
5655
},
57-
iconRenderProperties = IconRenderProperties.forCurrentOperatingSystem(),
5856
primaryAction = {
5957
isWindowVisible = true
6058
Log.i(logTag, "On Primary Clicked")

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ fun main() = application {
5858
painter = painterResource(icon),
5959
contentDescription = "Application Icon",
6060
// Use alwaysShowTray as a key to force recomposition when it changes
61-
colorFilter = if (alwaysShowTray) null else null
6261
)
6362
},
64-
iconRenderProperties = IconRenderProperties.forCurrentOperatingSystem(),
6563
primaryAction = {
6664
isWindowVisible = true
6765
Log.i(logTag, "On Primary Clicked")

0 commit comments

Comments
 (0)