From 786c5f1e936cc003f9854fde4b30a8b71d0624cf Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 17 Sep 2012 11:22:29 -0700
Subject: [PATCH] Fixed some layout issues with the new task row design

---
 astrid/res/layout/task_adapter_row_simple.xml |  3 ++-
 .../todoroo/astrid/adapter/TaskAdapter.java   | 24 +++++++------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/astrid/res/layout/task_adapter_row_simple.xml b/astrid/res/layout/task_adapter_row_simple.xml
index c6ff24037..eae0c6169 100644
--- a/astrid/res/layout/task_adapter_row_simple.xml
+++ b/astrid/res/layout/task_adapter_row_simple.xml
@@ -67,7 +67,8 @@
 	           android:layout_width="fill_parent"
 	           android:layout_height="wrap_content"
                android:layout_weight="100"
-	           android:orientation="vertical">
+	           android:orientation="vertical"
+	           android:gravity="center_vertical">
 		        <TextView
 		            android:id="@+id/title"
 		            style="@style/TextAppearance.TAd_ItemTitle"
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index cdceed523..46523bed0 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -317,7 +317,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             viewHolder.nameView.setEllipsize(null);
         }
 
-        if (showNotes) {
+        if (showNotes && !simpleLayout) {
             RelativeLayout.LayoutParams taskRowParams = (RelativeLayout.LayoutParams)viewHolder.taskRow.getLayoutParams();
             taskRowParams.addRule(RelativeLayout.CENTER_VERTICAL, 0);
         }
@@ -352,14 +352,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         setTaskAppearance(viewHolder, task);
     }
 
-    /** Helper method to set the visibility based on if there's stuff inside */
-    private static void setVisibility(TextView v) {
-        if(v.getText().length() > 0)
-            v.setVisibility(View.VISIBLE);
-        else
-            v.setVisibility(View.GONE);
-    }
-
     /**
      * View Holder saves a lot of findViewById lookups.
      *
@@ -1149,13 +1141,13 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                     String dateValue = formatDate(dueDate);
                     dueDateView.setText(dateValue);
                     dueDateTextWidth = paint.measureText(dateValue);
-                    setVisibility(dueDateView);
+                    dueDateView.setVisibility(View.VISIBLE);
                 } else if(task.isCompleted()) {
                     String dateValue = formatDate(task.getValue(Task.COMPLETION_DATE));
                     dueDateView.setText(resources.getString(R.string.TAd_completed, dateValue));
                     dueDateView.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemDueDate_Completed);
                     dueDateTextWidth = paint.measureText(dateValue);
-                    setVisibility(dueDateView);
+                    dueDateView.setVisibility(View.VISIBLE);
                 } else {
                     dueDateView.setVisibility(View.GONE);
                 }
@@ -1164,11 +1156,13 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                     String tags = viewHolder.tagsString;
                     if (tags != null && task.hasDueDate())
                         tags = "  |  " + tags; //$NON-NLS-1$
-                    if (!task.isCompleted())
+                    if (!task.isCompleted()) {
                         viewHolder.tagsView.setText(tags);
-                    else
-                        viewHolder.tagsView.setText(null);
-                    setVisibility(viewHolder.tagsView);
+                        viewHolder.tagsView.setVisibility(TextUtils.isEmpty(tags) ? View.GONE : View.VISIBLE);
+                    } else {
+                        viewHolder.tagsView.setText(""); //$NON-NLS-1$
+                        viewHolder.tagsView.setVisibility(View.GONE);
+                    }
                 }
             }
         }