Skip to content

Commit a21f61d

Browse files
arriolacarriolac
committed
Update GoogleMapsDemos
1 parent ccca9d1 commit a21f61d

File tree

81 files changed

+327
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+327
-287
lines changed

‎GoogleMaps/GoogleMapsDemos.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
58522D14C5843238B3B684B7 /* mapstyle-retro.json in Resources */ = {isa = PBXBuildFile; fileRef = 118A0FE8CA1D110B3C694A8D /* mapstyle-retro.json */; };
5050
5C91A963E5BF4ECDD5ADA417 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 16C4B08486C9905568685983 /* [email protected] */; };
5151
5E4A600A723EAD16564CE99A /* MarkerLayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3E84ED0331DFB2A7082CA36 /* MarkerLayerViewController.m */; };
52-
613F0C0401B17F64DFC23D27 /* libPods-GoogleMapsDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EC6F489AC345C54805DB317 /* libPods-GoogleMapsDemos.a */; };
5352
67BB1551A52FE25B519698E7 /* PolylinesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA4145303F340FC3675AABA5 /* PolylinesViewController.m */; };
5453
6C605BC471B85B1304719717 /* DoubleMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F8DFCC9D1D1F70D492149D65 /* DoubleMapViewController.m */; };
5554
6CCF16F2F014A3E746833201 /* MapTypesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F371BFD608DCF4DA1671DB03 /* MapTypesViewController.m */; };
5655
6FD2C9C23995654D55280DCC /* MapLayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E7BBD64FA078FC4259FCBD2 /* MapLayerViewController.m */; };
5756
70C609604B6E16310749BEE1 /* step3.png in Resources */ = {isa = PBXBuildFile; fileRef = 6533FA4161283F8F6A5F2CC3 /* step3.png */; };
5857
7130108058B7212F6C7FD1FE /* CustomMarkersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC77B503E93E88F6E254A170 /* CustomMarkersViewController.m */; };
58+
73513BB15A7A6CEAD901FC23 /* libPods-GoogleMapsDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A2ECE726212287177D85E92 /* libPods-GoogleMapsDemos.a */; };
5959
78251F0B2F404EDD815FF5C5 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 03E00AE555F58259DD31C383 /* [email protected] */; };
6060
7C990DA60F735AF48D770DC5 /* h1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B05E27C8BB92E89D2DC78AC /* h1.png */; };
6161
7D840080EF0D790EA1F194A8 /* australia.png in Resources */ = {isa = PBXBuildFile; fileRef = 304A2B780A4A9B2D32261355 /* australia.png */; };
@@ -133,13 +133,13 @@
133133
3B0B37F0669CF34418A263F9 /* step7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step7.png; sourceTree = "<group>"; };
134134
3B3D673FA7036FA5D07CB287 /* MapZoomViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MapZoomViewController.m; sourceTree = "<group>"; };
135135
3E7BBD64FA078FC4259FCBD2 /* MapLayerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MapLayerViewController.m; sourceTree = "<group>"; };
136-
3EC6F489AC345C54805DB317 /* libPods-GoogleMapsDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
137136
3F716156C215C436D55F5696 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
138137
430314741C873551A75A6748 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
139138
440513A7769094565EA82DD2 /* botswana-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "botswana-large.png"; sourceTree = "<group>"; };
140139
4B436F286FDDDE125BA44AEE /* MapTypesViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MapTypesViewController.h; sourceTree = "<group>"; };
141140
4D8E4A10394122CD9C9CD157 /* argentina-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "argentina-large.png"; sourceTree = "<group>"; };
142141
4F955F74654756E7F7DBD9C1 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
142+
50DA5C3D1F56160C4BC0C8BA /* 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>"; };
143143
51B3E8FEDF5AFB146C099C21 /* MapLayerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MapLayerViewController.h; sourceTree = "<group>"; };
144144
5563ED82E4E77A76707DAF12 /* CustomIndoorViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomIndoorViewController.m; sourceTree = "<group>"; };
145145
56200E1874E08933C65BFE11 /* PaddingBehaviorViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaddingBehaviorViewController.h; sourceTree = "<group>"; };
@@ -163,6 +163,7 @@
163163
721936633CF79A85B5EF0E92 /* FitBoundsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FitBoundsViewController.m; sourceTree = "<group>"; };
164164
726F8CE865076A20EE4C4408 /* PanoramaViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PanoramaViewController.h; sourceTree = "<group>"; };
165165
77E4A5AC4E17EB252D617792 /* x29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = x29.png; sourceTree = "<group>"; };
166+
7A2ECE726212287177D85E92 /* libPods-GoogleMapsDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
166167
7BAA2BF38E0B41197BB6CA14 /* GroundOverlayViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GroundOverlayViewController.h; sourceTree = "<group>"; };
167168
7DB963F858613E50A64CFAE6 /* FrameRateViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FrameRateViewController.m; sourceTree = "<group>"; };
168169
8038AEC0AF9CBD2EBB975F54 /* GroundOverlayViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroundOverlayViewController.m; sourceTree = "<group>"; };
@@ -212,7 +213,6 @@
212213
D5E5AF68BBC86BA530755A20 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
213214
D66EF243066A58A0D10280D4 /* step1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step1.png; sourceTree = "<group>"; };
214215
D78B4ACC4D102CC9EC32C8A3 /* SnapshotReadyViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SnapshotReadyViewController.h; sourceTree = "<group>"; };
215-
D826C7EFB3887941A9326EA6 /* 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>"; };
216216
DA6BF21C0287E5828A770C09 /* bulgaria-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bulgaria-large.png"; sourceTree = "<group>"; };
217217
DB481265195ED47C9D3588AB /* CustomIndoorViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomIndoorViewController.h; sourceTree = "<group>"; };
218218
DBB8C9AD891A00824AE32343 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -243,20 +243,29 @@
243243
buildActionMask = 2147483647;
244244
files = (
245245
B96B00239590850A49AC33AD /* UIKit.framework in Frameworks */,
246-
613F0C0401B17F64DFC23D27 /* libPods-GoogleMapsDemos.a in Frameworks */,
246+
73513BB15A7A6CEAD901FC23 /* libPods-GoogleMapsDemos.a in Frameworks */,
247247
);
248248
runOnlyForDeploymentPostprocessing = 0;
249249
};
250250
/* End PBXFrameworksBuildPhase section */
251251

252252
/* Begin PBXGroup section */
253+
14CB733429AB0D2CB7235EA1 /* Pods */ = {
254+
isa = PBXGroup;
255+
children = (
256+
50DA5C3D1F56160C4BC0C8BA /* Pods-GoogleMapsDemos.default.xcconfig */,
257+
);
258+
name = Pods;
259+
path = Pods;
260+
sourceTree = "<group>";
261+
};
253262
1D27564BB990E3F72332953D = {
254263
isa = PBXGroup;
255264
children = (
256265
3F84FF5646DF0F79669A6A34 /* Source */,
257266
89188BA529E9696AD04AD794 /* Frameworks */,
258267
9C667AD7285A7D36180D29BE /* Products */,
259-
40F7872144362EC2A81CCD81 /* Pods */,
268+
14CB733429AB0D2CB7235EA1 /* Pods */,
260269
);
261270
sourceTree = "<group>";
262271
};
@@ -268,20 +277,11 @@
268277
name = Source;
269278
sourceTree = "<group>";
270279
};
271-
40F7872144362EC2A81CCD81 /* Pods */ = {
272-
isa = PBXGroup;
273-
children = (
274-
D826C7EFB3887941A9326EA6 /* Pods-GoogleMapsDemos.default.xcconfig */,
275-
);
276-
name = Pods;
277-
path = Pods;
278-
sourceTree = "<group>";
279-
};
280280
89188BA529E9696AD04AD794 /* Frameworks */ = {
281281
isa = PBXGroup;
282282
children = (
283283
6F4C119D42CF37317FA0DFA9 /* UIKit.framework */,
284-
3EC6F489AC345C54805DB317 /* libPods-GoogleMapsDemos.a */,
284+
7A2ECE726212287177D85E92 /* libPods-GoogleMapsDemos.a */,
285285
);
286286
name = Frameworks;
287287
sourceTree = "<group>";
@@ -461,11 +461,11 @@
461461
isa = PBXNativeTarget;
462462
buildConfigurationList = 56D55B92E97A2AAB3D261D4A /* Build configuration list for PBXNativeTarget "GoogleMapsDemos" */;
463463
buildPhases = (
464-
2E87EE0D42C644347E9CC423 /* [CP] Check Pods Manifest.lock */,
464+
071D236E88ADC1077C1E23B7 /* [CP] Check Pods Manifest.lock */,
465465
C434996613C0A2FED463783D /* Resources */,
466466
06DE6F27AD1DD8E5163683B6 /* Sources */,
467467
8B9B135C626B0FF8CC12CB4D /* Frameworks */,
468-
3E17929022E5B84EF0D58A20 /* [CP] Copy Pods Resources */,
468+
E1507C15A24B144E3A0B0CD6 /* [CP] Copy Pods Resources */,
469469
);
470470
buildRules = (
471471
);
@@ -563,7 +563,7 @@
563563
/* End PBXResourcesBuildPhase section */
564564

565565
/* Begin PBXShellScriptBuildPhase section */
566-
2E87EE0D42C644347E9CC423 /* [CP] Check Pods Manifest.lock */ = {
566+
071D236E88ADC1077C1E23B7 /* [CP] Check Pods Manifest.lock */ = {
567567
isa = PBXShellScriptBuildPhase;
568568
buildActionMask = 2147483647;
569569
files = (
@@ -585,7 +585,7 @@
585585
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";
586586
showEnvVarsInLog = 0;
587587
};
588-
3E17929022E5B84EF0D58A20 /* [CP] Copy Pods Resources */ = {
588+
E1507C15A24B144E3A0B0CD6 /* [CP] Copy Pods Resources */ = {
589589
isa = PBXShellScriptBuildPhase;
590590
buildActionMask = 2147483647;
591591
files = (
@@ -657,7 +657,7 @@
657657
/* Begin XCBuildConfiguration section */
658658
2723CC697F2C564456B7C001 /* Default */ = {
659659
isa = XCBuildConfiguration;
660-
baseConfigurationReference = D826C7EFB3887941A9326EA6 /* Pods-GoogleMapsDemos.default.xcconfig */;
660+
baseConfigurationReference = 50DA5C3D1F56160C4BC0C8BA /* Pods-GoogleMapsDemos.default.xcconfig */;
661661
buildSettings = {
662662
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
663663
CLANG_ENABLE_OBJC_ARC = YES;

‎GoogleMaps/GoogleMapsDemos/DemoAppDelegate.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 Google Inc. All rights reserved.
2+
* Copyright 2016 Google LLC. All rights reserved.
33
*
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -19,14 +19,14 @@
1919
UIApplicationDelegate,
2020
UISplitViewControllerDelegate>
2121

22-
@property(strong, nonatomic) UIWindow *window;
23-
@property(strong, nonatomic) UINavigationController *navigationController;
24-
@property(strong, nonatomic) UISplitViewController *splitViewController;
22+
@property(nonatomic) UIWindow *window;
23+
@property(nonatomic) UINavigationController *navigationController;
24+
@property(nonatomic) UISplitViewController *splitViewController;
2525

2626
/**
2727
* If the device is an iPad, this property controls the sample displayed in the
2828
* right side of its split view controller.
2929
*/
30-
@property(strong, nonatomic) UIViewController *sample;
30+
@property(nonatomic) UIViewController *sample;
3131

3232
@end

‎GoogleMaps/GoogleMapsDemos/DemoAppDelegate.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 Google Inc. All rights reserved.
2+
* Copyright 2016 Google LLC. All rights reserved.
33
*
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -15,9 +15,9 @@
1515

1616
#import "GoogleMapsDemos/DemoAppDelegate.h"
1717

18-
#import <GoogleMaps/GoogleMaps.h>
1918
#import "GoogleMapsDemos/MasterViewController.h"
2019
#import "GoogleMapsDemos/SDKDemoAPIKey.h"
20+
#import <GoogleMaps/GoogleMaps.h>
2121

2222
@implementation DemoAppDelegate {
2323
id _services;
@@ -27,7 +27,7 @@ @implementation DemoAppDelegate {
2727

2828
- (BOOL)application:(UIApplication *)application
2929
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
30-
NSLog(@"Build version: %d", __apple_build_version__);
30+
NSLog(@"Build version: %s", __VERSION__);
3131

3232
if (kAPIKey.length == 0) {
3333
// Blow up if APIKey has not yet been set.

‎GoogleMaps/GoogleMapsDemos/MapsDemoAssets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@
8989
"idiom" : "ipad",
9090
"filename" : "Maps-SDK-Demo-App_167.png",
9191
"scale" : "2x"
92-
},
93-
{
94-
"idiom" : "ios-marketing",
95-
"size" : "1024x1024",
96-
"scale" : "1x"
9792
}
9893
],
9994
"info" : {

‎GoogleMaps/GoogleMapsDemos/MasterViewController.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 Google Inc. All rights reserved.
2+
* Copyright 2016 Google LLC. All rights reserved.
33
*
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -22,6 +22,6 @@
2222
UITableViewDataSource,
2323
UITableViewDelegate>
2424

25-
@property(nonatomic, assign) DemoAppDelegate *appDelegate;
25+
@property(nonatomic, weak) DemoAppDelegate *appDelegate;
2626

2727
@end

‎GoogleMaps/GoogleMapsDemos/MasterViewController.m‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 Google Inc. All rights reserved.
2+
* Copyright 2016 Google LLC. All rights reserved.
33
*
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -15,9 +15,10 @@
1515

1616
#import "GoogleMapsDemos/MasterViewController.h"
1717

18-
#import <GoogleMaps/GoogleMaps.h>
1918
#import "GoogleMapsDemos/DemoAppDelegate.h"
2019
#import "GoogleMapsDemos/Samples/Samples.h"
20+
#import <GoogleMaps/GoogleMaps.h>
21+
2122

2223
@implementation MasterViewController {
2324
NSArray *_demos;
@@ -46,7 +47,7 @@ - (void)viewDidLoad {
4647
}
4748

4849
self.title = NSLocalizedString(@"Maps SDK Demos", @"Maps SDK Demos");
49-
self.title = [NSString stringWithFormat:@"%@: %@", self.title, [GMSServices SDKVersion]];
50+
self.title = [NSString stringWithFormat:@"%@: %@", self.title, [GMSServices SDKLongVersion]];
5051

5152
self.tableView.autoresizingMask =
5253
UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;

‎GoogleMaps/GoogleMapsDemos/SDKDemoAPIKey.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 Google Inc. All rights reserved.
2+
* Copyright 2016 Google LLC. All rights reserved.
33
*
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -21,5 +21,5 @@
2121
* https://developers.google.com/maps/documentation/ios/start#get-key
2222
*/
2323

24-
#error Register for API Key and insert here. Then delete this line.
25-
static NSString *const kAPIKey = @"";
24+
//#error Register for API Key and insert here. Then delete this line.
25+
static NSString *const kAPIKey = @";ajlksdf";

‎GoogleMaps/GoogleMapsDemos/Samples/AnimatedCurrentLocationViewController.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 Google Inc. All rights reserved.
2+
* Copyright 2016 Google LLC. All rights reserved.
33
*
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this

‎GoogleMaps/GoogleMapsDemos/Samples/AnimatedCurrentLocationViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 Google Inc. All rights reserved.
2+
* Copyright 2016 Google LLC. All rights reserved.
33
*
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this

‎GoogleMaps/GoogleMapsDemos/Samples/AnimatedUIViewMarkerViewController.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 Google Inc. All rights reserved.
2+
* Copyright 2016 Google LLC. All rights reserved.
33
*
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this

0 commit comments

Comments
 (0)