@complexify/expo-mapbox-navigation 1.1.0 → 1.1.2

package/ios/CustomNavigationStyle.swift

@@ -1,13 +1,15 @@
-import MapboxNavigation
+import Foundation
+import MapboxMaps
+import MapboxNavigationUIKit
 import UIKit
 
-class CustomNavigationStyle: DayStyle {
-    var speedLimitTextColor: UIColor?
-    var speedLimitBackgroundColor: UIColor?
-    var speedLimitBorderColor: UIColor?
-    var bottomBannerBackgroundColor: UIColor?
-    var wayNameTextColor: UIColor?
-    var wayNameBackgroundColor: UIColor?
+class CustomDayStyle: StandardDayStyle {
+    var customSpeedLimitTextColor: UIColor?
+    var customSpeedLimitBackgroundColor: UIColor?
+    var customSpeedLimitBorderColor: UIColor?
+    var customBottomBannerBackgroundColor: UIColor?
+    var customWayNameTextColor: UIColor?
+    var customWayNameBackgroundColor: UIColor?
     
     required init() {
         super.init()
@@ -17,28 +19,30 @@ class CustomNavigationStyle: DayStyle {
     override func apply() {
         super.apply()
         
+        let traitCollection = UIScreen.main.traitCollection
+        
         // Speed limit customization
-        if let textColor = speedLimitTextColor {
-            SpeedLimitView.appearance().textColor = textColor
+        if let textColor = customSpeedLimitTextColor {
+            SpeedLimitView.appearance(for: traitCollection).textColor = textColor
         }
-        if let bgColor = speedLimitBackgroundColor {
-            SpeedLimitView.appearance().signBackColor = bgColor
+        if let bgColor = customSpeedLimitBackgroundColor {
+            SpeedLimitView.appearance(for: traitCollection).signBackColor = bgColor
         }
-        if let borderColor = speedLimitBorderColor {
-            SpeedLimitView.appearance().regulatoryBorderColor = borderColor
+        if let borderColor = customSpeedLimitBorderColor {
+            SpeedLimitView.appearance(for: traitCollection).regulatoryBorderColor = borderColor
         }
         
         // Bottom banner customization
-        if let bottomBannerBg = bottomBannerBackgroundColor {
-            BottomBannerView.appearance().backgroundColor = bottomBannerBg
+        if let bottomBannerBg = customBottomBannerBackgroundColor {
+            BottomBannerView.appearance(for: traitCollection).backgroundColor = bottomBannerBg
         }
         
         // Way name customization
-        if let textColor = wayNameTextColor {
-            WayNameView.appearance().textColor = textColor
+        if let textColor = customWayNameTextColor {
+            WayNameView.appearance(for: traitCollection).textColor = textColor
         }
-        if let bgColor = wayNameBackgroundColor {
-            WayNameView.appearance().backgroundColor = bgColor.withAlphaComponent(0.8)
+        if let bgColor = customWayNameBackgroundColor {
+            WayNameView.appearance(for: traitCollection).backgroundColor = bgColor.withAlphaComponent(0.8)
         }
     }
-} 
+}

package/ios/ExpoMapboxNavigationView.swift

@@ -4,7 +4,6 @@ import MapboxMaps
 import MapboxNavigationUIKit
 import MapboxDirections
 import Combine
-import CustomNavigationStyle
 
 
 class ExpoMapboxNavigationView: ExpoView {
@@ -18,7 +17,7 @@ class ExpoMapboxNavigationView: ExpoView {
 
     let controller = ExpoMapboxNavigationViewController()
 
-    let customStyle = CustomNavigationStyle()
+    let customDayStyle = CustomDayStyle()
 
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
@@ -258,7 +257,7 @@ class ExpoMapboxNavigationViewController: UIViewController {
     }
 
     func setBottomBannerBackgroundColor(hexColor: String) {
-        customStyle.bottomBannerBackgroundColor = UIColor(hex: hexColor)
+        customDayStyle.customBottomBannerBackgroundColor = UIColor(hex: hexColor)
         update()
     }
 
@@ -298,22 +297,22 @@ class ExpoMapboxNavigationViewController: UIViewController {
     }
 
     func setSpeedLimitBackgroundColor(hexColor: String) {
-        customStyle.speedLimitBackgroundColor = UIColor(hex: hexColor)
+        customDayStyle.customSpeedLimitBackgroundColor = UIColor(hex: hexColor)
         update()
     }
 
     func setSpeedLimitTextColor(hexColor: String) {
-        customStyle.speedLimitTextColor = UIColor(hex: hexColor)
+        customDayStyle.customSpeedLimitTextColor = UIColor(hex: hexColor)
         update()
     }
 
     func setWayNameViewBackgroundColor(hexColor: String) {
-        customStyle.wayNameBackgroundColor = UIColor(hex: hexColor)
+        customDayStyle.customWayNameBackgroundColor = UIColor(hex: hexColor)
         update()
     }
 
     func setWayNameViewTextColor(hexColor: String) {
-        customStyle.wayNameTextColor = UIColor(hex: hexColor)
+        customDayStyle.customWayNameTextColor = UIColor(hex: hexColor)
         update()
     }
 
@@ -328,7 +327,7 @@ class ExpoMapboxNavigationViewController: UIViewController {
     }
 
     func setSpeedLimitBorderColor(hexColor: String) {
-        customStyle.speedLimitBorderColor = UIColor(hex: hexColor)
+        customDayStyle.customSpeedLimitBorderColor = UIColor(hex: hexColor)
         update()
     }
 
@@ -437,7 +436,7 @@ class ExpoMapboxNavigationViewController: UIViewController {
         }
 
         let navigationOptions = NavigationOptions(
-            styles: [customStyle],
+            styles: [customDayStyle],
             mapboxNavigation: self.mapboxNavigation!,
             voiceController: ExpoMapboxNavigationViewController.navigationProvider.routeVoiceController,
             eventsManager: ExpoMapboxNavigationViewController.navigationProvider.eventsManager(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@complexify/expo-mapbox-navigation",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Expo module for Mapbox's Navigation SDK",
   "main": "build/index.js",
   "types": "build/index.d.ts",