Skip to content

Commit 83de66d

Browse files
authored
Merge pull request #197 from ellenhp/ellenhp/transit_bugfixes
Sort itineraries by earliest arrival, search sheet fixes
2 parents ef69639 + d9f5620 commit 83de66d

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

cardinal-android/app/src/main/java/earth/maps/cardinal/routing/RoutingOptions.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ abstract class RoutingOptions {
2929
/**
3030
* Convert this options object to JSON string for Valhalla API.
3131
*/
32+
@Suppress("unused")
3233
fun toValhallaOptionsJson(): String {
3334
val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
3435
.create()

cardinal-android/app/src/main/java/earth/maps/cardinal/ui/core/AppContent.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,6 @@ private fun HomeScreenComposable(
989989
onPeekHeightChange(it)
990990
}
991991
},
992-
homeInSearchScreen = searchExpanded == true,
993992
onSearchFocusChange = {
994993
if (it) {
995994
viewModel.expandSearch()

cardinal-android/app/src/main/java/earth/maps/cardinal/ui/directions/TransitDirectionsScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private fun TransitTimelineResults(
112112
) {
113113
LazyColumn(modifier = modifier) {
114114
items(planResponse.itineraries.size) { index ->
115-
val itinerary = planResponse.itineraries[index]
115+
val itinerary = planResponse.itineraries.reversed()[index]
116116

117117
TransitItineraryCard(
118118
itinerary = itinerary,

cardinal-android/app/src/main/java/earth/maps/cardinal/ui/home/HomeScreen.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ fun HomeScreen(
8484
onPlaceSelected: (Place) -> Unit,
8585
onPeekHeightChange: (dp: Dp) -> Unit,
8686
onSearchFocusChange: (Boolean) -> Unit,
87-
homeInSearchScreen: Boolean,
8887
) {
8988
val searchQuery = viewModel.searchQuery
9089

@@ -98,7 +97,7 @@ fun HomeScreen(
9897
onSearchFocusChange = onSearchFocusChange,
9998
onPeekHeightChange = onPeekHeightChange,
10099
onPlaceSelected = onPlaceSelected,
101-
homeInSearchScreen = homeInSearchScreen,
100+
homeInSearchScreen = viewModel.searchQuery.text.isNotEmpty(),
102101
)
103102
}
104103
}

0 commit comments

Comments
 (0)