From e5468b63601d9ec666f25024a48b49c5dfb29ff5 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 5 Sep 2011 12:32:08 -0700
Subject: [PATCH] Dismiss button for comments view

---
 .../com/todoroo/astrid/notes/EditNoteActivity.java       | 9 +++++++++
 astrid/res/layout/edit_note_activity.xml                 | 7 +++++++
 astrid/res/values/strings-core.xml                       | 3 +++
 3 files changed, 19 insertions(+)

diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index f4bc668c5..43c570641 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -76,6 +76,8 @@ public class EditNoteActivity extends ListActivity {
         setTheme(R.style.Theme_Dialog);
         setContentView(R.layout.edit_note_activity);
 
+        findViewById(R.id.dismiss_comments).setOnClickListener(dismissCommentsListener);
+
         long taskId = getIntent().getLongExtra(EXTRA_TASK_ID, -1);
         task = PluginServices.getTaskService().fetchById(taskId, Task.NOTES, Task.ID, Task.REMOTE_ID, Task.TITLE);
         if(task == null) {
@@ -272,6 +274,13 @@ public class EditNoteActivity extends ListActivity {
         StatisticsService.reportEvent("actfm-task-comment"); //$NON-NLS-1$
     }
 
+    private final OnClickListener dismissCommentsListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            finish();
+        }
+    };
+
     @Override
     public boolean onMenuItemSelected(int featureId, MenuItem item) {
         // handle my own menus
diff --git a/astrid/res/layout/edit_note_activity.xml b/astrid/res/layout/edit_note_activity.xml
index 379d51cec..b371ae39f 100644
--- a/astrid/res/layout/edit_note_activity.xml
+++ b/astrid/res/layout/edit_note_activity.xml
@@ -59,4 +59,11 @@
         
     </LinearLayout>
     
+    <Button android:id="@+id/dismiss_comments"
+        android:layout_width="fill_parent"
+        android:layout_height="50dip"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:text="@string/DLG_dismiss" />
+    
 </LinearLayout>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index e9dbd5f49..4ad3f8e78 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -56,6 +56,9 @@
   <!-- Dialog - loading -->
   <string name="DLG_loading">Loading...</string>
   
+  <!-- Dialog - dismiss -->
+  <string name="DLG_dismiss">Dismiss</string>
+  
   <!-- =============================================================== UI == -->
   
   <!-- Label for DateButtons with no value -->