From d67c5adab2a55fd93ea91544485330ee0d7298b5 Mon Sep 17 00:00:00 2001
From: Andrew Shaw <andrew.t.shaw@gmail.com>
Date: Tue, 24 Jan 2012 15:43:20 -0800
Subject: [PATCH] Centered task checkbox and it no longer cuts off on
 animation. Also centered text and set max lines to 2

---
 astrid/res/layout/task_adapter_row.xml        | 160 +++++++++---------
 .../todoroo/astrid/adapter/TaskAdapter.java   |   2 +-
 2 files changed, 80 insertions(+), 82 deletions(-)

diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index ed007bb13..dad243275 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -1,89 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- See the file "LICENSE" for the full license governing this code. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+    android:id="@+id/rowBody"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="60dip"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
-        
-    <RelativeLayout android:id="@+id/rowBody" 
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+    android:layout_height="70dip"
+    android:paddingBottom="4dip" >
+
+    <!-- completion check-box -->
+
+    <CheckBox
+        android:id="@+id/completeBox"
+        android:layout_width="45dip"
+        android:layout_height="fill_parent"
+        android:layout_alignParentTop="true"
         android:layout_marginLeft="10dip"
-        android:paddingBottom="4dip">
-            
-        <!-- completion check-box -->
-        <CheckBox android:id="@+id/completeBox"
-            android:layout_width="45dip"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="10dip"          
-            android:layout_marginRight="5dip"
-            android:scaleType="fitCenter"
-            android:gravity="center_horizontal|center_vertical"
-            android:button="@drawable/btn_check"/>
-        <!-- assignee photo -->
-        <greendroid.widget.AsyncImageView 
-            android:id="@+id/picture"
-            android:layout_width="35dip"
-            android:layout_height="35dip"
-            android:layout_marginTop="10dip"        
-            android:scaleType="fitCenter"
-            astrid:defaultSrc="@drawable/icn_default_person_image"
-            android:visibility="gone"/>
-            
-        <LinearLayout android:id="@+id/task_row"
+        android:button="@drawable/btn_check" />
+    <!-- assignee photo -->
+
+    <greendroid.widget.AsyncImageView
+        android:id="@+id/picture"
+        android:layout_width="35dip"
+        android:layout_height="35dip"
+        android:layout_marginLeft="10dip"
+        astrid:defaultSrc="@drawable/icn_default_person_image"
+        android:scaleType="fitCenter"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:id="@+id/task_row"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_alignTop="@id/completeBox"
+        android:layout_toRightOf="@id/completeBox"
+        android:orientation="horizontal"
+        android:paddingLeft="5dip" >
+
+        <!-- task name -->
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/TextAppearance.TAd_ItemTitle"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/completeBox"
-            android:layout_alignTop="@id/completeBox"
-            android:paddingLeft="5dip"
-            android:paddingBottom="4dip"
-            android:paddingTop="4dip"
-            android:orientation="horizontal">
-        
-            <!-- task name -->
-            <TextView android:id="@+id/title"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="100"
-                android:maxLines="2"
-                style="@style/TextAppearance.TAd_ItemTitle"/>
-            
-	        <!-- due date -->
-	        <TextView android:id="@+id/dueDate"
-	            android:layout_width="wrap_content"
-	            android:layout_height="fill_parent"
-	            android:layout_alignParentRight ="true"
-    			android:gravity="center_vertical|right"
-	            android:layout_marginRight="4dip"/>
-    
-        </LinearLayout>
-          
-        <!-- details line 1 -->
-        <TextView android:id="@+id/details1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/task_row"
-            android:layout_alignLeft="@id/task_row"
-            android:layout_marginTop="-5dip"
-            android:layout_marginLeft="5dip"
-            style="@style/TextAppearance.TAd_ItemDetails"
-            android:visibility="gone" />
-          
-        <!-- details line 2 -->
-        <TextView android:id="@+id/details2"
+            android:layout_height="fill_parent"
+            android:layout_weight="100"
+            android:gravity="center_vertical"
+            android:maxLines="2" />
+
+        <!-- due date -->
+
+        <TextView
+            android:id="@+id/dueDate"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/details1"
-            android:layout_alignLeft="@id/task_row"
-            android:layout_marginLeft="5dip"
-            style="@style/TextAppearance.TAd_ItemDetails"
-            android:visibility="gone" />
-            
-    </RelativeLayout>
-    
-</LinearLayout>
+            android:layout_height="fill_parent"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="4dip"
+            android:gravity="center_vertical|right" />
+    </LinearLayout>
+
+    <!-- details line 1 -->
+
+    <TextView
+        android:id="@+id/details1"
+        style="@style/TextAppearance.TAd_ItemDetails"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@id/task_row"
+        android:layout_below="@id/task_row"
+        android:layout_marginLeft="5dip"
+        android:layout_marginTop="-5dip"
+        android:visibility="gone" />
+
+    <!-- details line 2 -->
+
+    <TextView
+        android:id="@+id/details2"
+        style="@style/TextAppearance.TAd_ItemDetails"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@id/task_row"
+        android:layout_below="@id/details1"
+        android:layout_marginLeft="5dip"
+        android:visibility="gone" />
 
+</RelativeLayout>
\ No newline at end of file
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index a57424424..32cf65d80 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -210,7 +210,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         decorationManager = new DecorationManager();
         taskActionManager = new TaskActionManager();
 
-        scaleAnimation = new ScaleAnimation(1.6f, 1.0f, 1.6f, 1.0f,
+        scaleAnimation = new ScaleAnimation(1.4f, 1.0f, 1.4f, 1.0f,
                 Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
         scaleAnimation.setDuration(100);