feat(android): bump android-maps-utils to 3.4.0 (react-native-maps#4699)

Deepfleet · Apr 21, 2023 · 6b26c23 · 6b26c23
1 parent 1ef2505
commit 6b26c23
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 78 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -47,6 +47,6 @@ dependencies {
   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 'com.google.maps.android:android-maps-utils:3.4.0'
   implementation "androidx.work:work-runtime:2.7.1"
 }
diff --git a/android/src/main/java/com/rnmaps/maps/MapCircle.java b/android/src/main/java/com/rnmaps/maps/MapCircle.java
@@ -2,10 +2,10 @@
 
 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 MapCircle extends MapFeature {
 
@@ -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/android/src/main/java/com/rnmaps/maps/MapFeature.java b/android/src/main/java/com/rnmaps/maps/MapFeature.java
@@ -3,16 +3,15 @@
 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) {
     super(context);
   }
 
-  public abstract void addToMap(GoogleMap map);
+  public abstract void addToMap(Object mapOrCollection);
 
-  public abstract void removeFromMap(GoogleMap map);
+  public abstract void removeFromMap(Object mapOrCollection);
 
   public abstract Object getFeature();
 }
diff --git a/android/src/main/java/com/rnmaps/maps/MapGradientPolyline.java b/android/src/main/java/com/rnmaps/maps/MapGradientPolyline.java
@@ -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/android/src/main/java/com/rnmaps/maps/MapHeatmap.java b/android/src/main/java/com/rnmaps/maps/MapHeatmap.java
@@ -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/android/src/main/java/com/rnmaps/maps/MapLocalTile.java b/android/src/main/java/com/rnmaps/maps/MapLocalTile.java
@@ -140,12 +140,12 @@ public Object getFeature() {
     }
 
     @Override
-    public void addToMap(GoogleMap map) {
-        this.tileOverlay = map.addTileOverlay(getTileOverlayOptions());
+    public void addToMap(Object map) {
+        this.tileOverlay = ((GoogleMap) map).addTileOverlay(getTileOverlayOptions());
     }
 
     @Override
-    public void removeFromMap(GoogleMap map) {
+    public void removeFromMap(Object map) {
         tileOverlay.remove();
     }
 }
diff --git a/android/src/main/java/com/rnmaps/maps/MapMarker.java b/android/src/main/java/com/rnmaps/maps/MapMarker.java
@@ -33,12 +33,12 @@
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import com.facebook.react.bridge.ReadableMap;
-import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
+import com.google.maps.android.collections.MarkerManager;
 
 public class MapMarker extends MapFeature {
 
@@ -427,17 +427,19 @@ public Object getFeature() {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    marker = map.addMarker(getMarkerOptions());
+  public void addToMap(Object collection) {
+    MarkerManager.Collection markerCollection = (MarkerManager.Collection) collection;
+    marker = markerCollection.addMarker(getMarkerOptions());
     updateTracksViewChanges();
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
+  public void removeFromMap(Object collection) {
     if (marker == null) {
       return;
     }
-    marker.remove();
+    MarkerManager.Collection markerCollection = (MarkerManager.Collection) collection;
+    markerCollection.remove(marker);
     marker = null;
     updateTracksViewChanges();
   }

diff --git a/android/src/main/java/com/rnmaps/maps/MapOverlay.java b/android/src/main/java/com/rnmaps/maps/MapOverlay.java
@@ -4,13 +4,13 @@
 import android.graphics.Bitmap;
 
 import com.facebook.react.bridge.ReadableArray;
-import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.GroundOverlay;
 import com.google.android.gms.maps.model.GroundOverlayOptions;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
+import com.google.maps.android.collections.GroundOverlayManager;
 
 public class MapOverlay extends MapFeature implements ImageReadable {
 
@@ -24,7 +24,7 @@ public class MapOverlay extends MapFeature implements ImageReadable {
   private float transparency;
 
   private final ImageReader mImageReader;
-  private GoogleMap map;
+  private GroundOverlayManager.Collection groundOverlayCollection;
 
   public MapOverlay(Context context) {
     super(context);
@@ -107,24 +107,26 @@ public Object getFeature() {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
+  public void addToMap(Object collection) {
+    GroundOverlayManager.Collection groundOverlayCollection = (GroundOverlayManager.Collection) collection;
     GroundOverlayOptions groundOverlayOptions = getGroundOverlayOptions();
     if (groundOverlayOptions != null) {
-      this.groundOverlay = map.addGroundOverlay(groundOverlayOptions);
-      this.groundOverlay.setClickable(this.tappable);
+      groundOverlay = groundOverlayCollection.addGroundOverlay(groundOverlayOptions);
+      groundOverlay.setClickable(this.tappable);
     } else {
-      this.map = map;
+      this.groundOverlayCollection = groundOverlayCollection;
     }
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
-    this.map = null;
-    if (this.groundOverlay != null) {
-      this.groundOverlay.remove();
-      this.groundOverlay = null;
-      this.groundOverlayOptions = null;
+  public void removeFromMap(Object collection) {
+    if (groundOverlay != null) {
+      GroundOverlayManager.Collection groundOverlayCollection = (GroundOverlayManager.Collection) collection;
+      groundOverlayCollection.remove(groundOverlay);
+      groundOverlay = null;
+      groundOverlayOptions = null;
     }
+    groundOverlayCollection = null;
   }
 
   @Override
@@ -152,12 +154,12 @@ private GroundOverlay getGroundOverlay() {
     if (this.groundOverlay != null) {
       return this.groundOverlay;
     }
-    if (this.map == null) {
+    if (this.groundOverlayCollection == null) {
       return null;
     }
     GroundOverlayOptions groundOverlayOptions = getGroundOverlayOptions();
     if (groundOverlayOptions != null) {
-      return this.map.addGroundOverlay(groundOverlayOptions);
+      return this.groundOverlayCollection.addGroundOverlay(groundOverlayOptions);
     }
     return null;
   }

diff --git a/android/src/main/java/com/rnmaps/maps/MapPolygon.java b/android/src/main/java/com/rnmaps/maps/MapPolygon.java
@@ -4,10 +4,10 @@
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.PolygonOptions;
+import com.google.maps.android.collections.PolygonManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -148,13 +148,15 @@ public Object getFeature() {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    polygon = map.addPolygon(getPolygonOptions());
+  public void addToMap(Object collection) {
+    PolygonManager.Collection polygonCollection = (PolygonManager.Collection) collection;
+    polygon = polygonCollection.addPolygon(getPolygonOptions());
     polygon.setClickable(this.tappable);
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
-    polygon.remove();
+  public void removeFromMap(Object collection) {
+    PolygonManager.Collection polygonCollection = (PolygonManager.Collection) collection;
+    polygonCollection.remove(polygon);
   }
 }
diff --git a/android/src/main/java/com/rnmaps/maps/MapPolyline.java b/android/src/main/java/com/rnmaps/maps/MapPolyline.java
@@ -4,7 +4,6 @@
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.Cap;
 import com.google.android.gms.maps.model.Dash;
 import com.google.android.gms.maps.model.Dot;
@@ -14,6 +13,7 @@
 import com.google.android.gms.maps.model.Polyline;
 import com.google.android.gms.maps.model.PolylineOptions;
 import com.google.android.gms.maps.model.RoundCap;
+import com.google.maps.android.collections.PolylineManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -150,13 +150,15 @@ public Object getFeature() {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    polyline = map.addPolyline(getPolylineOptions());
+  public void addToMap(Object collection) {
+    PolylineManager.Collection polylineCollection = (PolylineManager.Collection) collection;
+    polyline = polylineCollection.addPolyline(getPolylineOptions());
     polyline.setClickable(this.tappable);
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
-    polyline.remove();
+  public void removeFromMap(Object collection) {
+    PolylineManager.Collection polylineCollection = (PolylineManager.Collection) collection;
+    polylineCollection.remove(polyline);
   }
 }
diff --git a/android/src/main/java/com/rnmaps/maps/MapUrlTile.java b/android/src/main/java/com/rnmaps/maps/MapUrlTile.java
@@ -196,12 +196,12 @@ public Object getFeature() {
   }
 
   @Override
-  public void addToMap(GoogleMap map) {
-    this.tileOverlay = map.addTileOverlay(getTileOverlayOptions());
+  public void addToMap(Object map) {
+    this.tileOverlay = ((GoogleMap) map).addTileOverlay(getTileOverlayOptions());
   }
 
   @Override
-  public void removeFromMap(GoogleMap map) {
+  public void removeFromMap(Object map) {
     tileOverlay.remove();
   }
 }