Updates to Android DatePickerPlugin

Android/BarcodeScanner/README.md

@@ -5,14 +5,17 @@ By Matt Kane
 This plugin requires the end user to install [the ZXing Barcode Scanner app](http://code.google.com/p/zxing/)
 If the user doesn't have the app install they will be promped to install it the first time the plugin is used.
 
-1. To install the plugin, move barcodescanner.js to your project's www folder and include a reference to it 
+1. To install the plugin, move `barcodescanner.js` to your project's www folder and include a reference to it 
 in your html files. 
 2. Create a folder called 'src/com/beetight/barcodescanner' within your project's src/com/ folder.
 3. And copy the java file into that new folder.
 
-`mkdir <your_project>/src/com/beetight/barcodescanner`
+    mkdir -p <your_project>/src/com/beetight/barcodescanner
+    cp ./BarcodeScanner.java <your_project>/src/com/beetight/barcodescanner
+
+4. Add a plugin line to `res/xml/plugins.xml`
 
-`cp ./BarcodeScanner.java <your_project>/src/com/beetight/barcodescanner`
+    `<plugin name="BarcodeScanner" value="com.beetight.barcodescanner.BarcodeScanner"/>`
 
 ## Using the plugin ##
 The plugin creates the object `window.plugins.barcodeScanner` with one method `scan(types, success, fail, options)`
@@ -67,12 +70,12 @@ Supported encoding types:
 
 A full example could be:
 
-            window.plugins.barcodeScanner.encode(BarcodeScanner.Encode.TEXT_TYPE, "http://www.nytimes.com", function(success) {
-  	        alert("encode success: " + success);
-  	      }, function(fail) {
-  	        alert("encoding failed: " + fail);
-  	      }, {yesString: "Install"}
-  	    );
+    window.plugins.barcodeScanner.encode(BarcodeScanner.Encode.TEXT_TYPE, "http://www.nytimes.com", function(success) {
+        alert("encode success: " + success);
+      }, function(fail) {
+        alert("encoding failed: " + fail);
+      }, {yesString: "Install"}
+    );
 
 
 ## BUGS AND CONTRIBUTIONS ##

Android/ChildBrowser/src/com/phonegap/plugins/childBrowser/ChildBrowser.java

@@ -15,6 +15,7 @@
 import org.json.JSONObject;
 
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -26,6 +27,7 @@
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.WindowManager.LayoutParams;
+import android.view.inputmethod.InputMethodManager;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.EditText;
@@ -46,6 +48,7 @@ public class ChildBrowser extends Plugin {
 
     private Dialog dialog;
     private WebView webview;
+    private EditText edittext; 
     private boolean showLocationBar = true;
 
     /**
@@ -64,6 +67,11 @@ public PluginResult execute(String action, JSONArray args, String callbackId) {
             if (action.equals("showWebPage")) {
                 this.browserCallbackId = callbackId;
 
+                // If the ChildBrowser is already open then throw an error
+                if (dialog != null && dialog.isShowing()) {
+                    return new PluginResult(PluginResult.Status.ERROR, "ChildBrowser is already open");
+                }
+
                 result = this.showWebPage(args.getString(0), args.optJSONObject(1));
 
                 if (result.length() > 0) {
@@ -129,7 +137,7 @@ public String openExternal(String url, boolean usePhoneGap) {
             this.ctx.startActivity(intent);
             return "";
         } catch (android.content.ActivityNotFoundException e) {
-            System.out.println("ChildBrowser: Error loading url "+url+":"+ e.toString());
+            Log.d(LOG_TAG, "ChildBrowser: Error loading url "+url+":"+ e.toString());
             return e.toString();
         }
     }
@@ -166,11 +174,15 @@ private void goForward() {
      * 
      * @param url to load
      */
-    private void navigate(String url) {
+    private void navigate(String url) {        
+        InputMethodManager imm = (InputMethodManager)this.ctx.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(edittext.getWindowToken(), 0);
+
         if (!url.startsWith("http")) {
             this.webview.loadUrl("http://" + url);            
         }
         this.webview.loadUrl(url);
+        this.webview.requestFocus();
     }
 
 
@@ -255,7 +267,7 @@ public void onClick(View v) {
                 }               
                 forward.setLayoutParams(forwardParams);
 
-                final EditText edittext = new EditText(ctx);
+                edittext = new EditText(ctx);
                 edittext.setOnKeyListener(new View.OnKeyListener() {
                     public boolean onKey(View v, int keyCode, KeyEvent event) {
                         // If the event is a key-down event on the "enter" button
@@ -270,7 +282,7 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                 edittext.setSingleLine(true);
                 edittext.setText(url);
                 edittext.setLayoutParams(editParams);
-                    
+
                 ImageButton close = new ImageButton(ctx);                
                 close.setOnClickListener(new View.OnClickListener() {
                     public void onClick(View v) {
@@ -287,11 +299,16 @@ public void onClick(View v) {
 
                 webview = new WebView(ctx);
                 webview.getSettings().setJavaScriptEnabled(true);
+                webview.getSettings().setBuiltInZoomControls(true);
                 WebViewClient client = new ChildBrowserClient(ctx, edittext);
                 webview.setWebViewClient(client);                
                 webview.loadUrl(url);
                 webview.setId(5);
+                webview.setInitialScale(0);
                 webview.setLayoutParams(wvParams);
+                webview.requestFocus();
+                webview.requestFocusFromTouch();
+
 
                 toolbar.addView(back);
                 toolbar.addView(forward);
@@ -363,7 +380,7 @@ public ChildBrowserClient(PhonegapActivity mContext, EditText mEditText) {
         public void onPageStarted(WebView view, String url,  Bitmap favicon) {
             super.onPageStarted(view, url, favicon);            
             String newloc;
-            if (url.startsWith("http")) {
+            if (url.startsWith("http:")) {
                 newloc = url;
             } else {
                 newloc = "http://" + url;

Android/ChildBrowser/www/childbrowser.js

@@ -27,7 +27,7 @@ ChildBrowser.prototype.showWebPage = function(url, options) {
         var options = new Object();
         options.showLocationBar = true;
     }
-    PhoneGap.exec(this._onEvent, null, "ChildBrowser", "showWebPage", [url, options]);
+    PhoneGap.exec(this._onEvent, this._onError, "ChildBrowser", "showWebPage", [url, options]);
 };
 
 /**
@@ -45,25 +45,35 @@ ChildBrowser.prototype.close = function() {
  * @param usePhoneGap   Load url in PhoneGap webview [optional]
  */
 ChildBrowser.prototype.openExternal = function(url, usePhoneGap) {
-    PhoneGap.exec(null, null, "ChildBrowser", "openExternal", [url, usePhoneGap]);
+    if (usePhoneGap === true) {
+        navigator.app.loadUrl(url);
+    }
+    else {
+        PhoneGap.exec(null, null, "ChildBrowser", "openExternal", [url, usePhoneGap]);
+    }
 };
 
 /**
- * Method called when the child browser is closed.
+ * Method called when the child browser has an event.
  */
 ChildBrowser.prototype._onEvent = function(data) {
-    console.log("In _onEvent");
-    console.log("data type = " + data.type);
     if (data.type == ChildBrowser.CLOSE_EVENT && typeof window.plugins.childBrowser.onClose === "function") {
-        console.log("Calling onClose");
         window.plugins.childBrowser.onClose();
     }
     if (data.type == ChildBrowser.LOCATION_CHANGED_EVENT && typeof window.plugins.childBrowser.onLocationChange === "function") {
-        console.log("Calling onLocChange");
         window.plugins.childBrowser.onLocationChange(data.location);
     }
 };
 
+/**
+ * Method called when the child browser has an error.
+ */
+ChildBrowser.prototype._onError = function(data) {
+    if (typeof window.plugins.childBrowser.onError === "function") {
+        window.plugins.childBrowser.onError(data);
+    }
+};
+
 /**
  * Maintain API consistency with iOS
  */

Android/DateTimePicker/DatePickerPlugin.java

@@ -0,0 +1,161 @@
+/**
+ * 
+ */
+package com.phonegap.plugins;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.app.DatePickerDialog;
+import android.app.DatePickerDialog.OnDateSetListener;
+import android.app.TimePickerDialog;
+import android.app.TimePickerDialog.OnTimeSetListener;
+import android.util.Log;
+import android.widget.DatePicker;
+import android.widget.TimePicker;
+
+import com.phonegap.api.PhonegapActivity;
+import com.phonegap.api.Plugin;
+import com.phonegap.api.PluginResult;
+
+/**
+ * @author ng4e
+ * @author Daniel van 't Oever
+ * 
+ *         Rewrote plugin so it it similar to the iOS datepicker plugin and it
+ *         accepts prefilled dates and time
+ */
+public class DatePickerPlugin extends Plugin {
+
+	private static final String ACTION_DATE = "date";
+	private static final String ACTION_TIME = "time";
+	private final String pluginName = "DatePickerPlugin";
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see com.phonegap.api.Plugin#execute(java.lang.String,
+	 * org.json.JSONArray, java.lang.String)
+	 */
+	@Override
+	public PluginResult execute(final String action, final JSONArray data, final String callBackId) {
+		Log.d(pluginName, "DatePicker called with options: " + data);
+		PluginResult result = null;
+
+		this.show(data, callBackId);
+		result = new PluginResult(PluginResult.Status.NO_RESULT);
+		result.setKeepCallback(true);
+
+		return result;
+	}
+
+	public synchronized void show(final JSONArray data, final String callBackId) {
+		final DatePickerPlugin datePickerPlugin = this;
+		final PhonegapActivity currentCtx = ctx;
+		final Calendar c = Calendar.getInstance();
+		final Runnable runnable;
+
+		String action = "";
+
+		// By default initalize these fields to 'now'
+		Date startTime = new Date();
+		try {
+			JSONObject obj = data.getJSONObject(0);
+			action = obj.getString("mode");
+
+			String optionDate = obj.getString("date");
+
+			if (! optionDate.equals(""))
+			{
+				SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+				try {
+					startTime = (Date) format.parse(optionDate);
+				} catch (Exception e) {
+					startTime = new Date();
+				}
+			}
+
+		} catch (JSONException e) {
+			e.printStackTrace();
+		}
+
+		c.setTime(startTime);
+		if (ACTION_TIME.equalsIgnoreCase(action)) {
+			runnable = new Runnable() {
+				public void run() {
+					final TimeSetListener timeSetListener = new TimeSetListener(datePickerPlugin, callBackId);
+					final TimePickerDialog timeDialog = new TimePickerDialog(currentCtx, timeSetListener, 
+					c.get(Calendar.HOUR_OF_DAY), c.get(Calendar.MINUTE), true);
+					timeDialog.show();
+				}
+			};
+
+		} else if (ACTION_DATE.equalsIgnoreCase(action)) {
+			runnable = new Runnable() {
+				public void run() {
+					final DateSetListener dateSetListener = new DateSetListener(datePickerPlugin, callBackId);
+					final DatePickerDialog dateDialog = new DatePickerDialog(currentCtx, dateSetListener, 
+							c.get(Calendar.YEAR), c.get(Calendar.MONTH) , c.get(Calendar.DAY_OF_MONTH));
+					dateDialog.show();
+				}
+			};
+
+		} else {
+			Log.d(pluginName, "Unknown action. Only 'date' or 'time' are valid actions");
+			return;
+		}
+
+		ctx.runOnUiThread(runnable);
+	}
+
+	private final class DateSetListener implements OnDateSetListener {
+		private final DatePickerPlugin datePickerPlugin;
+		private final String callBackId;
+
+		private DateSetListener(DatePickerPlugin datePickerPlugin, String callBackId) {
+			this.datePickerPlugin = datePickerPlugin;
+			this.callBackId = callBackId;
+		}
+
+		/**
+		 * Return a string containing the date in the format YYYY/MM/DD
+		 */
+		public void onDateSet(final DatePicker view, final int year, final int monthOfYear, final int dayOfMonth) {
+			Calendar c = Calendar.getInstance();
+			c.set(year, monthOfYear, dayOfMonth);
+			c.set(Calendar.HOUR_OF_DAY, 0);
+			c.set(Calendar.MINUTE, 0);
+			datePickerPlugin.success(new PluginResult(PluginResult.Status.OK, c.getTime().toString()), callBackId);
+
+		}
+	}
+
+	private final class TimeSetListener implements OnTimeSetListener {
+		private final DatePickerPlugin datePickerPlugin;
+		private final String callBackId;
+
+		private TimeSetListener(DatePickerPlugin datePickerPlugin, String callBackId) {
+			this.datePickerPlugin = datePickerPlugin;
+			this.callBackId = callBackId;
+		}
+
+		/**
+		 * Return the current date with the time modified as it was set in the
+		 * time picker.
+		 */
+		public void onTimeSet(final TimePicker view, final int hourOfDay, final int minute) {
+			Date date = new Date();
+			Calendar c = Calendar.getInstance();
+			c.setTime(date);
+			c.set(Calendar.HOUR_OF_DAY, hourOfDay);
+			c.set(Calendar.MINUTE, minute);
+
+			datePickerPlugin.success(new PluginResult(PluginResult.Status.OK, c.getTime().toString()), callBackId);
+		}
+	}
+}