Amy/small UI fixes #166
Open
Amy/small UI fixes #166
Conversation
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
…replaced with 'meal swipes' and 'BRBs' filters
-Renamed nearestEateriesSort to eateriesByDistance -Removed unused onNearestExpand
# Conflicts: # app/src/main/java/com/cornellappdev/android/eatery/ui/screens/HomeScreen.kt
zachseidner1
approved these changes
Oct 9, 2024
thisjustin123
requested changes
Oct 12, 2024
Comment on lines
+110
to
+123
| /**A [StateFlow] that emits a list of all eateries sorted by nearest proximity | ||
| * | ||
| * Sorted (by descending priority): Open/Closed, Walk Time | ||
| * */ | ||
| val eateriesByDistance: StateFlow<List<Eatery>> = eateryFlow.map { apiResponse -> | ||
| when (apiResponse) { | ||
| is EateryApiResponse.Error -> listOf() | ||
| is EateryApiResponse.Pending -> listOf() | ||
| is EateryApiResponse.Success -> { | ||
| apiResponse.data.sortedBy { it.getWalkTimes() }.sortedBy { it.isClosed() } | ||
| } | ||
| } | ||
| }.stateIn(viewModelScope, SharingStarted.Eagerly, listOf()) | ||
|
|
There was a problem hiding this comment.
What happened to nearestEateries? Are we still using it somewhere and therefore it can't be removed? Since it seems like you stopped using it the home screen composable.
Comment on lines
+231
to
+250
| eateriesApiResponse = eateriesApiResponse, | ||
| favorites = favorites, | ||
| nearestEateries = nearestEateries, | ||
| filters = filters, | ||
| onFavoriteClick = { eatery, favorite -> | ||
| if (favorite) { | ||
| homeViewModel.addFavorite(eatery.id) | ||
| } else { | ||
| homeViewModel.removeFavorite(eatery.id) | ||
| } | ||
| }, | ||
| onFilterClicked = { filter -> | ||
| if (filters.contains(filter)) { | ||
| homeViewModel.removeFilter(filter) | ||
| } else { | ||
| homeViewModel.addFilter(filter) | ||
| } | ||
| }, | ||
| onResetFilters = { | ||
| homeViewModel.resetFilters() |
There was a problem hiding this comment.
Looks like the indentation here became a little sus. Could you reformat file? Should be command option L on mac (or something like that...)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Overview
Small UI fixes on Eatery HomeScreen
Changes Made
Test Coverage
Screenshots (optional)