Vendor react-native-maps to 1.7.1 (expo#22908)

crummy · Jun 16, 2023 · 27df107 · 27df107
1 parent c414858
commit 27df107
Show file tree

Hide file tree

Showing 44 changed files with 478 additions and 466 deletions.
diff --git a/android/expoview/build.gradle b/android/expoview/build.gradle
@@ -285,7 +285,7 @@ dependencies {
 
   api 'com.google.firebase:firebase-core:21.1.0'
   api 'com.google.firebase:firebase-messaging:22.0.0'
-  api 'com.google.maps.android:android-maps-utils:0.5'
+  api 'com.google.maps.android:android-maps-utils:3.4.0'
   // Remember to update DetachAppTemplate build.gradle if you add any excludes or transitive = false here!
 
   // expo-file-system

diff --git a/.../src/main/java/versioned/host/exp/exponent/modules/api/components/maps/AirMapFeature.java b/.../src/main/java/versioned/host/exp/exponent/modules/api/components/maps/AirMapFeature.java
diff --git a/...view/src/main/java/versioned/host/exp/exponent/modules/api/components/maps/ImageUtil.java b/...view/src/main/java/versioned/host/exp/exponent/modules/api/components/maps/ImageUtil.java
@@ -1,6 +1,5 @@
 package versioned.host.exp.exponent.modules.api.components.maps;
 
-
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.util.Base64;

diff --git a/...es/api/components/maps/AirMapCallout.java → ...dules/api/components/maps/MapCallout.java b/...es/api/components/maps/AirMapCallout.java → ...dules/api/components/maps/MapCallout.java
@@ -4,12 +4,12 @@
 
 import com.facebook.react.views.view.ReactViewGroup;
 
-public class AirMapCallout extends ReactViewGroup {
+public class MapCallout extends ReactViewGroup {
   private boolean tooltip = false;
   public int width;
   public int height;
 
-  public AirMapCallout(Context context) {
+  public MapCallout(Context context) {
     super(context);
   }
 

diff --git a/...components/maps/AirMapCalloutManager.java → ...pi/components/maps/MapCalloutManager.java b/...components/maps/AirMapCalloutManager.java → ...pi/components/maps/MapCalloutManager.java
@@ -10,20 +10,20 @@
 
 import java.util.Map;
 
-public class AirMapCalloutManager extends ViewGroupManager<AirMapCallout> {
+public class MapCalloutManager extends ViewGroupManager<MapCallout> {
 
   @Override
   public String getName() {
     return "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 LayoutShadowNode createShadowNodeInstance() {
   }
 
   @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

diff --git a/...les/api/components/maps/AirMapCircle.java → ...odules/api/components/maps/MapCircle.java b/...les/api/components/maps/AirMapCircle.java → ...odules/api/components/maps/MapCircle.java
@@ -2,12 +2,12 @@
 
 import android.content.Context;
 
-import com.google.android.gms.maps.GoogleMap;
 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;
 
-public class AirMapCircle extends AirMapFeature {
+public class MapCircle extends MapFeature {
 
   private CircleOptions circleOptions;
   private Circle circle;
@@ -19,7 +19,7 @@ public class AirMapCircle extends AirMapFeature {
   private float strokeWidth;
   private float zIndex;
 
-  public AirMapCircle(Context context) {
+  public MapCircle(Context context) {
     super(context);
   }
 
@@ -89,12 +89,14 @@ public Object getFeature() {
   }
 
   @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);
   }
 }
diff --git a/.../components/maps/AirMapCircleManager.java → ...api/components/maps/MapCircleManager.java b/.../components/maps/AirMapCircleManager.java → ...api/components/maps/MapCircleManager.java
@@ -12,10 +12,10 @@
 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();
     metrics = new DisplayMetrics();
     ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
@@ -29,38 +29,38 @@ public String getName() {
   }
 
   @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);
   }
 

diff --git a/...iew/src/main/java/versioned/host/exp/exponent/modules/api/components/maps/MapFeature.java b/...iew/src/main/java/versioned/host/exp/exponent/modules/api/components/maps/MapFeature.java
@@ -0,0 +1,17 @@
+package versioned.host.exp.exponent.modules.api.components.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();
+}
diff --git a/...mponents/maps/AirMapGradientPolyline.java → .../components/maps/MapGradientPolyline.java b/...mponents/maps/AirMapGradientPolyline.java → .../components/maps/MapGradientPolyline.java
@@ -30,7 +30,7 @@
  * 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;
@@ -41,7 +41,7 @@ public class AirMapGradientPolyline extends AirMapFeature {
   private TileOverlay tileOverlay;
   protected final Context context;
 
-  public AirMapGradientPolyline(Context context) {
+  public MapGradientPolyline(Context context) {
     super(context);
     this.context = context;
   }
@@ -321,14 +321,13 @@ public Object getFeature() {
   }
 
   @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();
   }
 

diff --git a/...s/maps/AirMapGradientPolylineManager.java → ...ents/maps/MapGradientPolylineManager.java b/...s/maps/AirMapGradientPolylineManager.java → ...ents/maps/MapGradientPolylineManager.java
@@ -15,10 +15,10 @@
 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();
     metrics = new DisplayMetrics();
     ((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
@@ -32,12 +32,12 @@ public String getName() {
   }
 
   @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);
@@ -48,7 +48,7 @@ public void setCoordinates(AirMapGradientPolyline view, ReadableArray coordinate
   }
 
   @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};
@@ -70,13 +70,13 @@ public void setStrokeColors(AirMapGradientPolyline view, ReadableArray colors) {
   }
 
   @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);
   }

diff --git a/...es/api/components/maps/AirMapHeatmap.java → ...dules/api/components/maps/MapHeatmap.java b/...es/api/components/maps/AirMapHeatmap.java → ...dules/api/components/maps/MapHeatmap.java
@@ -13,7 +13,7 @@
 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);
     }
 
@@ -101,13 +101,12 @@ public Object getFeature() {
     }
 
     @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();
     }
 

diff --git a/...components/maps/AirMapHeatmapManager.java → ...pi/components/maps/MapHeatmapManager.java b/...components/maps/AirMapHeatmapManager.java → ...pi/components/maps/MapHeatmapManager.java
@@ -11,20 +11,20 @@
 import com.google.maps.android.heatmaps.Gradient;
 
 
-public class AirMapHeatmapManager extends ViewGroupManager<AirMapHeatmap> {
+public class MapHeatmapManager extends ViewGroupManager<MapHeatmap> {
 
     @Override
     public String getName() {
         return "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 void setPoints(AirMapHeatmap view, ReadableArray points) {
     }
 
     @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 void setGradient(AirMapHeatmap view, ReadableMap gradient) {
     }
 
     @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);
     }
 }
diff --git a/...pi/components/maps/AirMapLiteManager.java → ...s/api/components/maps/MapLiteManager.java b/...pi/components/maps/AirMapLiteManager.java → ...s/api/components/maps/MapLiteManager.java
@@ -3,7 +3,7 @@
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.google.android.gms.maps.GoogleMapOptions;
 
-public class AirMapLiteManager extends AirMapManager {
+public class MapLiteManager extends MapManager {
 
   private static final String REACT_CLASS = "AIRMapLite";
 
@@ -12,7 +12,7 @@ public String getName() {
     return REACT_CLASS;
   }
 
-  public AirMapLiteManager(ReactApplicationContext context) {
+  public MapLiteManager(ReactApplicationContext context) {
     super(context);
     this.googleMapOptions = new GoogleMapOptions().liteMode(true);
   }