Code clean-up.

mapbox · Sep 6, 2022 · 53ac7cd · 53ac7cd
1 parent da520d7
commit 53ac7cd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/Sources/MapboxNavigation/CameraController.swift b/Sources/MapboxNavigation/CameraController.swift
@@ -105,20 +105,23 @@ class CameraController: NavigationComponent, NavigationComponentDelegate {
     }
 
     @objc func navigationCameraStateDidChange(_ notification: Notification) {
-        guard let navigationCameraState = notification.userInfo?[NavigationCamera.NotificationUserInfoKey.state] as? NavigationCameraState else { return }
+        guard let navigationViewController = navigationViewData.containerViewController as? NavigationViewController,
+              let navigationCameraState = notification.userInfo?[NavigationCamera.NotificationUserInfoKey.state] as? NavigationCameraState else {
+            return
+        }
 
         updateNavigationCameraViewport()
 
         switch navigationCameraState {
         case .transitionToFollowing, .following:
-            (navigationViewData.containerViewController as? NavigationViewController)?.overviewButton.isHidden = false
+            navigationViewController.overviewButton.isHidden = false
             navigationViewData.navigationView.resumeButton.isHidden = true
             if let _ = navigationViewData.navigationView.wayNameView.text?.nonEmptyString {
                 navigationViewData.navigationView.wayNameView.containerView.isHidden = false
             }
             break
         case .idle, .transitionToOverview, .overview:
-            (navigationViewData.containerViewController as? NavigationViewController)?.overviewButton.isHidden = true
+            navigationViewController.overviewButton.isHidden = true
             navigationViewData.navigationView.resumeButton.isHidden = false
             navigationViewData.navigationView.wayNameView.containerView.isHidden = true
             break
@@ -165,9 +168,10 @@ class CameraController: NavigationComponent, NavigationComponentDelegate {
     // MARK: NavigationComponentDelegate Implementation
 
     func navigationViewDidLoad(_: UIView) {
-        (navigationViewData.containerViewController as? NavigationViewController)?.overviewButton.addTarget(self,
-                                                                                                            action: #selector(overview(_:)),
-                                                                                                            for: .touchUpInside)
+        let navigationViewController = navigationViewData.containerViewController as? NavigationViewController
+        navigationViewController?.overviewButton.addTarget(self,
+                                                          action: #selector(overview(_:)),
+                                                          for: .touchUpInside)
 
         navigationViewData.navigationView.resumeButton.addTarget(self,
                                                                  action: #selector(recenter(_:)),

diff --git a/Sources/MapboxNavigation/OrnamentsController.swift b/Sources/MapboxNavigation/OrnamentsController.swift
@@ -202,18 +202,24 @@ class OrnamentsController: NavigationComponent, NavigationComponentDelegate {
     // MARK: NavigationComponentDelegate implementation
 
     func navigationViewDidLoad(_: UIView) {
-        (navigationViewData.containerViewController as? NavigationViewController)?.muteButton.addTarget(self,
-                                                                                    action: #selector(toggleMute(_:)),
-                                                                                    for: .touchUpInside)
+        guard let navigationViewController = navigationViewData.containerViewController as? NavigationViewController else {
+            return
+        }
 
-        (navigationViewData.containerViewController as? NavigationViewController)?.reportButton.addTarget(self,
-                                                                                      action: #selector(feedback(_:)),
-                                                                                      for: .touchUpInside)
+        navigationViewController.muteButton.addTarget(self,
+                                                      action: #selector(toggleMute(_:)),
+                                                      for: .touchUpInside)
+
+        navigationViewController.reportButton.addTarget(self,
+                                                        action: #selector(feedback(_:)),
+                                                        for: .touchUpInside)
     }
 
     func navigationViewWillAppear(_: Bool) {
         resumeNotifications()
-        (navigationViewData.containerViewController as? NavigationViewController)?.muteButton.isSelected = NavigationSettings.shared.voiceMuted
+
+        let navigationViewController = navigationViewData.containerViewController as? NavigationViewController
+        navigationViewController?.muteButton.isSelected = NavigationSettings.shared.voiceMuted
     }
 
     func navigationViewDidDisappear(_: Bool) {