react-native-maps 0.31.1 → 1.0.0-alpha.1

package/android/src/main/java/com/rnmaps/maps/MapAirModulePackage.java

@@ -0,0 +1,98 @@
+package com.rnmaps.maps;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.TurboReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.uimanager.ViewManager;
+import com.facebook.fbreact.specs.NativeAirMapsModuleSpec;
+import com.rnmaps.fabric.CalloutManager;
+import com.rnmaps.fabric.CircleManager;
+import com.rnmaps.fabric.MapViewManager;
+import com.rnmaps.fabric.MarkerManager;
+import com.rnmaps.fabric.NativeAirMapsModule;
+import com.rnmaps.fabric.OverlayManager;
+import com.rnmaps.fabric.PolygonManager;
+import com.rnmaps.fabric.PolylineManager;
+import com.rnmaps.fabric.UrlTileManager;
+import com.rnmaps.fabric.WMSTileManager;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MapAirModulePackage extends TurboReactPackage {
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return List.of(new MapViewManager(reactContext),
+                new MarkerManager(reactContext),
+                new CalloutManager(reactContext),
+                new PolygonManager(reactContext),
+                new PolylineManager(reactContext),
+                new CircleManager(reactContext),
+                new OverlayManager(reactContext),
+                new UrlTileManager(reactContext),
+                new WMSTileManager(reactContext));
+    }
+
+
+    @Override
+    public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+        if (OverlayManager.REACT_CLASS.equals(name)) {
+            return new OverlayManager(reactContext);
+        }
+        if (CircleManager.REACT_CLASS.equals(name)) {
+            return new CircleManager(reactContext);
+        }
+        if (PolylineManager.REACT_CLASS.equals(name)) {
+            return new PolylineManager(reactContext);
+        }
+        if (PolygonManager.REACT_CLASS.equals(name)) {
+            return new PolygonManager(reactContext);
+        }
+        if (CalloutManager.REACT_CLASS.equals(name)) {
+            return new CalloutManager(reactContext);
+        }
+        if (MarkerManager.REACT_CLASS.equals(name)) {
+            return new MarkerManager(reactContext);
+        }
+        if (MapViewManager.REACT_CLASS.equals(name)) {
+            return new MapViewManager(reactContext);
+        }
+        if (UrlTileManager.REACT_CLASS.equals(name)) {
+            return new UrlTileManager(reactContext);
+        }
+        if (WMSTileManager.REACT_CLASS.equals(name)) {
+            return new WMSTileManager(reactContext);
+        }
+        if (NativeAirMapsModuleSpec.NAME.equals(name)) {
+            return new NativeAirMapsModule(reactContext);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return new ReactModuleInfoProvider() {
+            @NonNull
+            @Override
+            public Map<String, ReactModuleInfo> getReactModuleInfos() {
+                Map<String, ReactModuleInfo> map = new HashMap<>();
+                map.put(NativeAirMapsModuleSpec.NAME, new ReactModuleInfo(
+                        NativeAirMapsModuleSpec.NAME,       // name
+                        NativeAirMapsModuleSpec.NAME,       // className
+                        false, // canOverrideExistingModule
+                        false, // needsEagerInit
+                        false, // isCXXModule
+                        true   // isTurboModule
+                ));
+                return map;
+            }
+        };
+    }
+}

package/android/src/main/java/com/rnmaps/maps/MapCallout.java

@@ -0,0 +1,41 @@
+package com.rnmaps.maps;
+
+import android.content.Context;
+
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.views.view.ReactViewGroup;
+import com.rnmaps.fabric.event.OnPressEvent;
+
+import java.util.Map;
+
+public class MapCallout extends ReactViewGroup {
+  private boolean tooltip = false;
+  public int width;
+  public int height;
+
+  public MapCallout(Context context) {
+    super(context);
+  }
+
+  public void setTooltip(boolean tooltip) {
+    this.tooltip = tooltip;
+  }
+
+  public boolean getTooltip() {
+    return this.tooltip;
+  }
+
+  @Override
+  protected void onLayout(boolean changed,
+                                   int left, int top, int right, int bottom){
+    width = right - left;
+    height = bottom - top;
+  }
+
+
+  public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+    MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+   builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
+   return builder.build();
+  }
+}

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

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import androidx.annotation.Nullable;
 
@@ -10,7 +10,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 
 import java.util.Map;
 
-public class AirMapCalloutManager extends ViewGroupManager<AirMapCallout> {
+public class MapCalloutManager extends ViewGroupManager<MapCallout> {
 
   @Override
   public String getName() {
@@ -18,12 +18,12 @@ public class AirMapCalloutManager extends ViewGroupManager<AirMapCallout> {
   }
 
   @Override
-  public AirMapCallout createViewInstance(ThemedReactContext context) {
-    return new AirMapCallout(context);
+  public MapCallout createViewInstance(ThemedReactContext context) {
+    return new MapCallout(context);
   }
 
   @ReactProp(name = "tooltip", defaultBoolean = false)
-  public void setTooltip(AirMapCallout view, boolean tooltip) {
+  public void setTooltip(MapCallout view, boolean tooltip) {
     view.setTooltip(tooltip);
   }
 
@@ -42,7 +42,7 @@ public class AirMapCalloutManager extends ViewGroupManager<AirMapCallout> {
   }
 
   @Override
-  public void updateExtraData(AirMapCallout view, Object extraData) {
+  public void updateExtraData(MapCallout 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/{airbnb/android/react/maps/AirMapCircle.java → rnmaps/maps/MapCircle.java}

@@ -1,13 +1,18 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 
-import com.google.android.gms.maps.GoogleMap;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.common.MapBuilder;
 import com.google.android.gms.maps.model.Circle;
 import com.google.android.gms.maps.model.CircleOptions;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.maps.android.collections.CircleManager;
+import com.rnmaps.fabric.event.OnPressEvent;
 
-public class AirMapCircle extends AirMapFeature {
+import java.util.Map;
+
+public class MapCircle extends MapFeature {
 
   private CircleOptions circleOptions;
   private Circle circle;
@@ -18,8 +23,9 @@ public class AirMapCircle extends AirMapFeature {
   private int fillColor;
   private float strokeWidth;
   private float zIndex;
+  private boolean tappable;
 
-  public AirMapCircle(Context context) {
+  public MapCircle(Context context) {
     super(context);
   }
 
@@ -30,6 +36,12 @@ public class AirMapCircle extends AirMapFeature {
     }
   }
 
+  public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+    MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+    builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
+    return builder.build();
+  }
+
   public void setRadius(double radius) {
     this.radius = radius;
     if (circle != null) {
@@ -65,6 +77,13 @@ public class AirMapCircle extends AirMapFeature {
     }
   }
 
+  public void setTappable(boolean tappable) {
+    this.tappable = tappable;
+    if (circle != null) {
+      circle.setClickable(tappable);
+    }
+  }
+
   public CircleOptions getCircleOptions() {
     if (circleOptions == null) {
       circleOptions = createCircleOptions();
@@ -89,12 +108,19 @@ public class AirMapCircle extends AirMapFeature {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    circle = map.addCircle(getCircleOptions());
+  public void addToMap(Object collection) {
+    CircleManager.Collection circleCollection = (CircleManager.Collection) collection;
+    circle = circleCollection.addCircle(getCircleOptions());
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
-    circle.remove();
+  public void removeFromMap(Object collection) {
+    CircleManager.Collection circleCollection = (CircleManager.Collection) collection;
+    circleCollection.remove(circle);
+  }
+
+
+  public void setCenter(ReadableMap center) {
+    setCenter(new LatLng(center.getDouble("latitude"), center.getDouble("longitude")));
   }
 }

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

@@ -1,8 +1,7 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.maps;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
@@ -13,19 +12,15 @@ import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.google.android.gms.maps.model.LatLng;
 
-public class AirMapCircleManager extends ViewGroupManager<AirMapCircle> {
+public class MapCircleManager extends ViewGroupManager<MapCircle> {
   private final DisplayMetrics metrics;
 
-  public AirMapCircleManager(ReactApplicationContext reactContext) {
+  public MapCircleManager(ReactApplicationContext reactContext) {
     super();
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-      metrics = new DisplayMetrics();
-      ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
-          .getDefaultDisplay()
-          .getRealMetrics(metrics);
-    } else {
-      metrics = reactContext.getResources().getDisplayMetrics();
-    }
+    metrics = new DisplayMetrics();
+    ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
+        .getDefaultDisplay()
+        .getRealMetrics(metrics);
   }
 
   @Override
@@ -34,38 +29,38 @@ public class AirMapCircleManager extends ViewGroupManager<AirMapCircle> {
   }
 
   @Override
-  public AirMapCircle createViewInstance(ThemedReactContext context) {
-    return new AirMapCircle(context);
+  public MapCircle createViewInstance(ThemedReactContext context) {
+    return new MapCircle(context);
   }
 
   @ReactProp(name = "center")
-  public void setCenter(AirMapCircle view, ReadableMap center) {
+  public void setCenter(MapCircle view, ReadableMap center) {
     view.setCenter(new LatLng(center.getDouble("latitude"), center.getDouble("longitude")));
   }
 
   @ReactProp(name = "radius", defaultDouble = 0)
-  public void setRadius(AirMapCircle view, double radius) {
+  public void setRadius(MapCircle view, double radius) {
     view.setRadius(radius);
   }
 
   @ReactProp(name = "strokeWidth", defaultFloat = 1f)
-  public void setStrokeWidth(AirMapCircle view, float widthInPoints) {
+  public void setStrokeWidth(MapCircle 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(AirMapCircle view, int color) {
+  public void setFillColor(MapCircle view, int color) {
     view.setFillColor(color);
   }
 
   @ReactProp(name = "strokeColor", defaultInt = Color.RED, customType = "Color")
-  public void setStrokeColor(AirMapCircle view, int color) {
+  public void setStrokeColor(MapCircle view, int color) {
     view.setStrokeColor(color);
   }
 
   @ReactProp(name = "zIndex", defaultFloat = 1.0f)
-  public void setZIndex(AirMapCircle view, float zIndex) {
+  public void setZIndex(MapCircle view, float zIndex) {
     view.setZIndex(zIndex);
   }
 

package/android/src/main/java/com/rnmaps/maps/MapFeature.java

@@ -0,0 +1,17 @@
+package com.rnmaps.maps;
+
+import android.content.Context;
+
+import com.facebook.react.views.view.ReactViewGroup;
+
+public abstract class MapFeature extends ReactViewGroup {
+  public MapFeature(Context context) {
+    super(context);
+  }
+
+  public abstract void addToMap(Object mapOrCollection);
+
+  public abstract void removeFromMap(Object mapOrCollection);
+
+  public abstract Object getFeature();
+}

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

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.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 AirMapGradientPolyline extends AirMapFeature {
+public class MapGradientPolyline extends MapFeature {
   private List<LatLng> points;
   private int[] colors;
   private float zIndex;
@@ -38,12 +38,10 @@ public class AirMapGradientPolyline extends AirMapFeature {
 
   private GoogleMap map;
 
-  private TileOverlayOptions tileOverlayOptions;
   private TileOverlay tileOverlay;
-  private AirMapGradientPolylineProvider tileProvider;
   protected final Context context;
 
-  public AirMapGradientPolyline(Context context) {
+  public MapGradientPolyline(Context context) {
     super(context);
     this.context = context;
   }
@@ -88,8 +86,8 @@ public class AirMapGradientPolyline extends AirMapFeature {
   private TileOverlayOptions createTileOverlayOptions() {
     TileOverlayOptions options = new TileOverlayOptions();
     options.zIndex(zIndex);
-    this.tileProvider = new AirMapGradientPolylineProvider(context, points, colors, width);
-    options.tileProvider(this.tileProvider);
+    AirMapGradientPolylineProvider tileProvider = new AirMapGradientPolylineProvider(context, points, colors, width);
+    options.tileProvider(tileProvider);
     return options;
   }
 
@@ -323,14 +321,13 @@ public class AirMapGradientPolyline extends AirMapFeature {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    Log.d("AirMapGradientPolyline", "ADDTOMAP");
-    this.map = map;
-    this.tileOverlay = map.addTileOverlay(createTileOverlayOptions());
+  public void addToMap(Object map) {
+    this.map = (GoogleMap) map;
+    this.tileOverlay = this.map.addTileOverlay(createTileOverlayOptions());
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
+  public void removeFromMap(Object map) {
     tileOverlay.remove();
   }
 

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

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

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

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.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 AirMapHeatmap extends AirMapFeature {
+public class MapHeatmap extends MapFeature {
 
     private TileOverlayOptions heatmapOptions;
     private TileOverlay heatmap;
@@ -24,7 +24,7 @@ public class AirMapHeatmap extends AirMapFeature {
     private Double opacity;
     private Integer radius;
 
-    public AirMapHeatmap(Context context) {
+    public MapHeatmap(Context context) {
         super(context);
     }
 
@@ -49,7 +49,7 @@ public class AirMapHeatmap extends AirMapFeature {
     }
     
     public void setOpacity(double opacity) {
-        this.opacity = new Double(opacity);
+        this.opacity = opacity;
         if (heatmapTileProvider != null) {
             heatmapTileProvider.setOpacity(opacity);
         }
@@ -59,7 +59,7 @@ public class AirMapHeatmap extends AirMapFeature {
     }
 
     public void setRadius(int radius) {
-        this.radius = new Integer(radius);
+        this.radius = radius;
         if (heatmapTileProvider != null) {
             heatmapTileProvider.setRadius(radius);
         }
@@ -101,13 +101,12 @@ public class AirMapHeatmap extends AirMapFeature {
     }
 
     @Override
-    public void addToMap(GoogleMap map) {
-        Log.d("AirMapHeatmap", "ADD TO MAP");
-        heatmap = map.addTileOverlay(getHeatmapOptions());
+    public void addToMap(Object map) {
+        heatmap = ((GoogleMap) map).addTileOverlay(getHeatmapOptions());
     }
 
     @Override
-    public void removeFromMap(GoogleMap map) {
+    public void removeFromMap(Object map) {
         heatmap.remove();
     }
 

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

@@ -1,4 +1,4 @@
-package com.airbnb.android.react.maps;
+package com.rnmaps.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 AirMapHeatmapManager extends ViewGroupManager<AirMapHeatmap> {
+public class MapHeatmapManager extends ViewGroupManager<MapHeatmap> {
 
     @Override
     public String getName() {
@@ -19,12 +19,12 @@ public class AirMapHeatmapManager extends ViewGroupManager<AirMapHeatmap> {
     }
 
     @Override
-    public AirMapHeatmap createViewInstance(ThemedReactContext context) {
-        return new AirMapHeatmap(context);
+    public MapHeatmap createViewInstance(ThemedReactContext context) {
+        return new MapHeatmap(context);
     }
 
     @ReactProp(name = "points")
-    public void setPoints(AirMapHeatmap view, ReadableArray points) {
+    public void setPoints(MapHeatmap 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 AirMapHeatmapManager extends ViewGroupManager<AirMapHeatmap> {
     }
 
     @ReactProp(name = "gradient")
-    public void setGradient(AirMapHeatmap view, ReadableMap gradient) {
+    public void setGradient(MapHeatmap 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 AirMapHeatmapManager extends ViewGroupManager<AirMapHeatmap> {
     }
 
     @ReactProp(name = "opacity")
-    public void setOpacity(AirMapHeatmap view, double opacity) {
+    public void setOpacity(MapHeatmap view, double opacity) {
         view.setOpacity(opacity);
     }
 
     @ReactProp(name = "radius")
-    public void setRadius(AirMapHeatmap view, int radius) {
+    public void setRadius(MapHeatmap view, int radius) {
         view.setRadius(radius);
     }
 }