Skip to content

Commit 8bd8dba

Browse files
googlemaps-botgooglemaps-bot
authored
chore: Update Maps and Places samples from CocoaPods (#151)
1 parent 921e840 commit 8bd8dba

File tree

16 files changed

+376
-269
lines changed

16 files changed

+376
-269
lines changed

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

Lines changed: 123 additions & 119 deletions
Large diffs are not rendered by default.

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2626

2727
GMSServices.provideAPIKey(SDKConstants.apiKey)
2828

29+
// On iOS 15, continue to use opaque navigation bars like earlier iOS versions.
30+
if #available(iOS 15.0, *) {
31+
let navBarAppearance = UINavigationBarAppearance()
32+
navBarAppearance.configureWithOpaqueBackground()
33+
UINavigationBar.appearance().standardAppearance = navBarAppearance
34+
UINavigationBar.appearance().scrollEdgeAppearance = navBarAppearance
35+
}
36+
2937
let sampleListViewController = SampleListViewController()
3038
let frame = UIScreen.main.bounds
3139
let window = UIWindow(frame: frame)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class IndoorViewController: UIViewController {
4444
alert.addAction(alertAction(style))
4545
}
4646
alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
47+
alert.popoverPresentationController?.barButtonItem = sender
4748
present(alert, animated: true, completion: nil)
4849
}
4950

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

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
// Copyright 2022 Google LLC. All rights reserved.
2+
//
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
5+
// file except in compliance with the License. You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software distributed under
10+
// the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
11+
// ANY KIND, either express or implied. See the License for the specific language governing
12+
// permissions and limitations under the License.
13+
14+
import GoogleMaps
15+
import UIKit
16+
17+
final class PanoramaServiceController: UIViewController {
18+
private let markerLocation = CLLocationCoordinate2D.sydney
19+
20+
private var mySubview = UIView(frame: .zero)
21+
private var statusLabel = UILabel(frame: .zero)
22+
private var result = UITextView(frame: .zero)
23+
24+
private var panoService: GMSPanoramaService?
25+
private var requestCount = 0
26+
private var responseCount = 0
27+
28+
override func loadView() {
29+
navigationController?.navigationBar.isTranslucent = false
30+
view = mySubview
31+
32+
statusLabel.alpha = 1.0
33+
statusLabel.backgroundColor = .blue
34+
statusLabel.textColor = .white
35+
statusLabel.textAlignment = .center
36+
statusLabel.text = "Service Never Called"
37+
view.addSubview(statusLabel)
38+
statusLabel.translatesAutoresizingMaskIntoConstraints = false
39+
40+
view.addSubview(result)
41+
result.translatesAutoresizingMaskIntoConstraints = false
42+
43+
NSLayoutConstraint.activate([
44+
statusLabel.topAnchor.constraint(equalTo: view.topAnchor),
45+
statusLabel.heightAnchor.constraint(equalToConstant: 30),
46+
statusLabel.leadingAnchor.constraint(equalTo: view.leadingAnchor),
47+
statusLabel.trailingAnchor.constraint(equalTo: view.trailingAnchor),
48+
49+
result.topAnchor.constraint(equalTo: statusLabel.bottomAnchor),
50+
result.bottomAnchor.constraint(equalTo: view.bottomAnchor),
51+
result.leadingAnchor.constraint(equalTo: view.leadingAnchor),
52+
result.trailingAnchor.constraint(equalTo: view.trailingAnchor),
53+
])
54+
}
55+
56+
override func viewDidAppear(_ animated: Bool) {
57+
if panoService == nil {
58+
panoService = GMSPanoramaService()
59+
statusLabel.text = "Service initialized \(panoService?.description ?? "nil")"
60+
}
61+
62+
requestCount += 1
63+
panoService?.requestPanoramaNearCoordinate(
64+
markerLocation,
65+
radius: 300, // meters
66+
source: .outside
67+
) {
68+
pano, err in
69+
self.responseCount += 1
70+
self.statusLabel.text =
71+
"Callback invoked \(self.responseCount) time(s) out of \(self.requestCount) requests."
72+
73+
if let pano = pano {
74+
self.result.text = [
75+
"id: \(pano.panoramaID)",
76+
"#neighbors: \(pano.links.count)",
77+
"coordinate: \(pano.coordinate)",
78+
"description: \(pano.description)",
79+
"debugDescription: \(pano.debugDescription)",
80+
].joined(separator: "\n")
81+
} else {
82+
self.result.text = "<nil>"
83+
}
84+
}
85+
super.viewWillAppear(animated)
86+
}
87+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2020 Google LLC. All rights reserved.
1+
// Copyright 2022 Google LLC. All rights reserved.
22
//
33
//
44
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -65,6 +65,7 @@ enum Samples {
6565
viewControllerClass: GradientPolylinesViewController.self, title: "Gradient Polylines"),
6666
]
6767
let panoramaSamples = [
68+
Sample(viewControllerClass: PanoramaServiceController.self, title: "Panorama Service"),
6869
Sample(viewControllerClass: PanoramaViewController.self, title: "Street View"),
6970
Sample(viewControllerClass: FixedPanoramaViewController.self, title: "Fixed Street View"),
7071
]

‎GoogleMaps-Swift/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22

33
target 'GoogleMapsSwiftDemos' do
4-
platform :ios, '12.0'
5-
pod 'GoogleMaps', '= 6.2.1'
4+
platform :ios, 13.0
5+
pod 'GoogleMaps', '= 7.0.0'
66
end

‎GoogleMaps/GoogleMapsDemos.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
0B07C58295A7BE58E96F34A3 /* aeroplane@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F716156C215C436D55F5696 /* aeroplane@2x.png */; };
1717
0C0EF831E5337B424A4126EF /* PolygonsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ED9C84A592EB6464725BB9C /* PolygonsViewController.m */; };
1818
0D9B023D6E709FAB165A29C9 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE1D504741871952487BB5BE /* MasterViewController.m */; };
19-
0DA52628119D8F70D21B84BD /* libPods-GoogleMapsDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EF2A7B1F3E0A8B886D5BF85 /* libPods-GoogleMapsDemos.a */; };
2019
15D42DEC8B7AE783DE4C91A5 /* IndoorMuseumNavigationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1318E0A2BA2A41F2E8759CFE /* IndoorMuseumNavigationViewController.m */; };
2120
16717F377D18DD00AA691F18 /* argentina-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D8E4A10394122CD9C9CD157 /* argentina-large.png */; };
2221
16B31F7A9AF98310188109DC /* popup_santa.png in Resources */ = {isa = PBXBuildFile; fileRef = EF01EFEF0FC77447C02FE86C /* popup_santa.png */; };
@@ -59,6 +58,7 @@
5958
88F03EC5B1399F717E4F0146 /* MyLocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BF0878372A9A7274B74BCBE0 /* MyLocationViewController.m */; };
6059
8BE208DD6AC74D59735122F6 /* newark_nj_1922.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 2B0884C720D5AE0BDCC1903D /* newark_nj_1922.jpg */; };
6160
8CD768E0261BFDCCCA116EFC /* step1.png in Resources */ = {isa = PBXBuildFile; fileRef = D66EF243066A58A0D10280D4 /* step1.png */; };
61+
8DE4CB0B7E3DDB9FB449966D /* libPods-GoogleMapsDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81DE8F154FC913A2CDBA20C4 /* libPods-GoogleMapsDemos.a */; };
6262
8E542049DF18A44B2ECEFEC2 /* MarkersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D4CFDA7D44E2CF33EB10072B /* MarkersViewController.m */; };
6363
8F5472876D59BE14593D0FD2 /* boat.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B049CFC81E59949D0184B8B /* boat.png */; };
6464
9201EE4D315D2663EE849ACB /* step4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 60944672BB9D460BE315ECB8 /* step4@2x.png */; };
@@ -105,7 +105,6 @@
105105
/* Begin PBXFileReference section */
106106
02A7C56A409A0CB977458251 /* DemoAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemoAppDelegate.h; sourceTree = "<group>"; };
107107
03E00AE555F58259DD31C383 /* boat@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "boat@2x.png"; sourceTree = "<group>"; };
108-
06C4A97D6DA4225634B9CBEF /* Pods-GoogleMapsDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsDemos/Pods-GoogleMapsDemos.default.xcconfig"; sourceTree = "<group>"; };
109108
09A36E26A0818D4F0DF21051 /* CameraViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CameraViewController.m; sourceTree = "<group>"; };
110109
0C5E03510539F570D757CAEE /* GestureControlViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GestureControlViewController.h; sourceTree = "<group>"; };
111110
0CEA86A42848E5BAA7B523FB /* TileLayerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TileLayerViewController.m; sourceTree = "<group>"; };
@@ -140,11 +139,11 @@
140139
440513A7769094565EA82DD2 /* botswana-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "botswana-large.png"; sourceTree = "<group>"; };
141140
4B436F286FDDDE125BA44AEE /* MapTypesViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MapTypesViewController.h; sourceTree = "<group>"; };
142141
4D8E4A10394122CD9C9CD157 /* argentina-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "argentina-large.png"; sourceTree = "<group>"; };
143-
4EF2A7B1F3E0A8B886D5BF85 /* libPods-GoogleMapsDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
144142
4F955F74654756E7F7DBD9C1 /* step2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "step2@2x.png"; sourceTree = "<group>"; };
145143
51B3E8FEDF5AFB146C099C21 /* MapLayerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MapLayerViewController.h; sourceTree = "<group>"; };
146144
5563ED82E4E77A76707DAF12 /* CustomIndoorViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomIndoorViewController.m; sourceTree = "<group>"; };
147145
56200E1874E08933C65BFE11 /* PaddingBehaviorViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaddingBehaviorViewController.h; sourceTree = "<group>"; };
146+
565518E73360BA9EA019BD66 /* Pods-GoogleMapsDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsDemos/Pods-GoogleMapsDemos.default.xcconfig"; sourceTree = "<group>"; };
148147
57D0C4A29B66857C926387F0 /* glow-marker.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "glow-marker.png"; sourceTree = "<group>"; };
149148
5B3B4C44092471CA56ACFD4C /* voyager.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = voyager.png; sourceTree = "<group>"; };
150149
5C9035433ADBDA49B4FF973F /* StructuredGeocoderViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StructuredGeocoderViewController.h; sourceTree = "<group>"; };
@@ -169,6 +168,7 @@
169168
7DB963F858613E50A64CFAE6 /* FrameRateViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FrameRateViewController.m; sourceTree = "<group>"; };
170169
8038AEC0AF9CBD2EBB975F54 /* GroundOverlayViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroundOverlayViewController.m; sourceTree = "<group>"; };
171170
805803DEB0E29A1395C6ABB6 /* TrafficMapViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TrafficMapViewController.h; sourceTree = "<group>"; };
171+
81DE8F154FC913A2CDBA20C4 /* libPods-GoogleMapsDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
172172
8348F1BC33E5DCAAB85BBA43 /* DoubleMapViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DoubleMapViewController.h; sourceTree = "<group>"; };
173173
87C50C8E191C32391FCDE143 /* CameraViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CameraViewController.h; sourceTree = "<group>"; };
174174
89DFB3350D98DA617A2ECE85 /* MarkerInfoWindowViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MarkerInfoWindowViewController.m; sourceTree = "<group>"; };
@@ -246,7 +246,7 @@
246246
buildActionMask = 2147483647;
247247
files = (
248248
7EB0308A1EF8F6ADBD6DEF79 /* UIKit.framework in Frameworks */,
249-
0DA52628119D8F70D21B84BD /* libPods-GoogleMapsDemos.a in Frameworks */,
249+
8DE4CB0B7E3DDB9FB449966D /* libPods-GoogleMapsDemos.a in Frameworks */,
250250
);
251251
runOnlyForDeploymentPostprocessing = 0;
252252
};
@@ -259,7 +259,7 @@
259259
3F84FF5646DF0F79669A6A34 /* Source */,
260260
9F91B9CA1785E3DD586E3F93 /* Frameworks */,
261261
9C667AD7285A7D36180D29BE /* Products */,
262-
5B02550332A620A6CA6181C7 /* Pods */,
262+
609969F09B08380721296456 /* Pods */,
263263
);
264264
sourceTree = "<group>";
265265
};
@@ -271,10 +271,10 @@
271271
name = Source;
272272
sourceTree = "<group>";
273273
};
274-
5B02550332A620A6CA6181C7 /* Pods */ = {
274+
609969F09B08380721296456 /* Pods */ = {
275275
isa = PBXGroup;
276276
children = (
277-
06C4A97D6DA4225634B9CBEF /* Pods-GoogleMapsDemos.default.xcconfig */,
277+
565518E73360BA9EA019BD66 /* Pods-GoogleMapsDemos.default.xcconfig */,
278278
);
279279
name = Pods;
280280
path = Pods;
@@ -307,7 +307,7 @@
307307
isa = PBXGroup;
308308
children = (
309309
6F4C119D42CF37317FA0DFA9 /* UIKit.framework */,
310-
4EF2A7B1F3E0A8B886D5BF85 /* libPods-GoogleMapsDemos.a */,
310+
81DE8F154FC913A2CDBA20C4 /* libPods-GoogleMapsDemos.a */,
311311
);
312312
name = Frameworks;
313313
sourceTree = "<group>";
@@ -466,11 +466,11 @@
466466
isa = PBXNativeTarget;
467467
buildConfigurationList = 56D55B92E97A2AAB3D261D4A /* Build configuration list for PBXNativeTarget "GoogleMapsDemos" */;
468468
buildPhases = (
469-
0015622837818AAC044B4EF2 /* [CP] Check Pods Manifest.lock */,
469+
D26D48B177FAAF80B689023F /* [CP] Check Pods Manifest.lock */,
470470
C434996613C0A2FED463783D /* Resources */,
471471
06DE6F27AD1DD8E5163683B6 /* Sources */,
472472
8B9B135C626B0FF8CC12CB4D /* Frameworks */,
473-
48A02373C44410F2C42F510E /* [CP] Copy Pods Resources */,
473+
98D455DA08FF6A50E104D78B /* [CP] Copy Pods Resources */,
474474
);
475475
buildRules = (
476476
);
@@ -568,48 +568,48 @@
568568
/* End PBXResourcesBuildPhase section */
569569

570570
/* Begin PBXShellScriptBuildPhase section */
571-
0015622837818AAC044B4EF2 /* [CP] Check Pods Manifest.lock */ = {
571+
98D455DA08FF6A50E104D78B /* [CP] Copy Pods Resources */ = {
572572
isa = PBXShellScriptBuildPhase;
573573
buildActionMask = 2147483647;
574574
files = (
575575
);
576576
inputFileListPaths = (
577577
);
578578
inputPaths = (
579-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
580-
"${PODS_ROOT}/Manifest.lock",
579+
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsDemos/Pods-GoogleMapsDemos-resources.sh",
580+
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
581581
);
582-
name = "[CP] Check Pods Manifest.lock";
582+
name = "[CP] Copy Pods Resources";
583583
outputFileListPaths = (
584584
);
585585
outputPaths = (
586-
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsDemos-checkManifestLockResult.txt",
586+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
587587
);
588588
runOnlyForDeploymentPostprocessing = 0;
589589
shellPath = /bin/sh;
590-
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";
590+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsDemos/Pods-GoogleMapsDemos-resources.sh\"\n";
591591
showEnvVarsInLog = 0;
592592
};
593-
48A02373C44410F2C42F510E /* [CP] Copy Pods Resources */ = {
593+
D26D48B177FAAF80B689023F /* [CP] Check Pods Manifest.lock */ = {
594594
isa = PBXShellScriptBuildPhase;
595595
buildActionMask = 2147483647;
596596
files = (
597597
);
598598
inputFileListPaths = (
599599
);
600600
inputPaths = (
601-
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsDemos/Pods-GoogleMapsDemos-resources.sh",
602-
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
601+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
602+
"${PODS_ROOT}/Manifest.lock",
603603
);
604-
name = "[CP] Copy Pods Resources";
604+
name = "[CP] Check Pods Manifest.lock";
605605
outputFileListPaths = (
606606
);
607607
outputPaths = (
608-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
608+
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsDemos-checkManifestLockResult.txt",
609609
);
610610
runOnlyForDeploymentPostprocessing = 0;
611611
shellPath = /bin/sh;
612-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsDemos/Pods-GoogleMapsDemos-resources.sh\"\n";
612+
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";
613613
showEnvVarsInLog = 0;
614614
};
615615
/* End PBXShellScriptBuildPhase section */
@@ -667,14 +667,14 @@
667667
/* Begin XCBuildConfiguration section */
668668
2723CC697F2C564456B7C001 /* Default */ = {
669669
isa = XCBuildConfiguration;
670-
baseConfigurationReference = 06C4A97D6DA4225634B9CBEF /* Pods-GoogleMapsDemos.default.xcconfig */;
670+
baseConfigurationReference = 565518E73360BA9EA019BD66 /* Pods-GoogleMapsDemos.default.xcconfig */;
671671
buildSettings = {
672672
"ARCHS[sdk=iphonesimulator*]" = x86_64;
673673
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
674674
CLANG_ENABLE_OBJC_ARC = YES;
675675
CODE_SIGN_IDENTITY = "iPhone Developer";
676676
INFOPLIST_FILE = ./GoogleMapsDemos/Info.plist;
677-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
677+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
678678
LIBRARY_SEARCH_PATHS = (
679679
.,
680680
"$(SDKROOT)/System/Library/Frameworks",

‎GoogleMaps/GoogleMapsDemos/Samples/CustomMarkersViewController.m‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ - (void)viewDidLoad {
4747
self.navigationItem.rightBarButtonItems = @[ addButton, clearButton ];
4848

4949
self.view = _mapView;
50+
51+
// Reset count on view load
52+
kMarkerCount = 0;
5053
}
5154

5255
- (void)addDefaultMarkers {
@@ -114,6 +117,9 @@ - (void)addMarkerInBounds:(GMSCoordinateBounds *)bounds {
114117
- (void)didTapClear {
115118
[_mapView clear];
116119
[self addDefaultMarkers];
120+
121+
// Reset count on clear
122+
kMarkerCount = 0;
117123
}
118124

119125
@end

‎GoogleMaps/GoogleMapsDemos/Samples/Samples.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ + (NSArray *)loadDemos {
7373
[self newDemo:[IndoorMuseumNavigationViewController class]
7474
withTitle:@"Indoor Museum Navigator"
7575
andDescription:nil],
76-
[self newDemo:[StyledMapViewController class] withTitle:@"Styled Map" andDescription:nil],
7776
[self newDemo:[GestureControlViewController class]
7877
withTitle:@"Gesture Control"
7978
andDescription:nil],
@@ -89,6 +88,7 @@ + (NSArray *)loadDemos {
8988
[self newDemo:[PaddingBehaviorViewController class]
9089
withTitle:@"Padding Behavior"
9190
andDescription:nil],
91+
[self newDemo:[StyledMapViewController class] withTitle:@"Styled Map" andDescription:nil],
9292
];
9393

9494
NSArray *panoramaDemos = @[

‎GoogleMaps/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22

33
target 'GoogleMapsDemos' do
4-
platform :ios, '12.0'
5-
pod 'GoogleMaps', '= 6.2.1'
4+
platform :ios, 13.0
5+
pod 'GoogleMaps', '= 7.0.0'
66
end

0 commit comments

Comments
 (0)