@complexify/expo-mapbox-navigation 1.0.5 → 1.0.7

package/ios/ExpoMapboxNavigationView.swift

@@ -422,84 +422,40 @@ class ExpoMapboxNavigationViewController: UIViewController {
         )
 
         let navigationView = navigationViewController.navigationView
-        
-        // Then customize the properly initialized banners
-        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")
-        
-        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!.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)
-
-        navigationViewController.delegate = self
-        addChild(navigationViewController)
-        view.addSubview(navigationViewController.view)
-        navigationViewController.view.translatesAutoresizingMaskIntoConstraints = false
-        NSLayoutConstraint.activate([
-            navigationViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0),
-            navigationViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0),
-            navigationViewController.view.topAnchor.constraint(equalTo: view.topAnchor, constant: 0),
-            navigationViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0),
-        ])
-        navigationViewController.didMove(toParent: self)
-        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
-        }
-        if let arrowColor = currentManeuverArrowColor {
-            navigationMapView?.maneuverArrowColor = arrowColor
-        }
+        // 1. Instructions Banner (Top Banner)
+        let instructionsBanner = navigationView.instructionsBannerView
+        instructionsBanner.backgroundColor = topBannerBackgroundColor ?? UIColor(hex: "#FFFFFF")
+        instructionsBanner.primaryLabel.textColor = topBannerPrimaryTextColor ?? UIColor(hex: "#000000")
+        instructionsBanner.secondaryLabel.textColor = topBannerSecondaryTextColor ?? UIColor(hex: "#666666")
+        instructionsBanner.distanceLabel.textColor = topBannerDistanceTextColor ?? UIColor(hex: "#666666")
+        instructionsBanner.separatorView.backgroundColor = topBannerSeparatorColor ?? UIColor(hex: "#EEEEEE")
 
         // 2. Information Stack
-        let infoStack = navigationView.informationStackView
-        infoStack.backgroundColor = informationStackBackgroundColor ?? UIColor(hex: "#FFFFFF")
-        for view in infoStack.arrangedSubviews {
+        let informationStack = navigationView.informationStackView
+        informationStack.backgroundColor = informationStackBackgroundColor ?? UIColor(hex: "#FFFFFF")
+        for view in informationStack.arrangedSubviews {
             if let label = view as? UILabel {
                 label.textColor = informationStackTextColor ?? UIColor(hex: "#000000")
             }
         }
 
+        // 3. Bottom Banner
+        let bottomBanner = navigationView.bottomBannerView
+        bottomBanner.backgroundColor = bottomBannerBackgroundColor ?? UIColor(hex: "#FFFFFF")
+        bottomBanner.timeRemainingLabel.textColor = bottomBannerTimeRemainingTextColor ?? UIColor(hex: "#000000")
+        bottomBanner.distanceRemainingLabel.textColor = bottomBannerDistanceRemainingTextColor ?? UIColor(hex: "#666666")
+        bottomBanner.arrivalTimeLabel.textColor = bottomBannerArrivalTimeTextColor ?? UIColor(hex: "#666666")
+
         // 4. Resume Button
         let resumeButton = navigationView.resumeButton
         resumeButton.backgroundColor = resumeButtonBackgroundColor ?? UIColor(hex: "#FFFFFF")
-        resumeButton.setTitleColor(resumeButtonTextColor ?? UIColor(hex: "#000000"), for: UIControl.State.normal)
+        resumeButton.setTitleColor(resumeButtonTextColor ?? UIColor(hex: "#000000"), for: .normal)
 
         // 5. Speed Limit View
         let speedLimitView = navigationView.speedLimitView
         speedLimitView.backgroundColor = speedLimitBackgroundColor ?? UIColor(hex: "#FFFFFF")
-        if let speedLabel = speedLimitView.subviews.first as? UILabel {
+        if let speedLabel = speedLimitView.valueLabel {
             speedLabel.textColor = speedLimitTextColor ?? UIColor(hex: "#000000")
         }
 
@@ -512,10 +468,55 @@ class ExpoMapboxNavigationViewController: UIViewController {
             }
         }
 
+        // 7. Navigation Map
+        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 {}
+        })
+
+        // Apply map colors
+        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
+        }
+        if let arrowColor = currentManeuverArrowColor {
+            navigationMapView.maneuverArrowColor = arrowColor
+        }
+
         // 8. Way Name Label
         let wayNameView = navigationView.wayNameView
         wayNameView.backgroundColor = wayNameViewBackgroundColor ?? UIColor(hex: "#FFFFFF")
-        wayNameView.label.textColor = wayNameViewTextColor ?? UIColor(hex: "#000000")
+        wayNameView.valueLabel.textColor = wayNameViewTextColor ?? UIColor(hex: "#000000")
+
+        navigationViewController.delegate = self
+        addChild(navigationViewController)
+        view.addSubview(navigationViewController.view)
+        navigationViewController.view.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            navigationViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0),
+            navigationViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0),
+            navigationViewController.view.topAnchor.constraint(equalTo: view.topAnchor, constant: 0),
+            navigationViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0),
+        ])
+        navigationViewController.didMove(toParent: self)
+        mapboxNavigation!.tripSession().startActiveGuidance(with: navigationRoutes, startLegIndex: 0)
     }
 }
 extension ExpoMapboxNavigationViewController: NavigationViewControllerDelegate {

package/package.json

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