Move MarkerType to MapConfiguration

Author: aednlaxer

packages/google_maps_flutter/google_maps_flutter/example/lib/clustering.dart

@@ -6,7 +6,6 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 import 'page.dart';
 

packages/google_maps_flutter/google_maps_flutter/example/lib/marker_icons.dart

@@ -10,7 +10,6 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 import 'custom_marker_icon.dart';
 import 'page.dart';

packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart

@@ -10,7 +10,6 @@ import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 import 'custom_marker_icon.dart';
 import 'page.dart';

packages/google_maps_flutter/google_maps_flutter/example/lib/readme_sample_advanced_markers.dart

@@ -6,7 +6,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 void main() => runApp(const MyApp());
 

packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart

@@ -9,6 +9,7 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:google_maps_flutter_android/google_maps_flutter_android.dart';
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
@@ -43,6 +44,7 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
         MapType,
         Marker,
         MarkerId,
+        MarkerType,
         MinMaxZoomPreference,
         PatternItem,
         Polygon,

packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart

@@ -324,7 +324,18 @@ class GoogleMap extends StatefulWidget {
   /// for more details.
   final String? mapId;
 
-  /// Indicates whether map should use [AdvancedMarker]s or [Marker]s.
+  /// Indicates whether map uses [AdvancedMarker]s or [Marker]s.
+  ///
+  /// [AdvancedMarker] and [Marker]s classes might not be related to each other
+  /// in the platform implementation. It's important to set the correct
+  /// [MarkerType] so that the platform implementation can handle the markers:
+  /// * If [MarkerType.advancedMarker] is used, all markers must be of type
+  /// [AdvancedMarker].
+  /// * If [MarkerType.marker] is used, markers cannot be of type
+  /// [AdvancedMarker].
+  ///
+  /// While some features work with either type, using the incorrect type
+  /// may result in unexpected behavior.
   final MarkerType markerType;
 
   /// Creates a [State] for this [GoogleMap].
@@ -358,7 +369,6 @@ class _GoogleMapState extends State<GoogleMap> {
             TextDirection.ltr,
         initialCameraPosition: widget.initialCameraPosition,
         gestureRecognizers: widget.gestureRecognizers,
-        markerType: widget.markerType,
       ),
       mapObjects: MapObjects(
         markers: widget.markers,

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

@@ -3832,19 +3832,6 @@ public void setInitialClusterManagers(@NonNull List<PlatformClusterManager> sett
       this.initialClusterManagers = setterArg;
     }
 
-    private @NonNull PlatformMarkerType markerType;
-
-    public @NonNull PlatformMarkerType getMarkerType() {
-      return markerType;
-    }
-
-    public void setMarkerType(@NonNull PlatformMarkerType setterArg) {
-      if (setterArg == null) {
-        throw new IllegalStateException("Nonnull field \"markerType\" is null.");
-      }
-      this.markerType = setterArg;
-    }
-
     /** Constructor is non-public to enforce null safety; use Builder. */
     PlatformMapViewCreationParams() {}
 
@@ -3853,12 +3840,12 @@ public boolean equals(Object o) {
       if (this == o) { return true; }
       if (o == null || getClass() != o.getClass()) { return false; }
       PlatformMapViewCreationParams that = (PlatformMapViewCreationParams) o;
-      return initialCameraPosition.equals(that.initialCameraPosition) && mapConfiguration.equals(that.mapConfiguration) && initialCircles.equals(that.initialCircles) && initialMarkers.equals(that.initialMarkers) && initialPolygons.equals(that.initialPolygons) && initialPolylines.equals(that.initialPolylines) && initialHeatmaps.equals(that.initialHeatmaps) && initialTileOverlays.equals(that.initialTileOverlays) && initialClusterManagers.equals(that.initialClusterManagers) && markerType.equals(that.markerType);
+      return initialCameraPosition.equals(that.initialCameraPosition) && mapConfiguration.equals(that.mapConfiguration) && initialCircles.equals(that.initialCircles) && initialMarkers.equals(that.initialMarkers) && initialPolygons.equals(that.initialPolygons) && initialPolylines.equals(that.initialPolylines) && initialHeatmaps.equals(that.initialHeatmaps) && initialTileOverlays.equals(that.initialTileOverlays) && initialClusterManagers.equals(that.initialClusterManagers);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(initialCameraPosition, mapConfiguration, initialCircles, initialMarkers, initialPolygons, initialPolylines, initialHeatmaps, initialTileOverlays, initialClusterManagers, markerType);
+      return Objects.hash(initialCameraPosition, mapConfiguration, initialCircles, initialMarkers, initialPolygons, initialPolylines, initialHeatmaps, initialTileOverlays, initialClusterManagers);
     }
 
     public static final class Builder {
@@ -3935,14 +3922,6 @@ public static final class Builder {
         return this;
       }
 
-      private @Nullable PlatformMarkerType markerType;
-
-      @CanIgnoreReturnValue
-      public @NonNull Builder setMarkerType(@NonNull PlatformMarkerType setterArg) {
-        this.markerType = setterArg;
-        return this;
-      }
-
       public @NonNull PlatformMapViewCreationParams build() {
         PlatformMapViewCreationParams pigeonReturn = new PlatformMapViewCreationParams();
         pigeonReturn.setInitialCameraPosition(initialCameraPosition);
@@ -3954,14 +3933,13 @@ public static final class Builder {
         pigeonReturn.setInitialHeatmaps(initialHeatmaps);
         pigeonReturn.setInitialTileOverlays(initialTileOverlays);
         pigeonReturn.setInitialClusterManagers(initialClusterManagers);
-        pigeonReturn.setMarkerType(markerType);
         return pigeonReturn;
       }
     }
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<>(10);
+      ArrayList<Object> toListResult = new ArrayList<>(9);
       toListResult.add(initialCameraPosition);
       toListResult.add(mapConfiguration);
       toListResult.add(initialCircles);
@@ -3971,7 +3949,6 @@ ArrayList<Object> toList() {
       toListResult.add(initialHeatmaps);
       toListResult.add(initialTileOverlays);
       toListResult.add(initialClusterManagers);
-      toListResult.add(markerType);
       return toListResult;
     }
 
@@ -3995,8 +3972,6 @@ ArrayList<Object> toList() {
       pigeonResult.setInitialTileOverlays((List<PlatformTileOverlay>) initialTileOverlays);
       Object initialClusterManagers = pigeonVar_list.get(8);
       pigeonResult.setInitialClusterManagers((List<PlatformClusterManager>) initialClusterManagers);
-      Object markerType = pigeonVar_list.get(9);
-      pigeonResult.setMarkerType((PlatformMarkerType) markerType);
       return pigeonResult;
     }
   }
@@ -4187,6 +4162,16 @@ public void setLiteModeEnabled(@Nullable Boolean setterArg) {
       this.liteModeEnabled = setterArg;
     }
 
+    private @Nullable PlatformMarkerType markerType;
+
+    public @Nullable PlatformMarkerType getMarkerType() {
+      return markerType;
+    }
+
+    public void setMarkerType(@Nullable PlatformMarkerType setterArg) {
+      this.markerType = setterArg;
+    }
+
     private @Nullable String mapId;
 
     public @Nullable String getMapId() {
@@ -4212,12 +4197,12 @@ public boolean equals(Object o) {
       if (this == o) { return true; }
       if (o == null || getClass() != o.getClass()) { return false; }
       PlatformMapConfiguration that = (PlatformMapConfiguration) o;
-      return Objects.equals(compassEnabled, that.compassEnabled) && Objects.equals(cameraTargetBounds, that.cameraTargetBounds) && Objects.equals(mapType, that.mapType) && Objects.equals(minMaxZoomPreference, that.minMaxZoomPreference) && Objects.equals(mapToolbarEnabled, that.mapToolbarEnabled) && Objects.equals(rotateGesturesEnabled, that.rotateGesturesEnabled) && Objects.equals(scrollGesturesEnabled, that.scrollGesturesEnabled) && Objects.equals(tiltGesturesEnabled, that.tiltGesturesEnabled) && Objects.equals(trackCameraPosition, that.trackCameraPosition) && Objects.equals(zoomControlsEnabled, that.zoomControlsEnabled) && Objects.equals(zoomGesturesEnabled, that.zoomGesturesEnabled) && Objects.equals(myLocationEnabled, that.myLocationEnabled) && Objects.equals(myLocationButtonEnabled, that.myLocationButtonEnabled) && Objects.equals(padding, that.padding) && Objects.equals(indoorViewEnabled, that.indoorViewEnabled) && Objects.equals(trafficEnabled, that.trafficEnabled) && Objects.equals(buildingsEnabled, that.buildingsEnabled) && Objects.equals(liteModeEnabled, that.liteModeEnabled) && Objects.equals(mapId, that.mapId) && Objects.equals(style, that.style);
+      return Objects.equals(compassEnabled, that.compassEnabled) && Objects.equals(cameraTargetBounds, that.cameraTargetBounds) && Objects.equals(mapType, that.mapType) && Objects.equals(minMaxZoomPreference, that.minMaxZoomPreference) && Objects.equals(mapToolbarEnabled, that.mapToolbarEnabled) && Objects.equals(rotateGesturesEnabled, that.rotateGesturesEnabled) && Objects.equals(scrollGesturesEnabled, that.scrollGesturesEnabled) && Objects.equals(tiltGesturesEnabled, that.tiltGesturesEnabled) && Objects.equals(trackCameraPosition, that.trackCameraPosition) && Objects.equals(zoomControlsEnabled, that.zoomControlsEnabled) && Objects.equals(zoomGesturesEnabled, that.zoomGesturesEnabled) && Objects.equals(myLocationEnabled, that.myLocationEnabled) && Objects.equals(myLocationButtonEnabled, that.myLocationButtonEnabled) && Objects.equals(padding, that.padding) && Objects.equals(indoorViewEnabled, that.indoorViewEnabled) && Objects.equals(trafficEnabled, that.trafficEnabled) && Objects.equals(buildingsEnabled, that.buildingsEnabled) && Objects.equals(liteModeEnabled, that.liteModeEnabled) && Objects.equals(markerType, that.markerType) && Objects.equals(mapId, that.mapId) && Objects.equals(style, that.style);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(compassEnabled, cameraTargetBounds, mapType, minMaxZoomPreference, mapToolbarEnabled, rotateGesturesEnabled, scrollGesturesEnabled, tiltGesturesEnabled, trackCameraPosition, zoomControlsEnabled, zoomGesturesEnabled, myLocationEnabled, myLocationButtonEnabled, padding, indoorViewEnabled, trafficEnabled, buildingsEnabled, liteModeEnabled, mapId, style);
+      return Objects.hash(compassEnabled, cameraTargetBounds, mapType, minMaxZoomPreference, mapToolbarEnabled, rotateGesturesEnabled, scrollGesturesEnabled, tiltGesturesEnabled, trackCameraPosition, zoomControlsEnabled, zoomGesturesEnabled, myLocationEnabled, myLocationButtonEnabled, padding, indoorViewEnabled, trafficEnabled, buildingsEnabled, liteModeEnabled, markerType, mapId, style);
     }
 
     public static final class Builder {
@@ -4366,6 +4351,14 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable PlatformMarkerType markerType;
+
+      @CanIgnoreReturnValue
+      public @NonNull Builder setMarkerType(@Nullable PlatformMarkerType setterArg) {
+        this.markerType = setterArg;
+        return this;
+      }
+
       private @Nullable String mapId;
 
       @CanIgnoreReturnValue
@@ -4402,6 +4395,7 @@ public static final class Builder {
         pigeonReturn.setTrafficEnabled(trafficEnabled);
         pigeonReturn.setBuildingsEnabled(buildingsEnabled);
         pigeonReturn.setLiteModeEnabled(liteModeEnabled);
+        pigeonReturn.setMarkerType(markerType);
         pigeonReturn.setMapId(mapId);
         pigeonReturn.setStyle(style);
         return pigeonReturn;
@@ -4410,7 +4404,7 @@ public static final class Builder {
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<>(20);
+      ArrayList<Object> toListResult = new ArrayList<>(21);
       toListResult.add(compassEnabled);
       toListResult.add(cameraTargetBounds);
       toListResult.add(mapType);
@@ -4429,6 +4423,7 @@ ArrayList<Object> toList() {
       toListResult.add(trafficEnabled);
       toListResult.add(buildingsEnabled);
       toListResult.add(liteModeEnabled);
+      toListResult.add(markerType);
       toListResult.add(mapId);
       toListResult.add(style);
       return toListResult;
@@ -4472,9 +4467,11 @@ ArrayList<Object> toList() {
       pigeonResult.setBuildingsEnabled((Boolean) buildingsEnabled);
       Object liteModeEnabled = pigeonVar_list.get(17);
       pigeonResult.setLiteModeEnabled((Boolean) liteModeEnabled);
-      Object mapId = pigeonVar_list.get(18);
+      Object markerType = pigeonVar_list.get(18);
+      pigeonResult.setMarkerType((PlatformMarkerType) markerType);
+      Object mapId = pigeonVar_list.get(19);
       pigeonResult.setMapId((String) mapId);
-      Object style = pigeonVar_list.get(19);
+      Object style = pigeonVar_list.get(20);
       pigeonResult.setStyle((String) style);
       return pigeonResult;
     }

packages/google_maps_flutter/google_maps_flutter_android/example/lib/example_google_map.dart

@@ -404,7 +404,6 @@ class _ExampleGoogleMapState extends State<ExampleGoogleMap> {
             TextDirection.ltr,
         initialCameraPosition: widget.initialCameraPosition,
         gestureRecognizers: widget.gestureRecognizers,
-        markerType: widget.markerType,
       ),
       mapObjects: MapObjects(
         markers: widget.markers,

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

@@ -509,7 +509,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
     PlatformViewCreatedCallback onPlatformViewCreated, {
     required PlatformMapConfiguration mapConfiguration,
     required MapWidgetConfiguration widgetConfiguration,
-    required MarkerType markerType,
     MapObjects mapObjects = const MapObjects(),
   }) {
     final PlatformMapViewCreationParams creationParams =
@@ -533,7 +532,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
       initialClusterManagers: mapObjects.clusterManagers
           .map(_platformClusterManagerFromClusterManager)
           .toList(),
-      markerType: _platformMarkerTypeFromMarkerType(markerType),
     );
 
     const String viewType = 'plugins.flutter.dev/google_maps_android';
@@ -598,7 +596,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
       mapObjects: mapObjects,
       mapConfiguration:
           _platformMapConfigurationFromMapConfiguration(mapConfiguration),
-      markerType: widgetConfiguration.markerType,
     );
   }
 
@@ -624,7 +621,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
       widgetConfiguration: MapWidgetConfiguration(
         initialCameraPosition: initialCameraPosition,
         textDirection: textDirection,
-        markerType: markerType,
       ),
       mapObjects: MapObjects(
           markers: markers,
@@ -634,7 +630,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
           clusterManagers: clusterManagers,
           tileOverlays: tileOverlays),
       mapConfiguration: _platformMapConfigurationFromOptionsJson(mapOptions),
-      markerType: markerType,
     );
   }
 
@@ -876,13 +871,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
     }
   }
 
-  PlatformMarkerType _platformMarkerTypeFromMarkerType(MarkerType markerType) {
-    return switch (markerType) {
-      MarkerType.marker => PlatformMarkerType.marker,
-      MarkerType.advancedMarker => PlatformMarkerType.advancedMarker,
-    };
-  }
-
   /// Convert [MapBitmapScaling] from platform interface to [PlatformMapBitmapScaling] Pigeon.
   @visibleForTesting
   static PlatformMapBitmapScaling platformMapBitmapScalingFromScaling(
@@ -1222,6 +1210,14 @@ PlatformEdgeInsets? _platformEdgeInsetsFromEdgeInsets(EdgeInsets? insets) {
           right: insets.right);
 }
 
+PlatformMarkerType? _platformMarkerTypeFromMarkerType(MarkerType? markerType) {
+  return switch (markerType) {
+    null => null,
+    MarkerType.marker => PlatformMarkerType.marker,
+    MarkerType.advancedMarker => PlatformMarkerType.advancedMarker,
+  };
+}
+
 PlatformMapConfiguration _platformMapConfigurationFromMapConfiguration(
     MapConfiguration config) {
   return PlatformMapConfiguration(
@@ -1245,6 +1241,7 @@ PlatformMapConfiguration _platformMapConfigurationFromMapConfiguration(
     trafficEnabled: config.trafficEnabled,
     buildingsEnabled: config.buildingsEnabled,
     liteModeEnabled: config.liteModeEnabled,
+    markerType: _platformMarkerTypeFromMarkerType(config.markerType),
     mapId: config.mapId,
     style: config.style,
   );
@@ -1286,6 +1283,7 @@ PlatformMapConfiguration _platformMapConfigurationFromOptionsJson(
     trafficEnabled: options['trafficEnabled'] as bool?,
     buildingsEnabled: options['buildingsEnabled'] as bool?,
     liteModeEnabled: options['liteModeEnabled'] as bool?,
+    markerType: _platformMarkerTypeFromIndex(options['markerType'] as int?),
     mapId: options['mapId'] as String?,
     style: options['style'] as String?,
   );
@@ -1353,6 +1351,14 @@ PlatformZoomRange? _platformZoomRangeFromMinMaxZoomPreferenceJson(
   return PlatformZoomRange(min: minMaxZoom[0], max: minMaxZoom[1]);
 }
 
+PlatformMarkerType _platformMarkerTypeFromIndex(int? index) {
+  return switch (index) {
+    0 => PlatformMarkerType.marker,
+    1 => PlatformMarkerType.advancedMarker,
+    _ => PlatformMarkerType.marker,
+  };
+}
+
 /// Converts platform interface's JointType to Pigeon's PlatformJointType.
 @visibleForTesting
 PlatformJointType platformJointTypeFromJointType(JointType jointType) {