Remove isAdvanced flag from AdvancedMarker on Android

Author: aednlaxer

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java

@@ -12,6 +12,7 @@
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLngBounds;
 import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugins.googlemaps.Messages.PlatformMarkerType;
 import java.util.List;
 
 class GoogleMapBuilder implements GoogleMapOptionsSink {
@@ -37,9 +38,11 @@ GoogleMapController build(
       int id,
       Context context,
       BinaryMessenger binaryMessenger,
-      LifecycleProvider lifecycleProvider) {
+      LifecycleProvider lifecycleProvider,
+      PlatformMarkerType markerType) {
     final GoogleMapController controller =
-        new GoogleMapController(id, context, binaryMessenger, lifecycleProvider, options);
+        new GoogleMapController(id, context, binaryMessenger, lifecycleProvider, options,
+            markerType);
     controller.init();
     controller.setMyLocationEnabled(myLocationEnabled);
     controller.setMyLocationButtonEnabled(myLocationButtonEnabled);

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java

@@ -51,6 +51,7 @@
 import io.flutter.plugins.googlemaps.Messages.MapsApi;
 import io.flutter.plugins.googlemaps.Messages.MapsCallbackApi;
 import io.flutter.plugins.googlemaps.Messages.MapsInspectorApi;
+import io.flutter.plugins.googlemaps.Messages.PlatformMarkerType;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -117,7 +118,8 @@ class GoogleMapController
       Context context,
       BinaryMessenger binaryMessenger,
       LifecycleProvider lifecycleProvider,
-      GoogleMapOptions options) {
+      GoogleMapOptions options,
+      PlatformMarkerType markerType) {
     this.id = id;
     this.context = context;
     this.options = options;
@@ -136,7 +138,8 @@ class GoogleMapController
             clusterManagersController,
             assetManager,
             density,
-            new Convert.BitmapDescriptorFactoryWrapper());
+            new Convert.BitmapDescriptorFactoryWrapper(),
+            markerType);
     this.polygonsController = new PolygonsController(flutterApi, density);
     this.polylinesController = new PolylinesController(flutterApi, assetManager, density);
     this.circlesController = new CirclesController(flutterApi, density);

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapFactory.java

@@ -53,6 +53,6 @@ public PlatformView create(@NonNull Context context, int id, @Nullable Object ar
       builder.setMapId(mapId);
     }
 
-    return builder.build(id, context, binaryMessenger, lifecycleProvider);
+    return builder.build(id, context, binaryMessenger, lifecycleProvider, params.getMarkerType());
   }
 }

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java

@@ -13,6 +13,7 @@
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.google.maps.android.collections.MarkerManager;
 import io.flutter.plugins.googlemaps.Messages.MapsCallbackApi;
+import io.flutter.plugins.googlemaps.Messages.PlatformMarkerType;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
@@ -27,13 +28,15 @@ class MarkersController {
   private final AssetManager assetManager;
   private final float density;
   private final Convert.BitmapDescriptorFactoryWrapper bitmapDescriptorFactoryWrapper;
+  private PlatformMarkerType markerType;
 
   MarkersController(
       @NonNull MapsCallbackApi flutterApi,
       ClusterManagersController clusterManagersController,
       AssetManager assetManager,
       float density,
-      Convert.BitmapDescriptorFactoryWrapper bitmapDescriptorFactoryWrapper) {
+      Convert.BitmapDescriptorFactoryWrapper bitmapDescriptorFactoryWrapper,
+      @NonNull PlatformMarkerType markerType) {
     this.markerIdToMarkerBuilder = new HashMap<>();
     this.markerIdToController = new HashMap<>();
     this.googleMapsMarkerIdToDartMarkerId = new HashMap<>();
@@ -42,6 +45,7 @@ class MarkersController {
     this.assetManager = assetManager;
     this.density = density;
     this.bitmapDescriptorFactoryWrapper = bitmapDescriptorFactoryWrapper;
+    this.markerType = markerType;
   }
 
   void setCollection(MarkerManager.Collection markerCollection) {
@@ -176,8 +180,9 @@ public void onClusterItemRendered(MarkerBuilder markerBuilder, Marker marker) {
   private void addMarker(@NonNull Messages.PlatformMarker marker) {
     String markerId = marker.getMarkerId();
     String clusterManagerId = marker.getClusterManagerId();
+    boolean isAdvancedMarker = markerType == PlatformMarkerType.ADVANCED;
     MarkerBuilder markerBuilder = new MarkerBuilder(markerId, clusterManagerId,
-        marker.getIsAdvanced());
+        isAdvancedMarker);
     Convert.interpretMarkerOptions(
         marker, markerBuilder, assetManager, density, bitmapDescriptorFactoryWrapper);
     addMarker(markerBuilder);

packages/google_maps_flutter/google_maps_flutter_android/lib/src/google_maps_flutter_android.dart

@@ -550,8 +550,8 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
     PlatformViewCreatedCallback onPlatformViewCreated, {
     required PlatformMapConfiguration mapConfiguration,
     required MapWidgetConfiguration widgetConfiguration,
+    required MarkerType markerType,
     MapObjects mapObjects = const MapObjects(),
-    MarkerType markerType = MarkerType.legacy,
   }) {
     assert(
         mapObjects.groundOverlays.every((GroundOverlay groundOverlay) =>
@@ -582,6 +582,7 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
       initialGroundOverlays: mapObjects.groundOverlays
           .map(_platformGroundOverlayFromGroundOverlay)
           .toList(),
+      markerType: _platformMarkerTypeFromMarkerType(markerType),
     );
 
     const String viewType = 'plugins.flutter.dev/google_maps_android';
@@ -638,7 +639,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
     required MapWidgetConfiguration widgetConfiguration,
     MapConfiguration mapConfiguration = const MapConfiguration(),
     MapObjects mapObjects = const MapObjects(),
-    MarkerType markerType = MarkerType.legacy,
   }) {
     return _buildView(
       creationId,
@@ -647,6 +647,7 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
       mapObjects: mapObjects,
       mapConfiguration:
           _platformMapConfigurationFromMapConfiguration(mapConfiguration),
+      markerType: widgetConfiguration.markerType,
     );
   }
 
@@ -808,9 +809,8 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
       zIndex: marker.zIndex,
       markerId: marker.markerId.value,
       clusterManagerId: marker.clusterManagerId?.value,
-      isAdvanced: marker is AdvancedMarker,
       collisionBehavior: marker is AdvancedMarker
-          ? _platformMarkerCollisionBehaviorFromMarkerCollisionBehavior(
+          ? platformMarkerCollisionBehaviorFromMarkerCollisionBehavior(
               marker.collisionBehavior,
             )
           : PlatformMarkerCollisionBehavior.required,
@@ -947,6 +947,13 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
     }
   }
 
+  PlatformMarkerType _platformMarkerTypeFromMarkerType(MarkerType markerType) {
+    return switch (markerType) {
+      MarkerType.legacy => PlatformMarkerType.legacy,
+      MarkerType.advanced => PlatformMarkerType.advanced,
+    };
+  }
+
   /// Convert [MapBitmapScaling] from platform interface to [PlatformMapBitmapScaling] Pigeon.
   @visibleForTesting
   static PlatformMapBitmapScaling platformMapBitmapScalingFromScaling(
@@ -1439,9 +1446,11 @@ PlatformPatternItem platformPatternItemFromPatternItem(PatternItem item) {
   return PlatformPatternItem(type: PlatformPatternItemType.dot);
 }
 
+/// Converts a MarkerCollisionBehavior to Pigeon's
+/// PlatformMarkerCollisionBehavior
 @visibleForTesting
 PlatformMarkerCollisionBehavior
-    _platformMarkerCollisionBehaviorFromMarkerCollisionBehavior(
+    platformMarkerCollisionBehaviorFromMarkerCollisionBehavior(
   MarkerCollisionBehavior markerCollisionBehavior,
 ) {
   switch (markerCollisionBehavior) {

packages/google_maps_flutter/google_maps_flutter_android/pigeons/messages.dart

@@ -202,7 +202,6 @@ class PlatformMarker {
   final String markerId;
   final String? clusterManagerId;
 
-  final bool isAdvanced;
   final PlatformMarkerCollisionBehavior collisionBehavior;
 }
 
@@ -449,6 +448,7 @@ class PlatformMapViewCreationParams {
     required this.initialTileOverlays,
     required this.initialClusterManagers,
     required this.initialGroundOverlays,
+    required this.markerType,
   });
 
   final PlatformCameraPosition initialCameraPosition;
@@ -461,6 +461,12 @@ class PlatformMapViewCreationParams {
   final List<PlatformTileOverlay> initialTileOverlays;
   final List<PlatformClusterManager> initialClusterManagers;
   final List<PlatformGroundOverlay> initialGroundOverlays;
+  final PlatformMarkerType markerType;
+}
+
+enum PlatformMarkerType {
+  legacy,
+  advanced,
 }
 
 /// Pigeon equivalent of MapConfiguration.