From d520c7d6d0970b03e41547508d4f891f007a0424 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Wed, 20 Jul 2016 14:15:27 -0500
Subject: [PATCH] Fix widget row padding

---
 src/main/res/layout/scrollable_widget.xml |  2 +
 src/main/res/layout/widget_row.xml        | 67 ++++++++++++-----------
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/main/res/layout/scrollable_widget.xml b/src/main/res/layout/scrollable_widget.xml
index cff82b975..1241f9df3 100644
--- a/src/main/res/layout/scrollable_widget.xml
+++ b/src/main/res/layout/scrollable_widget.xml
@@ -67,6 +67,8 @@
 
         <ListView
             android:id="@+id/list_view"
+            android:divider="@null"
+            android:dividerHeight="0dp"
             android:layout_width="match_parent"
             android:layout_height="fill_parent" />
 
diff --git a/src/main/res/layout/widget_row.xml b/src/main/res/layout/widget_row.xml
index a16ac8288..6fc3f1b34 100644
--- a/src/main/res/layout/widget_row.xml
+++ b/src/main/res/layout/widget_row.xml
@@ -15,45 +15,46 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
         android:layout_gravity="center"
-        android:paddingBottom="5dp"
-        android:paddingEnd="5dp"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
-        android:paddingStart="5dp"
-        android:paddingTop="5dp" />
+        android:padding="5dp" />
 
-    <TextView
-        android:id="@+id/widget_text"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
+        android:layout_centerVertical="true"
         android:layout_toEndOf="@id/widget_complete_box"
         android:layout_toRightOf="@id/widget_complete_box"
-        android:paddingEnd="5dp"
-        android:paddingLeft="0dp"
-        android:paddingRight="5dp"
-        android:paddingStart="0dp"
-        android:singleLine="true"
-        android:textAlignment="viewStart"
-        android:textSize="16sp" />
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/widget_due_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/widget_text"
-        android:layout_toEndOf="@id/widget_complete_box"
-        android:layout_toRightOf="@id/widget_complete_box"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:paddingEnd="5dp"
-        android:paddingLeft="0dp"
-        android:paddingRight="5dp"
-        android:paddingStart="0dp"
-        android:singleLine="true"
-        android:textAlignment="viewStart"
-        android:textSize="12sp"
-        android:visibility="gone" />
+        <TextView
+            android:id="@+id/widget_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingEnd="5dp"
+            android:paddingLeft="0dp"
+            android:paddingRight="5dp"
+            android:paddingStart="0dp"
+            android:singleLine="true"
+            android:textAlignment="viewStart"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/widget_due_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:paddingEnd="5dp"
+            android:paddingLeft="0dp"
+            android:paddingRight="5dp"
+            android:paddingStart="0dp"
+            android:singleLine="true"
+            android:textAlignment="viewStart"
+            android:textSize="12sp"
+            android:visibility="gone" />
+
+    </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file