Add FilterSelectionActivity

src/main/AndroidManifest.xml

@@ -120,6 +120,11 @@
             android:name=".activities.SortActivity"
             android:theme="@style/Tasks.Dialog" />
 
+        <activity
+            android:name=".activities.FilterSelectionActivity"
+            android:exported="true"
+            android:theme="@style/Tasks.Dialog" />
+
         <!-- Activity that displays task list -->
         <activity
             android:name="com.todoroo.astrid.activity.TaskListActivity"

src/main/java/org/tasks/activities/FilterSelectionActivity.java

@@ -0,0 +1,53 @@
+package org.tasks.activities;
+
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+
+import com.todoroo.astrid.adapter.FilterAdapter;
+import com.todoroo.astrid.api.FilterListItem;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.tasks.R;
+import org.tasks.filters.FilterCounter;
+import org.tasks.filters.FilterProvider;
+import org.tasks.injection.InjectingFragmentActivity;
+
+import javax.inject.Inject;
+
+public class FilterSelectionActivity extends InjectingFragmentActivity {
+
+    public static final String EXTRA_FILTER_NAME = "extra_filter_name";
+
+    @Inject FilterProvider filterProvider;
+    @Inject FilterCounter filterCounter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final FilterAdapter filterAdapter = new FilterAdapter(filterProvider, filterCounter, this, null, false);
+        filterAdapter.populateList();
+
+        new AlertDialog.Builder(this, R.style.Tasks_Dialog)
+                .setSingleChoiceItems(filterAdapter, -1, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        final FilterListItem selectedFilter = filterAdapter.getItem(which);
+                        setResult(RESULT_OK, new Intent() {{
+                            putExtra(EXTRA_FILTER_NAME, selectedFilter.listingTitle);
+                        }});
+                        finish();
+                    }
+                })
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(DialogInterface dialog) {
+                        finish();
+                    }
+                })
+                .show();
+    }
+}

src/main/java/org/tasks/injection/ActivityModule.java

@@ -27,6 +27,7 @@ import org.tasks.activities.DeleteAllCalendarEventsActivity;
 import org.tasks.activities.DeleteCompletedActivity;
 import org.tasks.activities.DeleteCompletedEventsActivity;
 import org.tasks.activities.ExportTaskActivity;
+import org.tasks.activities.FilterSelectionActivity;
 import org.tasks.activities.ImportTaskActivity;
 import org.tasks.activities.LocationPickerActivity;
 import org.tasks.activities.PurgeDeletedActivity;
@@ -84,7 +85,8 @@ import dagger.Provides;
                 NotificationActivity.class,
                 HelpAndFeedbackActivity.class,
                 DateShortcutPreferences.class,
-                SortActivity.class
+                SortActivity.class,
+                FilterSelectionActivity.class
         })
 public class ActivityModule {
 

src/main/res/layout/filter_adapter_row.xml

@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<!-- Note that properties like height, background color, and filter name size
-     are defined in FilterAdapter.java -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="48dp"
@@ -51,9 +44,9 @@
         android:layout_marginRight="5dip"
         android:layout_marginEnd="5dip"
         android:layout_centerVertical="true"
-        android:paddingLeft="7dip" 
+        android:paddingLeft="7dip"
         android:paddingRight="7dip"
-        android:textColor="?attr/drawer_text"
+        android:textColor="?attr/asTextColor"
         android:gravity="center" />
 
 </RelativeLayout>

src/main/res/values/attrs.xml

@@ -46,7 +46,6 @@
     <attr name="ic_action_help" format="reference" />
     <attr name="ic_action_inbox" format="reference" />
     <attr name="ic_action_donate" format="reference" />
-    <attr name="drawer_text" format="color" />
     <attr name="importance_background_selected" format="reference" />
     <attr name="fab_icon" format="reference" />
     <attr name="toolbarSeparatorHeight" format="dimension" />

src/main/res/values/styles.xml

@@ -42,7 +42,6 @@
         <item name="asAbBackgroundColor">#607d8b</item>
         <item name="importance_background_selected">@drawable/importance_background_selected</item>
         <item name="task_edit_divider">@color/task_edit_divider</item>
-        <item name="drawer_text">@android:color/black</item>
         <item name="ic_action_attachment">@drawable/ic_attachment_black_24dp</item>
         <item name="ic_action_clock">@drawable/ic_schedule_black_24dp</item>
         <item name="ic_action_flag">@drawable/ic_flag_black_24dp</item>
@@ -84,7 +83,6 @@
         <item name="asTextColorHint">@android:color/darker_gray</item>
         <item name="asTextColorInverse">@android:color/black</item>
         <item name="asAbBackgroundColor">@android:color/black</item>
-        <item name="drawer_text">@android:color/white</item>
         <item name="ic_action_settings">@drawable/ic_settings_white_24dp</item>
         <item name="task_edit_divider">@color/task_edit_divider_dark</item>
         <item name="ic_action_attachment">@drawable/ic_attachment_white_24dp</item>
@@ -131,6 +129,15 @@
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/primary</item>
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
+        <item name="asTextColor">@android:color/black</item>
+        <item name="asListDividerColor">#dddddd</item>
+        <item name="ic_action_inbox">@drawable/ic_inbox_black_24dp</item>
+        <item name="ic_action_calendar_today">@drawable/ic_today_black_24dp</item>
+        <item name="ic_action_history">@drawable/ic_history_black_24dp</item>
+        <item name="ic_action_uncategorized">@drawable/ic_label_outline_black_24dp</item>
+        <item name="ic_action_label">@drawable/ic_label_black_24dp</item>
+        <item name="ic_action_filter">@drawable/ic_filter_list_black_24dp</item>
+        <item name="ic_action_cloud">@drawable/ic_cloud_queue_black_24dp</item>
     </style>
 
     <!--================================================== General == -->