Merge branch 'master' of github.com:airbnb/react-native-maps

Author: Tim Matthews

CHANGELOG.md

@@ -1,5 +1,47 @@
 # Change Log
 
+## 0.11.0 (October 16, 2016)
+
+### Breaking Changes
+
+* Update example app for RN 0.35, fix Gmaps bug for 0.35
+  [#695](https://github.com/airbnb/react-native-maps/pull/695)
+  (@spikebrehm)
+* Upgraded to RN 0.35
+  [#680](https://github.com/airbnb/react-native-maps/pull/680)
+  (@eugenehp)
+
+### Patches
+
+* Update installation.md
+  [#696](https://github.com/airbnb/react-native-maps/pull/696)
+  (@securingsincity)
+* [android] Fixes crash during Activity onPause()
+  [#694](https://github.com/airbnb/react-native-maps/pull/694)
+  (@felipecsl)
+* Included MapUrlTile usage in README.md
+  [#687](https://github.com/airbnb/react-native-maps/pull/687)
+  (@ochanje210)
+* [android] Add parameter to disable the moving on marker press
+  [#676](https://github.com/airbnb/react-native-maps/pull/676)
+  (@mlanter)
+* Add support for setting zIndex on markers
+  [#675](https://github.com/airbnb/react-native-maps/pull/675)
+  (@mlanter)
+
+
+## 0.10.1 (October 10, 2016)
+
+### Patches
+
+* [android] fix gradle build setup for explorer, bump to gradle 2.2.0
+  [#666](https://github.com/airbnb/react-native-maps/pull/666)
+  (@gilbox)
+* [android] fix getAirMapName to fix ref-based commands
+  [#665](https://github.com/airbnb/react-native-maps/pull/665)
+  (@gilbox)
+* Hopefully this release will fix issue [#656](https://github.com/airbnb/react-native-maps/issues/656)
+
 ## 0.10.0 (October 5, 2016)
 
 ### Breaking Changes

README.md

@@ -135,6 +135,30 @@ render() {
 </MapView>
 ```
 
+### Using a custom Tile Overlay
+
+```jsx
+<MapView 
+  region={this.state.region}
+  onRegionChange={this.onRegionChange}
+>
+  <MapView.UrlTile
+   /**
+   * The url template of the tile server. The patterns {x} {y} {z} will be replaced at runtime
+   * For example, http://c.tile.openstreetmap.org/{z}/{x}/{y}.png
+   */
+    urlTemplate={this.state.urlTemplate}
+  />
+</MapView>
+```
+
+For Android: add the following line in your AndroidManifest.xml
+```xml
+<uses-permission android:name="android.permission.INTERNET" />
+```
+For IOS: configure [App Transport Security](https://developer.apple.com/library/content/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html#//apple_ref/doc/uid/TP40009251-SW33) in your app
+
+
 
 ## Examples
 

android/build.gradle

@@ -9,14 +9,11 @@ buildscript {
       jcenter()
       maven {
           // For developing the library outside the context of the example app, expect `react-native`
-          // to be installed at `./android/node_modules`.
+          // to be installed at `./node_modules`.
           url "$projectDir/../node_modules/react-native/android"
       }
       maven {
-          // For developing the example app, expect this library to be installed as a node module
-          // inside of the example app. So traverse from `./android/example/node_modules/react-native-maps/android`
-          // to `./android/example/node_modules/react-native/android`.
-          // react-native should be installed since it's a peer dependency
+          // For developing the example app.
           url "$projectDir/../../react-native/android"
       }
   }
@@ -29,16 +26,13 @@ allprojects {
   repositories {
     mavenLocal()
     jcenter()
-      maven {
-          // For developing the library outside the context of the example app, expect `react-native`
-          // to be installed at `./android/node_modules`.
-          url "$projectDir/../node_modules/react-native/android"
-      }
     maven {
-        // For developing the example app, expect this library to be installed as a node module
-        // inside of the example app. So traverse from `./android/example/node_modules/react-native-maps/android`
-        // to `./android/example/node_modules/react-native/android`.
-        // react-native should be installed since it's a peer dependency
+        // For developing the library outside the context of the example app, expect `react-native`
+        // to be installed at `./node_modules`.
+        url "$projectDir/../node_modules/react-native/android"
+    }
+    maven {
+        // For developing the example app.
         url "$projectDir/../../react-native/android"
     }
   }

android/gradle.properties

@@ -1,5 +1,5 @@
 VERSION_CODE=2
-VERSION_NAME=0.10.0
+VERSION_NAME=0.11.0
 GROUP=com.airbnb.android
 
 POM_DESCRIPTION=React Native Map view component for Android

android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java

@@ -72,12 +72,6 @@ protected AirMapView createViewInstance(ThemedReactContext context) {
         return new AirMapView(context, this.appContext.getCurrentActivity(), this, this.googleMapOptions);
     }
 
-    @Override
-    public void onDropViewInstance(AirMapView view) {
-        view.doDestroy();
-        super.onDropViewInstance(view);
-    }
-
     private void emitMapError(String message, String type) {
         WritableMap error = Arguments.createMap();
         error.putString("message", message);
@@ -155,22 +149,27 @@ public void setRotateEnabled(AirMapView view, boolean rotateEnabled) {
         view.map.getUiSettings().setRotateGesturesEnabled(rotateEnabled);
     }
 
-    @ReactProp(name="cacheEnabled", defaultBoolean = false)
+    @ReactProp(name = "cacheEnabled", defaultBoolean = false)
     public void setCacheEnabled(AirMapView view, boolean cacheEnabled) {
         view.setCacheEnabled(cacheEnabled);
     }
 
-    @ReactProp(name="loadingEnabled", defaultBoolean = false)
+    @ReactProp(name = "loadingEnabled", defaultBoolean = false)
     public void setLoadingEnabled(AirMapView view, boolean loadingEnabled) {
         view.enableMapLoading(loadingEnabled);
     }
 
-    @ReactProp(name="loadingBackgroundColor", customType="Color")
+    @ReactProp(name = "moveOnMarkerPress", defaultBoolean = true)
+    public void setMoveOnMarkerPress(AirMapView view, boolean moveOnPress) {
+        view.setMoveOnMarkerPress(moveOnPress);
+    }
+
+    @ReactProp(name = "loadingBackgroundColor", customType = "Color")
     public void setLoadingBackgroundColor(AirMapView view, @Nullable Integer loadingBackgroundColor) {
         view.setLoadingBackgroundColor(loadingBackgroundColor);
     }
 
-    @ReactProp(name="loadingIndicatorColor", customType="Color")
+    @ReactProp(name = "loadingIndicatorColor", customType = "Color")
     public void setLoadingIndicatorColor(AirMapView view, @Nullable Integer loadingIndicatorColor) {
         view.setLoadingIndicatorColor(loadingIndicatorColor);
     }

android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java

@@ -61,6 +61,7 @@ public class AirMapMarker extends AirMapFeature {
     private float rotation = 0.0f;
     private boolean flat = false;
     private boolean draggable = false;
+    private int zIndex = 0;
 
     private float calloutAnchorX;
     private float calloutAnchorY;
@@ -173,6 +174,14 @@ public void setDraggable(boolean draggable) {
         update();
     }
 
+    public void setZIndex(int zIndex) {
+        this.zIndex = zIndex;
+        if (marker != null) {
+            marker.setZIndex(zIndex);
+        }
+        update();
+    }
+
     public void setMarkerHue(float markerHue) {
         this.markerHue = markerHue;
         update();
@@ -288,6 +297,7 @@ private MarkerOptions createMarkerOptions() {
         options.rotation(rotation);
         options.flat(flat);
         options.draggable(draggable);
+        options.zIndex(zIndex);
         options.icon(getIcon());
         return options;
     }

android/src/main/java/com/airbnb/android/react/maps/AirMapMarkerManager.java

@@ -116,6 +116,14 @@ public void setDraggable(AirMapMarker view, boolean draggable) {
         view.setDraggable(draggable);
     }
 
+    @Override
+    @ReactProp(name = "zIndex", defaultFloat = 0.0f)
+    public void setZIndex(AirMapMarker view, float zIndex) {
+      super.setZIndex(view, zIndex);
+      int integerZIndex = Math.round(zIndex);
+      view.setZIndex(integerZIndex);
+    }
+
     @Override
     public void addView(AirMapMarker parent, View child, int index) {
         // if an <Callout /> component is a child, then it is a callout view, NOT part of the

android/src/main/java/com/airbnb/android/react/maps/AirMapView.java

@@ -39,7 +39,6 @@
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.android.gms.maps.model.Marker;
-import com.google.android.gms.maps.model.TileOverlay;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -65,6 +64,7 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     private boolean isMonitoringRegion = false;
     private boolean isTouchDown = false;
     private boolean handlePanDrag = false;
+    private boolean moveOnMarkerPress = true;
     private boolean cacheEnabled = false;
 
     private static final String[] PERMISSIONS = new String[] {
@@ -75,24 +75,24 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     private final ScaleGestureDetector scaleDetector;
     private final GestureDetectorCompat gestureDetector;
     private final AirMapManager manager;
-    private LifecycleEventListener lifecycleListener;
     private boolean paused = false;
     private final ThemedReactContext context;
     private final EventDispatcher eventDispatcher;
 
-    public AirMapView(ThemedReactContext context, Context appContext, AirMapManager manager, GoogleMapOptions googleMapOptions) {
+    public AirMapView(ThemedReactContext reactContext, Context appContext, AirMapManager manager,
+            GoogleMapOptions googleMapOptions) {
         super(appContext, googleMapOptions);
 
         this.manager = manager;
-        this.context = context;
+        this.context = reactContext;
 
         super.onCreate(null);
         super.onResume();
         super.getMapAsync(this);
 
         final AirMapView view = this;
         scaleDetector =
-                new ScaleGestureDetector(context, new ScaleGestureDetector.SimpleOnScaleGestureListener() {
+                new ScaleGestureDetector(reactContext, new ScaleGestureDetector.SimpleOnScaleGestureListener() {
                     @Override
                     public boolean onScaleBegin(ScaleGestureDetector detector) {
                         view.startMonitoringRegion();
@@ -101,7 +101,7 @@ public boolean onScaleBegin(ScaleGestureDetector detector) {
         });
 
         gestureDetector =
-                new GestureDetectorCompat(context, new GestureDetector.SimpleOnGestureListener() {
+                new GestureDetectorCompat(reactContext, new GestureDetector.SimpleOnGestureListener() {
                     @Override
                     public boolean onDoubleTap(MotionEvent e) {
                         view.startMonitoringRegion();
@@ -122,13 +122,13 @@ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
         this.addOnLayoutChangeListener(new OnLayoutChangeListener() {
             @Override public void onLayoutChange(View v, int left, int top, int right, int bottom,
                 int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                if (!AirMapView.this.paused) {
+                if (!paused) {
                     AirMapView.this.cacheView();
                 }
             }
         });
 
-        eventDispatcher = context.getNativeModule(UIManagerModule.class).getEventDispatcher();
+        eventDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
     }
 
     @Override
@@ -154,7 +154,14 @@ public boolean onMarkerClick(Marker marker) {
                 event.putString("action", "marker-press");
                 manager.pushEvent(markerMap.get(marker), "onPress", event);
 
-                return false; // returning false opens the callout window, if possible
+                // Return false to open the callout info window and center on the marker
+                // https://developers.google.com/android/reference/com/google/android/gms/maps/GoogleMap.OnMarkerClickListener
+                if (view.moveOnMarkerPress) {
+                  return false;
+                } else {
+                  marker.showInfoWindow();
+                  return true;
+                }
             }
         });
 
@@ -222,36 +229,32 @@ public void onCameraChange(CameraPosition position) {
         // updating location constantly, killing the battery, even though some other location-mgmt
         // module may
         // desire to shut-down location-services.
-        lifecycleListener = new LifecycleEventListener() {
-            @Override
-            public void onHostResume() {
-                if (hasPermissions()) {
-                    //noinspection MissingPermission
-                    map.setMyLocationEnabled(showUserLocation);
-                }
-                synchronized (AirMapView.this) {
-                    AirMapView.this.onResume();
-                    paused = false;
-                }
-            }
+      LifecycleEventListener lifecycleListener = new LifecycleEventListener() {
+        @Override
+        public void onHostResume() {
+          if (hasPermissions()) {
+            //noinspection MissingPermission
+            map.setMyLocationEnabled(showUserLocation);
+          }
+          synchronized (AirMapView.this) {
+            AirMapView.this.onResume();
+            paused = false;
+          }
+        }
 
-            @Override
-            public void onHostPause() {
-                if (hasPermissions()) {
-                    //noinspection MissingPermission
-                    map.setMyLocationEnabled(false);
-                }
-                synchronized (AirMapView.this) {
-                    AirMapView.this.onPause();
-                    paused = true;
-                }
-            }
+        @Override
+        public void onHostPause() {
+          if (hasPermissions()) {
+            //noinspection MissingPermission
+            map.setMyLocationEnabled(false);
+          }
+          paused = true;
+        }
 
-            @Override
-            public void onHostDestroy() {
-                AirMapView.this.doDestroy();
-            }
-        };
+        @Override
+        public void onHostDestroy() {
+        }
+      };
 
         context.addLifecycleEventListener(lifecycleListener);
     }
@@ -261,20 +264,6 @@ private boolean hasPermissions() {
                 checkSelfPermission(getContext(), PERMISSIONS[1]) == PackageManager.PERMISSION_GRANTED;
     }
 
-    /*
-    onDestroy is final method so I can't override it.
-     */
-    public synchronized void doDestroy() {
-        if (lifecycleListener != null) {
-            context.removeLifecycleEventListener(lifecycleListener);
-            lifecycleListener = null;
-        }
-        if (!paused) {
-            onPause();
-        }
-        onDestroy();
-    }
-
     public void setRegion(ReadableMap region) {
         if (region == null) return;
 
@@ -330,6 +319,10 @@ public void enableMapLoading(boolean loadingEnabled) {
         }
     }
 
+    public void setMoveOnMarkerPress(boolean moveOnPress) {
+        this.moveOnMarkerPress = moveOnPress;
+    }
+
     public void setLoadingBackgroundColor(Integer loadingBackgroundColor) {
         this.loadingBackgroundColor = loadingBackgroundColor;