From 1e555cc712390440b617eae131c232364cb2e854 Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Sun, 14 Jun 2026 11:22:39 +0200
Subject: [PATCH] fix(monitor): Fix notification color inconsistency in dark
 mode on One UI

Remove Theme.Material3.DynamicColors.DayNight from the notification
container style; it does not resolve correctly in the notification host
process, causing light-mode colors to appear in dark mode. Replace all
?attr/colorAccent and ?android:attr/textColorPrimary refs in RemoteViews
layouts with explicit day/night color resources (notification_icon_tint)
and TextAppearance.Compat.Notification.Title defaults. Change tintMode
from multiply to src_in for status glyphs; remove tint from product PNG
icons to prevent silhouette rendering.

Fixes #613
---
 .../notification_battery_progress.xml         |  2 +-
 .../monitor_notification_dual_pods_big.xml    | 26 +++++++------------
 .../monitor_notification_dual_pods_small.xml  | 10 +++++++
 .../monitor_notification_single_pods_big.xml  | 10 +++----
 ...monitor_notification_single_pods_small.xml |  6 +++++
 app/src/main/res/values-night/colors.xml      |  4 +++
 app/src/main/res/values/colors.xml            |  2 ++
 app/src/main/res/values/styles.xml            |  5 ----
 8 files changed, 37 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/res/values-night/colors.xml

diff --git a/app/src/main/res/drawable/notification_battery_progress.xml b/app/src/main/res/drawable/notification_battery_progress.xml
index ee7373ff..af2c426f 100644
--- a/app/src/main/res/drawable/notification_battery_progress.xml
+++ b/app/src/main/res/drawable/notification_battery_progress.xml
@@ -12,7 +12,7 @@
         <clip>
             <shape android:shape="rectangle">
                 <corners android:radius="4dp" />
-                <solid android:color="?android:attr/colorAccent" />
+                <solid android:color="@color/brand_primary" />
             </shape>
         </clip>
     </item>
diff --git a/app/src/main/res/layout/monitor_notification_dual_pods_big.xml b/app/src/main/res/layout/monitor_notification_dual_pods_big.xml
index 8c026fad..b85ac878 100644
--- a/app/src/main/res/layout/monitor_notification_dual_pods_big.xml
+++ b/app/src/main/res/layout/monitor_notification_dual_pods_big.xml
@@ -24,8 +24,6 @@
                 android:id="@+id/pod_left_icon"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:tintMode="multiply"
-                android:tint="?android:attr/colorAccent"
                 android:src="@drawable/device_airpods_gen1_left" />
 
             <ProgressBar
@@ -58,8 +56,8 @@
                     android:layout_width="16dp"
                     android:layout_height="16dp"
                     android:layout_marginStart="2dp"
-                    android:tintMode="multiply"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@color/notification_icon_tint"
+                    android:tintMode="src_in"
                     android:src="@drawable/ic_baseline_power_24" />
 
                 <ImageView
@@ -67,8 +65,8 @@
                     android:layout_width="16dp"
                     android:layout_height="16dp"
                     android:layout_marginStart="2dp"
-                    android:tintMode="multiply"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@color/notification_icon_tint"
+                    android:tintMode="src_in"
                     android:src="@drawable/ic_baseline_hearing_24" />
 
             </LinearLayout>
@@ -88,8 +86,6 @@
                 android:id="@+id/pod_case_icon"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:tintMode="multiply"
-                android:tint="?android:attr/colorAccent"
                 android:src="@drawable/device_airpods_gen1_case" />
 
             <ProgressBar
@@ -122,8 +118,8 @@
                     android:layout_width="16dp"
                     android:layout_height="16dp"
                     android:layout_marginStart="2dp"
-                    android:tintMode="multiply"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@color/notification_icon_tint"
+                    android:tintMode="src_in"
                     android:src="@drawable/ic_baseline_power_24" />
 
             </LinearLayout>
@@ -142,8 +138,6 @@
                 android:id="@+id/pod_right_icon"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:tintMode="multiply"
-                android:tint="?android:attr/colorAccent"
                 android:src="@drawable/device_airpods_gen1_right" />
 
             <ProgressBar
@@ -176,8 +170,8 @@
                     android:layout_width="16dp"
                     android:layout_height="16dp"
                     android:layout_marginStart="2dp"
-                    android:tintMode="multiply"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@color/notification_icon_tint"
+                    android:tintMode="src_in"
                     android:src="@drawable/ic_baseline_power_24" />
 
                 <ImageView
@@ -185,8 +179,8 @@
                     android:layout_width="16dp"
                     android:layout_height="16dp"
                     android:layout_marginStart="2dp"
-                    android:tintMode="multiply"
-                    android:tint="?android:attr/colorAccent"
+                    android:tint="@color/notification_icon_tint"
+                    android:tintMode="src_in"
                     android:src="@drawable/ic_baseline_hearing_24" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/monitor_notification_dual_pods_small.xml b/app/src/main/res/layout/monitor_notification_dual_pods_small.xml
index 9c50b212..f6a1477d 100644
--- a/app/src/main/res/layout/monitor_notification_dual_pods_small.xml
+++ b/app/src/main/res/layout/monitor_notification_dual_pods_small.xml
@@ -38,6 +38,8 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_marginStart="2dp"
+                android:tint="@color/notification_icon_tint"
+                android:tintMode="src_in"
                 android:src="@drawable/ic_baseline_power_24" />
 
             <ImageView
@@ -46,6 +48,8 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_marginStart="2dp"
+                android:tint="@color/notification_icon_tint"
+                android:tintMode="src_in"
                 android:src="@drawable/ic_baseline_hearing_24" />
         </LinearLayout>
 
@@ -76,6 +80,8 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_marginStart="2dp"
+                android:tint="@color/notification_icon_tint"
+                android:tintMode="src_in"
                 android:src="@drawable/ic_baseline_power_24" />
         </LinearLayout>
 
@@ -105,6 +111,8 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_marginStart="2dp"
+                android:tint="@color/notification_icon_tint"
+                android:tintMode="src_in"
                 android:src="@drawable/ic_baseline_power_24" />
 
             <ImageView
@@ -113,6 +121,8 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_marginStart="2dp"
+                android:tint="@color/notification_icon_tint"
+                android:tintMode="src_in"
                 android:src="@drawable/ic_baseline_hearing_24" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/monitor_notification_single_pods_big.xml b/app/src/main/res/layout/monitor_notification_single_pods_big.xml
index b5d6bf7f..daecd9cb 100644
--- a/app/src/main/res/layout/monitor_notification_single_pods_big.xml
+++ b/app/src/main/res/layout/monitor_notification_single_pods_big.xml
@@ -24,8 +24,6 @@
                 android:id="@+id/headphones_icon"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:tintMode="multiply"
-                android:tint="?android:attr/colorAccent"
                 android:src="@drawable/twotone_headphones_24" />
 
             <TextView
@@ -71,8 +69,8 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_marginStart="2dp"
-                android:tintMode="multiply"
-                android:tint="?android:attr/colorAccent"
+                android:tint="@color/notification_icon_tint"
+                android:tintMode="src_in"
                 android:src="@drawable/ic_baseline_power_24" />
 
             <ImageView
@@ -80,8 +78,8 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_marginStart="2dp"
-                android:tintMode="multiply"
-                android:tint="?android:attr/colorAccent"
+                android:tint="@color/notification_icon_tint"
+                android:tintMode="src_in"
                 android:src="@drawable/ic_baseline_hearing_24" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/monitor_notification_single_pods_small.xml b/app/src/main/res/layout/monitor_notification_single_pods_small.xml
index 02a7e39a..4bc488a9 100644
--- a/app/src/main/res/layout/monitor_notification_single_pods_small.xml
+++ b/app/src/main/res/layout/monitor_notification_single_pods_small.xml
@@ -30,6 +30,8 @@
             android:id="@+id/headphones_battery_icon"
             style="@style/PodInfoItemIcon.Notification"
             android:layout_marginStart="12dp"
+            android:tint="@color/notification_icon_tint"
+            android:tintMode="src_in"
             android:src="@drawable/ic_baseline_battery_unknown_24" />
 
         <TextView
@@ -46,6 +48,8 @@
             android:layout_width="16dp"
             android:layout_height="16dp"
             android:layout_marginStart="2dp"
+            android:tint="@color/notification_icon_tint"
+            android:tintMode="src_in"
             android:src="@drawable/ic_baseline_power_24" />
 
         <ImageView
@@ -54,6 +58,8 @@
             android:layout_width="16dp"
             android:layout_height="16dp"
             android:layout_marginStart="2dp"
+            android:tint="@color/notification_icon_tint"
+            android:tintMode="src_in"
             android:src="@drawable/ic_baseline_hearing_24" />
 
     </LinearLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..faedd00a
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="notification_icon_tint">#EEEEEE</color>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 77c8e5d2..145dcde0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -60,4 +60,6 @@
     <color name="brand_primary">#3f7aff</color>
     <color name="brand_secondary">#ffd83c</color>
     <color name="brand_tertiary">#41eb8e</color>
+
+    <color name="notification_icon_tint">#757575</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 165f660c..13870f10 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,15 +13,11 @@
 
     <style name="Notification.Container">
         <!--        <item name="android:background">?android:attr/colorBackground</item>-->
-        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>
     </style>
 
     <style name="PodInfoItemIcon.Notification" parent="TextAppearance.Compat.Notification.Title">
         <item name="android:layout_height">20dp</item>
         <item name="android:layout_width">20dp</item>
-        <item name="android:tintMode">multiply</item>
-        <item name="android:tint">?android:attr/colorAccent</item>
-        <item name="tint">?android:attr/colorAccent</item>
     </style>
 
     <style name="PodInfoItemIcon.Notification.Large" parent="PodInfoItemIcon.Notification">
@@ -32,7 +28,6 @@
     <style name="PodInfoItemText.Notification" parent="TextAppearance.Compat.Notification.Title">
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">end</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="PodInfoItemIcon" parent="TextAppearance.Material3.BodyMedium">