|
|
@ -44,6 +44,7 @@ import com.todoroo.astrid.api.FilterListItem;
|
|
|
|
import com.todoroo.astrid.core.CoreFilterExposer;
|
|
|
|
import com.todoroo.astrid.core.CoreFilterExposer;
|
|
|
|
import com.todoroo.astrid.core.CustomFilterExposer;
|
|
|
|
import com.todoroo.astrid.core.CustomFilterExposer;
|
|
|
|
import com.todoroo.astrid.data.Task;
|
|
|
|
import com.todoroo.astrid.data.Task;
|
|
|
|
|
|
|
|
import com.todoroo.astrid.people.PeopleListFragment;
|
|
|
|
import com.todoroo.astrid.people.PeopleViewActivity;
|
|
|
|
import com.todoroo.astrid.people.PeopleViewActivity;
|
|
|
|
import com.todoroo.astrid.service.StatisticsConstants;
|
|
|
|
import com.todoroo.astrid.service.StatisticsConstants;
|
|
|
|
import com.todoroo.astrid.service.StatisticsService;
|
|
|
|
import com.todoroo.astrid.service.StatisticsService;
|
|
|
@ -279,14 +280,14 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
|
|
|
|
setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
|
|
|
|
R.id.filterlist_fragment_container, FilterListFragment.class, false);
|
|
|
|
R.id.filterlist_fragment_container, FilterListFragment.class, false, false);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
fragmentLayout = LAYOUT_SINGLE;
|
|
|
|
fragmentLayout = LAYOUT_SINGLE;
|
|
|
|
actionBar.setDisplayHomeAsUpEnabled(true);
|
|
|
|
actionBar.setDisplayHomeAsUpEnabled(true);
|
|
|
|
listsNav.setOnClickListener(popupMenuClickListener);
|
|
|
|
listsNav.setOnClickListener(popupMenuClickListener);
|
|
|
|
createListsPopover();
|
|
|
|
createListsPopover();
|
|
|
|
setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0,
|
|
|
|
setupPopoverWithFilterList((FilterListFragment) setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, 0,
|
|
|
|
getFilterListClass(), true));
|
|
|
|
getFilterListClass(), true, false));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -294,17 +295,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
|
|
|
|
return FilterListFragment.class;
|
|
|
|
return FilterListFragment.class;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// private void togglePeopleView(boolean peopleMode) {
|
|
|
|
|
|
|
|
// if (fragmentLayout != LAYOUT_SINGLE) {
|
|
|
|
|
|
|
|
// if (peopleMode)
|
|
|
|
|
|
|
|
// setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, R.id.filterlist_fragment_container,
|
|
|
|
|
|
|
|
// PeopleListFragment.class, false);
|
|
|
|
|
|
|
|
// else
|
|
|
|
|
|
|
|
// setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
|
|
|
|
|
|
|
|
// R.id.filterlist_fragment_container, FilterListFragment.class, false);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void createListsPopover() {
|
|
|
|
private void createListsPopover() {
|
|
|
|
listsPopover = new FragmentPopover(this, R.layout.list_dropdown_popover);
|
|
|
|
listsPopover = new FragmentPopover(this, R.layout.list_dropdown_popover);
|
|
|
|
listsPopover.setOnDismissListener(new OnDismissListener() {
|
|
|
|
listsPopover.setOnDismissListener(new OnDismissListener() {
|
|
|
@ -685,8 +675,12 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
|
|
|
|
onSearchRequested();
|
|
|
|
onSearchRequested();
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS:
|
|
|
|
case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS:
|
|
|
|
|
|
|
|
if (fragmentLayout != LAYOUT_SINGLE) {
|
|
|
|
|
|
|
|
togglePeopleView();
|
|
|
|
|
|
|
|
} else {
|
|
|
|
Intent peopleIntent = new Intent(this, PeopleViewActivity.class);
|
|
|
|
Intent peopleIntent = new Intent(this, PeopleViewActivity.class);
|
|
|
|
startActivity(peopleIntent);
|
|
|
|
startActivity(peopleIntent);
|
|
|
|
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
case MainMenuPopover.MAIN_MENU_ITEM_SUGGESTIONS:
|
|
|
|
case MainMenuPopover.MAIN_MENU_ITEM_SUGGESTIONS:
|
|
|
|
// Doesn't exist yet
|
|
|
|
// Doesn't exist yet
|
|
|
@ -699,6 +693,17 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
|
|
|
|
tlf.handleOptionsMenuItemSelected(item, customIntent);
|
|
|
|
tlf.handleOptionsMenuItemSelected(item, customIntent);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void togglePeopleView() {
|
|
|
|
|
|
|
|
FilterListFragment flf = getFilterListFragment();
|
|
|
|
|
|
|
|
boolean peopleMode = !(flf instanceof PeopleListFragment);
|
|
|
|
|
|
|
|
if (peopleMode)
|
|
|
|
|
|
|
|
setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT, R.id.filterlist_fragment_container,
|
|
|
|
|
|
|
|
PeopleListFragment.class, false, true);
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
setupFragment(FilterListFragment.TAG_FILTERLIST_FRAGMENT,
|
|
|
|
|
|
|
|
R.id.filterlist_fragment_container, FilterListFragment.class, false, true);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public MainMenuPopover getMainMenuPopover() {
|
|
|
|
public MainMenuPopover getMainMenuPopover() {
|
|
|
|
return mainMenuPopover;
|
|
|
|
return mainMenuPopover;
|
|
|
|
}
|
|
|
|
}
|
|
|
|