Change main menu nav to have lists button instead of tasks button

pull/14/head
Sam Bosley 13 years ago
parent 1d5863222c
commit db7ac008f9

@ -105,7 +105,7 @@
<string name="TLA_menu_sync">Sync Now!</string> <string name="TLA_menu_sync">Sync Now!</string>
<!-- Menu: Tasks --> <!-- Menu: Tasks -->
<string name="TLA_menu_tasks">Tasks</string> <string name="TLA_menu_lists">Lists</string>
<!-- Menu: Friends --> <!-- Menu: Friends -->
<string name="TLA_menu_friends">Friends</string> <string name="TLA_menu_friends">Friends</string>

@ -211,7 +211,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
} }
private void createMainMenuPopover() { private void createMainMenuPopover() {
mainMenuPopover = new MainMenuPopover(this, R.layout.main_menu_popover); mainMenuPopover = new MainMenuPopover(this, R.layout.main_menu_popover, (fragmentLayout != LAYOUT_SINGLE));
mainMenuPopover.setMenuListener(this); mainMenuPopover.setMenuListener(this);
mainMenuPopover.setOnDismissListener(new OnDismissListener() { mainMenuPopover.setOnDismissListener(new OnDismissListener() {
@Override @Override
@ -422,7 +422,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
TaskListFragment tla = getTaskListFragment(); TaskListFragment tla = getTaskListFragment();
switch (item) { switch (item) {
case MainMenuPopover.MAIN_MENU_ITEM_TASKS: case MainMenuPopover.MAIN_MENU_ITEM_TASKS:
// Do nothing listsNav.performClick();
break; break;
case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS: case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS:
// Doesn't exist yet // Doesn't exist yet

@ -31,13 +31,14 @@ public class MainMenuPopover extends FragmentPopover {
this.mListener = listener; this.mListener = listener;
} }
public MainMenuPopover(Context context, int layout) { public MainMenuPopover(Context context, int layout, boolean isTablet) {
super(context, layout); super(context, layout);
inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
content = (LinearLayout) getContentView().findViewById(R.id.content); content = (LinearLayout) getContentView().findViewById(R.id.content);
addTasksItem(); if (!isTablet)
addListsItem();
addFriendsItem(); addFriendsItem();
addSuggestionsItem(); addSuggestionsItem();
addTutorialItem(); addTutorialItem();
@ -70,8 +71,8 @@ public class MainMenuPopover extends FragmentPopover {
inflater.inflate(R.layout.fla_separator, content); inflater.inflate(R.layout.fla_separator, content);
} }
private void addTasksItem() { private void addListsItem() {
addMenuItem(R.string.TLA_menu_tasks, R.drawable.icn_menu_tasks, MAIN_MENU_ITEM_TASKS); addMenuItem(R.string.TLA_menu_lists, R.drawable.icn_menu_tasks, MAIN_MENU_ITEM_TASKS);
} }
private void addFriendsItem() { private void addFriendsItem() {

Loading…
Cancel
Save