Ability to swipe InstructionsBannerView #1750
Conversation
nitaliano
force-pushed
the
swipeable-banner
branch
from
fc20faa
to
f90121a
Compare
| @@ -546,6 +556,15 @@ class RouteMapViewController: UIViewController { | |||
| return populated(named) | |||
| } | |||
| } | |||
|
|
|||
| fileprivate func leg(with step: RouteStep) -> RouteLeg? { | |||
| fileprivate func leg(with step: RouteStep) -> RouteLeg? { | ||
| for leg in route.legs { | ||
| if leg.steps.contains(step) { | ||
| return leg |
There was a problem hiding this comment.
This is more succinctly written as route.legs.first { $0.steps.contains(step) }.
| updateCameraAltitude(for: router.routeProgress) | ||
|
|
||
| mapView.addArrow(route: router.route, | ||
| legIndex: router.routeProgress.legIndex, | ||
| stepIndex: router.routeProgress.currentLegProgress.stepIndex + 1) | ||
|
|
||
| if currentPreviewInstructionBannerStepIndex != nil { | ||
| currentPreviewInstructionBannerStepIndex = nil |
There was a problem hiding this comment.
Nit: I think you can set this unconditionally.
| @@ -18,8 +18,14 @@ public protocol InstructionsBannerViewDelegate: class { | |||
| /** | |||
| Called when the user drags either up or down on the `InstructionsBannerView`. | |||
| */ | |||
| @available(*, deprecated, message: "Please use didSwipeInstructionsBanner instead.") | |||
There was a problem hiding this comment.
This PR causes didDragInstructionsBanner(_:) to no longer get called. Deprecating it would be misleading, because that would imply (especially to Objective-C code, via a warning) that it’s OK to keep using the old method for now. Either mark this method obsoleted or, preferably, conditionally call the old method if it’s implemented.
There was a problem hiding this comment.
I am calling didDragInstructionsBanner(_:) again
| _ = curLegSteps.popLast() | ||
|
|
||
| for step in curLegSteps { | ||
| steps.append(step) |
There was a problem hiding this comment.
Implement a remainingLegs computed property like this:
return Array(legs.suffix(from: legIndex + 1))Then this method becomes simply:
return currentLegProgress.remainingSteps + remainingLegs.flatMap { $0.steps }The one wrinkle is that you might want to merge waypoint arrivals with the subsequent departures. We do that in a few places, but it would be misleading to do that as part of a simply named RouteProgress.remainingSteps method. So the caller could do something like this:
routeProgress.remainingSteps.filter { $0.maneuverType != .depart }
|
@1ec5 I made all changes |
CHANGELOG.md
Outdated
| @@ -1,6 +1,9 @@ | |||
| # Changes to the Mapbox Navigation SDK for iOS | |||
|
|
|||
| ## master | |||
| * Added `swipeable` property to `InstructionsBannerView` | |||
| * Added `didSwipeInstructionsBanner` to `InstructionsBannerViewDelegate` | |||
| * Deprecated `didDragInstructionsBanner` for `InstructionsBannerViewDelegate` | |||
There was a problem hiding this comment.
Fully qualify these symbols for jazzy autolinking:
- Added an
InstructionsBannerView.swipeableproperty that allows the user to swipe the banner to the side to preview future steps. TheInstructionsBannerViewDelegate.didDragInstructionsBanner(_:)method has been deprecated in favor ofInstructionsBannerViewDelegate.didSwipeInstructionsBanner(_:swipeDirection:). (#1750)
swipeableproperty toInstructionsBannerViewdidSwipeInstructionsBannertoInstructionsBannerViewDelegatedidDragInstructionsBannerforInstructionsBannerViewDelegateRouteMapViewControllerto implement swipeable banner@1ec5 @frederoni