Progress towards a user status button in the upper right corner

pull/14/head
Sam Bosley 13 years ago
parent 47f736d17a
commit 0044ff23e2

@ -8,13 +8,11 @@ import com.todoroo.astrid.activity.FilterModeSpec;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.api.FilterWithUpdate;
import com.todoroo.astrid.helper.AsyncImageView;
import com.todoroo.astrid.ui.MainMenuPopover; import com.todoroo.astrid.ui.MainMenuPopover;
public class PeopleFilterMode implements FilterModeSpec { public class PeopleFilterMode implements FilterModeSpec {
private AsyncImageView imageView; // private AsyncImageView imageView;
@Override @Override
public Filter getDefaultFilter(Context context) { public Filter getDefaultFilter(Context context) {
@ -29,17 +27,17 @@ public class PeopleFilterMode implements FilterModeSpec {
@Override @Override
public void onFilterItemClickedCallback(FilterListItem item) { public void onFilterItemClickedCallback(FilterListItem item) {
if (imageView == null) // if (imageView == null)
return; // return;
if (item instanceof FilterWithUpdate) // if (item instanceof FilterWithUpdate)
imageView.setUrl(((FilterWithUpdate) item).imageUrl); // imageView.setUrl(((FilterWithUpdate) item).imageUrl);
else // else
imageView.setUrl(null); // imageView.setUrl(null);
}
public void setImageView(AsyncImageView imageView) {
this.imageView = imageView;
} }
//
// public void setImageView(AsyncImageView imageView) {
// this.imageView = imageView;
// }
@Override @Override
public int[] getForbiddenMenuItems() { public int[] getForbiddenMenuItems() {

@ -46,6 +46,7 @@ public class PersonViewFragment extends TaskListFragment {
private AsyncImageView userImage; private AsyncImageView userImage;
private TextView userName; private TextView userName;
private TextView userSubtitle; private TextView userSubtitle;
private TextView userStatusButton;
private User user; private User user;
@ -60,6 +61,8 @@ public class PersonViewFragment extends TaskListFragment {
if (user != null) { if (user != null) {
userImage.setUrl(user.getValue(User.PICTURE)); userImage.setUrl(user.getValue(User.PICTURE));
userName.setText(user.getDisplayName()); userName.setText(user.getDisplayName());
userSubtitle.setText(user.getValue(User.STATUS));
userStatusButton.setText(user.getValue(User.STATUS));
} else { } else {
getView().findViewById(R.id.user_header).setVisibility(View.GONE); 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); userImage = (AsyncImageView) getView().findViewById(R.id.user_image);
userName = (TextView) getView().findViewById(R.id.user_name); userName = (TextView) getView().findViewById(R.id.user_name);
userSubtitle = (TextView) getView().findViewById(R.id.user_subtitle); userSubtitle = (TextView) getView().findViewById(R.id.user_subtitle);
userStatusButton = (TextView) getActivity().findViewById(R.id.person_image);
} }
@Override @Override

@ -54,11 +54,15 @@
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
<com.todoroo.astrid.helper.AsyncImageView <TextView
android:id="@+id/person_image" android:id="@+id/person_image"
android:layout_width="51dip" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:scaleType="centerCrop" android:gravity="center_vertical"
android:singleLine="true"
android:paddingRight="5dip"
style="@style/TextAppearance.ActionBar_ListsHeader"
android:textSize="16sp"
android:visibility="gone"/> android:visibility="gone"/>
<Button <Button

@ -20,9 +20,10 @@
<com.todoroo.astrid.helper.AsyncImageView <com.todoroo.astrid.helper.AsyncImageView
android:id="@+id/user_image" android:id="@+id/user_image"
android:layout_height="45dip" android:layout_height="50dip"
android:layout_width="45dip" android:layout_width="50dip"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:layout_marginRight="5dip"
android:layout_centerVertical="true"/> android:layout_centerVertical="true"/>
<TextView <TextView

@ -48,7 +48,6 @@ import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.core.CustomFilterExposer; import com.todoroo.astrid.core.CustomFilterExposer;
import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.helper.AsyncImageView;
import com.todoroo.astrid.people.PeopleFilterMode; import com.todoroo.astrid.people.PeopleFilterMode;
import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsConstants;
import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.StatisticsService;
@ -89,7 +88,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
private ImageView listsNavDisclosure; private ImageView listsNavDisclosure;
private TextView lists; private TextView lists;
private ImageView mainMenu; private ImageView mainMenu;
private AsyncImageView personImage; private TextView personStatus;
private Button commentsButton; private Button commentsButton;
private int filterMode; private int filterMode;
private FilterModeSpec filterModeSpec; private FilterModeSpec filterModeSpec;
@ -164,8 +163,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow); listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow);
lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title); lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title);
mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu); mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu);
personImage = (AsyncImageView) actionBar.getCustomView().findViewById(R.id.person_image); personStatus = (TextView) actionBar.getCustomView().findViewById(R.id.person_image);
personImage.setDefaultImageResource(R.drawable.icn_default_person_image);
commentsButton = (Button) actionBar.getCustomView().findViewById(R.id.comments); commentsButton = (Button) actionBar.getCustomView().findViewById(R.id.comments);
initializeFragments(actionBar); initializeFragments(actionBar);
@ -734,11 +732,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0, setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0,
filterModeSpec.getFilterListClass(), true, true)); filterModeSpec.getFilterListClass(), true, true));
if (mode == FILTER_MODE_PEOPLE) { if (mode == FILTER_MODE_PEOPLE) {
personImage.setVisibility(View.VISIBLE); personStatus.setVisibility(View.VISIBLE);
commentsButton.setVisibility(View.GONE); commentsButton.setVisibility(View.GONE);
((PeopleFilterMode) filterModeSpec).setImageView(personImage);
} else { } else {
personImage.setVisibility(View.GONE); personStatus.setVisibility(View.GONE);
commentsButton.setVisibility(View.VISIBLE); commentsButton.setVisibility(View.VISIBLE);
} }

Loading…
Cancel
Save