From d6269f0bf04a07513d5f3e0baf9b61ee93697c0a Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 11 Feb 2016 15:11:01 -0600 Subject: [PATCH] Move new tag and new filter buttons --- .../todoroo/astrid/adapter/FilterAdapter.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index 36c5471a0..91cdaed9f 100644 --- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -247,25 +247,27 @@ public class FilterAdapter extends ArrayAdapter { addSubMenu(R.string.filters, filterProvider.getFilters()); - addSubMenu(R.string.tags, filterProvider.getTags()); + if (navigationDrawer) { + add(new NavigationDrawerAction( + activity.getResources().getString(R.string.FLA_new_filter), + R.drawable.ic_add_24dp, + new Intent(activity, CustomFilterActivity.class), + TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER)); + } - addSubMenu(R.string.gtasks_GPr_header, filterProvider.getGoogleTaskFilters()); + addSubMenu(R.string.tags, filterProvider.getTags()); if (navigationDrawer) { - add(new NavigationDrawerSeparator()); - add(new NavigationDrawerAction( activity.getResources().getString(R.string.new_tag), R.drawable.ic_add_24dp, new Intent(activity, TagSettingsActivity.class), NavigationDrawerFragment.REQUEST_NEW_LIST)); + } - add(new NavigationDrawerAction( - activity.getResources().getString(R.string.FLA_new_filter), - R.drawable.ic_add_24dp, - new Intent(activity, CustomFilterActivity.class), - TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER)); + addSubMenu(R.string.gtasks_GPr_header, filterProvider.getGoogleTaskFilters()); + if (navigationDrawer) { add(new NavigationDrawerSeparator()); add(new NavigationDrawerAction(