Use the singleton of SpriteRepository for instructions and road name label. (#3864)

Author: ShanMa1991

CHANGELOG.md

@@ -19,6 +19,7 @@
 * `UserPuckCourseView` no longer desaturates its color based on the age of the last location update. `RouteController` simulates location updates whenever Location Services is unable to receive real location updates. To ensure a steady stream of location updates outside of turn-by-turn navigation, install a `PassiveLocationManager`. ([#3836](https://github.com/mapbox/mapbox-navigation-ios/pull/3836))
 * Fixed an issue where shields disappeared after the application returns to the foreground. ([#3840](https://github.com/mapbox/mapbox-navigation-ios/pull/3840))
 * Fixed an issue where `EndOfRouteCommentView` is using dark style when only light style is allowed. ([#3845](https://github.com/mapbox/mapbox-navigation-ios/pull/3845))
+* Fixed an issue where exit views and generic shields in top banner don't get updated when style changes in active navigation. ([#3864](https://github.com/mapbox/mapbox-navigation-ios/pull/3864))
 
 ### CarPlay
 

Sources/MapboxNavigation/CarPlayNavigationViewController.swift

@@ -398,7 +398,6 @@ open class CarPlayNavigationViewController: UIViewController, BuildingHighlighti
         setupStyleManager()
 
         observeNotifications(navigationService)
-        updateManeuvers(navigationService.routeProgress)
         navigationService.start()
         carPlayManager.delegate?.carPlayManager(carPlayManager, didBeginNavigationWith: navigationService)
         currentLegIndexMapped = navigationService.router.routeProgress.legIndex
@@ -838,6 +837,7 @@ extension CarPlayNavigationViewController: StyleManagerDelegate {
             mapboxMapStyle?.uri = styleURI
             // Update the sprite repository of wayNameView when map style changes.
             wayNameView?.label.updateStyle(styleURI: styleURI)
+            updateManeuvers(navigationService.routeProgress)
         }
     }
 

Sources/MapboxNavigation/DayStyle.swift

@@ -245,6 +245,14 @@ open class DayStyle: Style {
         FeedbackStyleView.appearance(whenContainedInInstancesOf: [FeedbackViewController.self]).backgroundColor = .white
         FeedbackCollectionView.appearance().backgroundColor = .white
         FeedbackCollectionView.appearance().cellColor = .black
+        InstructionLabel.appearance().roadShieldBlackColor = .roadShieldBlackColor
+        InstructionLabel.appearance().roadShieldBlueColor = .roadShieldBlueColor
+        InstructionLabel.appearance().roadShieldGreenColor = .roadShieldGreenColor
+        InstructionLabel.appearance().roadShieldRedColor = .roadShieldRedColor
+        InstructionLabel.appearance().roadShieldWhiteColor = .roadShieldWhiteColor
+        InstructionLabel.appearance().roadShieldYellowColor = .roadShieldYellowColor
+        InstructionLabel.appearance().roadShieldOrangeColor = .roadShieldOrangeColor
+        InstructionLabel.appearance().roadShieldDefaultColor = .roadShieldDefaultColor
 
         #if swift(>=5.5)
         if #available(iOS 15.0, *) {

Sources/MapboxNavigation/ExitView.swift

@@ -145,6 +145,7 @@ public class ExitView: StylableView {
      This generates the cache key needed to hold the `ExitView`'s `imageRepresentation` in the `ImageCache` caching engine.
      */
     static func criticalHash(side: ExitSide,
+                             styleID: String?,
                              dataSource: DataSource,
                              traitCollection: UITraitCollection) -> String {
         var appearance = ExitView.appearance()
@@ -163,6 +164,7 @@ public class ExitView: StylableView {
 
         var criticalProperties: [AnyHashable?] = [
             side,
+            styleID,
             dataSource.font.pointSize,
             appearance.backgroundColor,
             appearance.foregroundColor,

Sources/MapboxNavigation/GenericRouteShield.swift

@@ -94,7 +94,7 @@ public class GenericRouteShield: StylableView {
     /**
      This generates the cache key needed to hold the `GenericRouteShield`'s `imageRepresentation` in the `ImageCache` caching engine.
      */
-    static func criticalHash(dataSource: DataSource, traitCollection: UITraitCollection) -> String {
+    static func criticalHash(styleID: String?, dataSource: DataSource, traitCollection: UITraitCollection) -> String {
         var appearance = GenericRouteShield.appearance()
         if traitCollection.userInterfaceIdiom == .carPlay {
             if #available(iOS 12.0, *) {
@@ -110,6 +110,7 @@ public class GenericRouteShield: StylableView {
         }
 
         var criticalProperties: [AnyHashable?] = [
+            styleID,
             dataSource.font.pointSize,
             appearance.backgroundColor,
             appearance.foregroundColor,

Sources/MapboxNavigation/InstructionLabel.swift

@@ -4,6 +4,14 @@ import MapboxDirections
 
 /// :nodoc:
 open class InstructionLabel: StylableLabel, InstructionPresenterDataSource {
+    @objc dynamic var roadShieldBlackColor: UIColor = .roadShieldBlackColor
+    @objc dynamic var roadShieldBlueColor: UIColor = .roadShieldBlueColor
+    @objc dynamic var roadShieldGreenColor: UIColor = .roadShieldGreenColor
+    @objc dynamic var roadShieldRedColor: UIColor = .roadShieldRedColor
+    @objc dynamic var roadShieldWhiteColor: UIColor = .roadShieldWhiteColor
+    @objc dynamic var roadShieldYellowColor: UIColor = .roadShieldYellowColor
+    @objc dynamic var roadShieldOrangeColor: UIColor = .roadShieldOrangeColor
+    @objc dynamic var roadShieldDefaultColor: UIColor = .roadShieldDefaultColor
 
     typealias AvailableBoundsHandler = () -> (CGRect)
     var availableBounds: AvailableBoundsHandler!
@@ -12,48 +20,66 @@ open class InstructionLabel: StylableLabel, InstructionPresenterDataSource {
     // displayed. The bounds of `InstructionLabel` will be used if this view is unset.
     weak var viewForAvailableBoundsCalculation: UIView?
     var shieldHeight: CGFloat = 30
-    var imageRepository: ImageRepository = .shared
     var imageDownloadCompletion: (() -> Void)?
     weak var instructionDelegate: VisualInstructionDelegate?
 
     var instruction: VisualInstruction? {
         didSet {
-            guard let instruction = instruction else {
-                text = nil
-                instructionPresenter = nil
-                return
-            }
-            let update: InstructionPresenter.ShieldDownloadCompletion = { [weak self] (attributedText) in
-                guard let self = self else { return }
-                self.attributedText = attributedText
-                self.imageDownloadCompletion?()
-            }
-            
-            let presenter = InstructionPresenter(instruction,
-                                                 dataSource: self,
-                                                 imageRepository: imageRepository,
-                                                 traitCollection: traitCollection,
-                                                 downloadCompletion: update)
-            
-            let attributed = presenter.attributedText()
-            attributedText = instructionDelegate?.label(self, willPresent: instruction, as: attributed) ?? attributed
-            instructionPresenter = presenter
+            updateLabelAttributedText()
         }
     }
+    
+    private func updateLabelAttributedText() {
+        guard let instruction = instruction else {
+            text = nil
+            return
+        }
+        
+        let update: InstructionPresenter.ShieldDownloadCompletion = { [weak self] (attributedText) in
+            guard let self = self else { return }
+            self.attributedText = attributedText
+            self.imageDownloadCompletion?()
+        }
+        
+        let presenter = InstructionPresenter(instruction,
+                                             dataSource: self,
+                                             traitCollection: traitCollection,
+                                             downloadCompletion: update)
+        
+        let attributed = presenter.attributedText()
+        attributedText = instructionDelegate?.label(self, willPresent: instruction, as: attributed) ?? attributed
+    }
 
     open override func update() {
-        let previousInstruction = instruction
-        instruction = previousInstruction
+        updateLabelAttributedText()
         super.update()
     }
 
     open override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
         update()
-        imageRepository.resetImageCache(nil)
     }
 
-    private var instructionPresenter: InstructionPresenter?
+    func shieldColor(from textColor: String) -> UIColor {
+        switch textColor {
+        case "black":
+            return roadShieldBlackColor
+        case "blue":
+            return roadShieldBlueColor
+        case "green":
+            return roadShieldGreenColor
+        case "red":
+            return roadShieldRedColor
+        case "white":
+            return roadShieldWhiteColor
+        case "yellow":
+            return roadShieldYellowColor
+        case "orange":
+            return roadShieldOrangeColor
+        default:
+            return roadShieldDefaultColor
+        }
+    }
 }
 
 /// :nodoc: