From 38bc3be5b7f6f127dde55d1c0a2526052a065ebb Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Mon, 24 Jan 2022 15:10:30 +0100
Subject: [PATCH] Improve layouts

---
 .../cards/pods/DualApplePodsCardVH.kt         |  6 +-
 .../monitor_notification_dual_pods_small.xml  | 16 ++---
 ...r_notification_single_pods_basic_small.xml |  2 +-
 ...monitor_notification_single_pods_small.xml |  6 +-
 .../layout/overview_pods_apple_dual_item.xml  | 62 +++++++++----------
 .../overview_pods_apple_single_basic_item.xml |  4 +-
 .../overview_pods_apple_single_item.xml       | 12 ++--
 app/src/main/res/values/styles.xml            |  6 +-
 8 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualApplePodsCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualApplePodsCardVH.kt
index 76c25759..c193e379 100644
--- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualApplePodsCardVH.kt
+++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualApplePodsCardVH.kt
@@ -79,11 +79,15 @@ class DualApplePodsCardVH(parent: ViewGroup) :
             podCaseChargingIcon.isInvisible = !isCaseCharging
             podCaseChargingLabel.isInvisible = !isCaseCharging
 
-            podCaseLidLabel.text = when (device.caseLidState) {
+            podCaseLidLabel.text = when (caseLidState) {
                 LidState.OPEN -> context.getString(R.string.pods_case_status_open_label)
                 LidState.CLOSED -> context.getString(R.string.pods_case_status_closed_label)
                 else -> context.getString(R.string.general_value_unknown_label)
             }
+
+            val hideInfo = !listOf(LidState.OPEN, LidState.CLOSED).contains(caseLidState)
+            podCaseLidIcon.isInvisible = hideInfo
+            podCaseLidLabel.isInvisible = hideInfo
         }
 
         status.apply {
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 ff9626c6..e5b80484 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,7 +18,7 @@
 
         <ImageView
             android:id="@+id/pod_left_icon"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_airpod_left_24" />
 
         <TextView
@@ -31,12 +31,12 @@
 
         <ImageView
             android:id="@+id/pod_left_charging"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_baseline_power_24" />
 
         <ImageView
             android:id="@+id/pod_left_ear"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_baseline_hearing_24" />
     </LinearLayout>
 
@@ -52,7 +52,7 @@
 
         <ImageView
             android:id="@+id/pod_case_icon"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_airpod_case_24" />
 
         <TextView
@@ -65,7 +65,7 @@
 
         <ImageView
             android:id="@+id/pod_case_charging"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_baseline_power_24" />
     </LinearLayout>
 
@@ -81,7 +81,7 @@
 
         <ImageView
             android:id="@+id/pod_right_icon"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_airpod_right_24" />
 
         <TextView
@@ -94,12 +94,12 @@
 
         <ImageView
             android:id="@+id/pod_right_charging"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_baseline_power_24" />
 
         <ImageView
             android:id="@+id/pod_right_ear"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_baseline_hearing_24" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/monitor_notification_single_pods_basic_small.xml b/app/src/main/res/layout/monitor_notification_single_pods_basic_small.xml
index c8adecf7..00f46d63 100644
--- a/app/src/main/res/layout/monitor_notification_single_pods_basic_small.xml
+++ b/app/src/main/res/layout/monitor_notification_single_pods_basic_small.xml
@@ -21,7 +21,7 @@
 
         <ImageView
             android:id="@+id/headphones_battery_icon"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_baseline_battery_unknown_24" />
 
         <TextView
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 6fe00db3..206d2ce5 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
@@ -21,7 +21,7 @@
 
         <ImageView
             android:id="@+id/headphones_battery_icon"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_baseline_battery_unknown_24" />
 
         <TextView
@@ -35,12 +35,12 @@
 
         <ImageView
             android:id="@+id/headphones_charging"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_baseline_power_24" />
 
         <ImageView
             android:id="@+id/headphones_worn"
-            style="@style/MiniTextIcon"
+            style="@style/PodInfoItemIcon"
             android:src="@drawable/ic_baseline_hearing_24" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/overview_pods_apple_dual_item.xml b/app/src/main/res/layout/overview_pods_apple_dual_item.xml
index fc621ac8..42767d0f 100644
--- a/app/src/main/res/layout/overview_pods_apple_dual_item.xml
+++ b/app/src/main/res/layout/overview_pods_apple_dual_item.xml
@@ -94,7 +94,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="4dp"
             android:minHeight="108dp"
             app:layout_constraintBottom_toTopOf="@id/barrier_bottom"
             app:layout_constraintEnd_toStartOf="@id/pod_case_container"
@@ -104,7 +104,7 @@
 
             <ImageView
                 android:id="@+id/pod_left_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_airpod_left_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_left_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -112,7 +112,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_left_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -123,7 +123,7 @@
 
             <ImageView
                 android:id="@+id/pod_left_battery_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_battery_unknown_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_left_battery_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -131,7 +131,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_left_battery_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -143,7 +143,7 @@
 
             <ImageView
                 android:id="@+id/pod_left_charging_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_power_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_left_charging_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -151,7 +151,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_left_charging_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -163,7 +163,7 @@
 
             <ImageView
                 android:id="@+id/pod_left_microphone_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_keyboard_voice_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_left_microphone_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -171,7 +171,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_left_microphone_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -183,7 +183,7 @@
 
             <ImageView
                 android:id="@+id/pod_left_wear_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_hearing_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_left_wear_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -191,7 +191,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_left_wear_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -207,7 +207,7 @@
             android:id="@+id/pod_case_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="8dp"
+            android:layout_marginHorizontal="4dp"
             app:layout_constraintBottom_toTopOf="@id/barrier_bottom"
             app:layout_constraintEnd_toStartOf="@id/pod_right_container"
             app:layout_constraintStart_toEndOf="@id/pod_left_container"
@@ -216,7 +216,7 @@
 
             <ImageView
                 android:id="@+id/pod_case_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_airpod_case_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_case_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -224,7 +224,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_case_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -235,7 +235,7 @@
 
             <ImageView
                 android:id="@+id/pod_case_battery_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_battery_unknown_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_case_battery_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -243,7 +243,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_case_battery_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -255,7 +255,7 @@
 
             <ImageView
                 android:id="@+id/pod_case_charging_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_power_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_case_charging_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -263,7 +263,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_case_charging_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -275,7 +275,7 @@
 
             <ImageView
                 android:id="@+id/pod_case_lid_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_grid_view_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_case_lid_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -283,7 +283,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_case_lid_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -299,7 +299,7 @@
             android:id="@+id/pod_right_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="4dp"
             android:layout_marginEnd="16dp"
             app:layout_constraintBottom_toTopOf="@id/barrier_bottom"
             app:layout_constraintEnd_toEndOf="parent"
@@ -309,7 +309,7 @@
 
             <ImageView
                 android:id="@+id/pod_right_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_airpod_right_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_right_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -317,7 +317,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_right_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -328,7 +328,7 @@
 
             <ImageView
                 android:id="@+id/pod_right_battery_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_battery_unknown_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_right_battery_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -336,7 +336,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_right_battery_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -349,7 +349,7 @@
 
             <ImageView
                 android:id="@+id/pod_right_charging_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_power_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_right_charging_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -357,7 +357,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_right_charging_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -369,7 +369,7 @@
 
             <ImageView
                 android:id="@+id/pod_right_microphone_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_keyboard_voice_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_right_microphone_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -377,7 +377,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_right_microphone_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -389,7 +389,7 @@
 
             <ImageView
                 android:id="@+id/pod_right_wear_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_hearing_24"
                 app:layout_constraintBottom_toBottomOf="@id/pod_right_wear_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -397,7 +397,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/pod_right_wear_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/overview_pods_apple_single_basic_item.xml b/app/src/main/res/layout/overview_pods_apple_single_basic_item.xml
index 5886920c..390b4e12 100644
--- a/app/src/main/res/layout/overview_pods_apple_single_basic_item.xml
+++ b/app/src/main/res/layout/overview_pods_apple_single_basic_item.xml
@@ -105,7 +105,7 @@
 
             <ImageView
                 android:id="@+id/battery_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_battery_unknown_24"
                 app:layout_constraintBottom_toBottomOf="@id/battery_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -113,7 +113,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/battery_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/overview_pods_apple_single_item.xml b/app/src/main/res/layout/overview_pods_apple_single_item.xml
index 911693b3..5c4be1fc 100644
--- a/app/src/main/res/layout/overview_pods_apple_single_item.xml
+++ b/app/src/main/res/layout/overview_pods_apple_single_item.xml
@@ -106,7 +106,7 @@
 
             <ImageView
                 android:id="@+id/battery_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_battery_unknown_24"
                 app:layout_constraintBottom_toBottomOf="@id/battery_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -114,7 +114,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/battery_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -126,7 +126,7 @@
 
             <ImageView
                 android:id="@+id/charging_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_power_24"
                 app:layout_constraintBottom_toBottomOf="@id/charging_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -134,7 +134,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/charging_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -146,7 +146,7 @@
 
             <ImageView
                 android:id="@+id/wear_icon"
-                style="@style/MiniTextIcon"
+                style="@style/PodInfoItemIcon"
                 android:src="@drawable/ic_baseline_hearing_24"
                 app:layout_constraintBottom_toBottomOf="@id/wear_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -154,7 +154,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/wear_label"
-                style="@style/TextAppearance.MaterialComponents.Body2"
+                style="@style/PodInfoItemText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 25eadee5..5f460505 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,8 +7,12 @@
         <item name="android:layout_marginEnd">8dp</item>
     </style>
 
-    <style name="MiniTextIcon">
+    <style name="PodInfoItemIcon">
         <item name="android:layout_height">20dp</item>
         <item name="android:layout_width">20dp</item>
     </style>
+
+    <style name="PodInfoItemText" parent="TextAppearance.MaterialComponents.Body2">
+        <item name="android:singleLine">true</item>
+    </style>
 </resources>
\ No newline at end of file