chore: Update Maps and Places samples to 7.4.0 (#167)

* chore: Update Maps and Places samples from CocoaPods

* chore: update snippets and tutorials to 7.4.0

---------

Co-authored-by: Angela Yu <[email protected]>

Author: googlemaps-bot

GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj

@@ -15,9 +15,7 @@ import GoogleMaps
 import UIKit
 
 @UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
-
-  var window: UIWindow?
+class AppDelegate: UIResponder, UIApplicationDelegate, UIWindowSceneDelegate {
 
   func application(
     _ application: UIApplication,
@@ -28,22 +26,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     // Metal is the preferred renderer.
     GMSServices.setMetalRendererEnabled(true)
 
-    // On iOS 15, continue to use opaque navigation bars like earlier iOS versions.
-    if #available(iOS 15.0, *) {
-      let navBarAppearance = UINavigationBarAppearance()
-      navBarAppearance.configureWithOpaqueBackground()
-      UINavigationBar.appearance().standardAppearance = navBarAppearance
-      UINavigationBar.appearance().scrollEdgeAppearance = navBarAppearance
-    }
-
-    let sampleListViewController = SampleListViewController()
-    let frame = UIScreen.main.bounds
-    let window = UIWindow(frame: frame)
-    let navigationController = UINavigationController(rootViewController: sampleListViewController)
-    window.rootViewController = navigationController
-    window.makeKeyAndVisible()
-    self.window = window
-
     return true
   }
+
+  func application(
+    _ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession,
+    options: UIScene.ConnectionOptions
+  ) -> UISceneConfiguration {
+    let config = UISceneConfiguration(
+      name: "Default configuration", sessionRole: connectingSceneSession.role)
+    config.delegateClass = SceneDelegate.self
+    return config
+  }
 }

GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/AppDelegate.swift

@@ -0,0 +1,40 @@
+// Copyright 2022 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
+
+class SceneDelegate: UIResponder, UIWindowSceneDelegate {
+
+  var window: UIWindow?
+
+  func scene(
+    _ scene: UIScene, willConnectTo session: UISceneSession,
+    options connectionOptions: UIScene.ConnectionOptions
+  ) {
+    guard let scene = scene as? UIWindowScene else { return }
+    window = .init(windowScene: scene)
+
+    // On iOS 15, continue to use opaque navigation bars like earlier iOS versions.
+    if #available(iOS 15.0, *) {
+      let navBarAppearance = UINavigationBarAppearance()
+      navBarAppearance.configureWithOpaqueBackground()
+      UINavigationBar.appearance().standardAppearance = navBarAppearance
+      UINavigationBar.appearance().scrollEdgeAppearance = navBarAppearance
+    }
+
+    let sampleListViewController = SampleListViewController()
+    let navigationController = UINavigationController(rootViewController: sampleListViewController)
+    window?.rootViewController = navigationController
+    window?.makeKeyAndVisible()
+  }
+}

GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/SceneDelegate.swift

@@ -2,5 +2,5 @@ source 'https://github.com/CocoaPods/Specs.git'
 
 target 'GoogleMapsSwiftDemos' do
     platform :ios, '13.0'
-    pod 'GoogleMaps', '= 7.3.0'
+    pod 'GoogleMaps', '= 7.4.0'
 end

GoogleMaps-Swift/Podfile

@@ -17,8 +17,6 @@
 
 @interface DemoAppDelegate : UIResponder <UIApplicationDelegate>
 
-@property(nonatomic) UIWindow *window;
-@property(nonatomic) UISplitViewController *splitViewController;
-@property(nonatomic) id servicesHandle;
+@property(nonatomic, nullable) id servicesHandle;
 
 @end

GoogleMaps/GoogleMapsDemos.xcodeproj/project.pbxproj

@@ -15,14 +15,12 @@
 
 #import "GoogleMapsDemos/DemoAppDelegate.h"
 
-#import "GoogleMapsDemos/MasterViewController.h"
-#import "GoogleMapsDemos/SDKDemoAPIKey.h"
 #import <GoogleMaps/GoogleMaps.h>
+#import "GoogleMapsDemos/DemoSceneDelegate.h"
+#import "GoogleMapsDemos/SDKDemoAPIKey.h"
 
 @implementation DemoAppDelegate
 
-@synthesize window = _window;
-
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
   NSLog(@"Build version: %s", __VERSION__);
@@ -46,29 +44,17 @@ - (BOOL)application:(UIApplication *)application
   // demo.
   NSLog(@"Open source licenses:\n%@", [GMSServices openSourceLicenseInfo]);
 
-  self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-  MasterViewController *master = [[MasterViewController alloc] init];
-
-  UINavigationController *masterNavigationController =
-      [[UINavigationController alloc] initWithRootViewController:master];
-
-  UIViewController *empty = [[UIViewController alloc] init];
-  UINavigationController *detailNavigationController =
-      [[UINavigationController alloc] initWithRootViewController:empty];
-
-  self.splitViewController = [[UISplitViewController alloc] init];
-  self.splitViewController.delegate = master;
-  self.splitViewController.preferredDisplayMode = UISplitViewControllerDisplayModeAllVisible;
-  self.splitViewController.viewControllers =
-      @[ masterNavigationController, detailNavigationController ];
-
-  empty.navigationItem.leftItemsSupplementBackButton = YES;
-  empty.navigationItem.leftBarButtonItem = self.splitViewController.displayModeButtonItem;
-
-  self.window.rootViewController = self.splitViewController;
-
-  [self.window makeKeyAndVisible];
   return YES;
 }
 
+- (UISceneConfiguration *)application:(UIApplication *)application
+    configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession
+                                   options:(UISceneConnectionOptions *)options {
+  UISceneConfiguration *configuration =
+      [UISceneConfiguration configurationWithName:@"Default Configuration"
+                                      sessionRole:connectingSceneSession.role];
+  configuration.delegateClass = [DemoSceneDelegate class];
+  return configuration;
+}
+
 @end

GoogleMaps/GoogleMapsDemos/DemoAppDelegate.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022 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/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DemoSceneDelegate : UIResponder <UIWindowSceneDelegate>
+@property(nonatomic, nullable) UIWindow *window;
+@property(nonatomic, nullable) UISplitViewController *splitViewController;
+@end
+
+NS_ASSUME_NONNULL_END

GoogleMaps/GoogleMapsDemos/DemoAppDelegate.m

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022 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 "GoogleMapsDemos/DemoSceneDelegate.h"
+
+#import "GoogleMapsDemos/SampleListViewController.h"
+
+@implementation DemoSceneDelegate
+
+- (void)scene:(UIScene *)scene
+    willConnectToSession:(UISceneSession *)session
+                 options:(UISceneConnectionOptions *)connectionOptions {
+  if (![scene isKindOfClass:[UIWindowScene class]]) {
+    return;
+  }
+  UIWindowScene *windowScene = (UIWindowScene *)scene;
+  self.window = [[UIWindow alloc] initWithWindowScene:windowScene];
+
+  SampleListViewController *sampleListViewController = [[SampleListViewController alloc] init];
+
+  UINavigationController *rootNavigationController =
+      [[UINavigationController alloc] initWithRootViewController:sampleListViewController];
+
+  UIViewController *detailController = [[UIViewController alloc] init];
+
+  self.splitViewController = [[UISplitViewController alloc] init];
+  self.splitViewController.delegate = sampleListViewController;
+  self.splitViewController.preferredDisplayMode = UISplitViewControllerDisplayModeAllVisible;
+  self.splitViewController.viewControllers = @[ rootNavigationController, detailController ];
+
+  self.window.rootViewController = self.splitViewController;
+  [self.window makeKeyAndVisible];
+}
+
+@end

GoogleMaps/GoogleMapsDemos/DemoSceneDelegate.h

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2016 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/UIKit.h>
+
+@interface SampleListViewController
+    : UITableViewController <UISplitViewControllerDelegate, UISearchResultsUpdating>
+
+@end