CarPlay maneuver color fix (#4482)

* vk/NAVIOS-1233-carplay-maneuver-color: fixed applying correct style type when generating maneuver arrow for carplay; CHANGELOG updated
mapbox · Jun 19, 2023 · 80557c2 · 80557c2
1 parent 06d83f2
commit 80557c2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### CarPlay
 
 * Fixed an issue where starting navigation while connected to CarPlay but not having window active resulted in CarPlay view to be stuck at preview screen. ([#4477](https://github.com/mapbox/mapbox-navigation-ios/pull/4477))
+* Fixed an issue where maneuver arrow was not changing color following day/night style automatic toggling. ([#4482](https://github.com/mapbox/mapbox-navigation-ios/pull/4482))
 
 ### Other changes
 

diff --git a/Sources/MapboxNavigation/CarPlayNavigationViewController.swift b/Sources/MapboxNavigation/CarPlayNavigationViewController.swift
@@ -919,9 +919,8 @@ open class CarPlayNavigationViewController: UIViewController, BuildingHighlighti
 
         // Add maneuver arrow
         if #available(iOS 13.0, *) {
-            let userInterfaceStyle = traitCollection.userInterfaceStyle
             primaryManeuver.symbolImage = visualInstruction.primaryInstruction.maneuverImage(side: visualInstruction.drivingSide,
-                                                                                             userInterfaceStyle: userInterfaceStyle)
+                                                                                             type: styleManager?.currentStyleType)
         } else {
             primaryManeuver.symbolSet = visualInstruction.primaryInstruction.maneuverImageSet(side: visualInstruction.drivingSide)
         }

diff --git a/Sources/MapboxNavigation/VisualInstruction.swift b/Sources/MapboxNavigation/VisualInstruction.swift
@@ -116,18 +116,15 @@ extension VisualInstruction {
      - returns: A `UIImage` representing the maneuver.
      */
     @available(iOS 13.0, *)
-    func maneuverImage(side: DrivingSide, userInterfaceStyle: UIUserInterfaceStyle) -> UIImage? {
+    func maneuverImage(side: DrivingSide,
+                       type styleType: StyleType?
+    ) -> UIImage? {
         let color: UIColor
-        switch userInterfaceStyle {
-        case .unspecified:
+        switch styleType {
+        case .day, .none:
             color = .black
-        case .light:
-            color = .black
-        case .dark:
+        case .night:
             color = .white
-        @unknown default:
-            Log.error("Error occured with unknown UIUserInterfaceStyle.", category: .navigationUI)
-            return nil
         }
         return maneuverViewImage(drivingSide: side,
                                  color: color,