Fix bug where transparent LanesView displays on update when StepsTable is displayed (#3805)

* Show lanesview based on isDisplayingSteps.

* Fix draw method not being called.

* Handle showing LanesView in TopBannerViewController, remove changes to LanesView.

* Show secondary children using currentInstruction.

* Update only lanesview when steps arent displayed.

* Reverted changes to LanesView.swift.

* Never hide lanesView.

* Make sure you can see lanesview after previewing.

* Add changelog entry.

Author: jill-cardamon

CHANGELOG.md

@@ -21,6 +21,7 @@
 * Fixed an issue where `EndOfRouteCommentView` is using dark style when only light style is allowed. ([#3845](https://github.com/mapbox/mapbox-navigation-ios/pull/3845))
 * Fixed an issue where exit views and generic shields in top banner don't get updated when style changes in active navigation. ([#3864](https://github.com/mapbox/mapbox-navigation-ios/pull/3864))
 * Fixed an issue where the current road name label used a generic white circle instead of the correct shield to represent a state route in the United States. ([#3870](https://github.com/mapbox/mapbox-navigation-ios/pull/3870))
+* Fixed an issue where there was a transparent gap caused by a `LanesView` update when `StepsTable` is displayed during a maneuver update. `LanesView` now stays visible when `StepsTable` is displayed. ([#3805](https://github.com/mapbox/mapbox-navigation-ios/pull/3805))
 
 ### CarPlay
 

Sources/MapboxNavigation/TopBannerViewController.swift

@@ -19,6 +19,8 @@ open class TopBannerViewController: UIViewController {
 
     var routeProgress: RouteProgress?
 
+    var currentInstruction: VisualInstructionBanner?
+    
     lazy var informationStackBottomPinConstraint: NSLayoutConstraint = view.bottomAnchor.constraint(equalTo: informationStackView.bottomAnchor)
 
     lazy var informationStackView = UIStackView(orientation: .vertical, autoLayout: true)
@@ -54,10 +56,10 @@ open class TopBannerViewController: UIViewController {
     private let instructionsBannerHeight: CGFloat = 100.0
 
     private var informationChildren: [UIView] {
-        return [instructionsBannerView] + secondaryChildren
+        return [instructionsBannerView] + secondaryChildren + [lanesView]
     }
     private var secondaryChildren: [UIView] {
-        return [lanesView, nextBannerView, statusView, junctionView]
+        return [nextBannerView, statusView, junctionView]
     }
 
     required public init?(coder aDecoder: NSCoder) {
@@ -107,39 +109,58 @@ open class TopBannerViewController: UIViewController {
 
     private func setupInformationStackView() {
         addInstructionsBanner()
-        informationStackView.addArrangedSubviews(secondaryChildren)
+        let subviews = [lanesView] + secondaryChildren
+        informationStackView.addArrangedSubviews(subviews)
         for child in informationChildren {
             child.leadingAnchor.constraint(equalTo: informationStackView.leadingAnchor).isActive = true
             child.trailingAnchor.constraint(equalTo: informationStackView.trailingAnchor).isActive = true
         }
     }
 
 
-    private func showSecondaryChildren(completion: CompletionHandler? = nil) {
+    private func showSecondaryChildren(including secondaryView: UIView? = nil, completion: CompletionHandler? = nil) {
         statusView.isHidden = !statusView.isCurrentlyVisible
-        junctionView.isHidden = !junctionView.isCurrentlyVisible
-        lanesView.isHidden = !lanesView.isCurrentlyVisible
-        nextBannerView.isHidden = !nextBannerView.isCurrentlyVisible
 
-        UIView.animate(withDuration: 0.20, delay: 0.0, options: [.curveEaseOut], animations: { [weak self] in
-            guard let children = self?.informationChildren else {
-                return
+        if let tertiary = currentInstruction?.tertiaryInstruction {
+            lanesView.isHidden = !lanesView.isCurrentlyVisible
+            lanesView.update(for: currentInstruction)
+            if !tertiary.laneComponents.isEmpty {
+                nextBannerView.isHidden = !nextBannerView.isCurrentlyVisible
             }
+        }
+        
+        if let _ = currentInstruction?.quaternaryInstruction {
+            junctionView.isHidden = !junctionView.isCurrentlyVisible
+        }
+        
+        var notHiddenChildren = [instructionsBannerView] + secondaryChildren.filter {
+            $0.isHidden == false
+        }
+        
+        if let secondaryView = secondaryView {
+            notHiddenChildren += [secondaryView]
+        }
+        
+        UIView.animate(withDuration: 0.20, delay: 0.0, options: [.curveEaseOut], animations: {
 
-            for child in children {
+            for child in notHiddenChildren {
                 child.alpha = 1.0
             }
         }, completion: { _ in
             completion?()
         })
     }
 
-    private func hideSecondaryChildren(completion: CompletionHandler? = nil) {
+    private func hideSecondaryChildren(including secondaryView: UIView? = nil, completion: CompletionHandler? = nil) {
         UIView.animate(withDuration: 0.20, delay: 0.0, options: [.curveEaseIn], animations: { [weak self] in
-            guard let children = self?.secondaryChildren else {
+            guard var children = self?.secondaryChildren else {
                 return
             }
 
+            if let secondaryView = secondaryView {
+                children += [secondaryView]
+            }
+            
             for child in children {
                 child.alpha = 0.0
             }
@@ -196,7 +217,7 @@ open class TopBannerViewController: UIViewController {
         instructionsView.update(for: instructions)
         previewBannerView = instructionsView
 
-        hideSecondaryChildren(completion: completion)
+        hideSecondaryChildren(including: lanesView, completion: completion)
     }
 
     public func stopPreviewing(showingSecondaryChildren: Bool = true) {
@@ -213,7 +234,7 @@ open class TopBannerViewController: UIViewController {
         previewBannerView = nil
 
         if showingSecondaryChildren {
-            showSecondaryChildren()
+            showSecondaryChildren(including: lanesView)
         }
     }
 
@@ -271,7 +292,8 @@ open class TopBannerViewController: UIViewController {
             var constraints = pinningConstraints + hideConstraints + self.stepsContainerConstraints
 
             if let bannerHostHeight = self.view.superview?.superview?.frame.height {
-                let inset = self.instructionsBannerHeight + self.view.safeArea.top
+                let lanesViewHeight: CGFloat = 40
+                let inset = self.instructionsBannerHeight + lanesViewHeight + self.view.safeArea.top
                 stepsHeightPresizingConstraint = (child.view.heightAnchor.constraint(equalToConstant: bannerHostHeight - inset))
                 constraints.append(stepsHeightPresizingConstraint!)
             }
@@ -362,10 +384,11 @@ extension TopBannerViewController: NavigationComponent {
     }
 
     public func navigationService(_ service: NavigationService, didPassVisualInstructionPoint instruction: VisualInstructionBanner, routeProgress: RouteProgress) {
+        currentInstruction = instruction
         instructionsBannerView.update(for: instruction)
-        lanesView.update(for: instruction)
         nextBannerView.navigationService(service, didPassVisualInstructionPoint: instruction, routeProgress: routeProgress)
         junctionView.update(for: instruction, service: service)
+        lanesView.update(for: instruction)
     }
 
     public func navigationService(_ service: NavigationService, willRerouteFrom location: CLLocation) {