github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 00:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-3022: Add default text to Android Prompt

Browse Source
This commit is contained in:
mbillau 2013-04-24 12:48:48 -04:00 committed by Andrew Grieve
parent 2d4d18fd75
commit 4b38ccef80
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
framework/src/org/apache/cordova/Notification.java
View File

@ -33,6 +33,7 @@ import android.media.Ringtone;
import android.media.RingtoneManager; import android.media.RingtoneManager;
import android.net.Uri; import android.net.Uri;
import android.os.Vibrator; import android.os.Vibrator;
import android.util.Log;
import android.widget.EditText; import android.widget.EditText;
/** /**
@ -74,7 +75,7 @@ public class Notification extends CordovaPlugin {
return true; return true;
} }
else if (action.equals("prompt")) { else if (action.equals("prompt")) {
this.prompt(args.getString(0), args.getString(1), args.getJSONArray(2), callbackContext); this.prompt(args.getString(0), args.getString(1), args.getJSONArray(2), args.getString(3), callbackContext);
return true; return true;
} }
else if (action.equals("activityStart")) { else if (action.equals("activityStart")) {
@ -271,11 +272,12 @@ public class Notification extends CordovaPlugin {
* @param buttonLabels A comma separated list of button labels (Up to 3 buttons) * @param buttonLabels A comma separated list of button labels (Up to 3 buttons)
* @param callbackContext The callback context. * @param callbackContext The callback context.
*/ */
public synchronized void prompt(final String message, final String title, final JSONArray buttonLabels, final CallbackContext callbackContext) { public synchronized void prompt(final String message, final String title, final JSONArray buttonLabels, final String defaultText, final CallbackContext callbackContext) {
final CordovaInterface cordova = this.cordova; final CordovaInterface cordova = this.cordova;
final EditText promptInput = new EditText(cordova.getActivity()); final EditText promptInput = new EditText(cordova.getActivity());
promptInput.setHint(defaultText);
Runnable runnable = new Runnable() { Runnable runnable = new Runnable() {
public void run() { public void run() {
AlertDialog.Builder dlg = new AlertDialog.Builder(cordova.getActivity()); AlertDialog.Builder dlg = new AlertDialog.Builder(cordova.getActivity());
@ -296,7 +298,7 @@ public class Notification extends CordovaPlugin {
dialog.dismiss(); dialog.dismiss();
try { try {
result.put("buttonIndex",1); result.put("buttonIndex",1);
result.put("input1", promptInput.getText()); result.put("input1", promptInput.getText().toString().trim().length()==0 ? defaultText : promptInput.getText());
} catch (JSONException e) { e.printStackTrace(); } } catch (JSONException e) { e.printStackTrace(); }
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result)); callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result));
} }
@ -313,7 +315,7 @@ public class Notification extends CordovaPlugin {
dialog.dismiss(); dialog.dismiss();
try { try {
result.put("buttonIndex",2); result.put("buttonIndex",2);
result.put("input1", promptInput.getText()); result.put("input1", promptInput.getText().toString().trim().length()==0 ? defaultText : promptInput.getText());
} catch (JSONException e) { e.printStackTrace(); } } catch (JSONException e) { e.printStackTrace(); }
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result)); callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result));
} }
@ -330,7 +332,7 @@ public class Notification extends CordovaPlugin {
dialog.dismiss(); dialog.dismiss();
try { try {
result.put("buttonIndex",3); result.put("buttonIndex",3);
result.put("input1", promptInput.getText()); result.put("input1", promptInput.getText().toString().trim().length()==0 ? defaultText : promptInput.getText());
} catch (JSONException e) { e.printStackTrace(); } } catch (JSONException e) { e.printStackTrace(); }
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result)); callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result));
} }
@ -344,7 +346,7 @@ public class Notification extends CordovaPlugin {
dialog.dismiss(); dialog.dismiss();
try { try {
result.put("buttonIndex",0); result.put("buttonIndex",0);
result.put("input1", promptInput.getText()); result.put("input1", promptInput.getText().toString().trim().length()==0 ? defaultText : promptInput.getText());
} catch (JSONException e) { e.printStackTrace(); } } catch (JSONException e) { e.printStackTrace(); }
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result)); callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, result));
} }
@ -355,8 +357,9 @@ public class Notification extends CordovaPlugin {
}; };
}; };
this.cordova.getActivity().runOnUiThread(runnable); this.cordova.getActivity().runOnUiThread(runnable);
} }
/** /**
* Show the spinner. * Show the spinner.
* *
@ -446,5 +449,4 @@ public class Notification extends CordovaPlugin {
this.progressDialog = null; this.progressDialog = null;
} }
} }
} }