X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/85e9a40dbeb521029a592a3d85e9fa583cce0c19..c3d88a0594e32043b2599a37789b7ada4a9ac85a:/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 1755fa5a..862715fd 100644 --- a/src/com/owncloud/android/ui/dialog/EditNameDialog.java +++ b/src/com/owncloud/android/ui/dialog/EditNameDialog.java @@ -1,10 +1,10 @@ /* 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,69 +16,127 @@ * */ - 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.view.ViewGroup; -import android.view.View.OnClickListener; import android.view.WindowManager.LayoutParams; -import android.widget.Button; +import android.widget.EditText; import android.widget.TextView; +import android.widget.Toast; import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.R; +import com.owncloud.android.oc_framework.utils.FileUtils; /** - * 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 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(); + protected static final String ARG_TITLE = "TITLE"; + protected static final String ARG_NAME = "NAME"; + protected static final String ARG_SELECTION_START = "SELECTION_START"; + protected static final String ARG_SELECTION_END = "SELECTION_END"; + 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. + * @param selectionStart Index to the first character to be selected in the input field; negative value for none + * @param selectionEnd Index to the last character to be selected in the input field; negative value for none + * @return New dialog instance, ready to show. + */ + static public EditNameDialog newInstance(String title, String name, int selectionStart, int selectionEnd, EditNameDialogListener listener) { EditNameDialog f = new EditNameDialog(); Bundle args = new Bundle(); - args.putString("filename", filename); + args.putString(ARG_TITLE, title); + args.putString(ARG_NAME, name); + args.putInt(ARG_SELECTION_START, selectionStart); + args.putInt(ARG_SELECTION_END, selectionEnd); f.setArguments(args); + f.setOnDismissListener(listener); return f; } + + /** + * {@inheritDoc} + */ @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 = ""; + 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 + EditText inputText = ((EditText)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; - return v; - } + + Dialog d = builder.create(); + + inputText.requestFocus(); + int selectionStart = getArguments().getInt(ARG_SELECTION_START, -1); + int selectionEnd = getArguments().getInt(ARG_SELECTION_END, -1); + if (selectionStart >= 0 && selectionEnd >= 0) { + inputText.setSelection(Math.min(selectionStart, selectionEnd), Math.max(selectionStart, selectionEnd)); + } + 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 - 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(); + if (!FileUtils.isValidName(mNewFilename)) { + Toast.makeText(getSherlockActivity(), R.string.filename_forbidden_characters, Toast.LENGTH_LONG).show(); + return; + } mResult = true; } - case R.id.cancel: { // fallthought + case AlertDialog.BUTTON_NEGATIVE: { // fall through dismiss(); if (mListener != null) mListener.onDismiss(this); @@ -86,23 +144,35 @@ public class EditNameDialog extends SherlockDialogFragment implements OnClickLis } } - public void setOnDismissListener(EditNameDialogListener listener) { + protected void setOnDismissListener(EditNameDialogListener 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; } - // true if user clicked ok + /** + * + * @return True when the user clicked the positive button. + */ 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); } - + + }