Fix issues with ExitView and GenericRouteShield styling on iOS and CarPlay.

Author: MaximAlien

Sources/MapboxNavigation/ExitView.swift

@@ -148,17 +148,19 @@ public class ExitView: StylableView {
                              styleID: String?,
                              dataSource: DataSource,
                              traitCollection: UITraitCollection) -> String {
-        var appearance = ExitView.appearance()
+        var appearance = ExitView.appearance(for: UITraitCollection(userInterfaceIdiom: .phone))
         if traitCollection.userInterfaceIdiom == .carPlay {
+            let carPlayTraitCollection = UITraitCollection(userInterfaceIdiom: .carPlay)
+            
             if #available(iOS 12.0, *) {
-                let carPlayTraitCollection = UITraitCollection(traitsFrom: [
-                    UITraitCollection(userInterfaceIdiom: .carPlay),
+                let traitCollection = UITraitCollection(traitsFrom: [
+                    carPlayTraitCollection,
                     UITraitCollection(userInterfaceStyle: traitCollection.userInterfaceStyle)
                 ])
 
-                appearance = ExitView.appearance(for: carPlayTraitCollection)
+                appearance = ExitView.appearance(for: traitCollection)
             } else {
-                appearance = ExitView.appearance(for: UITraitCollection(userInterfaceIdiom: .carPlay))
+                appearance = ExitView.appearance(for: carPlayTraitCollection)
             }
         }
 

Sources/MapboxNavigation/GenericRouteShield.swift

@@ -95,7 +95,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(styleID: String?, dataSource: DataSource, traitCollection: UITraitCollection) -> String {
-        var appearance = GenericRouteShield.appearance()
+        var appearance = GenericRouteShield.appearance(for: UITraitCollection(userInterfaceIdiom: .phone))
         if traitCollection.userInterfaceIdiom == .carPlay {
             if #available(iOS 12.0, *) {
                 let carPlayTraitCollection = UITraitCollection(traitsFrom: [

Sources/MapboxNavigation/InstructionPresenter.swift

@@ -243,14 +243,14 @@ class InstructionPresenter {
             let genericRouteShield = GenericRouteShield(pointSize: dataSource.font.pointSize,
                                                         text: text)
 
-            var appearance = GenericRouteShield.appearance()
+            var appearance = GenericRouteShield.appearance(for: UITraitCollection(userInterfaceIdiom: .phone))
             if traitCollection.userInterfaceIdiom == .carPlay {
                 let carPlayTraitCollection = UITraitCollection(userInterfaceIdiom: .carPlay)
 
                 if #available(iOS 12.0, *) {
                     let traitCollection = UITraitCollection(traitsFrom: [
                         carPlayTraitCollection,
-                        UITraitCollection(userInterfaceStyle: self.traitCollection.userInterfaceStyle)
+                        UITraitCollection(userInterfaceStyle: traitCollection.userInterfaceStyle)
                     ])
 
                     appearance = GenericRouteShield.appearance(for: traitCollection)
@@ -292,14 +292,14 @@ class InstructionPresenter {
                                     side: side,
                                     text: text)
 
-            var appearance = ExitView.appearance()
+            var appearance = ExitView.appearance(for: UITraitCollection(userInterfaceIdiom: .phone))
             if traitCollection.userInterfaceIdiom == .carPlay {
                 let carPlayTraitCollection = UITraitCollection(userInterfaceIdiom: .carPlay)
 
                 if #available(iOS 12.0, *) {
                     let traitCollection = UITraitCollection(traitsFrom: [
                         carPlayTraitCollection,
-                        UITraitCollection(userInterfaceStyle: self.traitCollection.userInterfaceStyle)
+                        UITraitCollection(userInterfaceStyle: traitCollection.userInterfaceStyle)
                     ])
 
                     appearance = ExitView.appearance(for: traitCollection)