@complexify/expo-mapbox-navigation 1.0.4 → 1.0.6

package/CHANGELOG.md

@@ -1,4 +1,4 @@
 # Changelog
 
-## [1.0.3] - 2025-02-06
+## [1.0.5] - 2025-02-07
 

package/ios/ExpoMapboxNavigationView.swift

@@ -392,51 +392,54 @@ class ExpoMapboxNavigationViewController: UIViewController {
         onCancelNavigation?()
     }
 
-    func onRoutesCalculated(navigationRoutes: NavigationRoutes){
+    func onRoutesCalculated(navigationRoutes: NavigationRoutes) {
         onRoutesLoaded?()
 
+        let topBanner = TopBannerViewController()
+        topBanner.view.backgroundColor = topBannerBackgroundColor ?? UIColor(hex: "#FFFFFF")
+        topBanner.instructionsBannerView.backgroundColor = topBannerBackgroundColor ?? UIColor(hex: "#FFFFFF")
+        topBanner.instructionsBannerView.distanceFormatter.locale = currentLocale
+
+        let bottomBanner = BottomBannerViewController()
+        bottomBanner.view.backgroundColor = bottomBannerBackgroundColor ?? UIColor(hex: "#FFFFFF")
+        bottomBanner.distanceFormatter.locale = currentLocale
+        bottomBanner.dateFormatter.locale = currentLocale
+
+        let navigationOptions = NavigationOptions(
+            mapboxNavigation: self.mapboxNavigation!,
+            voiceController: ExpoMapboxNavigationViewController.navigationProvider.routeVoiceController,
+            eventsManager: ExpoMapboxNavigationViewController.navigationProvider.eventsManager(),
+            styles: nil,
+            topBanner: topBanner,
+            bottomBanner: bottomBanner,
+            predictiveCacheManager: nil,
+            navigationMapView: nil
+        )
+
         let navigationViewController = NavigationViewController(
             navigationRoutes: navigationRoutes,
-            navigationOptions: NavigationOptions(
-                styles: [.dayStyle],
-                navigationMapView: nil,
-                voiceController: ExpoMapboxNavigationViewController.navigationProvider.routeVoiceController,
-                eventsManager: ExpoMapboxNavigationViewController.navigationProvider.eventsManager()
-            )
+            navigationOptions: navigationOptions
         )
 
-        let navigationView = navigationViewController.navigationView
-
-        // Customize top banner colors
-        let topBanner = navigationView.topBannerContainerView
-        topBanner.backgroundColor = topBannerBackgroundColor ?? UIColor(hex: "#FFFFFF")
-        let instructionsView = navigationView.instructionsBannerView
-        instructionsView.primaryLabel.textColor = topBannerPrimaryTextColor ?? UIColor(hex: "#000000")
-        instructionsView.secondaryLabel.textColor = topBannerSecondaryTextColor ?? UIColor(hex: "#666666")
-        instructionsView.distanceLabel.textColor = topBannerDistanceTextColor ?? UIColor(hex: "#666666")
-        instructionsView.separatorView.backgroundColor = topBannerSeparatorColor ?? UIColor(hex: "#EEEEEE")
+        topBanner.instructionsBannerView.primaryLabel.textColor = topBannerPrimaryTextColor ?? UIColor(hex: "#000000")
+        topBanner.instructionsBannerView.secondaryLabel.textColor = topBannerSecondaryTextColor ?? UIColor(hex: "#666666")
+        topBanner.instructionsBannerView.distanceLabel.textColor = topBannerDistanceTextColor ?? UIColor(hex: "#666666")
+        topBanner.instructionsBannerView.separatorView.backgroundColor = topBannerSeparatorColor ?? UIColor(hex: "#EEEEEE")
         
-        // Customize bottom banner colors
-        let bottomBanner = navigationView.bottomBannerContainerView
-        bottomBanner.backgroundColor = bottomBannerBackgroundColor ?? UIColor(hex: "#FFFFFF")
-        let bottomView = navigationView.bottomBannerView
-        bottomView.timeRemainingLabel.textColor = bottomBannerTimeRemainingTextColor ?? UIColor(hex: "#000000")
-        bottomView.distanceRemainingLabel.textColor = bottomBannerDistanceRemainingTextColor ?? UIColor(hex: "#666666")
-        bottomView.arrivalTimeLabel.textColor = bottomBannerArrivalTimeTextColor ?? UIColor(hex: "#666666")
-
-        let navigationMapView = navigationView.navigationMapView
-        navigationMapView?.puckConfiguration = .puck2D()
-
-        if let style = currentMapStyle {
-            navigationMapView?.mapView.mapboxMap.loadStyle(StyleURI(rawValue: style)) { _ in
-                navigationMapView?.localizeLabels(locale: self.currentLocale)
-                do {
-                    try navigationMapView?.mapView.mapboxMap.localizeLabels(into: self.currentLocale)
-                } catch {
-                    print("Failed to localize map labels: \(error)")
-                }
-            }
-        }
+        bottomBanner.timeRemainingLabel.textColor = bottomBannerTimeRemainingTextColor ?? UIColor(hex: "#000000")
+        bottomBanner.distanceRemainingLabel.textColor = bottomBannerDistanceRemainingTextColor ?? UIColor(hex: "#666666")
+        bottomBanner.arrivalTimeLabel.textColor = bottomBannerArrivalTimeTextColor ?? UIColor(hex: "#666666")
+
+        let navigationMapView = navigationViewController.navigationMapView
+        navigationMapView.puckType = .puck2D(.navigationDefault)
+
+        let style = currentMapStyle != nil ? StyleURI(rawValue: currentMapStyle!) : StyleURI.streets
+        navigationMapView!.mapView.mapboxMap.loadStyle(style!, completion: { _ in
+            navigationMapView!.localizeLabels(locale: self.currentLocale)
+            do{
+                try navigationMapView!.mapView.mapboxMap.localizeLabels(into: self.currentLocale)
+            } catch {}
+        })
 
         let cancelButton = navigationView.bottomBannerContainerView.findViews(subclassOf: CancelButton.self).first
         cancelButton?.addTarget(self, action: #selector(cancelButtonClicked), for: UIControl.Event.touchUpInside)
@@ -475,7 +478,7 @@ class ExpoMapboxNavigationViewController: UIViewController {
         }
 
         // 2. Information Stack
-        let infoStack = navigationView.informationStackView
+        let infoStack = navigationViewController.navigationView.informationStackView
         infoStack.backgroundColor = informationStackBackgroundColor ?? UIColor(hex: "#FFFFFF")
         for view in infoStack.arrangedSubviews {
             if let label = view as? UILabel {
@@ -484,19 +487,19 @@ class ExpoMapboxNavigationViewController: UIViewController {
         }
 
         // 4. Resume Button
-        let resumeButton = navigationView.resumeButton
+        let resumeButton = navigationViewController.navigationView.resumeButton
         resumeButton.backgroundColor = resumeButtonBackgroundColor ?? UIColor(hex: "#FFFFFF")
         resumeButton.setTitleColor(resumeButtonTextColor ?? UIColor(hex: "#000000"), for: UIControl.State.normal)
 
         // 5. Speed Limit View
-        let speedLimitView = navigationView.speedLimitView
+        let speedLimitView = navigationViewController.navigationView.speedLimitView
         speedLimitView.backgroundColor = speedLimitBackgroundColor ?? UIColor(hex: "#FFFFFF")
         if let speedLabel = speedLimitView.subviews.first as? UILabel {
             speedLabel.textColor = speedLimitTextColor ?? UIColor(hex: "#000000")
         }
 
         // 6. Floating Stack
-        let floatingStack = navigationView.floatingStackView
+        let floatingStack = navigationViewController.navigationView.floatingStackView
         floatingStack.backgroundColor = floatingStackBackgroundColor ?? UIColor(hex: "#FFFFFF")
         for button in floatingStack.arrangedSubviews {
             if let floatingButton = button as? UIButton {
@@ -505,7 +508,7 @@ class ExpoMapboxNavigationViewController: UIViewController {
         }
 
         // 8. Way Name Label
-        let wayNameView = navigationView.wayNameView
+        let wayNameView = navigationViewController.navigationView.wayNameView
         wayNameView.backgroundColor = wayNameViewBackgroundColor ?? UIColor(hex: "#FFFFFF")
         wayNameView.label.textColor = wayNameViewTextColor ?? UIColor(hex: "#000000")
     }

package/package.json

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