From 28148b97ac3ee6bc6630a67145d6356de4591899 Mon Sep 17 00:00:00 2001
From: Andrew Shaw <andrew.t.shaw@gmail.com>
Date: Fri, 10 Feb 2012 20:25:35 -0800
Subject: [PATCH] When posted to task rabbit, assigned picture is a rabbit,
 assigned text is a rabbit too, lots of rabbits

---
 .../todoroo/astrid/actfm/EditPeopleControlSet.java    | 11 ++++++-----
 astrid/res/layout/task_adapter_row.xml                |  2 ++
 .../src/com/todoroo/astrid/adapter/TaskAdapter.java   |  6 +++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 04324e5d5..b1da68fab 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -118,7 +118,7 @@ public class EditPeopleControlSet extends PopupControlSet {
         public boolean didPostToTaskRabbit();
     }
 
-    int selected = 0; //need to remember last selected state for task rabbit
+    private int selected = 0; //need to remember last selected state for task rabbit
 
     static {
         AstridDependencyInjector.initialize();
@@ -401,7 +401,7 @@ public class EditPeopleControlSet extends PopupControlSet {
             if (l.shouldShowTaskRabbit()) {
                 taskRabbitUser = new AssignedToUser(activity.getString(R.string.actfm_EPA_task_rabbit), new JSONObject().put("default_picture", R.drawable.task_rabbit_image));
                 listValues.add(taskRabbitUser);
-                if(l.didPostToTaskRabbit() && assignedIndex <= 0){
+                if(l.didPostToTaskRabbit()){
                     assignedIndex = listValues.size()-1;
                 }
             }
@@ -548,9 +548,10 @@ public class EditPeopleControlSet extends PopupControlSet {
                 AssignedToUser item = (AssignedToUser) assignedList.getAdapter().getItem(assignedList.getCheckedItemPosition());
                 if (item != null) {
                     if (item.equals(taskRabbitUser)) { //don't want to ever set the user as the task rabbit user
-                        Log.d("Edit People control set", "Equals task rabbit");
-                        item = (AssignedToUser) assignedList.getAdapter().getItem(0);
-                        selected = 0;
+
+                        /*item = (AssignedToUser) assignedList.getAdapter().getItem(0);
+                        selected = 0;*/
+                        return true;
                     }
                     else {
                         Log.d("Edit People control set", "Does not equal task rabbit");
diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index 2e3a31802..06d79904f 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -16,6 +16,8 @@
         android:layout_height="45dip"
         android:layout_centerVertical="true"
         android:padding="2dip"
+        android:paddingTop="1dip"
+        android:paddingLeft="1dip"
         android:layout_marginLeft="5dip"
         astrid:defaultSrc="@drawable/icn_default_person_image"
         android:scaleType="fitCenter"
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 41d3c07f2..15b70f0df 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -82,6 +82,7 @@ import com.todoroo.astrid.notes.NotesDecorationExposer;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.TaskService;
+import com.todoroo.astrid.taskrabbit.TaskRabbitDataService;
 import com.todoroo.astrid.taskrabbit.TaskRabbitTaskContainer;
 import com.todoroo.astrid.timers.TimerDecorationExposer;
 import com.todoroo.astrid.utility.Constants;
@@ -391,9 +392,11 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
         // image view
         final AsyncImageView pictureView = viewHolder.picture; {
+            Log.d("TaskAdapter", "picture view");
             if (pictureView != null) {
-                TaskRabbitTaskContainer container = new TaskRabbitTaskContainer(task);
+                TaskRabbitTaskContainer container = TaskRabbitDataService.getInstance().getContainerForTask(task);
 
+                Log.d("TaskAdapter", "BOOL =" + task.getValue(Task.USER_ID) + "dfdsf" +container.getTaskID() );
                 if(task.getValue(Task.USER_ID) == 0 && container.getTaskID() <= 0) {
                     pictureView.setVisibility(View.GONE);
                     if (viewHolder.pictureBorder != null)
@@ -405,6 +408,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                     pictureView.setUrl(null);
                     if (container.getTaskID() > 0) {
                         pictureView.setDefaultImageResource(R.drawable.task_rabbit_image);
+                        Log.d("TaskAdapter", "Trying to show taks rabbit");
                     }
                     else {
                         pictureView.setDefaultImageResource(R.drawable.icn_default_person_image);