From c314987e132cae8e66ccce85a07ebce23f50cbda Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <darken@darken.eu>
Date: Thu, 2 Feb 2023 16:45:22 +0100
Subject: [PATCH] Fix popup icon sizes (#91)

---
 .../layout/popup_notification_dual_pods.xml   | 28 +++++--------------
 .../layout/popup_notification_single_pods.xml |  8 ++----
 app/src/main/res/values/styles.xml            |  5 ++++
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/app/src/main/res/layout/popup_notification_dual_pods.xml b/app/src/main/res/layout/popup_notification_dual_pods.xml
index 74278e62..8b131a22 100644
--- a/app/src/main/res/layout/popup_notification_dual_pods.xml
+++ b/app/src/main/res/layout/popup_notification_dual_pods.xml
@@ -7,9 +7,7 @@
 
     <ImageView
         android:id="@+id/pod_icon"
-        style="@style/PodInfoItemIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        style="@style/PodInfoItemIcon.Popup"
         android:src="@drawable/devic_earbuds_generic_both"
         app:layout_constraintBottom_toBottomOf="@id/pod_label"
         app:layout_constraintEnd_toStartOf="@id/pod_label"
@@ -55,9 +53,7 @@
 
         <ImageView
             android:id="@+id/pod_left_icon"
-            style="@style/PodInfoItemIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/PodInfoItemIcon.Popup"
             android:layout_gravity="center"
             android:src="@drawable/devic_airpods_gen1_left"
             app:layout_constraintBottom_toBottomOf="@id/pod_left_battery_label"
@@ -67,9 +63,7 @@
 
         <ImageView
             android:id="@id/pod_left_battery_icon"
-            style="@style/PodInfoItemIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/PodInfoItemIcon.Popup"
             android:src="@drawable/ic_baseline_battery_unknown_24"
             app:layout_constraintBottom_toBottomOf="@id/pod_left_battery_label"
             app:layout_constraintEnd_toStartOf="@id/pod_left_battery_label"
@@ -103,9 +97,7 @@
 
         <ImageView
             android:id="@+id/pod_case_icon"
-            style="@style/PodInfoItemIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/PodInfoItemIcon.Popup"
             android:layout_gravity="center"
             android:src="@drawable/devic_airpods_gen1_case"
             app:layout_constraintBottom_toBottomOf="@id/pod_case_battery_label"
@@ -115,9 +107,7 @@
 
         <ImageView
             android:id="@id/pod_case_battery_icon"
-            style="@style/PodInfoItemIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/PodInfoItemIcon.Popup"
             android:src="@drawable/ic_baseline_battery_unknown_24"
             app:layout_constraintBottom_toBottomOf="@id/pod_case_battery_label"
             app:layout_constraintEnd_toStartOf="@id/pod_case_battery_label"
@@ -150,9 +140,7 @@
 
         <ImageView
             android:id="@+id/pod_right_icon"
-            style="@style/PodInfoItemIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/PodInfoItemIcon.Popup"
             android:layout_gravity="center"
             android:src="@drawable/devic_airpods_gen1_right"
             app:layout_constraintBottom_toBottomOf="@id/pod_right_battery_label"
@@ -162,9 +150,7 @@
 
         <ImageView
             android:id="@id/pod_right_battery_icon"
-            style="@style/PodInfoItemIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/PodInfoItemIcon.Popup"
             android:src="@drawable/ic_baseline_battery_unknown_24"
             app:layout_constraintBottom_toBottomOf="@id/pod_right_battery_label"
             app:layout_constraintEnd_toStartOf="@id/pod_right_battery_label"
diff --git a/app/src/main/res/layout/popup_notification_single_pods.xml b/app/src/main/res/layout/popup_notification_single_pods.xml
index 91391945..19c3b976 100644
--- a/app/src/main/res/layout/popup_notification_single_pods.xml
+++ b/app/src/main/res/layout/popup_notification_single_pods.xml
@@ -7,9 +7,7 @@
 
     <ImageView
         android:id="@+id/headphones_icon"
-        android:layout_width="wrap_content"
-        style="@style/PodInfoItemIcon"
-        android:layout_height="wrap_content"
+        style="@style/PodInfoItemIcon.Popup"
         android:src="@drawable/devic_earbuds_generic_both"
         app:layout_constraintBottom_toBottomOf="@id/headphones_label"
         app:layout_constraintEnd_toStartOf="@id/headphones_label"
@@ -56,9 +54,7 @@
 
         <ImageView
             android:id="@id/headphones_battery_icon"
-            android:layout_width="wrap_content"
-            style="@style/PodInfoItemIcon"
-            android:layout_height="wrap_content"
+            style="@style/PodInfoItemIcon.Popup"
             android:src="@drawable/ic_baseline_battery_unknown_24"
             app:layout_constraintBottom_toBottomOf="@id/headphones_battery_label"
             app:layout_constraintEnd_toStartOf="@id/headphones_battery_label"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f5a8cd1f..48f6a697 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -38,6 +38,11 @@
         <item name="tint">?android:attr/colorControlNormal</item>
     </style>
 
+    <style name="PodInfoItemIcon.Popup">
+        <item name="android:layout_height">24dp</item>
+        <item name="android:layout_width">24dp</item>
+    </style>
+
     <style name="PodInfoItemText" parent="TextAppearance.MaterialComponents.Body2">
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">end</item>