Added comments button to action bar

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)
      */

astrid/res/layout/header_nav_views.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal">
     
@@ -10,39 +10,66 @@
         android:layout_height="fill_parent"
         android:src="?attr/asMainMenu"
         android:scaleType="fitCenter"/>
+    
+    <View
+        android:layout_width="1px"
+        android:layout_height="fill_parent"
+        style="@style/TEA_Separator"
+        android:layout_marginBottom="4dip"
+        android:layout_marginTop="4dip"/>
         
         
-	<RelativeLayout 
+    <LinearLayout 
-	    android:id="@+id/lists_nav"
+        android:layout_width="match_parent"
-	    android:layout_width="wrap_content"
+        android:layout_height="match_parent"
-	    android:layout_height="match_parent"
+		android:layout_weight="1"
-	    android:layout_marginLeft="5dip"
+		android:gravity="center_vertical">
-	    android:layout_marginTop="5dip"
+		<RelativeLayout 
-	    android:layout_marginBottom="5dip"
+		    android:id="@+id/lists_nav"
-	    android:paddingRight="5dip"
+		    android:layout_width="wrap_content"
-	    android:paddingLeft="5dip"
+		    android:layout_height="match_parent"
-	    android:gravity="center_vertical">
+		    android:layout_margin="5dip"
-	    
+		    android:paddingRight="5dip"
-	    <TextView
+		    android:paddingLeft="5dip"
-	        android:id="@+id/list_title"
+		    android:gravity="center_vertical">
-	        android:layout_width="wrap_content"
+		    
-	        android:layout_height="wrap_content"
+		    <TextView
-	        android:gravity="center_vertical"
+		        android:id="@+id/list_title"
-	        android:text="@string/BFE_Active"
+		        android:layout_width="wrap_content"
-	        android:singleLine="true"
+		        android:layout_height="wrap_content"
-	        android:ellipsize="end"
+		        android:gravity="center_vertical"
-	        style="@style/TextAppearance.ActionBar_ListsHeader"/>
+		        android:text="@string/BFE_Active"
-	    
+		        android:singleLine="true"
-	    <ImageView
+		        android:layout_weight="1"
-	        android:id="@+id/list_disclosure_arrow"
+		        android:ellipsize="end"
-	        android:layout_width="12dip"
+		        style="@style/TextAppearance.ActionBar_ListsHeader"/>
-	        android:layout_height="12dip"
+		    
-	        android:layout_marginLeft="10dip" 
+		    <ImageView
-	        android:layout_toRightOf="@id/list_title"
+		        android:id="@+id/list_disclosure_arrow"
-	        android:layout_alignBottom="@id/list_title"
+		        android:layout_width="12dip"
-	        android:src="?attr/asListsDisclosure"
+		        android:layout_height="12dip"
-	        android:scaleType="fitCenter"/>
+		        android:layout_marginLeft="10dip" 
+		        android:layout_toRightOf="@id/list_title"
+		        android:layout_alignBottom="@id/list_title"
+		        android:src="?attr/asListsDisclosure"
+		        android:scaleType="fitCenter"/>
+		
+		</RelativeLayout>
+    </LinearLayout>
+	
+	<View
+        android:layout_width="1px"
+        android:layout_height="fill_parent"
+        style="@style/TEA_Separator"
+        android:layout_marginBottom="4dip"
+        android:layout_marginTop="4dip"/>/>
 	
-	</RelativeLayout>
+	<ImageView 
+	    android:id="@+id/comments"
+	    android:layout_width="51dip"
+	    android:layout_height="fill_parent"
+	    android:padding="7dip"
+	    android:src="?attr/asCommentButtonImg"
+	    android:scaleType="fitCenter"/>
 
 </LinearLayout>

astrid/res/values/attrs.xml

@@ -24,6 +24,7 @@
   <attr name="asAddButtonImg" format="reference" />
   <attr name="asMicButtonImg" format="reference" />
   <attr name="asCameraButtonImg" format="reference" />
+  <attr name="asCommentButtonImg" format="reference" />
   <attr name="asTaskEditArrow" format="reference" />
   <attr name="asRepeatIcon" format="reference" />
   

astrid/res/values/styles.xml

@@ -22,6 +22,7 @@
         <item name="asAddButtonImg">@drawable/plus_button_blue</item>
         <item name="asMicButtonImg">@drawable/mic_button_blue</item>
         <item name="asCameraButtonImg">@drawable/camera_button_blue</item>
+        <item name="asCommentButtonImg">@drawable/comment_blue</item>
         <item name="asEditBackground">#171317</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
@@ -76,6 +77,7 @@
         <item name="asAddButtonImg">@drawable/plus_button_red</item>
         <item name="asMicButtonImg">@drawable/mic_button_red</item>
         <item name="asCameraButtonImg">@drawable/camera_button_red</item>
+        <item name="asCommentButtonImg">@drawable/comment_red</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator</item>
         <item name="asMainMenu">@drawable/menu_button_red</item>

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);
 	}
 
 	/**

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);
     }