From ba3255d9ec6218c274f3be575e610012cced48cc Mon Sep 17 00:00:00 2001
From: Luke Wass <wassupluke@gmail.com>
Date: Mon, 19 May 2025 16:34:56 -0500
Subject: [PATCH] Improve widget list layout

---
 app/src/main/res/layout/list_widgets_row.xml | 131 ++++++++++++-------
 1 file changed, 85 insertions(+), 46 deletions(-)

diff --git a/app/src/main/res/layout/list_widgets_row.xml b/app/src/main/res/layout/list_widgets_row.xml
index 878aaad..147cc36 100644
--- a/app/src/main/res/layout/list_widgets_row.xml
+++ b/app/src/main/res/layout/list_widgets_row.xml
@@ -6,55 +6,94 @@
     android:id="@+id/list_apps_row_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="15sp">
+    android:layout_marginTop="15sp"
+    android:layout_marginHorizontal="30sp">
 
-
-    <ImageView
-        android:id="@+id/list_widgets_row_icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:src="@mipmap/ic_launcher_round"
-        tools:ignore="ContentDescription" />
-
-
-    <TextView
-        android:id="@+id/list_widgets_row_name"
-        android:layout_width="0dp"
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10sp"
-        android:layout_marginEnd="10sp"
-        android:gravity="start"
-        android:text=""
-        android:textSize="20sp"
-        tools:text="some widget"
-        app:layout_constraintStart_toEndOf="@id/list_widgets_row_icon"
+        android:backgroundTint="#00000000"
+        app:cardElevation="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/list_widgets_row_description"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="10sp"
-        android:gravity="start"
-        android:text=""
-        android:textSize="12sp"
-        app:layout_constraintStart_toStartOf="@+id/list_widgets_row_name"
-        app:layout_constraintTop_toBottomOf="@+id/list_widgets_row_name"
-        tools:text="a longer description of the widget" />
-    <ImageView
-        android:id="@+id/list_widgets_row_preview"
-        android:layout_width="0dp"
-        android:maxHeight="100dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:layout_height="100dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/list_widgets_row_description"
-        tools:src="@mipmap/ic_launcher_round"
-        tools:ignore="ContentDescription" />
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/icon_title_description_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+
+                <ImageView
+                    android:id="@+id/list_widgets_row_icon"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    tools:src="@mipmap/ic_launcher_round"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:ignore="ContentDescription" />
+
+                <TextView
+                    android:id="@+id/list_widgets_row_name"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginStart="10sp"
+                    android:layout_marginEnd="10sp"
+                    android:text=""
+                    style="@style/TextAppearance.Material3.HeadlineSmall"
+                    tools:text="Some Widget"
+                    app:layout_constraintStart_toEndOf="@id/list_widgets_row_icon"
+                    app:layout_constraintTop_toTopOf="@id/list_widgets_row_icon"
+                    app:layout_constraintBottom_toBottomOf="@id/list_widgets_row_icon"/>
+
+
+                <TextView
+                    android:id="@+id/list_widgets_row_description"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textSize="12sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="@+id/list_widgets_row_name"
+                    app:layout_constraintTop_toBottomOf="@+id/list_widgets_row_name"
+                    tools:text="A longer description of the widget that may take up multiple lines." />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                app:layout_constraintTop_toBottomOf="@id/icon_title_description_container">
+
+
+                <ImageView
+                    android:id="@+id/list_widgets_row_preview"
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp"
+                    android:maxHeight="100dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/list_widgets_row_icon"
+                    tools:src="@mipmap/ic_launcher_round"
+                    tools:ignore="ContentDescription,NotSibling" />
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    </androidx.cardview.widget.CardView>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file