diff --git a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos.xcodeproj/project.pbxproj b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos.xcodeproj/project.pbxproj index ac13751d..e3741ad2 100644 --- a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos.xcodeproj/project.pbxproj +++ b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos.xcodeproj/project.pbxproj @@ -21,9 +21,9 @@ 1A48B68AA2A51B8420D10283 /* step4.png in Resources */ = {isa = PBXBuildFile; fileRef = BD395D788FF527EA97FD2957 /* step4.png */; }; 1CD7AB8171D046AABFECE269 /* popup_santa@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 71BD7C12F48BAF53583A910C /* popup_santa@2x.png */; }; 2015AA61583C94D81472FDE9 /* MarkerInfoWindowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B2ABAF90E4D16D80FB637B0 /* MarkerInfoWindowViewController.swift */; }; - 210D9459D38537822BB4AA6D /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8958099EFF1E216167AC7B71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */; }; 224A60161BCB8B23919F3372 /* voyager.png in Resources */ = {isa = PBXBuildFile; fileRef = 2E152725ABC167064FB9B792 /* voyager.png */; }; 248AD839C8AF6700D60F04AE /* CustomMarkersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78DE8670A1B9D301D6182F16 /* CustomMarkersViewController.swift */; }; + 273F7B460A071EF4EB92931B /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4624CE8A683C0C64F4302D71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */; }; 2810BB28A2ACCFFD0BE6544B /* step1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 207123C407D9F42BB6D3C9D6 /* step1@2x.png */; }; 2BF464AD6730D4C5005D2EC9 /* UIViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44D716D9114DCC920923A1B0 /* UIViewController+Extensions.swift */; }; 2CDC67FEB6CB48BBF4B08275 /* GeocoderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB2EE1D7695E0D90DBEAF4CC /* GeocoderViewController.swift */; }; @@ -59,7 +59,6 @@ 74E88C427B498F911D32A44B /* australia.png in Resources */ = {isa = PBXBuildFile; fileRef = 5FFD3A6BE4BD4C012EF50AFD /* australia.png */; }; 776382BEFFA4C43C5F9F38B6 /* h1.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EE67692C7A590BCF85C3ED9 /* h1.png */; }; 781F9CEB35235538D6F5634E /* step3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 825447853189D2D4563BB028 /* step3@2x.png */; }; - 78D1E74704B5966731F0EAFD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 813AA650D6B913CB76AAAB53 /* UIKit.framework */; }; 791E7FEACC10DFDA9E5512BD /* argentina.png in Resources */ = {isa = PBXBuildFile; fileRef = BEB38D778B61FCFDCD0BAF3E /* argentina.png */; }; 82043308F53102E889C6B28F /* DataDrivenStylingEventsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EF2332C983F2B61EE8D591A /* DataDrivenStylingEventsViewController.swift */; }; 8672736AB1BB98F58F6C5ED9 /* botswana.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CB004432BC22DC920797C87 /* botswana.png */; }; @@ -68,6 +67,7 @@ 96AC98FFADF710277E6F4309 /* boat@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C6FC465538CF0231E3E32EF /* boat@2x.png */; }; 9A11BCC3B4489D9E4B60BEA7 /* AnimatedUIViewMarkerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90FD42CF0008B034BF8B30F5 /* AnimatedUIViewMarkerViewController.swift */; }; 9AA1A005AF4CC2512BD677CE /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7050C885E55BC73ABC66C1BA /* LaunchScreen.storyboard */; }; + 9EC74440F1F7C7C6B7456F14 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 813AA650D6B913CB76AAAB53 /* UIKit.framework */; }; 9EFFD4F29F6DBCB69FFF955F /* spitfire.png in Resources */ = {isa = PBXBuildFile; fileRef = 1D0078DD977DCD440A9B1847 /* spitfire.png */; }; 9FEC78EBC378E57B626A0949 /* PolylinesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA082F9AB6DF56657D760529 /* PolylinesViewController.swift */; }; A1C22569608372D07A4EA5FC /* CameraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B974B58EDD2B70A1FA0C107F /* CameraViewController.swift */; }; @@ -139,6 +139,7 @@ 4162E354E88F4EFE2CF145C0 /* GoogleMapsSwiftXCFrameworkDemos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoogleMapsSwiftXCFrameworkDemos.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4494DA7385C95B5268429894 /* popup_santa.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = popup_santa.png; sourceTree = ""; }; 44D716D9114DCC920923A1B0 /* UIViewController+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extensions.swift"; sourceTree = ""; }; + 4624CE8A683C0C64F4302D71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 4E80A76C0EFBE73CEBFE4A88 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; 56F86F40F30C6687633BD6AF /* x29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = x29.png; sourceTree = ""; }; 5B5C253D2138464651723AF4 /* bulgaria.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bulgaria.png; sourceTree = ""; }; @@ -162,10 +163,8 @@ 80E098AF4C56B795EBA7E881 /* PolygonsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PolygonsViewController.swift; sourceTree = ""; }; 813AA650D6B913CB76AAAB53 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 825447853189D2D4563BB028 /* step3@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "step3@2x.png"; sourceTree = ""; }; - 82E86267E9757933A4CCBEA4 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; 8401BB4562DADADAC4885D68 /* DataDrivenStylingBasicViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataDrivenStylingBasicViewController.swift; sourceTree = ""; }; 85B2170D89EEB8206C3C8C59 /* museum-exhibits.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "museum-exhibits.json"; sourceTree = ""; }; - 8958099EFF1E216167AC7B71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 8A8CD751D4D3EF8B5A930C62 /* AnimatedCurrentLocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimatedCurrentLocationViewController.swift; sourceTree = ""; }; 8B2ABAF90E4D16D80FB637B0 /* MarkerInfoWindowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerInfoWindowViewController.swift; sourceTree = ""; }; 8B3409E9F50034C8B197B83C /* step6@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "step6@2x.png"; sourceTree = ""; }; @@ -203,6 +202,7 @@ D20F48E81C4AB68DA9666435 /* boat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boat.png; sourceTree = ""; }; D773980AEA07C06EEBD6CAE2 /* aeroplane.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = aeroplane.png; sourceTree = ""; }; DC4F9FD5FA2BDB4F54C62664 /* glow-marker@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "glow-marker@2x.png"; sourceTree = ""; }; + DDB557D895F5956CA43E9D29 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; DDE3AA2A24258BFC4FB2E985 /* GestureControlViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GestureControlViewController.swift; sourceTree = ""; }; E30250B9C564E339DB5564CF /* MapLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapLayerViewController.swift; sourceTree = ""; }; E42C1CA863AAC166B9252B90 /* PanoramaServiceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PanoramaServiceController.swift; sourceTree = ""; }; @@ -223,19 +223,19 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 78D1E74704B5966731F0EAFD /* UIKit.framework in Frameworks */, - 210D9459D38537822BB4AA6D /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */, + 9EC74440F1F7C7C6B7456F14 /* UIKit.framework in Frameworks */, + 273F7B460A071EF4EB92931B /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1770C8310E66B2F5721EFB53 /* Frameworks */ = { + 49D5CD2CC2E5C5341C1AA1A8 /* Frameworks */ = { isa = PBXGroup; children = ( 813AA650D6B913CB76AAAB53 /* UIKit.framework */, - 8958099EFF1E216167AC7B71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */, + 4624CE8A683C0C64F4302D71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */, ); name = Frameworks; sourceTree = ""; @@ -353,6 +353,15 @@ path = Samples; sourceTree = ""; }; + A39D4F0C1DEB44785ED809F3 /* Pods */ = { + isa = PBXGroup; + children = ( + DDB557D895F5956CA43E9D29 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; BE46EA4B5CB54B89AF4894A6 /* Museum-Icons */ = { isa = PBXGroup; children = ( @@ -380,9 +389,9 @@ isa = PBXGroup; children = ( 66BBCDCC5A47AE0211100656 /* Source */, - 1770C8310E66B2F5721EFB53 /* Frameworks */, + 49D5CD2CC2E5C5341C1AA1A8 /* Frameworks */, C28851C9B618723E4F44AB23 /* Products */, - DFC5FAB3928456731B3951EA /* Pods */, + A39D4F0C1DEB44785ED809F3 /* Pods */, ); sourceTree = ""; }; @@ -398,15 +407,6 @@ path = Swift; sourceTree = ""; }; - DFC5FAB3928456731B3951EA /* Pods */ = { - isa = PBXGroup; - children = ( - 82E86267E9757933A4CCBEA4 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -414,11 +414,11 @@ isa = PBXNativeTarget; buildConfigurationList = 5AC1A4250158D74DFA863CCE /* Build configuration list for PBXNativeTarget "GoogleMapsSwiftXCFrameworkDemos" */; buildPhases = ( - 62A5842B4106D070E86884B8 /* [CP] Check Pods Manifest.lock */, + 9E17DB1B61BB43E652FF469C /* [CP] Check Pods Manifest.lock */, 3F21832F0D03F8AC6CEF22A0 /* Resources */, BA0F106D7033E3A8544A3F80 /* Sources */, D163048ECCA404350BF50B51 /* Frameworks */, - 0165694DFDB6F815113431FE /* [CP] Copy Pods Resources */, + D1BEC2238D955EF0A8EF07AE /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -518,7 +518,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0165694DFDB6F815113431FE /* [CP] Copy Pods Resources */ = { + 9E17DB1B61BB43E652FF469C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -526,21 +526,21 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( ); outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle", + "$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftXCFrameworkDemos-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh\"\n"; + 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; }; - 62A5842B4106D070E86884B8 /* [CP] Check Pods Manifest.lock */ = { + D1BEC2238D955EF0A8EF07AE /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -548,18 +548,18 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", + "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle", ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftXCFrameworkDemos-checkManifestLockResult.txt", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -624,7 +624,7 @@ /* Begin XCBuildConfiguration section */ 060E158855CB2E3846F43DB2 /* Default */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 82E86267E9757933A4CCBEA4 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */; + baseConfigurationReference = DDB557D895F5956CA43E9D29 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */; buildSettings = { "ARCHS[sdk=iphonesimulator*]" = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; diff --git a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/AppDelegate.swift b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/AppDelegate.swift index 0d7763bd..39cfc46f 100755 --- a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/AppDelegate.swift +++ b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/AppDelegate.swift @@ -14,7 +14,7 @@ import GoogleMaps import UIKit -@UIApplicationMain +@main class AppDelegate: UIResponder, UIApplicationDelegate, UIWindowSceneDelegate { private var services: Any? diff --git a/GoogleMaps-Swift/Podfile b/GoogleMaps-Swift/Podfile index 7f6d4d45..b8603b18 100755 --- a/GoogleMaps-Swift/Podfile +++ b/GoogleMaps-Swift/Podfile @@ -1,8 +1,8 @@ -source 'https://cdn.cocoapods.org/' +source 'https://github.com/CocoaPods/Specs.git' platform :ios, '15.0' target 'GoogleMapsSwiftXCFrameworkDemos' do project 'GoogleMapsSwiftXCFrameworkDemos' - pod 'GoogleMaps', '= 9.1.0' -end \ No newline at end of file + pod 'GoogleMaps', '= 9.2.0' +end diff --git a/GoogleMaps/GoogleMapsXCFrameworkDemos.xcodeproj/project.pbxproj b/GoogleMaps/GoogleMapsXCFrameworkDemos.xcodeproj/project.pbxproj index c2e6d839..d6278c51 100644 --- a/GoogleMaps/GoogleMapsXCFrameworkDemos.xcodeproj/project.pbxproj +++ b/GoogleMaps/GoogleMapsXCFrameworkDemos.xcodeproj/project.pbxproj @@ -7,107 +7,107 @@ objects = { /* Begin PBXBuildFile section */ - 01040BCD3D27742EDB780D64 /* step1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA0AC036F34AA76EC781F679 /* step1@2x.png */; }; - 022135B0C5E8AC8BC40861D4 /* argentina-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 05EF40B0B41FC888B55D69FE /* argentina-large.png */; }; - 0324323EAC31453D7EB3C13C /* MarkersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6911475F4104D17D045C3D82 /* MarkersViewController.m */; }; - 0DEC8B37A2517404D24B76A7 /* bulgaria-large.png in Resources */ = {isa = PBXBuildFile; fileRef = FD5BFC4C927F512218D5ECA5 /* bulgaria-large.png */; }; - 0E059DC14E328C3BF1FAD6E2 /* h1.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3DB442C855FFE55BDB32F9 /* h1.png */; }; - 105124F22D0A08185939A9BC /* spitfire.png in Resources */ = {isa = PBXBuildFile; fileRef = 042409221D3AD13B007747B6 /* spitfire.png */; }; - 129B249DA7D6B02584E8ADF6 /* popup_santa.png in Resources */ = {isa = PBXBuildFile; fileRef = E82E636394A8A32F14D80A5A /* popup_santa.png */; }; - 17030BDB6E825ACB8A6DD55C /* libPods-GoogleMapsXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E2B8DD745DA5B64D8157895 /* libPods-GoogleMapsXCFrameworkDemos.a */; }; - 1C37AF2B54923BE22F20119E /* voyager.png in Resources */ = {isa = PBXBuildFile; fileRef = C5BCD7731E938D6EBA93DEA6 /* voyager.png */; }; - 1C959073896E6BC1BC25A835 /* arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3642CA57810F6FEB5E8A3811 /* arrow@2x.png */; }; - 1F226AF406E9190A041D857E /* australia-large@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E1A4272681528824CC8E5DE6 /* australia-large@2x.png */; }; - 242E537E5F0AB34F06631823 /* bulgaria.png in Resources */ = {isa = PBXBuildFile; fileRef = 6D5F0D1E6BBB77F88B200F1D /* bulgaria.png */; }; - 26F17F3876988498DF55E5DC /* DataDrivenStylingSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 56EE53E3D648068E7CFCD6B5 /* DataDrivenStylingSearchViewController.m */; }; - 27C833D0051EE01A62D72E6D /* AnimatedUIViewMarkerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F989E354E8FA9B749E870B32 /* AnimatedUIViewMarkerViewController.m */; }; - 28686C96A1B016101A905139 /* mapstyle-retro.json in Resources */ = {isa = PBXBuildFile; fileRef = 491F399A9E8F771F992DF523 /* mapstyle-retro.json */; }; - 29DC71969C3E0D4079D19B1B /* MarkerInfoWindowViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D7F398189A74C1D9479471E8 /* MarkerInfoWindowViewController.m */; }; - 2B1A661AD5A92691D40DFB45 /* MyLocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC3FF8BB4F2C607310003902 /* MyLocationViewController.m */; }; - 2B9A6832881C0CC209157262 /* step4.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F5B332E10E7DA6908EC2CE5 /* step4.png */; }; - 2D1E897C328DB9BE4D5F0862 /* PaddingBehaviorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6DE0DDB37F71BCC3AFFC0F /* PaddingBehaviorViewController.m */; }; - 2D4DF9BA8681040C56871D0C /* PolygonsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 33127A798B710B374511BBEE /* PolygonsViewController.m */; }; - 2E37162111B5AEF4E1A9151C /* step1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6322786532B55974883B5B86 /* step1.png */; }; - 30B7EAB5A9ECF9768C791907 /* step5.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A47350CF3348945019BECDB /* step5.png */; }; - 34C398F3902CCE79009D3CCC /* mapstyle-night.json in Resources */ = {isa = PBXBuildFile; fileRef = D6D648566749F55CA9A96A19 /* mapstyle-night.json */; }; - 36FF202E44BFF7E0F1475D3F /* walking_dot@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = FD104BE757F6B292840CF4DA /* walking_dot@3x.png */; }; - 38AFB309C6691192B01E4AC3 /* CustomIndoorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A480C379253CB45093B99A72 /* CustomIndoorViewController.m */; }; - 3B6B6998848E77BCB0E7C0DF /* glow-marker.png in Resources */ = {isa = PBXBuildFile; fileRef = 4FE519417F012DC5390E080B /* glow-marker.png */; }; - 40CE3E31B6F2B9A77F4A1316 /* MapLayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0CC84C1824BC3D464AE2360 /* MapLayerViewController.m */; }; - 44B81C062D7DC06F1ED8B298 /* x29.png in Resources */ = {isa = PBXBuildFile; fileRef = E2705016D4A4F41101F207FC /* x29.png */; }; - 48F7CE9065C35A982ED6EEF5 /* mapstyle-silver.json in Resources */ = {isa = PBXBuildFile; fileRef = D0A6DC61AF0440572F1EFF7C /* mapstyle-silver.json */; }; - 4A301CEF96A592B924885293 /* step3.png in Resources */ = {isa = PBXBuildFile; fileRef = E69369FB82C703E93F7931DA /* step3.png */; }; - 4EB7EC0D85E1133C8A26EA04 /* botswana.png in Resources */ = {isa = PBXBuildFile; fileRef = BB6F6A200F5303809062D466 /* botswana.png */; }; - 50BE08939D11A331639F5B52 /* GeocoderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E3CD7BBFBD79997CEF1A3B06 /* GeocoderViewController.m */; }; - 5187DB8969D4B8BA923291DC /* voyager@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5EE627B7FCC02BFE52CD2BDE /* voyager@2x.png */; }; - 5550925E38140ED30D937983 /* SnapshotReadyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 535B2F8F1241DE6E2172EB0A /* SnapshotReadyViewController.m */; }; - 55E85678ABCDBBACDD9F17F4 /* TrafficMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DCDE5879DF446014DD233CC /* TrafficMapViewController.m */; }; - 564C343FD1D21BF37818DBAB /* UIViewController+GMSModals.m in Sources */ = {isa = PBXBuildFile; fileRef = 16C71ED034AE80E6F25848A3 /* UIViewController+GMSModals.m */; }; - 57D5CD9CAB9D940115B826CA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2369B46AD19C2DE198A82E20 /* LaunchScreen.storyboard */; }; - 59B45A7D0B577292A15F2F88 /* IndoorMuseumNavigationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F313F9E375A76FA45A68B5E7 /* IndoorMuseumNavigationViewController.m */; }; - 59D329C3E2129D319A3F5E02 /* Samples.m in Sources */ = {isa = PBXBuildFile; fileRef = EAD5CC0C15E97132C5194D83 /* Samples.m */; }; - 5C00D748465B33B26260A27E /* aeroplane.png in Resources */ = {isa = PBXBuildFile; fileRef = A5085DCE62CFD5956C4AE958 /* aeroplane.png */; }; - 6266D7C7E5EE5F6CBEE5DD43 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54FF7D728243C732BE5CCEBF /* UIKit.framework */; }; - 62F41BCA6385140E4B0DCBB1 /* DarkModeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BB806D85431C7D1A3911BB02 /* DarkModeViewController.m */; }; - 64389E12EA070DB7D09CF034 /* boat@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 37D68F7F3A716D835389DE3A /* boat@2x.png */; }; - 64706C36737A9C9F2FB0614D /* australia.png in Resources */ = {isa = PBXBuildFile; fileRef = 391C4BEBCF0EB4DF08D479FB /* australia.png */; }; - 66D2F26A515EA964A99B24CF /* IndoorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B26DE4CEA5D8AFDC911B31 /* IndoorViewController.m */; }; - 6CBE2501B899E79C259C2906 /* GMSNotCapturingTouchesTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C73E5CA8887D1A321EB297 /* GMSNotCapturingTouchesTableView.m */; }; - 6F51E9F4F3A97E2A819D5391 /* GestureControlViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 40C866D8E5CFE4BE5DD9379A /* GestureControlViewController.m */; }; - 6FD86F54848C1E2C5EBF811F /* FrameRateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FB043514E68480EC2A43F174 /* FrameRateViewController.m */; }; - 72DC0F549F4D03200CFB115D /* x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A14DEDC3D43FF33DF42FB762 /* x29@2x.png */; }; - 736E5B9D3B6A5EA093098E3C /* CustomMarkersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 334E50318E9479B98AD305D3 /* CustomMarkersViewController.m */; }; - 738E93D9EC69ABBFB3595187 /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = FD8BB7719938AB3143930A30 /* arrow.png */; }; - 749B70526FB17AC06D8FDFBF /* newark_nj_1922.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 132E6A38376A89E0C7D6019A /* newark_nj_1922.jpg */; }; - 753BEEAA1A790DB1EC74751D /* australia-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 6049C34C07C09DF1E1F9E358 /* australia-large.png */; }; - 7A96B4EF4725546F8F0474F4 /* MapZoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B0F348AA337E8BF34ABA856 /* MapZoomViewController.m */; }; - 7FE34B88BAEF861EB376A551 /* glow-marker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 66B2C2E01F12190EAF3E5900 /* glow-marker@2x.png */; }; - 82B126FC49AA16BB55BE503C /* FitBoundsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 692F0E1F5B81C6403AEC0919 /* FitBoundsViewController.m */; }; - 8C25F874AD68E71308485044 /* track.json in Resources */ = {isa = PBXBuildFile; fileRef = 022AA9B6A5CE742555B528C7 /* track.json */; }; - 8D3D69C3A8AEEAD100132369 /* walking_dot@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7A66F5D261E57450EEBE73AB /* walking_dot@2x.png */; }; - 8E511695B960687FD468F0B3 /* MarkerEventsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B1518579123959F4182D3052 /* MarkerEventsViewController.m */; }; - 92225142BCE2569A35CA6D79 /* museum-exhibits.json in Resources */ = {isa = PBXBuildFile; fileRef = 3131080026B2DF3619C09AAC /* museum-exhibits.json */; }; - 996BD6DC39E242433C900876 /* GroundOverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA35FE8D02F64A4EF2504C31 /* GroundOverlayViewController.m */; }; - 9AD005F18F073925F90460A9 /* MapsDemoAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D7E287463FF5AB46974805F1 /* MapsDemoAssets.xcassets */; }; - 9AF6133EC02D18478A765A37 /* StampedPolylinesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 919E7008EC4E53C11FB6E486 /* StampedPolylinesViewController.m */; }; - A8CBB83ED13B395C32FAC6CC /* step8@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7582A67074185C3F659BB973 /* step8@2x.png */; }; - A9D37C3DE23EED226E316A9F /* argentina.png in Resources */ = {isa = PBXBuildFile; fileRef = B7F879052470705EEAE4E2BA /* argentina.png */; }; - AC3ACA46D2C8BB787F6411D8 /* DemoSceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BA71C573DD7486CB452BA358 /* DemoSceneDelegate.m */; }; - ADF56D4802AB058F39CF5B05 /* DataDrivenStylingBasicViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 40C77B62A87793FD6655D9AD /* DataDrivenStylingBasicViewController.m */; }; - AE489645396BADBC738563E6 /* h1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 00D6EB304E045944B763A9E9 /* h1@2x.png */; }; - B145C9ED88F2C0D6FEB38405 /* popup_santa@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5801101172DDCEFE33E8179F /* popup_santa@2x.png */; }; - B2BD10C1111CFA597DE2C63E /* step3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 215623103AE0C91ECD71FF91 /* step3@2x.png */; }; - B611137BA62573329F0B614F /* MapTypesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6DC85BF570FF84667BD976D5 /* MapTypesViewController.m */; }; - B84EADAD4D02B306BEDD9066 /* step4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 48A1D9EAA7C923318FE2AE21 /* step4@2x.png */; }; - B95CEE8227843DC9B1B4FE90 /* PolylinesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5977CDA9E59192152C023253 /* PolylinesViewController.m */; }; - BA73613626137DC42014FB78 /* SampleListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C750E37F2015A3DBFCB8B8E /* SampleListViewController.m */; }; - C061FEBFEC30872CE4E1115F /* CameraViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F12BE6B101B3C6676170AA86 /* CameraViewController.m */; }; - C1939E2DE9EB6768454CA731 /* step2.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D1DD818BD5B40FDB5A28381 /* step2.png */; }; - C82960DC17765A83CB606325 /* AnimatedCurrentLocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22C4B9877556BA5636335B9C /* AnimatedCurrentLocationViewController.m */; }; - C84D08D904F3F73D1388FA9D /* step7.png in Resources */ = {isa = PBXBuildFile; fileRef = DDCF92F9E7A946E2A4C45A1B /* step7.png */; }; - C950EF90A58F6F7EFB38808F /* step7@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A819CC9387B1047908E50C83 /* step7@2x.png */; }; - CDD28D9B701934C66483440D /* PanoramaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCCC39D450EE6F5CB2B44D8E /* PanoramaViewController.m */; }; - CE059EA109369AB8C315CF28 /* DataDrivenStylingEventsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B24AE1EFB46B0F402E32C4C /* DataDrivenStylingEventsViewController.m */; }; - CFD5879FAE1FA60A33D2FF10 /* MarkerLayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE154E2811554CAAC996EA17 /* MarkerLayerViewController.m */; }; - D2A6D272E7CE0B705931A83C /* step8.png in Resources */ = {isa = PBXBuildFile; fileRef = 825A2EFAAE135E492B792E35 /* step8.png */; }; - D2D8D9D04DEE271A39E5A832 /* boat.png in Resources */ = {isa = PBXBuildFile; fileRef = 0B7C9B05316A77DAB5CA7161 /* boat.png */; }; - D2DCF040BB97BB53182DC580 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 48625483113AB7D82912CB5C /* main.m */; }; - D3CB35F33C4AA227239546BC /* step2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 90DAA7D7D2EC158138011F70 /* step2@2x.png */; }; - D53B080367820AEF84AAE9C6 /* StructuredGeocoderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F55B6A9A985370CD2161A26 /* StructuredGeocoderViewController.m */; }; - E3FDB4C4E10283017A47630F /* GradientPolylinesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A6302185E3658A330EA7B71A /* GradientPolylinesViewController.m */; }; - E46FCE2CFBECF392EFF1C2E1 /* TileLayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AFB4D667570207CE427E154 /* TileLayerViewController.m */; }; - F03A1F6AEAB65D13EE615F03 /* BasicMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D6DE762B24046782158CDF /* BasicMapViewController.m */; }; - F1BBBEADC9FE1E3E5D4EE9C7 /* spitfire@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 559AE92084C73D8643C4247C /* spitfire@2x.png */; }; - F3C1C6B97CE504120393A53B /* aeroplane@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B43219D8AF7E4CCA16C755DD /* aeroplane@2x.png */; }; - F3D1FB485E56AFB1B80334B9 /* step6.png in Resources */ = {isa = PBXBuildFile; fileRef = 74B58840EDD39C1FC96FC3F7 /* step6.png */; }; - F4C0F4CAF678E634FFDC2874 /* VisibleRegionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E0E2B2CCA2C36AF9450808 /* VisibleRegionViewController.m */; }; - F54047ACBF5C4E2041C0B039 /* step5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B5B2A7CEFB3AED2A99F8DDDC /* step5@2x.png */; }; - F6D0F628B9DBA78B9B77A9C8 /* botswana-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 98F14EFF9CE86534819715CF /* botswana-large.png */; }; - F7D15CCCB54CCE8D600C6993 /* DoubleMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 59DDD6C9EABD26768F26985B /* DoubleMapViewController.m */; }; - FA1F21360B3599591DE08CEC /* FixedPanoramaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77D6F3A965ED915EF8C24711 /* FixedPanoramaViewController.m */; }; - FB423FAD85CB70A57BF3A5BA /* step6@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0E8344F6AF7332726090AC50 /* step6@2x.png */; }; - FEB9B0F39AAD4BA24155ADA1 /* DemoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CE84F5F4A666A359FE92F1 /* DemoAppDelegate.m */; }; - FF99932AEF8EC85BAF3DAE2C /* StyledMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C7BB4745249E4EED48C85B91 /* StyledMapViewController.m */; }; + 051FA03F837BB90440AEE34E /* AnimatedUIViewMarkerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F989E354E8FA9B749E870B32 /* AnimatedUIViewMarkerViewController.m */; }; + 05C5E507B2E36986E0112E06 /* FitBoundsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 692F0E1F5B81C6403AEC0919 /* FitBoundsViewController.m */; }; + 06AC6BA34098F098987018DA /* step4.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F5B332E10E7DA6908EC2CE5 /* step4.png */; }; + 0B11E4CAA4671B20FA415A53 /* popup_santa.png in Resources */ = {isa = PBXBuildFile; fileRef = E82E636394A8A32F14D80A5A /* popup_santa.png */; }; + 0C54FAE230A102956146B5E2 /* spitfire@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 559AE92084C73D8643C4247C /* spitfire@2x.png */; }; + 0CD2B3358D83FC2D18C7B392 /* PanoramaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCCC39D450EE6F5CB2B44D8E /* PanoramaViewController.m */; }; + 0DF6F5BBAA95B41F213BDF3F /* IndoorMuseumNavigationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F313F9E375A76FA45A68B5E7 /* IndoorMuseumNavigationViewController.m */; }; + 0E926BCA32C38FEDA05B21D4 /* SnapshotReadyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 535B2F8F1241DE6E2172EB0A /* SnapshotReadyViewController.m */; }; + 12C3EF3C6332DFEB420A6849 /* step7@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A819CC9387B1047908E50C83 /* step7@2x.png */; }; + 12D45DF9CF1530F9AE00AFB4 /* bulgaria-large.png in Resources */ = {isa = PBXBuildFile; fileRef = FD5BFC4C927F512218D5ECA5 /* bulgaria-large.png */; }; + 199B95BE0BBB60F6AC842A94 /* DataDrivenStylingBasicViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 40C77B62A87793FD6655D9AD /* DataDrivenStylingBasicViewController.m */; }; + 1A7AF3B8C6F1EDB4D04CF32B /* TileLayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AFB4D667570207CE427E154 /* TileLayerViewController.m */; }; + 1B85EEC4A316C34139ED9BE8 /* boat.png in Resources */ = {isa = PBXBuildFile; fileRef = 0B7C9B05316A77DAB5CA7161 /* boat.png */; }; + 1F4930DBE3F488F23E00FC97 /* aeroplane.png in Resources */ = {isa = PBXBuildFile; fileRef = A5085DCE62CFD5956C4AE958 /* aeroplane.png */; }; + 227B1C6AE5E6EBDE88D0182F /* DataDrivenStylingSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 56EE53E3D648068E7CFCD6B5 /* DataDrivenStylingSearchViewController.m */; }; + 230249F05438C47497343E98 /* GradientPolylinesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A6302185E3658A330EA7B71A /* GradientPolylinesViewController.m */; }; + 27354B9C528ADE6F4A4647F6 /* australia-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 6049C34C07C09DF1E1F9E358 /* australia-large.png */; }; + 2F2B2DC73539539BF875CCEE /* PolygonsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 33127A798B710B374511BBEE /* PolygonsViewController.m */; }; + 2F5986504DD9257E33D84B32 /* voyager.png in Resources */ = {isa = PBXBuildFile; fileRef = C5BCD7731E938D6EBA93DEA6 /* voyager.png */; }; + 2F67125D69D28B6E0E7042F5 /* DemoSceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BA71C573DD7486CB452BA358 /* DemoSceneDelegate.m */; }; + 2F8C755E5471FB68757A7110 /* StructuredGeocoderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F55B6A9A985370CD2161A26 /* StructuredGeocoderViewController.m */; }; + 314B807E33EAF523DB2D8570 /* DemoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CE84F5F4A666A359FE92F1 /* DemoAppDelegate.m */; }; + 32240A4E1007C768E7FBC5E4 /* step8@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7582A67074185C3F659BB973 /* step8@2x.png */; }; + 34A57A22DFFDDF0310E1B4C5 /* MarkerEventsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B1518579123959F4182D3052 /* MarkerEventsViewController.m */; }; + 34CCFD3E329A934A8446CB11 /* Samples.m in Sources */ = {isa = PBXBuildFile; fileRef = EAD5CC0C15E97132C5194D83 /* Samples.m */; }; + 3C23BB23E8D6CBF466643B4C /* h1.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3DB442C855FFE55BDB32F9 /* h1.png */; }; + 41E54FE2C211CBC684CF4B6B /* museum-exhibits.json in Resources */ = {isa = PBXBuildFile; fileRef = 3131080026B2DF3619C09AAC /* museum-exhibits.json */; }; + 44D78B72897F46E89D284D4C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2369B46AD19C2DE198A82E20 /* LaunchScreen.storyboard */; }; + 45FEDCC2B730CB78EC433A69 /* MapLayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0CC84C1824BC3D464AE2360 /* MapLayerViewController.m */; }; + 4682C0898F83B38473F40F9D /* libPods-GoogleMapsXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F5F127081824670DD73624E /* libPods-GoogleMapsXCFrameworkDemos.a */; }; + 4F841A7108D8D1912B19452A /* step5.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A47350CF3348945019BECDB /* step5.png */; }; + 52761865916B0064436F9F4E /* MyLocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC3FF8BB4F2C607310003902 /* MyLocationViewController.m */; }; + 57DD9EBC5FA7A6C46182DD83 /* PaddingBehaviorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6DE0DDB37F71BCC3AFFC0F /* PaddingBehaviorViewController.m */; }; + 59C8B39D77BF1FDA96B506DA /* glow-marker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 66B2C2E01F12190EAF3E5900 /* glow-marker@2x.png */; }; + 5C4C0F3621976571BD024DC4 /* CustomMarkersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 334E50318E9479B98AD305D3 /* CustomMarkersViewController.m */; }; + 5D23C574616C7873DA18293D /* BasicMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D6DE762B24046782158CDF /* BasicMapViewController.m */; }; + 5FC2E4AAF3D9E3FB240E36B6 /* DataDrivenStylingEventsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B24AE1EFB46B0F402E32C4C /* DataDrivenStylingEventsViewController.m */; }; + 5FCF0FD00C7EC598204795A9 /* arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3642CA57810F6FEB5E8A3811 /* arrow@2x.png */; }; + 62AE8C9E9AC40B18B9CC9BD6 /* GeocoderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E3CD7BBFBD79997CEF1A3B06 /* GeocoderViewController.m */; }; + 7356C5DC9F5B6D75902F57B0 /* IndoorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50B26DE4CEA5D8AFDC911B31 /* IndoorViewController.m */; }; + 752D74F06461BBBB5DB18F1C /* step2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 90DAA7D7D2EC158138011F70 /* step2@2x.png */; }; + 7E9D528F8D4AA20AF319E5B3 /* glow-marker.png in Resources */ = {isa = PBXBuildFile; fileRef = 4FE519417F012DC5390E080B /* glow-marker.png */; }; + 85C63AA30782F3D632E94368 /* step1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6322786532B55974883B5B86 /* step1.png */; }; + 8B89C92CD4558B657EA7E912 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 48625483113AB7D82912CB5C /* main.m */; }; + 8BD8B95E966B13C25010A77C /* AnimatedCurrentLocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22C4B9877556BA5636335B9C /* AnimatedCurrentLocationViewController.m */; }; + 8ED60491642A7960835DB0FF /* x29.png in Resources */ = {isa = PBXBuildFile; fileRef = E2705016D4A4F41101F207FC /* x29.png */; }; + 8F4C2407221B4B089A0AF380 /* step3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 215623103AE0C91ECD71FF91 /* step3@2x.png */; }; + 910DD1F0585904E69E559E95 /* mapstyle-silver.json in Resources */ = {isa = PBXBuildFile; fileRef = D0A6DC61AF0440572F1EFF7C /* mapstyle-silver.json */; }; + 9530FBAABECE52E33C8B6016 /* australia-large@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E1A4272681528824CC8E5DE6 /* australia-large@2x.png */; }; + 954FA764EDCFE3C6321C5690 /* step5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B5B2A7CEFB3AED2A99F8DDDC /* step5@2x.png */; }; + 9587E563986653A82C5CAA02 /* UIViewController+GMSModals.m in Sources */ = {isa = PBXBuildFile; fileRef = 16C71ED034AE80E6F25848A3 /* UIViewController+GMSModals.m */; }; + 96ACBC4CEF968B9983F8C8E3 /* DarkModeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BB806D85431C7D1A3911BB02 /* DarkModeViewController.m */; }; + 98505A047401D248C9BC8197 /* step8.png in Resources */ = {isa = PBXBuildFile; fileRef = 825A2EFAAE135E492B792E35 /* step8.png */; }; + 999F431B33E80DBED2B1D6D6 /* botswana-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 98F14EFF9CE86534819715CF /* botswana-large.png */; }; + 9AC5E51B8CC93BE82E7B8307 /* spitfire.png in Resources */ = {isa = PBXBuildFile; fileRef = 042409221D3AD13B007747B6 /* spitfire.png */; }; + 9C31FC07AADC6E9711E89547 /* walking_dot@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7A66F5D261E57450EEBE73AB /* walking_dot@2x.png */; }; + 9E0930A222926B878A31E018 /* track.json in Resources */ = {isa = PBXBuildFile; fileRef = 022AA9B6A5CE742555B528C7 /* track.json */; }; + 9E7C432A0510AED39C367FF0 /* MarkerLayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE154E2811554CAAC996EA17 /* MarkerLayerViewController.m */; }; + 9FE037D9C2C7451C66C17DD8 /* FrameRateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FB043514E68480EC2A43F174 /* FrameRateViewController.m */; }; + A0DD9F63B08B216B58562F4D /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54FF7D728243C732BE5CCEBF /* UIKit.framework */; }; + A14A0B5DF3E10EAA200DD852 /* popup_santa@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5801101172DDCEFE33E8179F /* popup_santa@2x.png */; }; + A27901B2756E386A15B38F60 /* newark_nj_1922.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 132E6A38376A89E0C7D6019A /* newark_nj_1922.jpg */; }; + A3D16393DD28EA929BB43887 /* australia.png in Resources */ = {isa = PBXBuildFile; fileRef = 391C4BEBCF0EB4DF08D479FB /* australia.png */; }; + A4407CF3671CCC733AADA601 /* h1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 00D6EB304E045944B763A9E9 /* h1@2x.png */; }; + A6EE0A4E0648E0851CE931AF /* step4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 48A1D9EAA7C923318FE2AE21 /* step4@2x.png */; }; + A859E1604D1C4F40827CC0B4 /* GestureControlViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 40C866D8E5CFE4BE5DD9379A /* GestureControlViewController.m */; }; + A9B6B9167406EE24B5DD9CC1 /* aeroplane@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B43219D8AF7E4CCA16C755DD /* aeroplane@2x.png */; }; + ADD7854D67D576254ED3357F /* x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A14DEDC3D43FF33DF42FB762 /* x29@2x.png */; }; + B134E5FE4D82EFB7E994F8C6 /* DoubleMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 59DDD6C9EABD26768F26985B /* DoubleMapViewController.m */; }; + B35C807A21035A91DA7FD6C6 /* boat@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 37D68F7F3A716D835389DE3A /* boat@2x.png */; }; + BD8859E218C20655F86BE120 /* walking_dot@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = FD104BE757F6B292840CF4DA /* walking_dot@3x.png */; }; + C0A9F48DA40146F8ACE60260 /* MapZoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B0F348AA337E8BF34ABA856 /* MapZoomViewController.m */; }; + C18A079F312B93B9DAB12158 /* CameraViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F12BE6B101B3C6676170AA86 /* CameraViewController.m */; }; + C35BA57EE13B0877E95B55AD /* StampedPolylinesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 919E7008EC4E53C11FB6E486 /* StampedPolylinesViewController.m */; }; + C5678328E64222A968A6F59D /* step1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA0AC036F34AA76EC781F679 /* step1@2x.png */; }; + CA29FE9C6E91C2573CBAF180 /* argentina-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 05EF40B0B41FC888B55D69FE /* argentina-large.png */; }; + CACFD6434CCA5E6A9F9D4DD1 /* MapsDemoAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D7E287463FF5AB46974805F1 /* MapsDemoAssets.xcassets */; }; + D83B0FBBB32568EF8DECDF33 /* SampleListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C750E37F2015A3DBFCB8B8E /* SampleListViewController.m */; }; + DA30B344811909207574ADA6 /* botswana.png in Resources */ = {isa = PBXBuildFile; fileRef = BB6F6A200F5303809062D466 /* botswana.png */; }; + DCAA16F2944BE4C830A212B0 /* step2.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D1DD818BD5B40FDB5A28381 /* step2.png */; }; + DD082313482D7A9ABFDFC94D /* step7.png in Resources */ = {isa = PBXBuildFile; fileRef = DDCF92F9E7A946E2A4C45A1B /* step7.png */; }; + DD974F1ABFF8450FBBBB3742 /* FixedPanoramaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77D6F3A965ED915EF8C24711 /* FixedPanoramaViewController.m */; }; + DD9CAC82B9EE32F9C98C8684 /* mapstyle-night.json in Resources */ = {isa = PBXBuildFile; fileRef = D6D648566749F55CA9A96A19 /* mapstyle-night.json */; }; + DDA4C18BDA857B120BBB6E14 /* step6.png in Resources */ = {isa = PBXBuildFile; fileRef = 74B58840EDD39C1FC96FC3F7 /* step6.png */; }; + DF5F0EB6B5FFC0A5872C15AF /* VisibleRegionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E0E2B2CCA2C36AF9450808 /* VisibleRegionViewController.m */; }; + E3D96E6AADA4210153FF9B3D /* GMSNotCapturingTouchesTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C73E5CA8887D1A321EB297 /* GMSNotCapturingTouchesTableView.m */; }; + E559F48361616010C0003C53 /* PolylinesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5977CDA9E59192152C023253 /* PolylinesViewController.m */; }; + E7688501B1D5088916C04522 /* step6@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0E8344F6AF7332726090AC50 /* step6@2x.png */; }; + E7C1583317AEA0F5E91215DE /* CustomIndoorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A480C379253CB45093B99A72 /* CustomIndoorViewController.m */; }; + E9898AC4FFC037697CE6523A /* bulgaria.png in Resources */ = {isa = PBXBuildFile; fileRef = 6D5F0D1E6BBB77F88B200F1D /* bulgaria.png */; }; + EC00DF9D4783BAF660DCC0AF /* GroundOverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA35FE8D02F64A4EF2504C31 /* GroundOverlayViewController.m */; }; + EF8B1B2A6DCD454834E3B878 /* step3.png in Resources */ = {isa = PBXBuildFile; fileRef = E69369FB82C703E93F7931DA /* step3.png */; }; + F26B4632C862F306E840D79E /* MapTypesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6DC85BF570FF84667BD976D5 /* MapTypesViewController.m */; }; + F68416E3B6F6BD972567A4A7 /* mapstyle-retro.json in Resources */ = {isa = PBXBuildFile; fileRef = 491F399A9E8F771F992DF523 /* mapstyle-retro.json */; }; + F8B1EBDB355EF680165227DC /* voyager@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5EE627B7FCC02BFE52CD2BDE /* voyager@2x.png */; }; + F968090ACE09825B70D666C7 /* argentina.png in Resources */ = {isa = PBXBuildFile; fileRef = B7F879052470705EEAE4E2BA /* argentina.png */; }; + FCBE42ED0B187D36130F8B84 /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = FD8BB7719938AB3143930A30 /* arrow.png */; }; + FCEC3C8EA094C86DEBB96047 /* StyledMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C7BB4745249E4EED48C85B91 /* StyledMapViewController.m */; }; + FD4CAAE4A350A4CA7B491EA5 /* MarkersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6911475F4104D17D045C3D82 /* MarkersViewController.m */; }; + FDC0C74C3105C083DFD1246C /* MarkerInfoWindowViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D7F398189A74C1D9479471E8 /* MarkerInfoWindowViewController.m */; }; + FF2E837A04F0F30DBF33C3CF /* TrafficMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DCDE5879DF446014DD233CC /* TrafficMapViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -140,7 +140,6 @@ 3B24AE1EFB46B0F402E32C4C /* DataDrivenStylingEventsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DataDrivenStylingEventsViewController.m; sourceTree = ""; }; 3C42F77AAB98E894342A2500 /* SnapshotReadyViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SnapshotReadyViewController.h; sourceTree = ""; }; 3DCDE5879DF446014DD233CC /* TrafficMapViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TrafficMapViewController.m; sourceTree = ""; }; - 3E2B8DD745DA5B64D8157895 /* libPods-GoogleMapsXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3F3DB442C855FFE55BDB32F9 /* h1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = h1.png; sourceTree = ""; }; 40C77B62A87793FD6655D9AD /* DataDrivenStylingBasicViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DataDrivenStylingBasicViewController.m; sourceTree = ""; }; 40C866D8E5CFE4BE5DD9379A /* GestureControlViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GestureControlViewController.m; sourceTree = ""; }; @@ -150,6 +149,7 @@ 491F399A9E8F771F992DF523 /* mapstyle-retro.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mapstyle-retro.json"; sourceTree = ""; }; 4B0F348AA337E8BF34ABA856 /* MapZoomViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MapZoomViewController.m; sourceTree = ""; }; 4B3523716C1DA5FE744A8357 /* FrameRateViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameRateViewController.h; sourceTree = ""; }; + 4F5F127081824670DD73624E /* libPods-GoogleMapsXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 4FE519417F012DC5390E080B /* glow-marker.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "glow-marker.png"; sourceTree = ""; }; 50B26DE4CEA5D8AFDC911B31 /* IndoorViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IndoorViewController.m; sourceTree = ""; }; 535B2F8F1241DE6E2172EB0A /* SnapshotReadyViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SnapshotReadyViewController.m; sourceTree = ""; }; @@ -173,11 +173,11 @@ 66B2C2E01F12190EAF3E5900 /* glow-marker@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "glow-marker@2x.png"; sourceTree = ""; }; 6911475F4104D17D045C3D82 /* MarkersViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MarkersViewController.m; sourceTree = ""; }; 692F0E1F5B81C6403AEC0919 /* FitBoundsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FitBoundsViewController.m; sourceTree = ""; }; + 6D1274A1AF8E25662185D498 /* Pods-GoogleMapsXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsXCFrameworkDemos/Pods-GoogleMapsXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; 6D5F0D1E6BBB77F88B200F1D /* bulgaria.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bulgaria.png; sourceTree = ""; }; 6DC85BF570FF84667BD976D5 /* MapTypesViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MapTypesViewController.m; sourceTree = ""; }; 6E6F16DCD92A7D5700284D17 /* TrafficMapViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TrafficMapViewController.h; sourceTree = ""; }; 71E304C0D81559F0658D68BD /* MapTypesViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MapTypesViewController.h; sourceTree = ""; }; - 71FA451CC319136D84A0530A /* Pods-GoogleMapsXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsXCFrameworkDemos/Pods-GoogleMapsXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; 74B58840EDD39C1FC96FC3F7 /* step6.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step6.png; sourceTree = ""; }; 7582A67074185C3F659BB973 /* step8@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "step8@2x.png"; sourceTree = ""; }; 77D6F3A965ED915EF8C24711 /* FixedPanoramaViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FixedPanoramaViewController.m; sourceTree = ""; }; @@ -267,29 +267,21 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6266D7C7E5EE5F6CBEE5DD43 /* UIKit.framework in Frameworks */, - 17030BDB6E825ACB8A6DD55C /* libPods-GoogleMapsXCFrameworkDemos.a in Frameworks */, + A0DD9F63B08B216B58562F4D /* UIKit.framework in Frameworks */, + 4682C0898F83B38473F40F9D /* libPods-GoogleMapsXCFrameworkDemos.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 126085E4942644F6341EDFE0 /* Pods */ = { + 0DD525867DEAAFD032C9C9D5 /* Frameworks */ = { isa = PBXGroup; children = ( - 71FA451CC319136D84A0530A /* Pods-GoogleMapsXCFrameworkDemos.default.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; - 289637F0EEDCF3E62A549F07 /* Source */ = { - isa = PBXGroup; - children = ( - EFC90874D38DB5AD560B6942 /* GoogleMapsXCFrameworkDemos */, + 54FF7D728243C732BE5CCEBF /* UIKit.framework */, + 4F5F127081824670DD73624E /* libPods-GoogleMapsXCFrameworkDemos.a */, ); - name = Source; + name = Frameworks; sourceTree = ""; }; 292FED0F98F608DEEA10F89E /* Samples */ = { @@ -382,10 +374,10 @@ 33F1184A502840646019F4AD = { isa = PBXGroup; children = ( - 289637F0EEDCF3E62A549F07 /* Source */, - 9012D7FCBD3B8AF6F97D252A /* Frameworks */, + F7209643A1096841E3F3674A /* Source */, + 0DD525867DEAAFD032C9C9D5 /* Frameworks */, 4821ED2B48575D39F15E7A3E /* Products */, - 126085E4942644F6341EDFE0 /* Pods */, + FCA0C9562F3343C3897B9393 /* Pods */, ); sourceTree = ""; }; @@ -460,15 +452,6 @@ path = Common; sourceTree = ""; }; - 9012D7FCBD3B8AF6F97D252A /* Frameworks */ = { - isa = PBXGroup; - children = ( - 54FF7D728243C732BE5CCEBF /* UIKit.framework */, - 3E2B8DD745DA5B64D8157895 /* libPods-GoogleMapsXCFrameworkDemos.a */, - ); - name = Frameworks; - sourceTree = ""; - }; AC957CAB6E869CA7D7D653CB /* Museum-Icons */ = { isa = PBXGroup; children = ( @@ -503,6 +486,23 @@ path = GoogleMapsXCFrameworkDemos; sourceTree = ""; }; + F7209643A1096841E3F3674A /* Source */ = { + isa = PBXGroup; + children = ( + EFC90874D38DB5AD560B6942 /* GoogleMapsXCFrameworkDemos */, + ); + name = Source; + sourceTree = ""; + }; + FCA0C9562F3343C3897B9393 /* Pods */ = { + isa = PBXGroup; + children = ( + 6D1274A1AF8E25662185D498 /* Pods-GoogleMapsXCFrameworkDemos.default.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -510,11 +510,11 @@ isa = PBXNativeTarget; buildConfigurationList = D847B05B529BB39E14FFF5BD /* Build configuration list for PBXNativeTarget "GoogleMapsXCFrameworkDemos" */; buildPhases = ( - D1E0418BF7DD664C116D230E /* [CP] Check Pods Manifest.lock */, + A9A8B5DCEAB79CC654EDD185 /* [CP] Check Pods Manifest.lock */, 951BCF66D792115EA918DDD9 /* Resources */, 0BD20F4D9AFC81C68D469BB4 /* Sources */, 88A4150CC961D43FDF2D38A8 /* Frameworks */, - 5FE32D4FF98A82BC963BD719 /* [CP] Copy Pods Resources */, + C1A3E6F89A7375351FC5DEC9 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -555,66 +555,66 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 30B7EAB5A9ECF9768C791907 /* step5.png in Resources */, - 01040BCD3D27742EDB780D64 /* step1@2x.png in Resources */, - 2B9A6832881C0CC209157262 /* step4.png in Resources */, - A9D37C3DE23EED226E316A9F /* argentina.png in Resources */, - D2D8D9D04DEE271A39E5A832 /* boat.png in Resources */, - F3C1C6B97CE504120393A53B /* aeroplane@2x.png in Resources */, - F3D1FB485E56AFB1B80334B9 /* step6.png in Resources */, - C84D08D904F3F73D1388FA9D /* step7.png in Resources */, - 36FF202E44BFF7E0F1475D3F /* walking_dot@3x.png in Resources */, - 5C00D748465B33B26260A27E /* aeroplane.png in Resources */, - F6D0F628B9DBA78B9B77A9C8 /* botswana-large.png in Resources */, - 4A301CEF96A592B924885293 /* step3.png in Resources */, - 8D3D69C3A8AEEAD100132369 /* walking_dot@2x.png in Resources */, - C1939E2DE9EB6768454CA731 /* step2.png in Resources */, - B145C9ED88F2C0D6FEB38405 /* popup_santa@2x.png in Resources */, - 3B6B6998848E77BCB0E7C0DF /* glow-marker.png in Resources */, - 2E37162111B5AEF4E1A9151C /* step1.png in Resources */, - B2BD10C1111CFA597DE2C63E /* step3@2x.png in Resources */, - 64706C36737A9C9F2FB0614D /* australia.png in Resources */, - C950EF90A58F6F7EFB38808F /* step7@2x.png in Resources */, - 1C959073896E6BC1BC25A835 /* arrow@2x.png in Resources */, - 7FE34B88BAEF861EB376A551 /* glow-marker@2x.png in Resources */, - F54047ACBF5C4E2041C0B039 /* step5@2x.png in Resources */, - 1F226AF406E9190A041D857E /* australia-large@2x.png in Resources */, - 738E93D9EC69ABBFB3595187 /* arrow.png in Resources */, - 64389E12EA070DB7D09CF034 /* boat@2x.png in Resources */, - 72DC0F549F4D03200CFB115D /* x29@2x.png in Resources */, - 105124F22D0A08185939A9BC /* spitfire.png in Resources */, - AE489645396BADBC738563E6 /* h1@2x.png in Resources */, - F1BBBEADC9FE1E3E5D4EE9C7 /* spitfire@2x.png in Resources */, - 0E059DC14E328C3BF1FAD6E2 /* h1.png in Resources */, - 1C37AF2B54923BE22F20119E /* voyager.png in Resources */, - 44B81C062D7DC06F1ED8B298 /* x29.png in Resources */, - 5187DB8969D4B8BA923291DC /* voyager@2x.png in Resources */, - 242E537E5F0AB34F06631823 /* bulgaria.png in Resources */, - 0DEC8B37A2517404D24B76A7 /* bulgaria-large.png in Resources */, - 022135B0C5E8AC8BC40861D4 /* argentina-large.png in Resources */, - D3CB35F33C4AA227239546BC /* step2@2x.png in Resources */, - 129B249DA7D6B02584E8ADF6 /* popup_santa.png in Resources */, - FB423FAD85CB70A57BF3A5BA /* step6@2x.png in Resources */, - A8CBB83ED13B395C32FAC6CC /* step8@2x.png in Resources */, - D2A6D272E7CE0B705931A83C /* step8.png in Resources */, - 753BEEAA1A790DB1EC74751D /* australia-large.png in Resources */, - 4EB7EC0D85E1133C8A26EA04 /* botswana.png in Resources */, - B84EADAD4D02B306BEDD9066 /* step4@2x.png in Resources */, - 749B70526FB17AC06D8FDFBF /* newark_nj_1922.jpg in Resources */, - 34C398F3902CCE79009D3CCC /* mapstyle-night.json in Resources */, - 28686C96A1B016101A905139 /* mapstyle-retro.json in Resources */, - 48F7CE9065C35A982ED6EEF5 /* mapstyle-silver.json in Resources */, - 8C25F874AD68E71308485044 /* track.json in Resources */, - 92225142BCE2569A35CA6D79 /* museum-exhibits.json in Resources */, - 57D5CD9CAB9D940115B826CA /* LaunchScreen.storyboard in Resources */, - 9AD005F18F073925F90460A9 /* MapsDemoAssets.xcassets in Resources */, + 4F841A7108D8D1912B19452A /* step5.png in Resources */, + C5678328E64222A968A6F59D /* step1@2x.png in Resources */, + 06AC6BA34098F098987018DA /* step4.png in Resources */, + F968090ACE09825B70D666C7 /* argentina.png in Resources */, + 1B85EEC4A316C34139ED9BE8 /* boat.png in Resources */, + A9B6B9167406EE24B5DD9CC1 /* aeroplane@2x.png in Resources */, + DDA4C18BDA857B120BBB6E14 /* step6.png in Resources */, + DD082313482D7A9ABFDFC94D /* step7.png in Resources */, + BD8859E218C20655F86BE120 /* walking_dot@3x.png in Resources */, + 1F4930DBE3F488F23E00FC97 /* aeroplane.png in Resources */, + 999F431B33E80DBED2B1D6D6 /* botswana-large.png in Resources */, + EF8B1B2A6DCD454834E3B878 /* step3.png in Resources */, + 9C31FC07AADC6E9711E89547 /* walking_dot@2x.png in Resources */, + DCAA16F2944BE4C830A212B0 /* step2.png in Resources */, + A14A0B5DF3E10EAA200DD852 /* popup_santa@2x.png in Resources */, + 7E9D528F8D4AA20AF319E5B3 /* glow-marker.png in Resources */, + 85C63AA30782F3D632E94368 /* step1.png in Resources */, + 8F4C2407221B4B089A0AF380 /* step3@2x.png in Resources */, + A3D16393DD28EA929BB43887 /* australia.png in Resources */, + 12C3EF3C6332DFEB420A6849 /* step7@2x.png in Resources */, + 5FCF0FD00C7EC598204795A9 /* arrow@2x.png in Resources */, + 59C8B39D77BF1FDA96B506DA /* glow-marker@2x.png in Resources */, + 954FA764EDCFE3C6321C5690 /* step5@2x.png in Resources */, + 9530FBAABECE52E33C8B6016 /* australia-large@2x.png in Resources */, + FCBE42ED0B187D36130F8B84 /* arrow.png in Resources */, + B35C807A21035A91DA7FD6C6 /* boat@2x.png in Resources */, + ADD7854D67D576254ED3357F /* x29@2x.png in Resources */, + 9AC5E51B8CC93BE82E7B8307 /* spitfire.png in Resources */, + A4407CF3671CCC733AADA601 /* h1@2x.png in Resources */, + 0C54FAE230A102956146B5E2 /* spitfire@2x.png in Resources */, + 3C23BB23E8D6CBF466643B4C /* h1.png in Resources */, + 2F5986504DD9257E33D84B32 /* voyager.png in Resources */, + 8ED60491642A7960835DB0FF /* x29.png in Resources */, + F8B1EBDB355EF680165227DC /* voyager@2x.png in Resources */, + E9898AC4FFC037697CE6523A /* bulgaria.png in Resources */, + 12D45DF9CF1530F9AE00AFB4 /* bulgaria-large.png in Resources */, + CA29FE9C6E91C2573CBAF180 /* argentina-large.png in Resources */, + 752D74F06461BBBB5DB18F1C /* step2@2x.png in Resources */, + 0B11E4CAA4671B20FA415A53 /* popup_santa.png in Resources */, + E7688501B1D5088916C04522 /* step6@2x.png in Resources */, + 32240A4E1007C768E7FBC5E4 /* step8@2x.png in Resources */, + 98505A047401D248C9BC8197 /* step8.png in Resources */, + 27354B9C528ADE6F4A4647F6 /* australia-large.png in Resources */, + DA30B344811909207574ADA6 /* botswana.png in Resources */, + A6EE0A4E0648E0851CE931AF /* step4@2x.png in Resources */, + A27901B2756E386A15B38F60 /* newark_nj_1922.jpg in Resources */, + DD9CAC82B9EE32F9C98C8684 /* mapstyle-night.json in Resources */, + F68416E3B6F6BD972567A4A7 /* mapstyle-retro.json in Resources */, + 910DD1F0585904E69E559E95 /* mapstyle-silver.json in Resources */, + 9E0930A222926B878A31E018 /* track.json in Resources */, + 41E54FE2C211CBC684CF4B6B /* museum-exhibits.json in Resources */, + 44D78B72897F46E89D284D4C /* LaunchScreen.storyboard in Resources */, + CACFD6434CCA5E6A9F9D4DD1 /* MapsDemoAssets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 5FE32D4FF98A82BC963BD719 /* [CP] Copy Pods Resources */ = { + A9A8B5DCEAB79CC654EDD185 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -622,21 +622,21 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsXCFrameworkDemos/Pods-GoogleMapsXCFrameworkDemos-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( ); outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle", + "$(DERIVED_FILE_DIR)/Pods-GoogleMapsXCFrameworkDemos-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsXCFrameworkDemos/Pods-GoogleMapsXCFrameworkDemos-resources.sh\"\n"; + 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; }; - D1E0418BF7DD664C116D230E /* [CP] Check Pods Manifest.lock */ = { + C1A3E6F89A7375351FC5DEC9 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -644,18 +644,18 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", + "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsXCFrameworkDemos/Pods-GoogleMapsXCFrameworkDemos-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle", ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-GoogleMapsXCFrameworkDemos-checkManifestLockResult.txt", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsXCFrameworkDemos/Pods-GoogleMapsXCFrameworkDemos-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -665,52 +665,52 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - BA73613626137DC42014FB78 /* SampleListViewController.m in Sources */, - 9AF6133EC02D18478A765A37 /* StampedPolylinesViewController.m in Sources */, - 2D4DF9BA8681040C56871D0C /* PolygonsViewController.m in Sources */, - 27C833D0051EE01A62D72E6D /* AnimatedUIViewMarkerViewController.m in Sources */, - 2B1A661AD5A92691D40DFB45 /* MyLocationViewController.m in Sources */, - C061FEBFEC30872CE4E1115F /* CameraViewController.m in Sources */, - FA1F21360B3599591DE08CEC /* FixedPanoramaViewController.m in Sources */, - F4C0F4CAF678E634FFDC2874 /* VisibleRegionViewController.m in Sources */, - 736E5B9D3B6A5EA093098E3C /* CustomMarkersViewController.m in Sources */, - 6F51E9F4F3A97E2A819D5391 /* GestureControlViewController.m in Sources */, - FF99932AEF8EC85BAF3DAE2C /* StyledMapViewController.m in Sources */, - B95CEE8227843DC9B1B4FE90 /* PolylinesViewController.m in Sources */, - E46FCE2CFBECF392EFF1C2E1 /* TileLayerViewController.m in Sources */, - 59D329C3E2129D319A3F5E02 /* Samples.m in Sources */, - CDD28D9B701934C66483440D /* PanoramaViewController.m in Sources */, - 2D1E897C328DB9BE4D5F0862 /* PaddingBehaviorViewController.m in Sources */, - 0324323EAC31453D7EB3C13C /* MarkersViewController.m in Sources */, - 26F17F3876988498DF55E5DC /* DataDrivenStylingSearchViewController.m in Sources */, - 55E85678ABCDBBACDD9F17F4 /* TrafficMapViewController.m in Sources */, - 66D2F26A515EA964A99B24CF /* IndoorViewController.m in Sources */, - 50BE08939D11A331639F5B52 /* GeocoderViewController.m in Sources */, - 40CE3E31B6F2B9A77F4A1316 /* MapLayerViewController.m in Sources */, - CFD5879FAE1FA60A33D2FF10 /* MarkerLayerViewController.m in Sources */, - 6FD86F54848C1E2C5EBF811F /* FrameRateViewController.m in Sources */, - 62F41BCA6385140E4B0DCBB1 /* DarkModeViewController.m in Sources */, - 7A96B4EF4725546F8F0474F4 /* MapZoomViewController.m in Sources */, - B611137BA62573329F0B614F /* MapTypesViewController.m in Sources */, - D53B080367820AEF84AAE9C6 /* StructuredGeocoderViewController.m in Sources */, - C82960DC17765A83CB606325 /* AnimatedCurrentLocationViewController.m in Sources */, - CE059EA109369AB8C315CF28 /* DataDrivenStylingEventsViewController.m in Sources */, - 38AFB309C6691192B01E4AC3 /* CustomIndoorViewController.m in Sources */, - F03A1F6AEAB65D13EE615F03 /* BasicMapViewController.m in Sources */, - 5550925E38140ED30D937983 /* SnapshotReadyViewController.m in Sources */, - 8E511695B960687FD468F0B3 /* MarkerEventsViewController.m in Sources */, - 59B45A7D0B577292A15F2F88 /* IndoorMuseumNavigationViewController.m in Sources */, - 29DC71969C3E0D4079D19B1B /* MarkerInfoWindowViewController.m in Sources */, - ADF56D4802AB058F39CF5B05 /* DataDrivenStylingBasicViewController.m in Sources */, - 82B126FC49AA16BB55BE503C /* FitBoundsViewController.m in Sources */, - E3FDB4C4E10283017A47630F /* GradientPolylinesViewController.m in Sources */, - F7D15CCCB54CCE8D600C6993 /* DoubleMapViewController.m in Sources */, - 996BD6DC39E242433C900876 /* GroundOverlayViewController.m in Sources */, - 564C343FD1D21BF37818DBAB /* UIViewController+GMSModals.m in Sources */, - 6CBE2501B899E79C259C2906 /* GMSNotCapturingTouchesTableView.m in Sources */, - D2DCF040BB97BB53182DC580 /* main.m in Sources */, - FEB9B0F39AAD4BA24155ADA1 /* DemoAppDelegate.m in Sources */, - AC3ACA46D2C8BB787F6411D8 /* DemoSceneDelegate.m in Sources */, + D83B0FBBB32568EF8DECDF33 /* SampleListViewController.m in Sources */, + C35BA57EE13B0877E95B55AD /* StampedPolylinesViewController.m in Sources */, + 2F2B2DC73539539BF875CCEE /* PolygonsViewController.m in Sources */, + 051FA03F837BB90440AEE34E /* AnimatedUIViewMarkerViewController.m in Sources */, + 52761865916B0064436F9F4E /* MyLocationViewController.m in Sources */, + C18A079F312B93B9DAB12158 /* CameraViewController.m in Sources */, + DD974F1ABFF8450FBBBB3742 /* FixedPanoramaViewController.m in Sources */, + DF5F0EB6B5FFC0A5872C15AF /* VisibleRegionViewController.m in Sources */, + 5C4C0F3621976571BD024DC4 /* CustomMarkersViewController.m in Sources */, + A859E1604D1C4F40827CC0B4 /* GestureControlViewController.m in Sources */, + FCEC3C8EA094C86DEBB96047 /* StyledMapViewController.m in Sources */, + E559F48361616010C0003C53 /* PolylinesViewController.m in Sources */, + 1A7AF3B8C6F1EDB4D04CF32B /* TileLayerViewController.m in Sources */, + 34CCFD3E329A934A8446CB11 /* Samples.m in Sources */, + 0CD2B3358D83FC2D18C7B392 /* PanoramaViewController.m in Sources */, + 57DD9EBC5FA7A6C46182DD83 /* PaddingBehaviorViewController.m in Sources */, + FD4CAAE4A350A4CA7B491EA5 /* MarkersViewController.m in Sources */, + 227B1C6AE5E6EBDE88D0182F /* DataDrivenStylingSearchViewController.m in Sources */, + FF2E837A04F0F30DBF33C3CF /* TrafficMapViewController.m in Sources */, + 7356C5DC9F5B6D75902F57B0 /* IndoorViewController.m in Sources */, + 62AE8C9E9AC40B18B9CC9BD6 /* GeocoderViewController.m in Sources */, + 45FEDCC2B730CB78EC433A69 /* MapLayerViewController.m in Sources */, + 9E7C432A0510AED39C367FF0 /* MarkerLayerViewController.m in Sources */, + 9FE037D9C2C7451C66C17DD8 /* FrameRateViewController.m in Sources */, + 96ACBC4CEF968B9983F8C8E3 /* DarkModeViewController.m in Sources */, + C0A9F48DA40146F8ACE60260 /* MapZoomViewController.m in Sources */, + F26B4632C862F306E840D79E /* MapTypesViewController.m in Sources */, + 2F8C755E5471FB68757A7110 /* StructuredGeocoderViewController.m in Sources */, + 8BD8B95E966B13C25010A77C /* AnimatedCurrentLocationViewController.m in Sources */, + 5FC2E4AAF3D9E3FB240E36B6 /* DataDrivenStylingEventsViewController.m in Sources */, + E7C1583317AEA0F5E91215DE /* CustomIndoorViewController.m in Sources */, + 5D23C574616C7873DA18293D /* BasicMapViewController.m in Sources */, + 0E926BCA32C38FEDA05B21D4 /* SnapshotReadyViewController.m in Sources */, + 34A57A22DFFDDF0310E1B4C5 /* MarkerEventsViewController.m in Sources */, + 0DF6F5BBAA95B41F213BDF3F /* IndoorMuseumNavigationViewController.m in Sources */, + FDC0C74C3105C083DFD1246C /* MarkerInfoWindowViewController.m in Sources */, + 199B95BE0BBB60F6AC842A94 /* DataDrivenStylingBasicViewController.m in Sources */, + 05C5E507B2E36986E0112E06 /* FitBoundsViewController.m in Sources */, + 230249F05438C47497343E98 /* GradientPolylinesViewController.m in Sources */, + B134E5FE4D82EFB7E994F8C6 /* DoubleMapViewController.m in Sources */, + EC00DF9D4783BAF660DCC0AF /* GroundOverlayViewController.m in Sources */, + 9587E563986653A82C5CAA02 /* UIViewController+GMSModals.m in Sources */, + E3D96E6AADA4210153FF9B3D /* GMSNotCapturingTouchesTableView.m in Sources */, + 8B89C92CD4558B657EA7E912 /* main.m in Sources */, + 314B807E33EAF523DB2D8570 /* DemoAppDelegate.m in Sources */, + 2F67125D69D28B6E0E7042F5 /* DemoSceneDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -728,7 +728,7 @@ }; F9B4FA0FAFB2D015072B6DB9 /* Default */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 71FA451CC319136D84A0530A /* Pods-GoogleMapsXCFrameworkDemos.default.xcconfig */; + baseConfigurationReference = 6D1274A1AF8E25662185D498 /* Pods-GoogleMapsXCFrameworkDemos.default.xcconfig */; buildSettings = { "ARCHS[sdk=iphonesimulator*]" = ( x86_64, diff --git a/GoogleMaps/GoogleMapsXCFrameworkDemos/Samples/IndoorMuseumNavigationViewController.m b/GoogleMaps/GoogleMapsXCFrameworkDemos/Samples/IndoorMuseumNavigationViewController.m index f9e5042d..4bcd603f 100755 --- a/GoogleMaps/GoogleMapsXCFrameworkDemos/Samples/IndoorMuseumNavigationViewController.m +++ b/GoogleMaps/GoogleMapsXCFrameworkDemos/Samples/IndoorMuseumNavigationViewController.m @@ -86,6 +86,9 @@ - (void)viewDidLoad { - (void)moveMarker { CLLocationCoordinate2D loc = CLLocationCoordinate2DMake([_exhibit[@"lat"] doubleValue], [_exhibit[@"lng"] doubleValue]); + [_mapView animateToLocation:loc]; + [_mapView animateToZoom:19]; + if (_marker == nil) { _marker = [GMSMarker markerWithPosition:loc]; _marker.map = _mapView; @@ -93,8 +96,6 @@ - (void)moveMarker { _marker.position = loc; } _marker.title = _exhibit[@"name"]; - [_mapView animateToLocation:loc]; - [_mapView animateToZoom:19]; } - (void)exhibitSelected:(UISegmentedControl *)segmentedControl { diff --git a/GoogleMaps/Podfile b/GoogleMaps/Podfile index 454919fa..594940aa 100755 --- a/GoogleMaps/Podfile +++ b/GoogleMaps/Podfile @@ -1,8 +1,8 @@ -source 'https://cdn.cocoapods.org/' +source 'https://github.com/CocoaPods/Specs.git' platform :ios, '15.0' target 'GoogleMapsXCFrameworkDemos' do project 'GoogleMapsXCFrameworkDemos' - pod 'GoogleMaps', '= 9.1.0' -end \ No newline at end of file + pod 'GoogleMaps', '= 9.2.0' +end diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos.xcodeproj/project.pbxproj b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos.xcodeproj/project.pbxproj index fc7da5ce..3d03d4e5 100644 --- a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos.xcodeproj/project.pbxproj +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos.xcodeproj/project.pbxproj @@ -7,28 +7,30 @@ objects = { /* Begin PBXBuildFile section */ + 038A02EFD4E9E9E6B9214812 /* RoutingOptionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42FB69B214FB18F5A67B950 /* RoutingOptionsViewController.swift */; }; + 15840D6EDEE91AAEB23EDD4B /* NavigationUIOptionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69E1261DEA6032884F8DBF79 /* NavigationUIOptionsViewController.swift */; }; 173AA08724831C31A790FF35 /* sdkdemos_icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = F707B406E5F6163D4F9A91B4 /* sdkdemos_icon-72.png */; }; + 1F0732683A6A599F14EFCE51 /* DirectionsListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B441347187E627E16933337D /* DirectionsListViewController.swift */; }; + 36A01C632CFF773859084295 /* DataBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B0037238B773A4A26F4B5DE /* DataBackViewController.swift */; }; 3A92A5973B714428EFD75CBE /* sdkdemos_icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17C85CE7271EB1D14BFD7782 /* sdkdemos_icon-72@2x.png */; }; + 49D133D6F625195FC8521780 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE5E48DA228BB59860ACE23 /* UIKit.framework */; }; 4EEE3524457DE349E3DD37F0 /* Samples.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1617FDDABDC70DD453461D77 /* Samples.swift */; }; 54A7283DE1892D3D78736CAF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77538FBE427713CB816C755A /* AppDelegate.swift */; }; + 5A21420C97BBC6E893196CDB /* libPods-GoogleNavSwiftXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 24548A46F9E842A5C09A36CB /* libPods-GoogleNavSwiftXCFrameworkDemos.a */; }; + 5A294265D3EFC4B371C9EDE4 /* NavigationSessionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 297A8A512BD957DC1626C57C /* NavigationSessionViewController.swift */; }; 629711051AE66BD0F8D5D108 /* sdkdemos_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 821EB50DDBB1FEB45F54B146 /* sdkdemos_icon@2x.png */; }; 6BD4DBC8C93ACDF7F882B8AD /* CarPlayApplicationSceneInformationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA6BDD380853B13035AE4B7 /* CarPlayApplicationSceneInformationController.swift */; }; - 6CE928428FF1B34702CB2482 /* GMSRouteStatus+CustomString.swift in Sources */ = {isa = PBXBuildFile; fileRef = C990BA4E907B27C466CA96C8 /* GMSRouteStatus+CustomString.swift */; }; - 6FBDDFC62156A3D092118BAA /* DataBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B0037238B773A4A26F4B5DE /* DataBackViewController.swift */; }; - 733F016776FD961655D5FEF8 /* BaseSampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CFEE69AB9CBD4876EAB882 /* BaseSampleViewController.swift */; }; 745E78FEA809A2965D74B2CD /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A78AA50DA7CCEEDA35CD2E59 /* SceneDelegate.swift */; }; - 848FFC1BE25FF366AB204583 /* libPods-GoogleNavSwiftXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 72F7BD70321935A126562419 /* libPods-GoogleNavSwiftXCFrameworkDemos.a */; }; - 87DC471D87A0792166F4DBEE /* NavigationUIOptionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69E1261DEA6032884F8DBF79 /* NavigationUIOptionsViewController.swift */; }; - 9FC729F6A3AD91E17640FC76 /* StopoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4819E459253950DAE6A0D537 /* StopoverViewController.swift */; }; - A230D8CF5162269A40537BD9 /* DirectionsListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B441347187E627E16933337D /* DirectionsListViewController.swift */; }; + 7A474626032F5671D1FC58C2 /* BasicNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B46CD816554630041C1D32E /* BasicNavigationViewController.swift */; }; + 7CB38CAD1A37353EE91306EB /* NavDemoSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BE955240EDADAE394FFC0CA /* NavDemoSwitch.swift */; }; + 84BAF0969B29D3CBF17895DA /* StopoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4819E459253950DAE6A0D537 /* StopoverViewController.swift */; }; + AAC874534B8F30AD4E7A5E31 /* SideOfRoadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F12CE7B597AC6A1DCF7896F1 /* SideOfRoadViewController.swift */; }; + AF157D5A0FD4C291AF3B87BD /* MenuUIHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0163BD5B9A1B07873BF1AFF3 /* MenuUIHelpers.swift */; }; AFA47ED7ABA843986B2225B2 /* SDKDemoAPIKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9F4F5EC505BBD6A25B59E4E /* SDKDemoAPIKey.swift */; }; - B0E91027DE6A82A0778AFB3A /* SideOfRoadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F12CE7B597AC6A1DCF7896F1 /* SideOfRoadViewController.swift */; }; - B82519995D61986A2460DD28 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE5E48DA228BB59860ACE23 /* UIKit.framework */; }; - C7814F92B5575AB36490AADB /* BasicNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B46CD816554630041C1D32E /* BasicNavigationViewController.swift */; }; - D2E2EC3FD35D573A36A65555 /* MenuUIHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0163BD5B9A1B07873BF1AFF3 /* MenuUIHelpers.swift */; }; E1261AC6CA73CE535A6883F5 /* sdkdemos_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = E7E2098C9338CCEA5019C68E /* sdkdemos_icon.png */; }; - F475E1DC06C168207372E745 /* RoutingOptionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42FB69B214FB18F5A67B950 /* RoutingOptionsViewController.swift */; }; + F07CA9640BD3841B8A959C79 /* BaseSampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CFEE69AB9CBD4876EAB882 /* BaseSampleViewController.swift */; }; F56132BC998B765F6233F232 /* SampleListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D56C0322BA0AE65C91FC3E1 /* SampleListViewController.swift */; }; + F72E96CF8D8E9CF22663C3E0 /* GMSRouteStatus+CustomString.swift in Sources */ = {isa = PBXBuildFile; fileRef = C990BA4E907B27C466CA96C8 /* GMSRouteStatus+CustomString.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -36,13 +38,15 @@ 0B0037238B773A4A26F4B5DE /* DataBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBackViewController.swift; sourceTree = ""; }; 1617FDDABDC70DD453461D77 /* Samples.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Samples.swift; sourceTree = ""; }; 17C85CE7271EB1D14BFD7782 /* sdkdemos_icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sdkdemos_icon-72@2x.png"; sourceTree = ""; }; - 2CD1EDDC20CB620322DBAC69 /* Pods-GoogleNavSwiftXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleNavSwiftXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleNavSwiftXCFrameworkDemos/Pods-GoogleNavSwiftXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; + 24548A46F9E842A5C09A36CB /* libPods-GoogleNavSwiftXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleNavSwiftXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 297A8A512BD957DC1626C57C /* NavigationSessionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationSessionViewController.swift; sourceTree = ""; }; 2D56C0322BA0AE65C91FC3E1 /* SampleListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleListViewController.swift; sourceTree = ""; }; 3BA6BDD380853B13035AE4B7 /* CarPlayApplicationSceneInformationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayApplicationSceneInformationController.swift; sourceTree = ""; }; 4819E459253950DAE6A0D537 /* StopoverViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopoverViewController.swift; sourceTree = ""; }; + 4FE059D982007E9FBCD283F5 /* Pods-GoogleNavSwiftXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleNavSwiftXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleNavSwiftXCFrameworkDemos/Pods-GoogleNavSwiftXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; 5CE5E48DA228BB59860ACE23 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 69E1261DEA6032884F8DBF79 /* NavigationUIOptionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationUIOptionsViewController.swift; sourceTree = ""; }; - 72F7BD70321935A126562419 /* libPods-GoogleNavSwiftXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleNavSwiftXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6BE955240EDADAE394FFC0CA /* NavDemoSwitch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavDemoSwitch.swift; sourceTree = ""; }; 77538FBE427713CB816C755A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AED462B824D8CF459C3A820 /* GoogleNavSwiftXCFrameworkDemos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoogleNavSwiftXCFrameworkDemos.app; sourceTree = BUILT_PRODUCTS_DIR; }; 821EB50DDBB1FEB45F54B146 /* sdkdemos_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sdkdemos_icon@2x.png"; sourceTree = ""; }; @@ -63,8 +67,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B82519995D61986A2460DD28 /* UIKit.framework in Frameworks */, - 848FFC1BE25FF366AB204583 /* libPods-GoogleNavSwiftXCFrameworkDemos.a in Frameworks */, + 49D133D6F625195FC8521780 /* UIKit.framework in Frameworks */, + 5A21420C97BBC6E893196CDB /* libPods-GoogleNavSwiftXCFrameworkDemos.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -79,23 +83,41 @@ path = CarPlay; sourceTree = ""; }; - 1AC6BD76C9C91945209B37D7 /* Frameworks */ = { + 1BF4C93FD285F583BD375BD4 = { isa = PBXGroup; children = ( - 5CE5E48DA228BB59860ACE23 /* UIKit.framework */, - 72F7BD70321935A126562419 /* libPods-GoogleNavSwiftXCFrameworkDemos.a */, + A881143985DFC468E50E55CD /* Source */, + 7E8BB36B8A95BCCD0943D0C8 /* Frameworks */, + 77AB0A863C92B414E22C212E /* Products */, + 7B843019290B4C4950654280 /* Pods */, ); - name = Frameworks; sourceTree = ""; }; - 1BF4C93FD285F583BD375BD4 = { + 39B15B32426E2A4F7F1BC17D /* Utils */ = { isa = PBXGroup; children = ( - A881143985DFC468E50E55CD /* Source */, - 1AC6BD76C9C91945209B37D7 /* Frameworks */, - 77AB0A863C92B414E22C212E /* Products */, - 82B136E876CB89CFEA3EC6B9 /* Pods */, + 6BE955240EDADAE394FFC0CA /* NavDemoSwitch.swift */, + ); + path = Utils; + sourceTree = ""; + }; + 3BF6237C3BB7D227BBBF1ADD /* Samples */ = { + isa = PBXGroup; + children = ( + 39B15B32426E2A4F7F1BC17D /* Utils */, + 97CFEE69AB9CBD4876EAB882 /* BaseSampleViewController.swift */, + 9B46CD816554630041C1D32E /* BasicNavigationViewController.swift */, + 0B0037238B773A4A26F4B5DE /* DataBackViewController.swift */, + B441347187E627E16933337D /* DirectionsListViewController.swift */, + C990BA4E907B27C466CA96C8 /* GMSRouteStatus+CustomString.swift */, + 0163BD5B9A1B07873BF1AFF3 /* MenuUIHelpers.swift */, + 297A8A512BD957DC1626C57C /* NavigationSessionViewController.swift */, + 69E1261DEA6032884F8DBF79 /* NavigationUIOptionsViewController.swift */, + C42FB69B214FB18F5A67B950 /* RoutingOptionsViewController.swift */, + F12CE7B597AC6A1DCF7896F1 /* SideOfRoadViewController.swift */, + 4819E459253950DAE6A0D537 /* StopoverViewController.swift */, ); + path = Samples; sourceTree = ""; }; 77AB0A863C92B414E22C212E /* Products */ = { @@ -106,20 +128,29 @@ name = Products; sourceTree = ""; }; - 82B136E876CB89CFEA3EC6B9 /* Pods */ = { + 7B843019290B4C4950654280 /* Pods */ = { isa = PBXGroup; children = ( - 2CD1EDDC20CB620322DBAC69 /* Pods-GoogleNavSwiftXCFrameworkDemos.default.xcconfig */, + 4FE059D982007E9FBCD283F5 /* Pods-GoogleNavSwiftXCFrameworkDemos.default.xcconfig */, ); name = Pods; path = Pods; sourceTree = ""; }; + 7E8BB36B8A95BCCD0943D0C8 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 5CE5E48DA228BB59860ACE23 /* UIKit.framework */, + 24548A46F9E842A5C09A36CB /* libPods-GoogleNavSwiftXCFrameworkDemos.a */, + ); + name = Frameworks; + sourceTree = ""; + }; 8A23E6011C6A2E32B082EA0B /* Swift */ = { isa = PBXGroup; children = ( 1340D54303F2BBF2727D2920 /* CarPlay */, - EC4365F9BC21671BD0F2F233 /* Samples */, + 3BF6237C3BB7D227BBBF1ADD /* Samples */, 77538FBE427713CB816C755A /* AppDelegate.swift */, A9F4F5EC505BBD6A25B59E4E /* SDKDemoAPIKey.swift */, 2D56C0322BA0AE65C91FC3E1 /* SampleListViewController.swift */, @@ -150,23 +181,6 @@ path = Resources/Images; sourceTree = ""; }; - EC4365F9BC21671BD0F2F233 /* Samples */ = { - isa = PBXGroup; - children = ( - 97CFEE69AB9CBD4876EAB882 /* BaseSampleViewController.swift */, - 9B46CD816554630041C1D32E /* BasicNavigationViewController.swift */, - 0B0037238B773A4A26F4B5DE /* DataBackViewController.swift */, - B441347187E627E16933337D /* DirectionsListViewController.swift */, - C990BA4E907B27C466CA96C8 /* GMSRouteStatus+CustomString.swift */, - 0163BD5B9A1B07873BF1AFF3 /* MenuUIHelpers.swift */, - 69E1261DEA6032884F8DBF79 /* NavigationUIOptionsViewController.swift */, - C42FB69B214FB18F5A67B950 /* RoutingOptionsViewController.swift */, - F12CE7B597AC6A1DCF7896F1 /* SideOfRoadViewController.swift */, - 4819E459253950DAE6A0D537 /* StopoverViewController.swift */, - ); - path = Samples; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -174,11 +188,11 @@ isa = PBXNativeTarget; buildConfigurationList = B74174651F6063BC55B20C23 /* Build configuration list for PBXNativeTarget "GoogleNavSwiftXCFrameworkDemos" */; buildPhases = ( - D360F9C373ECB84F3E26AE46 /* [CP] Check Pods Manifest.lock */, + 80BD9AB368CF71C9C7FEB462 /* [CP] Check Pods Manifest.lock */, A615EB11588E44CCF0E6D13B /* Resources */, 4CD2D071AD5D684951B4F799 /* Sources */, 8A1AA5E42F3D67C5755252E5 /* Frameworks */, - 1AC5CD76ECD2E23AA91CD36E /* [CP] Copy Pods Resources */, + EA5F5EBCC244573573AACE47 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -229,7 +243,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1AC5CD76ECD2E23AA91CD36E /* [CP] Copy Pods Resources */ = { + 80BD9AB368CF71C9C7FEB462 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -237,23 +251,21 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GoogleNavSwiftXCFrameworkDemos/Pods-GoogleNavSwiftXCFrameworkDemos-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/GoogleNavigation/GoogleNavigationResources.bundle", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( ); outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleNavigationResources.bundle", + "$(DERIVED_FILE_DIR)/Pods-GoogleNavSwiftXCFrameworkDemos-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleNavSwiftXCFrameworkDemos/Pods-GoogleNavSwiftXCFrameworkDemos-resources.sh\"\n"; + 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; }; - D360F9C373ECB84F3E26AE46 /* [CP] Check Pods Manifest.lock */ = { + EA5F5EBCC244573573AACE47 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -261,18 +273,20 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", + "${PODS_ROOT}/Target Support Files/Pods-GoogleNavSwiftXCFrameworkDemos/Pods-GoogleNavSwiftXCFrameworkDemos-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/GoogleNavigation/GoogleNavigationResources.bundle", ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-GoogleNavSwiftXCFrameworkDemos-checkManifestLockResult.txt", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleNavigationResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleNavSwiftXCFrameworkDemos/Pods-GoogleNavSwiftXCFrameworkDemos-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -283,16 +297,18 @@ buildActionMask = 2147483647; files = ( 6BD4DBC8C93ACDF7F882B8AD /* CarPlayApplicationSceneInformationController.swift in Sources */, - A230D8CF5162269A40537BD9 /* DirectionsListViewController.swift in Sources */, - 733F016776FD961655D5FEF8 /* BaseSampleViewController.swift in Sources */, - 9FC729F6A3AD91E17640FC76 /* StopoverViewController.swift in Sources */, - 6CE928428FF1B34702CB2482 /* GMSRouteStatus+CustomString.swift in Sources */, - F475E1DC06C168207372E745 /* RoutingOptionsViewController.swift in Sources */, - D2E2EC3FD35D573A36A65555 /* MenuUIHelpers.swift in Sources */, - 6FBDDFC62156A3D092118BAA /* DataBackViewController.swift in Sources */, - B0E91027DE6A82A0778AFB3A /* SideOfRoadViewController.swift in Sources */, - 87DC471D87A0792166F4DBEE /* NavigationUIOptionsViewController.swift in Sources */, - C7814F92B5575AB36490AADB /* BasicNavigationViewController.swift in Sources */, + 1F0732683A6A599F14EFCE51 /* DirectionsListViewController.swift in Sources */, + F07CA9640BD3841B8A959C79 /* BaseSampleViewController.swift in Sources */, + 84BAF0969B29D3CBF17895DA /* StopoverViewController.swift in Sources */, + 7CB38CAD1A37353EE91306EB /* NavDemoSwitch.swift in Sources */, + F72E96CF8D8E9CF22663C3E0 /* GMSRouteStatus+CustomString.swift in Sources */, + 5A294265D3EFC4B371C9EDE4 /* NavigationSessionViewController.swift in Sources */, + 038A02EFD4E9E9E6B9214812 /* RoutingOptionsViewController.swift in Sources */, + AF157D5A0FD4C291AF3B87BD /* MenuUIHelpers.swift in Sources */, + 36A01C632CFF773859084295 /* DataBackViewController.swift in Sources */, + AAC874534B8F30AD4E7A5E31 /* SideOfRoadViewController.swift in Sources */, + 15840D6EDEE91AAEB23EDD4B /* NavigationUIOptionsViewController.swift in Sources */, + 7A474626032F5671D1FC58C2 /* BasicNavigationViewController.swift in Sources */, F56132BC998B765F6233F232 /* SampleListViewController.swift in Sources */, 4EEE3524457DE349E3DD37F0 /* Samples.swift in Sources */, 54A7283DE1892D3D78736CAF /* AppDelegate.swift in Sources */, @@ -306,7 +322,7 @@ /* Begin XCBuildConfiguration section */ 7AB2FEFD1D26E09B00EEEAEE /* Default */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2CD1EDDC20CB620322DBAC69 /* Pods-GoogleNavSwiftXCFrameworkDemos.default.xcconfig */; + baseConfigurationReference = 4FE059D982007E9FBCD283F5 /* Pods-GoogleNavSwiftXCFrameworkDemos.default.xcconfig */; buildSettings = { "ARCHS[sdk=iphonesimulator*]" = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/AppDelegate.swift b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/AppDelegate.swift index de2a1797..45b9cb9c 100755 --- a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/AppDelegate.swift +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/AppDelegate.swift @@ -14,14 +14,13 @@ import GoogleNavigation import UIKit -@UIApplicationMain +@main class AppDelegate: UIResponder, UIApplicationDelegate { func application( _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { GMSServices.provideAPIKey(apiKey) - GMSServices.setMetalRendererEnabled(true) return true } diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples.swift b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples.swift index efc0faec..40453fce 100755 --- a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples.swift +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples.swift @@ -50,6 +50,8 @@ enum Samples { Sample(viewControllerClass: StopoverViewController.self, title: "Stopover"), Sample(viewControllerClass: NavigationUIOptionsViewController.self, title: "UI Options"), Sample(viewControllerClass: DataBackViewController.self, title: "Data Back"), + Sample( + viewControllerClass: NavigationSessionViewController.self, title: "Navigation Session"), ] var sections = [ diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/BasicNavigationViewController.swift b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/BasicNavigationViewController.swift index 818296d6..c89a5721 100755 --- a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/BasicNavigationViewController.swift +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/BasicNavigationViewController.swift @@ -31,7 +31,7 @@ class BasicNavigationViewController: UIViewController { }() private lazy var mapView: GMSMapView = { - let mapView = GMSMapView(frame: .zero) + let mapView = GMSMapView() mapView.isNavigationEnabled = true mapView.settings.compassButton = true mapView.delegate = self diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/DataBackViewController.swift b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/DataBackViewController.swift index 1279dfd6..041dae24 100755 --- a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/DataBackViewController.swift +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/DataBackViewController.swift @@ -23,7 +23,7 @@ import UIKit class DataBackViewController: BaseSampleViewController { /// The main map view. private lazy var mapView: GMSMapView = { - let mapView = GMSMapView(frame: .zero) + let mapView = GMSMapView() mapView.isNavigationEnabled = true mapView.settings.compassButton = true mapView.delegate = self @@ -195,7 +195,10 @@ class DataBackViewController: BaseSampleViewController { /// Continues to the next destination in a multi-waypoint route. @objc private func continueToNextWaypoint() { - mapView.navigator?.continueToNextDestination() + if !waypoints.isEmpty { + waypoints.removeFirst() + requestRoute() + } } /// Starts simulating along the current route. diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/MenuUIHelpers.swift b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/MenuUIHelpers.swift index 444a5040..5f964ed5 100755 --- a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/MenuUIHelpers.swift +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/MenuUIHelpers.swift @@ -13,7 +13,7 @@ import UIKit -typealias TargetActionPair = (target: Any, action: Selector) +typealias TargetActionPair = (target: Any?, action: Selector) /// Helper functions for creating UI elements to add to a menu. This provides common functionality /// for samples and does not demonstrate any significant functionality of Google Navigation SDK. @@ -103,29 +103,6 @@ enum MenuUIHelpers { return makeStackView(axis: .vertical, arrangedSubviews: [titleLabel, segmentedControl]) } - /// Makes a `UISwitch` with the given options suitable for use in a menu. - /// - /// - Parameters: - /// - title: An optional title set for a label to the left of the switch. Defaults to nil. - /// - targetActionPair: Set as the switch's target/action for the `.valueChanged` event. - /// - Returns: If `title` is present, returns a `UIStackView` with a label to the left of the - /// switch. Otherwise returns just the switch. - static func makeSwitch( - title: String? = nil, - onValueChanged targetActionPair: TargetActionPair - ) -> UIView { - let switchElement = UISwitch() - switchElement.addTarget( - targetActionPair.target, action: targetActionPair.action, for: .valueChanged) - - guard let title = title else { return switchElement } - - let titleLabel = makeLabel(text: title) - let stackView = makeStackView(arrangedSubviews: [titleLabel, switchElement]) - stackView.distribution = .fill - return stackView - } - /// Makes a `UITextField` with the given options suitable for use in a menu. /// /// - Parameters: diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/NavigationSessionViewController.swift b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/NavigationSessionViewController.swift new file mode 100755 index 00000000..8efb1a96 --- /dev/null +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/NavigationSessionViewController.swift @@ -0,0 +1,312 @@ +/// Copyright 2024 Google LLC. All rights reserved. +/// +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this +/// file except in compliance with the License. You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software distributed under +/// the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF +/// ANY KIND, either express or implied. See the License for the specific language governing +/// permissions and limitations under the License. + +import GoogleNavigation +import UIKit + +/// A view that displays information about the current navigation session. +class NavigationSessionView: UIView { + private lazy var label: UILabel = { + let label = UILabel() + label.translatesAutoresizingMaskIntoConstraints = false + label.numberOfLines = 2 + label.textColor = .lightText + label.lineBreakMode = .byWordWrapping + return label + }() + + private var navigator: GMSNavigator + private lazy var timeFormatter = DateComponentsFormatter() + private var navInfo: GMSNavigationNavInfo? + + init(frame: CGRect, navigator: GMSNavigator) { + self.navigator = navigator + super.init(frame: frame) + + navigator.add(self) + self.backgroundColor = UIColor(red: 0.0, green: 0.15, blue: 0.35, alpha: 1) + + addSubview(label) + + NSLayoutConstraint.activate([ + label.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor), + label.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor), + label.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor), + self.heightAnchor.constraint(equalToConstant: 100), + ]) + label.text = labelText() + } + + func labelText() -> String { + guard navigator.isGuidanceActive else { return "Guidance not active" } + + let remainingTime = navigator.timeToNextDestination + let remainingDistance = navigator.distanceToNextDestination + let remainingTimeString = timeFormatter.string(from: remainingTime) ?? "" + let remainingDistanceString = String(format: "%.1f", remainingDistance) + var displayText = + "Next stop Time: \(remainingTimeString) Distance: \(remainingDistanceString) m\n" + if let fullInstructionText = navInfo?.currentStep?.fullInstructionText { + displayText += fullInstructionText + } + return displayText + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } +} + +extension NavigationSessionView: GMSNavigatorListener { + func navigator(_ navigator: GMSNavigator, didArriveAt waypoint: GMSNavigationWaypoint) { + label.text = labelText() + } + + func navigator(_ navigator: GMSNavigator, didUpdateRemainingTime time: TimeInterval) { + label.text = labelText() + } + + func navigator(_ navigator: GMSNavigator, didUpdateRemainingDistance distance: CLLocationDistance) + { + label.text = labelText() + } + + func navigator(_ navigator: GMSNavigator, didUpdate navInfo: GMSNavigationNavInfo) { + self.navInfo = navInfo + label.text = labelText() + } + + func navigatorDidChangeRoute(_ navigator: GMSNavigator) { + label.text = labelText() + } +} + +class NavigationSessionViewController: BaseSampleViewController { + + // The navigation session for this demo. + private lazy var navigationSession: GMSNavigationSession? = { + let navigationSession = GMSNavigationServices.createNavigationSession() + if let navigationSession = navigationSession { + navigationSession.isStarted = true + } + return navigationSession + }() + + private lazy var navigator: GMSNavigator? = { + guard let navigationSession = navigationSession, let navigator = navigationSession.navigator + else { return nil } + navigator.add(self) + navigator.voiceGuidance = .silent + navigator.sendsBackgroundNotifications = false + return navigator + }() + + // The main map view. + private lazy var mapView: GMSMapView = { + let mapView = GMSMapView(frame: .zero) + mapView.delegate = self + mapView.isNavigationEnabled = false + mapView.overrideUserInterfaceStyle = .unspecified + mapView.isMyLocationEnabled = true + mapView.settings.compassButton = true + mapView.settings.showsDestinationMarkers = true + mapView.cameraMode = .overview + + if let navigationSession = navigationSession { + mapView.enableNavigation(with: navigationSession) + } + return mapView + }() + + private lazy var turnByTurnNavigationSwitch: NavDemoSwitch = { + let turnByTurnNavigationSwitch = NavDemoSwitch( + title: "Turn-by-turn Navigation", + onValueChanged: (target: self, action: #selector(turnByTurnNavigationChanged))) + return turnByTurnNavigationSwitch + }() + + private lazy var guidanceActiveSwitch: NavDemoSwitch = { + let guidanceActiveSwitch = NavDemoSwitch( + title: "Guidance Active", + onValueChanged: (target: self, action: #selector(guidanceActiveChanged))) + return guidanceActiveSwitch + }() + + private lazy var simulationPausedSwitch: NavDemoSwitch = { + let simulationPausedSwitch = NavDemoSwitch( + title: "Simulation Paused", + onValueChanged: (target: self, action: #selector(simulationPausedChanged))) + return simulationPausedSwitch + }() + + private lazy var voiceGuidanceSwitch: NavDemoSwitch = { + let voiceGuidanceSwitch = NavDemoSwitch( + title: "Voice Guidance", + onValueChanged: (target: self, action: #selector(voiceGuidanceChanged))) + return voiceGuidanceSwitch + }() + + var waypoints: [GMSNavigationWaypoint] = [] + + override func viewDidLoad() { + super.viewDidLoad() + + if let navigator = navigator { + let navigationSessionView = NavigationSessionView(frame: .zero, navigator: navigator) + self.primaryStackView.addArrangedSubview(navigationSessionView) + } + self.primaryStackView.addArrangedSubview(mapView) + + addMenuSubview( + MenuUIHelpers.makeStackView(arrangedSubviews: [ + MenuUIHelpers.makeMenuButton( + title: "Continue to next waypoint", + onTouchUpInside: (target: self, action: #selector(continueToNextWaypoint))), + MenuUIHelpers.makeMenuButton( + title: "Clear all", + onTouchUpInside: (target: self, action: #selector(clearDestinations))), + ]) + ) + + addMenuSubview(turnByTurnNavigationSwitch) + addMenuSubview(guidanceActiveSwitch) + addMenuSubview(simulationPausedSwitch) + addMenuSubview(voiceGuidanceSwitch) + addMenuSubview( + MenuUIHelpers.makeSegmentedControl( + title: "Simulated travel speed multiplier", + segmentTitles: ["1x", "2x", "5x", "10x", "20x"], + onValueChanged: (target: self, action: #selector(simulationSpeedMultiplierChanged)))) + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillAppear(animated) + stopNavigation() + } + + @objc private func continueToNextWaypoint() { + guard let navigator = navigator else { return } + navigator.setDestinations(waypoints) { [weak self] routeStatus in + self?.handleRouteCallbackWithStatus(routeStatus) + } + updateControls() + } + + private func handleRouteCallbackWithStatus(_ routeStatus: GMSRouteStatus) { + switch routeStatus { + case .OK: + startNavigation() + default: + print("Error setting destinations: \(routeStatus)") + } + } + + @objc private func clearDestinations() { + waypoints.removeAll() + mapView.clear() + navigationSession?.navigator?.clearDestinations() + stopNavigation() + } + + @objc func turnByTurnNavigationChanged(sender: UISwitch) { + sender.isOn ? startNavigation() : stopNavigation() + updateControls() + } + + @objc func guidanceActiveChanged(sender: UISwitch) { + guard let navigator = navigator else { return } + navigator.isGuidanceActive = sender.isOn + } + + @objc func simulationPausedChanged(sender: UISwitch) { + guard let navigationSession = navigationSession, + let locationSimulator = navigationSession.locationSimulator + else { return } + locationSimulator.isPaused = sender.isOn + } + + @objc func voiceGuidanceChanged(sender: UISwitch) { + guard let navigator = navigator else { return } + navigator.voiceGuidance = sender.isOn ? .alertsAndGuidance : .silent + } + + @objc func simulationSpeedMultiplierChanged(sender: UISegmentedControl) { + guard let navigationSession = navigationSession, + let locationSimulator = navigationSession.locationSimulator + else { return } + + let speedMultiplierArray: [Float] = [1.0, 2.0, 5.0, 10.0, 20.0] + let speedMultiplier = speedMultiplierArray[sender.selectedSegmentIndex] + locationSimulator.speedMultiplier = speedMultiplier + } + + private func startNavigation() { + guard let navigationSession = navigationSession, + let locationSimulator = navigationSession.locationSimulator, let navigator = navigator + else { return } + mapView.isMyLocationEnabled = false + mapView.enableNavigation(with: navigationSession) + navigationSession.locationSimulator?.simulateLocationsAlongExistingRoute() + updateControls() + } + + private func stopNavigation() { + guard let navigationSession = navigationSession, + let locationSimulator = navigationSession.locationSimulator, let navigator = navigator + else { return } + mapView.cameraMode = .overview + mapView.isNavigationEnabled = false + mapView.isMyLocationEnabled = true + updateControls() + } + + func updateControls() { + guard let navigationSession = navigationSession, let navigator = navigator, + let locationSimulator = navigationSession.locationSimulator + else { return } + turnByTurnNavigationSwitch.isOn = mapView.isNavigationEnabled + guidanceActiveSwitch.isOn = navigator.isGuidanceActive + simulationPausedSwitch.isOn = locationSimulator.isPaused + voiceGuidanceSwitch.isOn = navigator.voiceGuidance != .silent + } + +} + +extension NavigationSessionViewController: GMSNavigatorListener { + func navigator(_ navigator: GMSNavigator, didArriveAt waypoint: GMSNavigationWaypoint) { + stopNavigation() + } +} + +extension NavigationSessionViewController: GMSMapViewDelegate { + func mapView(_ mapView: GMSMapView, didTapAt coordinate: CLLocationCoordinate2D) { + guard let navigationSession = navigationSession, let navigator = navigationSession.navigator + else { return } + + guard !navigator.isGuidanceActive else { + // Can't edit route while navigating + return + } + + let marker = GMSMarker(position: coordinate) + marker.map = mapView + + guard let waypoint = GMSNavigationWaypoint(location: coordinate, title: "Waypoint") else { + return + } + waypoints.append(waypoint) + + updateControls() + + } +} diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/NavigationUIOptionsViewController.swift b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/NavigationUIOptionsViewController.swift index 49bb0db9..f26de97b 100755 --- a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/NavigationUIOptionsViewController.swift +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/NavigationUIOptionsViewController.swift @@ -36,7 +36,7 @@ class NavigationUIOptionsViewController: BaseSampleViewController { /// The main map view. private lazy var mapView: GMSMapView = { - let mapView = GMSMapView(frame: .zero) + let mapView = GMSMapView() mapView.isNavigationEnabled = true mapView.cameraMode = .following mapView.settings.compassButton = true @@ -177,7 +177,7 @@ class NavigationUIOptionsViewController: BaseSampleViewController { // Add a switch to toggle auto follow mode. addMenuSubview( - MenuUIHelpers.makeSwitch( + NavDemoSwitch( title: "Auto follow mode", onValueChanged: (target: self, action: #selector(autoFollowModeSwitchDidUpdate)))) @@ -189,27 +189,36 @@ class NavigationUIOptionsViewController: BaseSampleViewController { onValueChanged: (target: self, action: #selector(mapViewModeControlDidUpdate))) ) + // Add segmented control to adjust frame rate. + addMenuSubview( + MenuUIHelpers.makeSegmentedControl( + title: "Frame Rate", + segmentTitles: ["PowerSave", "Conservative", "Maximum"], + onValueChanged: (target: self, action: #selector(frameRateControlDidUpdate)), + selectedSegmentIndex: 2) + ) + // Add a switch to toggle custom header colors. addMenuSubview( - MenuUIHelpers.makeSwitch( + NavDemoSwitch( title: "Customized header", onValueChanged: (target: self, action: #selector(customizedHeaderSwitchDidUpdate)))) // Add a switch to toggle fullscreen. addMenuSubview( - MenuUIHelpers.makeSwitch( + NavDemoSwitch( title: "Fullscreen", onValueChanged: (target: self, action: #selector(fullscreenSwitchDidUpdate)))) // Add a switch to toggle the header accessory view. addMenuSubview( - MenuUIHelpers.makeSwitch( + NavDemoSwitch( title: "Header accessory view", onValueChanged: (target: self, action: #selector(headerAccessoryViewSwitchDidUpdate)))) // Add a switch to toggle accessibility on mapView elements. addMenuSubview( - MenuUIHelpers.makeSwitch( + NavDemoSwitch( title: "Hide accessibility elements", onValueChanged: ( target: self, action: #selector(accessibilitySwitchDidUpdate) @@ -250,7 +259,10 @@ class NavigationUIOptionsViewController: BaseSampleViewController { /// Continues to the next destination in a multi-waypoint route. @objc private func continueToNextWaypoint() { - mapView.navigator?.continueToNextDestination() + if !waypoints.isEmpty { + waypoints.removeFirst() + requestRoute() + } } /// Starts simulating along the current route. @@ -377,6 +389,19 @@ class NavigationUIOptionsViewController: BaseSampleViewController { } } + @objc private func frameRateControlDidUpdate(_ segmentedControl: UISegmentedControl) { + switch segmentedControl.selectedSegmentIndex { + case 0: + mapView.preferredFrameRate = .powerSave + case 1: + mapView.preferredFrameRate = .conservative + case 2: + mapView.preferredFrameRate = .maximum + default: + mapView.preferredFrameRate = .maximum + } + } + /// Updates the navigation bar for fullscreen. @objc private func fullscreenSwitchDidUpdate(_ sender: UISwitch) { navigationController?.setNavigationBarHidden(sender.isOn, animated: true) diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/RoutingOptionsViewController.swift b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/RoutingOptionsViewController.swift index f156c4cd..37e8a96e 100755 --- a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/RoutingOptionsViewController.swift +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/RoutingOptionsViewController.swift @@ -50,7 +50,7 @@ class RoutingOptionsViewController: BaseSampleViewController { /// The main map view. private lazy var mapView: GMSMapView = { - let mapView = GMSMapView(frame: .zero) + let mapView = GMSMapView() mapView.isNavigationEnabled = true mapView.settings.compassButton = true mapView.delegate = self @@ -64,6 +64,9 @@ class RoutingOptionsViewController: BaseSampleViewController { } } + /// The last type of waypoint destination(s) that was used in this sample. + private var lastDestinationType: DestinationType = .custom + /// Displays instructions for the current destination type. private lazy var destinationTypeInstructionLabel: UILabel = { let label = MenuUIHelpers.makeLabel(text: destinationType.instructionText) @@ -76,39 +79,7 @@ class RoutingOptionsViewController: BaseSampleViewController { private var customWaypoints = [GMSNavigationWaypoint]() /// Returns the waypoints for the current destination type. - private var currentWaypoints: [GMSNavigationWaypoint] { - // Hard-coded waypoints like this would normally be rare, but they are used here to demonstrate - // the different ways to create a waypoint. - switch destinationType { - case .custom: - return customWaypoints - case .coordinate: - if let ohloneCollege = GMSNavigationWaypoint( - location: CLLocationCoordinate2DMake(37.529032, -121.918846), - title: "Ohlone College") - { - return [ohloneCollege] - } - case .placeID: - if let paramountTheatre = GMSNavigationWaypoint( - placeID: "ChIJI2TVmK2Aj4ARxVVzT6uIQMw", - title: "Paramount Theatre, Oakland") - { - return [paramountTheatre] - } - case .multi: - if let ohloneCollege = GMSNavigationWaypoint( - location: CLLocationCoordinate2DMake(37.529032, -121.918846), - title: "Ohlone College"), - let paramountTheatre = GMSNavigationWaypoint( - placeID: "ChIJI2TVmK2Aj4ARxVVzT6uIQMw", - title: "Paramount Theatre, Oakland") - { - return [ohloneCollege, paramountTheatre] - } - } - return [] - } + private var currentWaypoints = [GMSNavigationWaypoint]() /// Receives a target distance from the user. private lazy var targetDistanceTextField: UITextField = { @@ -188,13 +159,13 @@ class RoutingOptionsViewController: BaseSampleViewController { // Add an avoid highways switch. addMenuSubview( - MenuUIHelpers.makeSwitch( + NavDemoSwitch( title: "Avoid highways", onValueChanged: (target: self, action: #selector(avoidHighwaysSwitchDidUpdate)))) // Add an avoid tolls switch. addMenuSubview( - MenuUIHelpers.makeSwitch( + NavDemoSwitch( title: "Avoid tolls", onValueChanged: (target: self, action: #selector(avoidTollsSwitchDidUpdate)))) @@ -217,13 +188,51 @@ class RoutingOptionsViewController: BaseSampleViewController { onValueChanged: (target: self, action: #selector(alternateRoutesStrategyControlDidUpdate)))) } + private func createWaypoints() -> [GMSNavigationWaypoint] { + switch destinationType { + case .custom: + return customWaypoints + case .coordinate: + if let ohloneCollege = GMSNavigationWaypoint( + location: CLLocationCoordinate2DMake(37.529032, -121.918846), + title: "Ohlone College") + { + return [ohloneCollege] + } + case .placeID: + if let paramountTheatre = GMSNavigationWaypoint( + placeID: "ChIJI2TVmK2Aj4ARxVVzT6uIQMw", + title: "Paramount Theatre, Oakland") + { + return [paramountTheatre] + } + case .multi: + if let ohloneCollege = GMSNavigationWaypoint( + location: CLLocationCoordinate2DMake(37.529032, -121.918846), + title: "Ohlone College"), + let paramountTheatre = GMSNavigationWaypoint( + placeID: "ChIJI2TVmK2Aj4ARxVVzT6uIQMw", + title: "Paramount Theatre, Oakland") + { + return [ohloneCollege, paramountTheatre] + } + } + return [] + } + // MARK: - Menu handlers /// Requests a route with the selected destination type, travel mode and options. @objc private func requestRoute() { - // Clear any custom markers first to reduce clutter on the map. - if destinationType == .custom { - mapView.clear() + // If the destination type has changed, create new waypoints. + if lastDestinationType != destinationType || currentWaypoints.isEmpty { + currentWaypoints = createWaypoints() + lastDestinationType = destinationType + } + + // If the destination type is custom and new waypoints were created, update the custom waypoints + if destinationType == .custom && !customWaypoints.isEmpty { + currentWaypoints = customWaypoints } // Set the routing options target distance if `.deltaToTargetDistance` is the routing strategy. if routingOptions.routingStrategy == .deltaToTargetDistance @@ -238,6 +247,7 @@ class RoutingOptionsViewController: BaseSampleViewController { // Clear previous destinations and set the new destinations. let navigator = mapView.navigator + clearRoute() navigator?.clearDestinations() navigator?.setDestinations(currentWaypoints, routingOptions: routingOptions) { routeStatus in self.handleRouteCallback(with: routeStatus) @@ -249,8 +259,8 @@ class RoutingOptionsViewController: BaseSampleViewController { mapView.navigator?.clearDestinations() if destinationType == .custom { customWaypoints.removeAll() - mapView.clear() } + mapView.clear() mapView.cameraMode = .following } @@ -267,7 +277,14 @@ class RoutingOptionsViewController: BaseSampleViewController { /// Continues to the next destination in a multi-waypoint route. @objc private func continueToNextWaypoint() { - mapView.navigator?.continueToNextDestination() + if !currentWaypoints.isEmpty { + currentWaypoints.removeFirst() + if currentWaypoints.isEmpty { + clearRoute() + } else { + requestRoute() + } + } } /// Starts simulating along the current route. diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/SideOfRoadViewController.swift b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/SideOfRoadViewController.swift index d0eedcbd..89f39a48 100755 --- a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/SideOfRoadViewController.swift +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/SideOfRoadViewController.swift @@ -88,7 +88,7 @@ class SideOfRoadViewController: BaseSampleViewController { private let options: [DestinationWaypoint] = DestinationWaypoint.allCases private lazy var mapView: GMSMapView = { - let mapView = GMSMapView(frame: .zero) + let mapView = GMSMapView() mapView.isNavigationEnabled = true mapView.cameraMode = .following mapView.settings.isRecenterButtonEnabled = false diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/StopoverViewController.swift b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/StopoverViewController.swift index 467a9e67..9ebffd29 100755 --- a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/StopoverViewController.swift +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/StopoverViewController.swift @@ -91,7 +91,10 @@ class StopoverViewController: BaseSampleViewController { private lazy var mapView: GMSMapView = { let camera = GMSCameraPosition(latitude: 1.295720, longitude: 103.848683, zoom: 13) - let mapView = GMSMapView(frame: .zero, camera: camera) + let options = GMSMapViewOptions() + options.camera = camera + options.frame = .zero + let mapView = GMSMapView(options: options) mapView.isNavigationEnabled = true mapView.cameraMode = .following mapView.settings.isRecenterButtonEnabled = true @@ -127,7 +130,7 @@ class StopoverViewController: BaseSampleViewController { // Add a stopover switch. addMenuSubview( - MenuUIHelpers.makeSwitch( + NavDemoSwitch( title: "Vehicle Stopover", onValueChanged: (target: self, action: #selector(updateVehicleStopover)))) diff --git a/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/Utils/NavDemoSwitch.swift b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/Utils/NavDemoSwitch.swift new file mode 100755 index 00000000..aa3398d8 --- /dev/null +++ b/GoogleNavigation-Swift/GoogleNavSwiftXCFrameworkDemos/Swift/Samples/Utils/NavDemoSwitch.swift @@ -0,0 +1,76 @@ +/// Copyright 2024 Google LLC. All rights reserved. +/// +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this +/// file except in compliance with the License. You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software distributed under +/// the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF +/// ANY KIND, either express or implied. See the License for the specific language governing +/// permissions and limitations under the License. + +import UIKit + +/// A switch with a title label on the left hand side and the switch on the right hand side. +class NavDemoSwitch: UIView { + private let control = UISwitch() + private var titleLabel: UILabel + private var textColor: UIColor + + /// The state of the switch. + var isOn: Bool { + get { control.isOn } + set { control.isOn = newValue } + } + + /// Whether the switch is enabled. + var isEnabled: Bool { + didSet { + guard oldValue != isEnabled else { return } + control.isEnabled = isEnabled + titleLabel.textColor = isEnabled ? textColor : .lightGray + } + } + + /// Creates a switch with the given options. + /// + /// - Parameters: + /// - title: The title which appears on the left hand side of the switch. + /// - textColor: The text color of the title. Defaults to `.black`. + /// - initialState: The initial state of the switch. Defaults to `false`. + /// - onValueChanged: The target/action pair for the `.valueChanged` event. + init( + title: String?, textColor: UIColor = .black, initialState: Bool = false, + onValueChanged targetActionPair: TargetActionPair + ) { + self.titleLabel = MenuUIHelpers.makeLabel(text: title ?? "") + self.textColor = textColor + self.isEnabled = true + + super.init(frame: .zero) + + titleLabel.textColor = textColor + + let stackView = MenuUIHelpers.makeStackView(arrangedSubviews: [titleLabel, control]) + stackView.translatesAutoresizingMaskIntoConstraints = false + stackView.distribution = .fill + addSubview(stackView) + + control.isOn = initialState + control.addTarget( + targetActionPair.target, action: targetActionPair.action, for: .valueChanged) + + addConstraints([ + stackView.leadingAnchor.constraint(equalTo: leadingAnchor), + stackView.trailingAnchor.constraint(equalTo: trailingAnchor), + stackView.topAnchor.constraint(equalTo: topAnchor), + stackView.bottomAnchor.constraint(equalTo: bottomAnchor), + ]) + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } +} diff --git a/GoogleNavigation-Swift/Podfile b/GoogleNavigation-Swift/Podfile index b2fb1f1f..16d914b3 100755 --- a/GoogleNavigation-Swift/Podfile +++ b/GoogleNavigation-Swift/Podfile @@ -1,8 +1,8 @@ -source 'https://cdn.cocoapods.org/' +source 'https://github.com/CocoaPods/Specs.git' platform :ios, '15.0' target 'GoogleNavSwiftXCFrameworkDemos' do project 'GoogleNavSwiftXCFrameworkDemos' - pod 'GoogleNavigation', '= 9.1.0' -end \ No newline at end of file + pod 'GoogleNavigation', '= 9.2.0' +end diff --git a/GoogleNavigation/GoogleNavXCFrameworkDemos.xcodeproj/project.pbxproj b/GoogleNavigation/GoogleNavXCFrameworkDemos.xcodeproj/project.pbxproj index fbbd8073..b52b8222 100644 --- a/GoogleNavigation/GoogleNavXCFrameworkDemos.xcodeproj/project.pbxproj +++ b/GoogleNavigation/GoogleNavXCFrameworkDemos.xcodeproj/project.pbxproj @@ -7,31 +7,31 @@ objects = { /* Begin PBXBuildFile section */ - 00657192363D06BBA881F3C8 /* CarPlayApplicationSceneInformationController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3A0C7592AD54B2D557710DB /* CarPlayApplicationSceneInformationController.m */; }; - 158D73D048695418C2865884 /* sdkdemos_icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F8DDD2B79543F571E805D43 /* sdkdemos_icon-72.png */; }; - 15A91D9FE4A78E6F3777BEB0 /* libPods-GoogleNavXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 44698A06AED0CB84B3A68A15 /* libPods-GoogleNavXCFrameworkDemos.a */; }; - 1944F3C69C3B695109CC5E87 /* sdkdemos_icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BB5C8B75FB265857CFB94EA6 /* sdkdemos_icon-72@2x.png */; }; - 2142875F8C2C4C8074D974E6 /* NavUIOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F36DCD0EC7054003394401C /* NavUIOptionsViewController.m */; }; - 23F9E892EAC022D32A043AC0 /* CarPlayConnectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D902FF533856EA8D9446C718 /* CarPlayConnectionManager.m */; }; - 3A429F387E619A5A62A0AFC2 /* NavDemoSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = CD7DDB5B2710F88A1EB53E0D /* NavDemoSwitch.m */; }; - 4E5314345E616C3DB70E155C /* CarPlaySharedState.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D5D6F704B438C6D3A2D88 /* CarPlaySharedState.m */; }; - 5494F41098F8A89842574CFD /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AFE8B27CF8BEAE1312AE8CF2 /* BaseViewController.m */; }; - 550BE3FF5D3ABA62A44FEEA2 /* CarPlayApplicationSceneMapController.m in Sources */ = {isa = PBXBuildFile; fileRef = 25FD619C2CD1ACC6C7C8B604 /* CarPlayApplicationSceneMapController.m */; }; - 5DBCBF49F475BC715A7CA003 /* sdkdemos_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 4836DADDA512595EAC555860 /* sdkdemos_icon.png */; }; - 60208ABB784781DE6E4A10A9 /* sdkdemos_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DC2C0EF7A9F6BC5C7052728 /* sdkdemos_icon@2x.png */; }; - 77C44B3F2F8AAE25A5EBB869 /* SideOfRoadViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 25B30A281053A452C4B55262 /* SideOfRoadViewController.m */; }; - 89224EADB0E49F4A4F4A9ED5 /* StopoverViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CF807E07AB7A3FD8F18DD40 /* StopoverViewController.m */; }; - 8C7919A21F9C24CB35393A38 /* DemoData.m in Sources */ = {isa = PBXBuildFile; fileRef = AD1F97ED7BBC5D4DD681025F /* DemoData.m */; }; - 8E91E671E0E913ADC35D0520 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A40617BC84289457DB73DD /* main.m */; }; - 8F61236A6895BEA6B17D858E /* RoutingOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D8E485EFA67A5534BF0FEF /* RoutingOptionsViewController.m */; }; - 957577CA4F9769AFD2F63404 /* DirectionsListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C5CC57852047DA26DF23E2D0 /* DirectionsListViewController.m */; }; - A6D9BB48C4BFCE600132F0FB /* NavDemoStringUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = A233FED8279D37EEA1E71F1B /* NavDemoStringUtils.m */; }; - C03452882B5F94AE39583EAB /* NavDemoUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F36455A6DBFFB4C78AA516 /* NavDemoUtilities.m */; }; - C410B9EFDAA5200072B8C22A /* NavDemoSceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A56D6F758F2129BFD26AA2D /* NavDemoSceneDelegate.m */; }; - C46033E91CFF8AE46F97C1A2 /* NavDemoMasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 084D9E82BA740BD33E5B0151 /* NavDemoMasterViewController.m */; }; - CDE3172D415D26FD0F6FE299 /* NavDemoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A32E134551AD284FCE5CD5E6 /* NavDemoAppDelegate.m */; }; - EEBEDD79C24DAF71B0BA75D0 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E763D9FA7C37510F7290CD82 /* UIKit.framework */; }; - FE14CFA7529ADF2C10A7DCCF /* NavigationSessionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F4BA9B8A324892E7366A586 /* NavigationSessionViewController.m */; }; + 02DFC98DC5B99AB14BBB98C2 /* NavUIOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F36DCD0EC7054003394401C /* NavUIOptionsViewController.m */; }; + 1532BFCF77473A5CB627B228 /* CarPlayConnectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D902FF533856EA8D9446C718 /* CarPlayConnectionManager.m */; }; + 20EF05E1EEBEAC1848DBD01F /* NavDemoMasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 084D9E82BA740BD33E5B0151 /* NavDemoMasterViewController.m */; }; + 3252E1CB887B83E47DB61A32 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A40617BC84289457DB73DD /* main.m */; }; + 36AF6ECB8D4A1181149A678C /* DirectionsListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C5CC57852047DA26DF23E2D0 /* DirectionsListViewController.m */; }; + 40B4251794CE202D17277743 /* CarPlayApplicationSceneInformationController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3A0C7592AD54B2D557710DB /* CarPlayApplicationSceneInformationController.m */; }; + 4A33109B71EA1A7D620DABF7 /* sdkdemos_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 4836DADDA512595EAC555860 /* sdkdemos_icon.png */; }; + 536749681303DDC2474672A2 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AFE8B27CF8BEAE1312AE8CF2 /* BaseViewController.m */; }; + 5D6DE1ACFA824304D93D17D4 /* NavDemoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A32E134551AD284FCE5CD5E6 /* NavDemoAppDelegate.m */; }; + 604D4F29CE9CC700A9DFC326 /* CarPlaySharedState.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D5D6F704B438C6D3A2D88 /* CarPlaySharedState.m */; }; + 6CDD24F9C90F0319F47C97B9 /* NavigationSessionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F4BA9B8A324892E7366A586 /* NavigationSessionViewController.m */; }; + 72116940A8152AC34A73A020 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E763D9FA7C37510F7290CD82 /* UIKit.framework */; }; + 84027EA31EEE000AF496C5C2 /* StopoverViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CF807E07AB7A3FD8F18DD40 /* StopoverViewController.m */; }; + 85D41924D9A86C454CF36166 /* DemoData.m in Sources */ = {isa = PBXBuildFile; fileRef = AD1F97ED7BBC5D4DD681025F /* DemoData.m */; }; + 912063F347F6FE1706970F7F /* RoutingOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D8E485EFA67A5534BF0FEF /* RoutingOptionsViewController.m */; }; + 9CF67B7F0E2AAB1BACB5CC6D /* sdkdemos_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DC2C0EF7A9F6BC5C7052728 /* sdkdemos_icon@2x.png */; }; + A243FDE2BBE6D10A021DD971 /* SideOfRoadViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 25B30A281053A452C4B55262 /* SideOfRoadViewController.m */; }; + A8C074C588ADA4E14717D37E /* NavDemoSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = CD7DDB5B2710F88A1EB53E0D /* NavDemoSwitch.m */; }; + AE858C5F05D526DF404BBA34 /* libPods-GoogleNavXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 647BCC3E831C148EAB648F3E /* libPods-GoogleNavXCFrameworkDemos.a */; }; + C964FE5B1C46DD9918DB70BD /* NavDemoUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F36455A6DBFFB4C78AA516 /* NavDemoUtilities.m */; }; + D08099D3E5114AAC54F87476 /* sdkdemos_icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F8DDD2B79543F571E805D43 /* sdkdemos_icon-72.png */; }; + D549F86A31A49B2F13E5BCBF /* CarPlayApplicationSceneMapController.m in Sources */ = {isa = PBXBuildFile; fileRef = 25FD619C2CD1ACC6C7C8B604 /* CarPlayApplicationSceneMapController.m */; }; + DD1CB06E719001E0120D1D49 /* NavDemoSceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A56D6F758F2129BFD26AA2D /* NavDemoSceneDelegate.m */; }; + E6FF8DA5D08136C24F97E7DB /* NavDemoStringUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = A233FED8279D37EEA1E71F1B /* NavDemoStringUtils.m */; }; + FF4247DD5646A7A3397BD6FD /* sdkdemos_icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BB5C8B75FB265857CFB94EA6 /* sdkdemos_icon-72@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -39,6 +39,7 @@ 02DD0A79894CB80C7116449A /* NavDemoAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NavDemoAppDelegate.h; sourceTree = ""; }; 084D9E82BA740BD33E5B0151 /* NavDemoMasterViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NavDemoMasterViewController.m; sourceTree = ""; }; 0A87B6CDF4D943B44408EF37 /* SideOfRoadViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SideOfRoadViewController.h; sourceTree = ""; }; + 1456A67D6221D1291F54C1E4 /* Pods-GoogleNavXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleNavXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleNavXCFrameworkDemos/Pods-GoogleNavXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; 176845FEEE19C9FCF267F864 /* CarPlaySharedState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CarPlaySharedState.h; sourceTree = ""; }; 1CBA1B689139D71125C1E30A /* CarPlayConnectionManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CarPlayConnectionManager.h; sourceTree = ""; }; 1CF807E07AB7A3FD8F18DD40 /* StopoverViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StopoverViewController.m; sourceTree = ""; }; @@ -47,14 +48,13 @@ 25B30A281053A452C4B55262 /* SideOfRoadViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SideOfRoadViewController.m; sourceTree = ""; }; 25FD619C2CD1ACC6C7C8B604 /* CarPlayApplicationSceneMapController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CarPlayApplicationSceneMapController.m; sourceTree = ""; }; 2CB6220D21CE8A4F650D0180 /* NavDemoSceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NavDemoSceneDelegate.h; sourceTree = ""; }; - 44698A06AED0CB84B3A68A15 /* libPods-GoogleNavXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleNavXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 4836DADDA512595EAC555860 /* sdkdemos_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sdkdemos_icon.png; sourceTree = ""; }; 4A5D5D6F704B438C6D3A2D88 /* CarPlaySharedState.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CarPlaySharedState.m; sourceTree = ""; }; 54F36455A6DBFFB4C78AA516 /* NavDemoUtilities.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NavDemoUtilities.m; sourceTree = ""; }; - 5B5B0DF1478AF88B32D10830 /* Pods-GoogleNavXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleNavXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleNavXCFrameworkDemos/Pods-GoogleNavXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; 61756D44E565BCEDC00E182A /* CarPlayApplicationSceneMapController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CarPlayApplicationSceneMapController.h; sourceTree = ""; }; 6303534765661BB55FF3F3A6 /* GoogleNavXCFrameworkDemos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoogleNavXCFrameworkDemos.app; sourceTree = BUILT_PRODUCTS_DIR; }; 63CAAC192F777BDB7B936B71 /* NavDemoMasterViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NavDemoMasterViewController.h; sourceTree = ""; }; + 647BCC3E831C148EAB648F3E /* libPods-GoogleNavXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleNavXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 6DE214B652C358F5833431E2 /* NavDemoStringUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NavDemoStringUtils.h; sourceTree = ""; }; 6E6FF7AB2D7A0CA8FBE4AB17 /* RoutingOptionsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoutingOptionsViewController.h; sourceTree = ""; }; 6F4BA9B8A324892E7366A586 /* NavigationSessionViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NavigationSessionViewController.m; sourceTree = ""; }; @@ -89,31 +89,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - EEBEDD79C24DAF71B0BA75D0 /* UIKit.framework in Frameworks */, - 15A91D9FE4A78E6F3777BEB0 /* libPods-GoogleNavXCFrameworkDemos.a in Frameworks */, + 72116940A8152AC34A73A020 /* UIKit.framework in Frameworks */, + AE858C5F05D526DF404BBA34 /* libPods-GoogleNavXCFrameworkDemos.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0349670172CF54AE10FFC68A /* Pods */ = { - isa = PBXGroup; - children = ( - 5B5B0DF1478AF88B32D10830 /* Pods-GoogleNavXCFrameworkDemos.default.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; - 0613B693A3C5A371249EA119 /* Source */ = { - isa = PBXGroup; - children = ( - 1867F193549AA23B088B9696 /* GoogleNavXCFrameworkDemos */, - ); - name = Source; - sourceTree = ""; - }; 166B2755C7FC6BC7D82AC754 /* CarPlay */ = { isa = PBXGroup; children = ( @@ -172,11 +155,11 @@ name = Products; sourceTree = ""; }; - 5B668767C4CFE41B91D6AF3A /* Frameworks */ = { + 8F18D6CDDF08673078481559 /* Frameworks */ = { isa = PBXGroup; children = ( E763D9FA7C37510F7290CD82 /* UIKit.framework */, - 44698A06AED0CB84B3A68A15 /* libPods-GoogleNavXCFrameworkDemos.a */, + 647BCC3E831C148EAB648F3E /* libPods-GoogleNavXCFrameworkDemos.a */, ); name = Frameworks; sourceTree = ""; @@ -202,16 +185,33 @@ path = Samples; sourceTree = ""; }; + B470677EA4C249346CAB94B5 /* Pods */ = { + isa = PBXGroup; + children = ( + 1456A67D6221D1291F54C1E4 /* Pods-GoogleNavXCFrameworkDemos.default.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; B7350518DC55898D172116E6 = { isa = PBXGroup; children = ( - 0613B693A3C5A371249EA119 /* Source */, - 5B668767C4CFE41B91D6AF3A /* Frameworks */, + CCF2A973951044955059DB60 /* Source */, + 8F18D6CDDF08673078481559 /* Frameworks */, 1B10B8A58D78FBFBFCEC053E /* Products */, - 0349670172CF54AE10FFC68A /* Pods */, + B470677EA4C249346CAB94B5 /* Pods */, ); sourceTree = ""; }; + CCF2A973951044955059DB60 /* Source */ = { + isa = PBXGroup; + children = ( + 1867F193549AA23B088B9696 /* GoogleNavXCFrameworkDemos */, + ); + name = Source; + sourceTree = ""; + }; DD43B750EA39FB80B6513549 /* Images */ = { isa = PBXGroup; children = ( @@ -230,11 +230,11 @@ isa = PBXNativeTarget; buildConfigurationList = 6F7E204FCBBF8C27C00235CB /* Build configuration list for PBXNativeTarget "GoogleNavXCFrameworkDemos" */; buildPhases = ( - C70324283FD530D2B80E1979 /* [CP] Check Pods Manifest.lock */, + 908E6CF5EE769C79D75BDAFD /* [CP] Check Pods Manifest.lock */, 1E965DCF453CADBB767B7394 /* Resources */, 37E82AA33F0EA23DB75ECB21 /* Sources */, E6C45C348CA9B1BFF8CA2A5C /* Frameworks */, - F9524ACE46B57747F1DC0F3B /* [CP] Copy Pods Resources */, + D06C2829DAE237A4CB9DD247 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -275,17 +275,17 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 60208ABB784781DE6E4A10A9 /* sdkdemos_icon@2x.png in Resources */, - 5DBCBF49F475BC715A7CA003 /* sdkdemos_icon.png in Resources */, - 158D73D048695418C2865884 /* sdkdemos_icon-72.png in Resources */, - 1944F3C69C3B695109CC5E87 /* sdkdemos_icon-72@2x.png in Resources */, + 9CF67B7F0E2AAB1BACB5CC6D /* sdkdemos_icon@2x.png in Resources */, + 4A33109B71EA1A7D620DABF7 /* sdkdemos_icon.png in Resources */, + D08099D3E5114AAC54F87476 /* sdkdemos_icon-72.png in Resources */, + FF4247DD5646A7A3397BD6FD /* sdkdemos_icon-72@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - C70324283FD530D2B80E1979 /* [CP] Check Pods Manifest.lock */ = { + 908E6CF5EE769C79D75BDAFD /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -307,7 +307,7 @@ 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; }; - F9524ACE46B57747F1DC0F3B /* [CP] Copy Pods Resources */ = { + D06C2829DAE237A4CB9DD247 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -338,25 +338,25 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4E5314345E616C3DB70E155C /* CarPlaySharedState.m in Sources */, - 00657192363D06BBA881F3C8 /* CarPlayApplicationSceneInformationController.m in Sources */, - 550BE3FF5D3ABA62A44FEEA2 /* CarPlayApplicationSceneMapController.m in Sources */, - 23F9E892EAC022D32A043AC0 /* CarPlayConnectionManager.m in Sources */, - 8C7919A21F9C24CB35393A38 /* DemoData.m in Sources */, - C410B9EFDAA5200072B8C22A /* NavDemoSceneDelegate.m in Sources */, - 3A429F387E619A5A62A0AFC2 /* NavDemoSwitch.m in Sources */, - A6D9BB48C4BFCE600132F0FB /* NavDemoStringUtils.m in Sources */, - C03452882B5F94AE39583EAB /* NavDemoUtilities.m in Sources */, - 8F61236A6895BEA6B17D858E /* RoutingOptionsViewController.m in Sources */, - FE14CFA7529ADF2C10A7DCCF /* NavigationSessionViewController.m in Sources */, - 5494F41098F8A89842574CFD /* BaseViewController.m in Sources */, - 957577CA4F9769AFD2F63404 /* DirectionsListViewController.m in Sources */, - 77C44B3F2F8AAE25A5EBB869 /* SideOfRoadViewController.m in Sources */, - 2142875F8C2C4C8074D974E6 /* NavUIOptionsViewController.m in Sources */, - 89224EADB0E49F4A4F4A9ED5 /* StopoverViewController.m in Sources */, - C46033E91CFF8AE46F97C1A2 /* NavDemoMasterViewController.m in Sources */, - 8E91E671E0E913ADC35D0520 /* main.m in Sources */, - CDE3172D415D26FD0F6FE299 /* NavDemoAppDelegate.m in Sources */, + 604D4F29CE9CC700A9DFC326 /* CarPlaySharedState.m in Sources */, + 40B4251794CE202D17277743 /* CarPlayApplicationSceneInformationController.m in Sources */, + D549F86A31A49B2F13E5BCBF /* CarPlayApplicationSceneMapController.m in Sources */, + 1532BFCF77473A5CB627B228 /* CarPlayConnectionManager.m in Sources */, + 85D41924D9A86C454CF36166 /* DemoData.m in Sources */, + DD1CB06E719001E0120D1D49 /* NavDemoSceneDelegate.m in Sources */, + A8C074C588ADA4E14717D37E /* NavDemoSwitch.m in Sources */, + E6FF8DA5D08136C24F97E7DB /* NavDemoStringUtils.m in Sources */, + C964FE5B1C46DD9918DB70BD /* NavDemoUtilities.m in Sources */, + 912063F347F6FE1706970F7F /* RoutingOptionsViewController.m in Sources */, + 6CDD24F9C90F0319F47C97B9 /* NavigationSessionViewController.m in Sources */, + 536749681303DDC2474672A2 /* BaseViewController.m in Sources */, + 36AF6ECB8D4A1181149A678C /* DirectionsListViewController.m in Sources */, + A243FDE2BBE6D10A021DD971 /* SideOfRoadViewController.m in Sources */, + 02DFC98DC5B99AB14BBB98C2 /* NavUIOptionsViewController.m in Sources */, + 84027EA31EEE000AF496C5C2 /* StopoverViewController.m in Sources */, + 20EF05E1EEBEAC1848DBD01F /* NavDemoMasterViewController.m in Sources */, + 3252E1CB887B83E47DB61A32 /* main.m in Sources */, + 5D6DE1ACFA824304D93D17D4 /* NavDemoAppDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -365,7 +365,7 @@ /* Begin XCBuildConfiguration section */ 214A854AC87F74D9754516CB /* Default */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5B5B0DF1478AF88B32D10830 /* Pods-GoogleNavXCFrameworkDemos.default.xcconfig */; + baseConfigurationReference = 1456A67D6221D1291F54C1E4 /* Pods-GoogleNavXCFrameworkDemos.default.xcconfig */; buildSettings = { "ARCHS[sdk=iphonesimulator*]" = ( x86_64, diff --git a/GoogleNavigation/GoogleNavXCFrameworkDemos/CarPlay/CarPlayApplicationSceneMapController.h b/GoogleNavigation/GoogleNavXCFrameworkDemos/CarPlay/CarPlayApplicationSceneMapController.h index 6ba8c377..a35b9c27 100755 --- a/GoogleNavigation/GoogleNavXCFrameworkDemos/CarPlay/CarPlayApplicationSceneMapController.h +++ b/GoogleNavigation/GoogleNavXCFrameworkDemos/CarPlay/CarPlayApplicationSceneMapController.h @@ -28,6 +28,16 @@ NS_ASSUME_NONNULL_BEGIN bundle:(nullable NSBundle *)nibBundleOrNil NS_UNAVAILABLE; - (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE; +/** Initializes a view controller for the given controller and window. */ +- (instancetype)initWithWindow:(CPWindow *)window NS_DESIGNATED_INITIALIZER; + +/** + * Terminates the map controller. + * + * This method should be called when the map controller is no longer needed. + */ +- (void)terminate; + @end NS_ASSUME_NONNULL_END diff --git a/GoogleNavigation/GoogleNavXCFrameworkDemos/CarPlay/CarPlayApplicationSceneMapController.m b/GoogleNavigation/GoogleNavXCFrameworkDemos/CarPlay/CarPlayApplicationSceneMapController.m index 57a74cb8..c2e66150 100755 --- a/GoogleNavigation/GoogleNavXCFrameworkDemos/CarPlay/CarPlayApplicationSceneMapController.m +++ b/GoogleNavigation/GoogleNavXCFrameworkDemos/CarPlay/CarPlayApplicationSceneMapController.m @@ -135,8 +135,6 @@ @interface CarPlayApplicationSceneMapController () *_carPlayApplicationSceneController; // The map controller for the CarPlay application scene, if it is active. - NSObject *_carPlayApplicationSceneMapController; + CarPlayApplicationSceneMapController *_carPlayApplicationSceneMapController; } - (void)scene:(UIScene *)scene @@ -141,8 +141,8 @@ - (void)templateWillDisappear:(CPTemplate *)aTemplate animated:(BOOL)animated { - (void)setApplicationSceneControllerFromState:(CarPlaySharedState *)state { if (state.enabled && !_carPlayApplicationSceneMapController) { // Set map controller - _carPlayApplicationSceneMapController = [CarPlayApplicationSceneMapController - sceneControllerWithWindow:_carPlayApplicationSceneWindow]; + _carPlayApplicationSceneMapController = [[CarPlayApplicationSceneMapController alloc] + initWithWindow:_carPlayApplicationSceneWindow]; [_carPlayInterfaceController pushTemplate:_carPlayApplicationSceneMapController.carPlayTemplate animated:YES]; } else if (_carPlayApplicationSceneMapController && !state.enabled) { @@ -155,6 +155,7 @@ - (void)setApplicationSceneControllerFromState:(CarPlaySharedState *)state { } - (void)mapControllerDidPop { + [_carPlayApplicationSceneMapController terminate]; _carPlayApplicationSceneMapController = nil; } diff --git a/GoogleNavigation/GoogleNavXCFrameworkDemos/Samples/NavUIOptionsViewController.m b/GoogleNavigation/GoogleNavXCFrameworkDemos/Samples/NavUIOptionsViewController.m index 5a9cd498..a726c7b0 100755 --- a/GoogleNavigation/GoogleNavXCFrameworkDemos/Samples/NavUIOptionsViewController.m +++ b/GoogleNavigation/GoogleNavXCFrameworkDemos/Samples/NavUIOptionsViewController.m @@ -243,6 +243,14 @@ - (void)addControls { mapViewTypeControl.selectedSegmentIndex = 0; [controls addArrangedSubview:mapViewTypeControl]; + // Add a segmented control to select the frame rate. + UILabel *frameRateLabel = GMSNavigationCreateLabelWithText(@"Frame Rate"); + [controls addArrangedSubview:frameRateLabel]; + UISegmentedControl *frameRateSegmentedControl = GMSNavigationCreateSegmentedControl( + self, @selector(frameRateControlDidUpdate:), @[ @"PowerSave", @"Conservative", @"Maximum" ]); + frameRateSegmentedControl.selectedSegmentIndex = 2; + [controls addArrangedSubview:frameRateSegmentedControl]; + // Add a button to collapse the UI controls area to make the map occupy the full screen. UIButton *collapseButton = GMSNavigationCreateButton(self, @selector(toggleMenuCollapsed), @"Menu"); @@ -540,6 +548,23 @@ - (void)mapTypeControlDidUpdate:(UISegmentedControl *)mapTypeControl { _mapView.mapType = kMapViewTypeChoices[mapTypeControl.selectedSegmentIndex]; } +- (void)frameRateControlDidUpdate:(UISegmentedControl *)frameRateControl { + switch (frameRateControl.selectedSegmentIndex) { + case 0: + _mapView.preferredFrameRate = kGMSFrameRatePowerSave; + break; + case 1: + _mapView.preferredFrameRate = kGMSFrameRateConservative; + break; + case 2: + _mapView.preferredFrameRate = kGMSFrameRateMaximum; + break; + default: + _mapView.preferredFrameRate = kGMSFrameRateMaximum; + break; + } +} + #pragma mark - GMSNavigationListener /** Update header accessory view when distance is updated. */ diff --git a/GoogleNavigation/GoogleNavXCFrameworkDemos/Samples/NavigationSessionViewController.m b/GoogleNavigation/GoogleNavXCFrameworkDemos/Samples/NavigationSessionViewController.m index e4d910d2..7a69d8df 100755 --- a/GoogleNavigation/GoogleNavXCFrameworkDemos/Samples/NavigationSessionViewController.m +++ b/GoogleNavigation/GoogleNavXCFrameworkDemos/Samples/NavigationSessionViewController.m @@ -207,6 +207,10 @@ - (void)navigator:(GMSNavigator *)navigator didUpdateNavInfo:(GMSNavigationNavIn [self updateLabel]; } +- (void)navigatorDidChangeRoute:(GMSNavigator *)navigator { + [self updateLabel]; +} + @end /** The height of the control pane when it is expanded. */ diff --git a/GoogleNavigation/Podfile b/GoogleNavigation/Podfile index 3f76300f..623e15a4 100755 --- a/GoogleNavigation/Podfile +++ b/GoogleNavigation/Podfile @@ -1,8 +1,8 @@ -source 'https://cdn.cocoapods.org/' +source 'https://github.com/CocoaPods/Specs.git' platform :ios, '15.0' target 'GoogleNavXCFrameworkDemos' do project 'GoogleNavXCFrameworkDemos' - pod 'GoogleNavigation', '= 9.1.0' -end \ No newline at end of file + pod 'GoogleNavigation', '= 9.2.0' +end diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos.xcodeproj/project.pbxproj b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos.xcodeproj/project.pbxproj index 28a128ed..55a1718b 100644 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos.xcodeproj/project.pbxproj +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos.xcodeproj/project.pbxproj @@ -7,36 +7,34 @@ objects = { /* Begin PBXBuildFile section */ - 002B7F96ADBBF8A10292D6C2 /* AutocompleteWithCustomColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 563D4941D595A2D8071C38B8 /* AutocompleteWithCustomColors.swift */; }; - 00D2905E8CD38D8CBB0B817E /* AutocompleteWithSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D8861C513FC2BC10D039226 /* AutocompleteWithSearchViewController.swift */; }; - 10F81C70BCD05DC29F144311 /* SearchNearbyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AF23A080ACAC079774B18AD /* SearchNearbyViewController.swift */; }; + 0448B3B8914530569C61F248 /* SDKDemoAPIKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71537B8830D32387A144D0C8 /* SDKDemoAPIKey.swift */; }; + 051D1B3BE01FF42D3CC4F090 /* PagingPhotoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C643E09802D5CC8D7EAC413 /* PagingPhotoView.swift */; }; + 0D8DB832F522E0225FA23445 /* AutocompleteWithTextFieldController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 446EC90243A57C996C88E181 /* AutocompleteWithTextFieldController.swift */; }; 163CAC038A4C47EFACFD3EED /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 860821F808DE00F3F2C41100 /* LaunchScreen.storyboard */; }; - 16A0E92568541B55EC4D4576 /* SampleDatas.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2401DB52F6B5F816091B5674 /* SampleDatas.swift */; }; - 2D3A5A694315B344F421E6DF /* ConfigurationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2228243742AE431CD773B059 /* ConfigurationViewController.swift */; }; - 392EAD3941B01B7C2B428CB9 /* SampleListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD3C40418C17BF6821C2371A /* SampleListViewController.swift */; }; - 3DFE0466035B0A55ED3CD380 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA584F7C7438765EB3341653 /* AppDelegate.swift */; }; - 4C28FE2BA67D56490C75A722 /* AutocompletePushViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6477AC546B26D44B6FD672 /* AutocompletePushViewController.swift */; }; - 54B934E49A1D40D637915F51 /* SDKDemoAPIKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71537B8830D32387A144D0C8 /* SDKDemoAPIKey.swift */; }; - 645B39762D03CE7CF90B8944 /* AutocompleteWithTextFieldController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 446EC90243A57C996C88E181 /* AutocompleteWithTextFieldController.swift */; }; - 6830D93A49E0459030C6643D /* FindPlaceLikelihoodListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8744EA3F5765185DB0A59802 /* FindPlaceLikelihoodListViewController.swift */; }; - 707E567A197EEC517059F58F /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3BBD5FF66CC81C1F16B2B05 /* SceneDelegate.swift */; }; - 7FE5C10D9311819D60D5FC59 /* AutocompleteConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DD13DBA658B60B6DF4A0E97 /* AutocompleteConfiguration.swift */; }; + 210F703406AF6CD6A265F133 /* ConfigurationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2228243742AE431CD773B059 /* ConfigurationViewController.swift */; }; + 2BF4FB0428CC2EE8215EE216 /* FindPlaceLikelihoodListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8744EA3F5765185DB0A59802 /* FindPlaceLikelihoodListViewController.swift */; }; + 3718AE8D709A246C16325C0C /* SearchNearbyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AF23A080ACAC079774B18AD /* SearchNearbyViewController.swift */; }; + 45C3A281B4B667923A5A985A /* libPods-GooglePlacesSwiftXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B65B238AD7019F42803B1369 /* libPods-GooglePlacesSwiftXCFrameworkDemos.a */; }; + 5C91A875DF19521751B41C1C /* ParameterInputTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CE2DB8FA2E6A147F4B1DA62 /* ParameterInputTextField.swift */; }; + 5EB5310790D1F72AE6F4D699 /* TextSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8454B896AE929281F988F9B2 /* TextSearchViewController.swift */; }; + 73E6638027FB612EB4EEC387 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA584F7C7438765EB3341653 /* AppDelegate.swift */; }; + 7EA5ED00B1F99EDF664DE3DC /* AutocompleteConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DD13DBA658B60B6DF4A0E97 /* AutocompleteConfiguration.swift */; }; + 80A1C4CD3AB93692A787F1B3 /* AutocompletePushViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6477AC546B26D44B6FD672 /* AutocompletePushViewController.swift */; }; 867D2502D8072DC199AF23C3 /* PlacesDemoAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0D451149A2DC0DFAE4CE3BAB /* PlacesDemoAssets.xcassets */; }; - 8DC6568C9AE08B451F7123CC /* TextSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8454B896AE929281F988F9B2 /* TextSearchViewController.swift */; }; + 8AC6EAB5B102C3DF1E86F8B4 /* AutocompleteBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF5F62464464D53F52590E9 /* AutocompleteBaseViewController.swift */; }; + 8AFF4189AB3CD52968438C84 /* AutocompleteModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC98A1D9129B6ED7098B676 /* AutocompleteModalViewController.swift */; }; 9718115F592963B549EDB822 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F13D93FEB7B038D913CA425E /* UIKit.framework */; }; - AE87772AD730BE6467A10F90 /* libPods-GooglePlacesSwiftXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C835BDBA6FB7C6D2CC84369 /* libPods-GooglePlacesSwiftXCFrameworkDemos.a */; }; - B6C84665A25F7CEF43BFD8EE /* ParameterInputTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CE2DB8FA2E6A147F4B1DA62 /* ParameterInputTextField.swift */; }; - BBAAE465499A1FF6CCB5F24C /* AutocompleteBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DF5F62464464D53F52590E9 /* AutocompleteBaseViewController.swift */; }; - CDF4797C0C1F6281732AC8A1 /* PagingPhotoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C643E09802D5CC8D7EAC413 /* PagingPhotoView.swift */; }; - F3B74C7955F4849882E238B4 /* AutocompleteModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC98A1D9129B6ED7098B676 /* AutocompleteModalViewController.swift */; }; + 9B6B100B59BB0F6DD019E50D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3BBD5FF66CC81C1F16B2B05 /* SceneDelegate.swift */; }; + AF59768A35117D9F23FB1D9D /* AutocompleteWithSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D8861C513FC2BC10D039226 /* AutocompleteWithSearchViewController.swift */; }; + AFEDD16691A2651909318377 /* SampleListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD3C40418C17BF6821C2371A /* SampleListViewController.swift */; }; + D74BBA93ACEB62FC23CDC5F3 /* AutocompleteWithCustomColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 563D4941D595A2D8071C38B8 /* AutocompleteWithCustomColors.swift */; }; FC5E31297CBC337BD343815F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6A5C19E7C0FC76DDF1EB2294 /* Localizable.strings */; }; + FC75D4D66E80D6524ADF6872 /* SampleDatas.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2401DB52F6B5F816091B5674 /* SampleDatas.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 03183B2A6CCFF54942CDA6E4 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_GB; path = en_GB.lproj/Localizable.strings; sourceTree = ""; }; 06FC3F4B8E1F6A15CF2F691D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Localizable.strings; sourceTree = ""; }; - 0B8AE98ECC3729EDD3DC71FC /* Pods-GooglePlacesSwiftXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GooglePlacesSwiftXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GooglePlacesSwiftXCFrameworkDemos/Pods-GooglePlacesSwiftXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; - 0C835BDBA6FB7C6D2CC84369 /* libPods-GooglePlacesSwiftXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GooglePlacesSwiftXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 0CBB4859F736C186AB1E0F28 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = ""; }; 0D451149A2DC0DFAE4CE3BAB /* PlacesDemoAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = PlacesDemoAssets.xcassets; sourceTree = ""; }; 0DA539C4CADEAFB15C6D82E4 /* en_IN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_IN; path = en_IN.lproj/Localizable.strings; sourceTree = ""; }; @@ -65,6 +63,7 @@ 5C447E2F5EAAC648FD32B2A9 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = ""; }; 5CC98A1D9129B6ED7098B676 /* AutocompleteModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutocompleteModalViewController.swift; sourceTree = ""; }; 5F6720C65262715C9C69FCEF /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; + 62814E3541952ACA4497166C /* Pods-GooglePlacesSwiftXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GooglePlacesSwiftXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GooglePlacesSwiftXCFrameworkDemos/Pods-GooglePlacesSwiftXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; 68F38CE6D1F785AE471287E5 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Localizable.strings; sourceTree = ""; }; 6C643E09802D5CC8D7EAC413 /* PagingPhotoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PagingPhotoView.swift; sourceTree = ""; }; 71537B8830D32387A144D0C8 /* SDKDemoAPIKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKDemoAPIKey.swift; sourceTree = ""; }; @@ -79,6 +78,7 @@ 9DD13DBA658B60B6DF4A0E97 /* AutocompleteConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutocompleteConfiguration.swift; sourceTree = ""; }; A40955A3B44533C4D7E3B1F1 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; B20D6F1076DC9BA671CC6F21 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = ""; }; + B65B238AD7019F42803B1369 /* libPods-GooglePlacesSwiftXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GooglePlacesSwiftXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; BAD6EA34949E033B45B448EB /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt_PT; path = pt_PT.lproj/Localizable.strings; sourceTree = ""; }; BB9A042C293F474D6CD57062 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = ""; }; C00C28A2B3AF42269E8E4541 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = ""; }; @@ -107,7 +107,7 @@ buildActionMask = 2147483647; files = ( 9718115F592963B549EDB822 /* UIKit.framework in Frameworks */, - AE87772AD730BE6467A10F90 /* libPods-GooglePlacesSwiftXCFrameworkDemos.a in Frameworks */, + 45C3A281B4B667923A5A985A /* libPods-GooglePlacesSwiftXCFrameworkDemos.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -128,7 +128,7 @@ isa = PBXGroup; children = ( 22865F676B9AACA8C6CDB231 /* Resources */, - 8970BD707B3E5533FCE444D4 /* Swift */, + F8CE3BC158A45805F0E5B6FA /* Swift */, ); name = Source; path = GooglePlacesSwiftXCFrameworkDemos; @@ -165,28 +165,22 @@ path = Autocomplete; sourceTree = ""; }; - 8970BD707B3E5533FCE444D4 /* Swift */ = { + DEA91D8BC1276D5CB5B3E1D5 /* Frameworks */ = { isa = PBXGroup; children = ( - E8569FDEE9C5094EDD3F67E8 /* Samples */, - EA584F7C7438765EB3341653 /* AppDelegate.swift */, - 9DD13DBA658B60B6DF4A0E97 /* AutocompleteConfiguration.swift */, - 2228243742AE431CD773B059 /* ConfigurationViewController.swift */, - 71537B8830D32387A144D0C8 /* SDKDemoAPIKey.swift */, - 2401DB52F6B5F816091B5674 /* SampleDatas.swift */, - FD3C40418C17BF6821C2371A /* SampleListViewController.swift */, - F3BBD5FF66CC81C1F16B2B05 /* SceneDelegate.swift */, + F13D93FEB7B038D913CA425E /* UIKit.framework */, + B65B238AD7019F42803B1369 /* libPods-GooglePlacesSwiftXCFrameworkDemos.a */, ); - path = Swift; + name = Frameworks; sourceTree = ""; }; - DEA91D8BC1276D5CB5B3E1D5 /* Frameworks */ = { + E3FB95EFB775573D75E29A09 /* Pods */ = { isa = PBXGroup; children = ( - F13D93FEB7B038D913CA425E /* UIKit.framework */, - 0C835BDBA6FB7C6D2CC84369 /* libPods-GooglePlacesSwiftXCFrameworkDemos.a */, + 62814E3541952ACA4497166C /* Pods-GooglePlacesSwiftXCFrameworkDemos.default.xcconfig */, ); - name = Frameworks; + name = Pods; + path = Pods; sourceTree = ""; }; E4E93D53E474ADC3F3A80007 = { @@ -195,7 +189,7 @@ 3BE356C7B8EA2D335BE62F15 /* Source */, DEA91D8BC1276D5CB5B3E1D5 /* Frameworks */, 549C8A25D4E2B8F6370D4157 /* Products */, - F2D7E9A6FA688DD39A586F49 /* Pods */, + E3FB95EFB775573D75E29A09 /* Pods */, ); sourceTree = ""; }; @@ -210,13 +204,19 @@ path = Samples; sourceTree = ""; }; - F2D7E9A6FA688DD39A586F49 /* Pods */ = { + F8CE3BC158A45805F0E5B6FA /* Swift */ = { isa = PBXGroup; children = ( - 0B8AE98ECC3729EDD3DC71FC /* Pods-GooglePlacesSwiftXCFrameworkDemos.default.xcconfig */, + E8569FDEE9C5094EDD3F67E8 /* Samples */, + EA584F7C7438765EB3341653 /* AppDelegate.swift */, + 9DD13DBA658B60B6DF4A0E97 /* AutocompleteConfiguration.swift */, + 2228243742AE431CD773B059 /* ConfigurationViewController.swift */, + 71537B8830D32387A144D0C8 /* SDKDemoAPIKey.swift */, + 2401DB52F6B5F816091B5674 /* SampleDatas.swift */, + FD3C40418C17BF6821C2371A /* SampleListViewController.swift */, + F3BBD5FF66CC81C1F16B2B05 /* SceneDelegate.swift */, ); - name = Pods; - path = Pods; + path = Swift; sourceTree = ""; }; /* End PBXGroup section */ @@ -226,11 +226,11 @@ isa = PBXNativeTarget; buildConfigurationList = 68C7EDB6FC7C286E50CAA86F /* Build configuration list for PBXNativeTarget "GooglePlacesSwiftXCFrameworkDemos" */; buildPhases = ( - 50C804EA4B706FE408BAB062 /* [CP] Check Pods Manifest.lock */, + 987D22E1C47B2C57DD394B53 /* [CP] Check Pods Manifest.lock */, 8C88B9B5B6D62D34447A195C /* Resources */, 99374647C708D956928DBA68 /* Sources */, 04BD53FC58BA9623F59143B2 /* Frameworks */, - 8E58053D64B5D494848B0390 /* [CP] Copy Pods Resources */, + 1475D4A5D05874A94B979158 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -321,7 +321,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 50C804EA4B706FE408BAB062 /* [CP] Check Pods Manifest.lock */ = { + 1475D4A5D05874A94B979158 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -329,21 +329,21 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", + "${PODS_ROOT}/Target Support Files/Pods-GooglePlacesSwiftXCFrameworkDemos/Pods-GooglePlacesSwiftXCFrameworkDemos-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/GooglePlaces/GooglePlacesResources.bundle", ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-GooglePlacesSwiftXCFrameworkDemos-checkManifestLockResult.txt", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GooglePlacesResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GooglePlacesSwiftXCFrameworkDemos/Pods-GooglePlacesSwiftXCFrameworkDemos-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 8E58053D64B5D494848B0390 /* [CP] Copy Pods Resources */ = { + 987D22E1C47B2C57DD394B53 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -351,18 +351,18 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GooglePlacesSwiftXCFrameworkDemos/Pods-GooglePlacesSwiftXCFrameworkDemos-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/GooglePlaces/GooglePlacesResources.bundle", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( ); outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GooglePlacesResources.bundle", + "$(DERIVED_FILE_DIR)/Pods-GooglePlacesSwiftXCFrameworkDemos-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GooglePlacesSwiftXCFrameworkDemos/Pods-GooglePlacesSwiftXCFrameworkDemos-resources.sh\"\n"; + 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; }; /* End PBXShellScriptBuildPhase section */ @@ -372,24 +372,24 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 16A0E92568541B55EC4D4576 /* SampleDatas.swift in Sources */, - 2D3A5A694315B344F421E6DF /* ConfigurationViewController.swift in Sources */, - CDF4797C0C1F6281732AC8A1 /* PagingPhotoView.swift in Sources */, - BBAAE465499A1FF6CCB5F24C /* AutocompleteBaseViewController.swift in Sources */, - 002B7F96ADBBF8A10292D6C2 /* AutocompleteWithCustomColors.swift in Sources */, - 00D2905E8CD38D8CBB0B817E /* AutocompleteWithSearchViewController.swift in Sources */, - 645B39762D03CE7CF90B8944 /* AutocompleteWithTextFieldController.swift in Sources */, - F3B74C7955F4849882E238B4 /* AutocompleteModalViewController.swift in Sources */, - 4C28FE2BA67D56490C75A722 /* AutocompletePushViewController.swift in Sources */, - 6830D93A49E0459030C6643D /* FindPlaceLikelihoodListViewController.swift in Sources */, - 8DC6568C9AE08B451F7123CC /* TextSearchViewController.swift in Sources */, - B6C84665A25F7CEF43BFD8EE /* ParameterInputTextField.swift in Sources */, - 10F81C70BCD05DC29F144311 /* SearchNearbyViewController.swift in Sources */, - 392EAD3941B01B7C2B428CB9 /* SampleListViewController.swift in Sources */, - 3DFE0466035B0A55ED3CD380 /* AppDelegate.swift in Sources */, - 54B934E49A1D40D637915F51 /* SDKDemoAPIKey.swift in Sources */, - 707E567A197EEC517059F58F /* SceneDelegate.swift in Sources */, - 7FE5C10D9311819D60D5FC59 /* AutocompleteConfiguration.swift in Sources */, + FC75D4D66E80D6524ADF6872 /* SampleDatas.swift in Sources */, + 210F703406AF6CD6A265F133 /* ConfigurationViewController.swift in Sources */, + 051D1B3BE01FF42D3CC4F090 /* PagingPhotoView.swift in Sources */, + 8AC6EAB5B102C3DF1E86F8B4 /* AutocompleteBaseViewController.swift in Sources */, + D74BBA93ACEB62FC23CDC5F3 /* AutocompleteWithCustomColors.swift in Sources */, + AF59768A35117D9F23FB1D9D /* AutocompleteWithSearchViewController.swift in Sources */, + 0D8DB832F522E0225FA23445 /* AutocompleteWithTextFieldController.swift in Sources */, + 8AFF4189AB3CD52968438C84 /* AutocompleteModalViewController.swift in Sources */, + 80A1C4CD3AB93692A787F1B3 /* AutocompletePushViewController.swift in Sources */, + 2BF4FB0428CC2EE8215EE216 /* FindPlaceLikelihoodListViewController.swift in Sources */, + 5EB5310790D1F72AE6F4D699 /* TextSearchViewController.swift in Sources */, + 5C91A875DF19521751B41C1C /* ParameterInputTextField.swift in Sources */, + 3718AE8D709A246C16325C0C /* SearchNearbyViewController.swift in Sources */, + AFEDD16691A2651909318377 /* SampleListViewController.swift in Sources */, + 73E6638027FB612EB4EEC387 /* AppDelegate.swift in Sources */, + 0448B3B8914530569C61F248 /* SDKDemoAPIKey.swift in Sources */, + 9B6B100B59BB0F6DD019E50D /* SceneDelegate.swift in Sources */, + 7EA5ED00B1F99EDF664DE3DC /* AutocompleteConfiguration.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -458,7 +458,7 @@ /* Begin XCBuildConfiguration section */ 1804A793EED314E240775EDD /* Default */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0B8AE98ECC3729EDD3DC71FC /* Pods-GooglePlacesSwiftXCFrameworkDemos.default.xcconfig */; + baseConfigurationReference = 62814E3541952ACA4497166C /* Pods-GooglePlacesSwiftXCFrameworkDemos.default.xcconfig */; buildSettings = { "ARCHS[sdk=iphonesimulator*]" = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ar.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ar.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ar.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ar.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ca.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ca.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ca.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ca.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/cs.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/cs.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/cs.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/cs.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/da.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/da.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/da.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/da.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/de.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/de.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/de.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/de.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/el.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/el.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/el.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/el.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_AU.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_AU.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_AU.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_AU.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_GB.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_GB.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_GB.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_GB.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_IN.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_IN.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_IN.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/en_IN.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es_419.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es_419.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es_419.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es_419.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es_MX.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es_MX.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es_MX.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/es_MX.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fi.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fi.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fi.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fi.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fr.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fr.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fr.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fr.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fr_CA.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fr_CA.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fr_CA.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/fr_CA.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/he.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/he.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/he.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/he.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hi.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hi.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hi.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hi.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hr.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hr.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hr.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hr.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hu.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hu.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hu.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/hu.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/id.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/id.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/id.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/id.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/it.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/it.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/it.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/it.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ja.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ja.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ja.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ja.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ko.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ko.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ko.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ko.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ms.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ms.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ms.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ms.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/nb.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/nb.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/nb.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/nb.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/nl.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/nl.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/nl.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/nl.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pl.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pl.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pl.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pl.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt_BR.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt_BR.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt_BR.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt_BR.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt_PT.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt_PT.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt_PT.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/pt_PT.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ro.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ro.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ro.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ro.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ru.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ru.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ru.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/ru.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/sk.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/sk.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/sk.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/sk.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/sv.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/sv.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/sv.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/sv.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/th.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/th.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/th.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/th.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/tr.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/tr.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/tr.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/tr.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/uk.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/uk.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/uk.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/uk.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/vi.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/vi.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/vi.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/vi.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_CN.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_CN.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_CN.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_CN.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_HK.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_HK.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_HK.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_HK.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_TW.lproj/Localizable.strings b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_TW.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_TW.lproj/Localizable.strings +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Resources/zh_TW.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/AppDelegate.swift b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/AppDelegate.swift index 8177b9ed..c876b0cb 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/AppDelegate.swift +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/AppDelegate.swift @@ -14,7 +14,7 @@ import GooglePlaces import UIKit -@UIApplicationMain +@main class AppDelegate: UIResponder, UIApplicationDelegate, UIWindowSceneDelegate { func application( diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/SampleDatas.swift b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/SampleDatas.swift index fd4adc75..baa6dd22 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/SampleDatas.swift +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/SampleDatas.swift @@ -86,7 +86,6 @@ enum Samples { comment: "Title of the textSearch demo section"), samples: textSearchSample) sections.append(textSearchSection) - let searchNearbySample: [Sample] = [ Sample( viewControllerClass: SearchNearbyViewController.self, diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/Samples/Autocomplete/AutocompleteWithTextFieldController.swift b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/Samples/Autocomplete/AutocompleteWithTextFieldController.swift index caf85903..9802a472 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/Samples/Autocomplete/AutocompleteWithTextFieldController.swift +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/Samples/Autocomplete/AutocompleteWithTextFieldController.swift @@ -128,6 +128,7 @@ extension AutocompleteWithTextFieldController: UITextFieldDelegate { } func textFieldShouldClear(_ textField: UITextField) -> Bool { + dismissResultView() textField.resignFirstResponder() textField.text = "" tableDataSource.clearResults() diff --git a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/Samples/TextSearchViewController.swift b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/Samples/TextSearchViewController.swift index 06581f79..11c57c7d 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/Samples/TextSearchViewController.swift +++ b/GooglePlaces-Swift/GooglePlacesSwiftXCFrameworkDemos/Swift/Samples/TextSearchViewController.swift @@ -38,6 +38,13 @@ class TextSearchViewController: AutocompleteBaseViewController, textQueryField.placeholder = "Enter Text Search Query" textQueryField.backgroundColor = .secondarySystemBackground textQueryField.translatesAutoresizingMaskIntoConstraints = false + if UIView.userInterfaceLayoutDirection( + for: textQueryField.semanticContentAttribute) == .rightToLeft + { + textQueryField.textAlignment = .right + } else { + textQueryField.textAlignment = .left + } return textQueryField }() diff --git a/GooglePlaces-Swift/Podfile b/GooglePlaces-Swift/Podfile index 74652242..d2ce51a2 100755 --- a/GooglePlaces-Swift/Podfile +++ b/GooglePlaces-Swift/Podfile @@ -1,8 +1,8 @@ -source 'https://cdn.cocoapods.org/' +source 'https://github.com/CocoaPods/Specs.git' platform :ios, '15.0' target 'GooglePlacesSwiftXCFrameworkDemos' do project 'GooglePlacesSwiftXCFrameworkDemos' - pod 'GooglePlaces', '= 9.1.0' -end \ No newline at end of file + pod 'GooglePlaces', '= 9.2.0' +end diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos.xcodeproj/project.pbxproj b/GooglePlaces/GooglePlacesXCFrameworkDemos.xcodeproj/project.pbxproj index f6c91800..86bb0ff7 100644 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos.xcodeproj/project.pbxproj +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos.xcodeproj/project.pbxproj @@ -17,6 +17,7 @@ 5679EE04A9B360411647663F /* DemoListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D2CA734A435425B8FF74875 /* DemoListViewController.m */; }; 6E798543119E6BDE1F35CBA8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DD724EB31AC6BCE47EEC1C37 /* main.m */; }; 746C20A87ADD61FE39286173 /* AutocompleteBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9E25AD6D6DEAC1491CE7511 /* AutocompleteBaseViewController.m */; }; + 75D1F24EFC7A851BCC6CABCC /* libPods-GooglePlacesXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 287DE8357EC04FCAEA66EF67 /* libPods-GooglePlacesXCFrameworkDemos.a */; }; 851E8B5E37B1195558560497 /* DemoSceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 448F969C8481659679CC8626 /* DemoSceneDelegate.m */; }; 8EEF8A1C0D173F1E94831D0E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3CC7D792593140325DD90732 /* Localizable.strings */; }; A5F3FA6403082BA26BDAC1F6 /* SearchNearbyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FA77B902CC0EEEC765C9238 /* SearchNearbyViewController.m */; }; @@ -27,7 +28,6 @@ EA0BB9CD89C5FF1931323B04 /* AutocompleteWithSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D5E3F84F54FFD1451AD90C /* AutocompleteWithSearchViewController.m */; }; F1041F6BF354A1899621AD90 /* DemoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C8A95A60C639AC388E2A28CB /* DemoAppDelegate.m */; }; FC1BA44E3A687D4C6F2541CE /* DemoData.m in Sources */ = {isa = PBXBuildFile; fileRef = ECDFD416C83764B1FEA9FBAD /* DemoData.m */; }; - FEFF7C81B7416465321F5D77 /* libPods-GooglePlacesXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 86743C4A3FB02993E5DBB62A /* libPods-GooglePlacesXCFrameworkDemos.a */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -47,6 +47,7 @@ 208660BFFF293F22E7AFA8E3 /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt_BR; path = pt_BR.lproj/Localizable.strings; sourceTree = ""; }; 215518BFE0C1ED5F8A6AD8B9 /* AutocompletePushViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AutocompletePushViewController.m; sourceTree = ""; }; 235C506F760966EB9F9AD758 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/Localizable.strings; sourceTree = ""; }; + 287DE8357EC04FCAEA66EF67 /* libPods-GooglePlacesXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GooglePlacesXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 2931E21F43D75A0FC3C90640 /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/Localizable.strings; sourceTree = ""; }; 2D38B24DE23468B01D9BD2B0 /* TextSearchViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TextSearchViewController.h; sourceTree = ""; }; 2E0D46879ED5FA054BDA2F2B /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = ""; }; @@ -74,14 +75,13 @@ 70E1EC0326A9595A97444CE9 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = ""; }; 7200E82C7547AFE055FE2647 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = ""; }; 724F6CE3B0E7557AF7826B2A /* FindPlaceLikelihoodListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FindPlaceLikelihoodListViewController.m; sourceTree = ""; }; + 748E3C7EBD17A1592993B287 /* Pods-GooglePlacesXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GooglePlacesXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GooglePlacesXCFrameworkDemos/Pods-GooglePlacesXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; 75A8BC243D0B6C1316FE643A /* AutocompleteModalViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AutocompleteModalViewController.m; sourceTree = ""; }; 763A07DA4B168C2B78086ACC /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/Localizable.strings; sourceTree = ""; }; 777A4017380A3DE1A024AAA3 /* SDKDemoAPIKey.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDKDemoAPIKey.h; sourceTree = ""; }; 81C56942F89F182D85272541 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = ""; }; 81E00202C8016C524305D18C /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = ""; }; 865580737B7A2C6070A57F57 /* es_419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es_419; path = es_419.lproj/Localizable.strings; sourceTree = ""; }; - 86743C4A3FB02993E5DBB62A /* libPods-GooglePlacesXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GooglePlacesXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 8772CB83A577EC2312EE5563 /* Pods-GooglePlacesXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GooglePlacesXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GooglePlacesXCFrameworkDemos/Pods-GooglePlacesXCFrameworkDemos.default.xcconfig"; sourceTree = ""; }; 930BF07A3DE556163FF730FB /* en_IN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_IN; path = en_IN.lproj/Localizable.strings; sourceTree = ""; }; 972394DBA3456A20F395DE17 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; 9A47FF6E08B297C3BACE6AD5 /* AutocompleteWithCustomColors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AutocompleteWithCustomColors.h; sourceTree = ""; }; @@ -119,7 +119,7 @@ buildActionMask = 2147483647; files = ( 4A554C2F351560F835E29373 /* UIKit.framework in Frameworks */, - FEFF7C81B7416465321F5D77 /* libPods-GooglePlacesXCFrameworkDemos.a in Frameworks */, + 75D1F24EFC7A851BCC6CABCC /* libPods-GooglePlacesXCFrameworkDemos.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -166,7 +166,7 @@ isa = PBXGroup; children = ( 46504F07FEC0C81D7402DBDD /* UIKit.framework */, - 86743C4A3FB02993E5DBB62A /* libPods-GooglePlacesXCFrameworkDemos.a */, + 287DE8357EC04FCAEA66EF67 /* libPods-GooglePlacesXCFrameworkDemos.a */, ); name = Frameworks; sourceTree = ""; @@ -196,7 +196,7 @@ 5D5C086080C3D6F95A446823 /* Source */, 7D7FCBA6BE1EAF3071B9A4C6 /* Frameworks */, 268D0670BCF08310AC4169BE /* Products */, - E750AEEB948AA2967CD87954 /* Pods */, + F1B2EDB380609920A54F6427 /* Pods */, ); sourceTree = ""; }; @@ -216,15 +216,6 @@ path = Samples; sourceTree = ""; }; - E750AEEB948AA2967CD87954 /* Pods */ = { - isa = PBXGroup; - children = ( - 8772CB83A577EC2312EE5563 /* Pods-GooglePlacesXCFrameworkDemos.default.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; EEC1CDCA2CD52659EFB20CDF /* Autocomplete */ = { isa = PBXGroup; children = ( @@ -244,6 +235,15 @@ path = Autocomplete; sourceTree = ""; }; + F1B2EDB380609920A54F6427 /* Pods */ = { + isa = PBXGroup; + children = ( + 748E3C7EBD17A1592993B287 /* Pods-GooglePlacesXCFrameworkDemos.default.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -251,11 +251,11 @@ isa = PBXNativeTarget; buildConfigurationList = 2B2B4231C4A531F8C0982DA6 /* Build configuration list for PBXNativeTarget "GooglePlacesXCFrameworkDemos" */; buildPhases = ( - 2B1DE8D53100096724B49556 /* [CP] Check Pods Manifest.lock */, + F912B7C6F80C1912A30CD1D3 /* [CP] Check Pods Manifest.lock */, F1FE60B3EEE84D1BCEF51FDA /* Resources */, 723E3969C707F6CEDF182AAB /* Sources */, D22E9B56CE3179180CE4527B /* Frameworks */, - 5F65135E020CA8737EFAD792 /* [CP] Copy Pods Resources */, + C270BDBAB0D00FA49FA3DE88 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -346,7 +346,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2B1DE8D53100096724B49556 /* [CP] Check Pods Manifest.lock */ = { + C270BDBAB0D00FA49FA3DE88 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -354,21 +354,21 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", + "${PODS_ROOT}/Target Support Files/Pods-GooglePlacesXCFrameworkDemos/Pods-GooglePlacesXCFrameworkDemos-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/GooglePlaces/GooglePlacesResources.bundle", ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-GooglePlacesXCFrameworkDemos-checkManifestLockResult.txt", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GooglePlacesResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GooglePlacesXCFrameworkDemos/Pods-GooglePlacesXCFrameworkDemos-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 5F65135E020CA8737EFAD792 /* [CP] Copy Pods Resources */ = { + F912B7C6F80C1912A30CD1D3 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -376,18 +376,18 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GooglePlacesXCFrameworkDemos/Pods-GooglePlacesXCFrameworkDemos-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/GooglePlaces/GooglePlacesResources.bundle", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( ); outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GooglePlacesResources.bundle", + "$(DERIVED_FILE_DIR)/Pods-GooglePlacesXCFrameworkDemos-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GooglePlacesXCFrameworkDemos/Pods-GooglePlacesXCFrameworkDemos-resources.sh\"\n"; + 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; }; /* End PBXShellScriptBuildPhase section */ @@ -481,7 +481,7 @@ /* Begin XCBuildConfiguration section */ 42221301ABD01D7649CBC58D /* Default */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8772CB83A577EC2312EE5563 /* Pods-GooglePlacesXCFrameworkDemos.default.xcconfig */; + baseConfigurationReference = 748E3C7EBD17A1592993B287 /* Pods-GooglePlacesXCFrameworkDemos.default.xcconfig */; buildSettings = { "ARCHS[sdk=iphonesimulator*]" = ( x86_64, diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/DemoListViewController.m b/GooglePlaces/GooglePlacesXCFrameworkDemos/DemoListViewController.m index 5b10be64..639ab244 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/DemoListViewController.m +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/DemoListViewController.m @@ -14,6 +14,7 @@ */ #import "GooglePlacesXCFrameworkDemos/DemoListViewController.h" +#import #if __has_feature(modules) @import GooglePlaces; @@ -176,6 +177,11 @@ - (void)setUpEditSelectionsUI { [scrollView addSubview:[self selectionButtonForPlaceProperty:placeProperty]]; } + [scrollView addSubview:[self headerLabelForTitle:@"Internal Usage Attribution ID"]]; + _nextSelectionYPos += kSelectionHeight; + [scrollView addSubview:[self viewForAddingInternalUsageAttributionID]]; + _nextSelectionYPos += kSelectionHeight; + // Add the close button to dismiss the selection UI. UIButton *close = [[UIButton alloc] initWithFrame:CGRectMake(0, _nextSelectionYPos, self.view.frame.size.width, @@ -359,6 +365,35 @@ - (UIButton *)selectionButtonForRestrictionBoundsArea:(NSString *)area { return selectionButton; } +- (UIView *)viewForAddingInternalUsageAttributionID { + UITextField *textField = + [[UITextField alloc] initWithFrame:CGRectMake(0, _nextSelectionYPos, + self.view.frame.size.width, kSelectionHeight)]; + textField.placeholder = @"Internal Usage Attribution ID(restart to clear)"; + UIButton *button = + [[UIButton alloc] initWithFrame:CGRectMake(0, 0, kSelectionSwitchWidth, kSelectionHeight)]; + button.autoresizingMask = UIViewAutoresizingFlexibleWidth; + [button.widthAnchor constraintEqualToConstant:kSelectionSwitchWidth].active = YES; + [button setBackgroundColor:[UIColor systemGreenColor]]; + [button setTitle:@"Add" forState:UIControlStateNormal]; + [button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + button.clipsToBounds = YES; + button.layer.cornerRadius = (kSelectionHeight - kEdgeBuffer) / 2; + textField.rightView = button; + textField.rightViewMode = UITextFieldViewModeAlways; + button.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter; + [button addTarget:self + action:@selector(addInternalUsageAttributionIDs:) + forControlEvents:UIControlEventTouchUpInside]; + return textField; +} + +- (void)addInternalUsageAttributionIDs:(UIButton *)button { + UITextView *textField = (UITextView *)button.superview; + [GMSPlacesClient addInternalUsageAttributionID:textField.text]; + textField.text = @""; +} + - (UISwitch *)switchFromButton:(UIButton *)button { for (UIView *subView in button.subviews) { if ([subView isKindOfClass:[UISwitch class]]) { diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ar.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ar.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ar.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ar.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ca.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ca.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ca.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ca.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/cs.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/cs.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/cs.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/cs.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/da.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/da.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/da.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/da.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/de.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/de.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/de.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/de.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/el.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/el.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/el.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/el.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_AU.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_AU.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_AU.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_AU.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_GB.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_GB.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_GB.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_GB.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_IN.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_IN.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_IN.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/en_IN.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es_419.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es_419.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es_419.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es_419.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es_MX.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es_MX.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es_MX.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/es_MX.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fi.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fi.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fi.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fi.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fr.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fr.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fr.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fr.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fr_CA.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fr_CA.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fr_CA.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/fr_CA.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/he.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/he.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/he.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/he.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hi.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hi.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hi.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hi.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hr.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hr.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hr.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hr.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hu.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hu.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hu.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/hu.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/id.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/id.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/id.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/id.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/it.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/it.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/it.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/it.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ja.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ja.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ja.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ja.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ko.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ko.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ko.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ko.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ms.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ms.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ms.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ms.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/nb.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/nb.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/nb.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/nb.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/nl.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/nl.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/nl.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/nl.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pl.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pl.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pl.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pl.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt_BR.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt_BR.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt_BR.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt_BR.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt_PT.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt_PT.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt_PT.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/pt_PT.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ro.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ro.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ro.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ro.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ru.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ru.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ru.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/ru.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/sk.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/sk.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/sk.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/sk.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/sv.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/sv.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/sv.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/sv.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/th.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/th.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/th.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/th.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/tr.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/tr.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/tr.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/tr.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/uk.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/uk.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/uk.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/uk.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/vi.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/vi.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/vi.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/vi.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_CN.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_CN.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_CN.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_CN.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_HK.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_HK.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_HK.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_HK.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_TW.lproj/Localizable.strings b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_TW.lproj/Localizable.strings index 7365c601..da16c0b1 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_TW.lproj/Localizable.strings +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Resources/zh_TW.lproj/Localizable.strings @@ -35,6 +35,8 @@ "Demo.Section.Title.TextSearch"="Text Search"; // Title of the nearbySearch demo section "Demo.Section.Title.SearchNearby"="Search Nearby"; +// Title of the Fetch Place demo section +"Demo.Section.Title.FetchPlace"="Fetch Place"; // Button title for 'show autocomplete widget' "Demo.Content.Autocomplete.ShowWidgetButton"="Show Autocomplete Widget"; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/Autocomplete/AutocompleteModalViewController.m b/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/Autocomplete/AutocompleteModalViewController.m index c57b2a7b..8b6e2d3e 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/Autocomplete/AutocompleteModalViewController.m +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/Autocomplete/AutocompleteModalViewController.m @@ -53,6 +53,7 @@ - (IBAction)showAutocompleteWidgetButtonTapped { [[GMSAutocompleteViewController alloc] init]; autocompleteViewController.delegate = self; autocompleteViewController.autocompleteFilter = self.autocompleteFilter; + autocompleteViewController.modalPresentationStyle = UIModalPresentationFullScreen; autocompleteViewController.placeProperties = self.placeProperties; [self presentViewController:autocompleteViewController animated:YES completion:nil]; [_showAutocompleteWidgetButton setHidden:YES]; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/SearchNearbyViewController.m b/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/SearchNearbyViewController.m index 45cf2fe3..d55e50c4 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/SearchNearbyViewController.m +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/SearchNearbyViewController.m @@ -73,6 +73,10 @@ - (instancetype)initWithTitle:(NSString *)title { _titleLabel.text = title; _textField = [[UITextField alloc] initWithFrame:CGRectZero]; + BOOL isRTL = [UIApplication sharedApplication].userInterfaceLayoutDirection == + UIUserInterfaceLayoutDirectionRightToLeft; + NSTextAlignment textAlignment = isRTL ? NSTextAlignmentRight : NSTextAlignmentLeft; + _textField.textAlignment = textAlignment; _textField.backgroundColor = [UIColor secondarySystemBackgroundColor]; _textField.delegate = self; diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/TextSearchViewController.h b/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/TextSearchViewController.h index 5f226500..a52b643f 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/TextSearchViewController.h +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/TextSearchViewController.h @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC. All rights reserved. +// Copyright 2023 Google LLC. All rights reserved. // // // Licensed under the Apache License, Version 2.0 (the "License"); you may not use this diff --git a/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/TextSearchViewController.m b/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/TextSearchViewController.m index dd239d92..07431b39 100755 --- a/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/TextSearchViewController.m +++ b/GooglePlaces/GooglePlacesXCFrameworkDemos/Samples/TextSearchViewController.m @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC. All rights reserved. +// Copyright 2023 Google LLC. All rights reserved. // // // Licensed under the Apache License, Version 2.0 (the "License"); you may not use this @@ -60,6 +60,14 @@ - (void)setUpTextField { _textQueryField.placeholder = @"Enter Text Search Query"; _textQueryField.backgroundColor = [UIColor secondarySystemBackgroundColor]; _textQueryField.translatesAutoresizingMaskIntoConstraints = false; + if ([UIView + userInterfaceLayoutDirectionForSemanticContentAttribute:_textQueryField + .semanticContentAttribute] == + UIUserInterfaceLayoutDirectionRightToLeft) { + _textQueryField.textAlignment = NSTextAlignmentRight; + } else { + _textQueryField.textAlignment = NSTextAlignmentLeft; + } [self.view addSubview:_textQueryField]; [NSLayoutConstraint activateConstraints:@[ diff --git a/GooglePlaces/Podfile b/GooglePlaces/Podfile index 0a9f8340..25b6ac2d 100755 --- a/GooglePlaces/Podfile +++ b/GooglePlaces/Podfile @@ -1,8 +1,8 @@ -source 'https://cdn.cocoapods.org/' +source 'https://github.com/CocoaPods/Specs.git' platform :ios, '15.0' target 'GooglePlacesXCFrameworkDemos' do project 'GooglePlacesXCFrameworkDemos' - pod 'GooglePlaces', '= 9.1.0' -end \ No newline at end of file + pod 'GooglePlaces', '= 9.2.0' +end