From 28e6aaa63894e89904d3b61b5965575d5e7cb888 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 27 Jan 2026 14:53:06 -0500 Subject: [PATCH 1/9] Standardize file names and prefixes --- .../ios/Runner.xcodeproj/project.pbxproj | 142 ++++++++---------- ...trollerTests.m => CircleControllerTests.m} | 10 +- ...sts.m => ClusterManagersControllerTests.m} | 14 +- ...nsUtilsTests.m => ConversionsUtilsTests.m} | 6 +- .../RunnerTests/ExtractIconFromDataTests.m | 2 +- .../example/ios/RunnerTests/GoogleMapsTests.m | 32 ++-- ...Tests.m => GroundOverlayControllerTests.m} | 26 ++-- ...rollerTests.m => HeatmapControllerTests.m} | 10 +- ...trollerTests.m => MarkerControllerTests.m} | 102 ++++++------- ...rollerTests.m => PolygonControllerTests.m} | 43 +++--- ...ollerTests.m => PolylineControllerTests.m} | 31 ++-- .../{ => TestUtils}/PartiallyMockedMapView.h | 0 .../{ => TestUtils}/PartiallyMockedMapView.m | 0 .../{ => TestUtils}/TestAssetProvider.h | 0 .../{ => TestUtils}/TestAssetProvider.m | 0 .../{ => TestUtils}/TestMapEventHandler.h | 0 .../{ => TestUtils}/TestMapEventHandler.m | 0 ...erTests.m => TileOverlayControllerTests.m} | 23 ++- ...rTests.m => TileProviderControllerTests.m} | 8 +- ...rcleController.m => FGMCircleController.m} | 33 ++-- ...pController.m => FGMGoogleMapController.m} | 56 +++---- ...ogleMapsPlugin.m => FGMGoogleMapsPlugin.m} | 6 +- .../FGMGroundOverlayController.m | 4 +- ...mapController.m => FGMHeatmapController.m} | 38 ++--- ...rkerController.m => FGMMarkerController.m} | 51 +++---- ...gonController.m => FGMPolygonController.m} | 31 ++-- ...neController.m => FGMPolylineController.m} | 31 ++-- ...ontroller.m => FGMTileOverlayController.m} | 55 ++++--- ...rcleController.h => FGMCircleController.h} | 4 +- ...ller_Test.h => FGMCircleController_Test.h} | 4 +- ...pController.h => FGMGoogleMapController.h} | 12 +- ...r_Test.h => FGMGoogleMapController_Test.h} | 10 +- ...ogleMapsPlugin.h => FGMGoogleMapsPlugin.h} | 12 +- .../FGMGroundOverlayController.h | 2 +- ...mapController.h => FGMHeatmapController.h} | 4 +- ...ler_Test.h => FGMHeatmapController_Test.h} | 4 +- ...rkerController.h => FGMMarkerController.h} | 4 +- ...ller_Test.h => FGMMarkerController_Test.h} | 6 +- ...gonController.h => FGMPolygonController.h} | 4 +- ...ler_Test.h => FGMPolygonController_Test.h} | 4 +- ...neController.h => FGMPolylineController.h} | 4 +- ...er_Test.h => FGMPolylineController_Test.h} | 4 +- ...ontroller.h => FGMTileOverlayController.h} | 8 +- ...Test.h => FGMTileOverlayController_Test.h} | 4 +- .../google_maps_flutter_ios/pubspec.yaml | 2 +- 45 files changed, 407 insertions(+), 439 deletions(-) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{GoogleMapsCircleControllerTests.m => CircleControllerTests.m} (93%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{FGMClusterManagersControllerTests.m => ClusterManagersControllerTests.m} (95%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{FGMConversionsUtilsTests.m => ConversionsUtilsTests.m} (99%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{GoogleMapsGroundOverlayControllerTests.m => GroundOverlayControllerTests.m} (93%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{FLTGoogleMapHeatmapControllerTests.m => HeatmapControllerTests.m} (94%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{GoogleMapsMarkerControllerTests.m => MarkerControllerTests.m} (81%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{GoogleMapsPolygonControllerTests.m => PolygonControllerTests.m} (70%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{GoogleMapsPolylineControllerTests.m => PolylineControllerTests.m} (85%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{ => TestUtils}/PartiallyMockedMapView.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{ => TestUtils}/PartiallyMockedMapView.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{ => TestUtils}/TestAssetProvider.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{ => TestUtils}/TestAssetProvider.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{ => TestUtils}/TestMapEventHandler.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{ => TestUtils}/TestMapEventHandler.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{GoogleMapsTileOverlayControllerTests.m => TileOverlayControllerTests.m} (77%) rename packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/{FLTTileProviderControllerTests.m => TileProviderControllerTests.m} (90%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/{GoogleMapCircleController.m => FGMCircleController.m} (74%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/{GoogleMapController.m => FGMGoogleMapController.m} (96%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/{FLTGoogleMapsPlugin.m => FGMGoogleMapsPlugin.m} (81%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/{FLTGoogleMapHeatmapController.m => FGMHeatmapController.m} (76%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/{GoogleMapMarkerController.m => FGMMarkerController.m} (86%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/{GoogleMapPolygonController.m => FGMPolygonController.m} (79%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/{GoogleMapPolylineController.m => FGMPolylineController.m} (78%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/{FLTGoogleMapTileOverlayController.m => FGMTileOverlayController.m} (76%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{GoogleMapCircleController.h => FGMCircleController.h} (91%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{GoogleMapCircleController_Test.h => FGMCircleController_Test.h} (86%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{GoogleMapController.h => FGMGoogleMapController.h} (76%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{GoogleMapController_Test.h => FGMGoogleMapController_Test.h} (89%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{FLTGoogleMapsPlugin.h => FGMGoogleMapsPlugin.h} (52%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{FLTGoogleMapHeatmapController.h => FGMHeatmapController.h} (95%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{FLTGoogleMapHeatmapController_Test.h => FGMHeatmapController_Test.h} (85%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{GoogleMapMarkerController.h => FGMMarkerController.h} (96%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{GoogleMapMarkerController_Test.h => FGMMarkerController_Test.h} (89%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{GoogleMapPolygonController.h => FGMPolygonController.h} (90%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{GoogleMapPolygonController_Test.h => FGMPolygonController_Test.h} (85%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{GoogleMapPolylineController.h => FGMPolylineController.h} (90%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{GoogleMapPolylineController_Test.h => FGMPolylineController_Test.h} (90%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{FLTGoogleMapTileOverlayController.h => FGMTileOverlayController.h} (87%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{FLTGoogleMapTileOverlayController_Test.h => FGMTileOverlayController_Test.h} (84%) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Runner.xcodeproj/project.pbxproj index 0caf990b9847..2db6a30056ec 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,31 +3,28 @@ archiveVersion = 1; classes = { }; - objectVersion = 60; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ - 0DD7B6C32B744EEF00E857FD /* FLTTileProviderControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DD7B6C22B744EEF00E857FD /* FLTTileProviderControllerTests.m */; }; + 0DD7B6C32B744EEF00E857FD /* TileProviderControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DD7B6C22B744EEF00E857FD /* TileProviderControllerTests.m */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 2A6906C72D263DF4001F8426 /* GoogleMapsGroundOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A6906C62D263DE7001F8426 /* GoogleMapsGroundOverlayControllerTests.m */; }; + 2A6906C72D263DF4001F8426 /* GroundOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A6906C62D263DE7001F8426 /* GroundOverlayControllerTests.m */; }; 2BDE99378062AE3E60B40021 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3ACE0AFE8D82CD5962486AFD /* Pods_RunnerTests.framework */; }; - 330909FF2D99B7A60077A751 /* GoogleMapsMarkerControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 330909FE2D99B79B0077A751 /* GoogleMapsMarkerControllerTests.m */; }; - 3378E6352F23F9300045E7DA /* TestMapEventHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 3378E6342F23F92E0045E7DA /* TestMapEventHandler.m */; }; - 339355BA2EB3E50300EBF864 /* GoogleMapsCircleControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355B92EB3E4F900EBF864 /* GoogleMapsCircleControllerTests.m */; }; - 339355BD2EB3E56300EBF864 /* GoogleMapsTileOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BC2EB3E55600EBF864 /* GoogleMapsTileOverlayControllerTests.m */; }; - 339355BF2EB535A600EBF864 /* FLTGoogleMapHeatmapControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BE2EB5359B00EBF864 /* FLTGoogleMapHeatmapControllerTests.m */; }; + 330909FF2D99B7A60077A751 /* MarkerControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 330909FE2D99B79B0077A751 /* MarkerControllerTests.m */; }; + 339355BA2EB3E50300EBF864 /* CircleControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355B92EB3E4F900EBF864 /* CircleControllerTests.m */; }; + 339355BD2EB3E56300EBF864 /* TileOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BC2EB3E55600EBF864 /* TileOverlayControllerTests.m */; }; + 339355BF2EB535A600EBF864 /* HeatmapControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BE2EB5359B00EBF864 /* HeatmapControllerTests.m */; }; 339DF1F02F1FE49800748863 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 339DF1EF2F1FE49300748863 /* AppDelegate.swift */; }; - 33BF9C6E2F2182DF0005FA15 /* TestAssetProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 33BF9C6D2F2182DB0005FA15 /* TestAssetProvider.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 478116522BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 478116512BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m */; }; - 528F16832C62941000148160 /* FGMClusterManagersControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 528F16822C62941000148160 /* FGMClusterManagersControllerTests.m */; }; + 478116522BEF8F47002F593E /* PolylineControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 478116512BEF8F47002F593E /* PolylineControllerTests.m */; }; + 528F16832C62941000148160 /* ClusterManagersControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 528F16822C62941000148160 /* ClusterManagersControllerTests.m */; }; 528F16872C62952700148160 /* ExtractIconFromDataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 528F16862C62952700148160 /* ExtractIconFromDataTests.m */; }; - 6851F3562835BC180032B7C8 /* FGMConversionsUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6851F3552835BC180032B7C8 /* FGMConversionsUtilsTests.m */; }; + 6851F3562835BC180032B7C8 /* ConversionsUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6851F3552835BC180032B7C8 /* ConversionsUtilsTests.m */; }; 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - 982F2A6C27BADE17003C81F4 /* PartiallyMockedMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */; }; B3A7FA04ABB7B84780729949 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A9A8623F5CA9BBC813DC6B /* Pods_Runner.framework */; }; F269303B2BB389BF00BF17C4 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = F269303A2BB389BF00BF17C4 /* assets */; }; F7151F13265D7ED70028CB91 /* GoogleMapsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F7151F12265D7ED70028CB91 /* GoogleMapsTests.m */; }; @@ -65,28 +62,24 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0DD7B6C22B744EEF00E857FD /* FLTTileProviderControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLTTileProviderControllerTests.m; sourceTree = ""; }; + 0DD7B6C22B744EEF00E857FD /* TileProviderControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TileProviderControllerTests.m; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 2A6906C62D263DE7001F8426 /* GoogleMapsGroundOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsGroundOverlayControllerTests.m; sourceTree = ""; }; - 330909FE2D99B79B0077A751 /* GoogleMapsMarkerControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsMarkerControllerTests.m; sourceTree = ""; }; - 3378E6332F23F9220045E7DA /* TestMapEventHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestMapEventHandler.h; sourceTree = ""; }; - 3378E6342F23F92E0045E7DA /* TestMapEventHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestMapEventHandler.m; sourceTree = ""; }; - 339355B82EB3E4D500EBF864 /* GoogleMapsPolygonControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsPolygonControllerTests.m; sourceTree = ""; }; - 339355B92EB3E4F900EBF864 /* GoogleMapsCircleControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsCircleControllerTests.m; sourceTree = ""; }; - 339355BC2EB3E55600EBF864 /* GoogleMapsTileOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsTileOverlayControllerTests.m; sourceTree = ""; }; - 339355BE2EB5359B00EBF864 /* FLTGoogleMapHeatmapControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLTGoogleMapHeatmapControllerTests.m; sourceTree = ""; }; + 2A6906C62D263DE7001F8426 /* GroundOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroundOverlayControllerTests.m; sourceTree = ""; }; + 330909FE2D99B79B0077A751 /* MarkerControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MarkerControllerTests.m; sourceTree = ""; }; + 339355B82EB3E4D500EBF864 /* PolygonControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PolygonControllerTests.m; sourceTree = ""; }; + 339355B92EB3E4F900EBF864 /* CircleControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CircleControllerTests.m; sourceTree = ""; }; + 339355BC2EB3E55600EBF864 /* TileOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TileOverlayControllerTests.m; sourceTree = ""; }; + 339355BE2EB5359B00EBF864 /* HeatmapControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HeatmapControllerTests.m; sourceTree = ""; }; 339DF1EF2F1FE49300748863 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 339DF1F12F1FE4AD00748863 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; - 33BF9C6C2F2182CB0005FA15 /* TestAssetProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestAssetProvider.h; sourceTree = ""; }; - 33BF9C6D2F2182DB0005FA15 /* TestAssetProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestAssetProvider.m; sourceTree = ""; }; 3ACE0AFE8D82CD5962486AFD /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 478116512BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsPolylineControllerTests.m; sourceTree = ""; }; - 528F16822C62941000148160 /* FGMClusterManagersControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FGMClusterManagersControllerTests.m; sourceTree = ""; }; + 478116512BEF8F47002F593E /* PolylineControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PolylineControllerTests.m; sourceTree = ""; }; + 528F16822C62941000148160 /* ClusterManagersControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClusterManagersControllerTests.m; sourceTree = ""; }; 528F16862C62952700148160 /* ExtractIconFromDataTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExtractIconFromDataTests.m; sourceTree = ""; }; 61A9A8623F5CA9BBC813DC6B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 6851F3552835BC180032B7C8 /* FGMConversionsUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FGMConversionsUtilsTests.m; sourceTree = ""; }; + 6851F3552835BC180032B7C8 /* ConversionsUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversionsUtilsTests.m; sourceTree = ""; }; 733AFAB37683A9DA7512F09C /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 784666492D4C4C64000A1A5F /* FlutterFramework */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterFramework; path = Flutter/ephemeral/Packages/.packages/FlutterFramework; sourceTree = ""; }; 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; @@ -98,8 +91,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 982F2A6A27BADE17003C81F4 /* PartiallyMockedMapView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PartiallyMockedMapView.h; sourceTree = ""; }; - 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PartiallyMockedMapView.m; sourceTree = ""; }; B7AFC65E3DD5AC60D834D83D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; E52C6A6210A56F027C582EF9 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; EA0E91726245EDC22B97E8B9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; @@ -112,6 +103,10 @@ F7151F22265D7EE50028CB91 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ +/* Begin PBXFileSystemSynchronizedRootGroup section */ + 33EAC5392F294BEB00CB15CE /* TestUtils */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = TestUtils; sourceTree = ""; }; +/* End PBXFileSystemSynchronizedRootGroup section */ + /* Begin PBXFrameworksBuildPhase section */ 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; @@ -214,25 +209,20 @@ F7151F11265D7ED70028CB91 /* RunnerTests */ = { isa = PBXGroup; children = ( + 33EAC5392F294BEB00CB15CE /* TestUtils */, F269303A2BB389BF00BF17C4 /* assets */, + 528F16822C62941000148160 /* ClusterManagersControllerTests.m */, + 6851F3552835BC180032B7C8 /* ConversionsUtilsTests.m */, + 339355B92EB3E4F900EBF864 /* CircleControllerTests.m */, 528F16862C62952700148160 /* ExtractIconFromDataTests.m */, - 528F16822C62941000148160 /* FGMClusterManagersControllerTests.m */, - 339355BE2EB5359B00EBF864 /* FLTGoogleMapHeatmapControllerTests.m */, - 6851F3552835BC180032B7C8 /* FGMConversionsUtilsTests.m */, - 0DD7B6C22B744EEF00E857FD /* FLTTileProviderControllerTests.m */, F7151F12265D7ED70028CB91 /* GoogleMapsTests.m */, - 339355B92EB3E4F900EBF864 /* GoogleMapsCircleControllerTests.m */, - 2A6906C62D263DE7001F8426 /* GoogleMapsGroundOverlayControllerTests.m */, - 330909FE2D99B79B0077A751 /* GoogleMapsMarkerControllerTests.m */, - 339355B82EB3E4D500EBF864 /* GoogleMapsPolygonControllerTests.m */, - 478116512BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m */, - 339355BC2EB3E55600EBF864 /* GoogleMapsTileOverlayControllerTests.m */, - 982F2A6A27BADE17003C81F4 /* PartiallyMockedMapView.h */, - 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */, - 33BF9C6C2F2182CB0005FA15 /* TestAssetProvider.h */, - 33BF9C6D2F2182DB0005FA15 /* TestAssetProvider.m */, - 3378E6332F23F9220045E7DA /* TestMapEventHandler.h */, - 3378E6342F23F92E0045E7DA /* TestMapEventHandler.m */, + 2A6906C62D263DE7001F8426 /* GroundOverlayControllerTests.m */, + 339355BE2EB5359B00EBF864 /* HeatmapControllerTests.m */, + 330909FE2D99B79B0077A751 /* MarkerControllerTests.m */, + 339355B82EB3E4D500EBF864 /* PolygonControllerTests.m */, + 478116512BEF8F47002F593E /* PolylineControllerTests.m */, + 339355BC2EB3E55600EBF864 /* TileOverlayControllerTests.m */, + 0DD7B6C22B744EEF00E857FD /* TileProviderControllerTests.m */, F7151F14265D7ED70028CB91 /* Info.plist */, ); path = RunnerTests; @@ -262,6 +252,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, BB6BD9A1101E970BEF85B6D2 /* [CP] Copy Pods Resources */, + 047700BF2FF597AB85605C89 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -283,13 +274,15 @@ F7151F0C265D7ED70028CB91 /* Sources */, F7151F0D265D7ED70028CB91 /* Frameworks */, F7151F0E265D7ED70028CB91 /* Resources */, - DF182F6A1B9E41DA05BFCB87 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( F7151F16265D7ED70028CB91 /* PBXTargetDependency */, ); + fileSystemSynchronizedGroups = ( + 33EAC5392F294BEB00CB15CE /* TestUtils */, + ); name = RunnerTests; productName = RunnerTests; productReference = F7151F10265D7ED70028CB91 /* RunnerTests.xctest */; @@ -391,6 +384,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 047700BF2FF597AB85605C89 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -482,24 +493,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - DF182F6A1B9E41DA05BFCB87 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -516,19 +509,16 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 528F16832C62941000148160 /* FGMClusterManagersControllerTests.m in Sources */, - 339355BA2EB3E50300EBF864 /* GoogleMapsCircleControllerTests.m in Sources */, - 339355BF2EB535A600EBF864 /* FLTGoogleMapHeatmapControllerTests.m in Sources */, - 339355BD2EB3E56300EBF864 /* GoogleMapsTileOverlayControllerTests.m in Sources */, + 528F16832C62941000148160 /* ClusterManagersControllerTests.m in Sources */, + 339355BA2EB3E50300EBF864 /* CircleControllerTests.m in Sources */, + 339355BF2EB535A600EBF864 /* HeatmapControllerTests.m in Sources */, + 339355BD2EB3E56300EBF864 /* TileOverlayControllerTests.m in Sources */, F7151F13265D7ED70028CB91 /* GoogleMapsTests.m in Sources */, - 33BF9C6E2F2182DF0005FA15 /* TestAssetProvider.m in Sources */, - 6851F3562835BC180032B7C8 /* FGMConversionsUtilsTests.m in Sources */, - 982F2A6C27BADE17003C81F4 /* PartiallyMockedMapView.m in Sources */, - 3378E6352F23F9300045E7DA /* TestMapEventHandler.m in Sources */, - 330909FF2D99B7A60077A751 /* GoogleMapsMarkerControllerTests.m in Sources */, - 478116522BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m in Sources */, - 2A6906C72D263DF4001F8426 /* GoogleMapsGroundOverlayControllerTests.m in Sources */, - 0DD7B6C32B744EEF00E857FD /* FLTTileProviderControllerTests.m in Sources */, + 6851F3562835BC180032B7C8 /* ConversionsUtilsTests.m in Sources */, + 330909FF2D99B7A60077A751 /* MarkerControllerTests.m in Sources */, + 478116522BEF8F47002F593E /* PolylineControllerTests.m in Sources */, + 2A6906C72D263DF4001F8426 /* GroundOverlayControllerTests.m in Sources */, + 0DD7B6C32B744EEF00E857FD /* TileProviderControllerTests.m in Sources */, 528F16872C62952700148160 /* ExtractIconFromDataTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/CircleControllerTests.m similarity index 93% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/CircleControllerTests.m index 7514a70704f5..798ffa5098ab 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/CircleControllerTests.m @@ -6,7 +6,7 @@ @import XCTest; @import GoogleMaps; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSCircle that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingCircle : GMSCircle { @@ -14,14 +14,14 @@ @interface PropertyOrderValidatingCircle : GMSCircle { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsCircleControllerTests : XCTestCase +@interface CircleControllerTests : XCTestCase @end -@implementation GoogleMapsCircleControllerTests +@implementation CircleControllerTests - (void)testUpdateCircleSetsVisibilityLast { PropertyOrderValidatingCircle *circle = [[PropertyOrderValidatingCircle alloc] init]; - [FLTGoogleMapCircleController + [FGMCircleController updateCircle:circle fromPlatformCircle:[FGMPlatformCircle makeWithConsumeTapEvents:NO @@ -40,7 +40,7 @@ - (void)testUpdateCircleSetsVisibilityLast { longitude:0] radius:10 circleId:@"circle"] - withMapView:[GoogleMapsCircleControllerTests mapView]]; + withMapView:[CircleControllerTests mapView]]; XCTAssertTrue(circle.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FGMClusterManagersControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/ClusterManagersControllerTests.m similarity index 95% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FGMClusterManagersControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/ClusterManagersControllerTests.m index 049855b05e4d..48f4220b15aa 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FGMClusterManagersControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/ClusterManagersControllerTests.m @@ -7,14 +7,14 @@ @import XCTest; @import GoogleMaps; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" -#import "TestMapEventHandler.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" +#import "TestUtils/TestMapEventHandler.h" -@interface FGMClusterManagersControllerTests : XCTestCase +@interface ClusterManagersControllerTests : XCTestCase @end -@implementation FGMClusterManagersControllerTests +@implementation ClusterManagersControllerTests - (void)testClustering { CGRect frame = CGRectMake(0, 0, 100, 100); @@ -29,8 +29,8 @@ - (void)testClustering { FGMClusterManagersController *clusterManagersController = [[FGMClusterManagersController alloc] initWithMapView:mapView eventDelegate:eventHandler]; - FLTMarkersController *markersController = - [[FLTMarkersController alloc] initWithMapView:mapView + FGMMarkersController *markersController = + [[FGMMarkersController alloc] initWithMapView:mapView eventDelegate:eventHandler clusterManagersController:clusterManagersController assetProvider:[[TestAssetProvider alloc] init]]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FGMConversionsUtilsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/ConversionsUtilsTests.m similarity index 99% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FGMConversionsUtilsTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/ConversionsUtilsTests.m index 5277c81395f2..bf2514a4bd11 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FGMConversionsUtilsTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/ConversionsUtilsTests.m @@ -6,12 +6,12 @@ @import XCTest; @import GoogleMaps; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" -@interface FGMConversionUtilsTests : XCTestCase +@interface ConversionUtilsTests : XCTestCase @end -@implementation FGMConversionUtilsTests +@implementation ConversionUtilsTests - (void)testGetValueOrNilWithValue { NSString *key = @"key"; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/ExtractIconFromDataTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/ExtractIconFromDataTests.m index 4fc1e9eef7d5..50666756cf86 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/ExtractIconFromDataTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/ExtractIconFromDataTests.m @@ -5,7 +5,7 @@ @import google_maps_flutter_ios; @import XCTest; -#import "TestAssetProvider.h" +#import "TestUtils/TestAssetProvider.h" @interface ExtractIconFromDataTests : XCTestCase - (UIImage *)createOnePixelImage; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsTests.m index e51da47062f7..18cda9bd070c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsTests.m @@ -6,8 +6,8 @@ @import XCTest; @import GoogleMaps; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" @interface MockCATransaction : NSObject @property(nonatomic, assign) BOOL beginCalled; @@ -50,21 +50,21 @@ - (FlutterBinaryMessengerConnection)setMessageHandlerOnChannel:(nonnull NSString #pragma mark - -@interface FLTGoogleMapFactory (Test) +@interface FGMGoogleMapFactory (Test) @property(strong, nonatomic, readonly) id sharedMapServices; @end @interface GoogleMapsTests : XCTestCase @end -@interface FLTTileProviderController (Testing) +@interface FGMTileProviderController (Testing) - (UIImage *)handleResultTile:(nullable UIImage *)tileImage; @end @implementation GoogleMapsTests - (void)testPlugin { - FLTGoogleMapsPlugin *plugin = [[FLTGoogleMapsPlugin alloc] init]; + FGMGoogleMapsPlugin *plugin = [[FGMGoogleMapsPlugin alloc] init]; XCTAssertNotNil(plugin); } @@ -74,8 +74,8 @@ - (void)testFrameObserver { options.frame = frame; options.camera = [[GMSCameraPosition alloc] initWithLatitude:0 longitude:0 zoom:0]; PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:options]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -94,9 +94,9 @@ - (void)testMapsServiceSync { // The API requires a registrar, but this test doesn't actually use it, so just pass in a // dummy object rather than set up a full mock. id registrar = [[NSObject alloc] init]; - FLTGoogleMapFactory *factory1 = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *factory1 = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; XCTAssertNotNil(factory1.sharedMapServices); - FLTGoogleMapFactory *factory2 = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *factory2 = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; // Test pointer equality, should be same retained singleton +[GMSServices sharedServices] object. // Retaining the opaque object should be enough to avoid multiple internal initializations, // but don't test the internals of the GoogleMaps API. Assume that it does what is documented. @@ -105,7 +105,7 @@ - (void)testMapsServiceSync { } - (void)testHandleResultTileDownsamplesWideGamutImages { - FLTTileProviderController *controller = [[FLTTileProviderController alloc] init]; + FGMTileProviderController *controller = [[FGMTileProviderController alloc] init]; NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -134,8 +134,8 @@ - (void)testAnimateCameraWithUpdate { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -164,8 +164,8 @@ - (void)testAnimateCameraWithUpdateAndDuration { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -203,8 +203,8 @@ - (void)testInspectorAPICameraPosition { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; NSObject *binaryMessenger = [[StubBinaryMessenger alloc] init]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GroundOverlayControllerTests.m similarity index 93% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GroundOverlayControllerTests.m index 14a607c8487f..eedde08d7d99 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GroundOverlayControllerTests.m @@ -6,8 +6,8 @@ @import XCTest; @import GoogleMaps; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" /// A GMSGroundOverlay that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingGroundOverlay : GMSGroundOverlay { @@ -15,15 +15,13 @@ @interface PropertyOrderValidatingGroundOverlay : GMSGroundOverlay { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsGroundOverlayControllerTests : XCTestCase +@interface GroundOverlayControllerTests : XCTestCase @end -@implementation GoogleMapsGroundOverlayControllerTests +@implementation GroundOverlayControllerTests -/// Returns GoogleMapGroundOverlayController object instantiated with position and a mocked map +/// Returns a GroundOverlayController object instantiated with position and a mocked map /// instance. -/// -/// @return An object of FLTGoogleMapGroundOverlayController + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap { NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -34,7 +32,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap icon:wideGamutImage zoomLevel:14.0]; - GMSMapView *mapView = [GoogleMapsGroundOverlayControllerTests mapView]; + GMSMapView *mapView = [GroundOverlayControllerTests mapView]; return [[FGMGroundOverlayController alloc] initWithGroundOverlay:groundOverlay identifier:@"id_1" @@ -42,10 +40,8 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap isCreatedWithBounds:NO]; } -/// Returns GoogleMapGroundOverlayController object instantiated with bounds and a mocked map +/// Returns a GroundOverlayController object instantiated with bounds and a mocked map /// instance. -/// -/// @return An object of FLTGoogleMapGroundOverlayController + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -57,7 +53,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { coordinate:CLLocationCoordinate2DMake(30, 40)] icon:wideGamutImage]; - GMSMapView *mapView = [GoogleMapsGroundOverlayControllerTests mapView]; + GMSMapView *mapView = [GroundOverlayControllerTests mapView]; return [[FGMGroundOverlayController alloc] initWithGroundOverlay:groundOverlay identifier:@"id_1" @@ -67,7 +63,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { - (void)testUpdatingGroundOverlayWithPosition { FGMGroundOverlayController *groundOverlayController = - [GoogleMapsGroundOverlayControllerTests groundOverlayControllerWithPositionWithMockedMap]; + [GroundOverlayControllerTests groundOverlayControllerWithPositionWithMockedMap]; FGMPlatformLatLng *position = [FGMPlatformLatLng makeWithLatitude:52.4816 longitude:3.1791]; @@ -119,7 +115,7 @@ - (void)testUpdatingGroundOverlayWithPosition { - (void)testUpdatingGroundOverlayWithBounds { FGMGroundOverlayController *groundOverlayController = - [GoogleMapsGroundOverlayControllerTests groundOverlayControllerWithBoundsWithMockedMap]; + [GroundOverlayControllerTests groundOverlayControllerWithBoundsWithMockedMap]; FGMPlatformLatLngBounds *bounds = [FGMPlatformLatLngBounds makeWithNortheast:[FGMPlatformLatLng makeWithLatitude:54.4816 longitude:5.1791] @@ -204,7 +200,7 @@ - (void)testUpdateGroundOverlaySetsVisibilityLast { visible:YES clickable:YES zoomLevel:nil] - withMapView:[GoogleMapsGroundOverlayControllerTests mapView] + withMapView:[GroundOverlayControllerTests mapView] assetProvider:[[TestAssetProvider alloc] init] screenScale:1.0 usingBounds:YES]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/HeatmapControllerTests.m similarity index 94% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/HeatmapControllerTests.m index 2b0134d3ef9b..94a543034e23 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/HeatmapControllerTests.m @@ -7,17 +7,17 @@ @import GoogleMaps; @import GoogleMapsUtils; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" @interface PropertyOrderValidatingHeatmap : GMUHeatmapTileLayer { } @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsHeatmapControllerTests : XCTestCase +@interface HeatmapControllerTests : XCTestCase @end -@implementation GoogleMapsHeatmapControllerTests +@implementation HeatmapControllerTests - (void)testUpdateHeatmapSetsVisibilityLast { PropertyOrderValidatingHeatmap *heatmap = [[PropertyOrderValidatingHeatmap alloc] init]; @@ -27,7 +27,7 @@ - (void)testUpdateHeatmapSetsVisibilityLast { ] startPoints:@[ @(0), @(1) ] colorMapSize:256]; - [FLTGoogleMapHeatmapController + [FGMHeatmapController updateHeatmap:heatmap fromPlatformHeatmap:[FGMPlatformHeatmap makeWithHeatmapId:@"heatmap" @@ -48,7 +48,7 @@ - (void)testUpdateHeatmapSetsVisibilityLast { radius:1 minimumZoomIntensity:1 maximumZoomIntensity:2] - withMapView:[GoogleMapsHeatmapControllerTests mapView]]; + withMapView:[HeatmapControllerTests mapView]]; XCTAssertTrue(heatmap.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/MarkerControllerTests.m similarity index 81% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/MarkerControllerTests.m index a34b11ae3cc0..a617473d9cda 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/MarkerControllerTests.m @@ -6,9 +6,9 @@ @import XCTest; @import GoogleMaps; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" -#import "TestMapEventHandler.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" +#import "TestUtils/TestMapEventHandler.h" /// A GMSMarker that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingMarker : GMSMarker { @@ -16,10 +16,10 @@ @interface PropertyOrderValidatingMarker : GMSMarker { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsMarkerControllerTests : XCTestCase +@interface MarkerControllerTests : XCTestCase @end -@implementation GoogleMapsMarkerControllerTests +@implementation MarkerControllerTests /// Returns a simple map view for use with marker controllers. + (GMSMapView *)mapView { @@ -29,13 +29,13 @@ + (GMSMapView *)mapView { return [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; } -/// Returns a FLTMarkersController instance instantiated with the given map view. +/// Returns a FGMMarkersController instance instantiated with the given map view. /// /// The mapView should outlive the controller, as the controller keeps a weak reference to it. -- (FLTMarkersController *)markersControllerWithMapView:(GMSMapView *)mapView +- (FGMMarkersController *)markersControllerWithMapView:(GMSMapView *)mapView eventDelegate: (NSObject *)eventDelegate { - return [[FLTMarkersController alloc] initWithMapView:mapView + return [[FGMMarkersController alloc] initWithMapView:mapView eventDelegate:eventDelegate clusterManagersController:nil assetProvider:[[TestAssetProvider alloc] init]]; @@ -46,9 +46,9 @@ - (FGMPlatformBitmap *)placeholderBitmap { } - (void)testSetsMarkerNumericProperties { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -78,8 +78,7 @@ - (void)testSetsMarkerNumericProperties { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; const double delta = 0.0001; @@ -95,9 +94,9 @@ - (void)testSetsMarkerNumericProperties { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsDraggable { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -119,8 +118,7 @@ - (void)testSetsDraggable { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; XCTAssertTrue(marker.draggable); @@ -129,9 +127,9 @@ - (void)testSetsDraggable { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsFlat { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -153,8 +151,7 @@ - (void)testSetsFlat { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; XCTAssertTrue(marker.flat); @@ -163,9 +160,9 @@ - (void)testSetsFlat { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsVisible { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -187,8 +184,7 @@ - (void)testSetsVisible { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; // Visibility is controlled by being set to a map. @@ -196,9 +192,9 @@ - (void)testSetsVisible { } - (void)testSetsMarkerInfoWindowProperties { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -226,8 +222,7 @@ - (void)testSetsMarkerInfoWindowProperties { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; const double delta = 0.0001; @@ -239,32 +234,31 @@ - (void)testSetsMarkerInfoWindowProperties { - (void)testUpdateMarkerSetsVisibilityLast { PropertyOrderValidatingMarker *marker = [[PropertyOrderValidatingMarker alloc] init]; - [FLTGoogleMapMarkerController - updateMarker:marker - fromPlatformMarker:[FGMPlatformMarker - makeWithAlpha:1.0 - anchor:[FGMPlatformPoint makeWithX:0 y:0] - consumeTapEvents:YES - draggable:YES - flat:YES - icon:[self placeholderBitmap] - infoWindow:[FGMPlatformInfoWindow - makeWithTitle:@"info title" - snippet:@"info snippet" - anchor:[FGMPlatformPoint - makeWithX:0 - y:0]] - position:[FGMPlatformLatLng makeWithLatitude:0 - longitude:0] - rotation:0 - visible:YES - zIndex:0 - markerId:@"marker" - clusterManagerId:nil] - withMapView:[GoogleMapsMarkerControllerTests mapView] - assetProvider:[[TestAssetProvider alloc] init] - screenScale:1 - usingOpacityForVisibility:NO]; + [FGMMarkerController updateMarker:marker + fromPlatformMarker:[FGMPlatformMarker + makeWithAlpha:1.0 + anchor:[FGMPlatformPoint makeWithX:0 y:0] + consumeTapEvents:YES + draggable:YES + flat:YES + icon:[self placeholderBitmap] + infoWindow:[FGMPlatformInfoWindow + makeWithTitle:@"info title" + snippet:@"info snippet" + anchor:[FGMPlatformPoint + makeWithX:0 + y:0]] + position:[FGMPlatformLatLng makeWithLatitude:0 + longitude:0] + rotation:0 + visible:YES + zIndex:0 + markerId:@"marker" + clusterManagerId:nil] + withMapView:[MarkerControllerTests mapView] + assetProvider:[[TestAssetProvider alloc] init] + screenScale:1 + usingOpacityForVisibility:NO]; XCTAssertTrue(marker.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/PolygonControllerTests.m similarity index 70% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/PolygonControllerTests.m index 2cb386e0fc55..dd36f2d95de0 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/PolygonControllerTests.m @@ -12,33 +12,32 @@ @interface PropertyOrderValidatingPolygon : GMSPolygon { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsPolygonControllerTests : XCTestCase +@interface PolygonControllerTests : XCTestCase @end -@implementation GoogleMapsPolygonControllerTests +@implementation PolygonControllerTests - (void)testUpdatePolygonSetsVisibilityLast { PropertyOrderValidatingPolygon *polygon = [[PropertyOrderValidatingPolygon alloc] init]; - [FLTGoogleMapPolygonController - updatePolygon:polygon - fromPlatformPolygon:[FGMPlatformPolygon - makeWithConsumeTapEvents:NO - fillColor:[FGMPlatformColor makeWithRed:0 - green:0 - blue:0 - alpha:0] - geodesic:NO - holes:@[] - strokeColor:[FGMPlatformColor makeWithRed:0 - green:0 - blue:0 - alpha:0] - strokeWidth:0 - visible:YES - zIndex:0 - points:@[] - polygonId:@"polygon"] - withMapView:[GoogleMapsPolygonControllerTests mapView]]; + [FGMPolygonController updatePolygon:polygon + fromPlatformPolygon:[FGMPlatformPolygon + makeWithConsumeTapEvents:NO + fillColor:[FGMPlatformColor makeWithRed:0 + green:0 + blue:0 + alpha:0] + geodesic:NO + holes:@[] + strokeColor:[FGMPlatformColor makeWithRed:0 + green:0 + blue:0 + alpha:0] + strokeWidth:0 + visible:YES + zIndex:0 + points:@[] + polygonId:@"polygon"] + withMapView:[PolygonControllerTests mapView]]; XCTAssertTrue(polygon.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/PolylineControllerTests.m similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/PolylineControllerTests.m index a018579c3e18..b5eb8a419aa9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/PolylineControllerTests.m @@ -6,7 +6,7 @@ @import XCTest; @import GoogleMaps; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSPolyline that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingPolyline : GMSPolyline { @@ -14,15 +14,15 @@ @interface PropertyOrderValidatingPolyline : GMSPolyline { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsPolylineControllerTests : XCTestCase +@interface PolylineControllerTests : XCTestCase @end -@implementation GoogleMapsPolylineControllerTests +@implementation PolylineControllerTests /// Returns GoogleMapPolylineController object instantiated with a mocked map instance /// -/// @return An object of FLTGoogleMapPolylineController -- (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { +/// @return An object of FGMPolylineController +- (FGMPolylineController *)polylineControllerWithMockedMap { FGMPlatformPolyline *polyline = [FGMPlatformPolyline makeWithPolylineId:@"polyline_id_0" consumesTapEvents:NO @@ -30,7 +30,7 @@ - (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { geodesic:NO jointType:FGMPlatformJointTypeRound patterns:@[] - points:[GoogleMapsPolylineControllerTests polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:NO width:1 zIndex:0]; @@ -46,16 +46,16 @@ - (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polyline.points)); - FLTGoogleMapPolylineController *polylineControllerWithMockedMap = - [[FLTGoogleMapPolylineController alloc] initWithPath:path - identifier:polyline.polylineId - mapView:mapView]; + FGMPolylineController *polylineControllerWithMockedMap = + [[FGMPolylineController alloc] initWithPath:path + identifier:polyline.polylineId + mapView:mapView]; return polylineControllerWithMockedMap; } - (void)testPatternsSetSpans { - FLTGoogleMapPolylineController *polylineController = [self polylineControllerWithMockedMap]; + FGMPolylineController *polylineController = [self polylineControllerWithMockedMap]; XCTAssertNil(polylineController.polyline.spans); @@ -77,8 +77,7 @@ - (void)testPatternsSetSpans { makeWithType:FGMPlatformPatternItemTypeDash length:@(10)] ] - points:[GoogleMapsPolylineControllerTests - polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:YES width:1 zIndex:0]]; @@ -89,7 +88,7 @@ - (void)testPatternsSetSpans { - (void)testUpdatePolylineSetsVisibilityLast { PropertyOrderValidatingPolyline *polyline = [[PropertyOrderValidatingPolyline alloc] init]; - [FLTGoogleMapPolylineController + [FGMPolylineController updatePolyline:polyline fromPlatformPolyline:[FGMPlatformPolyline makeWithPolylineId:@"polyline" @@ -101,11 +100,11 @@ - (void)testUpdatePolylineSetsVisibilityLast { geodesic:NO jointType:FGMPlatformJointTypeRound patterns:@[] - points:[GoogleMapsPolylineControllerTests polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:YES width:1 zIndex:0] - withMapView:[GoogleMapsPolylineControllerTests mapView]]; + withMapView:[PolylineControllerTests mapView]]; XCTAssertTrue(polyline.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/PartiallyMockedMapView.h b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/PartiallyMockedMapView.h rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/PartiallyMockedMapView.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/PartiallyMockedMapView.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestAssetProvider.h b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/TestAssetProvider.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestAssetProvider.h rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/TestAssetProvider.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestAssetProvider.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/TestAssetProvider.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestAssetProvider.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/TestAssetProvider.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestMapEventHandler.h b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/TestMapEventHandler.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestMapEventHandler.h rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/TestMapEventHandler.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestMapEventHandler.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/TestMapEventHandler.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestMapEventHandler.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestUtils/TestMapEventHandler.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TileOverlayControllerTests.m similarity index 77% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TileOverlayControllerTests.m index e7b1118a8d56..68211159022d 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TileOverlayControllerTests.m @@ -6,29 +6,28 @@ @import XCTest; @import GoogleMaps; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSTileOverlay that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingTileLayer : GMSTileLayer @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsTileOverlayControllerTests : XCTestCase +@interface TileOverlayControllerTests : XCTestCase @end -@implementation GoogleMapsTileOverlayControllerTests +@implementation TileOverlayControllerTests - (void)testUpdateTileOverlaySetsVisibilityLast { PropertyOrderValidatingTileLayer *tileLayer = [[PropertyOrderValidatingTileLayer alloc] init]; - [FLTGoogleMapTileOverlayController - updateTileLayer:tileLayer - fromPlatformTileOverlay:[FGMPlatformTileOverlay makeWithTileOverlayId:@"overlay" - fadeIn:NO - transparency:0.5 - zIndex:0 - visible:YES - tileSize:1] - withMapView:[GoogleMapsTileOverlayControllerTests mapView]]; + [FGMTileOverlayController updateTileLayer:tileLayer + fromPlatformTileOverlay:[FGMPlatformTileOverlay makeWithTileOverlayId:@"overlay" + fadeIn:NO + transparency:0.5 + zIndex:0 + visible:YES + tileSize:1] + withMapView:[TileOverlayControllerTests mapView]]; XCTAssertTrue(tileLayer.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FLTTileProviderControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TileProviderControllerTests.m similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FLTTileProviderControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TileProviderControllerTests.m index 0040fce6b44b..603ea7a850f1 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FLTTileProviderControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TileProviderControllerTests.m @@ -45,16 +45,16 @@ - (void)tileWithOverlayIdentifier:(NSString *)tileOverlayId #pragma mark - -@interface FLTTileProviderControllerTests : XCTestCase +@interface TileProviderControllerTests : XCTestCase @end -@implementation FLTTileProviderControllerTests +@implementation TileProviderControllerTests - (void)testCallChannelOnPlatformThread { XCTestExpectation *expectation = [self expectationWithDescription:@"invokeMethod"]; TestTileProvider *tileProvider = [[TestTileProvider alloc] initWithExpectation:expectation]; - FLTTileProviderController *controller = - [[FLTTileProviderController alloc] initWithTileOverlayIdentifier:@"foo" + FGMTileProviderController *controller = + [[FGMTileProviderController alloc] initWithTileOverlayIdentifier:@"foo" tileProvider:tileProvider]; XCTAssertNotNil(controller); [controller requestTileForX:0 y:0 zoom:0 receiver:[[StubTileReceiver alloc] init]]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMCircleController.m similarity index 74% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMCircleController.m index 1348601ce0ff..8f86199f29bf 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMCircleController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapCircleController.h" -#import "GoogleMapCircleController_Test.h" +#import "FGMCircleController.h" +#import "FGMCircleController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapCircleController () +@interface FGMCircleController () @property(nonatomic, strong) GMSCircle *circle; @property(nonatomic, weak) GMSMapView *mapView; @end -@implementation FLTGoogleMapCircleController +@implementation FGMCircleController - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle mapView:(GMSMapView *)mapView { @@ -24,9 +24,7 @@ - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle radius:circle.radius]; _mapView = mapView; _circle.userData = @[ circle.circleId ]; - [FLTGoogleMapCircleController updateCircle:_circle - fromPlatformCircle:circle - withMapView:mapView]; + [FGMCircleController updateCircle:_circle fromPlatformCircle:circle withMapView:mapView]; } return self; } @@ -36,9 +34,9 @@ - (void)removeCircle { } - (void)updateFromPlatformCircle:(FGMPlatformCircle *)platformCircle { - [FLTGoogleMapCircleController updateCircle:self.circle - fromPlatformCircle:platformCircle - withMapView:self.mapView]; + [FGMCircleController updateCircle:self.circle + fromPlatformCircle:platformCircle + withMapView:self.mapView]; } + (void)updateCircle:(GMSCircle *)circle @@ -58,7 +56,7 @@ + (void)updateCircle:(GMSCircle *)circle @end -@interface FLTCirclesController () +@interface FGMCirclesController () @property(weak, nonatomic) NSObject *eventDelegate; @property(weak, nonatomic) GMSMapView *mapView; @@ -66,7 +64,7 @@ @interface FLTCirclesController () @end -@implementation FLTCirclesController +@implementation FGMCirclesController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -81,23 +79,22 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView - (void)addCircles:(NSArray *)circlesToAdd { for (FGMPlatformCircle *circle in circlesToAdd) { - FLTGoogleMapCircleController *controller = - [[FLTGoogleMapCircleController alloc] initCircleWithPlatformCircle:circle - mapView:self.mapView]; + FGMCircleController *controller = + [[FGMCircleController alloc] initCircleWithPlatformCircle:circle mapView:self.mapView]; self.circleIdToController[circle.circleId] = controller; } } - (void)changeCircles:(NSArray *)circlesToChange { for (FGMPlatformCircle *circle in circlesToChange) { - FLTGoogleMapCircleController *controller = self.circleIdToController[circle.circleId]; + FGMCircleController *controller = self.circleIdToController[circle.circleId]; [controller updateFromPlatformCircle:circle]; } } - (void)removeCirclesWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapCircleController *controller = self.circleIdToController[identifier]; + FGMCircleController *controller = self.circleIdToController[identifier]; if (!controller) { continue; } @@ -117,7 +114,7 @@ - (void)didTapCircleWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapCircleController *controller = self.circleIdToController[identifier]; + FGMCircleController *controller = self.circleIdToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapController.m similarity index 96% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapController.m index c265785d624e..c1f07051264c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapController.m @@ -4,25 +4,25 @@ @import GoogleMapsUtils; -#import "GoogleMapController.h" -#import "GoogleMapController_Test.h" +#import "FGMGoogleMapController.h" +#import "FGMGoogleMapController_Test.h" #import "FGMAssetProvider.h" #import "FGMConversionUtils.h" #import "FGMGroundOverlayController.h" +#import "FGMHeatmapController.h" #import "FGMMarkerUserData.h" -#import "FLTGoogleMapHeatmapController.h" -#import "FLTGoogleMapTileOverlayController.h" +#import "FGMTileOverlayController.h" #import "google_maps_flutter_pigeon_messages.g.h" -@interface FLTGoogleMapFactory () +@interface FGMGoogleMapFactory () @property(weak, nonatomic) NSObject *registrar; @property(strong, nonatomic, readonly) id sharedMapServices; @end -@implementation FLTGoogleMapFactory +@implementation FGMGoogleMapFactory @synthesize sharedMapServices = _sharedMapServices; @@ -45,7 +45,7 @@ - (instancetype)initWithRegistrar:(NSObject *)registrar // Retain the shared map services singleton, don't use the result for anything. (void)[self sharedMapServices]; - return [[FLTGoogleMapController alloc] initWithFrame:frame + return [[FGMGoogleMapController alloc] initWithFrame:frame viewIdentifier:viewId creationParameters:args registrar:self.registrar]; @@ -216,12 +216,12 @@ - (void)didTapGroundOverlayWithIdentifier:(NSString *)groundOverlayId { /// Private declarations of the FGMMapCallHandler. @interface FGMMapCallHandler () -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix; /// The map controller this inspector corresponds to. -@property(nonatomic, weak) FLTGoogleMapController *controller; +@property(nonatomic, weak) FGMGoogleMapController *controller; /// The messenger this instance was registered with by Pigeon. @property(nonatomic, copy) NSObject *messenger; /// The suffix this instance was registered under with Pigeon. @@ -234,7 +234,7 @@ - (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controll @interface FGMMapInspector () /// The map controller this inspector corresponds to. -@property(nonatomic, weak) FLTGoogleMapController *controller; +@property(nonatomic, weak) FGMGoogleMapController *controller; /// The messenger this instance was registered with by Pigeon. @property(nonatomic, copy) NSObject *messenger; /// The suffix this instance was registered under with Pigeon. @@ -243,22 +243,22 @@ @interface FGMMapInspector () #pragma mark - -@interface FLTGoogleMapController () +@interface FGMGoogleMapController () @property(nonatomic, strong) GMSMapView *mapView; @property(nonatomic, strong) FGMMapsCallbackApi *dartCallbackHandler; @property(nonatomic, strong) FGMDefaultMapEventHandler *mapEventHandler; @property(nonatomic, assign) BOOL trackCameraPosition; @property(nonatomic, strong) FGMClusterManagersController *clusterManagersController; -@property(nonatomic, strong) FLTMarkersController *markersController; -@property(nonatomic, strong) FLTPolygonsController *polygonsController; -@property(nonatomic, strong) FLTPolylinesController *polylinesController; -@property(nonatomic, strong) FLTCirclesController *circlesController; +@property(nonatomic, strong) FGMMarkersController *markersController; +@property(nonatomic, strong) FGMPolygonsController *polygonsController; +@property(nonatomic, strong) FGMPolylinesController *polylinesController; +@property(nonatomic, strong) FGMCirclesController *circlesController; // The controller that handles heatmaps -@property(nonatomic, strong) FLTHeatmapsController *heatmapsController; -@property(nonatomic, strong) FLTTileOverlaysController *tileOverlaysController; -@property(nonatomic, strong) FLTGroundOverlaysController *groundOverlaysController; +@property(nonatomic, strong) FGMHeatmapsController *heatmapsController; +@property(nonatomic, strong) FGMTileOverlaysController *tileOverlaysController; +@property(nonatomic, strong) FGMGroundOverlaysController *groundOverlaysController; // The resulting error message, if any, from the last attempt to set the map style. // This is used to provide access to errors after the fact, since the map style is generally set at // creation time and there's no mechanism to return non-fatal error details during platform view @@ -271,7 +271,7 @@ @interface FLTGoogleMapController () @end -@implementation FLTGoogleMapController +@implementation FGMGoogleMapController - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId @@ -319,21 +319,21 @@ - (instancetype)initWithMapView:(GMSMapView *_Nonnull)mapView _clusterManagersController = [[FGMClusterManagersController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _markersController = [[FLTMarkersController alloc] initWithMapView:_mapView + _markersController = [[FGMMarkersController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler clusterManagersController:_clusterManagersController assetProvider:assetProvider]; - _polygonsController = [[FLTPolygonsController alloc] initWithMapView:_mapView + _polygonsController = [[FGMPolygonsController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _polylinesController = [[FLTPolylinesController alloc] initWithMapView:_mapView + _polylinesController = [[FGMPolylinesController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _circlesController = [[FLTCirclesController alloc] initWithMapView:_mapView + _circlesController = [[FGMCirclesController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _heatmapsController = [[FLTHeatmapsController alloc] initWithMapView:_mapView]; - _tileOverlaysController = [[FLTTileOverlaysController alloc] initWithMapView:_mapView + _heatmapsController = [[FGMHeatmapsController alloc] initWithMapView:_mapView]; + _tileOverlaysController = [[FGMTileOverlaysController alloc] initWithMapView:_mapView tileProvider:self]; _groundOverlaysController = - [[FLTGroundOverlaysController alloc] initWithMapView:_mapView + [[FGMGroundOverlaysController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler assetProvider:assetProvider]; [_clusterManagersController addClusterManagers:creationParameters.initialClusterManagers]; @@ -657,7 +657,7 @@ - (void)tileWithOverlayIdentifier:(NSString *)tileOverlayId /// Private declarations of the FGMMapCallHandler. @implementation FGMMapCallHandler -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix { self = [super init]; @@ -889,7 +889,7 @@ - (nullable FlutterStandardTypedData *)takeSnapshotWithError: /// Private declarations of the FGMMapInspector. @implementation FGMMapInspector -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix { self = [super init]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapsPlugin.m similarity index 81% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapsPlugin.m index 86391b40892e..515a6bf99e90 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapsPlugin.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapsPlugin.h" +#import "FGMGoogleMapsPlugin.h" #pragma mark - GoogleMaps plugin implementation -@implementation FLTGoogleMapsPlugin +@implementation FGMGoogleMapsPlugin + (void)registerWithRegistrar:(NSObject *)registrar { - FLTGoogleMapFactory *googleMapFactory = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *googleMapFactory = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; [registrar registerViewFactory:googleMapFactory withId:@"plugins.flutter.dev/google_maps_ios" gestureRecognizersBlockingPolicy: diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGroundOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGroundOverlayController.m index f1fe7281dc09..4575c1689755 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGroundOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGroundOverlayController.m @@ -79,7 +79,7 @@ + (void)updateGroundOverlay:(GMSGroundOverlay *)groundOverlay @end -@interface FLTGroundOverlaysController () +@interface FGMGroundOverlaysController () /// A map from ground overlay id to the controller that manages it. @property(strong, nonatomic) NSMutableDictionary @@ -96,7 +96,7 @@ @interface FLTGroundOverlaysController () @end -@implementation FLTGroundOverlaysController +@implementation FGMGroundOverlaysController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMHeatmapController.m similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMHeatmapController.m index 91c93933308d..49ec16dff827 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMHeatmapController.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapHeatmapController.h" -#import "FLTGoogleMapHeatmapController_Test.h" +#import "FGMHeatmapController.h" +#import "FGMHeatmapController_Test.h" @import GoogleMapsUtils; #import "FGMConversionUtils.h" -@interface FLTGoogleMapHeatmapController () +@interface FGMHeatmapController () /// The heatmap tile layer this controller handles. @property(nonatomic, strong) GMUHeatmapTileLayer *heatmapTileLayer; @@ -19,7 +19,7 @@ @interface FLTGoogleMapHeatmapController () @end -@implementation FLTGoogleMapHeatmapController +@implementation FGMHeatmapController - (instancetype)initWithHeatmap:(FGMPlatformHeatmap *)heatmap tileLayer:(GMUHeatmapTileLayer *)heatmapTileLayer mapView:(GMSMapView *)mapView { @@ -28,9 +28,9 @@ - (instancetype)initWithHeatmap:(FGMPlatformHeatmap *)heatmap _heatmapTileLayer = heatmapTileLayer; _mapView = mapView; - [FLTGoogleMapHeatmapController updateHeatmap:_heatmapTileLayer - fromPlatformHeatmap:heatmap - withMapView:_mapView]; + [FGMHeatmapController updateHeatmap:_heatmapTileLayer + fromPlatformHeatmap:heatmap + withMapView:_mapView]; } return self; } @@ -44,9 +44,9 @@ - (void)clearTileCache { } - (void)updateFromPlatformHeatmap:(FGMPlatformHeatmap *)platformHeatmap { - [FLTGoogleMapHeatmapController updateHeatmap:_heatmapTileLayer - fromPlatformHeatmap:platformHeatmap - withMapView:_mapView]; + [FGMHeatmapController updateHeatmap:_heatmapTileLayer + fromPlatformHeatmap:platformHeatmap + withMapView:_mapView]; } + (void)updateHeatmap:(GMUHeatmapTileLayer *)heatmapTileLayer @@ -67,18 +67,18 @@ + (void)updateHeatmap:(GMUHeatmapTileLayer *)heatmapTileLayer } @end -@interface FLTHeatmapsController () +@interface FGMHeatmapsController () /// A map from heatmapId to the controller that manages it. @property(nonatomic, strong) - NSMutableDictionary *heatmapIdToController; + NSMutableDictionary *heatmapIdToController; /// The map view owned by GoogmeMapController. @property(nonatomic, weak) GMSMapView *mapView; @end -@implementation FLTHeatmapsController +@implementation FGMHeatmapsController - (instancetype)initWithMapView:(GMSMapView *)mapView { self = [super init]; if (self) { @@ -91,17 +91,17 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView { - (void)addHeatmaps:(NSArray *)heatmapsToAdd { for (FGMPlatformHeatmap *heatmap in heatmapsToAdd) { GMUHeatmapTileLayer *heatmapTileLayer = [[GMUHeatmapTileLayer alloc] init]; - FLTGoogleMapHeatmapController *controller = - [[FLTGoogleMapHeatmapController alloc] initWithHeatmap:heatmap - tileLayer:heatmapTileLayer - mapView:_mapView]; + FGMHeatmapController *controller = + [[FGMHeatmapController alloc] initWithHeatmap:heatmap + tileLayer:heatmapTileLayer + mapView:_mapView]; _heatmapIdToController[heatmap.heatmapId] = controller; } } - (void)changeHeatmaps:(NSArray *)heatmapsToChange { for (FGMPlatformHeatmap *heatmap in heatmapsToChange) { - FLTGoogleMapHeatmapController *controller = _heatmapIdToController[heatmap.heatmapId]; + FGMHeatmapController *controller = _heatmapIdToController[heatmap.heatmapId]; [controller updateFromPlatformHeatmap:heatmap]; [controller clearTileCache]; @@ -110,7 +110,7 @@ - (void)changeHeatmaps:(NSArray *)heatmapsToChange { - (void)removeHeatmapsWithIdentifiers:(NSArray *)identifiers { for (NSString *heatmapId in identifiers) { - FLTGoogleMapHeatmapController *controller = _heatmapIdToController[heatmapId]; + FGMHeatmapController *controller = _heatmapIdToController[heatmapId]; if (!controller) { continue; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerController.m similarity index 86% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerController.m index 9d061eec8b09..82e1fbf8c1ee 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerController.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapMarkerController.h" -#import "GoogleMapMarkerController_Test.h" +#import "FGMMarkerController.h" +#import "FGMMarkerController_Test.h" #import "FGMConversionUtils.h" #import "FGMImageUtils.h" #import "FGMMarkerUserData.h" -@interface FLTGoogleMapMarkerController () +@interface FGMMarkerController () @property(strong, nonatomic, readwrite) GMSMarker *marker; @property(weak, nonatomic) GMSMapView *mapView; @@ -21,7 +21,7 @@ @interface FLTGoogleMapMarkerController () @end -@implementation FLTGoogleMapMarkerController +@implementation FGMMarkerController - (instancetype)initWithMarker:(GMSMarker *)marker markerIdentifier:(NSString *)markerIdentifier @@ -66,12 +66,12 @@ - (void)updateFromPlatformMarker:(FGMPlatformMarker *)platformMarker // If marker belongs the cluster manager, visibility need to be controlled with the opacity // as the cluster manager controls when marker is on the map and when not. BOOL useOpacityForVisibility = self.clusterManagerIdentifier != nil; - [FLTGoogleMapMarkerController updateMarker:self.marker - fromPlatformMarker:platformMarker - withMapView:self.mapView - assetProvider:assetProvider - screenScale:screenScale - usingOpacityForVisibility:useOpacityForVisibility]; + [FGMMarkerController updateMarker:self.marker + fromPlatformMarker:platformMarker + withMapView:self.mapView + assetProvider:assetProvider + screenScale:screenScale + usingOpacityForVisibility:useOpacityForVisibility]; } + (void)updateMarker:(GMSMarker *)marker @@ -106,10 +106,10 @@ + (void)updateMarker:(GMSMarker *)marker @end -@interface FLTMarkersController () +@interface FGMMarkersController () @property(strong, nonatomic, readwrite) - NSMutableDictionary *markerIdentifierToController; + NSMutableDictionary *markerIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; /// Controller for adding/removing/fetching cluster managers @property(weak, nonatomic, nullable) FGMClusterManagersController *clusterManagersController; @@ -118,7 +118,7 @@ @interface FLTMarkersController () @end -@implementation FLTMarkersController +@implementation FGMMarkersController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate @@ -146,10 +146,9 @@ - (void)addMarker:(FGMPlatformMarker *)markerToAdd { NSString *markerIdentifier = markerToAdd.markerId; NSString *clusterManagerIdentifier = markerToAdd.clusterManagerId; GMSMarker *marker = [GMSMarker markerWithPosition:position]; - FLTGoogleMapMarkerController *controller = - [[FLTGoogleMapMarkerController alloc] initWithMarker:marker - markerIdentifier:markerIdentifier - mapView:self.mapView]; + FGMMarkerController *controller = [[FGMMarkerController alloc] initWithMarker:marker + markerIdentifier:markerIdentifier + mapView:self.mapView]; [controller updateFromPlatformMarker:markerToAdd assetProvider:self.assetProvider screenScale:[self getScreenScale]]; @@ -172,7 +171,7 @@ - (void)changeMarkers:(NSArray *)markersToChange { - (void)changeMarker:(FGMPlatformMarker *)markerToChange { NSString *markerIdentifier = markerToChange.markerId; - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *controller = self.markerIdentifierToController[markerIdentifier]; if (!controller) { return; } @@ -210,7 +209,7 @@ - (void)removeMarkersWithIdentifiers:(NSArray *)identifiers { } - (void)removeMarker:(NSString *)identifier { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -229,7 +228,7 @@ - (BOOL)didTapMarkerWithIdentifier:(NSString *)identifier { if (!identifier) { return NO; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return NO; } @@ -242,7 +241,7 @@ - (void)didStartDraggingMarkerWithIdentifier:(NSString *)identifier if (!identifier) { return; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -256,7 +255,7 @@ - (void)didDragMarkerWithIdentifier:(NSString *)identifier if (!identifier) { return; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -266,7 +265,7 @@ - (void)didDragMarkerWithIdentifier:(NSString *)identifier - (void)didEndDraggingMarkerWithIdentifier:(NSString *)identifier location:(CLLocationCoordinate2D)location { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -283,7 +282,7 @@ - (void)didTapInfoWindowOfMarkerWithIdentifier:(NSString *)identifier { - (void)showMarkerInfoWindowWithIdentifier:(NSString *)identifier error: (FlutterError *_Nullable __autoreleasing *_Nonnull)error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { [controller showInfoWindow]; } else { @@ -296,7 +295,7 @@ - (void)showMarkerInfoWindowWithIdentifier:(NSString *)identifier - (void)hideMarkerInfoWindowWithIdentifier:(NSString *)identifier error: (FlutterError *_Nullable __autoreleasing *_Nonnull)error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { [controller hideInfoWindow]; } else { @@ -310,7 +309,7 @@ - (void)hideMarkerInfoWindowWithIdentifier:(NSString *)identifier isInfoWindowShownForMarkerWithIdentifier:(NSString *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { return @([controller isInfoWindowShown]); } else { diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolygonController.m similarity index 79% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolygonController.m index f5d077bd4ff1..2de1c9323878 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolygonController.m @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolygonController_Test.h" +#import "FGMPolygonController.h" +#import "FGMPolygonController_Test.h" #import "FGMConversionUtils.h" @@ -18,14 +18,14 @@ return pathHoles; } -@interface FLTGoogleMapPolygonController () +@interface FGMPolygonController () @property(strong, nonatomic) GMSPolygon *polygon; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapPolygonController +@implementation FGMPolygonController - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier @@ -44,9 +44,9 @@ - (void)removePolygon { } - (void)updateFromPlatformPolygon:(FGMPlatformPolygon *)polygon { - [FLTGoogleMapPolygonController updatePolygon:self.polygon - fromPlatformPolygon:polygon - withMapView:self.mapView]; + [FGMPolygonController updatePolygon:self.polygon + fromPlatformPolygon:polygon + withMapView:self.mapView]; } + (void)updatePolygon:(GMSPolygon *)polygon @@ -67,7 +67,7 @@ + (void)updatePolygon:(GMSPolygon *)polygon @end -@interface FLTPolygonsController () +@interface FGMPolygonsController () @property(strong, nonatomic) NSMutableDictionary *polygonIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; @@ -75,7 +75,7 @@ @interface FLTPolygonsController () @end -@implementation FLTPolygonsController +@implementation FGMPolygonsController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -92,10 +92,9 @@ - (void)addPolygons:(NSArray *)polygonsToAdd { for (FGMPlatformPolygon *polygon in polygonsToAdd) { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polygon.points)); NSString *identifier = polygon.polygonId; - FLTGoogleMapPolygonController *controller = - [[FLTGoogleMapPolygonController alloc] initWithPath:path - identifier:identifier - mapView:self.mapView]; + FGMPolygonController *controller = [[FGMPolygonController alloc] initWithPath:path + identifier:identifier + mapView:self.mapView]; [controller updateFromPlatformPolygon:polygon]; self.polygonIdentifierToController[identifier] = controller; } @@ -104,14 +103,14 @@ - (void)addPolygons:(NSArray *)polygonsToAdd { - (void)changePolygons:(NSArray *)polygonsToChange { for (FGMPlatformPolygon *polygon in polygonsToChange) { NSString *identifier = polygon.polygonId; - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; [controller updateFromPlatformPolygon:polygon]; } } - (void)removePolygonWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; if (!controller) { continue; } @@ -124,7 +123,7 @@ - (void)didTapPolygonWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolylineController.m similarity index 78% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolylineController.m index ea84a4e5be54..60b96515facc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolylineController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolylineController.h" -#import "GoogleMapPolylineController_Test.h" +#import "FGMPolylineController.h" +#import "FGMPolylineController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapPolylineController () +@interface FGMPolylineController () @property(strong, nonatomic) GMSPolyline *polyline; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapPolylineController +@implementation FGMPolylineController - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier @@ -33,9 +33,9 @@ - (void)removePolyline { } - (void)updateFromPlatformPolyline:(FGMPlatformPolyline *)polyline { - [FLTGoogleMapPolylineController updatePolyline:self.polyline - fromPlatformPolyline:polyline - withMapView:self.mapView]; + [FGMPolylineController updatePolyline:self.polyline + fromPlatformPolyline:polyline + withMapView:self.mapView]; } + (void)updatePolyline:(GMSPolyline *)polyline @@ -60,7 +60,7 @@ + (void)updatePolyline:(GMSPolyline *)polyline @end -@interface FLTPolylinesController () +@interface FGMPolylinesController () @property(strong, nonatomic) NSMutableDictionary *polylineIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; @@ -69,7 +69,7 @@ @interface FLTPolylinesController () @end ; -@implementation FLTPolylinesController +@implementation FGMPolylinesController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -86,10 +86,9 @@ - (void)addPolylines:(NSArray *)polylinesToAdd { for (FGMPlatformPolyline *polyline in polylinesToAdd) { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polyline.points)); NSString *identifier = polyline.polylineId; - FLTGoogleMapPolylineController *controller = - [[FLTGoogleMapPolylineController alloc] initWithPath:path - identifier:identifier - mapView:self.mapView]; + FGMPolylineController *controller = [[FGMPolylineController alloc] initWithPath:path + identifier:identifier + mapView:self.mapView]; [controller updateFromPlatformPolyline:polyline]; self.polylineIdentifierToController[identifier] = controller; } @@ -98,14 +97,14 @@ - (void)addPolylines:(NSArray *)polylinesToAdd { - (void)changePolylines:(NSArray *)polylinesToChange { for (FGMPlatformPolyline *polyline in polylinesToChange) { NSString *identifier = polyline.polylineId; - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; [controller updateFromPlatformPolyline:polyline]; } } - (void)removePolylineWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; if (!controller) { continue; } @@ -118,7 +117,7 @@ - (void)didTapPolylineWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m index 4116c82e4115..012276e27281 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapTileOverlayController.h" -#import "FLTGoogleMapTileOverlayController_Test.h" +#import "FGMTileOverlayController.h" +#import "FGMTileOverlayController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapTileOverlayController () +@interface FGMTileOverlayController () @property(strong, nonatomic) GMSTileLayer *layer; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapTileOverlayController +@implementation FGMTileOverlayController - (instancetype)initWithTileOverlay:(FGMPlatformTileOverlay *)tileOverlay tileLayer:(GMSTileLayer *)tileLayer @@ -23,9 +23,9 @@ - (instancetype)initWithTileOverlay:(FGMPlatformTileOverlay *)tileOverlay if (self) { _layer = tileLayer; _mapView = mapView; - [FLTGoogleMapTileOverlayController updateTileLayer:tileLayer - fromPlatformTileOverlay:tileOverlay - withMapView:mapView]; + [FGMTileOverlayController updateTileLayer:tileLayer + fromPlatformTileOverlay:tileOverlay + withMapView:mapView]; } return self; } @@ -39,9 +39,9 @@ - (void)clearTileCache { } - (void)updateFromPlatformTileOverlay:(FGMPlatformTileOverlay *)overlay { - [FLTGoogleMapTileOverlayController updateTileLayer:self.layer - fromPlatformTileOverlay:overlay - withMapView:self.mapView]; + [FGMTileOverlayController updateTileLayer:self.layer + fromPlatformTileOverlay:overlay + withMapView:self.mapView]; } + (void)updateTileLayer:(GMSTileLayer *)tileLayer @@ -58,13 +58,13 @@ + (void)updateTileLayer:(GMSTileLayer *)tileLayer @end -@interface FLTTileProviderController () +@interface FGMTileProviderController () @property(weak, nonatomic) NSObject *tileProviderDelegate; @end -@implementation FLTTileProviderController +@implementation FGMTileProviderController - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier tileProvider:(NSObject *)tileProvider { @@ -129,16 +129,16 @@ - (void)requestTileForX:(NSUInteger)x @end -@interface FLTTileOverlaysController () +@interface FGMTileOverlaysController () -@property(strong, nonatomic) NSMutableDictionary - *tileOverlayIdentifierToController; +@property(strong, nonatomic) + NSMutableDictionary *tileOverlayIdentifierToController; @property(weak, nonatomic) NSObject *tileProviderDelegate; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTTileOverlaysController +@implementation FGMTileOverlaysController - (instancetype)initWithMapView:(GMSMapView *)mapView tileProvider:(NSObject *)tileProvider { @@ -154,13 +154,13 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd { for (FGMPlatformTileOverlay *tileOverlay in tileOverlaysToAdd) { NSString *identifier = tileOverlay.tileOverlayId; - FLTTileProviderController *tileProvider = - [[FLTTileProviderController alloc] initWithTileOverlayIdentifier:identifier + FGMTileProviderController *tileProvider = + [[FGMTileProviderController alloc] initWithTileOverlayIdentifier:identifier tileProvider:self.tileProviderDelegate]; - FLTGoogleMapTileOverlayController *controller = - [[FLTGoogleMapTileOverlayController alloc] initWithTileOverlay:tileOverlay - tileLayer:tileProvider - mapView:self.mapView]; + FGMTileOverlayController *controller = + [[FGMTileOverlayController alloc] initWithTileOverlay:tileOverlay + tileLayer:tileProvider + mapView:self.mapView]; self.tileOverlayIdentifierToController[identifier] = controller; } } @@ -168,15 +168,13 @@ - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd { - (void)changeTileOverlays:(NSArray *)tileOverlaysToChange { for (FGMPlatformTileOverlay *tileOverlay in tileOverlaysToChange) { NSString *identifier = tileOverlay.tileOverlayId; - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; [controller updateFromPlatformTileOverlay:tileOverlay]; } } - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; if (!controller) { continue; } @@ -186,12 +184,11 @@ - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers { } - (void)clearTileCacheWithIdentifier:(NSString *)identifier { - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; [controller clearTileCache]; } -- (nullable FLTGoogleMapTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier { +- (nullable FGMTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier { return self.tileOverlayIdentifierToController[identifier]; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController.h similarity index 91% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController.h index ac4347551135..fb3b705871d3 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController.h @@ -10,13 +10,13 @@ NS_ASSUME_NONNULL_BEGIN // Defines circle controllable by Flutter. -@interface FLTGoogleMapCircleController : NSObject +@interface FGMCircleController : NSObject - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle mapView:(GMSMapView *)mapView; - (void)removeCircle; @end -@interface FLTCirclesController : NSObject +@interface FGMCirclesController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addCircles:(NSArray *)circlesToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController_Test.h similarity index 86% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController_Test.h index 1c72d2060dc1..9c1428987225 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController_Test.h @@ -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 "GoogleMapCircleController.h" +#import "FGMCircleController.h" NS_ASSUME_NONNULL_BEGIN /// Private methods exposed for testing. -@interface FLTGoogleMapCircleController (Test) +@interface FGMCircleController (Test) /// Updates the underlying GMSCircle with the properties from the given FGMPlatformCircle. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController.h similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController.h index e9ea39630ebf..b723c8d3658e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController.h @@ -6,17 +6,17 @@ @import GoogleMaps; #import "FGMCATransactionWrapper.h" +#import "FGMCircleController.h" #import "FGMClusterManagersController.h" -#import "GoogleMapCircleController.h" -#import "GoogleMapMarkerController.h" -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolylineController.h" +#import "FGMMarkerController.h" +#import "FGMPolygonController.h" +#import "FGMPolylineController.h" #import "google_maps_flutter_pigeon_messages.g.h" NS_ASSUME_NONNULL_BEGIN // Defines map overlay controllable from Flutter. -@interface FLTGoogleMapController : NSObject +@interface FGMGoogleMapController : NSObject - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId creationParameters:(FGMPlatformMapViewCreationParams *)creationParameters @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN @end // Allows the engine to create new Google Map instances. -@interface FLTGoogleMapFactory : NSObject +@interface FGMGoogleMapFactory : NSObject - (instancetype)initWithRegistrar:(NSObject *)registrar; @end diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController_Test.h similarity index 89% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController_Test.h index bbb61545cc0c..5e1fa9371b2c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController_Test.h @@ -7,7 +7,7 @@ #import "FGMAssetProvider.h" #import "FGMCATransactionWrapper.h" -#import "GoogleMapController.h" +#import "FGMGoogleMapController.h" NS_ASSUME_NONNULL_BEGIN @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN /// /// This is a separate object from the maps controller because the Pigeon API registration keeps a /// strong reference to the implementor, but as the FlutterPlatformView, the lifetime of the -/// FLTGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be +/// FGMGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be /// the target of the registration. @interface FGMMapCallHandler : NSObject @@ -28,18 +28,18 @@ NS_ASSUME_NONNULL_BEGIN /// /// This is a separate object from the maps controller because the Pigeon API registration keeps a /// strong reference to the implementor, but as the FlutterPlatformView, the lifetime of the -/// FLTGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be +/// FGMGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be /// the target of the registration. @interface FGMMapInspector : NSObject /// Initializes a Pigeon API for inpector with a map controller. -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix; @end -@interface FLTGoogleMapController (Test) +@interface FGMGoogleMapController (Test) /// Initializes a map controller with a concrete map view. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapsPlugin.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapsPlugin.h similarity index 52% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapsPlugin.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapsPlugin.h index a5a1d05a4cbd..ec294eb3d3e9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapsPlugin.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapsPlugin.h @@ -5,16 +5,16 @@ @import Flutter; @import GoogleMaps; +#import "FGMCircleController.h" #import "FGMClusterManagersController.h" -#import "GoogleMapCircleController.h" -#import "GoogleMapController.h" -#import "GoogleMapMarkerController.h" -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolylineController.h" +#import "FGMGoogleMapController.h" +#import "FGMMarkerController.h" +#import "FGMPolygonController.h" +#import "FGMPolylineController.h" NS_ASSUME_NONNULL_BEGIN -@interface FLTGoogleMapsPlugin : NSObject +@interface FGMGoogleMapsPlugin : NSObject @end NS_ASSUME_NONNULL_END diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGroundOverlayController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGroundOverlayController.h index f4a07aa950e5..1a8f01055445 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGroundOverlayController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGroundOverlayController.h @@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN @end /// Controller of multiple ground overlays on the map. -@interface FLTGroundOverlaysController : NSObject +@interface FGMGroundOverlaysController : NSObject /// Initializes the controller with a GMSMapView, event delegate, and asset provider. - (instancetype)initWithMapView:(GMSMapView *)mapView diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController.h similarity index 95% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController.h index 93c2aacf5e57..307ae5f00b26 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController.h @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN /// Controller of a single Heatmap on the map. -@interface FLTGoogleMapHeatmapController : NSObject +@interface FGMHeatmapController : NSObject /// Initializes an instance of this class with a heatmap tile layer, a map view, and additional /// configuration options. @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN @end /// Controller of multiple Heatmaps on the map. -@interface FLTHeatmapsController : NSObject +@interface FGMHeatmapsController : NSObject /// Initializes the controller with a GMSMapView. - (instancetype)initWithMapView:(GMSMapView *)mapView; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController_Test.h similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController_Test.h index b00a48e3477f..797c309dbb2c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapHeatmapController.h" +#import "FGMHeatmapController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapHeatmapController (Test) +@interface FGMHeatmapController (Test) /// Updates the underlying GMUHeatmapTileLayer with the properties from the given platform heatmap. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController.h similarity index 96% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController.h index 57797346639e..5b6734a89478 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController.h @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - // Defines marker controllable by Flutter. -@interface FLTGoogleMapMarkerController : NSObject +@interface FGMMarkerController : NSObject @property(assign, nonatomic, readonly) BOOL consumeTapEvents; - (instancetype)initWithMarker:(GMSMarker *)marker markerIdentifier:(NSString *)markerIdentifier @@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)removeMarker; @end -@interface FLTMarkersController : NSObject +@interface FGMMarkersController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate clusterManagersController:(nullable FGMClusterManagersController *)clusterManagersController diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController_Test.h similarity index 89% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController_Test.h index d7a9c1578432..29e450df13ae 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapMarkerController.h" +#import "FGMMarkerController.h" /// Methods exposed for unit testing. -@interface FLTGoogleMapMarkerController (Test) +@interface FGMMarkerController (Test) /// The underlying controlled GMSMarker. @property(strong, nonatomic, readonly) GMSMarker *marker; @@ -23,7 +23,7 @@ @end /// Methods exposed for unit testing. -@interface FLTMarkersController (Test) +@interface FGMMarkersController (Test) /// A mapping from marker identifiers to corresponding marker controllers. @property(strong, nonatomic, readonly) NSMutableDictionary *markerIdentifierToController; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController.h index a222ca6a4eb0..b66ed908bbec 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController.h @@ -8,14 +8,14 @@ #import "google_maps_flutter_pigeon_messages.g.h" // Defines polygon controllable by Flutter. -@interface FLTGoogleMapPolygonController : NSObject +@interface FGMPolygonController : NSObject - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier mapView:(GMSMapView *)mapView; - (void)removePolygon; @end -@interface FLTPolygonsController : NSObject +@interface FGMPolygonsController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addPolygons:(NSArray *)polygonsToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController_Test.h similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController_Test.h index ab4cf60be224..5072e4a4c7d7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolygonController.h" +#import "FGMPolygonController.h" /// Methods exposed for unit testing. -@interface FLTGoogleMapPolygonController (Test) +@interface FGMPolygonController (Test) /// Updates the underlying GMSPolygon with the properties from the given FGMPlatformPolygon. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController.h index ccf37dae9a35..14071b7700e2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController.h @@ -8,14 +8,14 @@ #import "google_maps_flutter_pigeon_messages.g.h" // Defines polyline controllable by Flutter. -@interface FLTGoogleMapPolylineController : NSObject +@interface FGMPolylineController : NSObject - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier mapView:(GMSMapView *)mapView; - (void)removePolyline; @end -@interface FLTPolylinesController : NSObject +@interface FGMPolylinesController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addPolylines:(NSArray *)polylinesToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController_Test.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController_Test.h index df9e31293951..548bcff27cce 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolylineController.h" +#import "FGMPolylineController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapPolylineController (Test) +@interface FGMPolylineController (Test) /// Polyline instance the controller is attached to @property(strong, nonatomic) GMSPolyline *polyline; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController.h similarity index 87% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController.h index b4c707e6d0b4..0785c22f9a43 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController.h @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - -@interface FLTGoogleMapTileOverlayController : NSObject +@interface FGMTileOverlayController : NSObject /// The layer managed by this controller instance. @property(readonly, nonatomic) GMSTileLayer *layer; @@ -31,20 +31,20 @@ NS_ASSUME_NONNULL_BEGIN - (void)clearTileCache; @end -@interface FLTTileProviderController : GMSTileLayer +@interface FGMTileProviderController : GMSTileLayer @property(copy, nonatomic, readonly) NSString *tileOverlayIdentifier; - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier tileProvider:(NSObject *)tileProvider; @end -@interface FLTTileOverlaysController : NSObject +@interface FGMTileOverlaysController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView tileProvider:(NSObject *)tileProvider; - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd; - (void)changeTileOverlays:(NSArray *)tileOverlaysToChange; - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers; - (void)clearTileCacheWithIdentifier:(NSString *)identifier; -- (nullable FLTGoogleMapTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier; +- (nullable FGMTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier; @end NS_ASSUME_NONNULL_END diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController_Test.h similarity index 84% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController_Test.h index e753698cde45..faebc2b98a1b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapTileOverlayController.h" +#import "FGMTileOverlayController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapTileOverlayController (Test) +@interface FGMTileOverlayController (Test) /// Updates the underlying GMSTileLayer with the properties from the given FGMPlatformTileOverlay. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index f971ae9b5678..97e00b0c6f07 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -13,7 +13,7 @@ flutter: implements: google_maps_flutter platforms: ios: - pluginClass: FLTGoogleMapsPlugin + pluginClass: FGMGoogleMapsPlugin dartPluginClass: GoogleMapsFlutterIOS dependencies: From d110b90325e1d0cbe0fc9082ebd1d3096769b11e Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 4 Feb 2026 11:25:01 -0500 Subject: [PATCH 2/9] Version bump --- .../google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md | 4 ++++ .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md index 3338803175ed..96f3592263d1 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.17.2 + +* Standardizes Objective-C class names. + ## 2.17.1 * Refactors code for improved testability. diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 97e00b0c6f07..a4fa0592292a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_ios description: iOS implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.17.1 +version: 2.17.2 environment: sdk: ^3.9.0 From c9f1ada5e5e4f968428d380cddce9d304ef5982f Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 4 Feb 2026 11:48:20 -0500 Subject: [PATCH 3/9] Convert folder to group for CocoaPods compat --- .../ios/Runner.xcodeproj/project.pbxproj | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Runner.xcodeproj/project.pbxproj index 2db6a30056ec..633cf9dc7247 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ @@ -12,6 +12,9 @@ 2A6906C72D263DF4001F8426 /* GroundOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A6906C62D263DE7001F8426 /* GroundOverlayControllerTests.m */; }; 2BDE99378062AE3E60B40021 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3ACE0AFE8D82CD5962486AFD /* Pods_RunnerTests.framework */; }; 330909FF2D99B7A60077A751 /* MarkerControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 330909FE2D99B79B0077A751 /* MarkerControllerTests.m */; }; + 3390B45E2F33AFA60094DEB9 /* PartiallyMockedMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3390B4582F33AFA60094DEB9 /* PartiallyMockedMapView.m */; }; + 3390B45F2F33AFA60094DEB9 /* TestAssetProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 3390B45A2F33AFA60094DEB9 /* TestAssetProvider.m */; }; + 3390B4602F33AFA60094DEB9 /* TestMapEventHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 3390B45C2F33AFA60094DEB9 /* TestMapEventHandler.m */; }; 339355BA2EB3E50300EBF864 /* CircleControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355B92EB3E4F900EBF864 /* CircleControllerTests.m */; }; 339355BD2EB3E56300EBF864 /* TileOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BC2EB3E55600EBF864 /* TileOverlayControllerTests.m */; }; 339355BF2EB535A600EBF864 /* HeatmapControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BE2EB5359B00EBF864 /* HeatmapControllerTests.m */; }; @@ -67,6 +70,12 @@ 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 2A6906C62D263DE7001F8426 /* GroundOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroundOverlayControllerTests.m; sourceTree = ""; }; 330909FE2D99B79B0077A751 /* MarkerControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MarkerControllerTests.m; sourceTree = ""; }; + 3390B4572F33AFA60094DEB9 /* PartiallyMockedMapView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PartiallyMockedMapView.h; sourceTree = ""; }; + 3390B4582F33AFA60094DEB9 /* PartiallyMockedMapView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PartiallyMockedMapView.m; sourceTree = ""; }; + 3390B4592F33AFA60094DEB9 /* TestAssetProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestAssetProvider.h; sourceTree = ""; }; + 3390B45A2F33AFA60094DEB9 /* TestAssetProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestAssetProvider.m; sourceTree = ""; }; + 3390B45B2F33AFA60094DEB9 /* TestMapEventHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestMapEventHandler.h; sourceTree = ""; }; + 3390B45C2F33AFA60094DEB9 /* TestMapEventHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestMapEventHandler.m; sourceTree = ""; }; 339355B82EB3E4D500EBF864 /* PolygonControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PolygonControllerTests.m; sourceTree = ""; }; 339355B92EB3E4F900EBF864 /* CircleControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CircleControllerTests.m; sourceTree = ""; }; 339355BC2EB3E55600EBF864 /* TileOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TileOverlayControllerTests.m; sourceTree = ""; }; @@ -103,10 +112,6 @@ F7151F22265D7EE50028CB91 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFileSystemSynchronizedRootGroup section */ - 33EAC5392F294BEB00CB15CE /* TestUtils */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = TestUtils; sourceTree = ""; }; -/* End PBXFileSystemSynchronizedRootGroup section */ - /* Begin PBXFrameworksBuildPhase section */ 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; @@ -144,6 +149,19 @@ name = Frameworks; sourceTree = ""; }; + 3390B45D2F33AFA60094DEB9 /* TestUtils */ = { + isa = PBXGroup; + children = ( + 3390B4572F33AFA60094DEB9 /* PartiallyMockedMapView.h */, + 3390B4582F33AFA60094DEB9 /* PartiallyMockedMapView.m */, + 3390B4592F33AFA60094DEB9 /* TestAssetProvider.h */, + 3390B45A2F33AFA60094DEB9 /* TestAssetProvider.m */, + 3390B45B2F33AFA60094DEB9 /* TestMapEventHandler.h */, + 3390B45C2F33AFA60094DEB9 /* TestMapEventHandler.m */, + ); + path = TestUtils; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -209,7 +227,7 @@ F7151F11265D7ED70028CB91 /* RunnerTests */ = { isa = PBXGroup; children = ( - 33EAC5392F294BEB00CB15CE /* TestUtils */, + 3390B45D2F33AFA60094DEB9 /* TestUtils */, F269303A2BB389BF00BF17C4 /* assets */, 528F16822C62941000148160 /* ClusterManagersControllerTests.m */, 6851F3552835BC180032B7C8 /* ConversionsUtilsTests.m */, @@ -280,9 +298,6 @@ dependencies = ( F7151F16265D7ED70028CB91 /* PBXTargetDependency */, ); - fileSystemSynchronizedGroups = ( - 33EAC5392F294BEB00CB15CE /* TestUtils */, - ); name = RunnerTests; productName = RunnerTests; productReference = F7151F10265D7ED70028CB91 /* RunnerTests.xctest */; @@ -509,6 +524,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3390B45E2F33AFA60094DEB9 /* PartiallyMockedMapView.m in Sources */, + 3390B45F2F33AFA60094DEB9 /* TestAssetProvider.m in Sources */, + 3390B4602F33AFA60094DEB9 /* TestMapEventHandler.m in Sources */, 528F16832C62941000148160 /* ClusterManagersControllerTests.m in Sources */, 339355BA2EB3E50300EBF864 /* CircleControllerTests.m in Sources */, 339355BF2EB535A600EBF864 /* HeatmapControllerTests.m in Sources */, From 4a299fa87c9d1ddb4ddf3ccd9768fcfa3a8e02ef Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 12 Feb 2026 11:54:37 -0500 Subject: [PATCH 4/9] Sync to the other copies --- .../ios/Runner.xcodeproj/project.pbxproj | 158 +++++++++--------- ...trollerTests.m => CircleControllerTests.m} | 10 +- ...sts.m => ClusterManagersControllerTests.m} | 14 +- ...nsUtilsTests.m => ConversionsUtilsTests.m} | 6 +- .../RunnerTests/ExtractIconFromDataTests.m | 2 +- .../example/ios/RunnerTests/GoogleMapsTests.m | 32 ++-- ...Tests.m => GroundOverlayControllerTests.m} | 28 ++-- ...rollerTests.m => HeatmapControllerTests.m} | 10 +- ...trollerTests.m => MarkerControllerTests.m} | 102 ++++++----- ...rollerTests.m => PolygonControllerTests.m} | 43 +++-- ...ollerTests.m => PolylineControllerTests.m} | 31 ++-- .../{ => TestUtils}/PartiallyMockedMapView.h | 0 .../{ => TestUtils}/PartiallyMockedMapView.m | 0 .../{ => TestUtils}/TestAssetProvider.h | 0 .../{ => TestUtils}/TestAssetProvider.m | 0 .../{ => TestUtils}/TestMapEventHandler.h | 0 .../{ => TestUtils}/TestMapEventHandler.m | 0 ...erTests.m => TileOverlayControllerTests.m} | 23 ++- ...rTests.m => TileProviderControllerTests.m} | 8 +- .../FGMCircleController.m} | 33 ++-- ...pController.m => FGMGoogleMapController.m} | 56 +++---- ...ogleMapsPlugin.m => FGMGoogleMapsPlugin.m} | 6 +- ...mapController.m => FGMHeatmapController.m} | 38 ++--- ...rkerController.m => FGMMarkerController.m} | 51 +++--- .../FGMPolygonController.m} | 31 ++-- .../FGMPolylineController.m} | 31 ++-- .../FGMTileOverlayController.m} | 55 +++--- .../FGMCircleController.h} | 4 +- ...ller_Test.h => FGMCircleController_Test.h} | 4 +- .../FGMGoogleMapController.h} | 12 +- .../FGMGoogleMapController_Test.h} | 10 +- .../FGMGoogleMapsPlugin.h} | 12 +- .../FGMGroundOverlayController.h | 2 +- .../FGMHeatmapController.h} | 4 +- .../FGMHeatmapController_Test.h} | 4 +- .../FGMMarkerController.h} | 4 +- .../FGMMarkerController_Test.h} | 6 +- .../FGMPolygonController.h} | 4 +- .../FGMPolygonController_Test.h} | 4 +- .../FGMPolylineController.h} | 4 +- .../FGMPolylineController_Test.h} | 4 +- ...ontroller.h => FGMTileOverlayController.h} | 8 +- .../FGMTileOverlayController_Test.h} | 4 +- .../pubspec.yaml | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 158 +++++++++--------- ...trollerTests.m => CircleControllerTests.m} | 10 +- ...sts.m => ClusterManagersControllerTests.m} | 14 +- ...nsUtilsTests.m => ConversionsUtilsTests.m} | 6 +- .../RunnerTests/ExtractIconFromDataTests.m | 2 +- .../example/ios/RunnerTests/GoogleMapsTests.m | 32 ++-- ...Tests.m => GroundOverlayControllerTests.m} | 28 ++-- ...rollerTests.m => HeatmapControllerTests.m} | 10 +- ...trollerTests.m => MarkerControllerTests.m} | 102 ++++++----- ...rollerTests.m => PolygonControllerTests.m} | 43 +++-- ...ollerTests.m => PolylineControllerTests.m} | 31 ++-- .../{ => TestUtils}/PartiallyMockedMapView.h | 0 .../{ => TestUtils}/PartiallyMockedMapView.m | 0 .../{ => TestUtils}/TestAssetProvider.h | 0 .../{ => TestUtils}/TestAssetProvider.m | 0 .../{ => TestUtils}/TestMapEventHandler.h | 0 .../{ => TestUtils}/TestMapEventHandler.m | 0 ...erTests.m => TileOverlayControllerTests.m} | 23 ++- ...rTests.m => TileProviderControllerTests.m} | 8 +- ...rcleController.m => FGMCircleController.m} | 33 ++-- ...pController.m => FGMGoogleMapController.m} | 56 +++---- .../FGMGoogleMapsPlugin.m} | 6 +- ...mapController.m => FGMHeatmapController.m} | 38 ++--- .../FGMMarkerController.m} | 51 +++--- .../FGMPolygonController.m} | 31 ++-- .../FGMPolylineController.m} | 31 ++-- ...ontroller.m => FGMTileOverlayController.m} | 55 +++--- .../FGMCircleController.h} | 4 +- .../FGMCircleController_Test.h} | 4 +- .../FGMGoogleMapController.h} | 12 +- .../FGMGoogleMapController_Test.h} | 10 +- ...ogleMapsPlugin.h => FGMGoogleMapsPlugin.h} | 12 +- .../FGMGroundOverlayController.h | 2 +- .../FGMHeatmapController.h} | 4 +- .../FGMHeatmapController_Test.h} | 4 +- ...rkerController.h => FGMMarkerController.h} | 4 +- .../FGMMarkerController_Test.h} | 6 +- .../FGMPolygonController.h} | 4 +- .../FGMPolygonController_Test.h} | 4 +- .../FGMPolylineController.h} | 4 +- .../FGMPolylineController_Test.h} | 4 +- ...ontroller.h => FGMTileOverlayController.h} | 8 +- .../FGMTileOverlayController_Test.h} | 4 +- .../google_maps_flutter_ios_sdk9/pubspec.yaml | 2 +- ...trollerTests.m => CircleControllerTests.m} | 10 +- ...sts.m => ClusterManagersControllerTests.m} | 14 +- ...nsUtilsTests.m => ConversionsUtilsTests.m} | 6 +- .../RunnerTests/ExtractIconFromDataTests.m | 2 +- .../example/ios/RunnerTests/GoogleMapsTests.m | 32 ++-- ...Tests.m => GroundOverlayControllerTests.m} | 28 ++-- ...rollerTests.m => HeatmapControllerTests.m} | 10 +- ...trollerTests.m => MarkerControllerTests.m} | 102 ++++++----- ...rollerTests.m => PolygonControllerTests.m} | 43 +++-- ...ollerTests.m => PolylineControllerTests.m} | 31 ++-- .../{ => TestUtils}/PartiallyMockedMapView.h | 0 .../{ => TestUtils}/PartiallyMockedMapView.m | 0 .../{ => TestUtils}/TestAssetProvider.h | 0 .../{ => TestUtils}/TestAssetProvider.m | 0 .../{ => TestUtils}/TestMapEventHandler.h | 0 .../{ => TestUtils}/TestMapEventHandler.m | 0 ...erTests.m => TileOverlayControllerTests.m} | 23 ++- ...rTests.m => TileProviderControllerTests.m} | 8 +- .../FGMCircleController.m} | 33 ++-- ...pController.m => FGMGoogleMapController.m} | 56 +++---- .../FGMGoogleMapsPlugin.m} | 6 +- ...mapController.m => FGMHeatmapController.m} | 38 ++--- .../FGMMarkerController.m} | 51 +++--- .../FGMPolygonController.m} | 31 ++-- .../FGMPolylineController.m} | 31 ++-- .../FGMTileOverlayController.m} | 55 +++--- ...rcleController.h => FGMCircleController.h} | 4 +- .../FGMCircleController_Test.h} | 4 +- .../FGMGoogleMapController.h} | 12 +- .../FGMGoogleMapController_Test.h} | 10 +- .../FGMGoogleMapsPlugin.h} | 12 +- .../FGMGroundOverlayController.h | 2 +- .../FGMHeatmapController.h} | 4 +- .../FGMHeatmapController_Test.h} | 4 +- .../FGMMarkerController.h} | 4 +- .../FGMMarkerController_Test.h} | 6 +- .../FGMPolygonController.h} | 4 +- .../FGMPolygonController_Test.h} | 4 +- .../FGMPolylineController.h} | 4 +- .../FGMPolylineController_Test.h} | 4 +- ...ontroller.h => FGMTileOverlayController.h} | 8 +- .../FGMTileOverlayController_Test.h} | 4 +- 130 files changed, 1185 insertions(+), 1235 deletions(-) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{GoogleMapsCircleControllerTests.m => CircleControllerTests.m} (93%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{FGMClusterManagersControllerTests.m => ClusterManagersControllerTests.m} (95%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{FGMConversionsUtilsTests.m => ConversionsUtilsTests.m} (99%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{GoogleMapsGroundOverlayControllerTests.m => GroundOverlayControllerTests.m} (93%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{FLTGoogleMapHeatmapControllerTests.m => HeatmapControllerTests.m} (94%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{GoogleMapsMarkerControllerTests.m => MarkerControllerTests.m} (82%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{GoogleMapsPolygonControllerTests.m => PolygonControllerTests.m} (70%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{GoogleMapsPolylineControllerTests.m => PolylineControllerTests.m} (85%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{ => TestUtils}/PartiallyMockedMapView.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{ => TestUtils}/PartiallyMockedMapView.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{ => TestUtils}/TestAssetProvider.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{ => TestUtils}/TestAssetProvider.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{ => TestUtils}/TestMapEventHandler.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{ => TestUtils}/TestMapEventHandler.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{GoogleMapsTileOverlayControllerTests.m => TileOverlayControllerTests.m} (77%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/{FLTTileProviderControllerTests.m => TileProviderControllerTests.m} (90%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMCircleController.m} (74%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/{GoogleMapController.m => FGMGoogleMapController.m} (96%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/{FLTGoogleMapsPlugin.m => FGMGoogleMapsPlugin.m} (81%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/{FLTGoogleMapHeatmapController.m => FGMHeatmapController.m} (76%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/{GoogleMapMarkerController.m => FGMMarkerController.m} (86%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapPolygonController.m => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMPolygonController.m} (79%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMPolylineController.m} (78%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMTileOverlayController.m} (76%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapCircleController.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMCircleController.h} (91%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/{GoogleMapCircleController_Test.h => FGMCircleController_Test.h} (86%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapController.h} (76%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapController_Test.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapController_Test.h} (89%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapsPlugin.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapsPlugin.h} (52%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMHeatmapController.h} (95%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController_Test.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMHeatmapController_Test.h} (85%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMMarkerController.h} (96%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapMarkerController_Test.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMMarkerController_Test.h} (89%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolygonController.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolygonController.h} (90%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController_Test.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolygonController_Test.h} (85%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolylineController.h} (90%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolylineController_Test.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolylineController_Test.h} (90%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/{FLTGoogleMapTileOverlayController.h => FGMTileOverlayController.h} (87%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController_Test.h => google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMTileOverlayController_Test.h} (84%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{GoogleMapsCircleControllerTests.m => CircleControllerTests.m} (93%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{FGMClusterManagersControllerTests.m => ClusterManagersControllerTests.m} (95%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{FGMConversionsUtilsTests.m => ConversionsUtilsTests.m} (99%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{GoogleMapsGroundOverlayControllerTests.m => GroundOverlayControllerTests.m} (93%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{FLTGoogleMapHeatmapControllerTests.m => HeatmapControllerTests.m} (94%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{GoogleMapsMarkerControllerTests.m => MarkerControllerTests.m} (82%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{GoogleMapsPolygonControllerTests.m => PolygonControllerTests.m} (70%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{GoogleMapsPolylineControllerTests.m => PolylineControllerTests.m} (85%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{ => TestUtils}/PartiallyMockedMapView.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{ => TestUtils}/PartiallyMockedMapView.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{ => TestUtils}/TestAssetProvider.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{ => TestUtils}/TestAssetProvider.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{ => TestUtils}/TestMapEventHandler.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{ => TestUtils}/TestMapEventHandler.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{GoogleMapsTileOverlayControllerTests.m => TileOverlayControllerTests.m} (77%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/{FLTTileProviderControllerTests.m => TileProviderControllerTests.m} (90%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/{GoogleMapCircleController.m => FGMCircleController.m} (74%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/{GoogleMapController.m => FGMGoogleMapController.m} (96%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGoogleMapsPlugin.m} (81%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/{FLTGoogleMapHeatmapController.m => FGMHeatmapController.m} (76%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMMarkerController.m} (86%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMPolygonController.m} (79%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapPolylineController.m => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMPolylineController.m} (78%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/{FLTGoogleMapTileOverlayController.m => FGMTileOverlayController.m} (76%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapCircleController.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMCircleController.h} (91%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController_Test.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMCircleController_Test.h} (86%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapController.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGoogleMapController.h} (76%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController_Test.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGoogleMapController_Test.h} (89%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/{FLTGoogleMapsPlugin.h => FGMGoogleMapsPlugin.h} (52%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapHeatmapController.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMHeatmapController.h} (95%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapHeatmapController_Test.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMHeatmapController_Test.h} (85%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/{GoogleMapMarkerController.h => FGMMarkerController.h} (96%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController_Test.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMMarkerController_Test.h} (89%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolygonController.h} (90%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolygonController_Test.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolygonController_Test.h} (85%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolylineController.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolylineController.h} (90%) rename packages/google_maps_flutter/{google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController_Test.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolylineController_Test.h} (90%) rename packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/{FLTGoogleMapTileOverlayController.h => FGMTileOverlayController.h} (87%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapTileOverlayController_Test.h => google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMTileOverlayController_Test.h} (84%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{GoogleMapsCircleControllerTests.m => CircleControllerTests.m} (93%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{FGMClusterManagersControllerTests.m => ClusterManagersControllerTests.m} (95%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{FGMConversionsUtilsTests.m => ConversionsUtilsTests.m} (99%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{GoogleMapsGroundOverlayControllerTests.m => GroundOverlayControllerTests.m} (93%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{FLTGoogleMapHeatmapControllerTests.m => HeatmapControllerTests.m} (94%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{GoogleMapsMarkerControllerTests.m => MarkerControllerTests.m} (82%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{GoogleMapsPolygonControllerTests.m => PolygonControllerTests.m} (70%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{GoogleMapsPolylineControllerTests.m => PolylineControllerTests.m} (85%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{ => TestUtils}/PartiallyMockedMapView.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{ => TestUtils}/PartiallyMockedMapView.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{ => TestUtils}/TestAssetProvider.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{ => TestUtils}/TestAssetProvider.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{ => TestUtils}/TestMapEventHandler.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{ => TestUtils}/TestMapEventHandler.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{GoogleMapsTileOverlayControllerTests.m => TileOverlayControllerTests.m} (77%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/{FLTTileProviderControllerTests.m => TileProviderControllerTests.m} (90%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapCircleController.m => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMCircleController.m} (74%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/{GoogleMapController.m => FGMGoogleMapController.m} (96%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FLTGoogleMapsPlugin.m => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapsPlugin.m} (81%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/{FLTGoogleMapHeatmapController.m => FGMHeatmapController.m} (76%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapMarkerController.m => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerController.m} (86%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapPolygonController.m => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolygonController.m} (79%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapPolylineController.m => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolylineController.m} (78%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FLTGoogleMapTileOverlayController.m => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m} (76%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{GoogleMapCircleController.h => FGMCircleController.h} (91%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapCircleController_Test.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController_Test.h} (86%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapController.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController.h} (76%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapController_Test.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController_Test.h} (89%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapsPlugin.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapsPlugin.h} (52%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapHeatmapController.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController.h} (95%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapHeatmapController_Test.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController_Test.h} (85%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapMarkerController.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController.h} (96%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapMarkerController_Test.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController_Test.h} (89%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolygonController.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController.h} (90%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolygonController_Test.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController_Test.h} (85%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolylineController.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController.h} (90%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolylineController_Test.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController_Test.h} (90%) rename packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/{FLTGoogleMapTileOverlayController.h => FGMTileOverlayController.h} (87%) rename packages/google_maps_flutter/{google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapTileOverlayController_Test.h => google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController_Test.h} (84%) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/Runner.xcodeproj/project.pbxproj index c2141f9f86c7..5037cb4b5bff 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/Runner.xcodeproj/project.pbxproj @@ -7,27 +7,27 @@ objects = { /* Begin PBXBuildFile section */ - 0DD7B6C32B744EEF00E857FD /* FLTTileProviderControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DD7B6C22B744EEF00E857FD /* FLTTileProviderControllerTests.m */; }; + 0DD7B6C32B744EEF00E857FD /* TileProviderControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DD7B6C22B744EEF00E857FD /* TileProviderControllerTests.m */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 2A6906C72D263DF4001F8426 /* GoogleMapsGroundOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A6906C62D263DE7001F8426 /* GoogleMapsGroundOverlayControllerTests.m */; }; + 2A6906C72D263DF4001F8426 /* GroundOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A6906C62D263DE7001F8426 /* GroundOverlayControllerTests.m */; }; 2BDE99378062AE3E60B40021 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3ACE0AFE8D82CD5962486AFD /* Pods_RunnerTests.framework */; }; - 330909FF2D99B7A60077A751 /* GoogleMapsMarkerControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 330909FE2D99B79B0077A751 /* GoogleMapsMarkerControllerTests.m */; }; - 3378E6352F23F9300045E7DA /* TestMapEventHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 3378E6342F23F92E0045E7DA /* TestMapEventHandler.m */; }; - 339355BA2EB3E50300EBF864 /* GoogleMapsCircleControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355B92EB3E4F900EBF864 /* GoogleMapsCircleControllerTests.m */; }; - 339355BD2EB3E56300EBF864 /* GoogleMapsTileOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BC2EB3E55600EBF864 /* GoogleMapsTileOverlayControllerTests.m */; }; - 339355BF2EB535A600EBF864 /* FLTGoogleMapHeatmapControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BE2EB5359B00EBF864 /* FLTGoogleMapHeatmapControllerTests.m */; }; + 330909FF2D99B7A60077A751 /* MarkerControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 330909FE2D99B79B0077A751 /* MarkerControllerTests.m */; }; + 3390B45E2F33AFA60094DEB9 /* PartiallyMockedMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3390B4582F33AFA60094DEB9 /* PartiallyMockedMapView.m */; }; + 3390B45F2F33AFA60094DEB9 /* TestAssetProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 3390B45A2F33AFA60094DEB9 /* TestAssetProvider.m */; }; + 3390B4602F33AFA60094DEB9 /* TestMapEventHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 3390B45C2F33AFA60094DEB9 /* TestMapEventHandler.m */; }; + 339355BA2EB3E50300EBF864 /* CircleControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355B92EB3E4F900EBF864 /* CircleControllerTests.m */; }; + 339355BD2EB3E56300EBF864 /* TileOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BC2EB3E55600EBF864 /* TileOverlayControllerTests.m */; }; + 339355BF2EB535A600EBF864 /* HeatmapControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BE2EB5359B00EBF864 /* HeatmapControllerTests.m */; }; 339DF1F02F1FE49800748863 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 339DF1EF2F1FE49300748863 /* AppDelegate.swift */; }; - 33BF9C6E2F2182DF0005FA15 /* TestAssetProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 33BF9C6D2F2182DB0005FA15 /* TestAssetProvider.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 478116522BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 478116512BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m */; }; - 528F16832C62941000148160 /* FGMClusterManagersControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 528F16822C62941000148160 /* FGMClusterManagersControllerTests.m */; }; + 478116522BEF8F47002F593E /* PolylineControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 478116512BEF8F47002F593E /* PolylineControllerTests.m */; }; + 528F16832C62941000148160 /* ClusterManagersControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 528F16822C62941000148160 /* ClusterManagersControllerTests.m */; }; 528F16872C62952700148160 /* ExtractIconFromDataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 528F16862C62952700148160 /* ExtractIconFromDataTests.m */; }; - 6851F3562835BC180032B7C8 /* FGMConversionsUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6851F3552835BC180032B7C8 /* FGMConversionsUtilsTests.m */; }; + 6851F3562835BC180032B7C8 /* ConversionsUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6851F3552835BC180032B7C8 /* ConversionsUtilsTests.m */; }; 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - 982F2A6C27BADE17003C81F4 /* PartiallyMockedMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */; }; B3A7FA04ABB7B84780729949 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A9A8623F5CA9BBC813DC6B /* Pods_Runner.framework */; }; F269303B2BB389BF00BF17C4 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = F269303A2BB389BF00BF17C4 /* assets */; }; F7151F13265D7ED70028CB91 /* GoogleMapsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F7151F12265D7ED70028CB91 /* GoogleMapsTests.m */; }; @@ -65,28 +65,30 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0DD7B6C22B744EEF00E857FD /* FLTTileProviderControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLTTileProviderControllerTests.m; sourceTree = ""; }; + 0DD7B6C22B744EEF00E857FD /* TileProviderControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TileProviderControllerTests.m; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 2A6906C62D263DE7001F8426 /* GoogleMapsGroundOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsGroundOverlayControllerTests.m; sourceTree = ""; }; - 330909FE2D99B79B0077A751 /* GoogleMapsMarkerControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsMarkerControllerTests.m; sourceTree = ""; }; - 3378E6332F23F9220045E7DA /* TestMapEventHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestMapEventHandler.h; sourceTree = ""; }; - 3378E6342F23F92E0045E7DA /* TestMapEventHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestMapEventHandler.m; sourceTree = ""; }; - 339355B82EB3E4D500EBF864 /* GoogleMapsPolygonControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsPolygonControllerTests.m; sourceTree = ""; }; - 339355B92EB3E4F900EBF864 /* GoogleMapsCircleControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsCircleControllerTests.m; sourceTree = ""; }; - 339355BC2EB3E55600EBF864 /* GoogleMapsTileOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsTileOverlayControllerTests.m; sourceTree = ""; }; - 339355BE2EB5359B00EBF864 /* FLTGoogleMapHeatmapControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLTGoogleMapHeatmapControllerTests.m; sourceTree = ""; }; + 2A6906C62D263DE7001F8426 /* GroundOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroundOverlayControllerTests.m; sourceTree = ""; }; + 330909FE2D99B79B0077A751 /* MarkerControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MarkerControllerTests.m; sourceTree = ""; }; + 3390B4572F33AFA60094DEB9 /* PartiallyMockedMapView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PartiallyMockedMapView.h; sourceTree = ""; }; + 3390B4582F33AFA60094DEB9 /* PartiallyMockedMapView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PartiallyMockedMapView.m; sourceTree = ""; }; + 3390B4592F33AFA60094DEB9 /* TestAssetProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestAssetProvider.h; sourceTree = ""; }; + 3390B45A2F33AFA60094DEB9 /* TestAssetProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestAssetProvider.m; sourceTree = ""; }; + 3390B45B2F33AFA60094DEB9 /* TestMapEventHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestMapEventHandler.h; sourceTree = ""; }; + 3390B45C2F33AFA60094DEB9 /* TestMapEventHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestMapEventHandler.m; sourceTree = ""; }; + 339355B82EB3E4D500EBF864 /* PolygonControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PolygonControllerTests.m; sourceTree = ""; }; + 339355B92EB3E4F900EBF864 /* CircleControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CircleControllerTests.m; sourceTree = ""; }; + 339355BC2EB3E55600EBF864 /* TileOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TileOverlayControllerTests.m; sourceTree = ""; }; + 339355BE2EB5359B00EBF864 /* HeatmapControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HeatmapControllerTests.m; sourceTree = ""; }; 339DF1EF2F1FE49300748863 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 339DF1F12F1FE4AD00748863 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; - 33BF9C6C2F2182CB0005FA15 /* TestAssetProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestAssetProvider.h; sourceTree = ""; }; - 33BF9C6D2F2182DB0005FA15 /* TestAssetProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestAssetProvider.m; sourceTree = ""; }; 3ACE0AFE8D82CD5962486AFD /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 478116512BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsPolylineControllerTests.m; sourceTree = ""; }; - 528F16822C62941000148160 /* FGMClusterManagersControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FGMClusterManagersControllerTests.m; sourceTree = ""; }; + 478116512BEF8F47002F593E /* PolylineControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PolylineControllerTests.m; sourceTree = ""; }; + 528F16822C62941000148160 /* ClusterManagersControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClusterManagersControllerTests.m; sourceTree = ""; }; 528F16862C62952700148160 /* ExtractIconFromDataTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExtractIconFromDataTests.m; sourceTree = ""; }; 61A9A8623F5CA9BBC813DC6B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 6851F3552835BC180032B7C8 /* FGMConversionsUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FGMConversionsUtilsTests.m; sourceTree = ""; }; + 6851F3552835BC180032B7C8 /* ConversionsUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversionsUtilsTests.m; sourceTree = ""; }; 733AFAB37683A9DA7512F09C /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 784666492D4C4C64000A1A5F /* FlutterFramework */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterFramework; path = Flutter/ephemeral/Packages/.packages/FlutterFramework; sourceTree = ""; }; 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; @@ -98,8 +100,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 982F2A6A27BADE17003C81F4 /* PartiallyMockedMapView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PartiallyMockedMapView.h; sourceTree = ""; }; - 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PartiallyMockedMapView.m; sourceTree = ""; }; B7AFC65E3DD5AC60D834D83D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; E52C6A6210A56F027C582EF9 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; EA0E91726245EDC22B97E8B9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; @@ -149,6 +149,19 @@ name = Frameworks; sourceTree = ""; }; + 3390B45D2F33AFA60094DEB9 /* TestUtils */ = { + isa = PBXGroup; + children = ( + 3390B4572F33AFA60094DEB9 /* PartiallyMockedMapView.h */, + 3390B4582F33AFA60094DEB9 /* PartiallyMockedMapView.m */, + 3390B4592F33AFA60094DEB9 /* TestAssetProvider.h */, + 3390B45A2F33AFA60094DEB9 /* TestAssetProvider.m */, + 3390B45B2F33AFA60094DEB9 /* TestMapEventHandler.h */, + 3390B45C2F33AFA60094DEB9 /* TestMapEventHandler.m */, + ); + path = TestUtils; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -214,25 +227,20 @@ F7151F11265D7ED70028CB91 /* RunnerTests */ = { isa = PBXGroup; children = ( + 3390B45D2F33AFA60094DEB9 /* TestUtils */, F269303A2BB389BF00BF17C4 /* assets */, + 528F16822C62941000148160 /* ClusterManagersControllerTests.m */, + 6851F3552835BC180032B7C8 /* ConversionsUtilsTests.m */, + 339355B92EB3E4F900EBF864 /* CircleControllerTests.m */, 528F16862C62952700148160 /* ExtractIconFromDataTests.m */, - 528F16822C62941000148160 /* FGMClusterManagersControllerTests.m */, - 339355BE2EB5359B00EBF864 /* FLTGoogleMapHeatmapControllerTests.m */, - 6851F3552835BC180032B7C8 /* FGMConversionsUtilsTests.m */, - 0DD7B6C22B744EEF00E857FD /* FLTTileProviderControllerTests.m */, F7151F12265D7ED70028CB91 /* GoogleMapsTests.m */, - 339355B92EB3E4F900EBF864 /* GoogleMapsCircleControllerTests.m */, - 2A6906C62D263DE7001F8426 /* GoogleMapsGroundOverlayControllerTests.m */, - 330909FE2D99B79B0077A751 /* GoogleMapsMarkerControllerTests.m */, - 339355B82EB3E4D500EBF864 /* GoogleMapsPolygonControllerTests.m */, - 478116512BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m */, - 339355BC2EB3E55600EBF864 /* GoogleMapsTileOverlayControllerTests.m */, - 982F2A6A27BADE17003C81F4 /* PartiallyMockedMapView.h */, - 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */, - 33BF9C6C2F2182CB0005FA15 /* TestAssetProvider.h */, - 33BF9C6D2F2182DB0005FA15 /* TestAssetProvider.m */, - 3378E6332F23F9220045E7DA /* TestMapEventHandler.h */, - 3378E6342F23F92E0045E7DA /* TestMapEventHandler.m */, + 2A6906C62D263DE7001F8426 /* GroundOverlayControllerTests.m */, + 339355BE2EB5359B00EBF864 /* HeatmapControllerTests.m */, + 330909FE2D99B79B0077A751 /* MarkerControllerTests.m */, + 339355B82EB3E4D500EBF864 /* PolygonControllerTests.m */, + 478116512BEF8F47002F593E /* PolylineControllerTests.m */, + 339355BC2EB3E55600EBF864 /* TileOverlayControllerTests.m */, + 0DD7B6C22B744EEF00E857FD /* TileProviderControllerTests.m */, F7151F14265D7ED70028CB91 /* Info.plist */, ); path = RunnerTests; @@ -262,6 +270,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, BB6BD9A1101E970BEF85B6D2 /* [CP] Copy Pods Resources */, + 047700BF2FF597AB85605C89 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -283,7 +292,6 @@ F7151F0C265D7ED70028CB91 /* Sources */, F7151F0D265D7ED70028CB91 /* Frameworks */, F7151F0E265D7ED70028CB91 /* Resources */, - DF182F6A1B9E41DA05BFCB87 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -391,6 +399,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 047700BF2FF597AB85605C89 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -482,24 +508,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - DF182F6A1B9E41DA05BFCB87 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -516,19 +524,19 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 528F16832C62941000148160 /* FGMClusterManagersControllerTests.m in Sources */, - 339355BA2EB3E50300EBF864 /* GoogleMapsCircleControllerTests.m in Sources */, - 339355BF2EB535A600EBF864 /* FLTGoogleMapHeatmapControllerTests.m in Sources */, - 339355BD2EB3E56300EBF864 /* GoogleMapsTileOverlayControllerTests.m in Sources */, + 3390B45E2F33AFA60094DEB9 /* PartiallyMockedMapView.m in Sources */, + 3390B45F2F33AFA60094DEB9 /* TestAssetProvider.m in Sources */, + 3390B4602F33AFA60094DEB9 /* TestMapEventHandler.m in Sources */, + 528F16832C62941000148160 /* ClusterManagersControllerTests.m in Sources */, + 339355BA2EB3E50300EBF864 /* CircleControllerTests.m in Sources */, + 339355BF2EB535A600EBF864 /* HeatmapControllerTests.m in Sources */, + 339355BD2EB3E56300EBF864 /* TileOverlayControllerTests.m in Sources */, F7151F13265D7ED70028CB91 /* GoogleMapsTests.m in Sources */, - 33BF9C6E2F2182DF0005FA15 /* TestAssetProvider.m in Sources */, - 6851F3562835BC180032B7C8 /* FGMConversionsUtilsTests.m in Sources */, - 982F2A6C27BADE17003C81F4 /* PartiallyMockedMapView.m in Sources */, - 3378E6352F23F9300045E7DA /* TestMapEventHandler.m in Sources */, - 330909FF2D99B7A60077A751 /* GoogleMapsMarkerControllerTests.m in Sources */, - 478116522BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m in Sources */, - 2A6906C72D263DF4001F8426 /* GoogleMapsGroundOverlayControllerTests.m in Sources */, - 0DD7B6C32B744EEF00E857FD /* FLTTileProviderControllerTests.m in Sources */, + 6851F3562835BC180032B7C8 /* ConversionsUtilsTests.m in Sources */, + 330909FF2D99B7A60077A751 /* MarkerControllerTests.m in Sources */, + 478116522BEF8F47002F593E /* PolylineControllerTests.m in Sources */, + 2A6906C72D263DF4001F8426 /* GroundOverlayControllerTests.m in Sources */, + 0DD7B6C32B744EEF00E857FD /* TileProviderControllerTests.m in Sources */, 528F16872C62952700148160 /* ExtractIconFromDataTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/CircleControllerTests.m similarity index 93% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/CircleControllerTests.m index a7ee1e4285c2..3573096d52b6 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/CircleControllerTests.m @@ -6,7 +6,7 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSCircle that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingCircle : GMSCircle { @@ -14,14 +14,14 @@ @interface PropertyOrderValidatingCircle : GMSCircle { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsCircleControllerTests : XCTestCase +@interface CircleControllerTests : XCTestCase @end -@implementation GoogleMapsCircleControllerTests +@implementation CircleControllerTests - (void)testUpdateCircleSetsVisibilityLast { PropertyOrderValidatingCircle *circle = [[PropertyOrderValidatingCircle alloc] init]; - [FLTGoogleMapCircleController + [FGMCircleController updateCircle:circle fromPlatformCircle:[FGMPlatformCircle makeWithConsumeTapEvents:NO @@ -40,7 +40,7 @@ - (void)testUpdateCircleSetsVisibilityLast { longitude:0] radius:10 circleId:@"circle"] - withMapView:[GoogleMapsCircleControllerTests mapView]]; + withMapView:[CircleControllerTests mapView]]; XCTAssertTrue(circle.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FGMClusterManagersControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/ClusterManagersControllerTests.m similarity index 95% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FGMClusterManagersControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/ClusterManagersControllerTests.m index 5ee9b6b23851..b3d71babfa93 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FGMClusterManagersControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/ClusterManagersControllerTests.m @@ -7,14 +7,14 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" -#import "TestMapEventHandler.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" +#import "TestUtils/TestMapEventHandler.h" -@interface FGMClusterManagersControllerTests : XCTestCase +@interface ClusterManagersControllerTests : XCTestCase @end -@implementation FGMClusterManagersControllerTests +@implementation ClusterManagersControllerTests - (void)testClustering { CGRect frame = CGRectMake(0, 0, 100, 100); @@ -29,8 +29,8 @@ - (void)testClustering { FGMClusterManagersController *clusterManagersController = [[FGMClusterManagersController alloc] initWithMapView:mapView eventDelegate:eventHandler]; - FLTMarkersController *markersController = - [[FLTMarkersController alloc] initWithMapView:mapView + FGMMarkersController *markersController = + [[FGMMarkersController alloc] initWithMapView:mapView eventDelegate:eventHandler clusterManagersController:clusterManagersController assetProvider:[[TestAssetProvider alloc] init]]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FGMConversionsUtilsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/ConversionsUtilsTests.m similarity index 99% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FGMConversionsUtilsTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/ConversionsUtilsTests.m index 2078b8a52153..ba9ca8ec9b29 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FGMConversionsUtilsTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/ConversionsUtilsTests.m @@ -6,12 +6,12 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" -@interface FGMConversionUtilsTests : XCTestCase +@interface ConversionUtilsTests : XCTestCase @end -@implementation FGMConversionUtilsTests +@implementation ConversionUtilsTests - (void)testGetValueOrNilWithValue { NSString *key = @"key"; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/ExtractIconFromDataTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/ExtractIconFromDataTests.m index 63f953bac59a..a9a2e4cce2d5 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/ExtractIconFromDataTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/ExtractIconFromDataTests.m @@ -5,7 +5,7 @@ @import google_maps_flutter_ios_sdk10; @import XCTest; -#import "TestAssetProvider.h" +#import "TestUtils/TestAssetProvider.h" @interface ExtractIconFromDataTests : XCTestCase - (UIImage *)createOnePixelImage; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsTests.m index f111c2ae14a7..b74c12f776da 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsTests.m @@ -6,8 +6,8 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" @interface MockCATransaction : NSObject @property(nonatomic, assign) BOOL beginCalled; @@ -50,21 +50,21 @@ - (FlutterBinaryMessengerConnection)setMessageHandlerOnChannel:(nonnull NSString #pragma mark - -@interface FLTGoogleMapFactory (Test) +@interface FGMGoogleMapFactory (Test) @property(strong, nonatomic, readonly) id sharedMapServices; @end @interface GoogleMapsTests : XCTestCase @end -@interface FLTTileProviderController (Testing) +@interface FGMTileProviderController (Testing) - (UIImage *)handleResultTile:(nullable UIImage *)tileImage; @end @implementation GoogleMapsTests - (void)testPlugin { - FLTGoogleMapsPlugin *plugin = [[FLTGoogleMapsPlugin alloc] init]; + FGMGoogleMapsPlugin *plugin = [[FGMGoogleMapsPlugin alloc] init]; XCTAssertNotNil(plugin); } @@ -74,8 +74,8 @@ - (void)testFrameObserver { options.frame = frame; options.camera = [[GMSCameraPosition alloc] initWithLatitude:0 longitude:0 zoom:0]; PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:options]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -94,9 +94,9 @@ - (void)testMapsServiceSync { // The API requires a registrar, but this test doesn't actually use it, so just pass in a // dummy object rather than set up a full mock. id registrar = [[NSObject alloc] init]; - FLTGoogleMapFactory *factory1 = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *factory1 = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; XCTAssertNotNil(factory1.sharedMapServices); - FLTGoogleMapFactory *factory2 = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *factory2 = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; // Test pointer equality, should be same retained singleton +[GMSServices sharedServices] object. // Retaining the opaque object should be enough to avoid multiple internal initializations, // but don't test the internals of the GoogleMaps API. Assume that it does what is documented. @@ -105,7 +105,7 @@ - (void)testMapsServiceSync { } - (void)testHandleResultTileDownsamplesWideGamutImages { - FLTTileProviderController *controller = [[FLTTileProviderController alloc] init]; + FGMTileProviderController *controller = [[FGMTileProviderController alloc] init]; NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -134,8 +134,8 @@ - (void)testAnimateCameraWithUpdate { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -164,8 +164,8 @@ - (void)testAnimateCameraWithUpdateAndDuration { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -203,8 +203,8 @@ - (void)testInspectorAPICameraPosition { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; NSObject *binaryMessenger = [[StubBinaryMessenger alloc] init]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GroundOverlayControllerTests.m similarity index 93% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GroundOverlayControllerTests.m index 0c598d5832c8..72c9e2aaa029 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GroundOverlayControllerTests.m @@ -6,9 +6,9 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" -#import "TestMapEventHandler.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" +#import "TestUtils/TestMapEventHandler.h" /// A GMSGroundOverlay that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingGroundOverlay : GMSGroundOverlay { @@ -16,15 +16,13 @@ @interface PropertyOrderValidatingGroundOverlay : GMSGroundOverlay { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsGroundOverlayControllerTests : XCTestCase +@interface GroundOverlayControllerTests : XCTestCase @end -@implementation GoogleMapsGroundOverlayControllerTests +@implementation GroundOverlayControllerTests -/// Returns GoogleMapGroundOverlayController object instantiated with position and a mocked map +/// Returns a GroundOverlayController object instantiated with position and a mocked map /// instance. -/// -/// @return An object of FLTGoogleMapGroundOverlayController + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap { NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -35,7 +33,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap icon:wideGamutImage zoomLevel:14.0]; - GMSMapView *mapView = [GoogleMapsGroundOverlayControllerTests mapView]; + GMSMapView *mapView = [GroundOverlayControllerTests mapView]; return [[FGMGroundOverlayController alloc] initWithGroundOverlay:groundOverlay identifier:@"id_1" @@ -43,10 +41,8 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap isCreatedWithBounds:NO]; } -/// Returns GoogleMapGroundOverlayController object instantiated with bounds and a mocked map +/// Returns a GroundOverlayController object instantiated with bounds and a mocked map /// instance. -/// -/// @return An object of FLTGoogleMapGroundOverlayController + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -58,7 +54,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { coordinate:CLLocationCoordinate2DMake(30, 40)] icon:wideGamutImage]; - GMSMapView *mapView = [GoogleMapsGroundOverlayControllerTests mapView]; + GMSMapView *mapView = [GroundOverlayControllerTests mapView]; return [[FGMGroundOverlayController alloc] initWithGroundOverlay:groundOverlay identifier:@"id_1" @@ -68,7 +64,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { - (void)testUpdatingGroundOverlayWithPosition { FGMGroundOverlayController *groundOverlayController = - [GoogleMapsGroundOverlayControllerTests groundOverlayControllerWithPositionWithMockedMap]; + [GroundOverlayControllerTests groundOverlayControllerWithPositionWithMockedMap]; FGMPlatformLatLng *position = [FGMPlatformLatLng makeWithLatitude:52.4816 longitude:3.1791]; @@ -120,7 +116,7 @@ - (void)testUpdatingGroundOverlayWithPosition { - (void)testUpdatingGroundOverlayWithBounds { FGMGroundOverlayController *groundOverlayController = - [GoogleMapsGroundOverlayControllerTests groundOverlayControllerWithBoundsWithMockedMap]; + [GroundOverlayControllerTests groundOverlayControllerWithBoundsWithMockedMap]; FGMPlatformLatLngBounds *bounds = [FGMPlatformLatLngBounds makeWithNortheast:[FGMPlatformLatLng makeWithLatitude:54.4816 longitude:5.1791] @@ -205,7 +201,7 @@ - (void)testUpdateGroundOverlaySetsVisibilityLast { visible:YES clickable:YES zoomLevel:nil] - withMapView:[GoogleMapsGroundOverlayControllerTests mapView] + withMapView:[GroundOverlayControllerTests mapView] assetProvider:[[TestAssetProvider alloc] init] screenScale:1.0 usingBounds:YES]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/HeatmapControllerTests.m similarity index 94% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/HeatmapControllerTests.m index 71414f43034d..fc93b90645c1 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/HeatmapControllerTests.m @@ -7,17 +7,17 @@ @import GoogleMapsUtils; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" @interface PropertyOrderValidatingHeatmap : GMUHeatmapTileLayer { } @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsHeatmapControllerTests : XCTestCase +@interface HeatmapControllerTests : XCTestCase @end -@implementation GoogleMapsHeatmapControllerTests +@implementation HeatmapControllerTests - (void)testUpdateHeatmapSetsVisibilityLast { PropertyOrderValidatingHeatmap *heatmap = [[PropertyOrderValidatingHeatmap alloc] init]; @@ -27,7 +27,7 @@ - (void)testUpdateHeatmapSetsVisibilityLast { ] startPoints:@[ @(0), @(1) ] colorMapSize:256]; - [FLTGoogleMapHeatmapController + [FGMHeatmapController updateHeatmap:heatmap fromPlatformHeatmap:[FGMPlatformHeatmap makeWithHeatmapId:@"heatmap" @@ -48,7 +48,7 @@ - (void)testUpdateHeatmapSetsVisibilityLast { radius:1 minimumZoomIntensity:1 maximumZoomIntensity:2] - withMapView:[GoogleMapsHeatmapControllerTests mapView]]; + withMapView:[HeatmapControllerTests mapView]]; XCTAssertTrue(heatmap.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/MarkerControllerTests.m similarity index 82% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/MarkerControllerTests.m index b6c6a5652f64..5d1233bed6e0 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/MarkerControllerTests.m @@ -6,9 +6,9 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" -#import "TestMapEventHandler.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" +#import "TestUtils/TestMapEventHandler.h" /// A GMSMarker that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingMarker : GMSMarker { @@ -16,10 +16,10 @@ @interface PropertyOrderValidatingMarker : GMSMarker { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsMarkerControllerTests : XCTestCase +@interface MarkerControllerTests : XCTestCase @end -@implementation GoogleMapsMarkerControllerTests +@implementation MarkerControllerTests /// Returns a simple map view for use with marker controllers. + (GMSMapView *)mapView { @@ -29,13 +29,13 @@ + (GMSMapView *)mapView { return [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; } -/// Returns a FLTMarkersController instance instantiated with the given map view. +/// Returns a FGMMarkersController instance instantiated with the given map view. /// /// The mapView should outlive the controller, as the controller keeps a weak reference to it. -- (FLTMarkersController *)markersControllerWithMapView:(GMSMapView *)mapView +- (FGMMarkersController *)markersControllerWithMapView:(GMSMapView *)mapView eventDelegate: (NSObject *)eventDelegate { - return [[FLTMarkersController alloc] initWithMapView:mapView + return [[FGMMarkersController alloc] initWithMapView:mapView eventDelegate:eventDelegate clusterManagersController:nil assetProvider:[[TestAssetProvider alloc] init]]; @@ -46,9 +46,9 @@ - (FGMPlatformBitmap *)placeholderBitmap { } - (void)testSetsMarkerNumericProperties { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -78,8 +78,7 @@ - (void)testSetsMarkerNumericProperties { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; const double delta = 0.0001; @@ -95,9 +94,9 @@ - (void)testSetsMarkerNumericProperties { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsDraggable { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -119,8 +118,7 @@ - (void)testSetsDraggable { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; XCTAssertTrue(marker.draggable); @@ -129,9 +127,9 @@ - (void)testSetsDraggable { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsFlat { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -153,8 +151,7 @@ - (void)testSetsFlat { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; XCTAssertTrue(marker.flat); @@ -163,9 +160,9 @@ - (void)testSetsFlat { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsVisible { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -187,8 +184,7 @@ - (void)testSetsVisible { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; // Visibility is controlled by being set to a map. @@ -196,9 +192,9 @@ - (void)testSetsVisible { } - (void)testSetsMarkerInfoWindowProperties { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -226,8 +222,7 @@ - (void)testSetsMarkerInfoWindowProperties { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; const double delta = 0.0001; @@ -239,32 +234,31 @@ - (void)testSetsMarkerInfoWindowProperties { - (void)testUpdateMarkerSetsVisibilityLast { PropertyOrderValidatingMarker *marker = [[PropertyOrderValidatingMarker alloc] init]; - [FLTGoogleMapMarkerController - updateMarker:marker - fromPlatformMarker:[FGMPlatformMarker - makeWithAlpha:1.0 - anchor:[FGMPlatformPoint makeWithX:0 y:0] - consumeTapEvents:YES - draggable:YES - flat:YES - icon:[self placeholderBitmap] - infoWindow:[FGMPlatformInfoWindow - makeWithTitle:@"info title" - snippet:@"info snippet" - anchor:[FGMPlatformPoint - makeWithX:0 - y:0]] - position:[FGMPlatformLatLng makeWithLatitude:0 - longitude:0] - rotation:0 - visible:YES - zIndex:0 - markerId:@"marker" - clusterManagerId:nil] - withMapView:[GoogleMapsMarkerControllerTests mapView] - assetProvider:[[TestAssetProvider alloc] init] - screenScale:1 - usingOpacityForVisibility:NO]; + [FGMMarkerController updateMarker:marker + fromPlatformMarker:[FGMPlatformMarker + makeWithAlpha:1.0 + anchor:[FGMPlatformPoint makeWithX:0 y:0] + consumeTapEvents:YES + draggable:YES + flat:YES + icon:[self placeholderBitmap] + infoWindow:[FGMPlatformInfoWindow + makeWithTitle:@"info title" + snippet:@"info snippet" + anchor:[FGMPlatformPoint + makeWithX:0 + y:0]] + position:[FGMPlatformLatLng makeWithLatitude:0 + longitude:0] + rotation:0 + visible:YES + zIndex:0 + markerId:@"marker" + clusterManagerId:nil] + withMapView:[MarkerControllerTests mapView] + assetProvider:[[TestAssetProvider alloc] init] + screenScale:1 + usingOpacityForVisibility:NO]; XCTAssertTrue(marker.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/PolygonControllerTests.m similarity index 70% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/PolygonControllerTests.m index fdbdb7541b25..33b67dfcffa1 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/PolygonControllerTests.m @@ -12,33 +12,32 @@ @interface PropertyOrderValidatingPolygon : GMSPolygon { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsPolygonControllerTests : XCTestCase +@interface PolygonControllerTests : XCTestCase @end -@implementation GoogleMapsPolygonControllerTests +@implementation PolygonControllerTests - (void)testUpdatePolygonSetsVisibilityLast { PropertyOrderValidatingPolygon *polygon = [[PropertyOrderValidatingPolygon alloc] init]; - [FLTGoogleMapPolygonController - updatePolygon:polygon - fromPlatformPolygon:[FGMPlatformPolygon - makeWithConsumeTapEvents:NO - fillColor:[FGMPlatformColor makeWithRed:0 - green:0 - blue:0 - alpha:0] - geodesic:NO - holes:@[] - strokeColor:[FGMPlatformColor makeWithRed:0 - green:0 - blue:0 - alpha:0] - strokeWidth:0 - visible:YES - zIndex:0 - points:@[] - polygonId:@"polygon"] - withMapView:[GoogleMapsPolygonControllerTests mapView]]; + [FGMPolygonController updatePolygon:polygon + fromPlatformPolygon:[FGMPlatformPolygon + makeWithConsumeTapEvents:NO + fillColor:[FGMPlatformColor makeWithRed:0 + green:0 + blue:0 + alpha:0] + geodesic:NO + holes:@[] + strokeColor:[FGMPlatformColor makeWithRed:0 + green:0 + blue:0 + alpha:0] + strokeWidth:0 + visible:YES + zIndex:0 + points:@[] + polygonId:@"polygon"] + withMapView:[PolygonControllerTests mapView]]; XCTAssertTrue(polygon.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/PolylineControllerTests.m similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/PolylineControllerTests.m index 4fe86699be04..a2244c7299fc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/PolylineControllerTests.m @@ -6,7 +6,7 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSPolyline that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingPolyline : GMSPolyline { @@ -14,15 +14,15 @@ @interface PropertyOrderValidatingPolyline : GMSPolyline { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsPolylineControllerTests : XCTestCase +@interface PolylineControllerTests : XCTestCase @end -@implementation GoogleMapsPolylineControllerTests +@implementation PolylineControllerTests /// Returns GoogleMapPolylineController object instantiated with a mocked map instance /// -/// @return An object of FLTGoogleMapPolylineController -- (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { +/// @return An object of FGMPolylineController +- (FGMPolylineController *)polylineControllerWithMockedMap { FGMPlatformPolyline *polyline = [FGMPlatformPolyline makeWithPolylineId:@"polyline_id_0" consumesTapEvents:NO @@ -30,7 +30,7 @@ - (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { geodesic:NO jointType:FGMPlatformJointTypeRound patterns:@[] - points:[GoogleMapsPolylineControllerTests polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:NO width:1 zIndex:0]; @@ -46,16 +46,16 @@ - (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polyline.points)); - FLTGoogleMapPolylineController *polylineControllerWithMockedMap = - [[FLTGoogleMapPolylineController alloc] initWithPath:path - identifier:polyline.polylineId - mapView:mapView]; + FGMPolylineController *polylineControllerWithMockedMap = + [[FGMPolylineController alloc] initWithPath:path + identifier:polyline.polylineId + mapView:mapView]; return polylineControllerWithMockedMap; } - (void)testPatternsSetSpans { - FLTGoogleMapPolylineController *polylineController = [self polylineControllerWithMockedMap]; + FGMPolylineController *polylineController = [self polylineControllerWithMockedMap]; XCTAssertNil(polylineController.polyline.spans); @@ -77,8 +77,7 @@ - (void)testPatternsSetSpans { makeWithType:FGMPlatformPatternItemTypeDash length:@(10)] ] - points:[GoogleMapsPolylineControllerTests - polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:YES width:1 zIndex:0]]; @@ -89,7 +88,7 @@ - (void)testPatternsSetSpans { - (void)testUpdatePolylineSetsVisibilityLast { PropertyOrderValidatingPolyline *polyline = [[PropertyOrderValidatingPolyline alloc] init]; - [FLTGoogleMapPolylineController + [FGMPolylineController updatePolyline:polyline fromPlatformPolyline:[FGMPlatformPolyline makeWithPolylineId:@"polyline" @@ -101,11 +100,11 @@ - (void)testUpdatePolylineSetsVisibilityLast { geodesic:NO jointType:FGMPlatformJointTypeRound patterns:@[] - points:[GoogleMapsPolylineControllerTests polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:YES width:1 zIndex:0] - withMapView:[GoogleMapsPolylineControllerTests mapView]]; + withMapView:[PolylineControllerTests mapView]]; XCTAssertTrue(polyline.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/PartiallyMockedMapView.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/PartiallyMockedMapView.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/PartiallyMockedMapView.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/PartiallyMockedMapView.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestAssetProvider.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/TestAssetProvider.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestAssetProvider.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/TestAssetProvider.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestAssetProvider.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/TestAssetProvider.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestAssetProvider.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/TestAssetProvider.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestMapEventHandler.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/TestMapEventHandler.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestMapEventHandler.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/TestMapEventHandler.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestMapEventHandler.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/TestMapEventHandler.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestMapEventHandler.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TestUtils/TestMapEventHandler.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TileOverlayControllerTests.m similarity index 77% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TileOverlayControllerTests.m index 7d6fe235c784..2e07bdf8918a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TileOverlayControllerTests.m @@ -6,29 +6,28 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSTileOverlay that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingTileLayer : GMSTileLayer @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsTileOverlayControllerTests : XCTestCase +@interface TileOverlayControllerTests : XCTestCase @end -@implementation GoogleMapsTileOverlayControllerTests +@implementation TileOverlayControllerTests - (void)testUpdateTileOverlaySetsVisibilityLast { PropertyOrderValidatingTileLayer *tileLayer = [[PropertyOrderValidatingTileLayer alloc] init]; - [FLTGoogleMapTileOverlayController - updateTileLayer:tileLayer - fromPlatformTileOverlay:[FGMPlatformTileOverlay makeWithTileOverlayId:@"overlay" - fadeIn:NO - transparency:0.5 - zIndex:0 - visible:YES - tileSize:1] - withMapView:[GoogleMapsTileOverlayControllerTests mapView]]; + [FGMTileOverlayController updateTileLayer:tileLayer + fromPlatformTileOverlay:[FGMPlatformTileOverlay makeWithTileOverlayId:@"overlay" + fadeIn:NO + transparency:0.5 + zIndex:0 + visible:YES + tileSize:1] + withMapView:[TileOverlayControllerTests mapView]]; XCTAssertTrue(tileLayer.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FLTTileProviderControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TileProviderControllerTests.m similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FLTTileProviderControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TileProviderControllerTests.m index 33d748b87f20..04dba7f58328 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/FLTTileProviderControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/TileProviderControllerTests.m @@ -45,16 +45,16 @@ - (void)tileWithOverlayIdentifier:(NSString *)tileOverlayId #pragma mark - -@interface FLTTileProviderControllerTests : XCTestCase +@interface TileProviderControllerTests : XCTestCase @end -@implementation FLTTileProviderControllerTests +@implementation TileProviderControllerTests - (void)testCallChannelOnPlatformThread { XCTestExpectation *expectation = [self expectationWithDescription:@"invokeMethod"]; TestTileProvider *tileProvider = [[TestTileProvider alloc] initWithExpectation:expectation]; - FLTTileProviderController *controller = - [[FLTTileProviderController alloc] initWithTileOverlayIdentifier:@"foo" + FGMTileProviderController *controller = + [[FGMTileProviderController alloc] initWithTileOverlayIdentifier:@"foo" tileProvider:tileProvider]; XCTAssertNotNil(controller); [controller requestTileForX:0 y:0 zoom:0 receiver:[[StubTileReceiver alloc] init]]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMCircleController.m similarity index 74% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMCircleController.m index 1348601ce0ff..8f86199f29bf 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMCircleController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapCircleController.h" -#import "GoogleMapCircleController_Test.h" +#import "FGMCircleController.h" +#import "FGMCircleController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapCircleController () +@interface FGMCircleController () @property(nonatomic, strong) GMSCircle *circle; @property(nonatomic, weak) GMSMapView *mapView; @end -@implementation FLTGoogleMapCircleController +@implementation FGMCircleController - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle mapView:(GMSMapView *)mapView { @@ -24,9 +24,7 @@ - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle radius:circle.radius]; _mapView = mapView; _circle.userData = @[ circle.circleId ]; - [FLTGoogleMapCircleController updateCircle:_circle - fromPlatformCircle:circle - withMapView:mapView]; + [FGMCircleController updateCircle:_circle fromPlatformCircle:circle withMapView:mapView]; } return self; } @@ -36,9 +34,9 @@ - (void)removeCircle { } - (void)updateFromPlatformCircle:(FGMPlatformCircle *)platformCircle { - [FLTGoogleMapCircleController updateCircle:self.circle - fromPlatformCircle:platformCircle - withMapView:self.mapView]; + [FGMCircleController updateCircle:self.circle + fromPlatformCircle:platformCircle + withMapView:self.mapView]; } + (void)updateCircle:(GMSCircle *)circle @@ -58,7 +56,7 @@ + (void)updateCircle:(GMSCircle *)circle @end -@interface FLTCirclesController () +@interface FGMCirclesController () @property(weak, nonatomic) NSObject *eventDelegate; @property(weak, nonatomic) GMSMapView *mapView; @@ -66,7 +64,7 @@ @interface FLTCirclesController () @end -@implementation FLTCirclesController +@implementation FGMCirclesController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -81,23 +79,22 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView - (void)addCircles:(NSArray *)circlesToAdd { for (FGMPlatformCircle *circle in circlesToAdd) { - FLTGoogleMapCircleController *controller = - [[FLTGoogleMapCircleController alloc] initCircleWithPlatformCircle:circle - mapView:self.mapView]; + FGMCircleController *controller = + [[FGMCircleController alloc] initCircleWithPlatformCircle:circle mapView:self.mapView]; self.circleIdToController[circle.circleId] = controller; } } - (void)changeCircles:(NSArray *)circlesToChange { for (FGMPlatformCircle *circle in circlesToChange) { - FLTGoogleMapCircleController *controller = self.circleIdToController[circle.circleId]; + FGMCircleController *controller = self.circleIdToController[circle.circleId]; [controller updateFromPlatformCircle:circle]; } } - (void)removeCirclesWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapCircleController *controller = self.circleIdToController[identifier]; + FGMCircleController *controller = self.circleIdToController[identifier]; if (!controller) { continue; } @@ -117,7 +114,7 @@ - (void)didTapCircleWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapCircleController *controller = self.circleIdToController[identifier]; + FGMCircleController *controller = self.circleIdToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGoogleMapController.m similarity index 96% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGoogleMapController.m index c265785d624e..c1f07051264c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGoogleMapController.m @@ -4,25 +4,25 @@ @import GoogleMapsUtils; -#import "GoogleMapController.h" -#import "GoogleMapController_Test.h" +#import "FGMGoogleMapController.h" +#import "FGMGoogleMapController_Test.h" #import "FGMAssetProvider.h" #import "FGMConversionUtils.h" #import "FGMGroundOverlayController.h" +#import "FGMHeatmapController.h" #import "FGMMarkerUserData.h" -#import "FLTGoogleMapHeatmapController.h" -#import "FLTGoogleMapTileOverlayController.h" +#import "FGMTileOverlayController.h" #import "google_maps_flutter_pigeon_messages.g.h" -@interface FLTGoogleMapFactory () +@interface FGMGoogleMapFactory () @property(weak, nonatomic) NSObject *registrar; @property(strong, nonatomic, readonly) id sharedMapServices; @end -@implementation FLTGoogleMapFactory +@implementation FGMGoogleMapFactory @synthesize sharedMapServices = _sharedMapServices; @@ -45,7 +45,7 @@ - (instancetype)initWithRegistrar:(NSObject *)registrar // Retain the shared map services singleton, don't use the result for anything. (void)[self sharedMapServices]; - return [[FLTGoogleMapController alloc] initWithFrame:frame + return [[FGMGoogleMapController alloc] initWithFrame:frame viewIdentifier:viewId creationParameters:args registrar:self.registrar]; @@ -216,12 +216,12 @@ - (void)didTapGroundOverlayWithIdentifier:(NSString *)groundOverlayId { /// Private declarations of the FGMMapCallHandler. @interface FGMMapCallHandler () -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix; /// The map controller this inspector corresponds to. -@property(nonatomic, weak) FLTGoogleMapController *controller; +@property(nonatomic, weak) FGMGoogleMapController *controller; /// The messenger this instance was registered with by Pigeon. @property(nonatomic, copy) NSObject *messenger; /// The suffix this instance was registered under with Pigeon. @@ -234,7 +234,7 @@ - (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controll @interface FGMMapInspector () /// The map controller this inspector corresponds to. -@property(nonatomic, weak) FLTGoogleMapController *controller; +@property(nonatomic, weak) FGMGoogleMapController *controller; /// The messenger this instance was registered with by Pigeon. @property(nonatomic, copy) NSObject *messenger; /// The suffix this instance was registered under with Pigeon. @@ -243,22 +243,22 @@ @interface FGMMapInspector () #pragma mark - -@interface FLTGoogleMapController () +@interface FGMGoogleMapController () @property(nonatomic, strong) GMSMapView *mapView; @property(nonatomic, strong) FGMMapsCallbackApi *dartCallbackHandler; @property(nonatomic, strong) FGMDefaultMapEventHandler *mapEventHandler; @property(nonatomic, assign) BOOL trackCameraPosition; @property(nonatomic, strong) FGMClusterManagersController *clusterManagersController; -@property(nonatomic, strong) FLTMarkersController *markersController; -@property(nonatomic, strong) FLTPolygonsController *polygonsController; -@property(nonatomic, strong) FLTPolylinesController *polylinesController; -@property(nonatomic, strong) FLTCirclesController *circlesController; +@property(nonatomic, strong) FGMMarkersController *markersController; +@property(nonatomic, strong) FGMPolygonsController *polygonsController; +@property(nonatomic, strong) FGMPolylinesController *polylinesController; +@property(nonatomic, strong) FGMCirclesController *circlesController; // The controller that handles heatmaps -@property(nonatomic, strong) FLTHeatmapsController *heatmapsController; -@property(nonatomic, strong) FLTTileOverlaysController *tileOverlaysController; -@property(nonatomic, strong) FLTGroundOverlaysController *groundOverlaysController; +@property(nonatomic, strong) FGMHeatmapsController *heatmapsController; +@property(nonatomic, strong) FGMTileOverlaysController *tileOverlaysController; +@property(nonatomic, strong) FGMGroundOverlaysController *groundOverlaysController; // The resulting error message, if any, from the last attempt to set the map style. // This is used to provide access to errors after the fact, since the map style is generally set at // creation time and there's no mechanism to return non-fatal error details during platform view @@ -271,7 +271,7 @@ @interface FLTGoogleMapController () @end -@implementation FLTGoogleMapController +@implementation FGMGoogleMapController - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId @@ -319,21 +319,21 @@ - (instancetype)initWithMapView:(GMSMapView *_Nonnull)mapView _clusterManagersController = [[FGMClusterManagersController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _markersController = [[FLTMarkersController alloc] initWithMapView:_mapView + _markersController = [[FGMMarkersController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler clusterManagersController:_clusterManagersController assetProvider:assetProvider]; - _polygonsController = [[FLTPolygonsController alloc] initWithMapView:_mapView + _polygonsController = [[FGMPolygonsController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _polylinesController = [[FLTPolylinesController alloc] initWithMapView:_mapView + _polylinesController = [[FGMPolylinesController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _circlesController = [[FLTCirclesController alloc] initWithMapView:_mapView + _circlesController = [[FGMCirclesController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _heatmapsController = [[FLTHeatmapsController alloc] initWithMapView:_mapView]; - _tileOverlaysController = [[FLTTileOverlaysController alloc] initWithMapView:_mapView + _heatmapsController = [[FGMHeatmapsController alloc] initWithMapView:_mapView]; + _tileOverlaysController = [[FGMTileOverlaysController alloc] initWithMapView:_mapView tileProvider:self]; _groundOverlaysController = - [[FLTGroundOverlaysController alloc] initWithMapView:_mapView + [[FGMGroundOverlaysController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler assetProvider:assetProvider]; [_clusterManagersController addClusterManagers:creationParameters.initialClusterManagers]; @@ -657,7 +657,7 @@ - (void)tileWithOverlayIdentifier:(NSString *)tileOverlayId /// Private declarations of the FGMMapCallHandler. @implementation FGMMapCallHandler -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix { self = [super init]; @@ -889,7 +889,7 @@ - (nullable FlutterStandardTypedData *)takeSnapshotWithError: /// Private declarations of the FGMMapInspector. @implementation FGMMapInspector -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix { self = [super init]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FLTGoogleMapsPlugin.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGoogleMapsPlugin.m similarity index 81% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FLTGoogleMapsPlugin.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGoogleMapsPlugin.m index 86391b40892e..515a6bf99e90 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FLTGoogleMapsPlugin.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGoogleMapsPlugin.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapsPlugin.h" +#import "FGMGoogleMapsPlugin.h" #pragma mark - GoogleMaps plugin implementation -@implementation FLTGoogleMapsPlugin +@implementation FGMGoogleMapsPlugin + (void)registerWithRegistrar:(NSObject *)registrar { - FLTGoogleMapFactory *googleMapFactory = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *googleMapFactory = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; [registrar registerViewFactory:googleMapFactory withId:@"plugins.flutter.dev/google_maps_ios" gestureRecognizersBlockingPolicy: diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FLTGoogleMapHeatmapController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMHeatmapController.m similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FLTGoogleMapHeatmapController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMHeatmapController.m index 91c93933308d..49ec16dff827 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FLTGoogleMapHeatmapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMHeatmapController.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapHeatmapController.h" -#import "FLTGoogleMapHeatmapController_Test.h" +#import "FGMHeatmapController.h" +#import "FGMHeatmapController_Test.h" @import GoogleMapsUtils; #import "FGMConversionUtils.h" -@interface FLTGoogleMapHeatmapController () +@interface FGMHeatmapController () /// The heatmap tile layer this controller handles. @property(nonatomic, strong) GMUHeatmapTileLayer *heatmapTileLayer; @@ -19,7 +19,7 @@ @interface FLTGoogleMapHeatmapController () @end -@implementation FLTGoogleMapHeatmapController +@implementation FGMHeatmapController - (instancetype)initWithHeatmap:(FGMPlatformHeatmap *)heatmap tileLayer:(GMUHeatmapTileLayer *)heatmapTileLayer mapView:(GMSMapView *)mapView { @@ -28,9 +28,9 @@ - (instancetype)initWithHeatmap:(FGMPlatformHeatmap *)heatmap _heatmapTileLayer = heatmapTileLayer; _mapView = mapView; - [FLTGoogleMapHeatmapController updateHeatmap:_heatmapTileLayer - fromPlatformHeatmap:heatmap - withMapView:_mapView]; + [FGMHeatmapController updateHeatmap:_heatmapTileLayer + fromPlatformHeatmap:heatmap + withMapView:_mapView]; } return self; } @@ -44,9 +44,9 @@ - (void)clearTileCache { } - (void)updateFromPlatformHeatmap:(FGMPlatformHeatmap *)platformHeatmap { - [FLTGoogleMapHeatmapController updateHeatmap:_heatmapTileLayer - fromPlatformHeatmap:platformHeatmap - withMapView:_mapView]; + [FGMHeatmapController updateHeatmap:_heatmapTileLayer + fromPlatformHeatmap:platformHeatmap + withMapView:_mapView]; } + (void)updateHeatmap:(GMUHeatmapTileLayer *)heatmapTileLayer @@ -67,18 +67,18 @@ + (void)updateHeatmap:(GMUHeatmapTileLayer *)heatmapTileLayer } @end -@interface FLTHeatmapsController () +@interface FGMHeatmapsController () /// A map from heatmapId to the controller that manages it. @property(nonatomic, strong) - NSMutableDictionary *heatmapIdToController; + NSMutableDictionary *heatmapIdToController; /// The map view owned by GoogmeMapController. @property(nonatomic, weak) GMSMapView *mapView; @end -@implementation FLTHeatmapsController +@implementation FGMHeatmapsController - (instancetype)initWithMapView:(GMSMapView *)mapView { self = [super init]; if (self) { @@ -91,17 +91,17 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView { - (void)addHeatmaps:(NSArray *)heatmapsToAdd { for (FGMPlatformHeatmap *heatmap in heatmapsToAdd) { GMUHeatmapTileLayer *heatmapTileLayer = [[GMUHeatmapTileLayer alloc] init]; - FLTGoogleMapHeatmapController *controller = - [[FLTGoogleMapHeatmapController alloc] initWithHeatmap:heatmap - tileLayer:heatmapTileLayer - mapView:_mapView]; + FGMHeatmapController *controller = + [[FGMHeatmapController alloc] initWithHeatmap:heatmap + tileLayer:heatmapTileLayer + mapView:_mapView]; _heatmapIdToController[heatmap.heatmapId] = controller; } } - (void)changeHeatmaps:(NSArray *)heatmapsToChange { for (FGMPlatformHeatmap *heatmap in heatmapsToChange) { - FLTGoogleMapHeatmapController *controller = _heatmapIdToController[heatmap.heatmapId]; + FGMHeatmapController *controller = _heatmapIdToController[heatmap.heatmapId]; [controller updateFromPlatformHeatmap:heatmap]; [controller clearTileCache]; @@ -110,7 +110,7 @@ - (void)changeHeatmaps:(NSArray *)heatmapsToChange { - (void)removeHeatmapsWithIdentifiers:(NSArray *)identifiers { for (NSString *heatmapId in identifiers) { - FLTGoogleMapHeatmapController *controller = _heatmapIdToController[heatmapId]; + FGMHeatmapController *controller = _heatmapIdToController[heatmapId]; if (!controller) { continue; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapMarkerController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMMarkerController.m similarity index 86% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapMarkerController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMMarkerController.m index 09a05db2840d..13d086cb31eb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapMarkerController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMMarkerController.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapMarkerController.h" -#import "GoogleMapMarkerController_Test.h" +#import "FGMMarkerController.h" +#import "FGMMarkerController_Test.h" #import "FGMConversionUtils.h" #import "FGMImageUtils.h" #import "FGMMarkerUserData.h" -@interface FLTGoogleMapMarkerController () +@interface FGMMarkerController () @property(strong, nonatomic, readwrite) GMSMarker *marker; @property(weak, nonatomic) GMSMapView *mapView; @@ -21,7 +21,7 @@ @interface FLTGoogleMapMarkerController () @end -@implementation FLTGoogleMapMarkerController +@implementation FGMMarkerController - (instancetype)initWithMarker:(GMSMarker *)marker markerIdentifier:(NSString *)markerIdentifier @@ -66,12 +66,12 @@ - (void)updateFromPlatformMarker:(FGMPlatformMarker *)platformMarker // If marker belongs the cluster manager, visibility need to be controlled with the opacity // as the cluster manager controls when marker is on the map and when not. BOOL useOpacityForVisibility = self.clusterManagerIdentifier != nil; - [FLTGoogleMapMarkerController updateMarker:self.marker - fromPlatformMarker:platformMarker - withMapView:self.mapView - assetProvider:assetProvider - screenScale:screenScale - usingOpacityForVisibility:useOpacityForVisibility]; + [FGMMarkerController updateMarker:self.marker + fromPlatformMarker:platformMarker + withMapView:self.mapView + assetProvider:assetProvider + screenScale:screenScale + usingOpacityForVisibility:useOpacityForVisibility]; } + (void)updateMarker:(GMSMarker *)marker @@ -106,10 +106,10 @@ + (void)updateMarker:(GMSMarker *)marker @end -@interface FLTMarkersController () +@interface FGMMarkersController () @property(strong, nonatomic, readwrite) - NSMutableDictionary *markerIdentifierToController; + NSMutableDictionary *markerIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; /// Controller for adding/removing/fetching cluster managers @property(weak, nonatomic, nullable) FGMClusterManagersController *clusterManagersController; @@ -118,7 +118,7 @@ @interface FLTMarkersController () @end -@implementation FLTMarkersController +@implementation FGMMarkersController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate @@ -146,10 +146,9 @@ - (void)addMarker:(FGMPlatformMarker *)markerToAdd { NSString *markerIdentifier = markerToAdd.markerId; NSString *clusterManagerIdentifier = markerToAdd.clusterManagerId; GMSMarker *marker = [GMSMarker markerWithPosition:position]; - FLTGoogleMapMarkerController *controller = - [[FLTGoogleMapMarkerController alloc] initWithMarker:marker - markerIdentifier:markerIdentifier - mapView:self.mapView]; + FGMMarkerController *controller = [[FGMMarkerController alloc] initWithMarker:marker + markerIdentifier:markerIdentifier + mapView:self.mapView]; [controller updateFromPlatformMarker:markerToAdd assetProvider:self.assetProvider screenScale:[self getScreenScale]]; @@ -172,7 +171,7 @@ - (void)changeMarkers:(NSArray *)markersToChange { - (void)changeMarker:(FGMPlatformMarker *)markerToChange { NSString *markerIdentifier = markerToChange.markerId; - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *controller = self.markerIdentifierToController[markerIdentifier]; if (!controller) { return; } @@ -210,7 +209,7 @@ - (void)removeMarkersWithIdentifiers:(NSArray *)identifiers { } - (void)removeMarker:(NSString *)identifier { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -229,7 +228,7 @@ - (BOOL)didTapMarkerWithIdentifier:(NSString *)identifier { if (!identifier) { return NO; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return NO; } @@ -242,7 +241,7 @@ - (void)didStartDraggingMarkerWithIdentifier:(NSString *)identifier if (!identifier) { return; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -256,7 +255,7 @@ - (void)didDragMarkerWithIdentifier:(NSString *)identifier if (!identifier) { return; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -266,7 +265,7 @@ - (void)didDragMarkerWithIdentifier:(NSString *)identifier - (void)didEndDraggingMarkerWithIdentifier:(NSString *)identifier location:(CLLocationCoordinate2D)location { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -283,7 +282,7 @@ - (void)didTapInfoWindowOfMarkerWithIdentifier:(NSString *)identifier { - (void)showMarkerInfoWindowWithIdentifier:(NSString *)identifier error: (FlutterError *_Nullable __autoreleasing *_Nonnull)error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { [controller showInfoWindow]; } else { @@ -296,7 +295,7 @@ - (void)showMarkerInfoWindowWithIdentifier:(NSString *)identifier - (void)hideMarkerInfoWindowWithIdentifier:(NSString *)identifier error: (FlutterError *_Nullable __autoreleasing *_Nonnull)error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { [controller hideInfoWindow]; } else { @@ -310,7 +309,7 @@ - (void)hideMarkerInfoWindowWithIdentifier:(NSString *)identifier isInfoWindowShownForMarkerWithIdentifier:(NSString *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { return @([controller isInfoWindowShown]); } else { diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapPolygonController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMPolygonController.m similarity index 79% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapPolygonController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMPolygonController.m index f5d077bd4ff1..2de1c9323878 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapPolygonController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMPolygonController.m @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolygonController_Test.h" +#import "FGMPolygonController.h" +#import "FGMPolygonController_Test.h" #import "FGMConversionUtils.h" @@ -18,14 +18,14 @@ return pathHoles; } -@interface FLTGoogleMapPolygonController () +@interface FGMPolygonController () @property(strong, nonatomic) GMSPolygon *polygon; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapPolygonController +@implementation FGMPolygonController - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier @@ -44,9 +44,9 @@ - (void)removePolygon { } - (void)updateFromPlatformPolygon:(FGMPlatformPolygon *)polygon { - [FLTGoogleMapPolygonController updatePolygon:self.polygon - fromPlatformPolygon:polygon - withMapView:self.mapView]; + [FGMPolygonController updatePolygon:self.polygon + fromPlatformPolygon:polygon + withMapView:self.mapView]; } + (void)updatePolygon:(GMSPolygon *)polygon @@ -67,7 +67,7 @@ + (void)updatePolygon:(GMSPolygon *)polygon @end -@interface FLTPolygonsController () +@interface FGMPolygonsController () @property(strong, nonatomic) NSMutableDictionary *polygonIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; @@ -75,7 +75,7 @@ @interface FLTPolygonsController () @end -@implementation FLTPolygonsController +@implementation FGMPolygonsController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -92,10 +92,9 @@ - (void)addPolygons:(NSArray *)polygonsToAdd { for (FGMPlatformPolygon *polygon in polygonsToAdd) { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polygon.points)); NSString *identifier = polygon.polygonId; - FLTGoogleMapPolygonController *controller = - [[FLTGoogleMapPolygonController alloc] initWithPath:path - identifier:identifier - mapView:self.mapView]; + FGMPolygonController *controller = [[FGMPolygonController alloc] initWithPath:path + identifier:identifier + mapView:self.mapView]; [controller updateFromPlatformPolygon:polygon]; self.polygonIdentifierToController[identifier] = controller; } @@ -104,14 +103,14 @@ - (void)addPolygons:(NSArray *)polygonsToAdd { - (void)changePolygons:(NSArray *)polygonsToChange { for (FGMPlatformPolygon *polygon in polygonsToChange) { NSString *identifier = polygon.polygonId; - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; [controller updateFromPlatformPolygon:polygon]; } } - (void)removePolygonWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; if (!controller) { continue; } @@ -124,7 +123,7 @@ - (void)didTapPolygonWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMPolylineController.m similarity index 78% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMPolylineController.m index ea84a4e5be54..60b96515facc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMPolylineController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolylineController.h" -#import "GoogleMapPolylineController_Test.h" +#import "FGMPolylineController.h" +#import "FGMPolylineController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapPolylineController () +@interface FGMPolylineController () @property(strong, nonatomic) GMSPolyline *polyline; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapPolylineController +@implementation FGMPolylineController - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier @@ -33,9 +33,9 @@ - (void)removePolyline { } - (void)updateFromPlatformPolyline:(FGMPlatformPolyline *)polyline { - [FLTGoogleMapPolylineController updatePolyline:self.polyline - fromPlatformPolyline:polyline - withMapView:self.mapView]; + [FGMPolylineController updatePolyline:self.polyline + fromPlatformPolyline:polyline + withMapView:self.mapView]; } + (void)updatePolyline:(GMSPolyline *)polyline @@ -60,7 +60,7 @@ + (void)updatePolyline:(GMSPolyline *)polyline @end -@interface FLTPolylinesController () +@interface FGMPolylinesController () @property(strong, nonatomic) NSMutableDictionary *polylineIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; @@ -69,7 +69,7 @@ @interface FLTPolylinesController () @end ; -@implementation FLTPolylinesController +@implementation FGMPolylinesController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -86,10 +86,9 @@ - (void)addPolylines:(NSArray *)polylinesToAdd { for (FGMPlatformPolyline *polyline in polylinesToAdd) { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polyline.points)); NSString *identifier = polyline.polylineId; - FLTGoogleMapPolylineController *controller = - [[FLTGoogleMapPolylineController alloc] initWithPath:path - identifier:identifier - mapView:self.mapView]; + FGMPolylineController *controller = [[FGMPolylineController alloc] initWithPath:path + identifier:identifier + mapView:self.mapView]; [controller updateFromPlatformPolyline:polyline]; self.polylineIdentifierToController[identifier] = controller; } @@ -98,14 +97,14 @@ - (void)addPolylines:(NSArray *)polylinesToAdd { - (void)changePolylines:(NSArray *)polylinesToChange { for (FGMPlatformPolyline *polyline in polylinesToChange) { NSString *identifier = polyline.polylineId; - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; [controller updateFromPlatformPolyline:polyline]; } } - (void)removePolylineWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; if (!controller) { continue; } @@ -118,7 +117,7 @@ - (void)didTapPolylineWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMTileOverlayController.m similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMTileOverlayController.m index 4116c82e4115..012276e27281 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMTileOverlayController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapTileOverlayController.h" -#import "FLTGoogleMapTileOverlayController_Test.h" +#import "FGMTileOverlayController.h" +#import "FGMTileOverlayController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapTileOverlayController () +@interface FGMTileOverlayController () @property(strong, nonatomic) GMSTileLayer *layer; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapTileOverlayController +@implementation FGMTileOverlayController - (instancetype)initWithTileOverlay:(FGMPlatformTileOverlay *)tileOverlay tileLayer:(GMSTileLayer *)tileLayer @@ -23,9 +23,9 @@ - (instancetype)initWithTileOverlay:(FGMPlatformTileOverlay *)tileOverlay if (self) { _layer = tileLayer; _mapView = mapView; - [FLTGoogleMapTileOverlayController updateTileLayer:tileLayer - fromPlatformTileOverlay:tileOverlay - withMapView:mapView]; + [FGMTileOverlayController updateTileLayer:tileLayer + fromPlatformTileOverlay:tileOverlay + withMapView:mapView]; } return self; } @@ -39,9 +39,9 @@ - (void)clearTileCache { } - (void)updateFromPlatformTileOverlay:(FGMPlatformTileOverlay *)overlay { - [FLTGoogleMapTileOverlayController updateTileLayer:self.layer - fromPlatformTileOverlay:overlay - withMapView:self.mapView]; + [FGMTileOverlayController updateTileLayer:self.layer + fromPlatformTileOverlay:overlay + withMapView:self.mapView]; } + (void)updateTileLayer:(GMSTileLayer *)tileLayer @@ -58,13 +58,13 @@ + (void)updateTileLayer:(GMSTileLayer *)tileLayer @end -@interface FLTTileProviderController () +@interface FGMTileProviderController () @property(weak, nonatomic) NSObject *tileProviderDelegate; @end -@implementation FLTTileProviderController +@implementation FGMTileProviderController - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier tileProvider:(NSObject *)tileProvider { @@ -129,16 +129,16 @@ - (void)requestTileForX:(NSUInteger)x @end -@interface FLTTileOverlaysController () +@interface FGMTileOverlaysController () -@property(strong, nonatomic) NSMutableDictionary - *tileOverlayIdentifierToController; +@property(strong, nonatomic) + NSMutableDictionary *tileOverlayIdentifierToController; @property(weak, nonatomic) NSObject *tileProviderDelegate; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTTileOverlaysController +@implementation FGMTileOverlaysController - (instancetype)initWithMapView:(GMSMapView *)mapView tileProvider:(NSObject *)tileProvider { @@ -154,13 +154,13 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd { for (FGMPlatformTileOverlay *tileOverlay in tileOverlaysToAdd) { NSString *identifier = tileOverlay.tileOverlayId; - FLTTileProviderController *tileProvider = - [[FLTTileProviderController alloc] initWithTileOverlayIdentifier:identifier + FGMTileProviderController *tileProvider = + [[FGMTileProviderController alloc] initWithTileOverlayIdentifier:identifier tileProvider:self.tileProviderDelegate]; - FLTGoogleMapTileOverlayController *controller = - [[FLTGoogleMapTileOverlayController alloc] initWithTileOverlay:tileOverlay - tileLayer:tileProvider - mapView:self.mapView]; + FGMTileOverlayController *controller = + [[FGMTileOverlayController alloc] initWithTileOverlay:tileOverlay + tileLayer:tileProvider + mapView:self.mapView]; self.tileOverlayIdentifierToController[identifier] = controller; } } @@ -168,15 +168,13 @@ - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd { - (void)changeTileOverlays:(NSArray *)tileOverlaysToChange { for (FGMPlatformTileOverlay *tileOverlay in tileOverlaysToChange) { NSString *identifier = tileOverlay.tileOverlayId; - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; [controller updateFromPlatformTileOverlay:tileOverlay]; } } - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; if (!controller) { continue; } @@ -186,12 +184,11 @@ - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers { } - (void)clearTileCacheWithIdentifier:(NSString *)identifier { - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; [controller clearTileCache]; } -- (nullable FLTGoogleMapTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier { +- (nullable FGMTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier { return self.tileOverlayIdentifierToController[identifier]; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapCircleController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMCircleController.h similarity index 91% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapCircleController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMCircleController.h index ac4347551135..fb3b705871d3 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapCircleController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMCircleController.h @@ -10,13 +10,13 @@ NS_ASSUME_NONNULL_BEGIN // Defines circle controllable by Flutter. -@interface FLTGoogleMapCircleController : NSObject +@interface FGMCircleController : NSObject - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle mapView:(GMSMapView *)mapView; - (void)removeCircle; @end -@interface FLTCirclesController : NSObject +@interface FGMCirclesController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addCircles:(NSArray *)circlesToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapCircleController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMCircleController_Test.h similarity index 86% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapCircleController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMCircleController_Test.h index 1c72d2060dc1..9c1428987225 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapCircleController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMCircleController_Test.h @@ -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 "GoogleMapCircleController.h" +#import "FGMCircleController.h" NS_ASSUME_NONNULL_BEGIN /// Private methods exposed for testing. -@interface FLTGoogleMapCircleController (Test) +@interface FGMCircleController (Test) /// Updates the underlying GMSCircle with the properties from the given FGMPlatformCircle. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapController.h similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapController.h index e9ea39630ebf..b723c8d3658e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapController.h @@ -6,17 +6,17 @@ @import GoogleMaps; #import "FGMCATransactionWrapper.h" +#import "FGMCircleController.h" #import "FGMClusterManagersController.h" -#import "GoogleMapCircleController.h" -#import "GoogleMapMarkerController.h" -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolylineController.h" +#import "FGMMarkerController.h" +#import "FGMPolygonController.h" +#import "FGMPolylineController.h" #import "google_maps_flutter_pigeon_messages.g.h" NS_ASSUME_NONNULL_BEGIN // Defines map overlay controllable from Flutter. -@interface FLTGoogleMapController : NSObject +@interface FGMGoogleMapController : NSObject - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId creationParameters:(FGMPlatformMapViewCreationParams *)creationParameters @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN @end // Allows the engine to create new Google Map instances. -@interface FLTGoogleMapFactory : NSObject +@interface FGMGoogleMapFactory : NSObject - (instancetype)initWithRegistrar:(NSObject *)registrar; @end diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapController_Test.h similarity index 89% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapController_Test.h index bbb61545cc0c..5e1fa9371b2c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapController_Test.h @@ -7,7 +7,7 @@ #import "FGMAssetProvider.h" #import "FGMCATransactionWrapper.h" -#import "GoogleMapController.h" +#import "FGMGoogleMapController.h" NS_ASSUME_NONNULL_BEGIN @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN /// /// This is a separate object from the maps controller because the Pigeon API registration keeps a /// strong reference to the implementor, but as the FlutterPlatformView, the lifetime of the -/// FLTGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be +/// FGMGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be /// the target of the registration. @interface FGMMapCallHandler : NSObject @@ -28,18 +28,18 @@ NS_ASSUME_NONNULL_BEGIN /// /// This is a separate object from the maps controller because the Pigeon API registration keeps a /// strong reference to the implementor, but as the FlutterPlatformView, the lifetime of the -/// FLTGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be +/// FGMGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be /// the target of the registration. @interface FGMMapInspector : NSObject /// Initializes a Pigeon API for inpector with a map controller. -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix; @end -@interface FLTGoogleMapController (Test) +@interface FGMGoogleMapController (Test) /// Initializes a map controller with a concrete map view. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapsPlugin.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapsPlugin.h similarity index 52% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapsPlugin.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapsPlugin.h index a5a1d05a4cbd..ec294eb3d3e9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapsPlugin.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGoogleMapsPlugin.h @@ -5,16 +5,16 @@ @import Flutter; @import GoogleMaps; +#import "FGMCircleController.h" #import "FGMClusterManagersController.h" -#import "GoogleMapCircleController.h" -#import "GoogleMapController.h" -#import "GoogleMapMarkerController.h" -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolylineController.h" +#import "FGMGoogleMapController.h" +#import "FGMMarkerController.h" +#import "FGMPolygonController.h" +#import "FGMPolylineController.h" NS_ASSUME_NONNULL_BEGIN -@interface FLTGoogleMapsPlugin : NSObject +@interface FGMGoogleMapsPlugin : NSObject @end NS_ASSUME_NONNULL_END diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGroundOverlayController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGroundOverlayController.h index f4a07aa950e5..1a8f01055445 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGroundOverlayController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMGroundOverlayController.h @@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN @end /// Controller of multiple ground overlays on the map. -@interface FLTGroundOverlaysController : NSObject +@interface FGMGroundOverlaysController : NSObject /// Initializes the controller with a GMSMapView, event delegate, and asset provider. - (instancetype)initWithMapView:(GMSMapView *)mapView diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMHeatmapController.h similarity index 95% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMHeatmapController.h index 1d31f124077b..c8fce13543c7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMHeatmapController.h @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN /// Controller of a single Heatmap on the map. -@interface FLTGoogleMapHeatmapController : NSObject +@interface FGMHeatmapController : NSObject /// Initializes an instance of this class with a heatmap tile layer, a map view, and additional /// configuration options. @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN @end /// Controller of multiple Heatmaps on the map. -@interface FLTHeatmapsController : NSObject +@interface FGMHeatmapsController : NSObject /// Initializes the controller with a GMSMapView. - (instancetype)initWithMapView:(GMSMapView *)mapView; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMHeatmapController_Test.h similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMHeatmapController_Test.h index b00a48e3477f..797c309dbb2c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMHeatmapController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapHeatmapController.h" +#import "FGMHeatmapController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapHeatmapController (Test) +@interface FGMHeatmapController (Test) /// Updates the underlying GMUHeatmapTileLayer with the properties from the given platform heatmap. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMMarkerController.h similarity index 96% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMMarkerController.h index 57797346639e..5b6734a89478 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMMarkerController.h @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - // Defines marker controllable by Flutter. -@interface FLTGoogleMapMarkerController : NSObject +@interface FGMMarkerController : NSObject @property(assign, nonatomic, readonly) BOOL consumeTapEvents; - (instancetype)initWithMarker:(GMSMarker *)marker markerIdentifier:(NSString *)markerIdentifier @@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)removeMarker; @end -@interface FLTMarkersController : NSObject +@interface FGMMarkersController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate clusterManagersController:(nullable FGMClusterManagersController *)clusterManagersController diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapMarkerController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMMarkerController_Test.h similarity index 89% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapMarkerController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMMarkerController_Test.h index d7a9c1578432..29e450df13ae 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapMarkerController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMMarkerController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapMarkerController.h" +#import "FGMMarkerController.h" /// Methods exposed for unit testing. -@interface FLTGoogleMapMarkerController (Test) +@interface FGMMarkerController (Test) /// The underlying controlled GMSMarker. @property(strong, nonatomic, readonly) GMSMarker *marker; @@ -23,7 +23,7 @@ @end /// Methods exposed for unit testing. -@interface FLTMarkersController (Test) +@interface FGMMarkersController (Test) /// A mapping from marker identifiers to corresponding marker controllers. @property(strong, nonatomic, readonly) NSMutableDictionary *markerIdentifierToController; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolygonController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolygonController.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolygonController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolygonController.h index a222ca6a4eb0..b66ed908bbec 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolygonController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolygonController.h @@ -8,14 +8,14 @@ #import "google_maps_flutter_pigeon_messages.g.h" // Defines polygon controllable by Flutter. -@interface FLTGoogleMapPolygonController : NSObject +@interface FGMPolygonController : NSObject - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier mapView:(GMSMapView *)mapView; - (void)removePolygon; @end -@interface FLTPolygonsController : NSObject +@interface FGMPolygonsController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addPolygons:(NSArray *)polygonsToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolygonController_Test.h similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolygonController_Test.h index ab4cf60be224..5072e4a4c7d7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolygonController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolygonController.h" +#import "FGMPolygonController.h" /// Methods exposed for unit testing. -@interface FLTGoogleMapPolygonController (Test) +@interface FGMPolygonController (Test) /// Updates the underlying GMSPolygon with the properties from the given FGMPlatformPolygon. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolylineController.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolylineController.h index ccf37dae9a35..14071b7700e2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolylineController.h @@ -8,14 +8,14 @@ #import "google_maps_flutter_pigeon_messages.g.h" // Defines polyline controllable by Flutter. -@interface FLTGoogleMapPolylineController : NSObject +@interface FGMPolylineController : NSObject - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier mapView:(GMSMapView *)mapView; - (void)removePolyline; @end -@interface FLTPolylinesController : NSObject +@interface FGMPolylinesController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addPolylines:(NSArray *)polylinesToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolylineController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolylineController_Test.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolylineController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolylineController_Test.h index df9e31293951..548bcff27cce 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolylineController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMPolylineController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolylineController.h" +#import "FGMPolylineController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapPolylineController (Test) +@interface FGMPolylineController (Test) /// Polyline instance the controller is attached to @property(strong, nonatomic) GMSPolyline *polyline; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapTileOverlayController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMTileOverlayController.h similarity index 87% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapTileOverlayController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMTileOverlayController.h index b4c707e6d0b4..0785c22f9a43 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapTileOverlayController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMTileOverlayController.h @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - -@interface FLTGoogleMapTileOverlayController : NSObject +@interface FGMTileOverlayController : NSObject /// The layer managed by this controller instance. @property(readonly, nonatomic) GMSTileLayer *layer; @@ -31,20 +31,20 @@ NS_ASSUME_NONNULL_BEGIN - (void)clearTileCache; @end -@interface FLTTileProviderController : GMSTileLayer +@interface FGMTileProviderController : GMSTileLayer @property(copy, nonatomic, readonly) NSString *tileOverlayIdentifier; - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier tileProvider:(NSObject *)tileProvider; @end -@interface FLTTileOverlaysController : NSObject +@interface FGMTileOverlaysController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView tileProvider:(NSObject *)tileProvider; - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd; - (void)changeTileOverlays:(NSArray *)tileOverlaysToChange; - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers; - (void)clearTileCacheWithIdentifier:(NSString *)identifier; -- (nullable FLTGoogleMapTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier; +- (nullable FGMTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier; @end NS_ASSUME_NONNULL_END diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMTileOverlayController_Test.h similarity index 84% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMTileOverlayController_Test.h index e753698cde45..faebc2b98a1b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FGMTileOverlayController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapTileOverlayController.h" +#import "FGMTileOverlayController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapTileOverlayController (Test) +@interface FGMTileOverlayController (Test) /// Updates the underlying GMSTileLayer with the properties from the given FGMPlatformTileOverlay. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml index aa32fe517a4f..4901c2164f3a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml @@ -13,7 +13,7 @@ flutter: implements: google_maps_flutter platforms: ios: - pluginClass: FLTGoogleMapsPlugin + pluginClass: FGMGoogleMapsPlugin dartPluginClass: GoogleMapsFlutterIOS dependencies: diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/Runner.xcodeproj/project.pbxproj index f92721e69d4a..7b4179fe35ec 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/Runner.xcodeproj/project.pbxproj @@ -7,27 +7,27 @@ objects = { /* Begin PBXBuildFile section */ - 0DD7B6C32B744EEF00E857FD /* FLTTileProviderControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DD7B6C22B744EEF00E857FD /* FLTTileProviderControllerTests.m */; }; + 0DD7B6C32B744EEF00E857FD /* TileProviderControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DD7B6C22B744EEF00E857FD /* TileProviderControllerTests.m */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 2A6906C72D263DF4001F8426 /* GoogleMapsGroundOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A6906C62D263DE7001F8426 /* GoogleMapsGroundOverlayControllerTests.m */; }; + 2A6906C72D263DF4001F8426 /* GroundOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A6906C62D263DE7001F8426 /* GroundOverlayControllerTests.m */; }; 2BDE99378062AE3E60B40021 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3ACE0AFE8D82CD5962486AFD /* Pods_RunnerTests.framework */; }; - 330909FF2D99B7A60077A751 /* GoogleMapsMarkerControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 330909FE2D99B79B0077A751 /* GoogleMapsMarkerControllerTests.m */; }; - 3378E6352F23F9300045E7DA /* TestMapEventHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 3378E6342F23F92E0045E7DA /* TestMapEventHandler.m */; }; - 339355BA2EB3E50300EBF864 /* GoogleMapsCircleControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355B92EB3E4F900EBF864 /* GoogleMapsCircleControllerTests.m */; }; - 339355BD2EB3E56300EBF864 /* GoogleMapsTileOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BC2EB3E55600EBF864 /* GoogleMapsTileOverlayControllerTests.m */; }; - 339355BF2EB535A600EBF864 /* FLTGoogleMapHeatmapControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BE2EB5359B00EBF864 /* FLTGoogleMapHeatmapControllerTests.m */; }; + 330909FF2D99B7A60077A751 /* MarkerControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 330909FE2D99B79B0077A751 /* MarkerControllerTests.m */; }; + 3390B45E2F33AFA60094DEB9 /* PartiallyMockedMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3390B4582F33AFA60094DEB9 /* PartiallyMockedMapView.m */; }; + 3390B45F2F33AFA60094DEB9 /* TestAssetProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 3390B45A2F33AFA60094DEB9 /* TestAssetProvider.m */; }; + 3390B4602F33AFA60094DEB9 /* TestMapEventHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 3390B45C2F33AFA60094DEB9 /* TestMapEventHandler.m */; }; + 339355BA2EB3E50300EBF864 /* CircleControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355B92EB3E4F900EBF864 /* CircleControllerTests.m */; }; + 339355BD2EB3E56300EBF864 /* TileOverlayControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BC2EB3E55600EBF864 /* TileOverlayControllerTests.m */; }; + 339355BF2EB535A600EBF864 /* HeatmapControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 339355BE2EB5359B00EBF864 /* HeatmapControllerTests.m */; }; 339DF1F02F1FE49800748863 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 339DF1EF2F1FE49300748863 /* AppDelegate.swift */; }; - 33BF9C6E2F2182DF0005FA15 /* TestAssetProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 33BF9C6D2F2182DB0005FA15 /* TestAssetProvider.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 478116522BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 478116512BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m */; }; - 528F16832C62941000148160 /* FGMClusterManagersControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 528F16822C62941000148160 /* FGMClusterManagersControllerTests.m */; }; + 478116522BEF8F47002F593E /* PolylineControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 478116512BEF8F47002F593E /* PolylineControllerTests.m */; }; + 528F16832C62941000148160 /* ClusterManagersControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 528F16822C62941000148160 /* ClusterManagersControllerTests.m */; }; 528F16872C62952700148160 /* ExtractIconFromDataTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 528F16862C62952700148160 /* ExtractIconFromDataTests.m */; }; - 6851F3562835BC180032B7C8 /* FGMConversionsUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6851F3552835BC180032B7C8 /* FGMConversionsUtilsTests.m */; }; + 6851F3562835BC180032B7C8 /* ConversionsUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6851F3552835BC180032B7C8 /* ConversionsUtilsTests.m */; }; 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - 982F2A6C27BADE17003C81F4 /* PartiallyMockedMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */; }; B3A7FA04ABB7B84780729949 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A9A8623F5CA9BBC813DC6B /* Pods_Runner.framework */; }; F269303B2BB389BF00BF17C4 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = F269303A2BB389BF00BF17C4 /* assets */; }; F7151F13265D7ED70028CB91 /* GoogleMapsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F7151F12265D7ED70028CB91 /* GoogleMapsTests.m */; }; @@ -65,28 +65,30 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0DD7B6C22B744EEF00E857FD /* FLTTileProviderControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLTTileProviderControllerTests.m; sourceTree = ""; }; + 0DD7B6C22B744EEF00E857FD /* TileProviderControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TileProviderControllerTests.m; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 2A6906C62D263DE7001F8426 /* GoogleMapsGroundOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsGroundOverlayControllerTests.m; sourceTree = ""; }; - 330909FE2D99B79B0077A751 /* GoogleMapsMarkerControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsMarkerControllerTests.m; sourceTree = ""; }; - 3378E6332F23F9220045E7DA /* TestMapEventHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestMapEventHandler.h; sourceTree = ""; }; - 3378E6342F23F92E0045E7DA /* TestMapEventHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestMapEventHandler.m; sourceTree = ""; }; - 339355B82EB3E4D500EBF864 /* GoogleMapsPolygonControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsPolygonControllerTests.m; sourceTree = ""; }; - 339355B92EB3E4F900EBF864 /* GoogleMapsCircleControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsCircleControllerTests.m; sourceTree = ""; }; - 339355BC2EB3E55600EBF864 /* GoogleMapsTileOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsTileOverlayControllerTests.m; sourceTree = ""; }; - 339355BE2EB5359B00EBF864 /* FLTGoogleMapHeatmapControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FLTGoogleMapHeatmapControllerTests.m; sourceTree = ""; }; + 2A6906C62D263DE7001F8426 /* GroundOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroundOverlayControllerTests.m; sourceTree = ""; }; + 330909FE2D99B79B0077A751 /* MarkerControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MarkerControllerTests.m; sourceTree = ""; }; + 3390B4572F33AFA60094DEB9 /* PartiallyMockedMapView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PartiallyMockedMapView.h; sourceTree = ""; }; + 3390B4582F33AFA60094DEB9 /* PartiallyMockedMapView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PartiallyMockedMapView.m; sourceTree = ""; }; + 3390B4592F33AFA60094DEB9 /* TestAssetProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestAssetProvider.h; sourceTree = ""; }; + 3390B45A2F33AFA60094DEB9 /* TestAssetProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestAssetProvider.m; sourceTree = ""; }; + 3390B45B2F33AFA60094DEB9 /* TestMapEventHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestMapEventHandler.h; sourceTree = ""; }; + 3390B45C2F33AFA60094DEB9 /* TestMapEventHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestMapEventHandler.m; sourceTree = ""; }; + 339355B82EB3E4D500EBF864 /* PolygonControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PolygonControllerTests.m; sourceTree = ""; }; + 339355B92EB3E4F900EBF864 /* CircleControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CircleControllerTests.m; sourceTree = ""; }; + 339355BC2EB3E55600EBF864 /* TileOverlayControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TileOverlayControllerTests.m; sourceTree = ""; }; + 339355BE2EB5359B00EBF864 /* HeatmapControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HeatmapControllerTests.m; sourceTree = ""; }; 339DF1EF2F1FE49300748863 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 339DF1F12F1FE4AD00748863 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; - 33BF9C6C2F2182CB0005FA15 /* TestAssetProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestAssetProvider.h; sourceTree = ""; }; - 33BF9C6D2F2182DB0005FA15 /* TestAssetProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestAssetProvider.m; sourceTree = ""; }; 3ACE0AFE8D82CD5962486AFD /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 478116512BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoogleMapsPolylineControllerTests.m; sourceTree = ""; }; - 528F16822C62941000148160 /* FGMClusterManagersControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FGMClusterManagersControllerTests.m; sourceTree = ""; }; + 478116512BEF8F47002F593E /* PolylineControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PolylineControllerTests.m; sourceTree = ""; }; + 528F16822C62941000148160 /* ClusterManagersControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClusterManagersControllerTests.m; sourceTree = ""; }; 528F16862C62952700148160 /* ExtractIconFromDataTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExtractIconFromDataTests.m; sourceTree = ""; }; 61A9A8623F5CA9BBC813DC6B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 6851F3552835BC180032B7C8 /* FGMConversionsUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FGMConversionsUtilsTests.m; sourceTree = ""; }; + 6851F3552835BC180032B7C8 /* ConversionsUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConversionsUtilsTests.m; sourceTree = ""; }; 733AFAB37683A9DA7512F09C /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 784666492D4C4C64000A1A5F /* FlutterFramework */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterFramework; path = Flutter/ephemeral/Packages/.packages/FlutterFramework; sourceTree = ""; }; 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; @@ -98,8 +100,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 982F2A6A27BADE17003C81F4 /* PartiallyMockedMapView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PartiallyMockedMapView.h; sourceTree = ""; }; - 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PartiallyMockedMapView.m; sourceTree = ""; }; B7AFC65E3DD5AC60D834D83D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; E52C6A6210A56F027C582EF9 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; EA0E91726245EDC22B97E8B9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; @@ -149,6 +149,19 @@ name = Frameworks; sourceTree = ""; }; + 3390B45D2F33AFA60094DEB9 /* TestUtils */ = { + isa = PBXGroup; + children = ( + 3390B4572F33AFA60094DEB9 /* PartiallyMockedMapView.h */, + 3390B4582F33AFA60094DEB9 /* PartiallyMockedMapView.m */, + 3390B4592F33AFA60094DEB9 /* TestAssetProvider.h */, + 3390B45A2F33AFA60094DEB9 /* TestAssetProvider.m */, + 3390B45B2F33AFA60094DEB9 /* TestMapEventHandler.h */, + 3390B45C2F33AFA60094DEB9 /* TestMapEventHandler.m */, + ); + path = TestUtils; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -214,25 +227,20 @@ F7151F11265D7ED70028CB91 /* RunnerTests */ = { isa = PBXGroup; children = ( + 3390B45D2F33AFA60094DEB9 /* TestUtils */, F269303A2BB389BF00BF17C4 /* assets */, + 528F16822C62941000148160 /* ClusterManagersControllerTests.m */, + 6851F3552835BC180032B7C8 /* ConversionsUtilsTests.m */, + 339355B92EB3E4F900EBF864 /* CircleControllerTests.m */, 528F16862C62952700148160 /* ExtractIconFromDataTests.m */, - 528F16822C62941000148160 /* FGMClusterManagersControllerTests.m */, - 339355BE2EB5359B00EBF864 /* FLTGoogleMapHeatmapControllerTests.m */, - 6851F3552835BC180032B7C8 /* FGMConversionsUtilsTests.m */, - 0DD7B6C22B744EEF00E857FD /* FLTTileProviderControllerTests.m */, F7151F12265D7ED70028CB91 /* GoogleMapsTests.m */, - 339355B92EB3E4F900EBF864 /* GoogleMapsCircleControllerTests.m */, - 2A6906C62D263DE7001F8426 /* GoogleMapsGroundOverlayControllerTests.m */, - 330909FE2D99B79B0077A751 /* GoogleMapsMarkerControllerTests.m */, - 339355B82EB3E4D500EBF864 /* GoogleMapsPolygonControllerTests.m */, - 478116512BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m */, - 339355BC2EB3E55600EBF864 /* GoogleMapsTileOverlayControllerTests.m */, - 982F2A6A27BADE17003C81F4 /* PartiallyMockedMapView.h */, - 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */, - 33BF9C6C2F2182CB0005FA15 /* TestAssetProvider.h */, - 33BF9C6D2F2182DB0005FA15 /* TestAssetProvider.m */, - 3378E6332F23F9220045E7DA /* TestMapEventHandler.h */, - 3378E6342F23F92E0045E7DA /* TestMapEventHandler.m */, + 2A6906C62D263DE7001F8426 /* GroundOverlayControllerTests.m */, + 339355BE2EB5359B00EBF864 /* HeatmapControllerTests.m */, + 330909FE2D99B79B0077A751 /* MarkerControllerTests.m */, + 339355B82EB3E4D500EBF864 /* PolygonControllerTests.m */, + 478116512BEF8F47002F593E /* PolylineControllerTests.m */, + 339355BC2EB3E55600EBF864 /* TileOverlayControllerTests.m */, + 0DD7B6C22B744EEF00E857FD /* TileProviderControllerTests.m */, F7151F14265D7ED70028CB91 /* Info.plist */, ); path = RunnerTests; @@ -262,6 +270,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, BB6BD9A1101E970BEF85B6D2 /* [CP] Copy Pods Resources */, + 047700BF2FF597AB85605C89 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -283,7 +292,6 @@ F7151F0C265D7ED70028CB91 /* Sources */, F7151F0D265D7ED70028CB91 /* Frameworks */, F7151F0E265D7ED70028CB91 /* Resources */, - DF182F6A1B9E41DA05BFCB87 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -391,6 +399,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 047700BF2FF597AB85605C89 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -482,24 +508,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - DF182F6A1B9E41DA05BFCB87 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -516,19 +524,19 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 528F16832C62941000148160 /* FGMClusterManagersControllerTests.m in Sources */, - 339355BA2EB3E50300EBF864 /* GoogleMapsCircleControllerTests.m in Sources */, - 339355BF2EB535A600EBF864 /* FLTGoogleMapHeatmapControllerTests.m in Sources */, - 339355BD2EB3E56300EBF864 /* GoogleMapsTileOverlayControllerTests.m in Sources */, + 3390B45E2F33AFA60094DEB9 /* PartiallyMockedMapView.m in Sources */, + 3390B45F2F33AFA60094DEB9 /* TestAssetProvider.m in Sources */, + 3390B4602F33AFA60094DEB9 /* TestMapEventHandler.m in Sources */, + 528F16832C62941000148160 /* ClusterManagersControllerTests.m in Sources */, + 339355BA2EB3E50300EBF864 /* CircleControllerTests.m in Sources */, + 339355BF2EB535A600EBF864 /* HeatmapControllerTests.m in Sources */, + 339355BD2EB3E56300EBF864 /* TileOverlayControllerTests.m in Sources */, F7151F13265D7ED70028CB91 /* GoogleMapsTests.m in Sources */, - 33BF9C6E2F2182DF0005FA15 /* TestAssetProvider.m in Sources */, - 6851F3562835BC180032B7C8 /* FGMConversionsUtilsTests.m in Sources */, - 982F2A6C27BADE17003C81F4 /* PartiallyMockedMapView.m in Sources */, - 3378E6352F23F9300045E7DA /* TestMapEventHandler.m in Sources */, - 330909FF2D99B7A60077A751 /* GoogleMapsMarkerControllerTests.m in Sources */, - 478116522BEF8F47002F593E /* GoogleMapsPolylineControllerTests.m in Sources */, - 2A6906C72D263DF4001F8426 /* GoogleMapsGroundOverlayControllerTests.m in Sources */, - 0DD7B6C32B744EEF00E857FD /* FLTTileProviderControllerTests.m in Sources */, + 6851F3562835BC180032B7C8 /* ConversionsUtilsTests.m in Sources */, + 330909FF2D99B7A60077A751 /* MarkerControllerTests.m in Sources */, + 478116522BEF8F47002F593E /* PolylineControllerTests.m in Sources */, + 2A6906C72D263DF4001F8426 /* GroundOverlayControllerTests.m in Sources */, + 0DD7B6C32B744EEF00E857FD /* TileProviderControllerTests.m in Sources */, 528F16872C62952700148160 /* ExtractIconFromDataTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/CircleControllerTests.m similarity index 93% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/CircleControllerTests.m index 9549e4dc58ba..e794ca4df081 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/CircleControllerTests.m @@ -6,7 +6,7 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSCircle that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingCircle : GMSCircle { @@ -14,14 +14,14 @@ @interface PropertyOrderValidatingCircle : GMSCircle { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsCircleControllerTests : XCTestCase +@interface CircleControllerTests : XCTestCase @end -@implementation GoogleMapsCircleControllerTests +@implementation CircleControllerTests - (void)testUpdateCircleSetsVisibilityLast { PropertyOrderValidatingCircle *circle = [[PropertyOrderValidatingCircle alloc] init]; - [FLTGoogleMapCircleController + [FGMCircleController updateCircle:circle fromPlatformCircle:[FGMPlatformCircle makeWithConsumeTapEvents:NO @@ -40,7 +40,7 @@ - (void)testUpdateCircleSetsVisibilityLast { longitude:0] radius:10 circleId:@"circle"] - withMapView:[GoogleMapsCircleControllerTests mapView]]; + withMapView:[CircleControllerTests mapView]]; XCTAssertTrue(circle.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FGMClusterManagersControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/ClusterManagersControllerTests.m similarity index 95% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FGMClusterManagersControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/ClusterManagersControllerTests.m index 2a613cf92e1a..4f5766a234b2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FGMClusterManagersControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/ClusterManagersControllerTests.m @@ -7,14 +7,14 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" -#import "TestMapEventHandler.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" +#import "TestUtils/TestMapEventHandler.h" -@interface FGMClusterManagersControllerTests : XCTestCase +@interface ClusterManagersControllerTests : XCTestCase @end -@implementation FGMClusterManagersControllerTests +@implementation ClusterManagersControllerTests - (void)testClustering { CGRect frame = CGRectMake(0, 0, 100, 100); @@ -29,8 +29,8 @@ - (void)testClustering { FGMClusterManagersController *clusterManagersController = [[FGMClusterManagersController alloc] initWithMapView:mapView eventDelegate:eventHandler]; - FLTMarkersController *markersController = - [[FLTMarkersController alloc] initWithMapView:mapView + FGMMarkersController *markersController = + [[FGMMarkersController alloc] initWithMapView:mapView eventDelegate:eventHandler clusterManagersController:clusterManagersController assetProvider:[[TestAssetProvider alloc] init]]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FGMConversionsUtilsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/ConversionsUtilsTests.m similarity index 99% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FGMConversionsUtilsTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/ConversionsUtilsTests.m index 5f7b1bfc066d..63e5a7866c3c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FGMConversionsUtilsTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/ConversionsUtilsTests.m @@ -6,12 +6,12 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" -@interface FGMConversionUtilsTests : XCTestCase +@interface ConversionUtilsTests : XCTestCase @end -@implementation FGMConversionUtilsTests +@implementation ConversionUtilsTests - (void)testGetValueOrNilWithValue { NSString *key = @"key"; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/ExtractIconFromDataTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/ExtractIconFromDataTests.m index 5bf92fcf6155..e6523fe34428 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/ExtractIconFromDataTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/ExtractIconFromDataTests.m @@ -5,7 +5,7 @@ @import google_maps_flutter_ios_sdk9; @import XCTest; -#import "TestAssetProvider.h" +#import "TestUtils/TestAssetProvider.h" @interface ExtractIconFromDataTests : XCTestCase - (UIImage *)createOnePixelImage; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsTests.m index c8c47a1ac882..4a554b806127 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsTests.m @@ -6,8 +6,8 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" @interface MockCATransaction : NSObject @property(nonatomic, assign) BOOL beginCalled; @@ -50,21 +50,21 @@ - (FlutterBinaryMessengerConnection)setMessageHandlerOnChannel:(nonnull NSString #pragma mark - -@interface FLTGoogleMapFactory (Test) +@interface FGMGoogleMapFactory (Test) @property(strong, nonatomic, readonly) id sharedMapServices; @end @interface GoogleMapsTests : XCTestCase @end -@interface FLTTileProviderController (Testing) +@interface FGMTileProviderController (Testing) - (UIImage *)handleResultTile:(nullable UIImage *)tileImage; @end @implementation GoogleMapsTests - (void)testPlugin { - FLTGoogleMapsPlugin *plugin = [[FLTGoogleMapsPlugin alloc] init]; + FGMGoogleMapsPlugin *plugin = [[FGMGoogleMapsPlugin alloc] init]; XCTAssertNotNil(plugin); } @@ -74,8 +74,8 @@ - (void)testFrameObserver { options.frame = frame; options.camera = [[GMSCameraPosition alloc] initWithLatitude:0 longitude:0 zoom:0]; PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:options]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -94,9 +94,9 @@ - (void)testMapsServiceSync { // The API requires a registrar, but this test doesn't actually use it, so just pass in a // dummy object rather than set up a full mock. id registrar = [[NSObject alloc] init]; - FLTGoogleMapFactory *factory1 = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *factory1 = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; XCTAssertNotNil(factory1.sharedMapServices); - FLTGoogleMapFactory *factory2 = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *factory2 = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; // Test pointer equality, should be same retained singleton +[GMSServices sharedServices] object. // Retaining the opaque object should be enough to avoid multiple internal initializations, // but don't test the internals of the GoogleMaps API. Assume that it does what is documented. @@ -105,7 +105,7 @@ - (void)testMapsServiceSync { } - (void)testHandleResultTileDownsamplesWideGamutImages { - FLTTileProviderController *controller = [[FLTTileProviderController alloc] init]; + FGMTileProviderController *controller = [[FGMTileProviderController alloc] init]; NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -134,8 +134,8 @@ - (void)testAnimateCameraWithUpdate { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -164,8 +164,8 @@ - (void)testAnimateCameraWithUpdateAndDuration { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -203,8 +203,8 @@ - (void)testInspectorAPICameraPosition { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; NSObject *binaryMessenger = [[StubBinaryMessenger alloc] init]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GroundOverlayControllerTests.m similarity index 93% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GroundOverlayControllerTests.m index dc4cdf4c1a88..4955e0528421 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GroundOverlayControllerTests.m @@ -6,9 +6,9 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" -#import "TestMapEventHandler.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" +#import "TestUtils/TestMapEventHandler.h" /// A GMSGroundOverlay that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingGroundOverlay : GMSGroundOverlay { @@ -16,15 +16,13 @@ @interface PropertyOrderValidatingGroundOverlay : GMSGroundOverlay { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsGroundOverlayControllerTests : XCTestCase +@interface GroundOverlayControllerTests : XCTestCase @end -@implementation GoogleMapsGroundOverlayControllerTests +@implementation GroundOverlayControllerTests -/// Returns GoogleMapGroundOverlayController object instantiated with position and a mocked map +/// Returns a GroundOverlayController object instantiated with position and a mocked map /// instance. -/// -/// @return An object of FLTGoogleMapGroundOverlayController + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap { NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -35,7 +33,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap icon:wideGamutImage zoomLevel:14.0]; - GMSMapView *mapView = [GoogleMapsGroundOverlayControllerTests mapView]; + GMSMapView *mapView = [GroundOverlayControllerTests mapView]; return [[FGMGroundOverlayController alloc] initWithGroundOverlay:groundOverlay identifier:@"id_1" @@ -43,10 +41,8 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap isCreatedWithBounds:NO]; } -/// Returns GoogleMapGroundOverlayController object instantiated with bounds and a mocked map +/// Returns a GroundOverlayController object instantiated with bounds and a mocked map /// instance. -/// -/// @return An object of FLTGoogleMapGroundOverlayController + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -58,7 +54,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { coordinate:CLLocationCoordinate2DMake(30, 40)] icon:wideGamutImage]; - GMSMapView *mapView = [GoogleMapsGroundOverlayControllerTests mapView]; + GMSMapView *mapView = [GroundOverlayControllerTests mapView]; return [[FGMGroundOverlayController alloc] initWithGroundOverlay:groundOverlay identifier:@"id_1" @@ -68,7 +64,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { - (void)testUpdatingGroundOverlayWithPosition { FGMGroundOverlayController *groundOverlayController = - [GoogleMapsGroundOverlayControllerTests groundOverlayControllerWithPositionWithMockedMap]; + [GroundOverlayControllerTests groundOverlayControllerWithPositionWithMockedMap]; FGMPlatformLatLng *position = [FGMPlatformLatLng makeWithLatitude:52.4816 longitude:3.1791]; @@ -120,7 +116,7 @@ - (void)testUpdatingGroundOverlayWithPosition { - (void)testUpdatingGroundOverlayWithBounds { FGMGroundOverlayController *groundOverlayController = - [GoogleMapsGroundOverlayControllerTests groundOverlayControllerWithBoundsWithMockedMap]; + [GroundOverlayControllerTests groundOverlayControllerWithBoundsWithMockedMap]; FGMPlatformLatLngBounds *bounds = [FGMPlatformLatLngBounds makeWithNortheast:[FGMPlatformLatLng makeWithLatitude:54.4816 longitude:5.1791] @@ -205,7 +201,7 @@ - (void)testUpdateGroundOverlaySetsVisibilityLast { visible:YES clickable:YES zoomLevel:nil] - withMapView:[GoogleMapsGroundOverlayControllerTests mapView] + withMapView:[GroundOverlayControllerTests mapView] assetProvider:[[TestAssetProvider alloc] init] screenScale:1.0 usingBounds:YES]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/HeatmapControllerTests.m similarity index 94% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/HeatmapControllerTests.m index 211b4f4ebbfc..c7f85488c1f9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/HeatmapControllerTests.m @@ -7,17 +7,17 @@ @import GoogleMapsUtils; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" @interface PropertyOrderValidatingHeatmap : GMUHeatmapTileLayer { } @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsHeatmapControllerTests : XCTestCase +@interface HeatmapControllerTests : XCTestCase @end -@implementation GoogleMapsHeatmapControllerTests +@implementation HeatmapControllerTests - (void)testUpdateHeatmapSetsVisibilityLast { PropertyOrderValidatingHeatmap *heatmap = [[PropertyOrderValidatingHeatmap alloc] init]; @@ -27,7 +27,7 @@ - (void)testUpdateHeatmapSetsVisibilityLast { ] startPoints:@[ @(0), @(1) ] colorMapSize:256]; - [FLTGoogleMapHeatmapController + [FGMHeatmapController updateHeatmap:heatmap fromPlatformHeatmap:[FGMPlatformHeatmap makeWithHeatmapId:@"heatmap" @@ -48,7 +48,7 @@ - (void)testUpdateHeatmapSetsVisibilityLast { radius:1 minimumZoomIntensity:1 maximumZoomIntensity:2] - withMapView:[GoogleMapsHeatmapControllerTests mapView]]; + withMapView:[HeatmapControllerTests mapView]]; XCTAssertTrue(heatmap.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/MarkerControllerTests.m similarity index 82% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/MarkerControllerTests.m index cec2ccfb2995..0913eef53a80 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/MarkerControllerTests.m @@ -6,9 +6,9 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" -#import "TestMapEventHandler.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" +#import "TestUtils/TestMapEventHandler.h" /// A GMSMarker that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingMarker : GMSMarker { @@ -16,10 +16,10 @@ @interface PropertyOrderValidatingMarker : GMSMarker { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsMarkerControllerTests : XCTestCase +@interface MarkerControllerTests : XCTestCase @end -@implementation GoogleMapsMarkerControllerTests +@implementation MarkerControllerTests /// Returns a simple map view for use with marker controllers. + (GMSMapView *)mapView { @@ -29,13 +29,13 @@ + (GMSMapView *)mapView { return [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; } -/// Returns a FLTMarkersController instance instantiated with the given map view. +/// Returns a FGMMarkersController instance instantiated with the given map view. /// /// The mapView should outlive the controller, as the controller keeps a weak reference to it. -- (FLTMarkersController *)markersControllerWithMapView:(GMSMapView *)mapView +- (FGMMarkersController *)markersControllerWithMapView:(GMSMapView *)mapView eventDelegate: (NSObject *)eventDelegate { - return [[FLTMarkersController alloc] initWithMapView:mapView + return [[FGMMarkersController alloc] initWithMapView:mapView eventDelegate:eventDelegate clusterManagersController:nil assetProvider:[[TestAssetProvider alloc] init]]; @@ -46,9 +46,9 @@ - (FGMPlatformBitmap *)placeholderBitmap { } - (void)testSetsMarkerNumericProperties { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -78,8 +78,7 @@ - (void)testSetsMarkerNumericProperties { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; const double delta = 0.0001; @@ -95,9 +94,9 @@ - (void)testSetsMarkerNumericProperties { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsDraggable { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -119,8 +118,7 @@ - (void)testSetsDraggable { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; XCTAssertTrue(marker.draggable); @@ -129,9 +127,9 @@ - (void)testSetsDraggable { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsFlat { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -153,8 +151,7 @@ - (void)testSetsFlat { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; XCTAssertTrue(marker.flat); @@ -163,9 +160,9 @@ - (void)testSetsFlat { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsVisible { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -187,8 +184,7 @@ - (void)testSetsVisible { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; // Visibility is controlled by being set to a map. @@ -196,9 +192,9 @@ - (void)testSetsVisible { } - (void)testSetsMarkerInfoWindowProperties { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -226,8 +222,7 @@ - (void)testSetsMarkerInfoWindowProperties { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; const double delta = 0.0001; @@ -239,32 +234,31 @@ - (void)testSetsMarkerInfoWindowProperties { - (void)testUpdateMarkerSetsVisibilityLast { PropertyOrderValidatingMarker *marker = [[PropertyOrderValidatingMarker alloc] init]; - [FLTGoogleMapMarkerController - updateMarker:marker - fromPlatformMarker:[FGMPlatformMarker - makeWithAlpha:1.0 - anchor:[FGMPlatformPoint makeWithX:0 y:0] - consumeTapEvents:YES - draggable:YES - flat:YES - icon:[self placeholderBitmap] - infoWindow:[FGMPlatformInfoWindow - makeWithTitle:@"info title" - snippet:@"info snippet" - anchor:[FGMPlatformPoint - makeWithX:0 - y:0]] - position:[FGMPlatformLatLng makeWithLatitude:0 - longitude:0] - rotation:0 - visible:YES - zIndex:0 - markerId:@"marker" - clusterManagerId:nil] - withMapView:[GoogleMapsMarkerControllerTests mapView] - assetProvider:[[TestAssetProvider alloc] init] - screenScale:1 - usingOpacityForVisibility:NO]; + [FGMMarkerController updateMarker:marker + fromPlatformMarker:[FGMPlatformMarker + makeWithAlpha:1.0 + anchor:[FGMPlatformPoint makeWithX:0 y:0] + consumeTapEvents:YES + draggable:YES + flat:YES + icon:[self placeholderBitmap] + infoWindow:[FGMPlatformInfoWindow + makeWithTitle:@"info title" + snippet:@"info snippet" + anchor:[FGMPlatformPoint + makeWithX:0 + y:0]] + position:[FGMPlatformLatLng makeWithLatitude:0 + longitude:0] + rotation:0 + visible:YES + zIndex:0 + markerId:@"marker" + clusterManagerId:nil] + withMapView:[MarkerControllerTests mapView] + assetProvider:[[TestAssetProvider alloc] init] + screenScale:1 + usingOpacityForVisibility:NO]; XCTAssertTrue(marker.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/PolygonControllerTests.m similarity index 70% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/PolygonControllerTests.m index f369408dbefe..7546017e986c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/PolygonControllerTests.m @@ -12,33 +12,32 @@ @interface PropertyOrderValidatingPolygon : GMSPolygon { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsPolygonControllerTests : XCTestCase +@interface PolygonControllerTests : XCTestCase @end -@implementation GoogleMapsPolygonControllerTests +@implementation PolygonControllerTests - (void)testUpdatePolygonSetsVisibilityLast { PropertyOrderValidatingPolygon *polygon = [[PropertyOrderValidatingPolygon alloc] init]; - [FLTGoogleMapPolygonController - updatePolygon:polygon - fromPlatformPolygon:[FGMPlatformPolygon - makeWithConsumeTapEvents:NO - fillColor:[FGMPlatformColor makeWithRed:0 - green:0 - blue:0 - alpha:0] - geodesic:NO - holes:@[] - strokeColor:[FGMPlatformColor makeWithRed:0 - green:0 - blue:0 - alpha:0] - strokeWidth:0 - visible:YES - zIndex:0 - points:@[] - polygonId:@"polygon"] - withMapView:[GoogleMapsPolygonControllerTests mapView]]; + [FGMPolygonController updatePolygon:polygon + fromPlatformPolygon:[FGMPlatformPolygon + makeWithConsumeTapEvents:NO + fillColor:[FGMPlatformColor makeWithRed:0 + green:0 + blue:0 + alpha:0] + geodesic:NO + holes:@[] + strokeColor:[FGMPlatformColor makeWithRed:0 + green:0 + blue:0 + alpha:0] + strokeWidth:0 + visible:YES + zIndex:0 + points:@[] + polygonId:@"polygon"] + withMapView:[PolygonControllerTests mapView]]; XCTAssertTrue(polygon.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/PolylineControllerTests.m similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/PolylineControllerTests.m index 014c44f46be0..6be24e208db9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/PolylineControllerTests.m @@ -6,7 +6,7 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSPolyline that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingPolyline : GMSPolyline { @@ -14,15 +14,15 @@ @interface PropertyOrderValidatingPolyline : GMSPolyline { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsPolylineControllerTests : XCTestCase +@interface PolylineControllerTests : XCTestCase @end -@implementation GoogleMapsPolylineControllerTests +@implementation PolylineControllerTests /// Returns GoogleMapPolylineController object instantiated with a mocked map instance /// -/// @return An object of FLTGoogleMapPolylineController -- (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { +/// @return An object of FGMPolylineController +- (FGMPolylineController *)polylineControllerWithMockedMap { FGMPlatformPolyline *polyline = [FGMPlatformPolyline makeWithPolylineId:@"polyline_id_0" consumesTapEvents:NO @@ -30,7 +30,7 @@ - (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { geodesic:NO jointType:FGMPlatformJointTypeRound patterns:@[] - points:[GoogleMapsPolylineControllerTests polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:NO width:1 zIndex:0]; @@ -46,16 +46,16 @@ - (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polyline.points)); - FLTGoogleMapPolylineController *polylineControllerWithMockedMap = - [[FLTGoogleMapPolylineController alloc] initWithPath:path - identifier:polyline.polylineId - mapView:mapView]; + FGMPolylineController *polylineControllerWithMockedMap = + [[FGMPolylineController alloc] initWithPath:path + identifier:polyline.polylineId + mapView:mapView]; return polylineControllerWithMockedMap; } - (void)testPatternsSetSpans { - FLTGoogleMapPolylineController *polylineController = [self polylineControllerWithMockedMap]; + FGMPolylineController *polylineController = [self polylineControllerWithMockedMap]; XCTAssertNil(polylineController.polyline.spans); @@ -77,8 +77,7 @@ - (void)testPatternsSetSpans { makeWithType:FGMPlatformPatternItemTypeDash length:@(10)] ] - points:[GoogleMapsPolylineControllerTests - polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:YES width:1 zIndex:0]]; @@ -89,7 +88,7 @@ - (void)testPatternsSetSpans { - (void)testUpdatePolylineSetsVisibilityLast { PropertyOrderValidatingPolyline *polyline = [[PropertyOrderValidatingPolyline alloc] init]; - [FLTGoogleMapPolylineController + [FGMPolylineController updatePolyline:polyline fromPlatformPolyline:[FGMPlatformPolyline makeWithPolylineId:@"polyline" @@ -101,11 +100,11 @@ - (void)testUpdatePolylineSetsVisibilityLast { geodesic:NO jointType:FGMPlatformJointTypeRound patterns:@[] - points:[GoogleMapsPolylineControllerTests polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:YES width:1 zIndex:0] - withMapView:[GoogleMapsPolylineControllerTests mapView]]; + withMapView:[PolylineControllerTests mapView]]; XCTAssertTrue(polyline.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/PartiallyMockedMapView.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/PartiallyMockedMapView.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/PartiallyMockedMapView.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/PartiallyMockedMapView.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestAssetProvider.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/TestAssetProvider.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestAssetProvider.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/TestAssetProvider.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestAssetProvider.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/TestAssetProvider.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestAssetProvider.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/TestAssetProvider.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestMapEventHandler.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/TestMapEventHandler.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestMapEventHandler.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/TestMapEventHandler.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestMapEventHandler.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/TestMapEventHandler.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestMapEventHandler.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TestUtils/TestMapEventHandler.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TileOverlayControllerTests.m similarity index 77% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TileOverlayControllerTests.m index be6469d0ecfb..0b206a128f7e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TileOverlayControllerTests.m @@ -6,29 +6,28 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSTileOverlay that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingTileLayer : GMSTileLayer @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsTileOverlayControllerTests : XCTestCase +@interface TileOverlayControllerTests : XCTestCase @end -@implementation GoogleMapsTileOverlayControllerTests +@implementation TileOverlayControllerTests - (void)testUpdateTileOverlaySetsVisibilityLast { PropertyOrderValidatingTileLayer *tileLayer = [[PropertyOrderValidatingTileLayer alloc] init]; - [FLTGoogleMapTileOverlayController - updateTileLayer:tileLayer - fromPlatformTileOverlay:[FGMPlatformTileOverlay makeWithTileOverlayId:@"overlay" - fadeIn:NO - transparency:0.5 - zIndex:0 - visible:YES - tileSize:1] - withMapView:[GoogleMapsTileOverlayControllerTests mapView]]; + [FGMTileOverlayController updateTileLayer:tileLayer + fromPlatformTileOverlay:[FGMPlatformTileOverlay makeWithTileOverlayId:@"overlay" + fadeIn:NO + transparency:0.5 + zIndex:0 + visible:YES + tileSize:1] + withMapView:[TileOverlayControllerTests mapView]]; XCTAssertTrue(tileLayer.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FLTTileProviderControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TileProviderControllerTests.m similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FLTTileProviderControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TileProviderControllerTests.m index a3df6c9da484..3e76b8b2db70 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/FLTTileProviderControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/TileProviderControllerTests.m @@ -45,16 +45,16 @@ - (void)tileWithOverlayIdentifier:(NSString *)tileOverlayId #pragma mark - -@interface FLTTileProviderControllerTests : XCTestCase +@interface TileProviderControllerTests : XCTestCase @end -@implementation FLTTileProviderControllerTests +@implementation TileProviderControllerTests - (void)testCallChannelOnPlatformThread { XCTestExpectation *expectation = [self expectationWithDescription:@"invokeMethod"]; TestTileProvider *tileProvider = [[TestTileProvider alloc] initWithExpectation:expectation]; - FLTTileProviderController *controller = - [[FLTTileProviderController alloc] initWithTileOverlayIdentifier:@"foo" + FGMTileProviderController *controller = + [[FGMTileProviderController alloc] initWithTileOverlayIdentifier:@"foo" tileProvider:tileProvider]; XCTAssertNotNil(controller); [controller requestTileForX:0 y:0 zoom:0 receiver:[[StubTileReceiver alloc] init]]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapCircleController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMCircleController.m similarity index 74% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapCircleController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMCircleController.m index 1348601ce0ff..8f86199f29bf 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapCircleController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMCircleController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapCircleController.h" -#import "GoogleMapCircleController_Test.h" +#import "FGMCircleController.h" +#import "FGMCircleController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapCircleController () +@interface FGMCircleController () @property(nonatomic, strong) GMSCircle *circle; @property(nonatomic, weak) GMSMapView *mapView; @end -@implementation FLTGoogleMapCircleController +@implementation FGMCircleController - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle mapView:(GMSMapView *)mapView { @@ -24,9 +24,7 @@ - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle radius:circle.radius]; _mapView = mapView; _circle.userData = @[ circle.circleId ]; - [FLTGoogleMapCircleController updateCircle:_circle - fromPlatformCircle:circle - withMapView:mapView]; + [FGMCircleController updateCircle:_circle fromPlatformCircle:circle withMapView:mapView]; } return self; } @@ -36,9 +34,9 @@ - (void)removeCircle { } - (void)updateFromPlatformCircle:(FGMPlatformCircle *)platformCircle { - [FLTGoogleMapCircleController updateCircle:self.circle - fromPlatformCircle:platformCircle - withMapView:self.mapView]; + [FGMCircleController updateCircle:self.circle + fromPlatformCircle:platformCircle + withMapView:self.mapView]; } + (void)updateCircle:(GMSCircle *)circle @@ -58,7 +56,7 @@ + (void)updateCircle:(GMSCircle *)circle @end -@interface FLTCirclesController () +@interface FGMCirclesController () @property(weak, nonatomic) NSObject *eventDelegate; @property(weak, nonatomic) GMSMapView *mapView; @@ -66,7 +64,7 @@ @interface FLTCirclesController () @end -@implementation FLTCirclesController +@implementation FGMCirclesController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -81,23 +79,22 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView - (void)addCircles:(NSArray *)circlesToAdd { for (FGMPlatformCircle *circle in circlesToAdd) { - FLTGoogleMapCircleController *controller = - [[FLTGoogleMapCircleController alloc] initCircleWithPlatformCircle:circle - mapView:self.mapView]; + FGMCircleController *controller = + [[FGMCircleController alloc] initCircleWithPlatformCircle:circle mapView:self.mapView]; self.circleIdToController[circle.circleId] = controller; } } - (void)changeCircles:(NSArray *)circlesToChange { for (FGMPlatformCircle *circle in circlesToChange) { - FLTGoogleMapCircleController *controller = self.circleIdToController[circle.circleId]; + FGMCircleController *controller = self.circleIdToController[circle.circleId]; [controller updateFromPlatformCircle:circle]; } } - (void)removeCirclesWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapCircleController *controller = self.circleIdToController[identifier]; + FGMCircleController *controller = self.circleIdToController[identifier]; if (!controller) { continue; } @@ -117,7 +114,7 @@ - (void)didTapCircleWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapCircleController *controller = self.circleIdToController[identifier]; + FGMCircleController *controller = self.circleIdToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGoogleMapController.m similarity index 96% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGoogleMapController.m index c265785d624e..c1f07051264c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGoogleMapController.m @@ -4,25 +4,25 @@ @import GoogleMapsUtils; -#import "GoogleMapController.h" -#import "GoogleMapController_Test.h" +#import "FGMGoogleMapController.h" +#import "FGMGoogleMapController_Test.h" #import "FGMAssetProvider.h" #import "FGMConversionUtils.h" #import "FGMGroundOverlayController.h" +#import "FGMHeatmapController.h" #import "FGMMarkerUserData.h" -#import "FLTGoogleMapHeatmapController.h" -#import "FLTGoogleMapTileOverlayController.h" +#import "FGMTileOverlayController.h" #import "google_maps_flutter_pigeon_messages.g.h" -@interface FLTGoogleMapFactory () +@interface FGMGoogleMapFactory () @property(weak, nonatomic) NSObject *registrar; @property(strong, nonatomic, readonly) id sharedMapServices; @end -@implementation FLTGoogleMapFactory +@implementation FGMGoogleMapFactory @synthesize sharedMapServices = _sharedMapServices; @@ -45,7 +45,7 @@ - (instancetype)initWithRegistrar:(NSObject *)registrar // Retain the shared map services singleton, don't use the result for anything. (void)[self sharedMapServices]; - return [[FLTGoogleMapController alloc] initWithFrame:frame + return [[FGMGoogleMapController alloc] initWithFrame:frame viewIdentifier:viewId creationParameters:args registrar:self.registrar]; @@ -216,12 +216,12 @@ - (void)didTapGroundOverlayWithIdentifier:(NSString *)groundOverlayId { /// Private declarations of the FGMMapCallHandler. @interface FGMMapCallHandler () -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix; /// The map controller this inspector corresponds to. -@property(nonatomic, weak) FLTGoogleMapController *controller; +@property(nonatomic, weak) FGMGoogleMapController *controller; /// The messenger this instance was registered with by Pigeon. @property(nonatomic, copy) NSObject *messenger; /// The suffix this instance was registered under with Pigeon. @@ -234,7 +234,7 @@ - (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controll @interface FGMMapInspector () /// The map controller this inspector corresponds to. -@property(nonatomic, weak) FLTGoogleMapController *controller; +@property(nonatomic, weak) FGMGoogleMapController *controller; /// The messenger this instance was registered with by Pigeon. @property(nonatomic, copy) NSObject *messenger; /// The suffix this instance was registered under with Pigeon. @@ -243,22 +243,22 @@ @interface FGMMapInspector () #pragma mark - -@interface FLTGoogleMapController () +@interface FGMGoogleMapController () @property(nonatomic, strong) GMSMapView *mapView; @property(nonatomic, strong) FGMMapsCallbackApi *dartCallbackHandler; @property(nonatomic, strong) FGMDefaultMapEventHandler *mapEventHandler; @property(nonatomic, assign) BOOL trackCameraPosition; @property(nonatomic, strong) FGMClusterManagersController *clusterManagersController; -@property(nonatomic, strong) FLTMarkersController *markersController; -@property(nonatomic, strong) FLTPolygonsController *polygonsController; -@property(nonatomic, strong) FLTPolylinesController *polylinesController; -@property(nonatomic, strong) FLTCirclesController *circlesController; +@property(nonatomic, strong) FGMMarkersController *markersController; +@property(nonatomic, strong) FGMPolygonsController *polygonsController; +@property(nonatomic, strong) FGMPolylinesController *polylinesController; +@property(nonatomic, strong) FGMCirclesController *circlesController; // The controller that handles heatmaps -@property(nonatomic, strong) FLTHeatmapsController *heatmapsController; -@property(nonatomic, strong) FLTTileOverlaysController *tileOverlaysController; -@property(nonatomic, strong) FLTGroundOverlaysController *groundOverlaysController; +@property(nonatomic, strong) FGMHeatmapsController *heatmapsController; +@property(nonatomic, strong) FGMTileOverlaysController *tileOverlaysController; +@property(nonatomic, strong) FGMGroundOverlaysController *groundOverlaysController; // The resulting error message, if any, from the last attempt to set the map style. // This is used to provide access to errors after the fact, since the map style is generally set at // creation time and there's no mechanism to return non-fatal error details during platform view @@ -271,7 +271,7 @@ @interface FLTGoogleMapController () @end -@implementation FLTGoogleMapController +@implementation FGMGoogleMapController - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId @@ -319,21 +319,21 @@ - (instancetype)initWithMapView:(GMSMapView *_Nonnull)mapView _clusterManagersController = [[FGMClusterManagersController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _markersController = [[FLTMarkersController alloc] initWithMapView:_mapView + _markersController = [[FGMMarkersController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler clusterManagersController:_clusterManagersController assetProvider:assetProvider]; - _polygonsController = [[FLTPolygonsController alloc] initWithMapView:_mapView + _polygonsController = [[FGMPolygonsController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _polylinesController = [[FLTPolylinesController alloc] initWithMapView:_mapView + _polylinesController = [[FGMPolylinesController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _circlesController = [[FLTCirclesController alloc] initWithMapView:_mapView + _circlesController = [[FGMCirclesController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _heatmapsController = [[FLTHeatmapsController alloc] initWithMapView:_mapView]; - _tileOverlaysController = [[FLTTileOverlaysController alloc] initWithMapView:_mapView + _heatmapsController = [[FGMHeatmapsController alloc] initWithMapView:_mapView]; + _tileOverlaysController = [[FGMTileOverlaysController alloc] initWithMapView:_mapView tileProvider:self]; _groundOverlaysController = - [[FLTGroundOverlaysController alloc] initWithMapView:_mapView + [[FGMGroundOverlaysController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler assetProvider:assetProvider]; [_clusterManagersController addClusterManagers:creationParameters.initialClusterManagers]; @@ -657,7 +657,7 @@ - (void)tileWithOverlayIdentifier:(NSString *)tileOverlayId /// Private declarations of the FGMMapCallHandler. @implementation FGMMapCallHandler -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix { self = [super init]; @@ -889,7 +889,7 @@ - (nullable FlutterStandardTypedData *)takeSnapshotWithError: /// Private declarations of the FGMMapInspector. @implementation FGMMapInspector -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix { self = [super init]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGoogleMapsPlugin.m similarity index 81% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGoogleMapsPlugin.m index 86391b40892e..515a6bf99e90 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGoogleMapsPlugin.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapsPlugin.h" +#import "FGMGoogleMapsPlugin.h" #pragma mark - GoogleMaps plugin implementation -@implementation FLTGoogleMapsPlugin +@implementation FGMGoogleMapsPlugin + (void)registerWithRegistrar:(NSObject *)registrar { - FLTGoogleMapFactory *googleMapFactory = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *googleMapFactory = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; [registrar registerViewFactory:googleMapFactory withId:@"plugins.flutter.dev/google_maps_ios" gestureRecognizersBlockingPolicy: diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FLTGoogleMapHeatmapController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMHeatmapController.m similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FLTGoogleMapHeatmapController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMHeatmapController.m index 91c93933308d..49ec16dff827 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FLTGoogleMapHeatmapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMHeatmapController.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapHeatmapController.h" -#import "FLTGoogleMapHeatmapController_Test.h" +#import "FGMHeatmapController.h" +#import "FGMHeatmapController_Test.h" @import GoogleMapsUtils; #import "FGMConversionUtils.h" -@interface FLTGoogleMapHeatmapController () +@interface FGMHeatmapController () /// The heatmap tile layer this controller handles. @property(nonatomic, strong) GMUHeatmapTileLayer *heatmapTileLayer; @@ -19,7 +19,7 @@ @interface FLTGoogleMapHeatmapController () @end -@implementation FLTGoogleMapHeatmapController +@implementation FGMHeatmapController - (instancetype)initWithHeatmap:(FGMPlatformHeatmap *)heatmap tileLayer:(GMUHeatmapTileLayer *)heatmapTileLayer mapView:(GMSMapView *)mapView { @@ -28,9 +28,9 @@ - (instancetype)initWithHeatmap:(FGMPlatformHeatmap *)heatmap _heatmapTileLayer = heatmapTileLayer; _mapView = mapView; - [FLTGoogleMapHeatmapController updateHeatmap:_heatmapTileLayer - fromPlatformHeatmap:heatmap - withMapView:_mapView]; + [FGMHeatmapController updateHeatmap:_heatmapTileLayer + fromPlatformHeatmap:heatmap + withMapView:_mapView]; } return self; } @@ -44,9 +44,9 @@ - (void)clearTileCache { } - (void)updateFromPlatformHeatmap:(FGMPlatformHeatmap *)platformHeatmap { - [FLTGoogleMapHeatmapController updateHeatmap:_heatmapTileLayer - fromPlatformHeatmap:platformHeatmap - withMapView:_mapView]; + [FGMHeatmapController updateHeatmap:_heatmapTileLayer + fromPlatformHeatmap:platformHeatmap + withMapView:_mapView]; } + (void)updateHeatmap:(GMUHeatmapTileLayer *)heatmapTileLayer @@ -67,18 +67,18 @@ + (void)updateHeatmap:(GMUHeatmapTileLayer *)heatmapTileLayer } @end -@interface FLTHeatmapsController () +@interface FGMHeatmapsController () /// A map from heatmapId to the controller that manages it. @property(nonatomic, strong) - NSMutableDictionary *heatmapIdToController; + NSMutableDictionary *heatmapIdToController; /// The map view owned by GoogmeMapController. @property(nonatomic, weak) GMSMapView *mapView; @end -@implementation FLTHeatmapsController +@implementation FGMHeatmapsController - (instancetype)initWithMapView:(GMSMapView *)mapView { self = [super init]; if (self) { @@ -91,17 +91,17 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView { - (void)addHeatmaps:(NSArray *)heatmapsToAdd { for (FGMPlatformHeatmap *heatmap in heatmapsToAdd) { GMUHeatmapTileLayer *heatmapTileLayer = [[GMUHeatmapTileLayer alloc] init]; - FLTGoogleMapHeatmapController *controller = - [[FLTGoogleMapHeatmapController alloc] initWithHeatmap:heatmap - tileLayer:heatmapTileLayer - mapView:_mapView]; + FGMHeatmapController *controller = + [[FGMHeatmapController alloc] initWithHeatmap:heatmap + tileLayer:heatmapTileLayer + mapView:_mapView]; _heatmapIdToController[heatmap.heatmapId] = controller; } } - (void)changeHeatmaps:(NSArray *)heatmapsToChange { for (FGMPlatformHeatmap *heatmap in heatmapsToChange) { - FLTGoogleMapHeatmapController *controller = _heatmapIdToController[heatmap.heatmapId]; + FGMHeatmapController *controller = _heatmapIdToController[heatmap.heatmapId]; [controller updateFromPlatformHeatmap:heatmap]; [controller clearTileCache]; @@ -110,7 +110,7 @@ - (void)changeHeatmaps:(NSArray *)heatmapsToChange { - (void)removeHeatmapsWithIdentifiers:(NSArray *)identifiers { for (NSString *heatmapId in identifiers) { - FLTGoogleMapHeatmapController *controller = _heatmapIdToController[heatmapId]; + FGMHeatmapController *controller = _heatmapIdToController[heatmapId]; if (!controller) { continue; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMMarkerController.m similarity index 86% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMMarkerController.m index 09a05db2840d..13d086cb31eb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMMarkerController.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapMarkerController.h" -#import "GoogleMapMarkerController_Test.h" +#import "FGMMarkerController.h" +#import "FGMMarkerController_Test.h" #import "FGMConversionUtils.h" #import "FGMImageUtils.h" #import "FGMMarkerUserData.h" -@interface FLTGoogleMapMarkerController () +@interface FGMMarkerController () @property(strong, nonatomic, readwrite) GMSMarker *marker; @property(weak, nonatomic) GMSMapView *mapView; @@ -21,7 +21,7 @@ @interface FLTGoogleMapMarkerController () @end -@implementation FLTGoogleMapMarkerController +@implementation FGMMarkerController - (instancetype)initWithMarker:(GMSMarker *)marker markerIdentifier:(NSString *)markerIdentifier @@ -66,12 +66,12 @@ - (void)updateFromPlatformMarker:(FGMPlatformMarker *)platformMarker // If marker belongs the cluster manager, visibility need to be controlled with the opacity // as the cluster manager controls when marker is on the map and when not. BOOL useOpacityForVisibility = self.clusterManagerIdentifier != nil; - [FLTGoogleMapMarkerController updateMarker:self.marker - fromPlatformMarker:platformMarker - withMapView:self.mapView - assetProvider:assetProvider - screenScale:screenScale - usingOpacityForVisibility:useOpacityForVisibility]; + [FGMMarkerController updateMarker:self.marker + fromPlatformMarker:platformMarker + withMapView:self.mapView + assetProvider:assetProvider + screenScale:screenScale + usingOpacityForVisibility:useOpacityForVisibility]; } + (void)updateMarker:(GMSMarker *)marker @@ -106,10 +106,10 @@ + (void)updateMarker:(GMSMarker *)marker @end -@interface FLTMarkersController () +@interface FGMMarkersController () @property(strong, nonatomic, readwrite) - NSMutableDictionary *markerIdentifierToController; + NSMutableDictionary *markerIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; /// Controller for adding/removing/fetching cluster managers @property(weak, nonatomic, nullable) FGMClusterManagersController *clusterManagersController; @@ -118,7 +118,7 @@ @interface FLTMarkersController () @end -@implementation FLTMarkersController +@implementation FGMMarkersController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate @@ -146,10 +146,9 @@ - (void)addMarker:(FGMPlatformMarker *)markerToAdd { NSString *markerIdentifier = markerToAdd.markerId; NSString *clusterManagerIdentifier = markerToAdd.clusterManagerId; GMSMarker *marker = [GMSMarker markerWithPosition:position]; - FLTGoogleMapMarkerController *controller = - [[FLTGoogleMapMarkerController alloc] initWithMarker:marker - markerIdentifier:markerIdentifier - mapView:self.mapView]; + FGMMarkerController *controller = [[FGMMarkerController alloc] initWithMarker:marker + markerIdentifier:markerIdentifier + mapView:self.mapView]; [controller updateFromPlatformMarker:markerToAdd assetProvider:self.assetProvider screenScale:[self getScreenScale]]; @@ -172,7 +171,7 @@ - (void)changeMarkers:(NSArray *)markersToChange { - (void)changeMarker:(FGMPlatformMarker *)markerToChange { NSString *markerIdentifier = markerToChange.markerId; - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *controller = self.markerIdentifierToController[markerIdentifier]; if (!controller) { return; } @@ -210,7 +209,7 @@ - (void)removeMarkersWithIdentifiers:(NSArray *)identifiers { } - (void)removeMarker:(NSString *)identifier { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -229,7 +228,7 @@ - (BOOL)didTapMarkerWithIdentifier:(NSString *)identifier { if (!identifier) { return NO; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return NO; } @@ -242,7 +241,7 @@ - (void)didStartDraggingMarkerWithIdentifier:(NSString *)identifier if (!identifier) { return; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -256,7 +255,7 @@ - (void)didDragMarkerWithIdentifier:(NSString *)identifier if (!identifier) { return; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -266,7 +265,7 @@ - (void)didDragMarkerWithIdentifier:(NSString *)identifier - (void)didEndDraggingMarkerWithIdentifier:(NSString *)identifier location:(CLLocationCoordinate2D)location { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -283,7 +282,7 @@ - (void)didTapInfoWindowOfMarkerWithIdentifier:(NSString *)identifier { - (void)showMarkerInfoWindowWithIdentifier:(NSString *)identifier error: (FlutterError *_Nullable __autoreleasing *_Nonnull)error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { [controller showInfoWindow]; } else { @@ -296,7 +295,7 @@ - (void)showMarkerInfoWindowWithIdentifier:(NSString *)identifier - (void)hideMarkerInfoWindowWithIdentifier:(NSString *)identifier error: (FlutterError *_Nullable __autoreleasing *_Nonnull)error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { [controller hideInfoWindow]; } else { @@ -310,7 +309,7 @@ - (void)hideMarkerInfoWindowWithIdentifier:(NSString *)identifier isInfoWindowShownForMarkerWithIdentifier:(NSString *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { return @([controller isInfoWindowShown]); } else { diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMPolygonController.m similarity index 79% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMPolygonController.m index f5d077bd4ff1..2de1c9323878 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMPolygonController.m @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolygonController_Test.h" +#import "FGMPolygonController.h" +#import "FGMPolygonController_Test.h" #import "FGMConversionUtils.h" @@ -18,14 +18,14 @@ return pathHoles; } -@interface FLTGoogleMapPolygonController () +@interface FGMPolygonController () @property(strong, nonatomic) GMSPolygon *polygon; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapPolygonController +@implementation FGMPolygonController - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier @@ -44,9 +44,9 @@ - (void)removePolygon { } - (void)updateFromPlatformPolygon:(FGMPlatformPolygon *)polygon { - [FLTGoogleMapPolygonController updatePolygon:self.polygon - fromPlatformPolygon:polygon - withMapView:self.mapView]; + [FGMPolygonController updatePolygon:self.polygon + fromPlatformPolygon:polygon + withMapView:self.mapView]; } + (void)updatePolygon:(GMSPolygon *)polygon @@ -67,7 +67,7 @@ + (void)updatePolygon:(GMSPolygon *)polygon @end -@interface FLTPolygonsController () +@interface FGMPolygonsController () @property(strong, nonatomic) NSMutableDictionary *polygonIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; @@ -75,7 +75,7 @@ @interface FLTPolygonsController () @end -@implementation FLTPolygonsController +@implementation FGMPolygonsController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -92,10 +92,9 @@ - (void)addPolygons:(NSArray *)polygonsToAdd { for (FGMPlatformPolygon *polygon in polygonsToAdd) { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polygon.points)); NSString *identifier = polygon.polygonId; - FLTGoogleMapPolygonController *controller = - [[FLTGoogleMapPolygonController alloc] initWithPath:path - identifier:identifier - mapView:self.mapView]; + FGMPolygonController *controller = [[FGMPolygonController alloc] initWithPath:path + identifier:identifier + mapView:self.mapView]; [controller updateFromPlatformPolygon:polygon]; self.polygonIdentifierToController[identifier] = controller; } @@ -104,14 +103,14 @@ - (void)addPolygons:(NSArray *)polygonsToAdd { - (void)changePolygons:(NSArray *)polygonsToChange { for (FGMPlatformPolygon *polygon in polygonsToChange) { NSString *identifier = polygon.polygonId; - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; [controller updateFromPlatformPolygon:polygon]; } } - (void)removePolygonWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; if (!controller) { continue; } @@ -124,7 +123,7 @@ - (void)didTapPolygonWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapPolylineController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMPolylineController.m similarity index 78% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapPolylineController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMPolylineController.m index ea84a4e5be54..60b96515facc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapPolylineController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMPolylineController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolylineController.h" -#import "GoogleMapPolylineController_Test.h" +#import "FGMPolylineController.h" +#import "FGMPolylineController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapPolylineController () +@interface FGMPolylineController () @property(strong, nonatomic) GMSPolyline *polyline; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapPolylineController +@implementation FGMPolylineController - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier @@ -33,9 +33,9 @@ - (void)removePolyline { } - (void)updateFromPlatformPolyline:(FGMPlatformPolyline *)polyline { - [FLTGoogleMapPolylineController updatePolyline:self.polyline - fromPlatformPolyline:polyline - withMapView:self.mapView]; + [FGMPolylineController updatePolyline:self.polyline + fromPlatformPolyline:polyline + withMapView:self.mapView]; } + (void)updatePolyline:(GMSPolyline *)polyline @@ -60,7 +60,7 @@ + (void)updatePolyline:(GMSPolyline *)polyline @end -@interface FLTPolylinesController () +@interface FGMPolylinesController () @property(strong, nonatomic) NSMutableDictionary *polylineIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; @@ -69,7 +69,7 @@ @interface FLTPolylinesController () @end ; -@implementation FLTPolylinesController +@implementation FGMPolylinesController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -86,10 +86,9 @@ - (void)addPolylines:(NSArray *)polylinesToAdd { for (FGMPlatformPolyline *polyline in polylinesToAdd) { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polyline.points)); NSString *identifier = polyline.polylineId; - FLTGoogleMapPolylineController *controller = - [[FLTGoogleMapPolylineController alloc] initWithPath:path - identifier:identifier - mapView:self.mapView]; + FGMPolylineController *controller = [[FGMPolylineController alloc] initWithPath:path + identifier:identifier + mapView:self.mapView]; [controller updateFromPlatformPolyline:polyline]; self.polylineIdentifierToController[identifier] = controller; } @@ -98,14 +97,14 @@ - (void)addPolylines:(NSArray *)polylinesToAdd { - (void)changePolylines:(NSArray *)polylinesToChange { for (FGMPlatformPolyline *polyline in polylinesToChange) { NSString *identifier = polyline.polylineId; - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; [controller updateFromPlatformPolyline:polyline]; } } - (void)removePolylineWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; if (!controller) { continue; } @@ -118,7 +117,7 @@ - (void)didTapPolylineWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FLTGoogleMapTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMTileOverlayController.m similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FLTGoogleMapTileOverlayController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMTileOverlayController.m index 4116c82e4115..012276e27281 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FLTGoogleMapTileOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMTileOverlayController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapTileOverlayController.h" -#import "FLTGoogleMapTileOverlayController_Test.h" +#import "FGMTileOverlayController.h" +#import "FGMTileOverlayController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapTileOverlayController () +@interface FGMTileOverlayController () @property(strong, nonatomic) GMSTileLayer *layer; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapTileOverlayController +@implementation FGMTileOverlayController - (instancetype)initWithTileOverlay:(FGMPlatformTileOverlay *)tileOverlay tileLayer:(GMSTileLayer *)tileLayer @@ -23,9 +23,9 @@ - (instancetype)initWithTileOverlay:(FGMPlatformTileOverlay *)tileOverlay if (self) { _layer = tileLayer; _mapView = mapView; - [FLTGoogleMapTileOverlayController updateTileLayer:tileLayer - fromPlatformTileOverlay:tileOverlay - withMapView:mapView]; + [FGMTileOverlayController updateTileLayer:tileLayer + fromPlatformTileOverlay:tileOverlay + withMapView:mapView]; } return self; } @@ -39,9 +39,9 @@ - (void)clearTileCache { } - (void)updateFromPlatformTileOverlay:(FGMPlatformTileOverlay *)overlay { - [FLTGoogleMapTileOverlayController updateTileLayer:self.layer - fromPlatformTileOverlay:overlay - withMapView:self.mapView]; + [FGMTileOverlayController updateTileLayer:self.layer + fromPlatformTileOverlay:overlay + withMapView:self.mapView]; } + (void)updateTileLayer:(GMSTileLayer *)tileLayer @@ -58,13 +58,13 @@ + (void)updateTileLayer:(GMSTileLayer *)tileLayer @end -@interface FLTTileProviderController () +@interface FGMTileProviderController () @property(weak, nonatomic) NSObject *tileProviderDelegate; @end -@implementation FLTTileProviderController +@implementation FGMTileProviderController - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier tileProvider:(NSObject *)tileProvider { @@ -129,16 +129,16 @@ - (void)requestTileForX:(NSUInteger)x @end -@interface FLTTileOverlaysController () +@interface FGMTileOverlaysController () -@property(strong, nonatomic) NSMutableDictionary - *tileOverlayIdentifierToController; +@property(strong, nonatomic) + NSMutableDictionary *tileOverlayIdentifierToController; @property(weak, nonatomic) NSObject *tileProviderDelegate; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTTileOverlaysController +@implementation FGMTileOverlaysController - (instancetype)initWithMapView:(GMSMapView *)mapView tileProvider:(NSObject *)tileProvider { @@ -154,13 +154,13 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd { for (FGMPlatformTileOverlay *tileOverlay in tileOverlaysToAdd) { NSString *identifier = tileOverlay.tileOverlayId; - FLTTileProviderController *tileProvider = - [[FLTTileProviderController alloc] initWithTileOverlayIdentifier:identifier + FGMTileProviderController *tileProvider = + [[FGMTileProviderController alloc] initWithTileOverlayIdentifier:identifier tileProvider:self.tileProviderDelegate]; - FLTGoogleMapTileOverlayController *controller = - [[FLTGoogleMapTileOverlayController alloc] initWithTileOverlay:tileOverlay - tileLayer:tileProvider - mapView:self.mapView]; + FGMTileOverlayController *controller = + [[FGMTileOverlayController alloc] initWithTileOverlay:tileOverlay + tileLayer:tileProvider + mapView:self.mapView]; self.tileOverlayIdentifierToController[identifier] = controller; } } @@ -168,15 +168,13 @@ - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd { - (void)changeTileOverlays:(NSArray *)tileOverlaysToChange { for (FGMPlatformTileOverlay *tileOverlay in tileOverlaysToChange) { NSString *identifier = tileOverlay.tileOverlayId; - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; [controller updateFromPlatformTileOverlay:tileOverlay]; } } - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; if (!controller) { continue; } @@ -186,12 +184,11 @@ - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers { } - (void)clearTileCacheWithIdentifier:(NSString *)identifier { - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; [controller clearTileCache]; } -- (nullable FLTGoogleMapTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier { +- (nullable FGMTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier { return self.tileOverlayIdentifierToController[identifier]; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapCircleController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMCircleController.h similarity index 91% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapCircleController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMCircleController.h index ac4347551135..fb3b705871d3 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapCircleController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMCircleController.h @@ -10,13 +10,13 @@ NS_ASSUME_NONNULL_BEGIN // Defines circle controllable by Flutter. -@interface FLTGoogleMapCircleController : NSObject +@interface FGMCircleController : NSObject - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle mapView:(GMSMapView *)mapView; - (void)removeCircle; @end -@interface FLTCirclesController : NSObject +@interface FGMCirclesController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addCircles:(NSArray *)circlesToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMCircleController_Test.h similarity index 86% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMCircleController_Test.h index 1c72d2060dc1..9c1428987225 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMCircleController_Test.h @@ -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 "GoogleMapCircleController.h" +#import "FGMCircleController.h" NS_ASSUME_NONNULL_BEGIN /// Private methods exposed for testing. -@interface FLTGoogleMapCircleController (Test) +@interface FGMCircleController (Test) /// Updates the underlying GMSCircle with the properties from the given FGMPlatformCircle. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGoogleMapController.h similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGoogleMapController.h index e9ea39630ebf..b723c8d3658e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGoogleMapController.h @@ -6,17 +6,17 @@ @import GoogleMaps; #import "FGMCATransactionWrapper.h" +#import "FGMCircleController.h" #import "FGMClusterManagersController.h" -#import "GoogleMapCircleController.h" -#import "GoogleMapMarkerController.h" -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolylineController.h" +#import "FGMMarkerController.h" +#import "FGMPolygonController.h" +#import "FGMPolylineController.h" #import "google_maps_flutter_pigeon_messages.g.h" NS_ASSUME_NONNULL_BEGIN // Defines map overlay controllable from Flutter. -@interface FLTGoogleMapController : NSObject +@interface FGMGoogleMapController : NSObject - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId creationParameters:(FGMPlatformMapViewCreationParams *)creationParameters @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN @end // Allows the engine to create new Google Map instances. -@interface FLTGoogleMapFactory : NSObject +@interface FGMGoogleMapFactory : NSObject - (instancetype)initWithRegistrar:(NSObject *)registrar; @end diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGoogleMapController_Test.h similarity index 89% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGoogleMapController_Test.h index bbb61545cc0c..5e1fa9371b2c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGoogleMapController_Test.h @@ -7,7 +7,7 @@ #import "FGMAssetProvider.h" #import "FGMCATransactionWrapper.h" -#import "GoogleMapController.h" +#import "FGMGoogleMapController.h" NS_ASSUME_NONNULL_BEGIN @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN /// /// This is a separate object from the maps controller because the Pigeon API registration keeps a /// strong reference to the implementor, but as the FlutterPlatformView, the lifetime of the -/// FLTGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be +/// FGMGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be /// the target of the registration. @interface FGMMapCallHandler : NSObject @@ -28,18 +28,18 @@ NS_ASSUME_NONNULL_BEGIN /// /// This is a separate object from the maps controller because the Pigeon API registration keeps a /// strong reference to the implementor, but as the FlutterPlatformView, the lifetime of the -/// FLTGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be +/// FGMGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be /// the target of the registration. @interface FGMMapInspector : NSObject /// Initializes a Pigeon API for inpector with a map controller. -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix; @end -@interface FLTGoogleMapController (Test) +@interface FGMGoogleMapController (Test) /// Initializes a map controller with a concrete map view. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapsPlugin.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGoogleMapsPlugin.h similarity index 52% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapsPlugin.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGoogleMapsPlugin.h index a5a1d05a4cbd..ec294eb3d3e9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapsPlugin.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGoogleMapsPlugin.h @@ -5,16 +5,16 @@ @import Flutter; @import GoogleMaps; +#import "FGMCircleController.h" #import "FGMClusterManagersController.h" -#import "GoogleMapCircleController.h" -#import "GoogleMapController.h" -#import "GoogleMapMarkerController.h" -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolylineController.h" +#import "FGMGoogleMapController.h" +#import "FGMMarkerController.h" +#import "FGMPolygonController.h" +#import "FGMPolylineController.h" NS_ASSUME_NONNULL_BEGIN -@interface FLTGoogleMapsPlugin : NSObject +@interface FGMGoogleMapsPlugin : NSObject @end NS_ASSUME_NONNULL_END diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGroundOverlayController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGroundOverlayController.h index f4a07aa950e5..1a8f01055445 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGroundOverlayController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMGroundOverlayController.h @@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN @end /// Controller of multiple ground overlays on the map. -@interface FLTGroundOverlaysController : NSObject +@interface FGMGroundOverlaysController : NSObject /// Initializes the controller with a GMSMapView, event delegate, and asset provider. - (instancetype)initWithMapView:(GMSMapView *)mapView diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapHeatmapController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMHeatmapController.h similarity index 95% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapHeatmapController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMHeatmapController.h index 1d31f124077b..c8fce13543c7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapHeatmapController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMHeatmapController.h @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN /// Controller of a single Heatmap on the map. -@interface FLTGoogleMapHeatmapController : NSObject +@interface FGMHeatmapController : NSObject /// Initializes an instance of this class with a heatmap tile layer, a map view, and additional /// configuration options. @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN @end /// Controller of multiple Heatmaps on the map. -@interface FLTHeatmapsController : NSObject +@interface FGMHeatmapsController : NSObject /// Initializes the controller with a GMSMapView. - (instancetype)initWithMapView:(GMSMapView *)mapView; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapHeatmapController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMHeatmapController_Test.h similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapHeatmapController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMHeatmapController_Test.h index b00a48e3477f..797c309dbb2c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapHeatmapController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMHeatmapController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapHeatmapController.h" +#import "FGMHeatmapController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapHeatmapController (Test) +@interface FGMHeatmapController (Test) /// Updates the underlying GMUHeatmapTileLayer with the properties from the given platform heatmap. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapMarkerController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMMarkerController.h similarity index 96% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapMarkerController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMMarkerController.h index 57797346639e..5b6734a89478 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapMarkerController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMMarkerController.h @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - // Defines marker controllable by Flutter. -@interface FLTGoogleMapMarkerController : NSObject +@interface FGMMarkerController : NSObject @property(assign, nonatomic, readonly) BOOL consumeTapEvents; - (instancetype)initWithMarker:(GMSMarker *)marker markerIdentifier:(NSString *)markerIdentifier @@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)removeMarker; @end -@interface FLTMarkersController : NSObject +@interface FGMMarkersController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate clusterManagersController:(nullable FGMClusterManagersController *)clusterManagersController diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMMarkerController_Test.h similarity index 89% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMMarkerController_Test.h index d7a9c1578432..29e450df13ae 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMMarkerController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapMarkerController.h" +#import "FGMMarkerController.h" /// Methods exposed for unit testing. -@interface FLTGoogleMapMarkerController (Test) +@interface FGMMarkerController (Test) /// The underlying controlled GMSMarker. @property(strong, nonatomic, readonly) GMSMarker *marker; @@ -23,7 +23,7 @@ @end /// Methods exposed for unit testing. -@interface FLTMarkersController (Test) +@interface FGMMarkersController (Test) /// A mapping from marker identifiers to corresponding marker controllers. @property(strong, nonatomic, readonly) NSMutableDictionary *markerIdentifierToController; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolygonController.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolygonController.h index a222ca6a4eb0..b66ed908bbec 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolygonController.h @@ -8,14 +8,14 @@ #import "google_maps_flutter_pigeon_messages.g.h" // Defines polygon controllable by Flutter. -@interface FLTGoogleMapPolygonController : NSObject +@interface FGMPolygonController : NSObject - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier mapView:(GMSMapView *)mapView; - (void)removePolygon; @end -@interface FLTPolygonsController : NSObject +@interface FGMPolygonsController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addPolygons:(NSArray *)polygonsToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolygonController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolygonController_Test.h similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolygonController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolygonController_Test.h index ab4cf60be224..5072e4a4c7d7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolygonController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolygonController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolygonController.h" +#import "FGMPolygonController.h" /// Methods exposed for unit testing. -@interface FLTGoogleMapPolygonController (Test) +@interface FGMPolygonController (Test) /// Updates the underlying GMSPolygon with the properties from the given FGMPlatformPolygon. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolylineController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolylineController.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolylineController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolylineController.h index ccf37dae9a35..14071b7700e2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolylineController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolylineController.h @@ -8,14 +8,14 @@ #import "google_maps_flutter_pigeon_messages.g.h" // Defines polyline controllable by Flutter. -@interface FLTGoogleMapPolylineController : NSObject +@interface FGMPolylineController : NSObject - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier mapView:(GMSMapView *)mapView; - (void)removePolyline; @end -@interface FLTPolylinesController : NSObject +@interface FGMPolylinesController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addPolylines:(NSArray *)polylinesToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolylineController_Test.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolylineController_Test.h index df9e31293951..548bcff27cce 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMPolylineController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolylineController.h" +#import "FGMPolylineController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapPolylineController (Test) +@interface FGMPolylineController (Test) /// Polyline instance the controller is attached to @property(strong, nonatomic) GMSPolyline *polyline; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapTileOverlayController.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMTileOverlayController.h similarity index 87% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapTileOverlayController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMTileOverlayController.h index b4c707e6d0b4..0785c22f9a43 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapTileOverlayController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMTileOverlayController.h @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - -@interface FLTGoogleMapTileOverlayController : NSObject +@interface FGMTileOverlayController : NSObject /// The layer managed by this controller instance. @property(readonly, nonatomic) GMSTileLayer *layer; @@ -31,20 +31,20 @@ NS_ASSUME_NONNULL_BEGIN - (void)clearTileCache; @end -@interface FLTTileProviderController : GMSTileLayer +@interface FGMTileProviderController : GMSTileLayer @property(copy, nonatomic, readonly) NSString *tileOverlayIdentifier; - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier tileProvider:(NSObject *)tileProvider; @end -@interface FLTTileOverlaysController : NSObject +@interface FGMTileOverlaysController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView tileProvider:(NSObject *)tileProvider; - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd; - (void)changeTileOverlays:(NSArray *)tileOverlaysToChange; - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers; - (void)clearTileCacheWithIdentifier:(NSString *)identifier; -- (nullable FLTGoogleMapTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier; +- (nullable FGMTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier; @end NS_ASSUME_NONNULL_END diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapTileOverlayController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMTileOverlayController_Test.h similarity index 84% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapTileOverlayController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMTileOverlayController_Test.h index e753698cde45..faebc2b98a1b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapTileOverlayController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FGMTileOverlayController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapTileOverlayController.h" +#import "FGMTileOverlayController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapTileOverlayController (Test) +@interface FGMTileOverlayController (Test) /// Updates the underlying GMSTileLayer with the properties from the given FGMPlatformTileOverlay. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml index ec907faa1912..4cde9c4d3ead 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml @@ -13,7 +13,7 @@ flutter: implements: google_maps_flutter platforms: ios: - pluginClass: FLTGoogleMapsPlugin + pluginClass: FGMGoogleMapsPlugin dartPluginClass: GoogleMapsFlutterIOS dependencies: diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/CircleControllerTests.m similarity index 93% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/CircleControllerTests.m index ea03ce5ca5d4..c13e12faa103 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsCircleControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/CircleControllerTests.m @@ -6,7 +6,7 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSCircle that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingCircle : GMSCircle { @@ -14,14 +14,14 @@ @interface PropertyOrderValidatingCircle : GMSCircle { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsCircleControllerTests : XCTestCase +@interface CircleControllerTests : XCTestCase @end -@implementation GoogleMapsCircleControllerTests +@implementation CircleControllerTests - (void)testUpdateCircleSetsVisibilityLast { PropertyOrderValidatingCircle *circle = [[PropertyOrderValidatingCircle alloc] init]; - [FLTGoogleMapCircleController + [FGMCircleController updateCircle:circle fromPlatformCircle:[FGMPlatformCircle makeWithConsumeTapEvents:NO @@ -40,7 +40,7 @@ - (void)testUpdateCircleSetsVisibilityLast { longitude:0] radius:10 circleId:@"circle"] - withMapView:[GoogleMapsCircleControllerTests mapView]]; + withMapView:[CircleControllerTests mapView]]; XCTAssertTrue(circle.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FGMClusterManagersControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/ClusterManagersControllerTests.m similarity index 95% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FGMClusterManagersControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/ClusterManagersControllerTests.m index b41f94682639..72c0fbba572d 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FGMClusterManagersControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/ClusterManagersControllerTests.m @@ -7,14 +7,14 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" -#import "TestMapEventHandler.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" +#import "TestUtils/TestMapEventHandler.h" -@interface FGMClusterManagersControllerTests : XCTestCase +@interface ClusterManagersControllerTests : XCTestCase @end -@implementation FGMClusterManagersControllerTests +@implementation ClusterManagersControllerTests - (void)testClustering { CGRect frame = CGRectMake(0, 0, 100, 100); @@ -29,8 +29,8 @@ - (void)testClustering { FGMClusterManagersController *clusterManagersController = [[FGMClusterManagersController alloc] initWithMapView:mapView eventDelegate:eventHandler]; - FLTMarkersController *markersController = - [[FLTMarkersController alloc] initWithMapView:mapView + FGMMarkersController *markersController = + [[FGMMarkersController alloc] initWithMapView:mapView eventDelegate:eventHandler clusterManagersController:clusterManagersController assetProvider:[[TestAssetProvider alloc] init]]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FGMConversionsUtilsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/ConversionsUtilsTests.m similarity index 99% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FGMConversionsUtilsTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/ConversionsUtilsTests.m index f315eea407d8..c603163eeba9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FGMConversionsUtilsTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/ConversionsUtilsTests.m @@ -6,12 +6,12 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" -@interface FGMConversionUtilsTests : XCTestCase +@interface ConversionUtilsTests : XCTestCase @end -@implementation FGMConversionUtilsTests +@implementation ConversionUtilsTests - (void)testGetValueOrNilWithValue { NSString *key = @"key"; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/ExtractIconFromDataTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/ExtractIconFromDataTests.m index 4fc1e9eef7d5..50666756cf86 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/ExtractIconFromDataTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/ExtractIconFromDataTests.m @@ -5,7 +5,7 @@ @import google_maps_flutter_ios; @import XCTest; -#import "TestAssetProvider.h" +#import "TestUtils/TestAssetProvider.h" @interface ExtractIconFromDataTests : XCTestCase - (UIImage *)createOnePixelImage; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsTests.m index 5829131a9c94..10617a6a1757 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsTests.m @@ -6,8 +6,8 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" @interface MockCATransaction : NSObject @property(nonatomic, assign) BOOL beginCalled; @@ -50,21 +50,21 @@ - (FlutterBinaryMessengerConnection)setMessageHandlerOnChannel:(nonnull NSString #pragma mark - -@interface FLTGoogleMapFactory (Test) +@interface FGMGoogleMapFactory (Test) @property(strong, nonatomic, readonly) id sharedMapServices; @end @interface GoogleMapsTests : XCTestCase @end -@interface FLTTileProviderController (Testing) +@interface FGMTileProviderController (Testing) - (UIImage *)handleResultTile:(nullable UIImage *)tileImage; @end @implementation GoogleMapsTests - (void)testPlugin { - FLTGoogleMapsPlugin *plugin = [[FLTGoogleMapsPlugin alloc] init]; + FGMGoogleMapsPlugin *plugin = [[FGMGoogleMapsPlugin alloc] init]; XCTAssertNotNil(plugin); } @@ -74,8 +74,8 @@ - (void)testFrameObserver { options.frame = frame; options.camera = [[GMSCameraPosition alloc] initWithLatitude:0 longitude:0 zoom:0]; PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:options]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -94,9 +94,9 @@ - (void)testMapsServiceSync { // The API requires a registrar, but this test doesn't actually use it, so just pass in a // dummy object rather than set up a full mock. id registrar = [[NSObject alloc] init]; - FLTGoogleMapFactory *factory1 = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *factory1 = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; XCTAssertNotNil(factory1.sharedMapServices); - FLTGoogleMapFactory *factory2 = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *factory2 = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; // Test pointer equality, should be same retained singleton +[GMSServices sharedServices] object. // Retaining the opaque object should be enough to avoid multiple internal initializations, // but don't test the internals of the GoogleMaps API. Assume that it does what is documented. @@ -105,7 +105,7 @@ - (void)testMapsServiceSync { } - (void)testHandleResultTileDownsamplesWideGamutImages { - FLTTileProviderController *controller = [[FLTTileProviderController alloc] init]; + FGMTileProviderController *controller = [[FGMTileProviderController alloc] init]; NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -134,8 +134,8 @@ - (void)testAnimateCameraWithUpdate { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -164,8 +164,8 @@ - (void)testAnimateCameraWithUpdateAndDuration { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] @@ -203,8 +203,8 @@ - (void)testInspectorAPICameraPosition { PartiallyMockedMapView *mapView = [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; NSObject *binaryMessenger = [[StubBinaryMessenger alloc] init]; - FLTGoogleMapController *controller = - [[FLTGoogleMapController alloc] initWithMapView:mapView + FGMGoogleMapController *controller = + [[FGMGoogleMapController alloc] initWithMapView:mapView viewIdentifier:0 creationParameters:[self emptyCreationParameters] assetProvider:[[TestAssetProvider alloc] init] diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GroundOverlayControllerTests.m similarity index 93% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GroundOverlayControllerTests.m index 9bace1c1d763..6abbadce2b3a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GroundOverlayControllerTests.m @@ -6,9 +6,9 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" -#import "TestMapEventHandler.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" +#import "TestUtils/TestMapEventHandler.h" /// A GMSGroundOverlay that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingGroundOverlay : GMSGroundOverlay { @@ -16,15 +16,13 @@ @interface PropertyOrderValidatingGroundOverlay : GMSGroundOverlay { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsGroundOverlayControllerTests : XCTestCase +@interface GroundOverlayControllerTests : XCTestCase @end -@implementation GoogleMapsGroundOverlayControllerTests +@implementation GroundOverlayControllerTests -/// Returns GoogleMapGroundOverlayController object instantiated with position and a mocked map +/// Returns a GroundOverlayController object instantiated with position and a mocked map /// instance. -/// -/// @return An object of FLTGoogleMapGroundOverlayController + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap { NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -35,7 +33,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap icon:wideGamutImage zoomLevel:14.0]; - GMSMapView *mapView = [GoogleMapsGroundOverlayControllerTests mapView]; + GMSMapView *mapView = [GroundOverlayControllerTests mapView]; return [[FGMGroundOverlayController alloc] initWithGroundOverlay:groundOverlay identifier:@"id_1" @@ -43,10 +41,8 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithPositionWithMockedMap isCreatedWithBounds:NO]; } -/// Returns GoogleMapGroundOverlayController object instantiated with bounds and a mocked map +/// Returns a GroundOverlayController object instantiated with bounds and a mocked map /// instance. -/// -/// @return An object of FLTGoogleMapGroundOverlayController + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { NSString *imagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"widegamut" ofType:@"png" @@ -58,7 +54,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { coordinate:CLLocationCoordinate2DMake(30, 40)] icon:wideGamutImage]; - GMSMapView *mapView = [GoogleMapsGroundOverlayControllerTests mapView]; + GMSMapView *mapView = [GroundOverlayControllerTests mapView]; return [[FGMGroundOverlayController alloc] initWithGroundOverlay:groundOverlay identifier:@"id_1" @@ -68,7 +64,7 @@ + (FGMGroundOverlayController *)groundOverlayControllerWithBoundsWithMockedMap { - (void)testUpdatingGroundOverlayWithPosition { FGMGroundOverlayController *groundOverlayController = - [GoogleMapsGroundOverlayControllerTests groundOverlayControllerWithPositionWithMockedMap]; + [GroundOverlayControllerTests groundOverlayControllerWithPositionWithMockedMap]; FGMPlatformLatLng *position = [FGMPlatformLatLng makeWithLatitude:52.4816 longitude:3.1791]; @@ -120,7 +116,7 @@ - (void)testUpdatingGroundOverlayWithPosition { - (void)testUpdatingGroundOverlayWithBounds { FGMGroundOverlayController *groundOverlayController = - [GoogleMapsGroundOverlayControllerTests groundOverlayControllerWithBoundsWithMockedMap]; + [GroundOverlayControllerTests groundOverlayControllerWithBoundsWithMockedMap]; FGMPlatformLatLngBounds *bounds = [FGMPlatformLatLngBounds makeWithNortheast:[FGMPlatformLatLng makeWithLatitude:54.4816 longitude:5.1791] @@ -205,7 +201,7 @@ - (void)testUpdateGroundOverlaySetsVisibilityLast { visible:YES clickable:YES zoomLevel:nil] - withMapView:[GoogleMapsGroundOverlayControllerTests mapView] + withMapView:[GroundOverlayControllerTests mapView] assetProvider:[[TestAssetProvider alloc] init] screenScale:1.0 usingBounds:YES]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/HeatmapControllerTests.m similarity index 94% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/HeatmapControllerTests.m index 1cc2a2a1ed2e..b2d6ebc7d9f3 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FLTGoogleMapHeatmapControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/HeatmapControllerTests.m @@ -7,17 +7,17 @@ @import GoogleMapsUtils; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" @interface PropertyOrderValidatingHeatmap : GMUHeatmapTileLayer { } @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsHeatmapControllerTests : XCTestCase +@interface HeatmapControllerTests : XCTestCase @end -@implementation GoogleMapsHeatmapControllerTests +@implementation HeatmapControllerTests - (void)testUpdateHeatmapSetsVisibilityLast { PropertyOrderValidatingHeatmap *heatmap = [[PropertyOrderValidatingHeatmap alloc] init]; @@ -27,7 +27,7 @@ - (void)testUpdateHeatmapSetsVisibilityLast { ] startPoints:@[ @(0), @(1) ] colorMapSize:256]; - [FLTGoogleMapHeatmapController + [FGMHeatmapController updateHeatmap:heatmap fromPlatformHeatmap:[FGMPlatformHeatmap makeWithHeatmapId:@"heatmap" @@ -48,7 +48,7 @@ - (void)testUpdateHeatmapSetsVisibilityLast { radius:1 minimumZoomIntensity:1 maximumZoomIntensity:2] - withMapView:[GoogleMapsHeatmapControllerTests mapView]]; + withMapView:[HeatmapControllerTests mapView]]; XCTAssertTrue(heatmap.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/MarkerControllerTests.m similarity index 82% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/MarkerControllerTests.m index 05afc39c1ce1..cbf6cfe475ea 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/MarkerControllerTests.m @@ -6,9 +6,9 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" -#import "TestAssetProvider.h" -#import "TestMapEventHandler.h" +#import "TestUtils/PartiallyMockedMapView.h" +#import "TestUtils/TestAssetProvider.h" +#import "TestUtils/TestMapEventHandler.h" /// A GMSMarker that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingMarker : GMSMarker { @@ -16,10 +16,10 @@ @interface PropertyOrderValidatingMarker : GMSMarker { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsMarkerControllerTests : XCTestCase +@interface MarkerControllerTests : XCTestCase @end -@implementation GoogleMapsMarkerControllerTests +@implementation MarkerControllerTests /// Returns a simple map view for use with marker controllers. + (GMSMapView *)mapView { @@ -29,13 +29,13 @@ + (GMSMapView *)mapView { return [[PartiallyMockedMapView alloc] initWithOptions:mapViewOptions]; } -/// Returns a FLTMarkersController instance instantiated with the given map view. +/// Returns a FGMMarkersController instance instantiated with the given map view. /// /// The mapView should outlive the controller, as the controller keeps a weak reference to it. -- (FLTMarkersController *)markersControllerWithMapView:(GMSMapView *)mapView +- (FGMMarkersController *)markersControllerWithMapView:(GMSMapView *)mapView eventDelegate: (NSObject *)eventDelegate { - return [[FLTMarkersController alloc] initWithMapView:mapView + return [[FGMMarkersController alloc] initWithMapView:mapView eventDelegate:eventDelegate clusterManagersController:nil assetProvider:[[TestAssetProvider alloc] init]]; @@ -46,9 +46,9 @@ - (FGMPlatformBitmap *)placeholderBitmap { } - (void)testSetsMarkerNumericProperties { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -78,8 +78,7 @@ - (void)testSetsMarkerNumericProperties { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; const double delta = 0.0001; @@ -95,9 +94,9 @@ - (void)testSetsMarkerNumericProperties { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsDraggable { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -119,8 +118,7 @@ - (void)testSetsDraggable { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; XCTAssertTrue(marker.draggable); @@ -129,9 +127,9 @@ - (void)testSetsDraggable { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsFlat { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -153,8 +151,7 @@ - (void)testSetsFlat { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; XCTAssertTrue(marker.flat); @@ -163,9 +160,9 @@ - (void)testSetsFlat { // Boolean properties are tested individually to ensure they aren't accidentally cross-assigned from // another property. - (void)testSetsVisible { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -187,8 +184,7 @@ - (void)testSetsVisible { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; // Visibility is controlled by being set to a map. @@ -196,9 +192,9 @@ - (void)testSetsVisible { } - (void)testSetsMarkerInfoWindowProperties { - GMSMapView *mapView = [GoogleMapsMarkerControllerTests mapView]; + GMSMapView *mapView = [MarkerControllerTests mapView]; TestMapEventHandler *eventHandler = [[TestMapEventHandler alloc] init]; - FLTMarkersController *controller = [self markersControllerWithMapView:mapView + FGMMarkersController *controller = [self markersControllerWithMapView:mapView eventDelegate:eventHandler]; NSString *markerIdentifier = @"marker"; @@ -226,8 +222,7 @@ - (void)testSetsMarkerInfoWindowProperties { markerId:markerIdentifier clusterManagerId:nil] ]]; - FLTGoogleMapMarkerController *markerController = - controller.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *markerController = controller.markerIdentifierToController[markerIdentifier]; GMSMarker *marker = markerController.marker; const double delta = 0.0001; @@ -239,32 +234,31 @@ - (void)testSetsMarkerInfoWindowProperties { - (void)testUpdateMarkerSetsVisibilityLast { PropertyOrderValidatingMarker *marker = [[PropertyOrderValidatingMarker alloc] init]; - [FLTGoogleMapMarkerController - updateMarker:marker - fromPlatformMarker:[FGMPlatformMarker - makeWithAlpha:1.0 - anchor:[FGMPlatformPoint makeWithX:0 y:0] - consumeTapEvents:YES - draggable:YES - flat:YES - icon:[self placeholderBitmap] - infoWindow:[FGMPlatformInfoWindow - makeWithTitle:@"info title" - snippet:@"info snippet" - anchor:[FGMPlatformPoint - makeWithX:0 - y:0]] - position:[FGMPlatformLatLng makeWithLatitude:0 - longitude:0] - rotation:0 - visible:YES - zIndex:0 - markerId:@"marker" - clusterManagerId:nil] - withMapView:[GoogleMapsMarkerControllerTests mapView] - assetProvider:[[TestAssetProvider alloc] init] - screenScale:1 - usingOpacityForVisibility:NO]; + [FGMMarkerController updateMarker:marker + fromPlatformMarker:[FGMPlatformMarker + makeWithAlpha:1.0 + anchor:[FGMPlatformPoint makeWithX:0 y:0] + consumeTapEvents:YES + draggable:YES + flat:YES + icon:[self placeholderBitmap] + infoWindow:[FGMPlatformInfoWindow + makeWithTitle:@"info title" + snippet:@"info snippet" + anchor:[FGMPlatformPoint + makeWithX:0 + y:0]] + position:[FGMPlatformLatLng makeWithLatitude:0 + longitude:0] + rotation:0 + visible:YES + zIndex:0 + markerId:@"marker" + clusterManagerId:nil] + withMapView:[MarkerControllerTests mapView] + assetProvider:[[TestAssetProvider alloc] init] + screenScale:1 + usingOpacityForVisibility:NO]; XCTAssertTrue(marker.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/PolygonControllerTests.m similarity index 70% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/PolygonControllerTests.m index 0db5e5364b6d..eab77dff194b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsPolygonControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/PolygonControllerTests.m @@ -12,33 +12,32 @@ @interface PropertyOrderValidatingPolygon : GMSPolygon { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsPolygonControllerTests : XCTestCase +@interface PolygonControllerTests : XCTestCase @end -@implementation GoogleMapsPolygonControllerTests +@implementation PolygonControllerTests - (void)testUpdatePolygonSetsVisibilityLast { PropertyOrderValidatingPolygon *polygon = [[PropertyOrderValidatingPolygon alloc] init]; - [FLTGoogleMapPolygonController - updatePolygon:polygon - fromPlatformPolygon:[FGMPlatformPolygon - makeWithConsumeTapEvents:NO - fillColor:[FGMPlatformColor makeWithRed:0 - green:0 - blue:0 - alpha:0] - geodesic:NO - holes:@[] - strokeColor:[FGMPlatformColor makeWithRed:0 - green:0 - blue:0 - alpha:0] - strokeWidth:0 - visible:YES - zIndex:0 - points:@[] - polygonId:@"polygon"] - withMapView:[GoogleMapsPolygonControllerTests mapView]]; + [FGMPolygonController updatePolygon:polygon + fromPlatformPolygon:[FGMPlatformPolygon + makeWithConsumeTapEvents:NO + fillColor:[FGMPlatformColor makeWithRed:0 + green:0 + blue:0 + alpha:0] + geodesic:NO + holes:@[] + strokeColor:[FGMPlatformColor makeWithRed:0 + green:0 + blue:0 + alpha:0] + strokeWidth:0 + visible:YES + zIndex:0 + points:@[] + polygonId:@"polygon"] + withMapView:[PolygonControllerTests mapView]]; XCTAssertTrue(polygon.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/PolylineControllerTests.m similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/PolylineControllerTests.m index 4e4d207dae29..9e381a0e5933 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsPolylineControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/PolylineControllerTests.m @@ -6,7 +6,7 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSPolyline that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingPolyline : GMSPolyline { @@ -14,15 +14,15 @@ @interface PropertyOrderValidatingPolyline : GMSPolyline { @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsPolylineControllerTests : XCTestCase +@interface PolylineControllerTests : XCTestCase @end -@implementation GoogleMapsPolylineControllerTests +@implementation PolylineControllerTests /// Returns GoogleMapPolylineController object instantiated with a mocked map instance /// -/// @return An object of FLTGoogleMapPolylineController -- (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { +/// @return An object of FGMPolylineController +- (FGMPolylineController *)polylineControllerWithMockedMap { FGMPlatformPolyline *polyline = [FGMPlatformPolyline makeWithPolylineId:@"polyline_id_0" consumesTapEvents:NO @@ -30,7 +30,7 @@ - (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { geodesic:NO jointType:FGMPlatformJointTypeRound patterns:@[] - points:[GoogleMapsPolylineControllerTests polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:NO width:1 zIndex:0]; @@ -46,16 +46,16 @@ - (FLTGoogleMapPolylineController *)polylineControllerWithMockedMap { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polyline.points)); - FLTGoogleMapPolylineController *polylineControllerWithMockedMap = - [[FLTGoogleMapPolylineController alloc] initWithPath:path - identifier:polyline.polylineId - mapView:mapView]; + FGMPolylineController *polylineControllerWithMockedMap = + [[FGMPolylineController alloc] initWithPath:path + identifier:polyline.polylineId + mapView:mapView]; return polylineControllerWithMockedMap; } - (void)testPatternsSetSpans { - FLTGoogleMapPolylineController *polylineController = [self polylineControllerWithMockedMap]; + FGMPolylineController *polylineController = [self polylineControllerWithMockedMap]; XCTAssertNil(polylineController.polyline.spans); @@ -77,8 +77,7 @@ - (void)testPatternsSetSpans { makeWithType:FGMPlatformPatternItemTypeDash length:@(10)] ] - points:[GoogleMapsPolylineControllerTests - polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:YES width:1 zIndex:0]]; @@ -89,7 +88,7 @@ - (void)testPatternsSetSpans { - (void)testUpdatePolylineSetsVisibilityLast { PropertyOrderValidatingPolyline *polyline = [[PropertyOrderValidatingPolyline alloc] init]; - [FLTGoogleMapPolylineController + [FGMPolylineController updatePolyline:polyline fromPlatformPolyline:[FGMPlatformPolyline makeWithPolylineId:@"polyline" @@ -101,11 +100,11 @@ - (void)testUpdatePolylineSetsVisibilityLast { geodesic:NO jointType:FGMPlatformJointTypeRound patterns:@[] - points:[GoogleMapsPolylineControllerTests polylinePoints] + points:[PolylineControllerTests polylinePoints] visible:YES width:1 zIndex:0] - withMapView:[GoogleMapsPolylineControllerTests mapView]]; + withMapView:[PolylineControllerTests mapView]]; XCTAssertTrue(polyline.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/PartiallyMockedMapView.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/PartiallyMockedMapView.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/PartiallyMockedMapView.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/PartiallyMockedMapView.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/PartiallyMockedMapView.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestAssetProvider.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/TestAssetProvider.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestAssetProvider.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/TestAssetProvider.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestAssetProvider.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/TestAssetProvider.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestAssetProvider.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/TestAssetProvider.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestMapEventHandler.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/TestMapEventHandler.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestMapEventHandler.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/TestMapEventHandler.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestMapEventHandler.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/TestMapEventHandler.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestMapEventHandler.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TestUtils/TestMapEventHandler.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TileOverlayControllerTests.m similarity index 77% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TileOverlayControllerTests.m index 32c2b1e6d6ba..2e56b524b852 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GoogleMapsTileOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TileOverlayControllerTests.m @@ -6,29 +6,28 @@ @import GoogleMaps; @import XCTest; -#import "PartiallyMockedMapView.h" +#import "TestUtils/PartiallyMockedMapView.h" /// A GMSTileOverlay that ensures that property updates are made before the map is set. @interface PropertyOrderValidatingTileLayer : GMSTileLayer @property(nonatomic) BOOL hasSetMap; @end -@interface GoogleMapsTileOverlayControllerTests : XCTestCase +@interface TileOverlayControllerTests : XCTestCase @end -@implementation GoogleMapsTileOverlayControllerTests +@implementation TileOverlayControllerTests - (void)testUpdateTileOverlaySetsVisibilityLast { PropertyOrderValidatingTileLayer *tileLayer = [[PropertyOrderValidatingTileLayer alloc] init]; - [FLTGoogleMapTileOverlayController - updateTileLayer:tileLayer - fromPlatformTileOverlay:[FGMPlatformTileOverlay makeWithTileOverlayId:@"overlay" - fadeIn:NO - transparency:0.5 - zIndex:0 - visible:YES - tileSize:1] - withMapView:[GoogleMapsTileOverlayControllerTests mapView]]; + [FGMTileOverlayController updateTileLayer:tileLayer + fromPlatformTileOverlay:[FGMPlatformTileOverlay makeWithTileOverlayId:@"overlay" + fadeIn:NO + transparency:0.5 + zIndex:0 + visible:YES + tileSize:1] + withMapView:[TileOverlayControllerTests mapView]]; XCTAssertTrue(tileLayer.hasSetMap); } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FLTTileProviderControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TileProviderControllerTests.m similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FLTTileProviderControllerTests.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TileProviderControllerTests.m index 39e8631d03bf..66c1594b1156 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/FLTTileProviderControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/TileProviderControllerTests.m @@ -45,16 +45,16 @@ - (void)tileWithOverlayIdentifier:(NSString *)tileOverlayId #pragma mark - -@interface FLTTileProviderControllerTests : XCTestCase +@interface TileProviderControllerTests : XCTestCase @end -@implementation FLTTileProviderControllerTests +@implementation TileProviderControllerTests - (void)testCallChannelOnPlatformThread { XCTestExpectation *expectation = [self expectationWithDescription:@"invokeMethod"]; TestTileProvider *tileProvider = [[TestTileProvider alloc] initWithExpectation:expectation]; - FLTTileProviderController *controller = - [[FLTTileProviderController alloc] initWithTileOverlayIdentifier:@"foo" + FGMTileProviderController *controller = + [[FGMTileProviderController alloc] initWithTileOverlayIdentifier:@"foo" tileProvider:tileProvider]; XCTAssertNotNil(controller); [controller requestTileForX:0 y:0 zoom:0 receiver:[[StubTileReceiver alloc] init]]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapCircleController.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMCircleController.m similarity index 74% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapCircleController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMCircleController.m index 1348601ce0ff..8f86199f29bf 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapCircleController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMCircleController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapCircleController.h" -#import "GoogleMapCircleController_Test.h" +#import "FGMCircleController.h" +#import "FGMCircleController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapCircleController () +@interface FGMCircleController () @property(nonatomic, strong) GMSCircle *circle; @property(nonatomic, weak) GMSMapView *mapView; @end -@implementation FLTGoogleMapCircleController +@implementation FGMCircleController - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle mapView:(GMSMapView *)mapView { @@ -24,9 +24,7 @@ - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle radius:circle.radius]; _mapView = mapView; _circle.userData = @[ circle.circleId ]; - [FLTGoogleMapCircleController updateCircle:_circle - fromPlatformCircle:circle - withMapView:mapView]; + [FGMCircleController updateCircle:_circle fromPlatformCircle:circle withMapView:mapView]; } return self; } @@ -36,9 +34,9 @@ - (void)removeCircle { } - (void)updateFromPlatformCircle:(FGMPlatformCircle *)platformCircle { - [FLTGoogleMapCircleController updateCircle:self.circle - fromPlatformCircle:platformCircle - withMapView:self.mapView]; + [FGMCircleController updateCircle:self.circle + fromPlatformCircle:platformCircle + withMapView:self.mapView]; } + (void)updateCircle:(GMSCircle *)circle @@ -58,7 +56,7 @@ + (void)updateCircle:(GMSCircle *)circle @end -@interface FLTCirclesController () +@interface FGMCirclesController () @property(weak, nonatomic) NSObject *eventDelegate; @property(weak, nonatomic) GMSMapView *mapView; @@ -66,7 +64,7 @@ @interface FLTCirclesController () @end -@implementation FLTCirclesController +@implementation FGMCirclesController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -81,23 +79,22 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView - (void)addCircles:(NSArray *)circlesToAdd { for (FGMPlatformCircle *circle in circlesToAdd) { - FLTGoogleMapCircleController *controller = - [[FLTGoogleMapCircleController alloc] initCircleWithPlatformCircle:circle - mapView:self.mapView]; + FGMCircleController *controller = + [[FGMCircleController alloc] initCircleWithPlatformCircle:circle mapView:self.mapView]; self.circleIdToController[circle.circleId] = controller; } } - (void)changeCircles:(NSArray *)circlesToChange { for (FGMPlatformCircle *circle in circlesToChange) { - FLTGoogleMapCircleController *controller = self.circleIdToController[circle.circleId]; + FGMCircleController *controller = self.circleIdToController[circle.circleId]; [controller updateFromPlatformCircle:circle]; } } - (void)removeCirclesWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapCircleController *controller = self.circleIdToController[identifier]; + FGMCircleController *controller = self.circleIdToController[identifier]; if (!controller) { continue; } @@ -117,7 +114,7 @@ - (void)didTapCircleWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapCircleController *controller = self.circleIdToController[identifier]; + FGMCircleController *controller = self.circleIdToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapController.m similarity index 96% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapController.m index c265785d624e..c1f07051264c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapController.m @@ -4,25 +4,25 @@ @import GoogleMapsUtils; -#import "GoogleMapController.h" -#import "GoogleMapController_Test.h" +#import "FGMGoogleMapController.h" +#import "FGMGoogleMapController_Test.h" #import "FGMAssetProvider.h" #import "FGMConversionUtils.h" #import "FGMGroundOverlayController.h" +#import "FGMHeatmapController.h" #import "FGMMarkerUserData.h" -#import "FLTGoogleMapHeatmapController.h" -#import "FLTGoogleMapTileOverlayController.h" +#import "FGMTileOverlayController.h" #import "google_maps_flutter_pigeon_messages.g.h" -@interface FLTGoogleMapFactory () +@interface FGMGoogleMapFactory () @property(weak, nonatomic) NSObject *registrar; @property(strong, nonatomic, readonly) id sharedMapServices; @end -@implementation FLTGoogleMapFactory +@implementation FGMGoogleMapFactory @synthesize sharedMapServices = _sharedMapServices; @@ -45,7 +45,7 @@ - (instancetype)initWithRegistrar:(NSObject *)registrar // Retain the shared map services singleton, don't use the result for anything. (void)[self sharedMapServices]; - return [[FLTGoogleMapController alloc] initWithFrame:frame + return [[FGMGoogleMapController alloc] initWithFrame:frame viewIdentifier:viewId creationParameters:args registrar:self.registrar]; @@ -216,12 +216,12 @@ - (void)didTapGroundOverlayWithIdentifier:(NSString *)groundOverlayId { /// Private declarations of the FGMMapCallHandler. @interface FGMMapCallHandler () -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix; /// The map controller this inspector corresponds to. -@property(nonatomic, weak) FLTGoogleMapController *controller; +@property(nonatomic, weak) FGMGoogleMapController *controller; /// The messenger this instance was registered with by Pigeon. @property(nonatomic, copy) NSObject *messenger; /// The suffix this instance was registered under with Pigeon. @@ -234,7 +234,7 @@ - (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controll @interface FGMMapInspector () /// The map controller this inspector corresponds to. -@property(nonatomic, weak) FLTGoogleMapController *controller; +@property(nonatomic, weak) FGMGoogleMapController *controller; /// The messenger this instance was registered with by Pigeon. @property(nonatomic, copy) NSObject *messenger; /// The suffix this instance was registered under with Pigeon. @@ -243,22 +243,22 @@ @interface FGMMapInspector () #pragma mark - -@interface FLTGoogleMapController () +@interface FGMGoogleMapController () @property(nonatomic, strong) GMSMapView *mapView; @property(nonatomic, strong) FGMMapsCallbackApi *dartCallbackHandler; @property(nonatomic, strong) FGMDefaultMapEventHandler *mapEventHandler; @property(nonatomic, assign) BOOL trackCameraPosition; @property(nonatomic, strong) FGMClusterManagersController *clusterManagersController; -@property(nonatomic, strong) FLTMarkersController *markersController; -@property(nonatomic, strong) FLTPolygonsController *polygonsController; -@property(nonatomic, strong) FLTPolylinesController *polylinesController; -@property(nonatomic, strong) FLTCirclesController *circlesController; +@property(nonatomic, strong) FGMMarkersController *markersController; +@property(nonatomic, strong) FGMPolygonsController *polygonsController; +@property(nonatomic, strong) FGMPolylinesController *polylinesController; +@property(nonatomic, strong) FGMCirclesController *circlesController; // The controller that handles heatmaps -@property(nonatomic, strong) FLTHeatmapsController *heatmapsController; -@property(nonatomic, strong) FLTTileOverlaysController *tileOverlaysController; -@property(nonatomic, strong) FLTGroundOverlaysController *groundOverlaysController; +@property(nonatomic, strong) FGMHeatmapsController *heatmapsController; +@property(nonatomic, strong) FGMTileOverlaysController *tileOverlaysController; +@property(nonatomic, strong) FGMGroundOverlaysController *groundOverlaysController; // The resulting error message, if any, from the last attempt to set the map style. // This is used to provide access to errors after the fact, since the map style is generally set at // creation time and there's no mechanism to return non-fatal error details during platform view @@ -271,7 +271,7 @@ @interface FLTGoogleMapController () @end -@implementation FLTGoogleMapController +@implementation FGMGoogleMapController - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId @@ -319,21 +319,21 @@ - (instancetype)initWithMapView:(GMSMapView *_Nonnull)mapView _clusterManagersController = [[FGMClusterManagersController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _markersController = [[FLTMarkersController alloc] initWithMapView:_mapView + _markersController = [[FGMMarkersController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler clusterManagersController:_clusterManagersController assetProvider:assetProvider]; - _polygonsController = [[FLTPolygonsController alloc] initWithMapView:_mapView + _polygonsController = [[FGMPolygonsController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _polylinesController = [[FLTPolylinesController alloc] initWithMapView:_mapView + _polylinesController = [[FGMPolylinesController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _circlesController = [[FLTCirclesController alloc] initWithMapView:_mapView + _circlesController = [[FGMCirclesController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler]; - _heatmapsController = [[FLTHeatmapsController alloc] initWithMapView:_mapView]; - _tileOverlaysController = [[FLTTileOverlaysController alloc] initWithMapView:_mapView + _heatmapsController = [[FGMHeatmapsController alloc] initWithMapView:_mapView]; + _tileOverlaysController = [[FGMTileOverlaysController alloc] initWithMapView:_mapView tileProvider:self]; _groundOverlaysController = - [[FLTGroundOverlaysController alloc] initWithMapView:_mapView + [[FGMGroundOverlaysController alloc] initWithMapView:_mapView eventDelegate:_mapEventHandler assetProvider:assetProvider]; [_clusterManagersController addClusterManagers:creationParameters.initialClusterManagers]; @@ -657,7 +657,7 @@ - (void)tileWithOverlayIdentifier:(NSString *)tileOverlayId /// Private declarations of the FGMMapCallHandler. @implementation FGMMapCallHandler -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix { self = [super init]; @@ -889,7 +889,7 @@ - (nullable FlutterStandardTypedData *)takeSnapshotWithError: /// Private declarations of the FGMMapInspector. @implementation FGMMapInspector -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix { self = [super init]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FLTGoogleMapsPlugin.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapsPlugin.m similarity index 81% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FLTGoogleMapsPlugin.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapsPlugin.m index 86391b40892e..515a6bf99e90 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FLTGoogleMapsPlugin.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGoogleMapsPlugin.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapsPlugin.h" +#import "FGMGoogleMapsPlugin.h" #pragma mark - GoogleMaps plugin implementation -@implementation FLTGoogleMapsPlugin +@implementation FGMGoogleMapsPlugin + (void)registerWithRegistrar:(NSObject *)registrar { - FLTGoogleMapFactory *googleMapFactory = [[FLTGoogleMapFactory alloc] initWithRegistrar:registrar]; + FGMGoogleMapFactory *googleMapFactory = [[FGMGoogleMapFactory alloc] initWithRegistrar:registrar]; [registrar registerViewFactory:googleMapFactory withId:@"plugins.flutter.dev/google_maps_ios" gestureRecognizersBlockingPolicy: diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMHeatmapController.m similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMHeatmapController.m index 91c93933308d..49ec16dff827 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMHeatmapController.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapHeatmapController.h" -#import "FLTGoogleMapHeatmapController_Test.h" +#import "FGMHeatmapController.h" +#import "FGMHeatmapController_Test.h" @import GoogleMapsUtils; #import "FGMConversionUtils.h" -@interface FLTGoogleMapHeatmapController () +@interface FGMHeatmapController () /// The heatmap tile layer this controller handles. @property(nonatomic, strong) GMUHeatmapTileLayer *heatmapTileLayer; @@ -19,7 +19,7 @@ @interface FLTGoogleMapHeatmapController () @end -@implementation FLTGoogleMapHeatmapController +@implementation FGMHeatmapController - (instancetype)initWithHeatmap:(FGMPlatformHeatmap *)heatmap tileLayer:(GMUHeatmapTileLayer *)heatmapTileLayer mapView:(GMSMapView *)mapView { @@ -28,9 +28,9 @@ - (instancetype)initWithHeatmap:(FGMPlatformHeatmap *)heatmap _heatmapTileLayer = heatmapTileLayer; _mapView = mapView; - [FLTGoogleMapHeatmapController updateHeatmap:_heatmapTileLayer - fromPlatformHeatmap:heatmap - withMapView:_mapView]; + [FGMHeatmapController updateHeatmap:_heatmapTileLayer + fromPlatformHeatmap:heatmap + withMapView:_mapView]; } return self; } @@ -44,9 +44,9 @@ - (void)clearTileCache { } - (void)updateFromPlatformHeatmap:(FGMPlatformHeatmap *)platformHeatmap { - [FLTGoogleMapHeatmapController updateHeatmap:_heatmapTileLayer - fromPlatformHeatmap:platformHeatmap - withMapView:_mapView]; + [FGMHeatmapController updateHeatmap:_heatmapTileLayer + fromPlatformHeatmap:platformHeatmap + withMapView:_mapView]; } + (void)updateHeatmap:(GMUHeatmapTileLayer *)heatmapTileLayer @@ -67,18 +67,18 @@ + (void)updateHeatmap:(GMUHeatmapTileLayer *)heatmapTileLayer } @end -@interface FLTHeatmapsController () +@interface FGMHeatmapsController () /// A map from heatmapId to the controller that manages it. @property(nonatomic, strong) - NSMutableDictionary *heatmapIdToController; + NSMutableDictionary *heatmapIdToController; /// The map view owned by GoogmeMapController. @property(nonatomic, weak) GMSMapView *mapView; @end -@implementation FLTHeatmapsController +@implementation FGMHeatmapsController - (instancetype)initWithMapView:(GMSMapView *)mapView { self = [super init]; if (self) { @@ -91,17 +91,17 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView { - (void)addHeatmaps:(NSArray *)heatmapsToAdd { for (FGMPlatformHeatmap *heatmap in heatmapsToAdd) { GMUHeatmapTileLayer *heatmapTileLayer = [[GMUHeatmapTileLayer alloc] init]; - FLTGoogleMapHeatmapController *controller = - [[FLTGoogleMapHeatmapController alloc] initWithHeatmap:heatmap - tileLayer:heatmapTileLayer - mapView:_mapView]; + FGMHeatmapController *controller = + [[FGMHeatmapController alloc] initWithHeatmap:heatmap + tileLayer:heatmapTileLayer + mapView:_mapView]; _heatmapIdToController[heatmap.heatmapId] = controller; } } - (void)changeHeatmaps:(NSArray *)heatmapsToChange { for (FGMPlatformHeatmap *heatmap in heatmapsToChange) { - FLTGoogleMapHeatmapController *controller = _heatmapIdToController[heatmap.heatmapId]; + FGMHeatmapController *controller = _heatmapIdToController[heatmap.heatmapId]; [controller updateFromPlatformHeatmap:heatmap]; [controller clearTileCache]; @@ -110,7 +110,7 @@ - (void)changeHeatmaps:(NSArray *)heatmapsToChange { - (void)removeHeatmapsWithIdentifiers:(NSArray *)identifiers { for (NSString *heatmapId in identifiers) { - FLTGoogleMapHeatmapController *controller = _heatmapIdToController[heatmapId]; + FGMHeatmapController *controller = _heatmapIdToController[heatmapId]; if (!controller) { continue; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapMarkerController.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerController.m similarity index 86% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapMarkerController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerController.m index 09a05db2840d..13d086cb31eb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapMarkerController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerController.m @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapMarkerController.h" -#import "GoogleMapMarkerController_Test.h" +#import "FGMMarkerController.h" +#import "FGMMarkerController_Test.h" #import "FGMConversionUtils.h" #import "FGMImageUtils.h" #import "FGMMarkerUserData.h" -@interface FLTGoogleMapMarkerController () +@interface FGMMarkerController () @property(strong, nonatomic, readwrite) GMSMarker *marker; @property(weak, nonatomic) GMSMapView *mapView; @@ -21,7 +21,7 @@ @interface FLTGoogleMapMarkerController () @end -@implementation FLTGoogleMapMarkerController +@implementation FGMMarkerController - (instancetype)initWithMarker:(GMSMarker *)marker markerIdentifier:(NSString *)markerIdentifier @@ -66,12 +66,12 @@ - (void)updateFromPlatformMarker:(FGMPlatformMarker *)platformMarker // If marker belongs the cluster manager, visibility need to be controlled with the opacity // as the cluster manager controls when marker is on the map and when not. BOOL useOpacityForVisibility = self.clusterManagerIdentifier != nil; - [FLTGoogleMapMarkerController updateMarker:self.marker - fromPlatformMarker:platformMarker - withMapView:self.mapView - assetProvider:assetProvider - screenScale:screenScale - usingOpacityForVisibility:useOpacityForVisibility]; + [FGMMarkerController updateMarker:self.marker + fromPlatformMarker:platformMarker + withMapView:self.mapView + assetProvider:assetProvider + screenScale:screenScale + usingOpacityForVisibility:useOpacityForVisibility]; } + (void)updateMarker:(GMSMarker *)marker @@ -106,10 +106,10 @@ + (void)updateMarker:(GMSMarker *)marker @end -@interface FLTMarkersController () +@interface FGMMarkersController () @property(strong, nonatomic, readwrite) - NSMutableDictionary *markerIdentifierToController; + NSMutableDictionary *markerIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; /// Controller for adding/removing/fetching cluster managers @property(weak, nonatomic, nullable) FGMClusterManagersController *clusterManagersController; @@ -118,7 +118,7 @@ @interface FLTMarkersController () @end -@implementation FLTMarkersController +@implementation FGMMarkersController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate @@ -146,10 +146,9 @@ - (void)addMarker:(FGMPlatformMarker *)markerToAdd { NSString *markerIdentifier = markerToAdd.markerId; NSString *clusterManagerIdentifier = markerToAdd.clusterManagerId; GMSMarker *marker = [GMSMarker markerWithPosition:position]; - FLTGoogleMapMarkerController *controller = - [[FLTGoogleMapMarkerController alloc] initWithMarker:marker - markerIdentifier:markerIdentifier - mapView:self.mapView]; + FGMMarkerController *controller = [[FGMMarkerController alloc] initWithMarker:marker + markerIdentifier:markerIdentifier + mapView:self.mapView]; [controller updateFromPlatformMarker:markerToAdd assetProvider:self.assetProvider screenScale:[self getScreenScale]]; @@ -172,7 +171,7 @@ - (void)changeMarkers:(NSArray *)markersToChange { - (void)changeMarker:(FGMPlatformMarker *)markerToChange { NSString *markerIdentifier = markerToChange.markerId; - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[markerIdentifier]; + FGMMarkerController *controller = self.markerIdentifierToController[markerIdentifier]; if (!controller) { return; } @@ -210,7 +209,7 @@ - (void)removeMarkersWithIdentifiers:(NSArray *)identifiers { } - (void)removeMarker:(NSString *)identifier { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -229,7 +228,7 @@ - (BOOL)didTapMarkerWithIdentifier:(NSString *)identifier { if (!identifier) { return NO; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return NO; } @@ -242,7 +241,7 @@ - (void)didStartDraggingMarkerWithIdentifier:(NSString *)identifier if (!identifier) { return; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -256,7 +255,7 @@ - (void)didDragMarkerWithIdentifier:(NSString *)identifier if (!identifier) { return; } - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -266,7 +265,7 @@ - (void)didDragMarkerWithIdentifier:(NSString *)identifier - (void)didEndDraggingMarkerWithIdentifier:(NSString *)identifier location:(CLLocationCoordinate2D)location { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (!controller) { return; } @@ -283,7 +282,7 @@ - (void)didTapInfoWindowOfMarkerWithIdentifier:(NSString *)identifier { - (void)showMarkerInfoWindowWithIdentifier:(NSString *)identifier error: (FlutterError *_Nullable __autoreleasing *_Nonnull)error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { [controller showInfoWindow]; } else { @@ -296,7 +295,7 @@ - (void)showMarkerInfoWindowWithIdentifier:(NSString *)identifier - (void)hideMarkerInfoWindowWithIdentifier:(NSString *)identifier error: (FlutterError *_Nullable __autoreleasing *_Nonnull)error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { [controller hideInfoWindow]; } else { @@ -310,7 +309,7 @@ - (void)hideMarkerInfoWindowWithIdentifier:(NSString *)identifier isInfoWindowShownForMarkerWithIdentifier:(NSString *)identifier error:(FlutterError *_Nullable __autoreleasing *_Nonnull) error { - FLTGoogleMapMarkerController *controller = self.markerIdentifierToController[identifier]; + FGMMarkerController *controller = self.markerIdentifierToController[identifier]; if (controller) { return @([controller isInfoWindowShown]); } else { diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapPolygonController.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolygonController.m similarity index 79% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapPolygonController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolygonController.m index f5d077bd4ff1..2de1c9323878 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/GoogleMapPolygonController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolygonController.m @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolygonController_Test.h" +#import "FGMPolygonController.h" +#import "FGMPolygonController_Test.h" #import "FGMConversionUtils.h" @@ -18,14 +18,14 @@ return pathHoles; } -@interface FLTGoogleMapPolygonController () +@interface FGMPolygonController () @property(strong, nonatomic) GMSPolygon *polygon; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapPolygonController +@implementation FGMPolygonController - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier @@ -44,9 +44,9 @@ - (void)removePolygon { } - (void)updateFromPlatformPolygon:(FGMPlatformPolygon *)polygon { - [FLTGoogleMapPolygonController updatePolygon:self.polygon - fromPlatformPolygon:polygon - withMapView:self.mapView]; + [FGMPolygonController updatePolygon:self.polygon + fromPlatformPolygon:polygon + withMapView:self.mapView]; } + (void)updatePolygon:(GMSPolygon *)polygon @@ -67,7 +67,7 @@ + (void)updatePolygon:(GMSPolygon *)polygon @end -@interface FLTPolygonsController () +@interface FGMPolygonsController () @property(strong, nonatomic) NSMutableDictionary *polygonIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; @@ -75,7 +75,7 @@ @interface FLTPolygonsController () @end -@implementation FLTPolygonsController +@implementation FGMPolygonsController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -92,10 +92,9 @@ - (void)addPolygons:(NSArray *)polygonsToAdd { for (FGMPlatformPolygon *polygon in polygonsToAdd) { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polygon.points)); NSString *identifier = polygon.polygonId; - FLTGoogleMapPolygonController *controller = - [[FLTGoogleMapPolygonController alloc] initWithPath:path - identifier:identifier - mapView:self.mapView]; + FGMPolygonController *controller = [[FGMPolygonController alloc] initWithPath:path + identifier:identifier + mapView:self.mapView]; [controller updateFromPlatformPolygon:polygon]; self.polygonIdentifierToController[identifier] = controller; } @@ -104,14 +103,14 @@ - (void)addPolygons:(NSArray *)polygonsToAdd { - (void)changePolygons:(NSArray *)polygonsToChange { for (FGMPlatformPolygon *polygon in polygonsToChange) { NSString *identifier = polygon.polygonId; - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; [controller updateFromPlatformPolygon:polygon]; } } - (void)removePolygonWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; if (!controller) { continue; } @@ -124,7 +123,7 @@ - (void)didTapPolygonWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapPolygonController *controller = self.polygonIdentifierToController[identifier]; + FGMPolygonController *controller = self.polygonIdentifierToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapPolylineController.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolylineController.m similarity index 78% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapPolylineController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolylineController.m index ea84a4e5be54..60b96515facc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/GoogleMapPolylineController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMPolylineController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolylineController.h" -#import "GoogleMapPolylineController_Test.h" +#import "FGMPolylineController.h" +#import "FGMPolylineController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapPolylineController () +@interface FGMPolylineController () @property(strong, nonatomic) GMSPolyline *polyline; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapPolylineController +@implementation FGMPolylineController - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier @@ -33,9 +33,9 @@ - (void)removePolyline { } - (void)updateFromPlatformPolyline:(FGMPlatformPolyline *)polyline { - [FLTGoogleMapPolylineController updatePolyline:self.polyline - fromPlatformPolyline:polyline - withMapView:self.mapView]; + [FGMPolylineController updatePolyline:self.polyline + fromPlatformPolyline:polyline + withMapView:self.mapView]; } + (void)updatePolyline:(GMSPolyline *)polyline @@ -60,7 +60,7 @@ + (void)updatePolyline:(GMSPolyline *)polyline @end -@interface FLTPolylinesController () +@interface FGMPolylinesController () @property(strong, nonatomic) NSMutableDictionary *polylineIdentifierToController; @property(weak, nonatomic) NSObject *eventDelegate; @@ -69,7 +69,7 @@ @interface FLTPolylinesController () @end ; -@implementation FLTPolylinesController +@implementation FGMPolylinesController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate { @@ -86,10 +86,9 @@ - (void)addPolylines:(NSArray *)polylinesToAdd { for (FGMPlatformPolyline *polyline in polylinesToAdd) { GMSMutablePath *path = FGMGetPathFromPoints(FGMGetPointsForPigeonLatLngs(polyline.points)); NSString *identifier = polyline.polylineId; - FLTGoogleMapPolylineController *controller = - [[FLTGoogleMapPolylineController alloc] initWithPath:path - identifier:identifier - mapView:self.mapView]; + FGMPolylineController *controller = [[FGMPolylineController alloc] initWithPath:path + identifier:identifier + mapView:self.mapView]; [controller updateFromPlatformPolyline:polyline]; self.polylineIdentifierToController[identifier] = controller; } @@ -98,14 +97,14 @@ - (void)addPolylines:(NSArray *)polylinesToAdd { - (void)changePolylines:(NSArray *)polylinesToChange { for (FGMPlatformPolyline *polyline in polylinesToChange) { NSString *identifier = polyline.polylineId; - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; [controller updateFromPlatformPolyline:polyline]; } } - (void)removePolylineWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; if (!controller) { continue; } @@ -118,7 +117,7 @@ - (void)didTapPolylineWithIdentifier:(NSString *)identifier { if (!identifier) { return; } - FLTGoogleMapPolylineController *controller = self.polylineIdentifierToController[identifier]; + FGMPolylineController *controller = self.polylineIdentifierToController[identifier]; if (!controller) { return; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FLTGoogleMapTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FLTGoogleMapTileOverlayController.m rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m index 4116c82e4115..012276e27281 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FLTGoogleMapTileOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapTileOverlayController.h" -#import "FLTGoogleMapTileOverlayController_Test.h" +#import "FGMTileOverlayController.h" +#import "FGMTileOverlayController_Test.h" #import "FGMConversionUtils.h" -@interface FLTGoogleMapTileOverlayController () +@interface FGMTileOverlayController () @property(strong, nonatomic) GMSTileLayer *layer; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTGoogleMapTileOverlayController +@implementation FGMTileOverlayController - (instancetype)initWithTileOverlay:(FGMPlatformTileOverlay *)tileOverlay tileLayer:(GMSTileLayer *)tileLayer @@ -23,9 +23,9 @@ - (instancetype)initWithTileOverlay:(FGMPlatformTileOverlay *)tileOverlay if (self) { _layer = tileLayer; _mapView = mapView; - [FLTGoogleMapTileOverlayController updateTileLayer:tileLayer - fromPlatformTileOverlay:tileOverlay - withMapView:mapView]; + [FGMTileOverlayController updateTileLayer:tileLayer + fromPlatformTileOverlay:tileOverlay + withMapView:mapView]; } return self; } @@ -39,9 +39,9 @@ - (void)clearTileCache { } - (void)updateFromPlatformTileOverlay:(FGMPlatformTileOverlay *)overlay { - [FLTGoogleMapTileOverlayController updateTileLayer:self.layer - fromPlatformTileOverlay:overlay - withMapView:self.mapView]; + [FGMTileOverlayController updateTileLayer:self.layer + fromPlatformTileOverlay:overlay + withMapView:self.mapView]; } + (void)updateTileLayer:(GMSTileLayer *)tileLayer @@ -58,13 +58,13 @@ + (void)updateTileLayer:(GMSTileLayer *)tileLayer @end -@interface FLTTileProviderController () +@interface FGMTileProviderController () @property(weak, nonatomic) NSObject *tileProviderDelegate; @end -@implementation FLTTileProviderController +@implementation FGMTileProviderController - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier tileProvider:(NSObject *)tileProvider { @@ -129,16 +129,16 @@ - (void)requestTileForX:(NSUInteger)x @end -@interface FLTTileOverlaysController () +@interface FGMTileOverlaysController () -@property(strong, nonatomic) NSMutableDictionary - *tileOverlayIdentifierToController; +@property(strong, nonatomic) + NSMutableDictionary *tileOverlayIdentifierToController; @property(weak, nonatomic) NSObject *tileProviderDelegate; @property(weak, nonatomic) GMSMapView *mapView; @end -@implementation FLTTileOverlaysController +@implementation FGMTileOverlaysController - (instancetype)initWithMapView:(GMSMapView *)mapView tileProvider:(NSObject *)tileProvider { @@ -154,13 +154,13 @@ - (instancetype)initWithMapView:(GMSMapView *)mapView - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd { for (FGMPlatformTileOverlay *tileOverlay in tileOverlaysToAdd) { NSString *identifier = tileOverlay.tileOverlayId; - FLTTileProviderController *tileProvider = - [[FLTTileProviderController alloc] initWithTileOverlayIdentifier:identifier + FGMTileProviderController *tileProvider = + [[FGMTileProviderController alloc] initWithTileOverlayIdentifier:identifier tileProvider:self.tileProviderDelegate]; - FLTGoogleMapTileOverlayController *controller = - [[FLTGoogleMapTileOverlayController alloc] initWithTileOverlay:tileOverlay - tileLayer:tileProvider - mapView:self.mapView]; + FGMTileOverlayController *controller = + [[FGMTileOverlayController alloc] initWithTileOverlay:tileOverlay + tileLayer:tileProvider + mapView:self.mapView]; self.tileOverlayIdentifierToController[identifier] = controller; } } @@ -168,15 +168,13 @@ - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd { - (void)changeTileOverlays:(NSArray *)tileOverlaysToChange { for (FGMPlatformTileOverlay *tileOverlay in tileOverlaysToChange) { NSString *identifier = tileOverlay.tileOverlayId; - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; [controller updateFromPlatformTileOverlay:tileOverlay]; } } - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers { for (NSString *identifier in identifiers) { - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; if (!controller) { continue; } @@ -186,12 +184,11 @@ - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers { } - (void)clearTileCacheWithIdentifier:(NSString *)identifier { - FLTGoogleMapTileOverlayController *controller = - self.tileOverlayIdentifierToController[identifier]; + FGMTileOverlayController *controller = self.tileOverlayIdentifierToController[identifier]; [controller clearTileCache]; } -- (nullable FLTGoogleMapTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier { +- (nullable FGMTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier { return self.tileOverlayIdentifierToController[identifier]; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController.h similarity index 91% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController.h index ac4347551135..fb3b705871d3 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController.h @@ -10,13 +10,13 @@ NS_ASSUME_NONNULL_BEGIN // Defines circle controllable by Flutter. -@interface FLTGoogleMapCircleController : NSObject +@interface FGMCircleController : NSObject - (instancetype)initCircleWithPlatformCircle:(FGMPlatformCircle *)circle mapView:(GMSMapView *)mapView; - (void)removeCircle; @end -@interface FLTCirclesController : NSObject +@interface FGMCirclesController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addCircles:(NSArray *)circlesToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapCircleController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController_Test.h similarity index 86% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapCircleController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController_Test.h index 1c72d2060dc1..9c1428987225 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapCircleController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMCircleController_Test.h @@ -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 "GoogleMapCircleController.h" +#import "FGMCircleController.h" NS_ASSUME_NONNULL_BEGIN /// Private methods exposed for testing. -@interface FLTGoogleMapCircleController (Test) +@interface FGMCircleController (Test) /// Updates the underlying GMSCircle with the properties from the given FGMPlatformCircle. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapController.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController.h similarity index 76% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController.h index e9ea39630ebf..b723c8d3658e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController.h @@ -6,17 +6,17 @@ @import GoogleMaps; #import "FGMCATransactionWrapper.h" +#import "FGMCircleController.h" #import "FGMClusterManagersController.h" -#import "GoogleMapCircleController.h" -#import "GoogleMapMarkerController.h" -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolylineController.h" +#import "FGMMarkerController.h" +#import "FGMPolygonController.h" +#import "FGMPolylineController.h" #import "google_maps_flutter_pigeon_messages.g.h" NS_ASSUME_NONNULL_BEGIN // Defines map overlay controllable from Flutter. -@interface FLTGoogleMapController : NSObject +@interface FGMGoogleMapController : NSObject - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId creationParameters:(FGMPlatformMapViewCreationParams *)creationParameters @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN @end // Allows the engine to create new Google Map instances. -@interface FLTGoogleMapFactory : NSObject +@interface FGMGoogleMapFactory : NSObject - (instancetype)initWithRegistrar:(NSObject *)registrar; @end diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController_Test.h similarity index 89% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController_Test.h index bbb61545cc0c..5e1fa9371b2c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapController_Test.h @@ -7,7 +7,7 @@ #import "FGMAssetProvider.h" #import "FGMCATransactionWrapper.h" -#import "GoogleMapController.h" +#import "FGMGoogleMapController.h" NS_ASSUME_NONNULL_BEGIN @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN /// /// This is a separate object from the maps controller because the Pigeon API registration keeps a /// strong reference to the implementor, but as the FlutterPlatformView, the lifetime of the -/// FLTGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be +/// FGMGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be /// the target of the registration. @interface FGMMapCallHandler : NSObject @@ -28,18 +28,18 @@ NS_ASSUME_NONNULL_BEGIN /// /// This is a separate object from the maps controller because the Pigeon API registration keeps a /// strong reference to the implementor, but as the FlutterPlatformView, the lifetime of the -/// FLTGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be +/// FGMGoogleMapController instance is what needs to trigger Pigeon unregistration, so can't be /// the target of the registration. @interface FGMMapInspector : NSObject /// Initializes a Pigeon API for inpector with a map controller. -- (instancetype)initWithMapController:(nonnull FLTGoogleMapController *)controller +- (instancetype)initWithMapController:(nonnull FGMGoogleMapController *)controller messenger:(NSObject *)messenger pigeonSuffix:(NSString *)suffix; @end -@interface FLTGoogleMapController (Test) +@interface FGMGoogleMapController (Test) /// Initializes a map controller with a concrete map view. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapsPlugin.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapsPlugin.h similarity index 52% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapsPlugin.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapsPlugin.h index a5a1d05a4cbd..ec294eb3d3e9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/FLTGoogleMapsPlugin.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGoogleMapsPlugin.h @@ -5,16 +5,16 @@ @import Flutter; @import GoogleMaps; +#import "FGMCircleController.h" #import "FGMClusterManagersController.h" -#import "GoogleMapCircleController.h" -#import "GoogleMapController.h" -#import "GoogleMapMarkerController.h" -#import "GoogleMapPolygonController.h" -#import "GoogleMapPolylineController.h" +#import "FGMGoogleMapController.h" +#import "FGMMarkerController.h" +#import "FGMPolygonController.h" +#import "FGMPolylineController.h" NS_ASSUME_NONNULL_BEGIN -@interface FLTGoogleMapsPlugin : NSObject +@interface FGMGoogleMapsPlugin : NSObject @end NS_ASSUME_NONNULL_END diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGroundOverlayController.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGroundOverlayController.h index f4a07aa950e5..1a8f01055445 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGroundOverlayController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMGroundOverlayController.h @@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN @end /// Controller of multiple ground overlays on the map. -@interface FLTGroundOverlaysController : NSObject +@interface FGMGroundOverlaysController : NSObject /// Initializes the controller with a GMSMapView, event delegate, and asset provider. - (instancetype)initWithMapView:(GMSMapView *)mapView diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapHeatmapController.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController.h similarity index 95% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapHeatmapController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController.h index 1d31f124077b..c8fce13543c7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapHeatmapController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController.h @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN /// Controller of a single Heatmap on the map. -@interface FLTGoogleMapHeatmapController : NSObject +@interface FGMHeatmapController : NSObject /// Initializes an instance of this class with a heatmap tile layer, a map view, and additional /// configuration options. @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN @end /// Controller of multiple Heatmaps on the map. -@interface FLTHeatmapsController : NSObject +@interface FGMHeatmapsController : NSObject /// Initializes the controller with a GMSMapView. - (instancetype)initWithMapView:(GMSMapView *)mapView; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapHeatmapController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController_Test.h similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapHeatmapController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController_Test.h index b00a48e3477f..797c309dbb2c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapHeatmapController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMHeatmapController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapHeatmapController.h" +#import "FGMHeatmapController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapHeatmapController (Test) +@interface FGMHeatmapController (Test) /// Updates the underlying GMUHeatmapTileLayer with the properties from the given platform heatmap. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapMarkerController.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController.h similarity index 96% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapMarkerController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController.h index 57797346639e..5b6734a89478 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapMarkerController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController.h @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - // Defines marker controllable by Flutter. -@interface FLTGoogleMapMarkerController : NSObject +@interface FGMMarkerController : NSObject @property(assign, nonatomic, readonly) BOOL consumeTapEvents; - (instancetype)initWithMarker:(GMSMarker *)marker markerIdentifier:(NSString *)markerIdentifier @@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)removeMarker; @end -@interface FLTMarkersController : NSObject +@interface FGMMarkersController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate clusterManagersController:(nullable FGMClusterManagersController *)clusterManagersController diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapMarkerController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController_Test.h similarity index 89% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapMarkerController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController_Test.h index d7a9c1578432..29e450df13ae 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapMarkerController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapMarkerController.h" +#import "FGMMarkerController.h" /// Methods exposed for unit testing. -@interface FLTGoogleMapMarkerController (Test) +@interface FGMMarkerController (Test) /// The underlying controlled GMSMarker. @property(strong, nonatomic, readonly) GMSMarker *marker; @@ -23,7 +23,7 @@ @end /// Methods exposed for unit testing. -@interface FLTMarkersController (Test) +@interface FGMMarkersController (Test) /// A mapping from marker identifiers to corresponding marker controllers. @property(strong, nonatomic, readonly) NSMutableDictionary *markerIdentifierToController; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolygonController.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolygonController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController.h index a222ca6a4eb0..b66ed908bbec 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolygonController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController.h @@ -8,14 +8,14 @@ #import "google_maps_flutter_pigeon_messages.g.h" // Defines polygon controllable by Flutter. -@interface FLTGoogleMapPolygonController : NSObject +@interface FGMPolygonController : NSObject - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier mapView:(GMSMapView *)mapView; - (void)removePolygon; @end -@interface FLTPolygonsController : NSObject +@interface FGMPolygonsController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addPolygons:(NSArray *)polygonsToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolygonController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController_Test.h similarity index 85% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolygonController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController_Test.h index ab4cf60be224..5072e4a4c7d7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolygonController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolygonController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolygonController.h" +#import "FGMPolygonController.h" /// Methods exposed for unit testing. -@interface FLTGoogleMapPolygonController (Test) +@interface FGMPolygonController (Test) /// Updates the underlying GMSPolygon with the properties from the given FGMPlatformPolygon. /// diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolylineController.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolylineController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController.h index ccf37dae9a35..14071b7700e2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapPolylineController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController.h @@ -8,14 +8,14 @@ #import "google_maps_flutter_pigeon_messages.g.h" // Defines polyline controllable by Flutter. -@interface FLTGoogleMapPolylineController : NSObject +@interface FGMPolylineController : NSObject - (instancetype)initWithPath:(GMSMutablePath *)path identifier:(NSString *)identifier mapView:(GMSMapView *)mapView; - (void)removePolyline; @end -@interface FLTPolylinesController : NSObject +@interface FGMPolylinesController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate; - (void)addPolylines:(NSArray *)polylinesToAdd; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolylineController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController_Test.h similarity index 90% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolylineController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController_Test.h index df9e31293951..548bcff27cce 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapPolylineController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMPolylineController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolylineController.h" +#import "FGMPolylineController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapPolylineController (Test) +@interface FGMPolylineController (Test) /// Polyline instance the controller is attached to @property(strong, nonatomic) GMSPolyline *polyline; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController.h similarity index 87% rename from packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController.h index b4c707e6d0b4..0785c22f9a43 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController.h @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - -@interface FLTGoogleMapTileOverlayController : NSObject +@interface FGMTileOverlayController : NSObject /// The layer managed by this controller instance. @property(readonly, nonatomic) GMSTileLayer *layer; @@ -31,20 +31,20 @@ NS_ASSUME_NONNULL_BEGIN - (void)clearTileCache; @end -@interface FLTTileProviderController : GMSTileLayer +@interface FGMTileProviderController : GMSTileLayer @property(copy, nonatomic, readonly) NSString *tileOverlayIdentifier; - (instancetype)initWithTileOverlayIdentifier:(NSString *)identifier tileProvider:(NSObject *)tileProvider; @end -@interface FLTTileOverlaysController : NSObject +@interface FGMTileOverlaysController : NSObject - (instancetype)initWithMapView:(GMSMapView *)mapView tileProvider:(NSObject *)tileProvider; - (void)addTileOverlays:(NSArray *)tileOverlaysToAdd; - (void)changeTileOverlays:(NSArray *)tileOverlaysToChange; - (void)removeTileOverlayWithIdentifiers:(NSArray *)identifiers; - (void)clearTileCacheWithIdentifier:(NSString *)identifier; -- (nullable FLTGoogleMapTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier; +- (nullable FGMTileOverlayController *)tileOverlayWithIdentifier:(NSString *)identifier; @end NS_ASSUME_NONNULL_END diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapTileOverlayController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController_Test.h similarity index 84% rename from packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapTileOverlayController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController_Test.h index e753698cde45..faebc2b98a1b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/FLTGoogleMapTileOverlayController_Test.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMTileOverlayController_Test.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapTileOverlayController.h" +#import "FGMTileOverlayController.h" /// Internal APIs exposed for unit testing -@interface FLTGoogleMapTileOverlayController (Test) +@interface FGMTileOverlayController (Test) /// Updates the underlying GMSTileLayer with the properties from the given FGMPlatformTileOverlay. /// From e681f1c250665d071f9f40d7b1f8b1ff9a959aed Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 12 Feb 2026 12:05:10 -0500 Subject: [PATCH 5/9] Adjust new tests --- .../example/ios/RunnerTests/GroundOverlayControllerTests.m | 6 +++--- .../example/ios/RunnerTests/MarkerControllerTests.m | 4 ++-- .../example/ios/RunnerTests/GroundOverlayControllerTests.m | 6 +++--- .../example/ios/RunnerTests/MarkerControllerTests.m | 4 ++-- .../example/ios/RunnerTests/GroundOverlayControllerTests.m | 6 +++--- .../example/ios/RunnerTests/MarkerControllerTests.m | 4 ++-- .../example/ios/RunnerTests/GroundOverlayControllerTests.m | 6 +++--- .../example/ios/RunnerTests/MarkerControllerTests.m | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GroundOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GroundOverlayControllerTests.m index 6abbadce2b3a..691c46b49eab 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GroundOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GroundOverlayControllerTests.m @@ -209,13 +209,13 @@ - (void)testUpdateGroundOverlaySetsVisibilityLast { } - (void)testAssetProviderIsRetained { - FLTGroundOverlaysController *groundOverlayController; + FGMGroundOverlaysController *groundOverlayController; __weak TestAssetProvider *weakAssetProvider; @autoreleasepool { TestAssetProvider *assetProvider = [[TestAssetProvider alloc] init]; weakAssetProvider = assetProvider; - groundOverlayController = [[FLTGroundOverlaysController alloc] - initWithMapView:[GoogleMapsGroundOverlayControllerTests mapView] + groundOverlayController = [[FGMGroundOverlaysController alloc] + initWithMapView:[GroundOverlayControllerTests mapView] eventDelegate:[[TestMapEventHandler alloc] init] assetProvider:assetProvider]; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/MarkerControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/MarkerControllerTests.m index cbf6cfe475ea..1d83202876d5 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/MarkerControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/MarkerControllerTests.m @@ -263,14 +263,14 @@ - (void)testUpdateMarkerSetsVisibilityLast { } - (void)testAssetProviderIsRetained { - FLTMarkersController *markerController; + FGMMarkersController *markerController; __weak TestAssetProvider *weakAssetProvider; @autoreleasepool { TestAssetProvider *assetProvider = [[TestAssetProvider alloc] init]; weakAssetProvider = assetProvider; markerController = - [[FLTMarkersController alloc] initWithMapView:[GoogleMapsMarkerControllerTests mapView] + [[FGMMarkersController alloc] initWithMapView:[MarkerControllerTests mapView] eventDelegate:[[TestMapEventHandler alloc] init] clusterManagersController:nil assetProvider:assetProvider]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GroundOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GroundOverlayControllerTests.m index 72c9e2aaa029..6c7a08da2fbb 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GroundOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GroundOverlayControllerTests.m @@ -209,13 +209,13 @@ - (void)testUpdateGroundOverlaySetsVisibilityLast { } - (void)testAssetProviderIsRetained { - FLTGroundOverlaysController *groundOverlayController; + FGMGroundOverlaysController *groundOverlayController; __weak TestAssetProvider *weakAssetProvider; @autoreleasepool { TestAssetProvider *assetProvider = [[TestAssetProvider alloc] init]; weakAssetProvider = assetProvider; - groundOverlayController = [[FLTGroundOverlaysController alloc] - initWithMapView:[GoogleMapsGroundOverlayControllerTests mapView] + groundOverlayController = [[FGMGroundOverlaysController alloc] + initWithMapView:[GroundOverlayControllerTests mapView] eventDelegate:[[TestMapEventHandler alloc] init] assetProvider:assetProvider]; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/MarkerControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/MarkerControllerTests.m index 5d1233bed6e0..cc0879e6a908 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/MarkerControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/MarkerControllerTests.m @@ -263,14 +263,14 @@ - (void)testUpdateMarkerSetsVisibilityLast { } - (void)testAssetProviderIsRetained { - FLTMarkersController *markerController; + FGMMarkersController *markerController; __weak TestAssetProvider *weakAssetProvider; @autoreleasepool { TestAssetProvider *assetProvider = [[TestAssetProvider alloc] init]; weakAssetProvider = assetProvider; markerController = - [[FLTMarkersController alloc] initWithMapView:[GoogleMapsMarkerControllerTests mapView] + [[FGMMarkersController alloc] initWithMapView:[MarkerControllerTests mapView] eventDelegate:[[TestMapEventHandler alloc] init] clusterManagersController:nil assetProvider:assetProvider]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GroundOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GroundOverlayControllerTests.m index 4955e0528421..d28be6bbe013 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GroundOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GroundOverlayControllerTests.m @@ -209,13 +209,13 @@ - (void)testUpdateGroundOverlaySetsVisibilityLast { } - (void)testAssetProviderIsRetained { - FLTGroundOverlaysController *groundOverlayController; + FGMGroundOverlaysController *groundOverlayController; __weak TestAssetProvider *weakAssetProvider; @autoreleasepool { TestAssetProvider *assetProvider = [[TestAssetProvider alloc] init]; weakAssetProvider = assetProvider; - groundOverlayController = [[FLTGroundOverlaysController alloc] - initWithMapView:[GoogleMapsGroundOverlayControllerTests mapView] + groundOverlayController = [[FGMGroundOverlaysController alloc] + initWithMapView:[GroundOverlayControllerTests mapView] eventDelegate:[[TestMapEventHandler alloc] init] assetProvider:assetProvider]; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/MarkerControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/MarkerControllerTests.m index 0913eef53a80..1f7d9581bbb2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/MarkerControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/MarkerControllerTests.m @@ -263,14 +263,14 @@ - (void)testUpdateMarkerSetsVisibilityLast { } - (void)testAssetProviderIsRetained { - FLTMarkersController *markerController; + FGMMarkersController *markerController; __weak TestAssetProvider *weakAssetProvider; @autoreleasepool { TestAssetProvider *assetProvider = [[TestAssetProvider alloc] init]; weakAssetProvider = assetProvider; markerController = - [[FLTMarkersController alloc] initWithMapView:[GoogleMapsMarkerControllerTests mapView] + [[FGMMarkersController alloc] initWithMapView:[MarkerControllerTests mapView] eventDelegate:[[TestMapEventHandler alloc] init] clusterManagersController:nil assetProvider:assetProvider]; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GroundOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GroundOverlayControllerTests.m index 6abbadce2b3a..691c46b49eab 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GroundOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/GroundOverlayControllerTests.m @@ -209,13 +209,13 @@ - (void)testUpdateGroundOverlaySetsVisibilityLast { } - (void)testAssetProviderIsRetained { - FLTGroundOverlaysController *groundOverlayController; + FGMGroundOverlaysController *groundOverlayController; __weak TestAssetProvider *weakAssetProvider; @autoreleasepool { TestAssetProvider *assetProvider = [[TestAssetProvider alloc] init]; weakAssetProvider = assetProvider; - groundOverlayController = [[FLTGroundOverlaysController alloc] - initWithMapView:[GoogleMapsGroundOverlayControllerTests mapView] + groundOverlayController = [[FGMGroundOverlaysController alloc] + initWithMapView:[GroundOverlayControllerTests mapView] eventDelegate:[[TestMapEventHandler alloc] init] assetProvider:assetProvider]; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/MarkerControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/MarkerControllerTests.m index cbf6cfe475ea..1d83202876d5 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/MarkerControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/example/ios/RunnerTests/MarkerControllerTests.m @@ -263,14 +263,14 @@ - (void)testUpdateMarkerSetsVisibilityLast { } - (void)testAssetProviderIsRetained { - FLTMarkersController *markerController; + FGMMarkersController *markerController; __weak TestAssetProvider *weakAssetProvider; @autoreleasepool { TestAssetProvider *assetProvider = [[TestAssetProvider alloc] init]; weakAssetProvider = assetProvider; markerController = - [[FLTMarkersController alloc] initWithMapView:[GoogleMapsMarkerControllerTests mapView] + [[FGMMarkersController alloc] initWithMapView:[MarkerControllerTests mapView] eventDelegate:[[TestMapEventHandler alloc] init] clusterManagersController:nil assetProvider:assetProvider]; From 7eb1299090dffe19852da29dc8230338b09c3c80 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 12 Feb 2026 12:12:34 -0500 Subject: [PATCH 6/9] Autoformat --- .../ios/RunnerTests/GroundOverlayControllerTests.m | 8 ++++---- .../ios/RunnerTests/GroundOverlayControllerTests.m | 8 ++++---- .../ios/RunnerTests/GroundOverlayControllerTests.m | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GroundOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GroundOverlayControllerTests.m index 691c46b49eab..3b6a90821576 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GroundOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GroundOverlayControllerTests.m @@ -214,10 +214,10 @@ - (void)testAssetProviderIsRetained { @autoreleasepool { TestAssetProvider *assetProvider = [[TestAssetProvider alloc] init]; weakAssetProvider = assetProvider; - groundOverlayController = [[FGMGroundOverlaysController alloc] - initWithMapView:[GroundOverlayControllerTests mapView] - eventDelegate:[[TestMapEventHandler alloc] init] - assetProvider:assetProvider]; + groundOverlayController = + [[FGMGroundOverlaysController alloc] initWithMapView:[GroundOverlayControllerTests mapView] + eventDelegate:[[TestMapEventHandler alloc] init] + assetProvider:assetProvider]; } XCTAssertNotNil(groundOverlayController); XCTAssertNotNil(weakAssetProvider); diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GroundOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GroundOverlayControllerTests.m index 6c7a08da2fbb..133cf0aa221a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GroundOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/RunnerTests/GroundOverlayControllerTests.m @@ -214,10 +214,10 @@ - (void)testAssetProviderIsRetained { @autoreleasepool { TestAssetProvider *assetProvider = [[TestAssetProvider alloc] init]; weakAssetProvider = assetProvider; - groundOverlayController = [[FGMGroundOverlaysController alloc] - initWithMapView:[GroundOverlayControllerTests mapView] - eventDelegate:[[TestMapEventHandler alloc] init] - assetProvider:assetProvider]; + groundOverlayController = + [[FGMGroundOverlaysController alloc] initWithMapView:[GroundOverlayControllerTests mapView] + eventDelegate:[[TestMapEventHandler alloc] init] + assetProvider:assetProvider]; } XCTAssertNotNil(groundOverlayController); XCTAssertNotNil(weakAssetProvider); diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GroundOverlayControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GroundOverlayControllerTests.m index d28be6bbe013..960a5c2dff90 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GroundOverlayControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/example/ios/RunnerTests/GroundOverlayControllerTests.m @@ -214,10 +214,10 @@ - (void)testAssetProviderIsRetained { @autoreleasepool { TestAssetProvider *assetProvider = [[TestAssetProvider alloc] init]; weakAssetProvider = assetProvider; - groundOverlayController = [[FGMGroundOverlaysController alloc] - initWithMapView:[GroundOverlayControllerTests mapView] - eventDelegate:[[TestMapEventHandler alloc] init] - assetProvider:assetProvider]; + groundOverlayController = + [[FGMGroundOverlaysController alloc] initWithMapView:[GroundOverlayControllerTests mapView] + eventDelegate:[[TestMapEventHandler alloc] init] + assetProvider:assetProvider]; } XCTAssertNotNil(groundOverlayController); XCTAssertNotNil(weakAssetProvider); From 8974e0d1e491e7da945eb9d227dc40578fb3d49e Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 12 Feb 2026 12:14:46 -0500 Subject: [PATCH 7/9] Version bumps for sdk* copies --- .../google_maps_flutter_ios_sdk10/CHANGELOG.md | 4 ++++ .../google_maps_flutter_ios_sdk10/pubspec.yaml | 2 +- .../google_maps_flutter_ios_sdk9/CHANGELOG.md | 4 ++++ .../google_maps_flutter_ios_sdk9/pubspec.yaml | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/CHANGELOG.md index c79067d7fa17..df1c0fc9b16b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.17.4 + +* Standardizes Objective-C class names. + ## 2.17.3 * Initial release, based on 2.17.3 of `google_maps_flutter_ios`. diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml index 4901c2164f3a..04ac479cd36f 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_ios_sdk10 description: iOS implementation of the google_maps_flutter plugin using Google Maps SDK 10. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios_sdk10 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.17.3 +version: 2.17.4 environment: sdk: ^3.9.0 diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/CHANGELOG.md index c79067d7fa17..df1c0fc9b16b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.17.4 + +* Standardizes Objective-C class names. + ## 2.17.3 * Initial release, based on 2.17.3 of `google_maps_flutter_ios`. diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml index 4cde9c4d3ead..3408cb4ed027 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_ios_sdk9 description: iOS implementation of the google_maps_flutter plugin using Google Maps SDK 9. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios_sdk9 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.17.3 +version: 2.17.4 environment: sdk: ^3.9.0 From 5be43c8ce60d5e325d5e7b3f60033eacaba6df3d Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 12 Feb 2026 13:08:42 -0500 Subject: [PATCH 8/9] Add file that was in a bad state --- .../google_maps_flutter_ios/FGMGroundOverlayController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGroundOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGroundOverlayController.m index c5e45188510a..16656ab5f7b4 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGroundOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_shared_code/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMGroundOverlayController.m @@ -79,7 +79,7 @@ + (void)updateGroundOverlay:(GMSGroundOverlay *)groundOverlay @end -@interface FLTGroundOverlaysController () +@interface FGMGroundOverlaysController () /// A map from ground overlay id to the controller that manages it. @property(strong, nonatomic) NSMutableDictionary @@ -96,7 +96,7 @@ @interface FLTGroundOverlaysController () @end -@implementation FLTGroundOverlaysController +@implementation FGMGroundOverlaysController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate From 3b213f2eb7ee728e352e8adcf706587e225ba766 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 12 Feb 2026 16:36:54 -0500 Subject: [PATCH 9/9] Sync the file again --- .../FGMGroundOverlayController.m | 4 ++-- .../google_maps_flutter_ios_sdk9/FGMGroundOverlayController.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGroundOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGroundOverlayController.m index c5e45188510a..16656ab5f7b4 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGroundOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGroundOverlayController.m @@ -79,7 +79,7 @@ + (void)updateGroundOverlay:(GMSGroundOverlay *)groundOverlay @end -@interface FLTGroundOverlaysController () +@interface FGMGroundOverlaysController () /// A map from ground overlay id to the controller that manages it. @property(strong, nonatomic) NSMutableDictionary @@ -96,7 +96,7 @@ @interface FLTGroundOverlaysController () @end -@implementation FLTGroundOverlaysController +@implementation FGMGroundOverlaysController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate diff --git a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGroundOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGroundOverlayController.m index c5e45188510a..16656ab5f7b4 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGroundOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGroundOverlayController.m @@ -79,7 +79,7 @@ + (void)updateGroundOverlay:(GMSGroundOverlay *)groundOverlay @end -@interface FLTGroundOverlaysController () +@interface FGMGroundOverlaysController () /// A map from ground overlay id to the controller that manages it. @property(strong, nonatomic) NSMutableDictionary @@ -96,7 +96,7 @@ @interface FLTGroundOverlaysController () @end -@implementation FLTGroundOverlaysController +@implementation FGMGroundOverlaysController - (instancetype)initWithMapView:(GMSMapView *)mapView eventDelegate:(NSObject *)eventDelegate