Fix after rebase

Author: aednlaxer

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

@@ -119,6 +119,10 @@ private static BitmapDescriptor toBitmapDescriptor(
       Messages.PlatformBitmapBytesMap typedBitmap = (Messages.PlatformBitmapBytesMap) bitmap;
       return getBitmapFromBytes(typedBitmap, density, wrapper);
     }
+    if (bitmap instanceof Messages.PlatformBitmapPinConfig) {
+      Messages.PlatformBitmapPinConfig pinConfigBitmap = (Messages.PlatformBitmapPinConfig) bitmap;
+      return getBitmapFromPinConfig(pinConfigBitmap, assetManager, density, wrapper);
+    }
     throw new IllegalArgumentException("PlatformBitmap did not contain a supported subtype.");
   }
 
@@ -190,7 +194,7 @@ public static BitmapDescriptor getBitmapFromBytes(
   }
 
   public static BitmapDescriptor getBitmapFromPinConfig(
-      Map<?, ?> byteData,
+      Messages.PlatformBitmapPinConfig pinConfigBitmap,
       AssetManager assetManager,
       float density,
       BitmapDescriptorFactoryWrapper bitmapDescriptorFactory
@@ -204,17 +208,19 @@ public static BitmapDescriptor getBitmapFromPinConfig(
       final String glyphBitmapDescriptorKey = "glyphBitmapDescriptor";
 
       final Integer backgroundColor =
-          byteData.containsKey(backgroundColorKey) ? toInt(byteData.get(backgroundColorKey)) : null;
+          pinConfigBitmap.getBackgroundColor() != null ? toInt(pinConfigBitmap.getBackgroundColor())
+              : null;
       final Integer borderColor =
-          byteData.containsKey(borderColorKey) ? toInt(byteData.get(borderColorKey)) : null;
+          pinConfigBitmap.getBorderColor() != null ? toInt(pinConfigBitmap.getBorderColor()) : null;
       final String glyphText =
-          byteData.containsKey(glyphTextKey) ? toString(byteData.get(glyphTextKey)) : null;
+          pinConfigBitmap.getGlyphText() != null ? pinConfigBitmap.getGlyphText() : null;
       final Integer glyphTextColor =
-          byteData.containsKey(glyphTextColorKey) ? toInt(byteData.get(glyphTextColorKey)) : null;
+          pinConfigBitmap.getGlyphTextColor() != null ? toInt(pinConfigBitmap.getGlyphTextColor())
+              : null;
       final Integer glyphColor =
-          byteData.containsKey(glyphColorKey) ? toInt(byteData.get(glyphColorKey)) : null;
-      final BitmapDescriptor glyphBitmapDescriptor = byteData.containsKey(glyphBitmapDescriptorKey)
-          ? toBitmapDescriptor(byteData.get(glyphBitmapDescriptorKey), assetManager, density)
+          pinConfigBitmap.getGlyphColor() != null ? toInt(pinConfigBitmap.getGlyphColor()) : null;
+      final BitmapDescriptor glyphBitmapDescriptor = pinConfigBitmap.getGlyphBitmap() != null
+          ? toBitmapDescriptor(pinConfigBitmap.getGlyphBitmap(), assetManager, density)
           : null;
 
       final PinConfig.Builder pinConfigBuilder = PinConfig.builder();

packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java

@@ -336,13 +336,14 @@ public void GetBitmapFromBytesThrowsErrorIfInvalidImageData() {
 
   @Test
   public void GetBitmapFromPinConfig() {
-    Map<String, Object> assetDetails = new HashMap<>();
-    assetDetails.put("backgroundColor", 0xFFFFFFFF);
-    assetDetails.put("borderColor", 0xFFFFFFFF);
+    Messages.PlatformBitmapPinConfig bitmap = new Messages.PlatformBitmapPinConfig.Builder()
+        .setBackgroundColor(0xFFFFFFL)
+        .setBorderColor(0xFFFFFFL)
+        .build();
 
     when(bitmapDescriptorFactoryWrapper.fromPinConfig(any())).thenReturn(mockBitmapDescriptor);
-    BitmapDescriptor result = Convert.getBitmapFromPinConfig(
-        assetDetails, assetManager, 1f, bitmapDescriptorFactoryWrapper);
+    BitmapDescriptor result = Convert.getBitmapFromPinConfig(bitmap, assetManager, 1f,
+        bitmapDescriptorFactoryWrapper);
     Assert.assertEquals(mockBitmapDescriptor, result);
   }
 

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

@@ -44,9 +44,10 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
   int _markerIdCounter = 1;
   LatLng? markerPosition;
 
-  // ignore: use_setters_to_change_properties
   void _onMapCreated(ExampleGoogleMapController controller) {
-    this.controller = controller;
+    setState(() {
+      this.controller = controller;
+    });
   }
 
   @override

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

@@ -1022,6 +1022,21 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
                 imagePixelRatio: bytes.imagePixelRatio,
                 width: bytes.width,
                 height: bytes.height));
+      case final PinConfig pinConfig:
+        final BitmapDescriptor? glyphBitmapDescriptor =
+            pinConfig.glyph?.bitmapDescriptor;
+        return PlatformBitmap(
+          bitmap: PlatformBitmapPinConfig(
+            backgroundColor: pinConfig.backgroundColor?.value,
+            borderColor: pinConfig.borderColor?.value,
+            glyphColor: pinConfig.glyph?.color?.value,
+            glyphText: pinConfig.glyph?.text,
+            glyphTextColor: pinConfig.glyph?.textColor?.value,
+            glyphBitmap: glyphBitmapDescriptor != null
+                ? platformBitmapFromBitmapDescriptor(glyphBitmapDescriptor)
+                : null,
+          ),
+        );
       default:
         throw ArgumentError(
             'Unrecognized type of bitmap ${bitmap.runtimeType}', 'bitmap');

packages/google_maps_flutter/google_maps_flutter_android/pigeons/messages.dart

@@ -637,6 +637,25 @@ class PlatformBitmapBytesMap {
   final double? height;
 }
 
+class PlatformBitmapPinConfig {
+  PlatformBitmapPinConfig({
+    required this.backgroundColor,
+    required this.borderColor,
+    required this.glyphColor,
+    required this.glyphBitmap,
+    required this.glyphText,
+    required this.glyphTextColor,
+  });
+
+  final int? backgroundColor;
+  final int? borderColor;
+  final int? glyphColor;
+  final PlatformBitmap? glyphBitmap;
+
+  final String? glyphText;
+  final int? glyphTextColor;
+}
+
 /// Interface for non-test interactions with the native SDK.
 ///
 /// For test-only state queries, see [MapsInspectorApi].

packages/google_maps_flutter/google_maps_flutter_android/test/google_maps_flutter_android_test.dart

@@ -521,20 +521,25 @@ void main() {
       expect(toChange.length, 1);
       final List<Object?>? encoded = toChange.first?.encode() as List<Object?>?;
       expect(encoded?[0], object2new.alpha);
-      final PlatformOffset? offset = encoded?[1] as PlatformOffset?;
-      expect(offset?.dx, object2new.anchor.dx);
-      expect(offset?.dy, object2new.anchor.dy);
-      expect(encoded?.getRange(2, 6).toList(), <Object?>[
+      final PlatformDoublePair? offset = encoded?[1] as PlatformDoublePair?;
+      expect(offset?.x, object2new.anchor.dx);
+      expect(offset?.y, object2new.anchor.dy);
+      expect(encoded?.getRange(2, 5).toList(), <Object?>[
         object2new.consumeTapEvents,
         object2new.draggable,
         object2new.flat,
-        object2new.icon.toJson(),
       ]);
+      expect(
+          (encoded?[5] as PlatformBitmap?)?.bitmap.runtimeType,
+          GoogleMapsFlutterAndroid.platformBitmapFromBitmapDescriptor(
+                  object2new.icon)
+              .bitmap
+              .runtimeType);
       final PlatformInfoWindow? window = encoded?[6] as PlatformInfoWindow?;
       expect(window?.title, object2new.infoWindow.title);
       expect(window?.snippet, object2new.infoWindow.snippet);
-      expect(window?.anchor.dx, object2new.infoWindow.anchor.dx);
-      expect(window?.anchor.dy, object2new.infoWindow.anchor.dy);
+      expect(window?.anchor.x, object2new.infoWindow.anchor.dx);
+      expect(window?.anchor.y, object2new.infoWindow.anchor.dy);
       final PlatformLatLng? latLng = encoded?[7] as PlatformLatLng?;
       expect(latLng?.latitude, object2new.position.latitude);
       expect(latLng?.longitude, object2new.position.longitude);
@@ -551,20 +556,25 @@ void main() {
       expect(toAdd.length, 1);
       final List<Object?>? encoded = toAdd.first?.encode() as List<Object?>?;
       expect(encoded?[0], object3.alpha);
-      final PlatformOffset? offset = encoded?[1] as PlatformOffset?;
-      expect(offset?.dx, object3.anchor.dx);
-      expect(offset?.dy, object3.anchor.dy);
-      expect(encoded?.getRange(2, 6).toList(), <Object?>[
+      final PlatformDoublePair? offset = encoded?[1] as PlatformDoublePair?;
+      expect(offset?.x, object3.anchor.dx);
+      expect(offset?.y, object3.anchor.dy);
+      expect(encoded?.getRange(2, 5).toList(), <Object?>[
         object3.consumeTapEvents,
         object3.draggable,
         object3.flat,
-        object3.icon.toJson(),
       ]);
+      expect(
+          (encoded?[5] as PlatformBitmap?)?.bitmap.runtimeType,
+          GoogleMapsFlutterAndroid.platformBitmapFromBitmapDescriptor(
+                  object3.icon)
+              .bitmap
+              .runtimeType);
       final PlatformInfoWindow? window = encoded?[6] as PlatformInfoWindow?;
       expect(window?.title, object3.infoWindow.title);
       expect(window?.snippet, object3.infoWindow.snippet);
-      expect(window?.anchor.dx, object3.infoWindow.anchor.dx);
-      expect(window?.anchor.dy, object3.infoWindow.anchor.dy);
+      expect(window?.anchor.x, object3.infoWindow.anchor.dx);
+      expect(window?.anchor.y, object3.infoWindow.anchor.dy);
       final PlatformLatLng? latLng = encoded?[7] as PlatformLatLng?;
       expect(latLng?.latitude, object3.position.latitude);
       expect(latLng?.longitude, object3.position.longitude);

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

@@ -48,9 +48,10 @@ class PlaceMarkerBodyState extends State<PlaceMarkerBody> {
   // A helper text for Xcode UITests.
   String _onDragXcodeUITestHelperText = '';
 
-  // ignore: use_setters_to_change_properties
   void _onMapCreated(ExampleGoogleMapController controller) {
-    this.controller = controller;
+    setState(() {
+      this.controller = controller;
+    });
   }
 
   @override

packages/google_maps_flutter/google_maps_flutter_ios/pigeons/messages.dart

@@ -415,6 +415,11 @@ class PlatformMapViewCreationParams {
   final PlatformMarkerType markerType;
 }
 
+enum PlatformMarkerType {
+  marker,
+  advancedMarker,
+}
+
 /// Pigeon equivalent of MapConfiguration.
 class PlatformMapConfiguration {
   PlatformMapConfiguration({

packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/bitmap.dart

@@ -1046,7 +1046,7 @@ class PinConfig extends BitmapDescriptor {
           backgroundColor != null || borderColor != null || glyph != null,
           'Cannot create PinConfig with all parameters being null.',
         ),
-        super._(const <Object>[]);
+        super._();
 
   /// The type of the MapBitmap object, used for the JSON serialization.
   static const String type = 'pinConfig';

packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/bitmap_test.dart

@@ -757,6 +757,8 @@ void main() {
         ],
       );
     });
+  });
+
   test('mapBitmapScaling from String', () {
     expect(mapBitmapScalingFromString('auto'), MapBitmapScaling.auto);
     expect(mapBitmapScalingFromString('none'), MapBitmapScaling.none);