Nav drawer icons

src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java

@@ -25,6 +25,7 @@ import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
 
 import org.tasks.R;
+import org.tasks.activities.DonationActivity;
 import org.tasks.filters.FilterCounter;
 import org.tasks.filters.FilterProvider;
 import org.tasks.filters.NavigationDrawerAction;
@@ -258,6 +259,11 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
                     getResource(activity, R.attr.ic_action_help),
                     new Intent(activity, HelpAndFeedbackActivity.class),
                     0));
+            add(new NavigationDrawerAction(
+                    activity.getResources().getString(R.string.TLA_menu_donate),
+                    getResource(activity, R.attr.ic_action_donate),
+                    new Intent(activity, DonationActivity.class),
+                    0));
         }
 
         notifyDataSetChanged();

src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java

@@ -64,13 +64,19 @@ public final class BuiltInFilterExposer {
         List<Filter> filters = new ArrayList<>();
 
         if (preferences.getBoolean(R.string.p_show_today_filter, true)) {
-            filters.add(getTodayFilter(r));
+            Filter todayFilter = getTodayFilter(r);
+            todayFilter.icon = resourceResolver.getResource(R.attr.ic_action_calendar_today);
+            filters.add(todayFilter);
         }
         if (preferences.getBoolean(R.string.p_show_recently_modified_filter, true)) {
-            filters.add(getRecentlyModifiedFilter(r));
+            Filter recentlyModifiedFilter = getRecentlyModifiedFilter(r);
+            recentlyModifiedFilter.icon = resourceResolver.getResource(R.attr.ic_action_history);
+            filters.add(recentlyModifiedFilter);
         }
         if (preferences.getBoolean(R.string.p_show_not_in_list_filter, true)) {
-            filters.add(getUncategorizedFilter(r));
+            Filter uncategorizedFilter = getUncategorizedFilter(r);
+            uncategorizedFilter.icon = resourceResolver.getResource(R.attr.ic_action_uncategorized);
+            filters.add(uncategorizedFilter);
         }
         // transmit filter list
         return filters;

src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java

@@ -27,6 +27,7 @@ import com.todoroo.astrid.data.Task;
 
 import org.tasks.R;
 import org.tasks.injection.ForApplication;
+import org.tasks.preferences.ResourceResolver;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,10 +45,12 @@ public class TagFilterExposer {
     public static final String TAG = "tag"; //$NON-NLS-1$
 
     private final TagService tagService;
+    private ResourceResolver resourceResolver;
     private final Context context;
 
     @Inject
-    public TagFilterExposer(@ForApplication Context context, TagService tagService) {
+    public TagFilterExposer(ResourceResolver resourceResolver, @ForApplication Context context, TagService tagService) {
+        this.resourceResolver = resourceResolver;
         this.context = context;
         this.tagService = tagService;
     }
@@ -111,9 +114,12 @@ public class TagFilterExposer {
 
         List<Filter> filters = new ArrayList<>();
 
+        int label = resourceResolver.getResource(R.attr.ic_action_label);
+
         for (TagData tag : tags) {
             Filter f = constructFilter(context, tag);
             if (f != null) {
+                f.icon = label;
                 filters.add(f);
             }
         }

src/main/java/org/tasks/filters/NavigationDrawerAction.java

@@ -67,19 +67,4 @@ public class NavigationDrawerAction extends FilterListItem {
             return new NavigationDrawerAction[size];
         }
     };
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        NavigationDrawerAction that = (NavigationDrawerAction) o;
-
-        return requestCode == that.requestCode;
-    }
-
-    @Override
-    public int hashCode() {
-        return requestCode;
-    }
 }

src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java

@@ -24,9 +24,6 @@ public class HelpAndFeedbackActivity extends InjectingPreferenceActivity {
                     putExtra(Intent.EXTRA_SUBJECT, "Tasks Feedback");
                     putExtra(Intent.EXTRA_TEXT, deviceInfo.getDebugInfo());
                 }});
-        if (!deviceInfo.supportsBilling()) {
-            remove(R.string.TLA_menu_donate);
-        }
         if (!deviceInfo.isPlayStoreAvailable()) {
             remove(R.string.rate_tasks);
         }