Skip to content

Commit 56b5831

Browse files
googlemaps-botgooglemaps-bot
authored
chore: Update Maps and Places samples from CocoaPods (#181)
1 parent ac61f0d commit 56b5831

File tree

22 files changed

+497
-421
lines changed

22 files changed

+497
-421
lines changed

‎GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
87710C46AFF873B391259D34 /* argentina-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 0EDDB89D7FC679C6141D5F7F /* argentina-large.png */; };
6161
89361183BB2BF64F4847DA32 /* argentina.png in Resources */ = {isa = PBXBuildFile; fileRef = 822521FD132C2E44D03EE0E8 /* argentina.png */; };
6262
8CAB00DE9E5AFE66057884A4 /* botswana-large.png in Resources */ = {isa = PBXBuildFile; fileRef = F531ABFE1A21DA26444A02BC /* botswana-large.png */; };
63-
95CF5E70DD685CF5930FED3F /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2711077F7697311AFA5589AB /* libPods-GoogleMapsSwiftDemos.a */; };
6463
97DD9977EC5047161D0F7A40 /* GroundOverlayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 922B67562D8E4B0D00C7B4BB /* GroundOverlayViewController.swift */; };
6564
9B820E7BA576743B85114CB7 /* GestureControlViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE84B21AF0FE670AF73B8015 /* GestureControlViewController.swift */; };
6665
9DDFC10B53970CA1F0007AF5 /* MarkersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ED4F2473A7C9EB8BA05986B /* MarkersViewController.swift */; };
@@ -92,6 +91,7 @@
9291
DC204BFAEB6DCDA7F7610536 /* GMSMapStyle+Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A9A391184A7EAD7C072E62 /* GMSMapStyle+Bundle.swift */; };
9392
DFBE1D0F69ADD7B44416635D /* MapTypesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB2B29C49F7B36D477192D04 /* MapTypesViewController.swift */; };
9493
E31E402B435CE656EAF45BD6 /* CustomIndoorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B08A9836FC58ADF5E6C36DC /* CustomIndoorViewController.swift */; };
94+
E3B3A787ED3769885A4481CD /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 36FB7115F969FAB84CDCB92A /* libPods-GoogleMapsSwiftDemos.a */; };
9595
E3D9CA39859BD1CDB3863347 /* FitBoundsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBE707A4130CDA88BBCC2DD4 /* FitBoundsViewController.swift */; };
9696
E899CA016F483DAF0998CF6B /* mapstyle-retro.json in Resources */ = {isa = PBXBuildFile; fileRef = 8E0F7227CD83A68A40D74050 /* mapstyle-retro.json */; };
9797
E9EC783AAF928C3E9F018D40 /* step8.png in Resources */ = {isa = PBXBuildFile; fileRef = EFD1B4A1869A5ED24977724F /* step8.png */; };
@@ -116,18 +116,19 @@
116116
0EDDB89D7FC679C6141D5F7F /* argentina-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "argentina-large.png"; sourceTree = "<group>"; };
117117
1730B1B4AD1EF5754F84355B /* FixedPanoramaViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FixedPanoramaViewController.swift; sourceTree = "<group>"; };
118118
17C7DF8FF79FD6CE7012853F /* step4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step4.png; sourceTree = "<group>"; };
119+
19D8B93DA5BF2119B4344281 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos.default.xcconfig"; sourceTree = "<group>"; };
119120
1DE0C90254383DA8C437CD0A /* MapsDemoAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = MapsDemoAssets.xcassets; sourceTree = "<group>"; };
120121
1EAC16DE0E8CC752D17EB04A /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
121122
221F6743F6F3DB331816D7D3 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
122123
24E0C7EAB68D8720DCB2CAC0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
123124
24E559AA1425536C6D0ACF0D /* step5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step5.png; sourceTree = "<group>"; };
124125
2566CE33406BE9F4AE26CFC0 /* AnimatedCurrentLocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimatedCurrentLocationViewController.swift; sourceTree = "<group>"; };
125-
2711077F7697311AFA5589AB /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
126126
27D56F2A707892084368A7E2 /* bulgaria-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bulgaria-large.png"; sourceTree = "<group>"; };
127127
2A5B8956E7E8B6AF430CC416 /* voyager.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = voyager.png; sourceTree = "<group>"; };
128128
2C8E6590B2109C88BF5DF3BF /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
129129
2D48B3FFC6D573CF2673D451 /* popup_santa.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = popup_santa.png; sourceTree = "<group>"; };
130130
30CF698467FA9E7F200017B3 /* mapstyle-silver.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mapstyle-silver.json"; sourceTree = "<group>"; };
131+
36FB7115F969FAB84CDCB92A /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
131132
3B0F56EA0940A859776C9DD3 /* track.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = track.json; sourceTree = "<group>"; };
132133
3B919F5AC728E794E349D4A3 /* SampleLevel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleLevel.swift; sourceTree = "<group>"; };
133134
3EA1DB5D699D162AC375E1C9 /* StyledMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StyledMapViewController.swift; sourceTree = "<group>"; };
@@ -169,7 +170,6 @@
169170
962C5BE26208B06737B4653C /* TileLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileLayerViewController.swift; sourceTree = "<group>"; };
170171
996FCE46D4BD31A4E02C2473 /* h1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = h1.png; sourceTree = "<group>"; };
171172
9DEB41AE386954E4085FAA85 /* MapLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapLayerViewController.swift; sourceTree = "<group>"; };
172-
A14E794B17D957FCB1A20246 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos.default.xcconfig"; sourceTree = "<group>"; };
173173
A29805B04CA5A5071F63E40F /* arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = arrow.png; sourceTree = "<group>"; };
174174
A6181B3AED573910BA0F2D6B /* PaddingBehaviorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaddingBehaviorViewController.swift; sourceTree = "<group>"; };
175175
ABD5CD72476857CF2A348366 /* MarkerLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerLayerViewController.swift; sourceTree = "<group>"; };
@@ -216,22 +216,13 @@
216216
buildActionMask = 2147483647;
217217
files = (
218218
4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */,
219-
95CF5E70DD685CF5930FED3F /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
219+
E3B3A787ED3769885A4481CD /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
220220
);
221221
runOnlyForDeploymentPostprocessing = 0;
222222
};
223223
/* End PBXFrameworksBuildPhase section */
224224

225225
/* Begin PBXGroup section */
226-
26F592F5BB1E8A4BF41291D6 /* Pods */ = {
227-
isa = PBXGroup;
228-
children = (
229-
A14E794B17D957FCB1A20246 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
230-
);
231-
name = Pods;
232-
path = Pods;
233-
sourceTree = "<group>";
234-
};
235226
77BA0496CE92FC06E4C6A5D5 /* GoogleMapsSwiftDemos */ = {
236227
isa = PBXGroup;
237228
children = (
@@ -307,7 +298,7 @@
307298
isa = PBXGroup;
308299
children = (
309300
922338CA529F228A03DE6422 /* UIKit.framework */,
310-
2711077F7697311AFA5589AB /* libPods-GoogleMapsSwiftDemos.a */,
301+
36FB7115F969FAB84CDCB92A /* libPods-GoogleMapsSwiftDemos.a */,
311302
);
312303
name = Frameworks;
313304
sourceTree = "<group>";
@@ -326,7 +317,7 @@
326317
D0ED9A279E12177F7FDFA2FF /* Source */,
327318
AC723F443153D968479E59F3 /* Frameworks */,
328319
DD0B6FB690051F4443F4132B /* Products */,
329-
26F592F5BB1E8A4BF41291D6 /* Pods */,
320+
E8482B677CDFAD11AD0CF175 /* Pods */,
330321
);
331322
sourceTree = "<group>";
332323
};
@@ -338,6 +329,15 @@
338329
name = Products;
339330
sourceTree = "<group>";
340331
};
332+
E8482B677CDFAD11AD0CF175 /* Pods */ = {
333+
isa = PBXGroup;
334+
children = (
335+
19D8B93DA5BF2119B4344281 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
336+
);
337+
name = Pods;
338+
path = Pods;
339+
sourceTree = "<group>";
340+
};
341341
E8E5C8B67F417779B6FF93C4 /* Resources */ = {
342342
isa = PBXGroup;
343343
children = (
@@ -409,11 +409,11 @@
409409
isa = PBXNativeTarget;
410410
buildConfigurationList = 65556A7591C40D0E8B77989F /* Build configuration list for PBXNativeTarget "GoogleMapsSwiftDemos" */;
411411
buildPhases = (
412-
18657CB41BE1D0277DAE69F0 /* [CP] Check Pods Manifest.lock */,
412+
0A2324DBEFF8D1A688DB9330 /* [CP] Check Pods Manifest.lock */,
413413
2ADDADBB329E244AF7ED1FB2 /* Resources */,
414414
22EB17F407E92B9B4F3B601A /* Sources */,
415415
B4530C282FE2BDE3D1071779 /* Frameworks */,
416-
452C9DB61EF3CC1CE3565586 /* [CP] Copy Pods Resources */,
416+
A6455A5AF886AD347389BC96 /* [CP] Copy Pods Resources */,
417417
);
418418
buildRules = (
419419
);
@@ -513,7 +513,7 @@
513513
/* End PBXResourcesBuildPhase section */
514514

515515
/* Begin PBXShellScriptBuildPhase section */
516-
18657CB41BE1D0277DAE69F0 /* [CP] Check Pods Manifest.lock */ = {
516+
0A2324DBEFF8D1A688DB9330 /* [CP] Check Pods Manifest.lock */ = {
517517
isa = PBXShellScriptBuildPhase;
518518
buildActionMask = 2147483647;
519519
files = (
@@ -535,7 +535,7 @@
535535
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";
536536
showEnvVarsInLog = 0;
537537
};
538-
452C9DB61EF3CC1CE3565586 /* [CP] Copy Pods Resources */ = {
538+
A6455A5AF886AD347389BC96 /* [CP] Copy Pods Resources */ = {
539539
isa = PBXShellScriptBuildPhase;
540540
buildActionMask = 2147483647;
541541
files = (
@@ -625,7 +625,7 @@
625625
};
626626
6798450D013ACAFF39CF0187 /* Default */ = {
627627
isa = XCBuildConfiguration;
628-
baseConfigurationReference = A14E794B17D957FCB1A20246 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
628+
baseConfigurationReference = 19D8B93DA5BF2119B4344281 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
629629
buildSettings = {
630630
"ARCHS[sdk=iphonesimulator*]" = x86_64;
631631
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

‎GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/SampleListViewController.swift‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class SampleListViewController: UIViewController {
1919

2020
let sampleSections = Samples.allSamples()
2121
lazy var tableView: UITableView = UITableView()
22+
var shouldCollapseDetailViewController = true
2223

2324
override func viewDidLoad() {
2425
super.viewDidLoad()
@@ -69,11 +70,38 @@ extension SampleListViewController: UITableViewDataSource {
6970

7071
extension SampleListViewController: UITableViewDelegate {
7172
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
73+
shouldCollapseDetailViewController = false
7274
tableView.deselectRow(at: indexPath, animated: true)
7375
if let sample = sample(at: indexPath) {
7476
let viewController = sample.viewControllerClass.init()
7577
viewController.title = sample.title
76-
navigationController?.pushViewController(viewController, animated: true)
78+
let navController = UINavigationController(rootViewController: viewController)
79+
navController.navigationBar.isTranslucent = false
80+
showDetailViewController(navController, sender: self)
7781
}
7882
}
7983
}
84+
85+
extension SampleListViewController: UISplitViewControllerDelegate {
86+
func primaryViewController(forExpanding splitViewController: UISplitViewController)
87+
-> UIViewController?
88+
{
89+
tableView.reloadData()
90+
return nil
91+
}
92+
93+
func primaryViewController(forCollapsing splitViewController: UISplitViewController)
94+
-> UIViewController?
95+
{
96+
tableView.reloadData()
97+
return nil
98+
}
99+
100+
func splitViewController(
101+
_ splitViewController: UISplitViewController,
102+
collapseSecondary secondaryViewController: UIViewController,
103+
onto primaryViewController: UIViewController
104+
) -> Bool {
105+
return shouldCollapseDetailViewController
106+
}
107+
}

‎GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/Samples/StructuredGeocoderViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extension StructuredGeocoderViewController: GMSMapViewDelegate {
5757
snippet.append("subLocality: \(subLocality)\n")
5858
}
5959
if let locality = address.locality {
60-
snippet.append("subLocality: \(locality)\n")
60+
snippet.append("locality: \(locality)\n")
6161
}
6262
if let administrativeArea = address.administrativeArea {
6363
snippet.append("administrativeArea: \(administrativeArea)\n")

‎GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/SceneDelegate.swift‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,15 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
2424
guard let scene = scene as? UIWindowScene else { return }
2525
window = .init(windowScene: scene)
2626

27-
// On iOS 15, continue to use opaque navigation bars like earlier iOS versions.
28-
if #available(iOS 15.0, *) {
29-
let navBarAppearance = UINavigationBarAppearance()
30-
navBarAppearance.configureWithOpaqueBackground()
31-
UINavigationBar.appearance().standardAppearance = navBarAppearance
32-
UINavigationBar.appearance().scrollEdgeAppearance = navBarAppearance
33-
}
34-
3527
let sampleListViewController = SampleListViewController()
3628
let navigationController = UINavigationController(rootViewController: sampleListViewController)
37-
window?.rootViewController = navigationController
29+
let detailController = UIViewController()
30+
let splitViewController = UISplitViewController()
31+
32+
splitViewController.delegate = sampleListViewController
33+
splitViewController.preferredDisplayMode = .oneBesideSecondary
34+
splitViewController.viewControllers = [navigationController, detailController]
35+
window?.rootViewController = splitViewController
3836
window?.makeKeyAndVisible()
3937
}
4038
}

‎GoogleMaps-Swift/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ source 'https://github.com/CocoaPods/Specs.git'
22

33
target 'GoogleMapsSwiftDemos' do
44
platform :ios, '14.0'
5-
pod 'GoogleMaps', '= 8.0.0'
5+
pod 'GoogleMaps', '= 8.2.0'
66
end

0 commit comments

Comments
 (0)