Merge branch 'issue-2598' into upstream

2 files changed, 65 insertions, 60 deletions

diff --git a/main/src/cgeo/geocaching/ui/EditNoteDialog.java b/main/src/cgeo/geocaching/ui/EditNoteDialog.java
new file mode 100644
index 0000000..23e57f2
--- /dev/null
+++ b/main/src/cgeo/geocaching/ui/EditNoteDialog.java
@@ -0,0 +1,65 @@
+package cgeo.geocaching.ui;
+
+import cgeo.geocaching.R;
+import cgeo.geocaching.R.string;
+
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager.LayoutParams;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
+
+public class EditNoteDialog extends DialogFragment implements OnEditorActionListener {
+
+    public interface EditNoteDialogListener {
+        void onFinishEditNoteDialog(final String inputText);
+    }
+
+    private EditText mEditText;
+    private String initialNote;
+
+    public EditNoteDialog() {
+        // Empty constructor required for DialogFragment
+    }
+
+    public EditNoteDialog(final String initialNote) {
+        this.initialNote = initialNote;
+    }
+
+    @Override
+    public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
+                             final Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_edit_note, container);
+        mEditText = (EditText) view.findViewById(R.id.note);
+        if (initialNote != null) {
+            mEditText.setText(initialNote);
+            initialNote = null;
+        }
+        getDialog().setTitle(string.cache_personal_note);
+        mEditText.requestFocus();
+        getDialog().getWindow().setSoftInputMode(
+                LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        mEditText.setOnEditorActionListener(this);
+
+        return view;
+    }
+
+    @Override
+    public boolean onEditorAction(final TextView v, final int actionId, final KeyEvent event) {
+        if (EditorInfo.IME_ACTION_DONE == actionId) {
+            final EditNoteDialogListener activity = (EditNoteDialogListener) getActivity();
+            activity.onFinishEditNoteDialog(mEditText.getText().toString());
+            dismiss();
+            return true;
+        }
+        return false;
+    }
+
+
+}
diff --git a/main/src/cgeo/geocaching/ui/dialog/EditorDialog.java b/main/src/cgeo/geocaching/ui/dialog/EditorDialog.java
deleted file mode 100644
index 4db69e5..0000000
--- a/main/src/cgeo/geocaching/ui/dialog/EditorDialog.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package cgeo.geocaching.ui.dialog;
-
-import cgeo.geocaching.CacheDetailActivity;
-import cgeo.geocaching.R;
-import cgeo.geocaching.activity.ActivityMixin;
-
-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, ActivityMixin.getTheme());
-        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.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-    }
-
-}