Skip to content

Commit afa57c4

Browse files
authored
Merge pull request #43 from googlemaps/chris/fix/samples_cleanup
chore(GoogleMaps, GooglePlaces): update samples
2 parents 84c2e25 + fadbd03 commit afa57c4

File tree

135 files changed

+723
-7368
lines changed

Some content is hidden

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

135 files changed

+723
-7368
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Xcode
2+
.DS_Store
23

34
## Build generated
45
build/

GoogleMaps/GoogleMapsDemos.xcodeproj/project.pbxproj

Lines changed: 226 additions & 215 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@
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"
9297
}
9398
],
9499
"info" : {

GooglePlacePicker/GooglePlacePickerDemos/Support/CGRect+Extensions.swift renamed to GoogleMaps/GoogleMapsDemos/UIViewController+GMSToastMessages.h

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
import CoreGraphics
16+
#import <UIKit/UIKit.h>
1717

18-
extension CGRect {
19-
var center: CGPoint {
20-
get {
21-
return CGPoint(x: origin.x+size.width/2, y: origin.y+size.height/2)
22-
}
23-
}
24-
}
18+
NS_ASSUME_NONNULL_BEGIN
19+
20+
@interface UIViewController (GMSToastMessages)
21+
22+
- (void)gms_showToastWithMessage:(NSString*)message;
23+
24+
@end
25+
26+
NS_ASSUME_NONNULL_END
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* Copyright 2016 Google Inc. All rights reserved.
3+
*
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
6+
* file except in compliance with the License. You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software distributed under
11+
* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
12+
* ANY KIND, either express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
#import "GoogleMapsDemos/UIViewController+GMSToastMessages.h"
17+
18+
@implementation UIViewController (GMSToastMessages)
19+
20+
- (void)gms_showToastWithMessage:(NSString *)message {
21+
UIAlertController *toast =
22+
[UIAlertController alertControllerWithTitle:nil
23+
message:message
24+
preferredStyle:UIAlertControllerStyleAlert];
25+
[self presentViewController:toast
26+
animated:YES
27+
completion:^{
28+
const int kDuration = 2;
29+
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, kDuration * NSEC_PER_SEC),
30+
dispatch_get_main_queue(), ^{
31+
[toast dismissViewControllerAnimated:YES completion:nil];
32+
});
33+
}];
34+
}
35+
36+
@end

GoogleMaps/Podfile

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

33
target 'GoogleMapsDemos' do
4-
pod 'GoogleMaps', '= 2.7.0'
4+
platform :ios, '9.0'
5+
pod 'GoogleMaps', '= 3.7.0'
56
end

GoogleMaps/README.GoogleMapsDemos

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ GoogleMapsDemos contains a demo application showcasing various features of
22
the Google Maps SDK for iOS.
33

44
Before starting, please note that these demos are directed towards a technical
5-
audience. You'll also need Xcode 7.3 or later, with the iOS SDK 9.3 or later.
5+
audience. You'll also need Xcode 9.0 or later, with the iOS SDK 9.3 or later.
66

77
If you're new to the SDK, please read the Introduction section of the Google
88
Maps SDK for iOS documentation-

GooglePlacePicker/GooglePlacePickerDemos.xcodeproj/project.pbxproj

Lines changed: 0 additions & 496 deletions
This file was deleted.

GooglePlacePicker/GooglePlacePickerDemos/AppDelegate.swift

Lines changed: 0 additions & 68 deletions
This file was deleted.

GooglePlacePicker/GooglePlacePickerDemos/Info.plist

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)