Merge pull request #667 from nightstomp/master

Update 1.3.3

Author: Hirbod

README.md

@@ -22,6 +22,30 @@ New versions will be announced through the official community. Stay tuned!
 
 ###What's up?
 
+v.1.3.3
+
+**Added**
+
+- added zIndex (iOS only, not available for Android)
+ - [659](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/issues/659)
+
+```js
+map.addMarker({
+    zIndex: int
+})
+// and
+marker.setZIndex()
+```
+
+**Fixed**
+- Status-Bar Shift-Down
+ - [657](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/issues/657#issuecomment-146036169)
+- Temp Dom-not-updated fix
+ - [658](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/issues/658)
+- Stabilized iOS loading
+ - [623](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/issues/623)
+
+
 v.1.3.2
 - Updated Google Maps SDK to 1.10.3 - should avoid plist problems on Xcode 7 now
 

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="plugin.google.maps" version="1.3.2" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="plugin.google.maps" version="1.3.3" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>phonegap-googlemaps-plugin</name>
     <js-module name="phonegap-googlemaps-plugin" src="www/googlemaps-cdv-plugin.js">
         <clobbers target="plugin.google.maps" />

src/android/plugin/google/maps/GoogleMaps.java

@@ -120,7 +120,7 @@ private enum TEXT_STYLE_ALIGNMENTS {
   private ViewGroup root;
   private final int CLOSE_LINK_ID = 0x7f999990;  //random
   private final int LICENSE_LINK_ID = 0x7f99991; //random
-  private final String PLUGIN_VERSION = "1.2.5";
+  private final String PLUGIN_VERSION = "1.3.3";
   private MyPluginLayout mPluginLayout = null;
   public boolean isDebug = false;
   private GoogleApiClient googleApiClient = null;
@@ -141,7 +141,7 @@ public void initialize(final CordovaInterface cordova, final CordovaWebView webV
       isRelease = !((appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) == ApplicationInfo.FLAG_DEBUGGABLE);
     } catch (Exception e) {}
 
-    Log.i("CordovaLog", "This app uses phonegap-googlemaps-plugin version " + PLUGIN_VERSION);
+    //Log.i("CordovaLog", "This app uses phonegap-googlemaps-plugin version " + PLUGIN_VERSION);
 
     if (!isRelease) {
       cordova.getThreadPool().execute(new Runnable() {
@@ -192,8 +192,8 @@ public void run() {
             e.printStackTrace();
           }
        */
-        if (Build.VERSION.SDK_INT >= 11){
-          view.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        if (Build.VERSION.SDK_INT >= 21){
+          view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
         }
 
         root.setBackgroundColor(Color.WHITE);

src/android/plugin/google/maps/MyPluginLayout.java

@@ -52,8 +52,8 @@ public MyPluginLayout(View view, Activity activity) {
     this.root = (ViewGroup) view.getParent();
     this.context = view.getContext();
     view.setBackgroundColor(Color.TRANSPARENT);
-    if (VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-      view.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+    if (VERSION.SDK_INT >= 21) {
+      view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
     }
     frontLayer = new FrontLayerLayout(this.context);
 

src/android/plugin/google/maps/PluginMarker.java

@@ -80,6 +80,9 @@ private void createMarker(final JSONArray args, final CallbackContext callbackCo
     if (opts.has("opacity")) {
       markerOptions.alpha((float) opts.getDouble("opacity"));
     }
+    if (opts.has("zIndex")) {
+      // do nothing, API v2 has no zIndex :(
+    }
     Marker marker = map.addMarker(markerOptions);
 
 
@@ -388,6 +391,18 @@ private void setOpacity(final JSONArray args, final CallbackContext callbackCont
     String id = args.getString(1);
     this.setFloat("setAlpha", id, alpha, callbackContext);
   }
+    
+    /**
+     * Set zIndex for the marker (dummy code, not available on Android V2)
+     * @param args
+     * @param callbackContext
+     * @throws JSONException
+     */
+    @SuppressWarnings("unused")
+    private void setZIndex(final JSONArray args, final CallbackContext callbackContext) throws JSONException {
+        // nothing to do :(
+        // it's a shame google...
+    }
 
   /**
    * set position