From e449dcb23133c63ad0affedc5dc4a55e4ce56e97 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 7 Apr 2020 16:04:09 -0500
Subject: [PATCH] Fix priority row on smaller devices

---
 .../main/res/layout/control_set_priority.xml  | 76 ++++++++++---------
 app/src/main/res/values-sw384dp/dimens.xml    |  1 +
 app/src/main/res/values/dimens.xml            |  1 +
 app/src/main/res/values/styles.xml            |  3 +-
 4 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/app/src/main/res/layout/control_set_priority.xml b/app/src/main/res/layout/control_set_priority.xml
index e2b7aaac7..9b2dc9fe3 100644
--- a/app/src/main/res/layout/control_set_priority.xml
+++ b/app/src/main/res/layout/control_set_priority.xml
@@ -4,41 +4,45 @@
   android:layout_height="wrap_content"
   android:gravity="center_vertical">
 
-  <TextView
-    android:id="@+id/text"
-    style="@style/TaskEditTextPrimary"
-    android:layout_alignParentStart="true"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="start|center_vertical"
-    android:text="@string/TEA_importance_label"/>
-
-  <RadioGroup
-    android:layout_toEndOf="@id/text"
-    android:layout_alignParentEnd="true"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="end"
-    android:paddingStart="@dimen/keyline_first"
-    android:paddingEnd="0dp"
-    android:gravity="end"
-    android:orientation="horizontal">
-
-    <androidx.appcompat.widget.AppCompatRadioButton
-      android:id="@+id/priority_none"
-      style="@style/priority_button"/>
-
-    <androidx.appcompat.widget.AppCompatRadioButton
-      android:id="@+id/priority_low"
-      style="@style/priority_button"/>
-
-    <androidx.appcompat.widget.AppCompatRadioButton
-      android:id="@+id/priority_medium"
-      style="@style/priority_button"/>
-
-    <androidx.appcompat.widget.AppCompatRadioButton
-      android:id="@+id/priority_high"
-      style="@style/priority_button"/>
-  </RadioGroup>
+    <RadioGroup
+      android:id="@+id/priority_group"
+      android:layout_alignParentEnd="true"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="end"
+      android:paddingStart="@dimen/keyline_first"
+      android:paddingEnd="0dp"
+      android:gravity="end"
+      android:orientation="horizontal">
+
+        <androidx.appcompat.widget.AppCompatRadioButton
+          android:id="@+id/priority_none"
+          style="@style/priority_button" />
+
+        <androidx.appcompat.widget.AppCompatRadioButton
+          android:id="@+id/priority_low"
+          style="@style/priority_button" />
+
+        <androidx.appcompat.widget.AppCompatRadioButton
+          android:id="@+id/priority_medium"
+          style="@style/priority_button" />
+
+        <androidx.appcompat.widget.AppCompatRadioButton
+          android:id="@+id/priority_high"
+          style="@style/priority_button" />
+    </RadioGroup>
+
+    <TextView
+      android:id="@+id/text"
+      style="@style/TaskEditTextPrimary"
+      android:layout_alignParentStart="true"
+      android:layout_toStartOf="@id/priority_group"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:singleLine="true"
+      android:ellipsize="end"
+      android:gravity="start|center_vertical"
+      android:text="@string/TEA_importance_label" />
+
 
 </RelativeLayout>
diff --git a/app/src/main/res/values-sw384dp/dimens.xml b/app/src/main/res/values-sw384dp/dimens.xml
index 989e33480..2dba4e2b5 100644
--- a/app/src/main/res/values-sw384dp/dimens.xml
+++ b/app/src/main/res/values-sw384dp/dimens.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <dimen name="priority_button_width">48dp</dimen>
   <dimen name="navigation_drawer_width">320dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 934c6a71d..b5871fa99 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,6 +6,7 @@
   <dimen name="keyline_first">16dp</dimen>
   <dimen name="keyline_second">32dp</dimen>
   <dimen name="keyline_content_inset">72dp</dimen>
+  <dimen name="priority_button_width">40dp</dimen>
 
   <dimen name="task_list_footer_height">88dp</dimen>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d57019c38..5d30e3dd7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -131,7 +131,8 @@
     <item name="android:elevation" tools:ignore="NewApi">@dimen/elevation_refresh_indicator</item>
   </style>
 
-  <style name="priority_button_base">
+  <style name="priority_button_base" parent="Widget.AppCompat.CompoundButton.RadioButton">
+    <item name="android:layout_width">@dimen/priority_button_width</item>
     <item name="android:layout_height">24dp</item>
   </style>