draft

remove unnecessary static funcctions

clean up method name and remove unused code

update version

remove all static methods

fix

remove unnecessary imports

Author: Chris Yang

packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md

@@ -1,7 +1,8 @@
-## NEXT
+## 2.1.6
 
 * Fixes iOS native unit tests on M1 devices.
 * Minor fixes for new analysis options.
+* Objective-C code cleanup.
 
 ## 2.1.5
 

packages/google_maps_flutter/google_maps_flutter/ios/Classes/FLTGoogleMapTileOverlayController.h

@@ -24,8 +24,9 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 @interface FLTTileProviderController : GMSTileLayer
-@property(copy, nonatomic, readonly) NSString *tileOverlayId;
-- (instancetype)init:(FlutterMethodChannel *)methodChannel tileOverlayId:(NSString *)tileOverlayId;
+@property(copy, nonatomic, readonly) NSString *tileOverlayIdentifier;
+- (instancetype)init:(FlutterMethodChannel *)methodChannel
+    tileOverlayIdentifier:(NSString *)identifier;
 @end
 
 @interface FLTTileOverlaysController : NSObject
@@ -34,9 +35,9 @@ NS_ASSUME_NONNULL_BEGIN
            registrar:(NSObject<FlutterPluginRegistrar> *)registrar;
 - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd;
 - (void)changeTileOverlays:(NSArray *)tileOverlaysToChange;
-- (void)removeTileOverlayIds:(NSArray *)tileOverlayIdsToRemove;
-- (void)clearTileCache:(NSString *)tileOverlayId;
-- (nullable NSDictionary *)getTileOverlayInfo:(NSString *)tileverlayId;
+- (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers;
+- (void)clearTileCacheWithIdentifier:(NSString *)identifiers;
+- (nullable NSDictionary *)getTileOverlayInfoWithIdentifier:(NSString *)identifier;
 @end
 
 NS_ASSUME_NONNULL_END

packages/google_maps_flutter/google_maps_flutter/ios/Classes/FLTGoogleMapTileOverlayController.m

@@ -5,35 +5,6 @@
 #import "FLTGoogleMapTileOverlayController.h"
 #import "JsonConversions.h"
 
-static void InterpretTileOverlayOptions(NSDictionary *data,
-                                        id<FLTGoogleMapTileOverlayOptionsSink> sink,
-                                        NSObject<FlutterPluginRegistrar> *registrar) {
-  NSNumber *visible = data[@"visible"];
-  if (visible != nil) {
-    [sink setVisible:visible.boolValue];
-  }
-
-  NSNumber *transparency = data[@"transparency"];
-  if (transparency != nil) {
-    [sink setTransparency:transparency.floatValue];
-  }
-
-  NSNumber *zIndex = data[@"zIndex"];
-  if (zIndex != nil) {
-    [sink setZIndex:zIndex.intValue];
-  }
-
-  NSNumber *fadeIn = data[@"fadeIn"];
-  if (fadeIn != nil) {
-    [sink setFadeIn:fadeIn.boolValue];
-  }
-
-  NSNumber *tileSize = data[@"tileSize"];
-  if (tileSize != nil) {
-    [sink setTileSize:tileSize.integerValue];
-  }
-}
-
 @interface FLTGoogleMapTileOverlayController ()
 
 @property(strong, nonatomic) GMSTileLayer *layer;
@@ -46,8 +17,8 @@ @implementation FLTGoogleMapTileOverlayController
 - (instancetype)initWithTileLayer:(GMSTileLayer *)tileLayer mapView:(GMSMapView *)mapView {
   self = [super init];
   if (self) {
-    self.layer = tileLayer;
-    self.mapView = mapView;
+    _layer = tileLayer;
+    _mapView = mapView;
   }
   return self;
 }
@@ -98,17 +69,17 @@ - (void)setTileSize:(NSInteger)tileSize {
 @interface FLTTileProviderController ()
 
 @property(weak, nonatomic) FlutterMethodChannel *methodChannel;
-@property(copy, nonatomic, readwrite) NSString *tileOverlayId;
 
 @end
 
 @implementation FLTTileProviderController
 
-- (instancetype)init:(FlutterMethodChannel *)methodChannel tileOverlayId:(NSString *)tileOverlayId {
+- (instancetype)init:(FlutterMethodChannel *)methodChannel
+    tileOverlayIdentifier:(NSString *)identifier {
   self = [super init];
   if (self) {
-    self.methodChannel = methodChannel;
-    self.tileOverlayId = tileOverlayId;
+    _methodChannel = methodChannel;
+    _tileOverlayIdentifier = identifier;
   }
   return self;
 }
@@ -122,7 +93,7 @@ - (void)requestTileForX:(NSUInteger)x
   [self.methodChannel
       invokeMethod:@"tileOverlay#getTile"
          arguments:@{
-           @"tileOverlayId" : self.tileOverlayId,
+           @"tileOverlayId" : self.tileOverlayIdentifier,
            @"x" : @(x),
            @"y" : @(y),
            @"zoom" : @(zoom)
@@ -156,9 +127,8 @@ - (void)requestTileForX:(NSUInteger)x
 
 @interface FLTTileOverlaysController ()
 
-@property(strong, nonatomic) NSMutableDictionary *tileOverlayIdToController;
+@property(strong, nonatomic) NSMutableDictionary *tileOverlayIdentifierToController;
 @property(weak, nonatomic) FlutterMethodChannel *methodChannel;
-@property(weak, nonatomic) NSObject<FlutterPluginRegistrar> *registrar;
 @property(weak, nonatomic) GMSMapView *mapView;
 
 @end
@@ -172,63 +142,94 @@ - (instancetype)init:(FlutterMethodChannel *)methodChannel
   if (self) {
     self.methodChannel = methodChannel;
     self.mapView = mapView;
-    self.tileOverlayIdToController = [[NSMutableDictionary alloc] init];
-    self.registrar = registrar;
+    self.tileOverlayIdentifierToController = [[NSMutableDictionary alloc] init];
   }
   return self;
 }
 
 - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd {
   for (NSDictionary *tileOverlay in tileOverlaysToAdd) {
-    NSString *tileOverlayId = [FLTTileOverlaysController getTileOverlayId:tileOverlay];
+    NSString *identifier = [FLTTileOverlaysController getTileOverlayIdentifier:tileOverlay];
     FLTTileProviderController *tileProvider =
-        [[FLTTileProviderController alloc] init:self.methodChannel tileOverlayId:tileOverlayId];
+        [[FLTTileProviderController alloc] init:self.methodChannel
+                          tileOverlayIdentifier:identifier];
     FLTGoogleMapTileOverlayController *controller =
         [[FLTGoogleMapTileOverlayController alloc] initWithTileLayer:tileProvider
                                                              mapView:self.mapView];
-    InterpretTileOverlayOptions(tileOverlay, controller, self.registrar);
-    self.tileOverlayIdToController[tileOverlayId] = controller;
+    [FLTTileOverlaysController interpretTileOverlayOptions:tileOverlay sink:controller];
+    self.tileOverlayIdentifierToController[identifier] = controller;
   }
 }
 
 - (void)changeTileOverlays:(NSArray *)tileOverlaysToChange {
   for (NSDictionary *tileOverlay in tileOverlaysToChange) {
-    NSString *tileOverlayId = [FLTTileOverlaysController getTileOverlayId:tileOverlay];
-    FLTGoogleMapTileOverlayController *controller = self.tileOverlayIdToController[tileOverlayId];
+    NSString *identifier = [FLTTileOverlaysController getTileOverlayIdentifier:tileOverlay];
+    FLTGoogleMapTileOverlayController *controller =
+        self.tileOverlayIdentifierToController[identifier];
     if (!controller) {
       continue;
     }
-    InterpretTileOverlayOptions(tileOverlay, controller, self.registrar);
+    [FLTTileOverlaysController interpretTileOverlayOptions:tileOverlay sink:controller];
   }
 }
-- (void)removeTileOverlayIds:(NSArray *)tileOverlayIdsToRemove {
-  for (NSString *tileOverlayId in tileOverlayIdsToRemove) {
-    FLTGoogleMapTileOverlayController *controller = self.tileOverlayIdToController[tileOverlayId];
+- (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers {
+  for (NSString *identifier in identifiers) {
+    FLTGoogleMapTileOverlayController *controller =
+        self.tileOverlayIdentifierToController[identifier];
     if (!controller) {
       continue;
     }
     [controller removeTileOverlay];
-    [self.tileOverlayIdToController removeObjectForKey:tileOverlayId];
+    [self.tileOverlayIdentifierToController removeObjectForKey:identifier];
   }
 }
 
-- (void)clearTileCache:(NSString *)tileOverlayId {
-  FLTGoogleMapTileOverlayController *controller = self.tileOverlayIdToController[tileOverlayId];
+- (void)clearTileCacheWithIdentifier:(NSString *)identifier {
+  FLTGoogleMapTileOverlayController *controller =
+      self.tileOverlayIdentifierToController[identifier];
   if (!controller) {
     return;
   }
   [controller clearTileCache];
 }
 
-- (nullable NSDictionary *)getTileOverlayInfo:(NSString *)tileverlayId {
-  if (self.tileOverlayIdToController[tileverlayId] == nil) {
+- (nullable NSDictionary *)getTileOverlayInfoWithIdentifier:(NSString *)identifier {
+  if (self.tileOverlayIdentifierToController[identifier] == nil) {
     return nil;
   }
-  return [self.tileOverlayIdToController[tileverlayId] getTileOverlayInfo];
+  return [self.tileOverlayIdentifierToController[identifier] getTileOverlayInfo];
 }
 
-+ (NSString *)getTileOverlayId:(NSDictionary *)tileOverlay {
++ (NSString *)getTileOverlayIdentifier:(NSDictionary *)tileOverlay {
   return tileOverlay[@"tileOverlayId"];
 }
 
++ (void)interpretTileOverlayOptions:(NSDictionary *)data
+                               sink:(id<FLTGoogleMapTileOverlayOptionsSink>)sink {
+  NSNumber *visible = data[@"visible"];
+  if (visible != nil) {
+    [sink setVisible:visible.boolValue];
+  }
+
+  NSNumber *transparency = data[@"transparency"];
+  if (transparency != nil) {
+    [sink setTransparency:transparency.floatValue];
+  }
+
+  NSNumber *zIndex = data[@"zIndex"];
+  if (zIndex != nil) {
+    [sink setZIndex:zIndex.intValue];
+  }
+
+  NSNumber *fadeIn = data[@"fadeIn"];
+  if (fadeIn != nil) {
+    [sink setFadeIn:fadeIn.boolValue];
+  }
+
+  NSNumber *tileSize = data[@"tileSize"];
+  if (tileSize != nil) {
+    [sink setTileSize:tileSize.integerValue];
+  }
+}
+
 @end

packages/google_maps_flutter/google_maps_flutter/ios/Classes/FLTGoogleMapsPlugin.h

@@ -10,5 +10,9 @@
 #import "GoogleMapPolygonController.h"
 #import "GoogleMapPolylineController.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface FLTGoogleMapsPlugin : NSObject <FlutterPlugin>
 @end
+
+NS_ASSUME_NONNULL_END

packages/google_maps_flutter/google_maps_flutter/ios/Classes/FLTGoogleMapsPlugin.m

@@ -6,11 +6,7 @@
 
 #pragma mark - GoogleMaps plugin implementation
 
-@implementation FLTGoogleMapsPlugin {
-  NSObject<FlutterPluginRegistrar> *_registrar;
-  FlutterMethodChannel *_channel;
-  NSMutableDictionary *_mapControllers;
-}
+@implementation FLTGoogleMapsPlugin
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   FLTGoogleMapFactory *googleMapFactory = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar];
@@ -20,12 +16,4 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
           FlutterPlatformViewGestureRecognizersBlockingPolicyWaitUntilTouchesEnded];
 }
 
-- (FLTGoogleMapController *)mapFromCall:(FlutterMethodCall *)call error:(FlutterError **)error {
-  id mapId = call.arguments[@"map"];
-  FLTGoogleMapController *controller = _mapControllers[mapId];
-  if (!controller && error) {
-    *error = [FlutterError errorWithCode:@"unknown_map" message:nil details:mapId];
-  }
-  return controller;
-}
 @end

packages/google_maps_flutter/google_maps_flutter/ios/Classes/GoogleMapCircleController.h

@@ -19,10 +19,9 @@
 
 // Defines circle controllable by Flutter.
 @interface FLTGoogleMapCircleController : NSObject <FLTGoogleMapCircleOptionsSink>
-@property(atomic, readonly) NSString *circleId;
 - (instancetype)initCircleWithPosition:(CLLocationCoordinate2D)position
                                 radius:(CLLocationDistance)radius
-                              circleId:(NSString *)circleId
+                              circleId:(NSString *)circleIdentifier
                                mapView:(GMSMapView *)mapView;
 - (void)removeCircle;
 @end
@@ -33,7 +32,7 @@
            registrar:(NSObject<FlutterPluginRegistrar> *)registrar;
 - (void)addCircles:(NSArray *)circlesToAdd;
 - (void)changeCircles:(NSArray *)circlesToChange;
-- (void)removeCircleIds:(NSArray *)circleIdsToRemove;
-- (void)onCircleTap:(NSString *)circleId;
-- (bool)hasCircleWithId:(NSString *)circleId;
+- (void)removeCircleWithIdentifiers:(NSArray *)identifiers;
+- (void)didTapCircleWithIdentifier:(NSString *)identifier;
+- (bool)hasCircleWithIdentifier:(NSString *)identifier;
 @end