diff --git a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java index 6ed9d3f62..0689a2545 100644 --- a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java @@ -31,7 +31,6 @@ import com.todoroo.astrid.reminders.ReminderDialog; import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsService; -import com.todoroo.astrid.subtasks.SubtasksListFragment; import com.todoroo.astrid.ui.DateChangedAlerts; /** @@ -190,7 +189,7 @@ public class AstridActivity extends FragmentActivity } protected final void setupTasklistFragmentWithFilter(Filter filter) { - setupTasklistFragmentWithFilterAndCustomTaskList(filter, SubtasksListFragment.class); + setupTasklistFragmentWithFilterAndCustomTaskList(filter, TaskListFragment.class); } protected final void setupTasklistFragmentWithFilterAndCustomTaskList(Filter filter, Class customTaskList) { diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java index 72360b38a..4bc3a6eb4 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java @@ -16,7 +16,6 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; -import android.net.Uri; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.ListFragment; @@ -28,7 +27,6 @@ import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.KeyEvent; import android.view.LayoutInflater; -import android.view.MenuInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; @@ -55,7 +53,6 @@ import com.todoroo.astrid.adapter.FilterAdapter; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterListItem; -import com.todoroo.astrid.core.CustomFilterActivity; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.tags.TagService; @@ -80,12 +77,6 @@ public class FilterListFragment extends ListFragment { // --- menu codes - private static final int MENU_SEARCH_ID = R.string.FLA_menu_search; - private static final int MENU_HELP_ID = R.string.FLA_menu_help; - private static final int MENU_NEW_FILTER_ID = R.string.FLA_new_filter; - //private static final int MENU_NEW_LIST_ID = R.string.FLA_new_list; - - private static final int CONTEXT_MENU_SHORTCUT = R.string.FLA_context_shortcut; private static final int CONTEXT_MENU_INTENT = Menu.FIRST + 4; @@ -93,7 +84,6 @@ public class FilterListFragment extends ListFragment { static final int REQUEST_VIEW_TASKS = 2; public static final int REQUEST_NEW_BUTTON = 3; public static final int REQUEST_NEW_LIST = 4; - public static final int REQUEST_NEW_FILTER = 5; // --- instance variables @@ -211,27 +201,6 @@ public class FilterListFragment extends ListFragment { } } - /** - * Create options menu (displayed when user presses menu key) - * - * @return true if menu should be displayed - */ - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - 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 (((AstridActivity) getActivity()).getFragmentLayout() != AstridActivity.LAYOUT_SINGLE) - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - } - /* ====================================================================== * ============================================================ lifecycle * ====================================================================== */ @@ -434,21 +403,6 @@ public class FilterListFragment extends ListFragment { public boolean onOptionsItemSelected(final MenuItem item) { // handle my own menus switch (item.getItemId()) { - case MENU_SEARCH_ID: { - getActivity().onSearchRequested(); - return true; - } - case MENU_HELP_ID: { - Intent intent = new Intent(Intent.ACTION_VIEW, - Uri.parse("http://weloveastrid.com/help-user-guide-astrid-v3/filters/")); //$NON-NLS-1$ - startActivity(intent); - return true; - } - case MENU_NEW_FILTER_ID : { - Intent intent = new Intent(getActivity(), CustomFilterActivity.class); - getActivity().startActivityForResult(intent, REQUEST_NEW_FILTER); - return true; - } case CONTEXT_MENU_SHORTCUT: { AdapterContextMenuInfo info = (AdapterContextMenuInfo)item.getMenuInfo(); final Intent shortcutIntent = item.getIntent(); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index f76e273ae..f86724266 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -377,7 +377,9 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - if ((requestCode == FilterListFragment.REQUEST_NEW_LIST || requestCode == FilterListFragment.REQUEST_NEW_FILTER) && resultCode == Activity.RESULT_OK) { + if ((requestCode == FilterListFragment.REQUEST_NEW_LIST || + requestCode == TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER) && + resultCode == Activity.RESULT_OK) { if(data == null) return; diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java index 796a28ec1..3c5cb46bb 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java @@ -68,6 +68,7 @@ import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.TaskContextActionExposer; import com.todoroo.astrid.api.TaskDecoration; import com.todoroo.astrid.core.CoreFilterExposer; +import com.todoroo.astrid.core.CustomFilterActivity; import com.todoroo.astrid.core.SortHelper; import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; @@ -113,6 +114,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, public static final int ACTIVITY_SORT = 2; public static final int ACTIVITY_ADDONS = 3; public static final int ACTIVITY_MENU_EXTERNAL = 4; + public static final int ACTIVITY_REQUEST_NEW_FILTER = 5; // --- menu codes @@ -121,6 +123,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, protected static final int MENU_SORT_ID = R.string.TLA_menu_sort; protected static final int MENU_SYNC_ID = R.string.TLA_menu_sync; protected static final int MENU_SUPPORT_ID = R.string.TLA_menu_support; + protected static final int MENU_NEW_FILTER_ID = R.string.FLA_new_filter; protected static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 199; protected static final int CONTEXT_MENU_EDIT_TASK_ID = R.string.TAd_contextEditTask; @@ -381,6 +384,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, MenuItem item; + // --- sort if (!(this instanceof DraggableTaskListFragment)) { item = menu.add(Menu.NONE, MENU_SORT_ID, Menu.NONE, R.string.TLA_menu_sort); @@ -389,18 +393,29 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); } + // --- sync addSyncRefreshMenuItem(menu); + // --- new filter + item = menu.add(Menu.NONE, MENU_NEW_FILTER_ID, Menu.NONE, + R.string.FLA_new_filter); + item.setIcon(android.R.drawable.ic_menu_add); + if (((AstridActivity) getActivity()).getFragmentLayout() != AstridActivity.LAYOUT_SINGLE) + item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + + // --- addons if (!Constants.MARKET_DISABLED) { item = menu.add(Menu.NONE, MENU_ADDONS_ID, Menu.NONE, R.string.TLA_menu_addons); item.setIcon(android.R.drawable.ic_menu_set_as); } + // --- support item = menu.add(Menu.NONE, MENU_SUPPORT_ID, Menu.NONE, R.string.TLA_menu_support); item.setIcon(android.R.drawable.ic_menu_help); + // --- settings item = menu.add(Menu.NONE, MENU_SETTINGS_ID, Menu.NONE, R.string.TLA_menu_settings); item.setIcon(android.R.drawable.ic_menu_preferences); @@ -1059,6 +1074,10 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, AndroidUtilities.startExternalIntent(getActivity(), intent, ACTIVITY_MENU_EXTERNAL); return true; + case MENU_NEW_FILTER_ID: + intent = new Intent(getActivity(), CustomFilterActivity.class); + getActivity().startActivityForResult(intent, ACTIVITY_REQUEST_NEW_FILTER); + return true; // --- context menu items