From 6f09bc648409e1d0b1118143e41ce62043a457dc Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 16 Apr 2020 10:40:37 -0500
Subject: [PATCH] Keep hidden task indicator aligned to top

---
 .../java/org/tasks/tasklist/ViewHolder.java   |  8 +-
 .../main/res/layout/task_adapter_row_body.xml | 77 +++++++++++--------
 2 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/org/tasks/tasklist/ViewHolder.java b/app/src/main/java/org/tasks/tasklist/ViewHolder.java
index 58a06a5dc..c396db63a 100644
--- a/app/src/main/java/org/tasks/tasklist/ViewHolder.java
+++ b/app/src/main/java/org/tasks/tasklist/ViewHolder.java
@@ -72,6 +72,9 @@ public class ViewHolder extends RecyclerView.ViewHolder {
   @BindView(R.id.chip_group)
   ChipGroup chipGroup;
 
+  @BindView(R.id.hidden_icon)
+  View hiddenIcon;
+
   private int indent;
   private boolean selected;
   private boolean moving;
@@ -122,7 +125,7 @@ public class ViewHolder extends RecyclerView.ViewHolder {
       description.setEllipsize(null);
     }
 
-    setTopPadding(rowPadding, nameView, completeBox, dueDate);
+    setTopPadding(rowPadding, nameView, completeBox, dueDate, hiddenIcon);
     setBottomPadding(rowPadding, completeBox, dueDate);
 
     nameView.setTextSize(fontSize);
@@ -197,8 +200,7 @@ public class ViewHolder extends RecyclerView.ViewHolder {
     this.indent = task.indent;
 
     nameView.setText(task.getTitle());
-    TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(
-        nameView, task.isHidden() ? R.drawable.ic_outline_visibility_off_24px : 0, 0, 0, 0);
+    hiddenIcon.setVisibility(task.isHidden() ? View.VISIBLE : View.GONE);
     setupTitleAndCheckbox();
     setupDueDate();
     if (preferences.getBoolean(R.string.p_show_list_indicators, true)) {
diff --git a/app/src/main/res/layout/task_adapter_row_body.xml b/app/src/main/res/layout/task_adapter_row_body.xml
index 359546183..4a0147d1b 100644
--- a/app/src/main/res/layout/task_adapter_row_body.xml
+++ b/app/src/main/res/layout/task_adapter_row_body.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/rowBody"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -17,7 +18,8 @@
       android:layout_alignParentTop="true"
       android:layout_alignParentStart="true"
       android:paddingStart="@dimen/keyline_first"
-      android:paddingEnd="@dimen/keyline_second"/>
+      android:paddingEnd="@dimen/keyline_second"
+      tools:src="@drawable/ic_outline_check_box_outline_blank_24px" />
 
     <TextView
       android:id="@+id/due_date"
@@ -30,13 +32,25 @@
       android:paddingEnd="@dimen/half_keyline_first"
       android:ellipsize="end"
       android:singleLine="true"
-      android:textSize="14sp"/>
+      android:textSize="14sp"
+      tools:text="Tmrrw" />
+
+    <ImageView
+      android:id="@+id/hidden_icon"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_toEndOf="@id/completeBox"
+      android:paddingEnd="2dp"
+      android:paddingStart="0dp"
+      android:src="@drawable/ic_outline_visibility_off_24px"
+      android:tint="@color/icon_tint_with_alpha"
+      android:contentDescription="@string/widget_due_date_hidden" />
 
     <TextView
       android:id="@+id/title"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_toEndOf="@id/completeBox"
+      android:layout_toEndOf="@id/hidden_icon"
       android:layout_toStartOf="@id/due_date"
       android:paddingStart="0dp"
       android:paddingEnd="@dimen/half_keyline_first"
@@ -48,34 +62,37 @@
       android:textColor="?android:attr/textColorPrimary"
       android:textSize="@dimen/task_edit_text_size"
       android:drawablePadding="2dp"
-      app:drawableTint="@color/icon_tint_with_alpha"/>
+      app:drawableTint="@color/icon_tint_with_alpha"
+      tools:text="Task title"
+      tools:textColor="@color/text_primary" />
 
-  <TextView
-    android:id="@+id/description"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_below="@id/title"
-    android:layout_marginTop="@dimen/task_list_item_spacing"
-    android:paddingStart="@dimen/keyline_content_inset"
-    android:paddingEnd="@dimen/keyline_first"
-    android:ellipsize="end"
-    android:gravity="start"
-    android:maxLines="2"
-    android:textAlignment="viewStart"
-    android:textColor="?android:textColorSecondary"
-    android:textSize="@dimen/task_edit_text_size"
-    android:visibility="gone"/>
+    <TextView
+      android:id="@+id/description"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/title"
+      android:layout_marginTop="@dimen/task_list_item_spacing"
+      android:paddingStart="@dimen/keyline_content_inset"
+      android:paddingEnd="@dimen/keyline_first"
+      android:ellipsize="end"
+      android:gravity="start"
+      android:maxLines="2"
+      android:textAlignment="viewStart"
+      android:textColor="?android:textColorSecondary"
+      android:textSize="@dimen/task_edit_text_size"
+      android:visibility="gone"
+      tools:text="Task description" />
 
-  <com.google.android.material.chip.ChipGroup
-    android:id="@+id/chip_group"
-    android:layout_below="@id/description"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/task_list_item_spacing"
-    android:layout_marginStart="@dimen/keyline_content_inset"
-    android:layout_marginEnd="@dimen/keyline_first"
-    android:visibility="gone"
-    app:chipSpacingHorizontal="@dimen/chip_spacing"
-    app:chipSpacingVertical="@dimen/chip_spacing"/>
+    <com.google.android.material.chip.ChipGroup
+      android:id="@+id/chip_group"
+      android:layout_below="@id/description"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/task_list_item_spacing"
+      android:layout_marginStart="@dimen/keyline_content_inset"
+      android:layout_marginEnd="@dimen/keyline_first"
+      android:visibility="gone"
+      app:chipSpacingHorizontal="@dimen/chip_spacing"
+      app:chipSpacingVertical="@dimen/chip_spacing" />
 
 </RelativeLayout>
\ No newline at end of file