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 000000000..25ede0224 Binary files /dev/null and b/astrid/res/drawable/comment_blue.png differ diff --git a/astrid/res/drawable/comment_red.png b/astrid/res/drawable/comment_red.png new file mode 100644 index 000000000..2c942763f Binary files /dev/null and b/astrid/res/drawable/comment_red.png differ diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/res/layout/header_nav_views.xml index da88e5cf6..c59682855 100644 --- a/astrid/res/layout/header_nav_views.xml +++ b/astrid/res/layout/header_nav_views.xml @@ -1,6 +1,6 @@ @@ -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); }