From db7ac008f993c79d8f270987d04dec2726e2f638 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 9 Feb 2012 19:55:49 -0800
Subject: [PATCH] Change main menu nav to have lists button instead of tasks
 button

---
 astrid/res/values/strings-core.xml                       | 2 +-
 .../com/todoroo/astrid/activity/TaskListActivity.java    | 4 ++--
 astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java    | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 5f9f4214e..5099df698 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -105,7 +105,7 @@
   <string name="TLA_menu_sync">Sync Now!</string>
   
   <!-- Menu: Tasks -->
-  <string name="TLA_menu_tasks">Tasks</string>
+  <string name="TLA_menu_lists">Lists</string>
 
   <!-- Menu: Friends -->
   <string name="TLA_menu_friends">Friends</string>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 431bb6bef..b02c1e155 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -211,7 +211,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     }
 
     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.setOnDismissListener(new OnDismissListener() {
             @Override
@@ -422,7 +422,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         TaskListFragment tla = getTaskListFragment();
         switch (item) {
         case MainMenuPopover.MAIN_MENU_ITEM_TASKS:
-            // Do nothing
+            listsNav.performClick();
             break;
         case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS:
             // Doesn't exist yet
diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
index de3cbfe72..bba1c49f2 100644
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@@ -31,13 +31,14 @@ public class MainMenuPopover extends FragmentPopover {
         this.mListener = listener;
     }
 
-    public MainMenuPopover(Context context, int layout) {
+    public MainMenuPopover(Context context, int layout, boolean isTablet) {
         super(context, layout);
 
         inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
         content = (LinearLayout) getContentView().findViewById(R.id.content);
-        addTasksItem();
+        if (!isTablet)
+            addListsItem();
         addFriendsItem();
         addSuggestionsItem();
         addTutorialItem();
@@ -70,8 +71,8 @@ public class MainMenuPopover extends FragmentPopover {
         inflater.inflate(R.layout.fla_separator, content);
     }
 
-    private void addTasksItem() {
-        addMenuItem(R.string.TLA_menu_tasks, R.drawable.icn_menu_tasks, MAIN_MENU_ITEM_TASKS);
+    private void addListsItem() {
+        addMenuItem(R.string.TLA_menu_lists, R.drawable.icn_menu_tasks, MAIN_MENU_ITEM_TASKS);
     }
 
     private void addFriendsItem() {