Added new check box images for tasks

astrid/res/drawable/importance_check_1.xml

@@ -3,9 +3,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/repeat_box_1" />
+          android:drawable="@drawable/check_box_1" />
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/repeat_box_1" />
+          android:drawable="@drawable/check_box_checked_1" />
 
 </selector>

astrid/res/drawable/importance_check_2.xml

@@ -3,9 +3,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/repeat_box_2" />
+          android:drawable="@drawable/check_box_2" />
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/repeat_box_2" />
+          android:drawable="@drawable/check_box_checked_2" />
 
 </selector>

astrid/res/drawable/importance_check_3.xml

@@ -3,9 +3,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/repeat_box_3" />
+          android:drawable="@drawable/check_box_3" />
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/repeat_box_3" />
+          android:drawable="@drawable/check_box_checked_3" />
 
 </selector>

astrid/res/drawable/importance_check_4.xml

@@ -3,9 +3,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/repeat_box_4" />
+          android:drawable="@drawable/check_box_4" />
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/repeat_box_4" />
+          android:drawable="@drawable/check_box_checked_4" />
 
 </selector>

astrid/res/drawable/importance_check_repeat_1.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/check_box_repeat_1" />
+    <item android:state_checked="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/check_box_repeat_checked_1" />
+
+</selector>

astrid/res/drawable/importance_check_repeat_2.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/check_box_repeat_2" />
+    <item android:state_checked="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/check_box_repeat_checked_2" />
+
+</selector>

astrid/res/drawable/importance_check_repeat_3.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/check_box_repeat_3" />
+    <item android:state_checked="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/check_box_repeat_checked_3" />
+
+</selector>

astrid/res/drawable/importance_check_repeat_4.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/check_box_repeat_4" />
+    <item android:state_checked="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/check_box_repeat_checked_4" />
+
+</selector>

astrid/res/layout/task_adapter_row.xml

@@ -11,7 +11,7 @@
     <RelativeLayout android:id="@+id/rowBody" 
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="15dip"
+        android:layout_marginLeft="10dip"
         android:paddingBottom="4dip">
             
         <!-- completion check-box -->
@@ -19,13 +19,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:layout_marginTop="5dip"        
+            android:layout_marginTop="10dip"        
             android:button="@drawable/btn_check"/>
         <!-- assignee photo -->
-        <greendroid.widget.AsyncImageView android:id="@+id/picture"
+        <greendroid.widget.AsyncImageView 
+            android:id="@+id/picture"
             android:layout_width="35dip"
             android:layout_height="35dip"
-            android:padding="5dip" 
+            android:layout_marginTop="10dip"        
             android:scaleType="fitCenter"
             astrid:defaultSrc="@drawable/icn_default_person_image"
             android:visibility="gone"/>

astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java

@@ -129,7 +129,10 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     };
 
     private static int[] IMPORTANCE_REPEAT_RESOURCES = new int[] {
-        // stuff will go here
+        R.drawable.importance_check_repeat_1, //task_indicator_0,
+        R.drawable.importance_check_repeat_2, //task_indicator_1,
+        R.drawable.importance_check_repeat_3, //task_indicator_2,
+        R.drawable.importance_check_repeat_4, //task_indicator_3,
     };
 
     // --- instance variables
@@ -377,12 +380,24 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         final CheckBox checkBoxView = viewHolder.completeBox; {
             int value = task.getValue(Task.IMPORTANCE);
             if(value < IMPORTANCE_RESOURCES.length)
-                if (!TextUtils.isEmpty(task.getValue(Task.RECURRENCE)))
-                    checkBoxView.setButtonDrawable(IMPORTANCE_RESOURCES[value]);
-                else
+                if (!TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) {
+                    checkBoxView.setButtonDrawable(IMPORTANCE_REPEAT_RESOURCES[value]);
+                    pictureView.setBackgroundResource(IMPORTANCE_REPEAT_RESOURCES[value]);
+                }
+                else {
                     checkBoxView.setButtonDrawable(IMPORTANCE_RESOURCES[value]);
+                    pictureView.setBackgroundResource(IMPORTANCE_RESOURCES[value]);
+                }
             else
+            {
                 checkBoxView.setBackgroundResource(R.drawable.btn_check);
+            }
+            if (pictureView.getVisibility() == View.VISIBLE){
+                checkBoxView.setVisibility(View.INVISIBLE);
+            }
+            else {
+                checkBoxView.setVisibility(View.VISIBLE);
+            }
         }
 
         String details;
@@ -410,7 +425,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         if(Math.abs(DateUtilities.now() - task.getValue(Task.MODIFICATION_DATE)) < 2000L)
             mostRecentlyMade = task.getId();
 
-//        // details and decorations, expanded
+        //        // details and decorations, expanded
         decorationManager.request(viewHolder);
     }
 
@@ -424,7 +439,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         viewHolder.completeBox.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
         rightWidth = rightWidth + viewHolder.dueDate.getPaddingRight();
         float left = viewHolder.completeBox.getMeasuredWidth() +
-            ((MarginLayoutParams)viewHolder.completeBox.getLayoutParams()).leftMargin;
+        ((MarginLayoutParams)viewHolder.completeBox.getLayoutParams()).leftMargin;
         int availableWidth = (int) (displayMetrics.widthPixels - left - (rightWidth + 16) * displayMetrics.density);
 
         int i = 0;
@@ -555,8 +570,8 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                         continue;
                     } else if(Constants.DEBUG) {
                         System.err.println("Forced loading of details: " + task.getId() + //$NON-NLS-1$
-                        		"\n  details: " + new Date(task.getValue(Task.DETAILS_DATE)) + //$NON-NLS-1$
-                        		"\n  modified: " + new Date(task.getValue(Task.MODIFICATION_DATE))); //$NON-NLS-1$
+                                "\n  details: " + new Date(task.getValue(Task.DETAILS_DATE)) + //$NON-NLS-1$
+                                "\n  modified: " + new Date(task.getValue(Task.MODIFICATION_DATE))); //$NON-NLS-1$
                     }
                     addTaskToLoadingArray(task);
 
@@ -583,7 +598,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
         private boolean detailsAreRecentAndUpToDate(Task task) {
             return task.getValue(Task.DETAILS_DATE) >= task.getValue(Task.MODIFICATION_DATE) &&
-                !TextUtils.isEmpty(task.getValue(Task.DETAILS));
+            !TextUtils.isEmpty(task.getValue(Task.DETAILS));
         }
 
         private void addTaskToLoadingArray(Task task) {
@@ -650,8 +665,8 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                 return null;
             Drawable d;
             if(!cache.containsKey(drawable)) {
-                 d = r.getDrawable(drawable);
-                 d.setBounds(0,0,d.getIntrinsicWidth(),d.getIntrinsicHeight());
+                d = r.getDrawable(drawable);
+                d.setBounds(0,0,d.getIntrinsicWidth(),d.getIntrinsicHeight());
                 cache.put(drawable, d);
             } else
                 d = cache.get(drawable);