Fix marker type in platform implementation

Author: aednlaxer

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

@@ -632,6 +632,7 @@ MapConfiguration _configurationFromMapWidget(GoogleMap map) {
     indoorViewEnabled: map.indoorViewEnabled,
     trafficEnabled: map.trafficEnabled,
     buildingsEnabled: map.buildingsEnabled,
+    markerType: map.markerType,
     mapId: map.mapId,
     // A null style in the widget means no style, which is expressed as '' in
     // the configuration to distinguish from no change (null).

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

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

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

@@ -577,6 +577,7 @@ MapConfiguration _configurationFromMapWidget(ExampleGoogleMap map) {
     indoorViewEnabled: map.indoorViewEnabled,
     trafficEnabled: map.trafficEnabled,
     buildingsEnabled: map.buildingsEnabled,
+    markerType: map.markerType,
     mapId: map.mapId,
     style: map.style,
   );

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

@@ -613,7 +613,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
     Set<ClusterManager> clusterManagers = const <ClusterManager>{},
     Set<Factory<OneSequenceGestureRecognizer>>? gestureRecognizers,
     Map<String, dynamic> mapOptions = const <String, dynamic>{},
-    MarkerType markerType = MarkerType.marker,
   }) {
     return _buildView(
       creationId,
@@ -646,7 +645,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
     Set<ClusterManager> clusterManagers = const <ClusterManager>{},
     Set<Factory<OneSequenceGestureRecognizer>>? gestureRecognizers,
     Map<String, dynamic> mapOptions = const <String, dynamic>{},
-    MarkerType markerType = MarkerType.marker,
   }) {
     return buildViewWithTextDirection(
       creationId,
@@ -661,7 +659,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
       clusterManagers: clusterManagers,
       gestureRecognizers: gestureRecognizers,
       mapOptions: mapOptions,
-      markerType: markerType,
     );
   }
 

packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/example_google_map.dart

@@ -573,6 +573,7 @@ MapConfiguration _configurationFromMapWidget(ExampleGoogleMap map) {
     indoorViewEnabled: map.indoorViewEnabled,
     trafficEnabled: map.trafficEnabled,
     buildingsEnabled: map.buildingsEnabled,
+    markerType: map.markerType,
     mapId: map.mapId,
     style: map.style,
   );

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController.m

@@ -180,7 +180,7 @@ - (instancetype)initWithMapView:(GMSMapView *_Nonnull)mapView
     NSString *pigeonSuffix = [NSString stringWithFormat:@"%lld", viewId];
     _dartCallbackHandler = [[FGMMapsCallbackApi alloc] initWithBinaryMessenger:registrar.messenger
                                                           messageChannelSuffix:pigeonSuffix];
-    FGMPlatformMarkerType markerType = creationParameters.markerType;
+    FGMPlatformMarkerTypeBox* markerType = creationParameters.mapConfiguration.markerType;
     _mapView.delegate = self;
     _mapView.paddingAdjustmentBehavior = kGMSMapViewPaddingAdjustmentBehaviorNever;
     _registrar = registrar;
@@ -191,7 +191,7 @@ - (instancetype)initWithMapView:(GMSMapView *_Nonnull)mapView
                                                        callbackHandler:_dartCallbackHandler
                                              clusterManagersController:_clusterManagersController
                                                              registrar:registrar
-                                                            markerType:markerType];
+                                                            markerType:markerType.value];
     _polygonsController = [[FLTPolygonsController alloc] initWithMapView:_mapView
                                                          callbackHandler:_dartCallbackHandler
                                                                registrar:registrar];

packages/google_maps_flutter/google_maps_flutter_ios/lib/src/google_maps_flutter_ios.dart

@@ -820,6 +820,45 @@ class GoogleMapsFlutterIOS extends GoogleMapsFlutterPlatform {
                 imagePixelRatio: bytes.imagePixelRatio,
                 width: bytes.width,
                 height: bytes.height));
+      case final PinConfig pinConfig:
+        final int? backgroundColor = pinConfig.backgroundColor?.value;
+        final int? borderColor = pinConfig.borderColor?.value;
+        switch (pinConfig.glyph) {
+          case final CircleGlyph circleGlyph:
+            return PlatformBitmap(
+              bitmap: PlatformBitmapPinConfig(
+                backgroundColor: backgroundColor,
+                borderColor: borderColor,
+                glyphColor: circleGlyph.color.value,
+              ),
+            );
+          case final TextGlyph textGlyph:
+            return PlatformBitmap(
+              bitmap: PlatformBitmapPinConfig(
+                backgroundColor: backgroundColor,
+                borderColor: borderColor,
+                glyphText: textGlyph.text,
+                glyphTextColor: textGlyph.textColor?.value,
+              ),
+            );
+          case final BitmapGlyph bitmapGlyph:
+            return PlatformBitmap(
+              bitmap: PlatformBitmapPinConfig(
+                backgroundColor: backgroundColor,
+                borderColor: borderColor,
+                glyphBitmap: platformBitmapFromBitmapDescriptor(
+                  bitmapGlyph.bitmap,
+                ),
+              ),
+            );
+          default:
+            return PlatformBitmap(
+              bitmap: PlatformBitmapPinConfig(
+                backgroundColor: backgroundColor,
+                borderColor: borderColor,
+              ),
+            );
+        }
       default:
         throw ArgumentError(
             'Unrecognized type of bitmap ${bitmap.runtimeType}', 'bitmap');