-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: show filtered departures in stop details #124
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
55bcffb
implement filter
boringcactus e40b3b6
rethink binding one more time
boringcactus 66582bc
add tests
boringcactus 3fa7a25
rename NearbyStopRoutePatternView to HeadsignRowView
boringcactus f587480
also move UpcomingTripView into ComponentViews
boringcactus 9a431f7
rearrange splitPerTrip
boringcactus 769914b
filter to route in FilteredRouteView constructor
boringcactus 4ad0e99
make stack deeper for lastStopDetailsFilter test
boringcactus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
iosApp/iosApp/Pages/StopDetails/StopDetailsFilteredRouteView.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // | ||
| // StopDetailsFilteredRouteView.swift | ||
| // iosApp | ||
| // | ||
| // Created by Horn, Melody on 2024-04-05. | ||
| // Copyright © 2024 MBTA. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import shared | ||
| import SwiftUI | ||
|
|
||
| struct StopDetailsFilteredRouteView: View { | ||
| let patternsByStop: PatternsByStop | ||
| let now: Instant | ||
| @Binding var filter: StopDetailsFilter? | ||
|
|
||
| struct RowData { | ||
| let tripId: String | ||
| let headsign: String | ||
| let formatted: PatternsByHeadsign.Format | ||
|
|
||
| init?(trip: UpcomingTrip, route: Route, expectedDirection: Int32?, now: Instant) { | ||
| if trip.trip.directionId != expectedDirection { | ||
| return nil | ||
| } | ||
|
|
||
| tripId = trip.trip.id | ||
| headsign = trip.trip.headsign | ||
| formatted = PatternsByHeadsign( | ||
| route: route, headsign: headsign, patterns: [], upcomingTrips: [trip], alertsHere: nil | ||
| ).format(now: now) | ||
|
|
||
| if !(formatted is PatternsByHeadsign.FormatSome) { | ||
| return nil | ||
| } | ||
| } | ||
| } | ||
|
|
||
| let rows: [RowData] | ||
|
|
||
| init(departures: StopDetailsDepartures, now: Instant, filter filterBinding: Binding<StopDetailsFilter?>) { | ||
| _filter = filterBinding | ||
| let filter = filterBinding.wrappedValue | ||
| let patternsByStop = departures.routes.first(where: { $0.route.id == filter?.routeId })! | ||
| self.patternsByStop = patternsByStop | ||
| self.now = now | ||
|
|
||
| let expectedDirection: Int32? = filter?.directionId | ||
| rows = patternsByStop.allUpcomingTrips().compactMap { | ||
| RowData(trip: $0, route: patternsByStop.route, expectedDirection: expectedDirection, now: now) | ||
| } | ||
| } | ||
|
|
||
| var body: some View { | ||
| Button(action: { filter = nil }, label: { Text("Clear Filter") }) | ||
| List { | ||
| RoutePillSection(route: patternsByStop.route) { | ||
| ForEach(rows, id: \.tripId) { row in | ||
| HeadsignRowView(headsign: row.headsign, predictions: row.formatted) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
question (non-blocking): does losing alertsHere data limit how what we can render in alerts scenarios?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, because rendering the alert once for each upcoming trip would be incorrect; it looks like the spec for handling alerts in stop details hasn't been written yet, but whatever we settle on will be outside of the individual trips.