Killed filters header and moved add filter button to menu

astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java

@@ -4,7 +4,6 @@
 package com.todoroo.astrid.core;
 
 import android.app.Activity;
-import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -28,7 +27,6 @@ import com.todoroo.astrid.activity.FilterListActivity;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.AstridFilterExposer;
 import com.todoroo.astrid.api.Filter;
-import com.todoroo.astrid.api.FilterCategoryWithNewButton;
 import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.api.PermaSql;
 import com.todoroo.astrid.dao.StoreObjectDao;
@@ -60,19 +58,19 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
     private FilterListItem[] prepareFilters(Context context) {
         Resources r = context.getResources();
 
-        PendingIntent customFilterIntent = PendingIntent.getActivity(context, 0,
-                new Intent(context, CustomFilterActivity.class), 0);
+        //PendingIntent customFilterIntent = PendingIntent.getActivity(context, 0,
+        //        new Intent(context, CustomFilterActivity.class), 0);
 
         Filter[] savedFilters = buildSavedFilters(context, r);
 
-        FilterCategoryWithNewButton heading = new FilterCategoryWithNewButton(r.getString(R.string.BFE_Saved), savedFilters);
-        heading.label = r.getString(R.string.tag_FEx_add_new);
-        heading.intent = customFilterIntent;
+        //FilterCategoryWithNewButton heading = new FilterCategoryWithNewButton(r.getString(R.string.BFE_Saved), savedFilters);
+        //heading.label = r.getString(R.string.tag_FEx_add_new);
+        //heading.intent = customFilterIntent;
 
 
-        FilterListItem[] list = new FilterListItem[1];
-        list[0] = heading;
-        return list;
+        //FilterListItem[] list = new FilterListItem[1];
+        //list[0] = heading;
+        return savedFilters;
     }
 
     private Filter[] buildSavedFilters(Context context, Resources r) {

astrid/res/values/strings-core.xml

@@ -245,6 +245,9 @@
   <!-- Toast: created shortcut (%s => label) -->
   <string name="FLA_toast_onCreateShortcut">Created Shortcut: %s</string>
   
+  <!-- Menu: new filter -->
+  <string name="FLA_new_filter">New Filter</string>
+  
   <!-- ================================================= TaskEditActivity == -->
   
   <!-- Title when editing a task (%s => task title) -->

astrid/src/com/todoroo/astrid/activity/FilterListActivity.java

@@ -74,6 +74,7 @@ import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.api.FilterWithCustomIntent;
 import com.todoroo.astrid.api.IntentFilter;
 import com.todoroo.astrid.api.SyncAction;
+import com.todoroo.astrid.core.CustomFilterActivity;
 import com.todoroo.astrid.core.SearchFilter;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.MetadataHelper;
@@ -100,11 +101,12 @@ public class FilterListActivity extends ExpandableListActivity {
     private static final int MENU_SEARCH_ID = Menu.FIRST + 0;
     private static final int MENU_HELP_ID = Menu.FIRST + 1;
     private static final int MENU_REFRESH_ID = Menu.FIRST + 2;
+    private static final int MENU_NEW_FILTER_ID = Menu.FIRST + 3;
 
     private static final String LAST_TAG_REFRESH_KEY = "last_tag_refresh"; //$NON-NLS-1$
 
-    private static final int CONTEXT_MENU_SHORTCUT = Menu.FIRST + 3;
-    private static final int CONTEXT_MENU_INTENT = Menu.FIRST + 4;
+    private static final int CONTEXT_MENU_SHORTCUT = Menu.FIRST + 4;
+    private static final int CONTEXT_MENU_INTENT = Menu.FIRST + 5;
 
     private static final int REQUEST_CUSTOM_INTENT = 1;
     private static final int REQUEST_VIEW_TASKS = 2;
@@ -197,15 +199,17 @@ public class FilterListActivity extends ExpandableListActivity {
 
         MenuItem item;
 
+        item = menu.add(Menu.NONE, MENU_NEW_FILTER_ID, Menu.NONE,
+                R.string.FLA_new_filter);
+        item.setIcon(android.R.drawable.ic_menu_add);
+
         item = menu.add(Menu.NONE, MENU_SEARCH_ID, Menu.NONE,
                 R.string.FLA_menu_search);
         item.setIcon(android.R.drawable.ic_menu_search);
 
-        //if(actFmPreferenceService.isLoggedIn()) {
-            item = menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE,
-                    R.string.TLA_menu_sync);
-            item.setIcon(R.drawable.ic_menu_refresh);
-        //}
+        item = menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE,
+                R.string.TLA_menu_sync);
+        item.setIcon(R.drawable.ic_menu_refresh);
 
         item = menu.add(Menu.NONE, MENU_HELP_ID, Menu.NONE,
                 R.string.FLA_menu_help);
@@ -426,6 +430,12 @@ public class FilterListActivity extends ExpandableListActivity {
             return true;
         }
 
+        case MENU_NEW_FILTER_ID : {
+            Intent intent = new Intent(this, CustomFilterActivity.class);
+            startActivity(intent);
+            return true;
+        }
+
         case CONTEXT_MENU_SHORTCUT: {
             ExpandableListContextMenuInfo info = (ExpandableListContextMenuInfo)item.getMenuInfo();