diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java index 5adb54cd1..aebe6df10 100644 --- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java +++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java @@ -8,13 +8,11 @@ import com.todoroo.astrid.activity.FilterModeSpec; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterListItem; -import com.todoroo.astrid.api.FilterWithUpdate; -import com.todoroo.astrid.helper.AsyncImageView; import com.todoroo.astrid.ui.MainMenuPopover; public class PeopleFilterMode implements FilterModeSpec { - private AsyncImageView imageView; +// private AsyncImageView imageView; @Override public Filter getDefaultFilter(Context context) { @@ -29,17 +27,17 @@ public class PeopleFilterMode implements FilterModeSpec { @Override public void onFilterItemClickedCallback(FilterListItem item) { - if (imageView == null) - return; - if (item instanceof FilterWithUpdate) - imageView.setUrl(((FilterWithUpdate) item).imageUrl); - else - imageView.setUrl(null); - } - - public void setImageView(AsyncImageView imageView) { - this.imageView = imageView; +// if (imageView == null) +// return; +// if (item instanceof FilterWithUpdate) +// imageView.setUrl(((FilterWithUpdate) item).imageUrl); +// else +// imageView.setUrl(null); } +// +// public void setImageView(AsyncImageView imageView) { +// this.imageView = imageView; +// } @Override public int[] getForbiddenMenuItems() { diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java index e849aca7e..4dfc0c1ba 100644 --- a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java @@ -46,6 +46,7 @@ public class PersonViewFragment extends TaskListFragment { private AsyncImageView userImage; private TextView userName; private TextView userSubtitle; + private TextView userStatusButton; private User user; @@ -60,6 +61,8 @@ public class PersonViewFragment extends TaskListFragment { if (user != null) { userImage.setUrl(user.getValue(User.PICTURE)); userName.setText(user.getDisplayName()); + userSubtitle.setText(user.getValue(User.STATUS)); + userStatusButton.setText(user.getValue(User.STATUS)); } else { getView().findViewById(R.id.user_header).setVisibility(View.GONE); } @@ -86,6 +89,7 @@ public class PersonViewFragment extends TaskListFragment { userImage = (AsyncImageView) getView().findViewById(R.id.user_image); userName = (TextView) getView().findViewById(R.id.user_name); userSubtitle = (TextView) getView().findViewById(R.id.user_subtitle); + userStatusButton = (TextView) getActivity().findViewById(R.id.person_image); } @Override diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/res/layout/header_nav_views.xml index 8430fb867..c66bd04a3 100644 --- a/astrid/res/layout/header_nav_views.xml +++ b/astrid/res/layout/header_nav_views.xml @@ -54,11 +54,15 @@ -