From e3f4a6fefa1ac6709b0a9279f2ef957fd7ec97a3 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Tue, 16 Nov 2021 16:48:40 -0700
Subject: [PATCH] widgets: fix minor issues

Fix problems with weird margins in the small/wide widgets and change
the initial layout from widget_medium to widget_default.

The latter is nice, as it allows for more cohesion between the default
state and the "unhooked" state that's shown when the phone boots.
---
 app/src/main/res/layout/widget_small.xml | 4 ++--
 app/src/main/res/layout/widget_wide.xml  | 4 ++--
 app/src/main/res/values/dimens.xml       | 2 +-
 app/src/main/res/xml-v31/widget_info.xml | 2 +-
 app/src/main/res/xml/widget_info.xml     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/widget_small.xml b/app/src/main/res/layout/widget_small.xml
index 359453ad5..4fcd0da5b 100644
--- a/app/src/main/res/layout/widget_small.xml
+++ b/app/src/main/res/layout/widget_small.xml
@@ -55,8 +55,8 @@
         android:layout_alignParentBottom="true"
         android:paddingTop="@dimen/spacing_small"
         android:paddingBottom="@dimen/spacing_small"
-        android:paddingStart="@dimen/spacing_medium"
-        android:paddingEnd="@dimen/spacing_medium"
+        android:paddingStart="@dimen/spacing_small"
+        android:paddingEnd="@dimen/spacing_small"
         android:elevation="@dimen/elevation_normal"
         android:orientation="horizontal"
         android:background="@drawable/ui_widget_panel"
diff --git a/app/src/main/res/layout/widget_wide.xml b/app/src/main/res/layout/widget_wide.xml
index 742c7a67b..65b8d532b 100644
--- a/app/src/main/res/layout/widget_wide.xml
+++ b/app/src/main/res/layout/widget_wide.xml
@@ -59,8 +59,8 @@
         android:orientation="horizontal"
         android:paddingTop="@dimen/spacing_small"
         android:paddingBottom="@dimen/spacing_small"
-        android:paddingStart="@dimen/spacing_medium"
-        android:paddingEnd="@dimen/spacing_medium">
+        android:paddingStart="@dimen/spacing_small"
+        android:paddingEnd="@dimen/spacing_small">
 
         <android.widget.ImageButton
             android:id="@+id/widget_loop"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ffa44e104..9567644ec 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -33,5 +33,5 @@
     <dimen name="widget_width_min">176dp</dimen>
     <dimen name="widget_height_min">110dp</dimen>
     <dimen name="widget_width_def">@dimen/widget_width_min</dimen>
-    <dimen name="widget_height_def">180dp</dimen>
+    <dimen name="widget_height_def">110dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml-v31/widget_info.xml b/app/src/main/res/xml-v31/widget_info.xml
index 1e2f02576..71ce304c0 100644
--- a/app/src/main/res/xml-v31/widget_info.xml
+++ b/app/src/main/res/xml-v31/widget_info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:description="@string/info_widget_desc"
-    android:initialLayout="@layout/widget_medium"
+    android:initialLayout="@layout/widget_default"
     android:minWidth="@dimen/widget_width_def"
     android:minHeight="@dimen/widget_height_def"
     android:minResizeWidth="@dimen/widget_width_min"
diff --git a/app/src/main/res/xml/widget_info.xml b/app/src/main/res/xml/widget_info.xml
index 95359c542..3ef1eb157 100644
--- a/app/src/main/res/xml/widget_info.xml
+++ b/app/src/main/res/xml/widget_info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialLayout="@layout/widget_medium"
+    android:initialLayout="@layout/widget_default"
     android:minWidth="@dimen/widget_width_def"
     android:minHeight="@dimen/widget_height_def"
     android:minResizeWidth="@dimen/widget_width_min"