From 5e940fb07f056da5b9d6ecf461c6861960a15647 Mon Sep 17 00:00:00 2001 From: inukiwi Date: Thu, 25 Jun 2026 13:31:58 +0200 Subject: [PATCH 1/3] Accept notification_icon_color as preferred alias to color in notification data --- .../android/common/notifications/NotificationFunctions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt b/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt index c59f7973621..c12968b0912 100755 --- a/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt +++ b/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt @@ -246,7 +246,7 @@ fun prepareText(text: String): Spanned { } fun handleColor(context: Context, builder: NotificationCompat.Builder, data: Map) { - val colorString = data["color"] + val colorString = data["notification_icon_color"] ?: data["color"] val color = parseColor(context, colorString, R.color.colorPrimary) builder.color = color } From 2e23ffb0af96286c906b4fd9d6caab147d870104 Mon Sep 17 00:00:00 2001 From: inukiwi Date: Thu, 25 Jun 2026 15:16:03 +0200 Subject: [PATCH 2/3] Create NOTIFICATION_ICON_COLOR const --- .../android/common/notifications/NotificationFunctions.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt b/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt index c12968b0912..9b9cfc28efd 100755 --- a/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt +++ b/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt @@ -41,6 +41,7 @@ object NotificationData { const val LED_COLOR = "ledColor" const val VIBRATION_PATTERN = "vibrationPattern" const val NOTIFICATION_ICON = "notification_icon" + const val NOTIFICATION_ICON_COLOR = "notification_icon_color" const val ALERT_ONCE = "alert_once" const val COMMAND = "command" @@ -246,7 +247,7 @@ fun prepareText(text: String): Spanned { } fun handleColor(context: Context, builder: NotificationCompat.Builder, data: Map) { - val colorString = data["notification_icon_color"] ?: data["color"] + val colorString = data[NotificationData.NOTIFICATION_ICON_COLOR] ?: data["color"] val color = parseColor(context, colorString, R.color.colorPrimary) builder.color = color } From af11c33856506ab827ab03b5835f327e2b99caa4 Mon Sep 17 00:00:00 2001 From: Timothy <6560631+TimoPtr@users.noreply.github.com> Date: Mon, 29 Jun 2026 14:54:11 +0200 Subject: [PATCH 3/3] Use const --- .../android/common/notifications/NotificationFunctions.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt b/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt index 9b9cfc28efd..bdd570d48b5 100755 --- a/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt +++ b/common/src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt @@ -39,6 +39,7 @@ object NotificationData { const val CHANNEL = "channel" const val IMPORTANCE = "importance" const val LED_COLOR = "ledColor" + const val COLOR = "color" const val VIBRATION_PATTERN = "vibrationPattern" const val NOTIFICATION_ICON = "notification_icon" const val NOTIFICATION_ICON_COLOR = "notification_icon_color" @@ -247,7 +248,7 @@ fun prepareText(text: String): Spanned { } fun handleColor(context: Context, builder: NotificationCompat.Builder, data: Map) { - val colorString = data[NotificationData.NOTIFICATION_ICON_COLOR] ?: data["color"] + val colorString = data[NotificationData.NOTIFICATION_ICON_COLOR] ?: data[NotificationData.COLOR] val color = parseColor(context, colorString, R.color.colorPrimary) builder.color = color }