From 78ccddf87c236bce001ef1b3163a0e1921d4bc51 Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Sun, 1 May 2022 17:48:32 +0200
Subject: [PATCH] Fix notification icon/text color to match light/dark theme.

---
 .../monitor_notification_dual_pods_small.xml  | 22 +++++++++----------
 ...monitor_notification_single_pods_small.xml | 10 ++++-----
 ...itor_notification_unknown_device_small.xml |  2 +-
 app/src/main/res/values/styles.xml            | 12 +++++++++-
 4 files changed, 28 insertions(+), 18 deletions(-)

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 e5b80484..a886634d 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
@@ -18,12 +18,12 @@
 
         <ImageView
             android:id="@+id/pod_left_icon"
-            style="@style/PodInfoItemIcon"
+            style="@style/PodInfoItemIcon.Notification"
             android:src="@drawable/ic_airpod_left_24" />
 
         <TextView
             android:id="@+id/pod_left_label"
-            style="@style/TextAppearance.Compat.Notification.Title"
+            style="@style/PodInfoItemText.Notification"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -31,12 +31,12 @@
 
         <ImageView
             android:id="@+id/pod_left_charging"
-            style="@style/PodInfoItemIcon"
+            style="@style/PodInfoItemIcon.Notification"
             android:src="@drawable/ic_baseline_power_24" />
 
         <ImageView
             android:id="@+id/pod_left_ear"
-            style="@style/PodInfoItemIcon"
+            style="@style/PodInfoItemIcon.Notification"
             android:src="@drawable/ic_baseline_hearing_24" />
     </LinearLayout>
 
@@ -52,12 +52,12 @@
 
         <ImageView
             android:id="@+id/pod_case_icon"
-            style="@style/PodInfoItemIcon"
+            style="@style/PodInfoItemIcon.Notification"
             android:src="@drawable/ic_airpod_case_24" />
 
         <TextView
             android:id="@+id/pod_case_label"
-            style="@style/TextAppearance.Compat.Notification.Title"
+            style="@style/PodInfoItemText.Notification"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -65,7 +65,7 @@
 
         <ImageView
             android:id="@+id/pod_case_charging"
-            style="@style/PodInfoItemIcon"
+            style="@style/PodInfoItemIcon.Notification"
             android:src="@drawable/ic_baseline_power_24" />
     </LinearLayout>
 
@@ -81,12 +81,12 @@
 
         <ImageView
             android:id="@+id/pod_right_icon"
-            style="@style/PodInfoItemIcon"
+            style="@style/PodInfoItemIcon.Notification"
             android:src="@drawable/ic_airpod_right_24" />
 
         <TextView
             android:id="@+id/pod_right_label"
-            style="@style/TextAppearance.Compat.Notification.Title"
+            style="@style/PodInfoItemText.Notification"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -94,12 +94,12 @@
 
         <ImageView
             android:id="@+id/pod_right_charging"
-            style="@style/PodInfoItemIcon"
+            style="@style/PodInfoItemIcon.Notification"
             android:src="@drawable/ic_baseline_power_24" />
 
         <ImageView
             android:id="@+id/pod_right_ear"
-            style="@style/PodInfoItemIcon"
+            style="@style/PodInfoItemIcon.Notification"
             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 206d2ce5..ef802ffa 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
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/headphones_label"
-        style="@style/TextAppearance.Compat.Notification.Title"
+        style="@style/PodInfoItemText.Notification"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -21,12 +21,12 @@
 
         <ImageView
             android:id="@+id/headphones_battery_icon"
-            style="@style/PodInfoItemIcon"
+            style="@style/PodInfoItemIcon.Notification"
             android:src="@drawable/ic_baseline_battery_unknown_24" />
 
         <TextView
             android:id="@+id/headphones_battery_label"
-            style="@style/TextAppearance.Compat.Notification.Title"
+            style="@style/PodInfoItemText.Notification"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -35,12 +35,12 @@
 
         <ImageView
             android:id="@+id/headphones_charging"
-            style="@style/PodInfoItemIcon"
+            style="@style/PodInfoItemIcon.Notification"
             android:src="@drawable/ic_baseline_power_24" />
 
         <ImageView
             android:id="@+id/headphones_worn"
-            style="@style/PodInfoItemIcon"
+            style="@style/PodInfoItemIcon.Notification"
             android:src="@drawable/ic_baseline_hearing_24" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/monitor_notification_unknown_device_small.xml b/app/src/main/res/layout/monitor_notification_unknown_device_small.xml
index ff1ff580..b79e8b64 100644
--- a/app/src/main/res/layout/monitor_notification_unknown_device_small.xml
+++ b/app/src/main/res/layout/monitor_notification_unknown_device_small.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/device"
-        style="@style/TextAppearance.Compat.Notification.Title"
+        style="@style/PodInfoItemText.Notification"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6173be45..44313c5c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,7 +7,17 @@
         <item name="android:layout_marginEnd">8dp</item>
     </style>
 
-    <style name="PodInfoItemIcon">
+    <style name="PodInfoItemIcon.Notification" parent="TextAppearance.Compat.Notification.Title">
+        <item name="android:layout_height">20dp</item>
+        <item name="android:layout_width">20dp</item>
+    </style>
+
+    <style name="PodInfoItemText.Notification" parent="TextAppearance.Compat.Notification.Title">
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="PodInfoItemIcon" parent="TextAppearance.MaterialComponents.Body2">
         <item name="android:layout_height">20dp</item>
         <item name="android:layout_width">20dp</item>
     </style>