@complexify/expo-mapbox-navigation 1.2.2 → 1.3.1

package/ios/ExpoMapboxNavigationView.swift

@@ -34,330 +34,6 @@ class ExpoMapboxNavigationView: ExpoView {
     override func layoutSubviews() {
         controller.view.frame = bounds
     }
-
-    // Steps List
-    func setStepsBackgroundColor(hexColor: String) {
-        controller.customDayStyle.customStepsBackgroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setStepsPrimaryTextColor(hexColor: String) {
-        controller.customDayStyle.customStepsPrimaryTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setStepsSecondaryTextColor(hexColor: String) {
-        controller.customDayStyle.customStepsSecondaryTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setStepsManeuverViewPrimaryColor(hexColor: String) {
-        controller.customDayStyle.customStepsManeuverViewPrimaryColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setStepsManeuverViewSecondaryColor(hexColor: String) {
-        controller.customDayStyle.customStepsManeuverViewSecondaryColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setStepsSeparatorColor(hexColor: String) {
-        controller.customDayStyle.customStepsSeparatorColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Lane View
-    func setLaneViewBackgroundColor(hexColor: String) {
-        controller.customDayStyle.customLaneViewBackgroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setLaneViewForegroundColor(hexColor: String) {
-        controller.customDayStyle.customLaneViewForegroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setLaneViewSeparatorColor(hexColor: String) {
-        controller.customDayStyle.customLaneViewSeparatorColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Next Banner View
-    func setNextBannerBackgroundColor(hexColor: String) {
-        controller.customDayStyle.customNextBannerBackgroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setNextBannerPrimaryTextColor(hexColor: String) {
-        controller.customDayStyle.customNextBannerPrimaryTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setNextBannerSecondaryTextColor(hexColor: String) {
-        controller.customDayStyle.customNextBannerSecondaryTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setNextBannerDistanceTextColor(hexColor: String) {
-        controller.customDayStyle.customNextBannerDistanceTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Progress Bar
-    func setProgressBarProgressColor(hexColor: String) {
-        controller.customDayStyle.customProgressBarProgressColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setProgressBarBackgroundColor(hexColor: String) {
-        controller.customDayStyle.customProgressBarBackgroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Instructions Card
-    func setInstructionsCardBackgroundColor(hexColor: String) {
-        controller.customDayStyle.customInstructionsCardBackgroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    func setInstructionsCardSeparatorColor(hexColor: String) {
-        controller.customDayStyle.customInstructionsCardSeparatorColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    func setInstructionsCardHighlightedSeparatorColor(hexColor: String) {
-        controller.customDayStyle.customInstructionsCardHighlightedSeparatorColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    // Exit View
-    func setExitViewForegroundColor(hexColor: String) {
-        controller.customDayStyle.customExitViewForegroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    func setExitViewBorderColor(hexColor: String) {
-        controller.customDayStyle.customExitViewBorderColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    func setExitViewHighlightColor(hexColor: String) {
-        controller.customDayStyle.customExitViewHighlightColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    // Route Shield
-    func setRouteShieldForegroundColor(hexColor: String) {
-        controller.customDayStyle.customRouteShieldForegroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    func setRouteShieldBorderColor(hexColor: String) {
-        controller.customDayStyle.customRouteShieldBorderColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    func setRouteShieldHighlightColor(hexColor: String) {
-        controller.customDayStyle.customRouteShieldHighlightColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    // Distance Labels
-    func setDistanceRemainingColor(hexColor: String) {
-        controller.customDayStyle.customDistanceRemainingColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    func setDistanceUnitColor(hexColor: String) {
-        controller.customDayStyle.customDistanceUnitColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setDistanceValueColor(hexColor: String) {
-        controller.customDayStyle.customDistanceValueColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    // Navigation Map
-    func setRouteAnnotationSelectedColor(hexColor: String) {
-        controller.customDayStyle.customRouteAnnotationSelectedColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-    
-    func setRouteAnnotationColor(hexColor: String) {
-        controller.customDayStyle.customRouteAnnotationColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Route Shield Colors
-    func setRoadShieldBlackColor(hexColor: String) {
-        controller.customDayStyle.customRoadShieldBlackColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setRoadShieldBlueColor(hexColor: String) {
-        controller.customDayStyle.customRoadShieldBlueColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setRoadShieldGreenColor(hexColor: String) {
-        controller.customDayStyle.customRoadShieldGreenColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setRoadShieldRedColor(hexColor: String) {
-        controller.customDayStyle.customRoadShieldRedColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setRoadShieldWhiteColor(hexColor: String) {
-        controller.customDayStyle.customRoadShieldWhiteColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setRoadShieldYellowColor(hexColor: String) {
-        controller.customDayStyle.customRoadShieldYellowColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setRoadShieldDefaultColor(hexColor: String) {
-        controller.customDayStyle.customRoadShieldDefaultColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Button Properties
-    func setButtonTextColor(hexColor: String) {
-        controller.customDayStyle.customButtonTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setCancelButtonTintColor(hexColor: String) {
-        controller.customDayStyle.customCancelButtonTintColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setPreviewButtonTintColor(hexColor: String) {
-        controller.customDayStyle.customPreviewButtonTintColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setStartButtonTintColor(hexColor: String) {
-        controller.customDayStyle.customStartButtonTintColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setDismissButtonBackgroundColor(hexColor: String) {
-        controller.customDayStyle.customDismissButtonBackgroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setDismissButtonTextColor(hexColor: String) {
-        controller.customDayStyle.customDismissButtonTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setBackButtonBackgroundColor(hexColor: String) {
-        controller.customDayStyle.customBackButtonBackgroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setBackButtonTintColor(hexColor: String) {
-        controller.customDayStyle.customBackButtonTintColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setBackButtonTextColor(hexColor: String) {
-        controller.customDayStyle.customBackButtonTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setBackButtonBorderColor(hexColor: String) {
-        controller.customDayStyle.customBackButtonBorderColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Navigation View
-    func setNavigationViewBackgroundColor(hexColor: String) {
-        controller.customDayStyle.customNavigationViewBackgroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Distance Label Properties
-    func setDistanceLabelUnitTextColor(hexColor: String) {
-        controller.customDayStyle.customDistanceLabelUnitTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setDistanceLabelValueTextColor(hexColor: String) {
-        controller.customDayStyle.customDistanceLabelValueTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Rating Control
-    func setRatingControlNormalColor(hexColor: String) {
-        controller.customDayStyle.customRatingControlNormalColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setRatingControlSelectedColor(hexColor: String) {
-        controller.customDayStyle.customRatingControlSelectedColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Steps Properties
-    func setStepsBackgroundViewColor(hexColor: String) {
-        controller.customDayStyle.customStepsBackgroundViewColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setStepsTableHeaderTintColor(hexColor: String) {
-        controller.customDayStyle.customStepsTableHeaderTintColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setStepsTableHeaderTextColor(hexColor: String) {
-        controller.customDayStyle.customStepsTableHeaderTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setStepInstructionsBackgroundColor(hexColor: String) {
-        controller.customDayStyle.customStepInstructionsBackgroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setStepTableViewCellBackgroundColor(hexColor: String) {
-        controller.customDayStyle.customStepTableViewCellBackgroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Next Instruction
-    func setNextInstructionNormalTextColor(hexColor: String) {
-        controller.customDayStyle.customNextInstructionNormalTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    func setNextInstructionContainedTextColor(hexColor: String) {
-        controller.customDayStyle.customNextInstructionContainedTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Secondary Label Properties
-    func setSecondaryLabelNormalTextColor(hexColor: String) {
-        controller.customDayStyle.customSecondaryLabelNormalTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // Stylable Label
-    func setStylableLabelNormalTextColor(hexColor: String) {
-        controller.customDayStyle.customStylableLabelNormalTextColor = UIColor(hex: hexColor)
-        controller.update()
-    }
-
-    // CarPlay Properties
-    func setCarPlayCompassBackgroundColor(hexColor: String) {
-        controller.customDayStyle.customCarPlayCompassBackgroundColor = UIColor(hex: hexColor)
-        controller.update()
-    }
 }
 
 
@@ -390,6 +66,8 @@ class ExpoMapboxNavigationViewController: UIViewController {
     private var reroutingCancellable: AnyCancellable? = nil
     private var sessionCancellable: AnyCancellable? = nil
 
+    var currentRouteColor: UIColor?
+    var currentRouteAlternateColor: UIColor?
     var currentRouteCasingColor: UIColor?
     var currentRouteAlternateCasingColor: UIColor?
     var currentTraversedRouteColor: UIColor?
@@ -527,8 +205,18 @@ class ExpoMapboxNavigationViewController: UIViewController {
         }
     }
 
+    func setRouteColor(hexColor: String) {
+        currentRouteColor = UIColor(hex: hexColor)
+        update()
+    }
+
+    func setRouteAlternateColor(hexColor: String) {
+        currentRouteAlternateColor = UIColor(hex: hexColor)
+        update()
+    }
+
     func setRouteCasingColor(hexColor: String) {
-        customDayStyle.customRouteCasingColor = UIColor(hex: hexColor)
+        currentRouteCasingColor = UIColor(hex: hexColor)
         update()
     }
 
@@ -656,16 +344,6 @@ class ExpoMapboxNavigationViewController: UIViewController {
         update()
     }
 
-    func setManeuverViewPrimaryColorHighlighted(hexColor: String) {
-        customDayStyle.customManeuverViewPrimaryColorHighlighted = UIColor(hex: hexColor)
-        update()
-    }
-
-    func setManeuverViewSecondaryColorHighlighted(hexColor: String) {
-        customDayStyle.customManeuverViewSecondaryColorHighlighted = UIColor(hex: hexColor)
-        update()
-    }
-
     func update(){
         calculateRoutesTask?.cancel()
 
@@ -686,7 +364,7 @@ class ExpoMapboxNavigationViewController: UIViewController {
         }
     }
 
-    func calculateRoutes(waypoints: Array<Waypoint>) {
+    func calculateRoutes(waypoints: Array<Waypoint>){
         let routeOptions = NavigationRouteOptions(
             waypoints: waypoints, 
             profileIdentifier: currentRouteProfile != nil ? ProfileIdentifier(rawValue: currentRouteProfile!) : nil,
@@ -696,21 +374,16 @@ class ExpoMapboxNavigationViewController: UIViewController {
         )
 
         calculateRoutesTask = Task {
-            do {
-                let result = try await self.routingProvider!.calculateRoutes(options: routeOptions)
-                switch result.result {
-                case .success(let navigationRoutes):
-                    onRoutesCalculated(navigationRoutes: navigationRoutes)
-                case .failure(let error):
-                    print("Route calculation error: \(error.localizedDescription)")
-                }
-            } catch {
-                print("Failed to calculate routes: \(error.localizedDescription)")
+            switch await self.routingProvider!.calculateRoutes(options: routeOptions).result {
+            case .failure(let error):
+                print(error.localizedDescription)
+            case .success(let navigationRoutes):
+                onRoutesCalculated(navigationRoutes: navigationRoutes)
             }
         }
     }
 
-    func calculateMapMatchingRoutes(waypoints: Array<Waypoint>) {
+    func calculateMapMatchingRoutes(waypoints: Array<Waypoint>){
         let matchOptions = NavigationMatchOptions(
             waypoints: waypoints, 
             profileIdentifier: currentRouteProfile != nil ? ProfileIdentifier(rawValue: currentRouteProfile!) : nil,
@@ -719,17 +392,13 @@ class ExpoMapboxNavigationViewController: UIViewController {
         )
         matchOptions.locale = currentLocale
 
+
         calculateRoutesTask = Task {
-            do {
-                let result = try await self.routingProvider!.calculateRoutes(options: matchOptions)
-                switch result.result {
-                case .success(let navigationRoutes):
-                    onRoutesCalculated(navigationRoutes: navigationRoutes)
-                case .failure(let error):
-                    print("Map matching error: \(error.localizedDescription)")
-                }
-            } catch {
-                print("Failed to match routes: \(error.localizedDescription)")
+            switch await self.routingProvider!.calculateRoutes(options: matchOptions).result {
+            case .failure(let error):
+                print(error.localizedDescription)
+            case .success(let navigationRoutes):
+                onRoutesCalculated(navigationRoutes: navigationRoutes)
             }
         }
     }
@@ -791,9 +460,18 @@ class ExpoMapboxNavigationViewController: UIViewController {
         mapboxNavigation!.tripSession().startActiveGuidance(with: navigationRoutes, startLegIndex: 0)
     
         // Apply custom colors if set
+        if let routeColor = currentRouteColor {
+            navigationMapView?.routeColor = routeColor
+        }
+        if let alternateColor = currentRouteAlternateColor {
+            navigationMapView?.routeAlternateColor = alternateColor
+        }
         if let casingColor = currentRouteCasingColor {
             navigationMapView?.routeCasingColor = casingColor
         }
+        if let alternateCasingColor = currentRouteAlternateCasingColor {
+            navigationMapView?.routeAlternateCasingColor = alternateCasingColor
+        }
         if let traversedColor = currentTraversedRouteColor {
             navigationMapView?.traversedRouteColor = traversedColor
         }

package/package.json

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