[google_maps_flutter_ios] Rename new classes to use FGM prefix

jokerttu · jokerttu · commit b78f1189be7a · 2024-08-06T21:34:18.000+03:00
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj
@@ -208,7 +208,7 @@
 			children = (
 				F269303A2BB389BF00BF17C4 /* assets */,
 				52E9C2AF2C5CECD100078060 /* ExtractIconFromDataTests.m */,
-				52E9C2AD2C5CEBD600078060 /* FLTClusterManagersControllerTests.m */,
+				52E9C2AD2C5CEBD600078060 /* FGMClusterManagersControllerTests.m */,
 				6851F3552835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m */,
 				0DD7B6C22B744EEF00E857FD /* FLTTileProviderControllerTests.m */,
 				F7151F12265D7ED70028CB91 /* GoogleMapsTests.m */,
@@ -512,7 +512,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				F7151F13265D7ED70028CB91 /* GoogleMapsTests.m in Sources */,
-				52E9C2AE2C5CEBD600078060 /* FLTClusterManagersControllerTests.m in Sources */,
+				52E9C2AE2C5CEBD600078060 /* FGMClusterManagersControllerTests.m in Sources */,
 				6851F3562835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m in Sources */,
 				982F2A6C27BADE17003C81F4 /* PartiallyMockedMapView.m in Sources */,
 				478116522BEF8F47002F593E /* GoogleMapsPolylinesControllerTests.m in Sources */,
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m
@@ -11,10 +11,10 @@
 #import <OCMock/OCMock.h>
 #import "PartiallyMockedMapView.h"
 
-@interface FLTClusterManagersControllerTests : XCTestCase
+@interface FGMClusterManagersControllerTests : XCTestCase
 @end
 
-@implementation FLTClusterManagersControllerTests
+@implementation FGMClusterManagersControllerTests
 
 - (void)testClustering {
   NSObject<FlutterPluginRegistrar> *registrar = OCMProtocolMock(@protocol(FlutterPluginRegistrar));
@@ -28,8 +28,8 @@ - (void)testClustering {
 
   id handler = OCMClassMock([FGMMapsCallbackApi class]);
 
-  FLTClusterManagersController *clusterManagersController =
-      [[FLTClusterManagersController alloc] initWithMapView:mapView callbackHandler:handler];
+  FGMClusterManagersController *clusterManagersController =
+      [[FGMClusterManagersController alloc] initWithMapView:mapView callbackHandler:handler];
 
   FLTMarkersController *markersController =
       [[FLTMarkersController alloc] initWithMapView:mapView
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMClusterManagersController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMClusterManagersController.h
@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 // Defines cluster managers controller interface which
 // is responsible for adding/removing/returning one or more cluster managers.
-@interface FLTClusterManagersController : NSObject
+@interface FGMClusterManagersController : NSObject
 
 /// Initializes FLTClusterManagersController.
 ///
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMClusterManagersController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMClusterManagersController.m
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FLTClusterManagersController.h"
+#import "FGMClusterManagersController.h"
 
+#import "FGMMarkerUserData.h"
 #import "FLTGoogleMapJSONConversions.h"
-#import "FLTGoogleMarkerUserData.h"
 
-@interface FLTClusterManagersController ()
+@interface FGMClusterManagersController ()
 
 /// A dictionary that cluster managers unique identifiers to GMUClusterManager instances.
 @property(strong, nonatomic)
@@ -21,7 +21,7 @@ @interface FLTClusterManagersController ()
 
 @end
 
-@implementation FLTClusterManagersController
+@implementation FGMClusterManagersController
 - (instancetype)initWithMapView:(GMSMapView *)mapView
                 callbackHandler:(FGMMapsCallbackApi *)callbackHandler {
   self = [super init];
@@ -128,7 +128,7 @@ - (void)didTapCluster:(GMUStaticCluster *)cluster {
 - (nullable NSString *)clusterManagerIdentifierForCluster:(GMUStaticCluster *)cluster {
   if ([cluster.items.firstObject isKindOfClass:[GMSMarker class]]) {
     GMSMarker *firstMarker = (GMSMarker *)cluster.items.firstObject;
-    return FLTGetClusterManagerIdentifierFrom(firstMarker);
+    return FGMGetClusterManagerIdentifierFromMarker(firstMarker);
   }
 
   return nil;
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMMarkerUserData.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMMarkerUserData.h
@@ -7,7 +7,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /// Defines user data object for markers.
-@interface FLTGoogleMarkerUserData : NSObject
+@interface FGMMarkerUserData : NSObject
 
 /// The identifier of the marker.
 @property(nonatomic, copy) NSString *markerIdentifier;
@@ -23,20 +23,20 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param markerIdentifier Identifier of marker.
 /// @param clusterManagerIdentifier Optional identifier of cluster manager.
 /// @param marker GMSMarker object.
-extern void FLTSetIdentifiersToMarkerUserData(NSString *markerIdentifier,
+extern void FGMSetIdentifiersToMarkerUserData(NSString *markerIdentifier,
                                               NSString *_Nullable clusterManagerIdentifier,
                                               GMSMarker *marker);
 
 /// Get MarkerIdentifier from GMSMarker UserData.
 ///
 /// @param marker GMSMarker object.
 /// @return NSString if found; otherwise, nil.
-extern NSString *_Nullable FLTGetMarkerIdentifierFrom(GMSMarker *marker);
+extern NSString *_Nullable FGMGetMarkerIdentifierFromMarker(GMSMarker *marker);
 
 /// Get ClusterManagerIdentifier from GMSMarker UserData.
 ///
 /// @param marker GMSMarker object.
 /// @return NSString if found; otherwise, nil.
-extern NSString *_Nullable FLTGetClusterManagerIdentifierFrom(GMSMarker *marker);
+extern NSString *_Nullable FGMGetClusterManagerIdentifierFromMarker(GMSMarker *marker);
 
 NS_ASSUME_NONNULL_END
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMMarkerUserData.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMMarkerUserData.m
@@ -0,0 +1,34 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "FGMMarkerUserData.h"
+
+@implementation FGMMarkerUserData
+
+@end
+
+void FGMSetIdentifiersToMarkerUserData(NSString *markerIdentifier,
+                                       NSString *_Nullable clusterManagerIdentifier,
+                                       GMSMarker *marker) {
+  FGMMarkerUserData *userData = [[FGMMarkerUserData alloc] init];
+  userData.markerIdentifier = markerIdentifier;
+  userData.clusterManagerIdentifier = clusterManagerIdentifier;
+  marker.userData = userData;
+};
+
+NSString *_Nullable FGMGetMarkerIdentifierFromMarker(GMSMarker *marker) {
+  if ([marker.userData isKindOfClass:[FGMMarkerUserData class]]) {
+    FGMMarkerUserData *userData = (FGMMarkerUserData *)marker.userData;
+    return userData.markerIdentifier;
+  }
+  return nil;
+};
+
+NSString *_Nullable FGMGetClusterManagerIdentifierFromMarker(GMSMarker *marker) {
+  if ([marker.userData isKindOfClass:[FGMMarkerUserData class]]) {
+    FGMMarkerUserData *userData = (FGMMarkerUserData *)marker.userData;
+    return userData.clusterManagerIdentifier;
+  }
+  return nil;
+};
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapJSONConversions.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapJSONConversions.m
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #import "FLTGoogleMapJSONConversions.h"
-#import "FLTGoogleMarkerUserData.h"
+#import "FGMMarkerUserData.h"
 
 /// Returns dict[key], or nil if dict[key] is NSNull.
 id FGMGetValueOrNilFromDict(NSDictionary *dict, NSString *key) {
@@ -46,7 +46,7 @@ CLLocationCoordinate2D FGMGetCoordinateForPigeonLatLng(FGMPlatformLatLng *latLng
   GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] init];
 
   for (GMSMarker *marker in cluster.items) {
-    [markerIDs addObject:FLTGetMarkerIdentifierFrom(marker)];
+    [markerIDs addObject:FGMGetMarkerIdentifierFromMarker(marker)];
     bounds = [bounds includingCoordinate:marker.position];
   }
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapsPlugin.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapsPlugin.h
@@ -4,7 +4,7 @@
 
 #import <Flutter/Flutter.h>
 #import <GoogleMaps/GoogleMaps.h>
-#import "FLTClusterManagersController.h"
+#import "FGMClusterManagersController.h"
 #import "GoogleMapCircleController.h"
 #import "GoogleMapController.h"
 #import "GoogleMapMarkerController.h"
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMarkerUserData.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMarkerUserData.m
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController.h
@@ -4,7 +4,7 @@
 
 #import <Flutter/Flutter.h>
 #import <GoogleMaps/GoogleMaps.h>
-#import "FLTClusterManagersController.h"
+#import "FGMClusterManagersController.h"
 #import "GoogleMapCircleController.h"
 #import "GoogleMapMarkerController.h"
 #import "GoogleMapPolygonController.h"
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController.m
@@ -5,10 +5,11 @@
 @import GoogleMapsUtils;
 
 #import "GoogleMapController.h"
+
+#import "FGMMarkerUserData.h"
 #import "FLTGoogleMapHeatmapController.h"
 #import "FLTGoogleMapJSONConversions.h"
 #import "FLTGoogleMapTileOverlayController.h"
-#import "FLTGoogleMarkerUserData.h"
 #import "messages.g.h"
 
 #pragma mark - Conversion of JSON-like values sent via platform channels. Forward declarations.
@@ -119,7 +120,7 @@ @interface FLTGoogleMapController ()
 @property(nonatomic, strong) FGMMapsCallbackApi *dartCallbackHandler;
 @property(nonatomic, assign) BOOL trackCameraPosition;
 @property(nonatomic, weak) NSObject<FlutterPluginRegistrar> *registrar;
-@property(nonatomic, strong) FLTClusterManagersController *clusterManagersController;
+@property(nonatomic, strong) FGMClusterManagersController *clusterManagersController;
 @property(nonatomic, strong) FLTMarkersController *markersController;
 @property(nonatomic, strong) FLTPolygonsController *polygonsController;
 @property(nonatomic, strong) FLTPolylinesController *polylinesController;
@@ -180,7 +181,7 @@ - (instancetype)initWithMapView:(GMSMapView *_Nonnull)mapView
     _mapView.paddingAdjustmentBehavior = kGMSMapViewPaddingAdjustmentBehaviorNever;
     _registrar = registrar;
     _clusterManagersController =
-        [[FLTClusterManagersController alloc] initWithMapView:_mapView
+        [[FGMClusterManagersController alloc] initWithMapView:_mapView
                                               callbackHandler:_dartCallbackHandler];
     _markersController = [[FLTMarkersController alloc] initWithMapView:_mapView
                                                        callbackHandler:_dartCallbackHandler
@@ -408,27 +409,30 @@ - (BOOL)mapView:(GMSMapView *)mapView didTapMarker:(GMSMarker *)marker {
     // When NO is returned, the map will focus on the cluster.
     return NO;
   }
-  return [self.markersController didTapMarkerWithIdentifier:FLTGetMarkerIdentifierFrom(marker)];
+  return
+      [self.markersController didTapMarkerWithIdentifier:FGMGetMarkerIdentifierFromMarker(marker)];
 }
 
 - (void)mapView:(GMSMapView *)mapView didEndDraggingMarker:(GMSMarker *)marker {
-  [self.markersController didEndDraggingMarkerWithIdentifier:FLTGetMarkerIdentifierFrom(marker)
-                                                    location:marker.position];
+  [self.markersController
+      didEndDraggingMarkerWithIdentifier:FGMGetMarkerIdentifierFromMarker(marker)
+                                location:marker.position];
 }
 
 - (void)mapView:(GMSMapView *)mapView didBeginDraggingMarker:(GMSMarker *)marker {
-  [self.markersController didStartDraggingMarkerWithIdentifier:FLTGetMarkerIdentifierFrom(marker)
-                                                      location:marker.position];
+  [self.markersController
+      didStartDraggingMarkerWithIdentifier:FGMGetMarkerIdentifierFromMarker(marker)
+                                  location:marker.position];
 }
 
 - (void)mapView:(GMSMapView *)mapView didDragMarker:(GMSMarker *)marker {
-  [self.markersController didDragMarkerWithIdentifier:FLTGetMarkerIdentifierFrom(marker)
+  [self.markersController didDragMarkerWithIdentifier:FGMGetMarkerIdentifierFromMarker(marker)
                                              location:marker.position];
 }
 
 - (void)mapView:(GMSMapView *)mapView didTapInfoWindowOfMarker:(GMSMarker *)marker {
   [self.markersController
-      didTapInfoWindowOfMarkerWithIdentifier:FLTGetMarkerIdentifierFrom(marker)];
+      didTapInfoWindowOfMarkerWithIdentifier:FGMGetMarkerIdentifierFromMarker(marker)];
 }
 - (void)mapView:(GMSMapView *)mapView didTapOverlay:(GMSOverlay *)overlay {
   NSString *overlayId = overlay.userData[0];
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.h
@@ -4,7 +4,7 @@
 
 #import <Flutter/Flutter.h>
 #import <GoogleMaps/GoogleMaps.h>
-#import "FLTClusterManagersController.h"
+#import "FGMClusterManagersController.h"
 #import "GoogleMapController.h"
 #import "messages.g.h"
 
@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface FLTMarkersController : NSObject
 - (instancetype)initWithMapView:(GMSMapView *)mapView
                 callbackHandler:(FGMMapsCallbackApi *)callbackHandler
-      clusterManagersController:(nullable FLTClusterManagersController *)clusterManagersController
+      clusterManagersController:(nullable FGMClusterManagersController *)clusterManagersController
                       registrar:(NSObject<FlutterPluginRegistrar> *)registrar;
 - (void)addJSONMarkers:(NSArray<NSDictionary<NSString *, id> *> *)markersToAdd;
 - (void)addMarkers:(NSArray<FGMPlatformMarker *> *)markersToAdd;
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #import "GoogleMapMarkerController.h"
+#import "FGMMarkerUserData.h"
 #import "FLTGoogleMapJSONConversions.h"
-#import "FLTGoogleMarkerUserData.h"
 
 @interface FLTGoogleMapMarkerController ()
 
@@ -30,7 +30,7 @@ - (instancetype)initWithMarker:(GMSMarker *)marker
     _markerIdentifier = [markerIdentifier copy];
     _clusterManagerIdentifier = [clusterManagerIdentifier copy];
     _mapView = mapView;
-    FLTSetIdentifiersToMarkerUserData(_markerIdentifier, _clusterManagerIdentifier, _marker);
+    FGMSetIdentifiersToMarkerUserData(_markerIdentifier, _clusterManagerIdentifier, _marker);
   }
   return self;
 }
@@ -448,7 +448,7 @@ @interface FLTMarkersController ()
 @property(strong, nonatomic) NSMutableDictionary *markerIdentifierToController;
 @property(strong, nonatomic) FGMMapsCallbackApi *callbackHandler;
 /// Controller for adding/removing/fetching cluster managers
-@property(weak, nonatomic, nullable) FLTClusterManagersController *clusterManagersController;
+@property(weak, nonatomic, nullable) FGMClusterManagersController *clusterManagersController;
 @property(weak, nonatomic) NSObject<FlutterPluginRegistrar> *registrar;
 @property(weak, nonatomic) GMSMapView *mapView;
 
@@ -458,7 +458,7 @@ @implementation FLTMarkersController
 
 - (instancetype)initWithMapView:(GMSMapView *)mapView
                 callbackHandler:(FGMMapsCallbackApi *)callbackHandler
-      clusterManagersController:(nullable FLTClusterManagersController *)clusterManagersController
+      clusterManagersController:(nullable FGMClusterManagersController *)clusterManagersController
                       registrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   self = [super init];
   if (self) {
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/google_maps_flutter_ios-umbrella.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/google_maps_flutter_ios-umbrella.h
@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 #import <Foundation/Foundation.h>
+#import <google_maps_flutter_ios/FGMMarkerUserData.h>
 #import <google_maps_flutter_ios/FLTGoogleMapHeatmapController.h>
 #import <google_maps_flutter_ios/FLTGoogleMapJSONConversions.h>
 #import <google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h>
 #import <google_maps_flutter_ios/FLTGoogleMapsPlugin.h>
-#import <google_maps_flutter_ios/FLTGoogleMarkerUserData.h>
 #import <google_maps_flutter_ios/GoogleMapPolylineController_Test.h>
 
 FOUNDATION_EXPORT double google_maps_flutterVersionNumber;
