From e8ada2b4019639b0aa5e56f44c31b7ff86399916 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Fri, 5 Feb 2016 10:15:05 -0600
Subject: [PATCH] Fix layouts and discard bug

* Consistent clear button size
* Implement Geofence.equals
* Align text and icons to toolbar keylines
---
 build.gradle                                  |  2 +-
 .../astrid/ui/EditTitleControlSet.java        |  1 +
 .../java/org/tasks/location/Geofence.java     | 31 ++++++++++++++
 src/main/res/layout/alarm_edit_row.xml        |  4 +-
 .../res/layout/control_set_clear_button.xml   |  6 +--
 src/main/res/layout/control_set_deadline.xml  |  3 +-
 .../res/layout/control_set_description.xml    |  4 +-
 src/main/res/layout/control_set_priority.xml  |  8 ++--
 .../res/layout/control_set_repeat_display.xml |  2 +-
 src/main/res/layout/control_set_template.xml  | 18 +++++---
 src/main/res/layout/control_set_timers.xml    |  3 --
 src/main/res/layout/control_set_title.xml     | 42 ++++++++++---------
 src/main/res/layout/file_row.xml              |  4 +-
 src/main/res/layout/filter_adapter_row.xml    | 12 +++---
 .../res/layout/filter_adapter_subheader.xml   |  4 +-
 .../res/layout/task_adapter_row_simple.xml    | 29 +++++++------
 src/main/res/values-sw600dp/dimens.xml        |  2 +-
 src/main/res/values/dimens.xml                |  4 +-
 18 files changed, 107 insertions(+), 72 deletions(-)

diff --git a/build.gradle b/build.gradle
index f6caa2812..22510a44d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ android {
     buildToolsVersion "23.0.2"
 
     defaultConfig {
-        versionCode 387
+        versionCode 388
         versionName "4.8.4"
         minSdkVersion 14
         targetSdkVersion 23
diff --git a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
index e3ee03e39..6b8c7b9a6 100644
--- a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -79,6 +79,7 @@ public class EditTitleControlSet extends TaskEditControlFragment {
         completeBox.setChecked(isComplete);
         editText.setTextKeepState(title);
         editText.setHorizontallyScrolling(false);
+        editText.setLines(1);
         editText.setMaxLines(Integer.MAX_VALUE);
         updateCompleteBox();
         return view;
diff --git a/src/main/java/org/tasks/location/Geofence.java b/src/main/java/org/tasks/location/Geofence.java
index db705a562..9ac3c2147 100644
--- a/src/main/java/org/tasks/location/Geofence.java
+++ b/src/main/java/org/tasks/location/Geofence.java
@@ -55,6 +55,37 @@ public class Geofence implements Serializable, Parcelable {
         return taskId;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Geofence geofence = (Geofence) o;
+
+        if (Double.compare(geofence.latitude, latitude) != 0) return false;
+        if (Double.compare(geofence.longitude, longitude) != 0) return false;
+        if (radius != geofence.radius) return false;
+        if (taskId != geofence.taskId) return false;
+        if (metadataId != geofence.metadataId) return false;
+        return !(name != null ? !name.equals(geofence.name) : geofence.name != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        long temp;
+        result = name != null ? name.hashCode() : 0;
+        temp = Double.doubleToLongBits(latitude);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        temp = Double.doubleToLongBits(longitude);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        result = 31 * result + radius;
+        result = 31 * result + (int) (taskId ^ (taskId >>> 32));
+        result = 31 * result + (int) (metadataId ^ (metadataId >>> 32));
+        return result;
+    }
+
     @Override
     public String toString() {
         return "Geofence{" +
diff --git a/src/main/res/layout/alarm_edit_row.xml b/src/main/res/layout/alarm_edit_row.xml
index 4b2952c1b..c2ade60f0 100644
--- a/src/main/res/layout/alarm_edit_row.xml
+++ b/src/main/res/layout/alarm_edit_row.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
-    android:layout_width="fill_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/task_edit_double_padding_top_bottom"
     android:layout_marginBottom="@dimen/task_edit_double_padding_top_bottom">
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:layout_weight="100">
diff --git a/src/main/res/layout/control_set_clear_button.xml b/src/main/res/layout/control_set_clear_button.xml
index 2225c7e6e..0ea88c834 100644
--- a/src/main/res/layout/control_set_clear_button.xml
+++ b/src/main/res/layout/control_set_clear_button.xml
@@ -2,15 +2,11 @@
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/clear"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:layout_gravity="center"
     android:layout_weight="1"
     android:alpha="@dimen/alpha_secondary_text_icons"
     android:background="?attr/selectableItemBackgroundBorderless"
     android:clickable="true"
-    android:paddingEnd="10dp"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
-    android:paddingStart="10dp"
     android:src="@drawable/ic_cancel_24dp"
     android:tint="?attr/icon_tint" />
\ No newline at end of file
diff --git a/src/main/res/layout/control_set_deadline.xml b/src/main/res/layout/control_set_deadline.xml
index f46122a94..cf56d795c 100644
--- a/src/main/res/layout/control_set_deadline.xml
+++ b/src/main/res/layout/control_set_deadline.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="top"
     android:orientation="horizontal">
 
     <LinearLayout
diff --git a/src/main/res/layout/control_set_description.xml b/src/main/res/layout/control_set_description.xml
index ac0d5fe11..3fbdd8a6c 100644
--- a/src/main/res/layout/control_set_description.xml
+++ b/src/main/res/layout/control_set_description.xml
@@ -3,8 +3,8 @@
     android:id="@+id/notes"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingRight="@dimen/task_edit_drawable_padding_left_right"
-    android:paddingEnd="@dimen/task_edit_drawable_padding_left_right"
+    android:paddingRight="@dimen/keyline_second"
+    android:paddingEnd="@dimen/keyline_second"
     android:scrollbars="vertical"
     android:hint="@string/TEA_note_label"
     android:textColorHint="?attr/asTextColorHint"
diff --git a/src/main/res/layout/control_set_priority.xml b/src/main/res/layout/control_set_priority.xml
index 68e7a6f0d..cba58ac4b 100644
--- a/src/main/res/layout/control_set_priority.xml
+++ b/src/main/res/layout/control_set_priority.xml
@@ -10,8 +10,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="start|center_vertical"
-        android:paddingEnd="@dimen/task_edit_drawable_padding_left_right"
-        android:paddingRight="@dimen/task_edit_drawable_padding_left_right"
+        android:paddingEnd="@dimen/keyline_second"
+        android:paddingRight="@dimen/keyline_second"
         android:text="@string/TEA_importance_label"
         android:textColor="?attr/asTextColor"
         android:textSize="@dimen/task_edit_text_size" />
@@ -22,8 +22,8 @@
         android:layout_gravity="end"
         android:gravity="end"
         android:orientation="horizontal"
-        android:paddingLeft="@dimen/task_edit_drawable_padding_left_right"
-        android:paddingStart="@dimen/task_edit_drawable_padding_left_right">
+        android:paddingLeft="@dimen/keyline_second"
+        android:paddingStart="@dimen/keyline_second">
 
         <android.support.v7.widget.AppCompatRadioButton
             android:id="@+id/priority_none"
diff --git a/src/main/res/layout/control_set_repeat_display.xml b/src/main/res/layout/control_set_repeat_display.xml
index a97bfd9ae..3771206c1 100644
--- a/src/main/res/layout/control_set_repeat_display.xml
+++ b/src/main/res/layout/control_set_repeat_display.xml
@@ -9,7 +9,7 @@
     android:orientation="horizontal">
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:layout_weight="100">
diff --git a/src/main/res/layout/control_set_template.xml b/src/main/res/layout/control_set_template.xml
index 3e086baee..9d6a9deea 100644
--- a/src/main/res/layout/control_set_template.xml
+++ b/src/main/res/layout/control_set_template.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:paddingLeft="@dimen/keyline_first"
+    android:paddingStart="@dimen/keyline_first"
+    tools:ignore="RtlSymmetry">
 
     <ImageView
         android:id="@+id/icon"
@@ -13,10 +17,9 @@
         android:alpha="@dimen/alpha_secondary_text_icons"
         android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom"
         android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom"
-        android:paddingLeft="@dimen/task_edit_drawable_padding_left_right"
-        android:paddingStart="@dimen/task_edit_drawable_padding_left_right"
-        android:paddingRight="@dimen/task_edit_drawable_padding_left_right"
-        android:paddingEnd="@dimen/task_edit_drawable_padding_left_right" />
+        android:paddingRight="@dimen/keyline_second"
+        android:paddingEnd="@dimen/keyline_second"
+        tools:ignore="ContentDescription" />
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -29,7 +32,10 @@
             android:id="@+id/content"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" />
+            android:orientation="vertical"
+            android:paddingRight="@dimen/keyline_first"
+            android:paddingEnd="@dimen/keyline_first"
+            tools:ignore="RtlSymmetry" />
 
         <include layout="@layout/task_edit_divider" />
 
diff --git a/src/main/res/layout/control_set_timers.xml b/src/main/res/layout/control_set_timers.xml
index 33438ceaf..a43fe7a76 100644
--- a/src/main/res/layout/control_set_timers.xml
+++ b/src/main/res/layout/control_set_timers.xml
@@ -29,9 +29,6 @@
         android:id="@+id/timer_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingRight="10dp"
-        android:paddingEnd="10dp"
-        android:layout_marginLeft="2dip"
         android:layout_weight="1"
         android:orientation="vertical">
 
diff --git a/src/main/res/layout/control_set_title.xml b/src/main/res/layout/control_set_title.xml
index d242df86f..007c8e61b 100644
--- a/src/main/res/layout/control_set_title.xml
+++ b/src/main/res/layout/control_set_title.xml
@@ -6,27 +6,27 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="vertical">
 
-    <com.todoroo.astrid.ui.CheckableImageView
-        android:id="@+id/completeBox"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom"
-        android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom"
-        android:paddingLeft="@dimen/task_edit_drawable_padding_left_right"
-        android:paddingStart="@dimen/task_edit_drawable_padding_left_right"
-        android:paddingRight="@dimen/task_edit_drawable_padding_left_right"
-        android:paddingEnd="@dimen/task_edit_drawable_padding_left_right"
-        android:scaleType="center" />
+        android:layout_weight="100"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/keyline_first"
+        android:paddingStart="@dimen/keyline_first"
+        android:paddingRight="@dimen/keyline_first"
+        android:paddingEnd="@dimen/keyline_first">
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/task_edit_padding_top_bottom"
-        android:layout_marginTop="@dimen/task_edit_padding_top_bottom" >
+        <com.todoroo.astrid.ui.CheckableImageView
+            android:id="@+id/completeBox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:paddingEnd="@dimen/keyline_second"
+            android:paddingRight="@dimen/keyline_second"
+            android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom"
+            android:scaleType="center" />
 
         <EditText
             android:id="@+id/title"
@@ -39,11 +39,13 @@
             android:inputType="textCapSentences"
             android:scrollbars="vertical"
             android:textColor="?attr/asTextColor"
-            android:textColorHint="?attr/asTextColorHint" />
-
-        <include layout="@layout/task_edit_divider" />
+            android:textColorHint="?attr/asTextColorHint"
+            android:layout_marginTop="@dimen/task_edit_padding_top_bottom"
+            android:paddingTop="@dimen/task_edit_padding_top_bottom"/>
 
     </LinearLayout>
 
+    <include layout="@layout/task_edit_divider" />
+
 </LinearLayout>
 
diff --git a/src/main/res/layout/file_row.xml b/src/main/res/layout/file_row.xml
index 99b1ffb66..5833f23f3 100644
--- a/src/main/res/layout/file_row.xml
+++ b/src/main/res/layout/file_row.xml
@@ -5,7 +5,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
-    android:layout_width="fill_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/task_edit_double_padding_top_bottom"
     android:layout_marginBottom="@dimen/task_edit_double_padding_top_bottom">
@@ -13,7 +13,7 @@
     <TextView
         style="@android:style/TextAppearance"
         android:id="@+id/file_text"
-        android:layout_width="fill_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="100"
         android:textColor="?attr/asTextColor" />
diff --git a/src/main/res/layout/filter_adapter_row.xml b/src/main/res/layout/filter_adapter_row.xml
index 44f5298ad..fd3f5f290 100644
--- a/src/main/res/layout/filter_adapter_row.xml
+++ b/src/main/res/layout/filter_adapter_row.xml
@@ -14,17 +14,17 @@
         android:fontFamily="@string/font_fontFamily_medium"
         android:gravity="center_vertical|end"
         android:minEms="3"
-        android:paddingEnd="@dimen/navigation_drawer_horizontal_margins"
-        android:paddingLeft="@dimen/navigation_drawer_horizontal_margins"
-        android:paddingRight="@dimen/navigation_drawer_horizontal_margins"
-        android:paddingStart="@dimen/navigation_drawer_horizontal_margins"
+        android:paddingEnd="@dimen/keyline_first"
+        android:paddingLeft="@dimen/keyline_first"
+        android:paddingRight="@dimen/keyline_first"
+        android:paddingStart="@dimen/keyline_first"
         android:textColor="?attr/asTextColor" />
 
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_marginLeft="@dimen/navigation_drawer_horizontal_margins"
-        android:layout_marginStart="@dimen/navigation_drawer_horizontal_margins"
+        android:layout_marginLeft="@dimen/keyline_first"
+        android:layout_marginStart="@dimen/keyline_first"
         android:layout_toLeftOf="@id/size"
         android:layout_toStartOf="@id/size"
         android:gravity="center_vertical"
diff --git a/src/main/res/layout/filter_adapter_subheader.xml b/src/main/res/layout/filter_adapter_subheader.xml
index cefbc73f9..73b4850e8 100644
--- a/src/main/res/layout/filter_adapter_subheader.xml
+++ b/src/main/res/layout/filter_adapter_subheader.xml
@@ -12,8 +12,8 @@
         android:background="?attr/asListDividerColor" />
 
     <TextView
-        android:paddingLeft="@dimen/navigation_drawer_horizontal_margins"
-        android:paddingStart="@dimen/navigation_drawer_horizontal_margins"
+        android:paddingLeft="@dimen/keyline_first"
+        android:paddingStart="@dimen/keyline_first"
         android:gravity="center_vertical"
         android:id="@+id/subheader_text"
         android:textColor="?attr/asTextColor"
diff --git a/src/main/res/layout/task_adapter_row_simple.xml b/src/main/res/layout/task_adapter_row_simple.xml
index a90eef696..9d6a49431 100644
--- a/src/main/res/layout/task_adapter_row_simple.xml
+++ b/src/main/res/layout/task_adapter_row_simple.xml
@@ -5,7 +5,8 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
@@ -15,28 +16,30 @@
 	    android:layout_height="wrap_content"
 	    android:layout_marginTop="5dip"
 	    android:layout_marginBottom="5dip"
-	    android:minHeight="40dip">
+		android:paddingEnd="@dimen/keyline_first"
+		android:paddingRight="@dimen/keyline_first">
 	
 	    <com.todoroo.astrid.ui.CheckableImageView
 	        android:id="@+id/completeBox"
-	        android:layout_width="45dip"
-	        android:layout_marginLeft="4dip"
+	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
-	        android:minHeight="40dip"
 	        android:scaleType="center"
 	        android:gravity="center"
+			android:paddingLeft="@dimen/keyline_first"
+			android:paddingStart="@dimen/keyline_first"
+			android:paddingRight="@dimen/keyline_second"
+			android:paddingEnd="@dimen/keyline_second"
 	        android:layout_centerVertical="true" />
 	
 	    <LinearLayout
 	        android:id="@+id/task_row"
-	        android:baselineAligned="false"
+			android:layout_toRightOf="@id/completeBox"
+			android:layout_toEndOf="@id/completeBox"
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"
-	        android:layout_marginLeft="52dip"
 	        android:layout_centerVertical="true"
 	        android:orientation="horizontal"
-	        android:gravity="center_vertical"
-	        android:paddingLeft="4dip" >
+	        android:gravity="center_vertical">
 	
 	        <!-- task name -->
 	
@@ -79,21 +82,21 @@
 		        </LinearLayout>
 	        </LinearLayout>
 	        <!-- due date -->
-	
+
 	        <LinearLayout
 	            android:id="@+id/taskActionContainer"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
 	            android:layout_marginLeft="5dip"
-	            android:layout_marginRight="10dip"
 	            android:orientation="vertical"
-	            android:gravity="right|center_vertical">
+	            android:gravity="end|center_vertical">
 		        <ImageView
 		            android:id="@+id/taskActionIcon"
 		            android:layout_width="20dip"
 		            android:layout_height="20dip"
 		            android:scaleType="fitCenter"
-		            android:visibility="gone"/>
+		            android:visibility="gone"
+					tools:ignore="ContentDescription" />
 	        </LinearLayout>
 	    </LinearLayout>
 	
diff --git a/src/main/res/values-sw600dp/dimens.xml b/src/main/res/values-sw600dp/dimens.xml
index 200b4bd8f..fb08267b2 100644
--- a/src/main/res/values-sw600dp/dimens.xml
+++ b/src/main/res/values-sw600dp/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="navigation_drawer_horizontal_margins">24dp</dimen>
+    <dimen name="keyline_first">24dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index ac0055d72..c49069207 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="navigation_drawer_width">260dp</dimen>
-    <dimen name="navigation_drawer_horizontal_margins">16dp</dimen>
+    <dimen name="keyline_first">16dp</dimen>
+    <dimen name="keyline_second">20dp</dimen>
     <dimen name="widget_margin">0dp</dimen>
 
     <dimen name="task_list_footer_height">88dp</dimen>
@@ -10,7 +11,6 @@
     <dimen name="task_edit_title_padding_top_bottom">18dp</dimen>
     <dimen name="task_edit_padding_top_bottom">9dp</dimen>
     <dimen name="task_edit_double_padding_top_bottom">18dp</dimen>
-    <dimen name="task_edit_drawable_padding_left_right">20dp</dimen>
     <dimen name="task_edit_drawable_padding_top_bottom">17dp</dimen>
     <dimen name="task_edit_text_size">16sp</dimen>
     <item name="alpha_text" format="float" type="dimen">0.87</item>