From 7ff311f76d331e03316e1d16e3715dd70b13d2b8 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 27 Jun 2012 13:36:24 -0700
Subject: [PATCH] Show people's images when in people mode

---
 astrid/res/layout/header_nav_views.xml        |  7 ++
 astrid/res/layout/header_people_view.xml      | 76 -------------------
 .../astrid/activity/TaskListActivity.java     | 12 +++
 3 files changed, 19 insertions(+), 76 deletions(-)
 delete mode 100644 astrid/res/layout/header_people_view.xml

diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/res/layout/header_nav_views.xml
index 32c20c671..7e5f1f2ae 100644
--- a/astrid/res/layout/header_nav_views.xml
+++ b/astrid/res/layout/header_nav_views.xml
@@ -49,6 +49,13 @@
 		</RelativeLayout>
     </LinearLayout>
 	
+    <com.todoroo.astrid.helper.AsyncImageView 
+        android:id="@+id/person_image"
+        android:layout_width="51dip"
+        android:layout_height="fill_parent"
+        android:scaleType="centerCrop"
+        android:visibility="gone"/>
+    
 	<Button 
 	    android:id="@+id/comments"
 	    android:layout_width="51dip"
diff --git a/astrid/res/layout/header_people_view.xml b/astrid/res/layout/header_people_view.xml
deleted file mode 100644
index 4d049fd58..000000000
--- a/astrid/res/layout/header_people_view.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
-    
-    <ImageView
-        android:id="@+id/main_menu"
-        android:layout_width="51dip"
-        android:layout_height="fill_parent"
-        android:src="?attr/asPeopleMenu"
-        android:scaleType="fitCenter"/>
-    
-    <View
-        android:layout_width="1px"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="-1px"
-        android:background="?attr/asSeparatorBackground"
-        android:layout_marginBottom="4dip"
-        android:layout_marginTop="4dip"/>
-        
-        
-    <LinearLayout 
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center_vertical">
-        <RelativeLayout 
-            android:id="@+id/lists_nav"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_margin="5dip"
-            android:paddingRight="5dip"
-            android:paddingLeft="5dip"
-            android:gravity="center_vertical">
-            
-            <TextView
-                android:id="@+id/list_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="@string/BFE_Active"
-                android:singleLine="true"
-                android:layout_weight="1"
-                android:ellipsize="end"
-                style="@style/TextAppearance.ActionBar_ListsHeader"/>
-            
-            <ImageView
-                android:id="@+id/list_disclosure_arrow"
-                android:layout_width="12dip"
-                android:layout_height="12dip"
-                android:layout_marginLeft="10dip" 
-                android:layout_toRightOf="@id/list_title"
-                android:layout_alignBottom="@id/list_title"
-                android:src="?attr/asListsDisclosure"
-                android:scaleType="fitCenter"/>
-        
-        </RelativeLayout>
-    </LinearLayout>
-    
-    <com.todoroo.astrid.helper.AsyncImageView 
-        android:id="@+id/person_image"
-        android:layout_width="51dip"
-        android:layout_height="fill_parent"
-        android:scaleType="centerCrop"/>
-    
-    <Button 
-        android:id="@+id/comments"
-        android:layout_width="51dip"
-        android:layout_height="fill_parent"
-        android:background="?attr/asCommentButtonImg"
-        android:textColor="@android:color/white"
-        android:paddingBottom="6dip"
-        android:visibility="gone"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 9eba6baf0..d04ea1b2d 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -41,6 +41,7 @@ import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.core.CustomFilterExposer;
 import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.helper.AsyncImageView;
 import com.todoroo.astrid.people.PeopleFilterMode;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
@@ -78,6 +79,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     private ImageView listsNavDisclosure;
     private TextView lists;
     private ImageView mainMenu;
+    private AsyncImageView personImage;
     private Button commentsButton;
     private int filterMode;
     private FilterModeSpec filterModeSpec;
@@ -150,6 +152,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow);
         lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title);
         mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu);
+        personImage = (AsyncImageView) actionBar.getCustomView().findViewById(R.id.person_image);
+        personImage.setDefaultImageResource(R.drawable.icn_default_person_image);
         commentsButton = (Button) actionBar.getCustomView().findViewById(R.id.comments);
 
         initializeFragments(actionBar);
@@ -672,6 +676,14 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             createListsPopover();
             setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0,
                     filterModeSpec.getFilterListClass(), true, true));
+            if (mode == FILTER_MODE_PEOPLE) {
+                personImage.setVisibility(View.VISIBLE);
+                commentsButton.setVisibility(View.GONE);
+                ((PeopleFilterMode) filterModeSpec).setImageView(personImage);
+            } else {
+                personImage.setVisibility(View.GONE);
+                commentsButton.setVisibility(View.VISIBLE);
+            }
         } else {
             setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, R.id.filterlist_fragment_container,
                     filterModeSpec.getFilterListClass(), false, true);