[google_maps_flutter] Semi-convert remaining Android host API calls to Pigeon

packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.11.0
+
+* Converts additional platform calls to Pigeon.
+
 ## 2.10.0
 
 * Converts some platform calls to Pigeon.

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

@@ -4,6 +4,7 @@
 
 package io.flutter.plugins.googlemaps;
 
+import androidx.annotation.NonNull;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.Circle;
 import com.google.android.gms.maps.model.CircleOptions;
@@ -31,31 +32,28 @@ void setGoogleMap(GoogleMap googleMap) {
     this.googleMap = googleMap;
   }
 
-  void addCircles(List<Object> circlesToAdd) {
+  void addJsonCircles(List<Object> circlesToAdd) {
     if (circlesToAdd != null) {
       for (Object circleToAdd : circlesToAdd) {
-        addCircle(circleToAdd);
+        addJsonCircle(circleToAdd);
       }
     }
   }
 
-  void changeCircles(List<Object> circlesToChange) {
-    if (circlesToChange != null) {
-      for (Object circleToChange : circlesToChange) {
-        changeCircle(circleToChange);
-      }
+  void addCircles(@NonNull List<Messages.PlatformCircle> circlesToAdd) {
+    for (Messages.PlatformCircle circleToAdd : circlesToAdd) {
+      addJsonCircle(circleToAdd.getJson());
     }
   }
 
-  void removeCircles(List<Object> circleIdsToRemove) {
-    if (circleIdsToRemove == null) {
-      return;
+  void changeCircles(@NonNull List<Messages.PlatformCircle> circlesToChange) {
+    for (Object circleToChange : circlesToChange) {
+      changeCircle(circleToChange);
     }
-    for (Object rawCircleId : circleIdsToRemove) {
-      if (rawCircleId == null) {
-        continue;
-      }
-      String circleId = (String) rawCircleId;
+  }
+
+  void removeCircles(@NonNull List<String> circleIdsToRemove) {
+    for (String circleId : circleIdsToRemove) {
       final CircleController circleController = circleIdToController.remove(circleId);
       if (circleController != null) {
         circleController.remove();
@@ -77,7 +75,7 @@ boolean onCircleTap(String googleCircleId) {
     return false;
   }
 
-  private void addCircle(Object circle) {
+  private void addJsonCircle(Object circle) {
     if (circle == null) {
       return;
     }

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

@@ -79,18 +79,25 @@ private void initListenersForClusterManager(
   }
 
   /** Adds new ClusterManagers to the controller. */
-  void addClusterManagers(@NonNull List<Object> clusterManagersToAdd) {
+  void addJsonClusterManagers(@NonNull List<Object> clusterManagersToAdd) {
     for (Object clusterToAdd : clusterManagersToAdd) {
-      addClusterManager(clusterToAdd);
+      String clusterManagerId = getClusterManagerId(clusterToAdd);
+      if (clusterManagerId == null) {
+        throw new IllegalArgumentException("clusterManagerId was null");
+      }
+      addClusterManager(clusterManagerId);
     }
   }
 
-  /** Adds new ClusterManager to the controller. */
-  void addClusterManager(Object clusterManagerData) {
-    String clusterManagerId = getClusterManagerId(clusterManagerData);
-    if (clusterManagerId == null) {
-      throw new IllegalArgumentException("clusterManagerId was null");
+  /** Adds new ClusterManagers to the controller. */
+  void addClusterManagers(@NonNull List<Messages.PlatformClusterManager> clusterManagersToAdd) {
+    for (Messages.PlatformClusterManager clusterToAdd : clusterManagersToAdd) {
+      addClusterManager(clusterToAdd.getIdentifier());
     }
+  }
+
+  /** Adds new ClusterManager to the controller. */
+  void addClusterManager(String clusterManagerId) {
     ClusterManager<MarkerBuilder> clusterManager =
         new ClusterManager<MarkerBuilder>(context, googleMap, markerManager);
     ClusterRenderer<MarkerBuilder> clusterRenderer =
@@ -101,12 +108,8 @@ void addClusterManager(Object clusterManagerData) {
   }
 
   /** Removes ClusterManagers by given cluster manager IDs from the controller. */
-  public void removeClusterManagers(@NonNull List<Object> clusterManagerIdsToRemove) {
-    for (Object rawClusterManagerId : clusterManagerIdsToRemove) {
-      if (rawClusterManagerId == null) {
-        continue;
-      }
-      String clusterManagerId = (String) rawClusterManagerId;
+  public void removeClusterManagers(@NonNull List<String> clusterManagerIdsToRemove) {
+    for (String clusterManagerId : clusterManagerIdsToRemove) {
       removeClusterManager(clusterManagerId);
     }
   }