Disable change log; to remove in future

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / EditNameDialog.java

diff --git a/src/com/owncloud/android/ui/dialog/EditNameDialog.java b/src/com/owncloud/android/ui/dialog/EditNameDialog.java
index 1755fa5..069eedb 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/EditNameDialog.java
+++ b/src/com/owncloud/android/ui/dialog/EditNameDialog.java
@@ -1,9 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski

+ *   Copyright (C) 2012-2013 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or

  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,


@@ -16,16 +17,15 @@
  *
  */
 
  *
  */
 

-

 package com.owncloud.android.ui.dialog;
 
 package com.owncloud.android.ui.dialog;
 

+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;

 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;

-import android.view.ViewGroup;
-import android.view.View.OnClickListener;

 import android.view.WindowManager.LayoutParams;
 import android.view.WindowManager.LayoutParams;

-import android.widget.Button;

 import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;


@@ -33,52 +33,93 @@ import com.owncloud.android.R;
 
 
 /**
 
 
 /**

- * Dialog to request the user about a certificate that could not be validated with the certificates store in the system.
+ * Dialog to request the user to input a name, optionally initialized with a former name.

  * 
  * @author Bartek Przybylski
  * 
  * @author Bartek Przybylski

+ * @author David A. Velasco

  */
  */

-public class EditNameDialog extends SherlockDialogFragment implements OnClickListener {
+public class EditNameDialog extends SherlockDialogFragment implements DialogInterface.OnClickListener {

 
     public static final String TAG = EditNameDialog.class.getSimpleName();
     
 
     public static final String TAG = EditNameDialog.class.getSimpleName();
     

+    protected static final String ARG_TITLE = "title";
+    protected static final String ARG_NAME = "name";
+    

     private String mNewFilename;
     private boolean mResult;
     private EditNameDialogListener mListener;
     
     private String mNewFilename;
     private boolean mResult;
     private EditNameDialogListener mListener;
     

-    static public EditNameDialog newInstance(String filename) {
+    /**
+     * Public factory method to get dialog instances.
+     * 
+     * @param title         Text to show as title in the dialog.
+     * @param name          Optional text to include in the text input field when the dialog is shown.
+     * @param listener      Instance to notify when the dialog is dismissed.
+     * @return              New dialog instance, ready to show.
+     */
+    static public EditNameDialog newInstance(String title, String name, EditNameDialogListener listener) {

         EditNameDialog f = new EditNameDialog();
         Bundle args = new Bundle();
         EditNameDialog f = new EditNameDialog();
         Bundle args = new Bundle();

-        args.putString("filename", filename);
+        args.putString(ARG_TITLE, title);
+        args.putString(ARG_NAME, name);

         f.setArguments(args);
         f.setArguments(args);

+        f.setOnDismissListener(listener);

         return f;
     }
     
         return f;
     }
     

+    
+    /**
+     * {@inheritDoc}
+     */

     @Override
     @Override

-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.edit_box_dialog, container, false);
-
-        String currentName = getArguments().getString("filename");
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        String currentName = getArguments().getString(ARG_NAME);

         if (currentName == null)
             currentName = "";
         if (currentName == null)
             currentName = "";

+        String title = getArguments().getString(ARG_TITLE);

         
         

-        ((Button)v.findViewById(R.id.cancel)).setOnClickListener(this);
-        ((Button)v.findViewById(R.id.ok)).setOnClickListener(this);
-        ((TextView)v.findViewById(R.id.user_input)).setText(currentName);
-        ((TextView)v.findViewById(R.id.user_input)).requestFocus();
-        getDialog().getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        // Inflate the layout for the dialog
+        LayoutInflater inflater = getSherlockActivity().getLayoutInflater();
+        View v = inflater.inflate(R.layout.edit_box_dialog, null);  // null parent view because it will go in the dialog layout
+        TextView inputText = ((TextView)v.findViewById(R.id.user_input));
+        inputText.setText(currentName);
+        
+        // Set it to the dialog 
+        AlertDialog.Builder builder = new AlertDialog.Builder(getSherlockActivity());
+        builder.setView(v)
+               .setPositiveButton(R.string.common_ok, this)
+               .setNegativeButton(R.string.common_cancel, this);

 
 

+        if (title != null) {
+            builder.setTitle(title);
+        }
+        

         mResult = false;
         mResult = false;

-        return v;
-    }
+        
+        Dialog d = builder.create();
+
+        inputText.requestFocus();
+        d.getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        return d;
+    }    
+

     
     

+    /**
+     * Performs the corresponding action when a dialog button is clicked.
+     * 
+     * Saves the text in the input field to be accessed through {@link #getNewFilename()} when the positive
+     * button is clicked.
+     * 
+     * Notify the current listener in any case.
+     */

     @Override
     @Override

-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.ok: {
-                mNewFilename = ((TextView)getView().findViewById(R.id.user_input)).getText().toString();
+    public void onClick(DialogInterface dialog, int which) {
+        switch (which) {
+            case AlertDialog.BUTTON_POSITIVE: {
+                mNewFilename = ((TextView)(getDialog().findViewById(R.id.user_input))).getText().toString();

                 mResult = true;
             }
                 mResult = true;
             }

-            case R.id.cancel: { // fallthought
+            case AlertDialog.BUTTON_NEGATIVE: { // fall through

                 dismiss();
                 if (mListener != null)
                     mListener.onDismiss(this);
                 dismiss();
                 if (mListener != null)
                     mListener.onDismiss(this);


@@ -86,23 +127,35 @@ public class EditNameDialog extends SherlockDialogFragment implements OnClickLis
         }
     }
     
         }
     }
     

-    public void setOnDismissListener(EditNameDialogListener listener) {
+    protected void setOnDismissListener(EditNameDialogListener listener) {

         mListener = listener;
     }
     
         mListener = listener;
     }
     

+    /**
+     * Returns the text in the input field after the user clicked the positive button.
+     * 
+     * @return      Text in the input field.
+     */

     public String getNewFilename() {
         return mNewFilename;
     }
     
     public String getNewFilename() {
         return mNewFilename;
     }
     

-    // true if user clicked ok
+    /**
+     * 
+     * @return      True when the user clicked the positive button.
+     */

     public boolean getResult() {
         return mResult;
     }
 
     
     public boolean getResult() {
         return mResult;
     }
 
     

+    /**
+     * Interface to receive a notification when any button in the dialog is clicked.
+     */

     public interface EditNameDialogListener {
         public void onDismiss(EditNameDialog dialog);
     }
     public interface EditNameDialogListener {
         public void onDismiss(EditNameDialog dialog);
     }

-    
+
+

 }
 
 }