2 files changed, 80 insertions, 12 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 93566c2..993e6a0 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -18,6 +18,7 @@ import cgeo.geocaching.network.HtmlImage;
 import cgeo.geocaching.network.Parameters;
 import cgeo.geocaching.ui.CacheDetailsCreator;
 import cgeo.geocaching.ui.DecryptTextClickListener;
+import cgeo.geocaching.ui.EditorDialog;
 import cgeo.geocaching.ui.Formatter;
 import cgeo.geocaching.ui.LoggingUI;
 import cgeo.geocaching.utils.BaseUtils;
@@ -1896,18 +1897,26 @@ public class CacheDetailActivity extends AbstractActivity {
             }
 
             // cache personal note
-            if (StringUtils.isNotBlank(cache.getPersonalNote())) {
-                ((LinearLayout) view.findViewById(R.id.personalnote_box)).setVisibility(View.VISIBLE);
-
-                TextView personalNoteText = (TextView) view.findViewById(R.id.personalnote);
-                personalNoteText.setVisibility(View.VISIBLE);
-                personalNoteText.setText(cache.getPersonalNote(), TextView.BufferType.SPANNABLE);
-                personalNoteText.setMovementMethod(LinkMovementMethod.getInstance());
-                registerForContextMenu(personalNoteText);
-            }
-            else {
-                ((LinearLayout) view.findViewById(R.id.personalnote_box)).setVisibility(View.GONE);
-            }
+            final TextView personalNoteText = (TextView) view.findViewById(R.id.personalnote);
+            personalNoteText.setText(cache.getPersonalNote(), TextView.BufferType.SPANNABLE);
+            personalNoteText.setMovementMethod(LinkMovementMethod.getInstance());
+            registerForContextMenu(personalNoteText);
+            final Button personalNoteEdit = (Button) view.findViewById(R.id.edit_personalnote);
+            personalNoteEdit.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    EditorDialog editor = new EditorDialog(CacheDetailActivity.this, personalNoteText.getText());
+                    editor.setOnEditorUpdate(new EditorDialog.EditorUpdate() {
+                        @Override
+                        public void update(CharSequence editorText) {
+                            personalNoteText.setText(editorText);
+                            cache.setPersonalNote(editorText.toString());
+                            app.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB));
+                        }
+                    });
+                    editor.show();
+                }
+            });
 
             // cache hint and spoiler images
             if (StringUtils.isNotBlank(cache.getHint()) || CollectionUtils.isNotEmpty(cache.getSpoilers())) {
diff --git a/main/src/cgeo/geocaching/ui/EditorDialog.java b/main/src/cgeo/geocaching/ui/EditorDialog.java
new file mode 100644
index 0000000..50b3e27
--- /dev/null
+++ b/main/src/cgeo/geocaching/ui/EditorDialog.java
@@ -0,0 +1,59 @@
+package cgeo.geocaching.ui;
+
+import cgeo.geocaching.CacheDetailActivity;
+import cgeo.geocaching.R;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.EditText;
+
+public class EditorDialog extends Dialog {
+
+    private CharSequence editorText;
+    private EditorUpdate editorUpdate;
+
+    public EditorDialog(CacheDetailActivity cacheDetailActivity, CharSequence editable) {
+        super(cacheDetailActivity);
+        this.editorText = editable;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.editor);
+
+        final EditText editText = (EditText) findViewById(R.id.editorEditText);
+        editText.setText(editorText);
+
+        final Button buttonSave = (Button) findViewById(R.id.editorSave);
+        buttonSave.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                editorUpdate.update(editText.getEditableText());
+                EditorDialog.this.hide();
+            }
+        });
+    }
+
+    public interface EditorUpdate {
+        public void update(CharSequence editorText);
+    }
+
+    public void setOnEditorUpdate(EditorUpdate editorUpdate) {
+        this.editorUpdate = editorUpdate;
+
+    }
+
+    @Override
+    public void show() {
+        super.show();
+        getWindow().setLayout(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
+    }
+
+}