Skip to content

Limit sport filters for MVP #50

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.

Sign up for GitHub

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

Merged
helenjb merged 8 commits into from
Apr 16, 2025
Merged

Limit sport filters for MVP #50

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61b6596
Limit sport filters for MVP
helenjb Apr 14, 2025
1d2b74a
Fix game filtering for carousel
helenjb Apr 14, 2025
fc95915
Refactored
helenjb Apr 15, 2025
1e14647
Fix game carousel text overflow
helenjb Apr 15, 2025
ce78fd6
Merge branch 'main' into helen/bug-fixes
helenjb Apr 15, 2025
f0d19c9
Solve merge conflicts
helenjb Apr 15, 2025
dd4fa99
Refactor filtering to repository
helenjb Apr 15, 2025
a8d5ef4
Merge branch 'main' into helen/bug-fixes
helenjb Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,21 @@ data class HomeUiState(
is ApiResponse.Success -> loadedState.data.filter { game ->
(selectedGender == GenderDivision.ALL || game.gender == selectedGender.displayName) &&
(sportSelect is SportSelection.All || (sportSelect is SportSelection.SportSelect && game.sport == sportSelect.sport.displayName))
&& (game.sport == "Baseball" || game.sport == "Basketball" || game.sport == "Field Hockey" || game.sport == "Football" || game.sport == "Ice Hockey" || game.sport == "Lacrosse" || game.sport == "Soccer")
}

ApiResponse.Loading -> emptyList()
ApiResponse.Error -> emptyList()
}
val upcomingGames: List<GameCardData> = filteredGames.take(3)
val upcomingGames: List<GameCardData>
get() = when (loadedState) {
is ApiResponse.Success -> loadedState.data.filter { game ->
(game.sport == "Baseball" || game.sport == "Basketball" || game.sport == "Field Hockey" || game.sport == "Football" || game.sport == "Ice Hockey" || game.sport == "Lacrosse" || game.sport == "Soccer")
}

ApiResponse.Loading -> emptyList()
ApiResponse.Error -> emptyList()
}.take(3)
}

@HiltViewModel
Expand All @@ -39,7 +48,9 @@ class HomeViewModel @Inject constructor(
HomeUiState(
selectedGender = GenderDivision.ALL,
sportSelect = SportSelection.All,
selectionList = Sport.getSportSelectionList(),
selectionList = Sport.getSportSelectionList().filter {
it is SportSelection.All || (it is SportSelection.SportSelect && (it.sport.displayName == "Baseball" || it.sport.displayName == "Basketball" || it.sport.displayName == "Field Hockey" || it.sport.displayName == "Football" || it.sport.displayName == "Ice Hockey" || it.sport.displayName == "Lacrosse" || it.sport.displayName == "Soccer"))
},
loadedState = ApiResponse.Loading
)
) {
Expand Down
15 changes: 13 additions & 2 deletions app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,21 @@ data class PastGamesUiState(
is ApiResponse.Success -> loadedState.data.filter { game ->
(selectedGender == GenderDivision.ALL || game.gender == selectedGender.displayName) &&
(sportSelect is SportSelection.All || (sportSelect is SportSelection.SportSelect && game.sport == sportSelect.sport.displayName))
&& (game.sport == "Baseball" || game.sport == "Basketball" || game.sport == "Field Hockey" || game.sport == "Football" || game.sport == "Ice Hockey" || game.sport == "Lacrosse" || game.sport == "Soccer")
}

ApiResponse.Loading -> emptyList()
ApiResponse.Error -> emptyList()
}
val pastGames: List<GameCardData> = filteredGames.take(3)
val pastGames: List<GameCardData>
get() = when (loadedState) {
is ApiResponse.Success -> loadedState.data.filter { game ->
(game.sport == "Baseball" || game.sport == "Basketball" || game.sport == "Field Hockey" || game.sport == "Football" || game.sport == "Ice Hockey" || game.sport == "Lacrosse" || game.sport == "Soccer")
}

ApiResponse.Loading -> emptyList()
ApiResponse.Error -> emptyList()
}.take(3)
}

@HiltViewModel
Expand All @@ -39,7 +48,9 @@ class PastGamesViewModel @Inject constructor(
PastGamesUiState(
selectedGender = GenderDivision.ALL,
sportSelect = SportSelection.All,
selectionList = Sport.getSportSelectionList(),
selectionList = Sport.getSportSelectionList().filter {
it is SportSelection.All || (it is SportSelection.SportSelect && (it.sport.displayName == "Baseball" || it.sport.displayName == "Basketball" || it.sport.displayName == "Field Hockey" || it.sport.displayName == "Football" || it.sport.displayName == "Ice Hockey" || it.sport.displayName == "Lacrosse" || it.sport.displayName == "Soccer"))
},
loadedState = ApiResponse.Loading
)
) {
Expand Down