From 1cd9f08c28d51d5d4080180a52be56fffd093555 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 25 Jun 2012 19:51:26 -0700 Subject: [PATCH] More work on the featured lists view --- .../tags/reusable/FeaturedListActivity.java | 28 +++++++++++++++++++ .../tags/reusable/FeaturedListFragment.java | 25 +++++++++++++++++ .../tags/reusable/ReusableListActivity.java | 9 ++++++ astrid/res/layout/featured_list_activity.xml | 11 ++++++++ astrid/res/values/strings-core.xml | 3 ++ .../astrid/activity/TaskListActivity.java | 5 ++++ .../todoroo/astrid/ui/MainMenuPopover.java | 5 ++++ 7 files changed, 86 insertions(+) create mode 100644 astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListActivity.java create mode 100644 astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java create mode 100644 astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableListActivity.java create mode 100644 astrid/res/layout/featured_list_activity.xml diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListActivity.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListActivity.java new file mode 100644 index 000000000..8d1c353fd --- /dev/null +++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListActivity.java @@ -0,0 +1,28 @@ +package com.todoroo.astrid.tags.reusable; + +import android.content.Intent; +import android.os.Bundle; + +import com.timsu.astrid.R; +import com.todoroo.astrid.activity.AstridActivity; +import com.todoroo.astrid.activity.TaskListActivity; +import com.todoroo.astrid.activity.TaskListFragment; +import com.todoroo.astrid.api.FilterListItem; + +public class FeaturedListActivity extends AstridActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.featured_list_activity); + } + + @Override + public boolean onFilterItemClicked(FilterListItem item) { + Intent taskList = new Intent(this, TaskListActivity.class); + taskList.putExtra(TaskListFragment.TOKEN_FILTER, item); + startActivity(taskList); + return true; + } + +} diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java new file mode 100644 index 000000000..55fe921a3 --- /dev/null +++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java @@ -0,0 +1,25 @@ +package com.todoroo.astrid.tags.reusable; + +import android.app.Activity; + +import com.timsu.astrid.R; +import com.todoroo.andlib.utility.AndroidUtilities; +import com.todoroo.astrid.activity.FilterListFragment; +import com.todoroo.astrid.adapter.FilterAdapter; + +public class FeaturedListFragment extends FilterListFragment { + + @Override + protected FilterAdapter instantiateAdapter() { + return new FeaturedListFilterAdapter(getActivity(), null, R.layout.filter_adapter_row, false); + } + + @Override + protected int getLayout(Activity activity) { + if (AndroidUtilities.isTabletSized(activity)) + return R.layout.filter_list_fragment_alternative_3pane; + else + return R.layout.filter_list_fragment_alternative; + } + +} diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableListActivity.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableListActivity.java new file mode 100644 index 000000000..0f555d79f --- /dev/null +++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableListActivity.java @@ -0,0 +1,9 @@ +package com.todoroo.astrid.tags.reusable; + +import android.app.Activity; + +public class ReusableListActivity extends Activity { + + // + +} diff --git a/astrid/res/layout/featured_list_activity.xml b/astrid/res/layout/featured_list_activity.xml new file mode 100644 index 000000000..99789bebb --- /dev/null +++ b/astrid/res/layout/featured_list_activity.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index 378188a0f..5253d5126 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -124,6 +124,9 @@ People + + Featured Lists + Suggestions diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index cda9d8c68..7c2dd6fcc 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -49,6 +49,7 @@ import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.service.abtesting.ABTestEventReportingService; import com.todoroo.astrid.tags.TagService; +import com.todoroo.astrid.tags.reusable.FeaturedListActivity; import com.todoroo.astrid.ui.DateChangedAlerts; import com.todoroo.astrid.ui.FragmentPopover; import com.todoroo.astrid.ui.MainMenuPopover; @@ -642,6 +643,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener case MainMenuPopover.MAIN_MENU_ITEM_SEARCH: onSearchRequested(); return; + case MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS: + Intent featured = new Intent(this, FeaturedListActivity.class); + startActivity(featured); + return; case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS: if (fragmentLayout != LAYOUT_SINGLE) { togglePeopleView(); diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java index e47292fae..d87242d4a 100644 --- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java +++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java @@ -24,6 +24,7 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi public static final int MAIN_MENU_ITEM_LISTS = R.string.TLA_menu_lists; public static final int MAIN_MENU_ITEM_FRIENDS = R.string.TLA_menu_friends; + public static final int MAIN_MENU_ITEM_FEATURED_LISTS = R.string.TLA_menu_featured_lists; public static final int MAIN_MENU_ITEM_SEARCH = R.string.TLA_menu_search; public static final int MAIN_MENU_ITEM_SUGGESTIONS = R.string.TLA_menu_suggestions; public static final int MAIN_MENU_ITEM_SETTINGS = R.string.TLA_menu_settings; @@ -107,6 +108,10 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi ThemeService.getDrawable(R.drawable.icn_menu_friends, themeFlags), MAIN_MENU_ITEM_FRIENDS, null, topFixed); + addMenuItem(R.string.TLA_menu_featured_lists, + 0, + MAIN_MENU_ITEM_FEATURED_LISTS, null, topFixed); + addMenuItem(R.string.TLA_menu_search, ThemeService.getDrawable(R.drawable.icn_menu_search, themeFlags), MAIN_MENU_ITEM_SEARCH, null, topFixed);