chore: Update Maps and Places samples from CocoaPods

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos.xcodeproj/project.pbxproj

@@ -28,6 +28,7 @@
 		2CDC67FEB6CB48BBF4B08275 /* GeocoderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB2EE1D7695E0D90DBEAF4CC /* GeocoderViewController.swift */; };
 		2EF9DA94B3F482457E71BDE3 /* australia-large@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B8B740D2FA058395C5C0F32A /* australia-large@2x.png */; };
 		32F4182C033B514D3D3EBD8E /* DataDrivenStylingBasicViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8401BB4562DADADAC4885D68 /* DataDrivenStylingBasicViewController.swift */; };
+		35C6DC4F1ACE4DBEA591D7C5 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 022F36790544AECB7DE221A9 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */; };
 		37B37E52E432743785C5A1D4 /* popup_santa.png in Resources */ = {isa = PBXBuildFile; fileRef = 4494DA7385C95B5268429894 /* popup_santa.png */; };
 		3841C1144E1495DF4C3752CA /* boat.png in Resources */ = {isa = PBXBuildFile; fileRef = D20F48E81C4AB68DA9666435 /* boat.png */; };
 		3AD0D195591655CD7DF4BDB9 /* MapLayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E30250B9C564E339DB5564CF /* MapLayerViewController.swift */; };
@@ -63,7 +64,6 @@
 		82043308F53102E889C6B28F /* DataDrivenStylingEventsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EF2332C983F2B61EE8D591A /* DataDrivenStylingEventsViewController.swift */; };
 		8672736AB1BB98F58F6C5ED9 /* botswana.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CB004432BC22DC920797C87 /* botswana.png */; };
 		8CB666464C345428DFBC567C /* GMSMapStyle+Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E945C0EF87794CB7BBACB41 /* GMSMapStyle+Bundle.swift */; };
-		9231B336F9410D85C0AC5AF6 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E435025CEF4F4BC87E93D58 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */; };
 		968451616004D31510CD1EAF /* PanoramaServiceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E42C1CA863AAC166B9252B90 /* PanoramaServiceController.swift */; };
 		96AC98FFADF710277E6F4309 /* boat@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C6FC465538CF0231E3E32EF /* boat@2x.png */; };
 		9A11BCC3B4489D9E4B60BEA7 /* AnimatedUIViewMarkerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90FD42CF0008B034BF8B30F5 /* AnimatedUIViewMarkerViewController.swift */; };
@@ -112,6 +112,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		022F36790544AECB7DE221A9 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		03FD71C70F7607AB869917C7 /* botswana-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "botswana-large.png"; sourceTree = "<group>"; };
 		07D2376C2CFD352BB816BAD1 /* FrameRateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameRateViewController.swift; sourceTree = "<group>"; };
 		07DCB8EA2727FC4DE5352224 /* MarkerLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerLayerViewController.swift; sourceTree = "<group>"; };
@@ -129,12 +130,12 @@
 		2E152725ABC167064FB9B792 /* voyager.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = voyager.png; sourceTree = "<group>"; };
 		3061757D4FF862BB7A736490 /* track.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = track.json; sourceTree = "<group>"; };
 		31797C544AD8076A06525A65 /* mapstyle-retro.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mapstyle-retro.json"; sourceTree = "<group>"; };
+		330D57C5175021B60EBD7BB6 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; sourceTree = "<group>"; };
 		36A148313C8CDFAED9C9C4B4 /* IndoorMuseumNavigationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndoorMuseumNavigationViewController.swift; sourceTree = "<group>"; };
 		382782429644E90B5A1447EA /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		392A7D132855C21094CFB021 /* australia-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "australia-large.png"; sourceTree = "<group>"; };
 		3A66A9AD0A36086F2FAFAE15 /* MarkerEventsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerEventsViewController.swift; sourceTree = "<group>"; };
 		3A7D2BC402119B009115B458 /* walking_dot@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "walking_dot@3x.png"; sourceTree = "<group>"; };
-		3E435025CEF4F4BC87E93D58 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3EB880171F8782BB95056A63 /* step5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step5.png; sourceTree = "<group>"; };
 		401F0FC38C20C76F7D1C0A47 /* step8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step8.png; sourceTree = "<group>"; };
 		4162E354E88F4EFE2CF145C0 /* GoogleMapsSwiftXCFrameworkDemos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoogleMapsSwiftXCFrameworkDemos.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -174,7 +175,6 @@
 		977C1755E05CB7EA2762CA06 /* DataDrivenStylingSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataDrivenStylingSearchViewController.swift; sourceTree = "<group>"; };
 		9862C46F7F70E4C7EF238EA6 /* CustomIndoorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomIndoorViewController.swift; sourceTree = "<group>"; };
 		98E9B6EA859BE405346819D9 /* MapTypesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTypesViewController.swift; sourceTree = "<group>"; };
-		9A14E4160277506E25D036FD /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; sourceTree = "<group>"; };
 		9D352205B6B3A8624B7640B1 /* VisibleRegionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisibleRegionViewController.swift; sourceTree = "<group>"; };
 		9F85E37BBCF08547A4D6D1EB /* aeroplane@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "aeroplane@2x.png"; sourceTree = "<group>"; };
 		A489BF0E3CECC559937A38D1 /* arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = arrow.png; sourceTree = "<group>"; };
@@ -224,7 +224,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				78D1E74704B5966731F0EAFD /* UIKit.framework in Frameworks */,
-				9231B336F9410D85C0AC5AF6 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */,
+				35C6DC4F1ACE4DBEA591D7C5 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -235,15 +235,15 @@
 			isa = PBXGroup;
 			children = (
 				813AA650D6B913CB76AAAB53 /* UIKit.framework */,
-				3E435025CEF4F4BC87E93D58 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */,
+				022F36790544AECB7DE221A9 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		3C21D7D528A2D38D67C35B40 /* Pods */ = {
+		2BA3AE1B8B11AFC983099FBB /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				9A14E4160277506E25D036FD /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */,
+				330D57C5175021B60EBD7BB6 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */,
 			);
 			name = Pods;
 			path = Pods;
@@ -391,7 +391,7 @@
 				66BBCDCC5A47AE0211100656 /* Source */,
 				1770C8310E66B2F5721EFB53 /* Frameworks */,
 				C28851C9B618723E4F44AB23 /* Products */,
-				3C21D7D528A2D38D67C35B40 /* Pods */,
+				2BA3AE1B8B11AFC983099FBB /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -414,11 +414,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 5AC1A4250158D74DFA863CCE /* Build configuration list for PBXNativeTarget "GoogleMapsSwiftXCFrameworkDemos" */;
 			buildPhases = (
-				C35727428108954F084870AD /* [CP] Check Pods Manifest.lock */,
+				20C3AF031BC3CB8F37C30824 /* [CP] Check Pods Manifest.lock */,
 				3F21832F0D03F8AC6CEF22A0 /* Resources */,
 				BA0F106D7033E3A8544A3F80 /* Sources */,
 				D163048ECCA404350BF50B51 /* Frameworks */,
-				06B5175459B7D2FC50E31289 /* [CP] Copy Pods Resources */,
+				EF6CE6B2D0BCF18439CFED86 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -518,48 +518,48 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		06B5175459B7D2FC50E31289 /* [CP] Copy Pods Resources */ = {
+		20C3AF031BC3CB8F37C30824 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle",
+				"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftXCFrameworkDemos-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh\"\n";
+			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";
 			showEnvVarsInLog = 0;
 		};
-		C35727428108954F084870AD /* [CP] Check Pods Manifest.lock */ = {
+		EF6CE6B2D0BCF18439CFED86 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
+				"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle",
 			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftXCFrameworkDemos-checkManifestLockResult.txt",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -624,14 +624,14 @@
 /* Begin XCBuildConfiguration section */
 		060E158855CB2E3846F43DB2 /* Default */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9A14E4160277506E25D036FD /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */;
+			baseConfigurationReference = 330D57C5175021B60EBD7BB6 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */;
 			buildSettings = {
 				"ARCHS[sdk=iphonesimulator*]" = x86_64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				INFOPLIST_FILE = ./GoogleMapsSwiftXCFrameworkDemos/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/SampleListViewController.swift

@@ -80,7 +80,7 @@ extension SampleListViewController: UITableViewDelegate {
     shouldCollapseDetailViewController = false
     tableView.deselectRow(at: indexPath, animated: true)
     if let sample = sample(at: indexPath) {
-      let viewController = sample.viewControllerClass.init()
+      let viewController = sample.viewController
       viewController.title = sample.title
       let navController = UINavigationController(rootViewController: viewController)
       navController.navigationBar.isTranslucent = false
@@ -135,7 +135,6 @@ extension SampleListViewController: UISearchResultsUpdating {
 
 extension Sample {
   func matches(_ filter: String) -> Bool {
-    return title.lowercased().contains(filter)
-      || String(describing: viewControllerClass).lowercased().contains(filter)
+    return searchString.lowercased().contains(filter)
   }
 }

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/AnimatedCurrentLocationViewController.swift

@@ -28,6 +28,10 @@ final class AnimatedCurrentLocationViewController: UIViewController {
   override func loadView() {
     mapView.settings.myLocationButton = false
     mapView.settings.indoorPicker = false
+
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     view = mapView
   }
 

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/AnimatedUIViewMarkerViewController.swift

@@ -25,6 +25,9 @@ class AnimatedUIViewMarkerViewController: UIViewController {
   private var infoView: UIImageView?
 
   override func loadView() {
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     view = mapView
     mapView.delegate = self
   }

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/BasicMapViewController.swift

@@ -23,6 +23,10 @@ class BasicMapViewController: UIViewController {
     // Seattle coordinates
     let camera = GMSCameraPosition(latitude: 47.6089945, longitude: -122.3410462, zoom: 14)
     let mapView = GMSMapView(frame: view.bounds, camera: camera)
+
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     mapView.delegate = self
     view = mapView
     navigationController?.navigationBar.isTranslucent = false

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/CameraViewController.swift

@@ -30,6 +30,9 @@ class CameraViewController: UIViewController {
   private var timer: Timer?
 
   override func loadView() {
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     mapView.settings.zoomGestures = false
     mapView.settings.scrollGestures = false
     mapView.settings.rotateGestures = false

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/CustomIndoorViewController.swift

@@ -73,7 +73,7 @@ extension CustomIndoorViewController: GMSIndoorDisplayDelegate {
     self.sampleLevels = sampleLevels
 
     levelPickerView.reloadAllComponents()
-    levelPickerView.selectRow(-1, inComponent: 0, animated: false)
+    levelPickerView.selectRow(0, inComponent: 0, animated: false)
   }
 
   func didChangeActiveLevel(_ level: GMSIndoorLevel?) {

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/CustomMarkersViewController.swift

@@ -24,6 +24,9 @@ class CustomMarkersViewController: UIViewController {
   }()
 
   override func loadView() {
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     view = mapView
     addDefaultMarkers()
     navigationController?.navigationBar.isTranslucent = false

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DoubleMapViewController.swift

@@ -20,10 +20,18 @@ class DoubleMapViewController: UIViewController {
     latitude: 37.7847, longitude: -122.41, zoom: 5)
   private lazy var mapView: GMSMapView = {
     let mapView = GMSMapView(frame: .zero, camera: sanFranciscoCamera)
+
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     return mapView
   }()
   private lazy var boundMapView: GMSMapView = {
     let mapView = GMSMapView(frame: .zero, camera: sanFranciscoCamera)
+
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     return mapView
   }()
 

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/FitBoundsViewController.swift

@@ -44,6 +44,9 @@ class FitBoundsViewController: UIViewController {
     mapView.delegate = self
     view = mapView
 
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     // Creates a button that, when pressed, updates the camera to fit the bounds.
     navigationItem.rightBarButtonItem = UIBarButtonItem(
       title: "Fit Bounds", style: .plain, target: self, action: #selector(fitBounds))

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/FrameRateViewController.swift

@@ -25,6 +25,9 @@ class FrameRateViewController: UIViewController {
   override func loadView() {
     view = mapView
 
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     statusTextView.text = ""
     statusTextView.textAlignment = .center
     statusTextView.backgroundColor = UIColor(white: 1, alpha: 0.8)

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/GeocoderViewController.swift

@@ -27,6 +27,9 @@ class GeocoderViewController: UIViewController {
   override func loadView() {
     view = mapView
     mapView.delegate = self
+
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
   }
 }
 

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/GestureControlViewController.swift

@@ -27,6 +27,9 @@ class GestureControlViewController: UIViewController {
   override func viewDidLoad() {
     super.viewDidLoad()
 
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     view.addSubview(mapView)
 
     let holder = UIView(frame: .zero)

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/GradientPolylinesViewController.swift

@@ -42,6 +42,9 @@ final class GradientPolylinesViewController: UIViewController {
   }()
 
   override func loadView() {
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     view = mapView
   }
 

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/GroundOverlayViewController.swift

@@ -24,6 +24,10 @@ final class GroundOverlayViewController: UIViewController {
     let newark = GMSGeometryInterpolate(southWest, northEast, 0.5)
     let cameraPosition = GMSCameraPosition(target: newark, zoom: 12, bearing: 0, viewingAngle: 45)
     let mapView = GMSMapView(frame: .zero, camera: cameraPosition)
+
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     mapView.delegate = self
     view = mapView
 

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/IndoorMuseumNavigationViewController.swift

@@ -48,6 +48,9 @@ class IndoorMuseumNavigationViewController: UIViewController {
   private var sampleLevels: [SampleLevel] = []
 
   override func loadView() {
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     view = mapView
   }
 

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/MapLayerViewController.swift

@@ -24,6 +24,10 @@ class MapLayerViewController: UIViewController {
 
   override func loadView() {
     mapView.isMyLocationEnabled = true
+
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     view = mapView
 
     navigationItem.rightBarButtonItem = UIBarButtonItem(

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/MapTypesViewController.swift

@@ -27,6 +27,9 @@ class MapTypesViewController: UIViewController {
   }()
 
   override func loadView() {
+    // Opt the MapView into automatic dark mode switching.
+    mapView.overrideUserInterfaceStyle = .unspecified
+
     view = mapView
   }