From bbfb7351243aa48ff620dd70ef50ed99ae0b01e8 Mon Sep 17 00:00:00 2001
From: Ricky Cheung <rcheung844@gmail.com>
Date: Wed, 26 Jun 2024 17:41:47 +0800
Subject: [PATCH] Enlarge the icons on wide widgets

* Also move the case details to the centre and separate the text a little

Signed-off-by: Ricky Cheung <rcheung844@gmail.com>
---
 .../capod/main/ui/widget/WidgetProvider.kt    |  4 +-
 .../layout/widget_pod_dual_wide_layout.xml    | 48 ++++++++++---------
 app/src/main/res/values/styles.xml            |  5 ++
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetProvider.kt b/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetProvider.kt
index 4546b3f..2d6f23f 100644
--- a/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetProvider.kt
+++ b/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetProvider.kt
@@ -135,13 +135,13 @@ class WidgetProvider : AppWidgetProvider() {
                     .getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH)
                 val columns = getCellsForSize(minWidth)
 
-                /* Enable wide widgets only when we are provided with 4 or
+                /* Enable wide widgets only when we are provided with 5 or
                  * more columns of space.
                  * Although the minimum size is only 2x1, the safeguards are
                  * added if these restrictions will ever be loosened in the future.
                  */
                 val layout = when (columns) {
-                    in 1 .. 3 -> R.layout.widget_pod_dual_compact_layout
+                    in 1 .. 4 -> R.layout.widget_pod_dual_compact_layout
                     else -> R.layout.widget_pod_dual_wide_layout
                 }
 
diff --git a/app/src/main/res/layout/widget_pod_dual_wide_layout.xml b/app/src/main/res/layout/widget_pod_dual_wide_layout.xml
index 44f3530..de3068c 100644
--- a/app/src/main/res/layout/widget_pod_dual_wide_layout.xml
+++ b/app/src/main/res/layout/widget_pod_dual_wide_layout.xml
@@ -14,12 +14,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginEnd="24dp"
+            android:layout_marginEnd="12dp"
+            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/pod_left_icon"
-                style="@style/PodInfoItemIcon.Notification"
+                style="@style/PodInfoItemIcon.Notification.Large"
                 android:src="@drawable/devic_airpods_pro2_left"
                 tools:ignore="ContentDescription" />
 
@@ -49,17 +50,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginEnd="24dp"
+            android:layout_marginEnd="12dp"
+            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <ImageView
-                android:id="@+id/pod_right_icon"
-                style="@style/PodInfoItemIcon.Notification"
-                android:src="@drawable/devic_airpods_pro2_right"
+                android:id="@+id/pod_case_icon"
+                style="@style/PodInfoItemIcon.Notification.Large"
+                android:src="@drawable/devic_airpods_gen1_case"
                 tools:ignore="ContentDescription" />
 
             <TextView
-                android:id="@+id/pod_right_label"
+                android:id="@+id/pod_case_label"
                 style="@style/PodInfoItemText.Notification"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -68,32 +70,26 @@
                 tools:text="100%" />
 
             <ImageView
-                android:id="@+id/pod_right_charging"
-                style="@style/PodInfoItemIcon.Notification"
-                android:src="@drawable/ic_baseline_power_24"
-                tools:ignore="ContentDescription" />
-
-            <ImageView
-                android:id="@+id/pod_right_ear"
+                android:id="@+id/pod_case_charging"
                 style="@style/PodInfoItemIcon.Notification"
-                android:src="@drawable/ic_baseline_hearing_24"
-                tools:ignore="ContentDescription" />
+                android:src="@drawable/ic_baseline_power_24" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <ImageView
-                android:id="@+id/pod_case_icon"
-                style="@style/PodInfoItemIcon.Notification"
-                android:src="@drawable/devic_airpods_gen1_case"
+                android:id="@+id/pod_right_icon"
+                style="@style/PodInfoItemIcon.Notification.Large"
+                android:src="@drawable/devic_airpods_pro2_right"
                 tools:ignore="ContentDescription" />
 
             <TextView
-                android:id="@+id/pod_case_label"
+                android:id="@+id/pod_right_label"
                 style="@style/PodInfoItemText.Notification"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -102,9 +98,16 @@
                 tools:text="100%" />
 
             <ImageView
-                android:id="@+id/pod_case_charging"
+                android:id="@+id/pod_right_charging"
                 style="@style/PodInfoItemIcon.Notification"
-                android:src="@drawable/ic_baseline_power_24" />
+                android:src="@drawable/ic_baseline_power_24"
+                tools:ignore="ContentDescription" />
+
+            <ImageView
+                android:id="@+id/pod_right_ear"
+                style="@style/PodInfoItemIcon.Notification"
+                android:src="@drawable/ic_baseline_hearing_24"
+                tools:ignore="ContentDescription" />
         </LinearLayout>
 
     </LinearLayout>
@@ -115,6 +118,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:layout_marginTop="8dp"
         android:gravity="center"
         android:textSize="12sp"
         android:textStyle="bold"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5a32110..5e73c1c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,6 +24,11 @@
         <item name="tint">?android:attr/colorAccent</item>
     </style>
 
+    <style name="PodInfoItemIcon.Notification.Large" parent="PodInfoItemIcon.Notification">
+        <item name="android:layout_height">40dp</item>
+        <item name="android:layout_width">40dp</item>
+    </style>
+
     <style name="PodInfoItemText.Notification" parent="TextAppearance.Compat.Notification.Title">
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">end</item>