archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Progress towards a user status button in the upper right corner

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 47f736d17a
commit 0044ff23e2
5 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File

24
astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java
Unescape Escape View File

@ -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() {

4
astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
Unescape Escape View File

@ -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

10
astrid/res/layout/header_nav_views.xml
Unescape Escape View File

@ -54,11 +54,15 @@
</RelativeLayout>
</LinearLayout>
<com.todoroo.astrid.helper.AsyncImageView
<TextView
android:id="@+id/person_image"
android:layout_width="51dip"
android:layout_width="wrap_content"
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"/>
<Button

5
astrid/res/layout/task_list_body_user.xml
Unescape Escape View File

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

11
astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save