react-native-maps 1.4.0-beta.1 → 1.4.0

package/android/build.gradle

@@ -20,11 +20,11 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion safeExtGet('compileSdkVersion', 31)
+  compileSdkVersion safeExtGet('compileSdkVersion', 30)
 
   defaultConfig {
     minSdkVersion safeExtGet('minSdkVersion', 21)
-    targetSdkVersion safeExtGet('targetSdkVersion', 31)
+    targetSdkVersion safeExtGet('targetSdkVersion', 30)
   }
 }
 
@@ -43,10 +43,11 @@ repositories {
 }
 
 dependencies {
+  def work_version = safeExtGet('targetSdkVersion', 27) < 31 ? "2.5.0" : "2.7.1"
   implementation 'com.facebook.react:react-native:+'
   implementation "com.google.android.gms:play-services-base:${safeExtGet('playServicesVersion', '18.1.0')}"
   implementation "com.google.android.gms:play-services-maps:${safeExtGet('playServicesVersion', '18.0.2')}"
   implementation "com.google.android.gms:play-services-location:20.0.0"
   implementation 'com.google.maps.android:android-maps-utils:0.5'
-  implementation "androidx.work:work-runtime:2.7.1"
+  implementation "androidx.work:work-runtime:$work_version"
 }

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.rnmaps.maps" >
+    package="com.airbnb.android.react.maps" >
 </manifest>

package/android/src/main/java/com/{rnmaps/maps/MapCallout.java → airbnb/android/react/maps/AirMapCallout.java}

@@ -1,15 +1,15 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import android.content.Context;
 
 import com.facebook.react.views.view.ReactViewGroup;
 
-public class MapCallout extends ReactViewGroup {
+public class AirMapCallout extends ReactViewGroup {
   private boolean tooltip = false;
   public int width;
   public int height;
 
-  public MapCallout(Context context) {
+  public AirMapCallout(Context context) {
     super(context);
   }
 

package/android/src/main/java/com/{rnmaps/maps/MapCalloutManager.java → airbnb/android/react/maps/AirMapCalloutManager.java}

@@ -1,4 +1,4 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import androidx.annotation.Nullable;
 
@@ -10,7 +10,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 
 import java.util.Map;
 
-public class MapCalloutManager extends ViewGroupManager<MapCallout> {
+public class AirMapCalloutManager extends ViewGroupManager<AirMapCallout> {
 
   @Override
   public String getName() {
@@ -18,12 +18,12 @@ public class MapCalloutManager extends ViewGroupManager<MapCallout> {
   }
 
   @Override
-  public MapCallout createViewInstance(ThemedReactContext context) {
-    return new MapCallout(context);
+  public AirMapCallout createViewInstance(ThemedReactContext context) {
+    return new AirMapCallout(context);
   }
 
   @ReactProp(name = "tooltip", defaultBoolean = false)
-  public void setTooltip(MapCallout view, boolean tooltip) {
+  public void setTooltip(AirMapCallout view, boolean tooltip) {
     view.setTooltip(tooltip);
   }
 
@@ -42,7 +42,7 @@ public class MapCalloutManager extends ViewGroupManager<MapCallout> {
   }
 
   @Override
-  public void updateExtraData(MapCallout view, Object extraData) {
+  public void updateExtraData(AirMapCallout view, Object extraData) {
     // This method is called from the shadow node with the width/height of the rendered
     // marker view.
     //noinspection unchecked

package/android/src/main/java/com/{rnmaps/maps/MapCircle.java → airbnb/android/react/maps/AirMapCircle.java}

@@ -1,4 +1,4 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import android.content.Context;
 
@@ -7,7 +7,7 @@ import com.google.android.gms.maps.model.Circle;
 import com.google.android.gms.maps.model.CircleOptions;
 import com.google.android.gms.maps.model.LatLng;
 
-public class MapCircle extends MapFeature {
+public class AirMapCircle extends AirMapFeature {
 
   private CircleOptions circleOptions;
   private Circle circle;
@@ -19,7 +19,7 @@ public class MapCircle extends MapFeature {
   private float strokeWidth;
   private float zIndex;
 
-  public MapCircle(Context context) {
+  public AirMapCircle(Context context) {
     super(context);
   }
 

package/android/src/main/java/com/{rnmaps/maps/MapCircleManager.java → airbnb/android/react/maps/AirMapCircleManager.java}

@@ -1,4 +1,4 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -12,10 +12,10 @@ import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.google.android.gms.maps.model.LatLng;
 
-public class MapCircleManager extends ViewGroupManager<MapCircle> {
+public class AirMapCircleManager extends ViewGroupManager<AirMapCircle> {
   private final DisplayMetrics metrics;
 
-  public MapCircleManager(ReactApplicationContext reactContext) {
+  public AirMapCircleManager(ReactApplicationContext reactContext) {
     super();
     metrics = new DisplayMetrics();
     ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
@@ -29,38 +29,38 @@ public class MapCircleManager extends ViewGroupManager<MapCircle> {
   }
 
   @Override
-  public MapCircle createViewInstance(ThemedReactContext context) {
-    return new MapCircle(context);
+  public AirMapCircle createViewInstance(ThemedReactContext context) {
+    return new AirMapCircle(context);
   }
 
   @ReactProp(name = "center")
-  public void setCenter(MapCircle view, ReadableMap center) {
+  public void setCenter(AirMapCircle view, ReadableMap center) {
     view.setCenter(new LatLng(center.getDouble("latitude"), center.getDouble("longitude")));
   }
 
   @ReactProp(name = "radius", defaultDouble = 0)
-  public void setRadius(MapCircle view, double radius) {
+  public void setRadius(AirMapCircle view, double radius) {
     view.setRadius(radius);
   }
 
   @ReactProp(name = "strokeWidth", defaultFloat = 1f)
-  public void setStrokeWidth(MapCircle view, float widthInPoints) {
+  public void setStrokeWidth(AirMapCircle view, float widthInPoints) {
     float widthInScreenPx = metrics.density * widthInPoints; // done for parity with iOS
     view.setStrokeWidth(widthInScreenPx);
   }
 
   @ReactProp(name = "fillColor", defaultInt = Color.RED, customType = "Color")
-  public void setFillColor(MapCircle view, int color) {
+  public void setFillColor(AirMapCircle view, int color) {
     view.setFillColor(color);
   }
 
   @ReactProp(name = "strokeColor", defaultInt = Color.RED, customType = "Color")
-  public void setStrokeColor(MapCircle view, int color) {
+  public void setStrokeColor(AirMapCircle view, int color) {
     view.setStrokeColor(color);
   }
 
   @ReactProp(name = "zIndex", defaultFloat = 1.0f)
-  public void setZIndex(MapCircle view, float zIndex) {
+  public void setZIndex(AirMapCircle view, float zIndex) {
     view.setZIndex(zIndex);
   }
 

package/android/src/main/java/com/{rnmaps/maps/MapFeature.java → airbnb/android/react/maps/AirMapFeature.java}

@@ -1,12 +1,12 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import android.content.Context;
 
 import com.facebook.react.views.view.ReactViewGroup;
 import com.google.android.gms.maps.GoogleMap;
 
-public abstract class MapFeature extends ReactViewGroup {
-  public MapFeature(Context context) {
+public abstract class AirMapFeature extends ReactViewGroup {
+  public AirMapFeature(Context context) {
     super(context);
   }
 

package/android/src/main/java/com/{rnmaps/maps/MapGradientPolyline.java → airbnb/android/react/maps/AirMapGradientPolyline.java}

@@ -1,4 +1,4 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -30,7 +30,7 @@ import java.util.List;
  * from Dagothig/ColoredPolylineOverlay
  * (https://gist.github.com/Dagothig/5f9cf0a4a7a42901a7b2)
  */
-public class MapGradientPolyline extends MapFeature {
+public class AirMapGradientPolyline extends AirMapFeature {
   private List<LatLng> points;
   private int[] colors;
   private float zIndex;
@@ -41,7 +41,7 @@ public class MapGradientPolyline extends MapFeature {
   private TileOverlay tileOverlay;
   protected final Context context;
 
-  public MapGradientPolyline(Context context) {
+  public AirMapGradientPolyline(Context context) {
     super(context);
     this.context = context;
   }

package/android/src/main/java/com/{rnmaps/maps/MapGradientPolylineManager.java → airbnb/android/react/maps/AirMapGradientPolylineManager.java}

@@ -1,4 +1,4 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import android.content.Context;
 import android.util.DisplayMetrics;
@@ -15,10 +15,10 @@ import com.google.android.gms.maps.model.LatLng;
 import java.util.List;
 import java.util.ArrayList;
 
-public class MapGradientPolylineManager extends ViewGroupManager<MapGradientPolyline> {
+public class AirMapGradientPolylineManager extends ViewGroupManager<AirMapGradientPolyline> {
   private final DisplayMetrics metrics;
 
-  public MapGradientPolylineManager(ReactApplicationContext reactContext) {
+  public AirMapGradientPolylineManager(ReactApplicationContext reactContext) {
     super();
     metrics = new DisplayMetrics();
     ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
@@ -32,12 +32,12 @@ public class MapGradientPolylineManager extends ViewGroupManager<MapGradientPoly
   }
 
   @Override
-  public MapGradientPolyline createViewInstance(ThemedReactContext context) {
-    return new MapGradientPolyline(context);
+  public AirMapGradientPolyline createViewInstance(ThemedReactContext context) {
+    return new AirMapGradientPolyline(context);
   }
 
   @ReactProp(name = "coordinates")
-  public void setCoordinates(MapGradientPolyline view, ReadableArray coordinates) {
+  public void setCoordinates(AirMapGradientPolyline view, ReadableArray coordinates) {
     List<LatLng> p = new ArrayList<LatLng>();
     for (int i = 0; i < coordinates.size(); i++) {
       ReadableMap point = coordinates.getMap(i);
@@ -48,7 +48,7 @@ public class MapGradientPolylineManager extends ViewGroupManager<MapGradientPoly
   }
 
   @ReactProp(name = "strokeColors", customType = "ColorArray")
-  public void setStrokeColors(MapGradientPolyline view, ReadableArray colors) {
+  public void setStrokeColors(AirMapGradientPolyline view, ReadableArray colors) {
     if (colors != null) {
       if (colors.size() == 0) {
         int[] colorValues = {0,0};
@@ -70,13 +70,13 @@ public class MapGradientPolylineManager extends ViewGroupManager<MapGradientPoly
   }
 
   @ReactProp(name = "zIndex", defaultFloat = 1.0f)
-  public void setZIndex(MapGradientPolyline view, float zIndex) {
+  public void setZIndex(AirMapGradientPolyline view, float zIndex) {
     view.setZIndex(zIndex);
   }
 
 
   @ReactProp(name = "strokeWidth", defaultFloat = 1f)
-  public void setStrokeWidth(MapGradientPolyline view, float widthInPoints) {
+  public void setStrokeWidth(AirMapGradientPolyline view, float widthInPoints) {
     float widthInScreenPx = metrics.density * widthInPoints; // done for parity with iOS
     view.setWidth(widthInScreenPx);
   }

package/android/src/main/java/com/{rnmaps/maps/MapHeatmap.java → airbnb/android/react/maps/AirMapHeatmap.java}

@@ -1,4 +1,4 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import android.content.Context;
 import android.util.Log;
@@ -13,7 +13,7 @@ import com.google.maps.android.heatmaps.Gradient;
 import java.util.Arrays;
 import java.util.List;
 
-public class MapHeatmap extends MapFeature {
+public class AirMapHeatmap extends AirMapFeature {
 
     private TileOverlayOptions heatmapOptions;
     private TileOverlay heatmap;
@@ -24,7 +24,7 @@ public class MapHeatmap extends MapFeature {
     private Double opacity;
     private Integer radius;
 
-    public MapHeatmap(Context context) {
+    public AirMapHeatmap(Context context) {
         super(context);
     }
 

package/android/src/main/java/com/{rnmaps/maps/MapHeatmapManager.java → airbnb/android/react/maps/AirMapHeatmapManager.java}

@@ -1,4 +1,4 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
@@ -11,7 +11,7 @@ import com.google.maps.android.heatmaps.WeightedLatLng;
 import com.google.maps.android.heatmaps.Gradient;
 
 
-public class MapHeatmapManager extends ViewGroupManager<MapHeatmap> {
+public class AirMapHeatmapManager extends ViewGroupManager<AirMapHeatmap> {
 
     @Override
     public String getName() {
@@ -19,12 +19,12 @@ public class MapHeatmapManager extends ViewGroupManager<MapHeatmap> {
     }
 
     @Override
-    public MapHeatmap createViewInstance(ThemedReactContext context) {
-        return new MapHeatmap(context);
+    public AirMapHeatmap createViewInstance(ThemedReactContext context) {
+        return new AirMapHeatmap(context);
     }
 
     @ReactProp(name = "points")
-    public void setPoints(MapHeatmap view, ReadableArray points) {
+    public void setPoints(AirMapHeatmap view, ReadableArray points) {
         WeightedLatLng[] p = new WeightedLatLng[points.size()];
         for (int i = 0; i < points.size(); i++) {
             ReadableMap point = points.getMap(i);
@@ -41,7 +41,7 @@ public class MapHeatmapManager extends ViewGroupManager<MapHeatmap> {
     }
 
     @ReactProp(name = "gradient")
-    public void setGradient(MapHeatmap view, ReadableMap gradient) {
+    public void setGradient(AirMapHeatmap view, ReadableMap gradient) {
         ReadableArray srcColors = gradient.getArray("colors");
         int[] colors = new int[srcColors.size()];
         for (int i = 0; i < srcColors.size(); i++) {
@@ -63,12 +63,12 @@ public class MapHeatmapManager extends ViewGroupManager<MapHeatmap> {
     }
 
     @ReactProp(name = "opacity")
-    public void setOpacity(MapHeatmap view, double opacity) {
+    public void setOpacity(AirMapHeatmap view, double opacity) {
         view.setOpacity(opacity);
     }
 
     @ReactProp(name = "radius")
-    public void setRadius(MapHeatmap view, int radius) {
+    public void setRadius(AirMapHeatmap view, int radius) {
         view.setRadius(radius);
     }
 }

package/android/src/main/java/com/{rnmaps/maps/MapLiteManager.java → airbnb/android/react/maps/AirMapLiteManager.java}

@@ -1,9 +1,9 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.google.android.gms.maps.GoogleMapOptions;
 
-public class MapLiteManager extends MapManager {
+public class AirMapLiteManager extends AirMapManager {
 
   private static final String REACT_CLASS = "AIRMapLite";
 
@@ -12,7 +12,7 @@ public class MapLiteManager extends MapManager {
     return REACT_CLASS;
   }
 
-  public MapLiteManager(ReactApplicationContext context) {
+  public AirMapLiteManager(ReactApplicationContext context) {
     super(context);
     this.googleMapOptions = new GoogleMapOptions().liteMode(true);
   }

package/android/src/main/java/com/{rnmaps/maps/MapLocalTile.java → airbnb/android/react/maps/AirMapLocalTile.java}

@@ -1,4 +1,4 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import android.content.Context;
 
@@ -13,7 +13,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-public class MapLocalTile extends MapFeature {
+public class AirMapLocalTile extends AirMapFeature {
 
     class AIRMapLocalTileProvider implements TileProvider {
         private static final int BUFFER_SIZE = 16 * 1024;
@@ -80,14 +80,14 @@ public class MapLocalTile extends MapFeature {
 
     private TileOverlayOptions tileOverlayOptions;
     private TileOverlay tileOverlay;
-    private MapLocalTile.AIRMapLocalTileProvider tileProvider;
+    private AirMapLocalTile.AIRMapLocalTileProvider tileProvider;
 
     private String pathTemplate;
     private float tileSize;
     private float zIndex;
     private boolean useAssets;
 
-    public MapLocalTile(Context context) {
+    public AirMapLocalTile(Context context) {
         super(context);
     }
 
@@ -129,7 +129,7 @@ public class MapLocalTile extends MapFeature {
     private TileOverlayOptions createTileOverlayOptions() {
         TileOverlayOptions options = new TileOverlayOptions();
         options.zIndex(zIndex);
-        this.tileProvider = new MapLocalTile.AIRMapLocalTileProvider((int)this.tileSize, this.pathTemplate, this.useAssets);
+        this.tileProvider = new AirMapLocalTile.AIRMapLocalTileProvider((int)this.tileSize, this.pathTemplate, this.useAssets);
         options.tileProvider(this.tileProvider);
         return options;
     }

package/android/src/main/java/com/{rnmaps/maps/MapLocalTileManager.java → airbnb/android/react/maps/AirMapLocalTileManager.java}

@@ -1,4 +1,4 @@
-package com.rnmaps.maps;
+package com.airbnb.android.react.maps;
 
 import android.content.Context;
 import android.util.DisplayMetrics;
@@ -12,9 +12,9 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 /**
  * Created by zavadpe on 30/11/2017.
  */
-public class MapLocalTileManager extends ViewGroupManager<MapLocalTile> {
+public class AirMapLocalTileManager extends ViewGroupManager<AirMapLocalTile> {
 
-    public MapLocalTileManager(ReactApplicationContext reactContext) {
+    public AirMapLocalTileManager(ReactApplicationContext reactContext) {
         super();
         DisplayMetrics metrics = new DisplayMetrics();
         ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
@@ -28,27 +28,27 @@ public class MapLocalTileManager extends ViewGroupManager<MapLocalTile> {
     }
 
     @Override
-    public MapLocalTile createViewInstance(ThemedReactContext context) {
-        return new MapLocalTile(context);
+    public AirMapLocalTile createViewInstance(ThemedReactContext context) {
+        return new AirMapLocalTile(context);
     }
 
     @ReactProp(name = "pathTemplate")
-    public void setPathTemplate(MapLocalTile view, String pathTemplate) {
+    public void setPathTemplate(AirMapLocalTile view, String pathTemplate) {
         view.setPathTemplate(pathTemplate);
     }
 
     @ReactProp(name = "tileSize", defaultFloat = 256f)
-    public void setTileSize(MapLocalTile view, float tileSize) {
+    public void setTileSize(AirMapLocalTile view, float tileSize) {
         view.setTileSize(tileSize);
     }
 
     @ReactProp(name = "zIndex", defaultFloat = -1.0f)
-    public void setZIndex(MapLocalTile view, float zIndex) {
+    public void setZIndex(AirMapLocalTile view, float zIndex) {
         view.setZIndex(zIndex);
     }
 
     @ReactProp(name = "useAssets", defaultBoolean = false)
-    public void setUseAssets(MapLocalTile view, boolean useAssets) {
+    public void setUseAssets(AirMapLocalTile view, boolean useAssets) {
         view.setUseAssets(useAssets);
     }
 }