From 34f0d1c77856b615646d90ed8211681c5e714040 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Thu, 2 Feb 2012 13:10:37 -0800 Subject: [PATCH] Added comments button to action bar --- .../todoroo/astrid/actfm/TagViewFragment.java | 26 ++--- astrid/res/drawable/comment_blue.png | Bin 0 -> 3423 bytes astrid/res/drawable/comment_red.png | Bin 0 -> 3406 bytes astrid/res/layout/header_nav_views.xml | 91 ++++++++++++------ astrid/res/values/attrs.xml | 1 + astrid/res/values/styles.xml | 2 + .../astrid/activity/TaskListActivity.java | 12 +++ .../astrid/activity/TaskListFragment.java | 7 ++ 8 files changed, 89 insertions(+), 50 deletions(-) create mode 100644 astrid/res/drawable/comment_blue.png create mode 100644 astrid/res/drawable/comment_red.png diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java index 7d32aae45..4cc015a56 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java @@ -110,24 +110,6 @@ public class TagViewFragment extends TaskListFragment { View membersEdit = getView().findViewById(R.id.members_edit); membersEdit.setOnClickListener(settingsListener); -// if (actFmPreferenceService.isLoggedIn()) { -// View activityContainer = getView().findViewById(R.id.activityContainer); -// activityContainer.setVisibility(View.VISIBLE); -// -// getView().findViewById(R.id.listLabel).setPadding(0, 0, 0, 0); -// -// ImageView activity = (ImageView) getView().findViewById(R.id.activity); -// activity.setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View v) { -// Intent intent = new Intent(getActivity(), TagUpdatesActivity.class); -// intent.putExtra(EXTRA_TAG_DATA, tagData); -// startActivity(intent); -// AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); -// } -// }); -// } - originalFilter = filter; showListSettingsPopover(); } @@ -144,6 +126,14 @@ public class TagViewFragment extends TaskListFragment { } }; + @Override + protected void commentsButtonClicked() { + Intent intent = new Intent(getActivity(), TagUpdatesActivity.class); + intent.putExtra(EXTRA_TAG_DATA, tagData); + startActivity(intent); + AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out); + } + /* (non-Javadoc) * @see com.todoroo.astrid.activity.TaskListActivity#getListBody(android.view.ViewGroup) */ diff --git a/astrid/res/drawable/comment_blue.png b/astrid/res/drawable/comment_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..25ede02242bf6f1800da631afe8d22f6649f652e GIT binary patch literal 3423 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 BWm*6L literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/comment_red.png b/astrid/res/drawable/comment_red.png new file mode 100644 index 0000000000000000000000000000000000000000..2c942763f182cb5ad7dbfbe40a4f8670c380c65a GIT binary patch literal 3406 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 kk5OHMhJZaAC; @@ -10,39 +10,66 @@ android:layout_height="fill_parent" android:src="?attr/asMainMenu" android:scaleType="fitCenter"/> + + - - - - - + + + + + + + + + + + /> - + \ No newline at end of file diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml index e7e04c890..b1abceb21 100644 --- a/astrid/res/values/attrs.xml +++ b/astrid/res/values/attrs.xml @@ -24,6 +24,7 @@ + diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index 3075fa211..4614671c1 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -22,6 +22,7 @@ @drawable/plus_button_blue @drawable/mic_button_blue @drawable/camera_button_blue + @drawable/comment_blue #171317 @drawable/task_edit_background @drawable/custom_tab_indicator_dark @@ -76,6 +77,7 @@ @drawable/plus_button_red @drawable/mic_button_red @drawable/camera_button_red + @drawable/comment_red @drawable/task_edit_background_white @drawable/custom_tab_indicator @drawable/menu_button_red diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 28783d665..f5a339b9a 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -39,6 +39,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener private ImageView listsNavDisclosure; private TextView lists; private ImageView mainMenu; + private ImageView commentsButton; private FragmentPopover listsPopover; private FragmentPopover editPopover; @@ -60,6 +61,15 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener } }; + private final OnClickListener commentsButtonClickListener = new OnClickListener() { + @Override + public void onClick(View v) { + TaskListFragment tlf = getTaskListFragment(); + if (tlf != null) + tlf.commentsButtonClicked(); + } + }; + private final OnDismissListener editPopoverDismissListener = new OnDismissListener() { @Override public void onDismiss() { @@ -93,10 +103,12 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow); lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title); mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu); + commentsButton = (ImageView) actionBar.getCustomView().findViewById(R.id.comments); initializeFragments(actionBar); createMainMenuPopover(); mainMenu.setOnClickListener(mainMenuClickListener); + commentsButton.setOnClickListener(commentsButtonClickListener); } /** diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java index 73a0df155..9dab7bdde 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java @@ -1188,6 +1188,13 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, return task; } + /** + * Comments button in action bar was clicked + */ + protected void commentsButtonClicked() { + // Subclasses can override + } + private static void showAlertForMarkupTask(AstridActivity activity, Task task, String originalText) { DateChangedAlerts.showQuickAddMarkupDialog(activity, task, originalText); }