From 327e4ef6069b90f27f1669fb29536b2ee574c50d Mon Sep 17 00:00:00 2001 From: amjiao Date: Sat, 14 Nov 2026 19:18:39 -0500 Subject: [PATCH 01/10] start post-onboarding flow --- .../cornellappdev/score/auth/AuthViewModel.kt | 14 +- .../score/components/ButtonPrimary.kt | 9 ++ .../score/components/GenderDivisionFilter.kt | 11 +- .../score/components/SportSelectorHeader.kt | 2 +- .../HomeScreenFavoritesInfoBanner.kt | 47 +++++++ .../model/OnboardingPreferencesRepository.kt | 13 ++ .../com/cornellappdev/score/model/Sport.kt | 15 ++- .../cornellappdev/score/screen/HomeScreen.kt | 11 +- .../screen/OnboardingFavoriteSportsScreen.kt | 10 +- .../score/viewmodel/HomeViewModel.kt | 127 ++++++++++++++---- .../score/viewmodel/PastGamesViewModel.kt | 32 ++++- 11 files changed, 236 insertions(+), 55 deletions(-) create mode 100644 app/src/main/java/com/cornellappdev/score/components/onboarding/HomeScreenFavoritesInfoBanner.kt diff --git a/app/src/main/java/com/cornellappdev/score/auth/AuthViewModel.kt b/app/src/main/java/com/cornellappdev/score/auth/AuthViewModel.kt index b66fc170..63bb0d0e 100644 --- a/app/src/main/java/com/cornellappdev/score/auth/AuthViewModel.kt +++ b/app/src/main/java/com/cornellappdev/score/auth/AuthViewModel.kt @@ -1,6 +1,7 @@ package com.cornellappdev.score.auth import android.app.Activity +import android.util.Log import androidx.credentials.exceptions.GetCredentialCancellationException import androidx.credentials.exceptions.NoCredentialException import androidx.lifecycle.ViewModel @@ -48,13 +49,22 @@ constructor(private val repository: AuthRepository, private val google: GoogleSi } catch (error: CancellationException) { mutableSignInState.value = SignInState() throw error - } catch (_: Exception) { - google.signOut() + } catch (error: Exception) { + Log.e(TAG, "Google sign-in failed", error) mutableSignInState.value = SignInState(error = R.string.auth_sign_in_failed) + try { + google.signOut() + } catch (cleanupError: Exception) { + Log.w(TAG, "Could not clear Google credential state", cleanupError) + } } } } + private companion object { + const val TAG = "AuthViewModel" + } + fun dismissError() { mutableSignInState.value = mutableSignInState.value.copy(error = null) } diff --git a/app/src/main/java/com/cornellappdev/score/components/ButtonPrimary.kt b/app/src/main/java/com/cornellappdev/score/components/ButtonPrimary.kt index 4aa4108e..82334414 100644 --- a/app/src/main/java/com/cornellappdev/score/components/ButtonPrimary.kt +++ b/app/src/main/java/com/cornellappdev/score/components/ButtonPrimary.kt @@ -12,6 +12,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.cornellappdev.score.theme.CrimsonPrimary import com.cornellappdev.score.theme.Style.bodyMedium @@ -45,4 +46,12 @@ fun ButtonPrimary( } Text(text = text, style = bodyMedium.copy(color = White)) } +} + +@Preview +@Composable +private fun ButtonPrimaryPreview(){ + ScorePreview{ + ButtonPrimary(text = "test", onClick = {}, icon = null) + } } \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt b/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt index bfe545a0..7fbcb9cd 100644 --- a/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt +++ b/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt @@ -36,14 +36,13 @@ import com.cornellappdev.score.theme.White fun GenderDivisionFilter( selectedGender: GenderDivision, onGenderSelected: (GenderDivision) -> Unit, - modifier: Modifier = Modifier -) { - val options = listOf( - GenderDivision.ALL, + modifier: Modifier = Modifier, + options: List = listOf( + GenderDivision.FAVORITES, GenderDivision.MALE, GenderDivision.FEMALE ) - +) { Row( modifier = modifier .fillMaxWidth() @@ -85,7 +84,7 @@ fun GenderDivisionFilter( @Composable private fun GenderDivisionFilterPreview() { ScorePreview { - var selectedGender by remember { mutableStateOf(GenderDivision.ALL) } + var selectedGender by remember { mutableStateOf(GenderDivision.FAVORITES) } GenderDivisionFilter( selectedGender = selectedGender, diff --git a/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt b/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt index a36471cb..dd86dbbb 100644 --- a/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt +++ b/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt @@ -129,7 +129,7 @@ fun SportSelector( @Preview @Composable private fun PreviewSportSelectorHeader() = ScorePreview { - var selectedOption by remember { mutableStateOf(GenderDivision.ALL) } + var selectedOption by remember { mutableStateOf(GenderDivision.FAVORITES) } var selectedSport: SportSelection by remember { mutableStateOf(SportSelection.All) } SportSelectorHeader( diff --git a/app/src/main/java/com/cornellappdev/score/components/onboarding/HomeScreenFavoritesInfoBanner.kt b/app/src/main/java/com/cornellappdev/score/components/onboarding/HomeScreenFavoritesInfoBanner.kt new file mode 100644 index 00000000..63aeb978 --- /dev/null +++ b/app/src/main/java/com/cornellappdev/score/components/onboarding/HomeScreenFavoritesInfoBanner.kt @@ -0,0 +1,47 @@ +package com.cornellappdev.score.components.onboarding + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import com.cornellappdev.score.theme.Style.bodyNormal +import com.cornellappdev.score.theme.Style.bodySemibold +import com.cornellappdev.score.theme.Style.labelsNormal + +@Composable +fun HomeScreenFavoritesInfoBanner( + +){ + val gradientRed = Brush.horizontalGradient(0f to Color(0xFFBC2811), 1000f to Color(0xFF62180C)) + Row( + modifier = Modifier.fillMaxWidth().background(gradientRed), + horizontalArrangement = Arrangement.spacedBy(12.dp) + ){ + Column( + + ){ + Text( + text = "Showing all sports", + style = bodySemibold + ) + Text( + text = "Select your favorite sports to personalize your feed.", + style = labelsNormal + ) + } + + + } +} + +@Composable +fun GoToProfileButton(){ + +} \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/score/model/OnboardingPreferencesRepository.kt b/app/src/main/java/com/cornellappdev/score/model/OnboardingPreferencesRepository.kt index 6463b766..3a1046a6 100644 --- a/app/src/main/java/com/cornellappdev/score/model/OnboardingPreferencesRepository.kt +++ b/app/src/main/java/com/cornellappdev/score/model/OnboardingPreferencesRepository.kt @@ -25,8 +25,21 @@ class OnboardingPreferencesRepository @Inject constructor( } } + fun getFavoriteSportNames(): Set = preferences + .getStringSet(KEY_FAVORITE_SPORTS, emptySet()) + .orEmpty() + .mapNotNull { it.substringBefore(':').takeIf(String::isNotBlank) } + .toSet() + + fun saveFavoriteSportKeys(keys: Set) { + preferences.edit { + putStringSet(KEY_FAVORITE_SPORTS, keys.toSet()) + } + } + private companion object { const val PREFERENCES_NAME = "score_app_preferences" const val KEY_ONBOARDING_COMPLETED = "onboarding_completed" + const val KEY_FAVORITE_SPORTS = "favorite_sports" } } diff --git a/app/src/main/java/com/cornellappdev/score/model/Sport.kt b/app/src/main/java/com/cornellappdev/score/model/Sport.kt index bcf68cb6..3b1e691c 100644 --- a/app/src/main/java/com/cornellappdev/score/model/Sport.kt +++ b/app/src/main/java/com/cornellappdev/score/model/Sport.kt @@ -172,12 +172,16 @@ enum class Sport( val filteredSports = when (selectedGender) { GenderDivision.MALE -> Sport.entries.filter { it.gender == GenderDivision.MALE || it.gender == GenderDivision.ALL } GenderDivision.FEMALE -> Sport.entries.filter { it.gender == GenderDivision.FEMALE || it.gender == GenderDivision.ALL } + GenderDivision.FAVORITES, GenderDivision.ALL, null -> Sport.entries }.filter { isValidSport(it.displayName) } return listOf(SportSelection.All) + filteredSports.map { SportSelection.SportSelect(it) } } + + fun getHomeSportSelectionList(selectedGender: GenderDivision?): List = + getSportSelectionList(selectedGender) } } @@ -189,13 +193,16 @@ sealed class SportSelection { enum class GenderDivision( val displayName: String ) { - FEMALE( - "Women's" + FAVORITES( + "Favorites" + ), + ALL( + "All" ), MALE( "Men's" ), - ALL( - "All" + FEMALE( + "Women's" ) } diff --git a/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt index 1536efad..bc4ae58c 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt @@ -36,7 +36,6 @@ import com.cornellappdev.score.components.EmptyStateBox import com.cornellappdev.score.components.ErrorState import com.cornellappdev.score.components.GameCard import com.cornellappdev.score.components.GamesCarousel -import com.cornellappdev.score.components.IconButton import com.cornellappdev.score.components.LoadingScreen import com.cornellappdev.score.components.ScorePreview import com.cornellappdev.score.components.ScorePullToRefreshBox @@ -93,10 +92,10 @@ fun HomeScreen( sheetState = sheetState, onDismiss = { showBottomSheet = false }, onApply = { price, location, date -> - // TODO: forward to ViewModel + homeViewModel.onApplyAdvancedFilters(price, location, date) }, onReset = { - // TODO: reset filters in ViewModel + homeViewModel.onResetAdvancedFilters() } ) } @@ -234,9 +233,10 @@ private fun HomeScreenPreview() = ScorePreview { ) { HomeContent( HomeUiState( - selectedGender = GenderDivision.ALL, + selectedGender = GenderDivision.FAVORITES, sportSelect = SportSelection.All, selectionList = sportSelectionList, + favoriteSports = emptySet(), loadedState = ApiResponse.Success(gameList) ), onGenderSelected = {}, @@ -252,9 +252,10 @@ private fun HomeScreenPreview() = ScorePreview { private fun HomeScreenEmptyStatePreview() = ScorePreview { HomeContent( HomeUiState( - selectedGender = GenderDivision.ALL, + selectedGender = GenderDivision.FAVORITES, sportSelect = SportSelection.All, selectionList = sportSelectionList, + favoriteSports = emptySet(), loadedState = ApiResponse.Success(emptyList()) ), onGenderSelected = {}, diff --git a/app/src/main/java/com/cornellappdev/score/screen/OnboardingFavoriteSportsScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/OnboardingFavoriteSportsScreen.kt index 56cda4cd..5c6f8ebb 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/OnboardingFavoriteSportsScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/OnboardingFavoriteSportsScreen.kt @@ -67,7 +67,7 @@ data class FavoriteSport( val sport = runCatching { Sport.valueOf(parts[0]) }.getOrNull() ?: return null val gender = runCatching { GenderDivision.valueOf(parts[1]) }.getOrNull() ?: return null - if (gender == GenderDivision.ALL) return null + if (gender == GenderDivision.ALL || gender == GenderDivision.FAVORITES) return null return FavoriteSport(sport, gender) } } @@ -118,7 +118,12 @@ fun OnboardingFavoriteSportsScreen( Spacer(Modifier.height(32.dp)) GenderDivisionFilter( selectedGender = selectedGender, - onGenderSelected = { selectedGender = it } + onGenderSelected = { selectedGender = it }, + options = listOf( + GenderDivision.ALL, + GenderDivision.MALE, + GenderDivision.FEMALE + ) ) } @@ -181,6 +186,7 @@ private fun rememberFavoriteSportOptions(): List { GenderDivision.MALE -> listOf(FavoriteSport(sport, GenderDivision.MALE)) GenderDivision.FEMALE -> listOf(FavoriteSport(sport, GenderDivision.FEMALE)) + GenderDivision.FAVORITES -> emptyList() } } .sortedWith( diff --git a/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt index ee6159bb..6a9b17d2 100644 --- a/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt +++ b/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt @@ -1,8 +1,12 @@ package com.cornellappdev.score.viewmodel +import com.cornellappdev.score.components.DateFilter +import com.cornellappdev.score.components.LocationFilter +import com.cornellappdev.score.components.PriceFilter import com.cornellappdev.score.model.ApiResponse import com.cornellappdev.score.model.GameCardData import com.cornellappdev.score.model.GenderDivision +import com.cornellappdev.score.model.OnboardingPreferencesRepository import com.cornellappdev.score.model.ScoreRepository import com.cornellappdev.score.model.Sport import com.cornellappdev.score.model.SportSelection @@ -16,52 +20,88 @@ data class HomeUiState( val selectedGender: GenderDivision, val sportSelect: SportSelection, val selectionList: List, - val loadedState: ApiResponse> + val favoriteSports: Set, + val loadedState: ApiResponse>, + val priceFilter: PriceFilter? = null, + val locationFilter: LocationFilter? = null, + val dateFilter: DateFilter? = null ) { + private val games: List + get() = (loadedState as? ApiResponse.Success)?.data.orEmpty() + //TODO: refactor filters to use flows - not best practice to expose original games list to the view val filteredGames: List - get() = when (loadedState) { - 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)) + get() { + val favoriteSportNames = favoriteSports.map { it.displayName } + return games.filter { game -> + val matchesGender = when (selectedGender) { + GenderDivision.ALL -> true + GenderDivision.FAVORITES -> if (favoriteSports.isNotEmpty()) { + game.sport in favoriteSportNames + } else { + true + } + else -> game.gender == selectedGender.displayName + } + val matchesSport = when (sportSelect) { + is SportSelection.SportSelect -> game.sport == sportSelect.sport.displayName + else -> true + } + val matchesLocation = when (locationFilter) { + LocationFilter.ON_CAMPUS -> game.isHome + else -> true + } + val matchesDate = when (dateFilter) { + DateFilter.TODAY -> game.date == LocalDate.now() + DateFilter.WITHIN_7_DAYS -> game.date?.isBefore(LocalDate.now().plusDays(8)) == true && (game.date?.isAfter(LocalDate.now().minusDays(1)) == true) + DateFilter.WITHIN_A_MONTH -> game.date?.isBefore(LocalDate.now().plusMonths(1)) == true && (game.date?.isAfter(LocalDate.now().minusDays(1)) == true) + DateFilter.OVER_A_MONTH -> game.date?.isAfter(LocalDate.now().plusMonths(1)) == true + null -> true + } + matchesGender && matchesSport && matchesLocation && matchesDate } - - ApiResponse.Loading -> emptyList() - ApiResponse.Error -> emptyList() } - val upcomingGames: List - get() = when (loadedState) { - is ApiResponse.Success -> loadedState.data - ApiResponse.Loading -> emptyList() - ApiResponse.Error -> emptyList() - }.take(3) + val upcomingGames: List + get() = games.take(3) } @HiltViewModel class HomeViewModel @Inject constructor( - private val scoreRepository: ScoreRepository + private val scoreRepository: ScoreRepository, + preferencesRepository: OnboardingPreferencesRepository ) : BaseViewModel( HomeUiState( - selectedGender = GenderDivision.ALL, + selectedGender = GenderDivision.FAVORITES, sportSelect = SportSelection.All, - selectionList = Sport.getSportSelectionList(GenderDivision.ALL), + selectionList = Sport.getSportSelectionList(GenderDivision.FAVORITES), + favoriteSports = preferencesRepository.getFavoriteSportNames() + .mapNotNull { runCatching { Sport.valueOf(it) }.getOrNull() } + .toSet(), loadedState = ApiResponse.Loading ) ) { init { + applyMutation { + copy(selectionList = selectionListFor(selectedGender, favoriteSports, emptyList())) + } scoreRepository.fetchGames() asyncCollect(scoreRepository.upcomingGamesFlow) { response -> applyMutation { + val loadedState = response.map { list -> + list.map { game -> + game.toGameCardData() + }.filter { game -> + game.date?.isAfter(LocalDate.now().minusDays(1)) ?: false + }.sortedBy { it.date } + } copy( - loadedState = response.map { list -> - list.map { game -> - game.toGameCardData() - }.filter { game -> - game.date?.isAfter(LocalDate.now().minusDays(1)) ?: false - }.sortedBy { it.date } - } + loadedState = loadedState, + selectionList = selectionListFor( + selectedGender, + favoriteSports, + (loadedState as? ApiResponse.Success)?.data.orEmpty() + ) ) } } @@ -71,7 +111,6 @@ class HomeViewModel @Inject constructor( applyMutation { copy(loadedState = ApiResponse.Loading) } - scoreRepository.fetchGames() } @@ -79,16 +118,48 @@ class HomeViewModel @Inject constructor( applyMutation { copy( selectedGender = gender, - selectionList = Sport.getSportSelectionList(gender), + selectionList = selectionListFor( + gender, + favoriteSports, + (loadedState as? ApiResponse.Success)?.data.orEmpty() + ), ) } } fun onSportSelected(sport: SportSelection) { + applyMutation { copy(sportSelect = sport) } + } + + fun onApplyAdvancedFilters( + priceFilter: PriceFilter?, + locationFilter: LocationFilter?, + dateFilter: DateFilter? + ) { applyMutation { copy( - sportSelect = sport + priceFilter = priceFilter, + locationFilter = locationFilter, + dateFilter = dateFilter ) } } + + fun onResetAdvancedFilters() { + applyMutation { + copy( + priceFilter = null, + locationFilter = null, + dateFilter = null + ) + } + } + + private fun selectionListFor( + gender: GenderDivision, + favorites: Set, + upcomingGames: List + ): List { + return Sport.getSportSelectionList(gender) + } } diff --git a/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt index 84493d81..6eebb7a3 100644 --- a/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt +++ b/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt @@ -3,6 +3,7 @@ package com.cornellappdev.score.viewmodel import com.cornellappdev.score.model.ApiResponse import com.cornellappdev.score.model.GameCardData import com.cornellappdev.score.model.GenderDivision +import com.cornellappdev.score.model.OnboardingPreferencesRepository import com.cornellappdev.score.model.ScoreRepository import com.cornellappdev.score.model.Sport import com.cornellappdev.score.model.SportSelection @@ -16,15 +17,28 @@ data class PastGamesUiState( val selectedGender: GenderDivision, val sportSelect: SportSelection, val selectionList: List, + val favoriteSports: Set = emptySet(), val loadedState: ApiResponse> ) { //TODO: refactor filters to use flows - not best practice to expose original games list to the view val filteredGames: List get() = when (loadedState) { - 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)) + is ApiResponse.Success -> { + val favoriteSportNames = favoriteSports.map { it.displayName } + loadedState.data.filter { game -> + val matchesGender = when (selectedGender) { + GenderDivision.ALL -> true + GenderDivision.FAVORITES -> if (favoriteSports.isNotEmpty()) { + game.sport in favoriteSportNames + } else { + true + } + else -> game.gender == selectedGender.displayName + } + val matchesSport = (sportSelect is SportSelection.All || + (sportSelect is SportSelection.SportSelect && game.sport == sportSelect.sport.displayName)) + matchesGender && matchesSport + } } ApiResponse.Loading -> emptyList() @@ -41,12 +55,16 @@ data class PastGamesUiState( @HiltViewModel class PastGamesViewModel @Inject constructor( - private val scoreRepository: ScoreRepository + private val scoreRepository: ScoreRepository, + preferencesRepository: OnboardingPreferencesRepository ) : BaseViewModel( PastGamesUiState( - selectedGender = GenderDivision.ALL, + selectedGender = GenderDivision.FAVORITES, sportSelect = SportSelection.All, - selectionList = Sport.getSportSelectionList(GenderDivision.ALL), + selectionList = Sport.getSportSelectionList(GenderDivision.FAVORITES), + favoriteSports = preferencesRepository.getFavoriteSportNames() + .mapNotNull { runCatching { Sport.valueOf(it) }.getOrNull() } + .toSet(), loadedState = ApiResponse.Loading ) ) { From 3d1fc4127bb77deca95b28f2ec65d92c16cb1a7f Mon Sep 17 00:00:00 2001 From: amjiao Date: Mon, 16 Nov 2026 14:28:24 -0500 Subject: [PATCH 02/10] UI info and welcome banners --- .../HomeScreenFavoritesInfoBanner.kt | 78 ++++++++++++++++--- .../components/onboarding/WelcomeBanner.kt | 66 ++++++++++++++++ 2 files changed, 132 insertions(+), 12 deletions(-) create mode 100644 app/src/main/java/com/cornellappdev/score/components/onboarding/WelcomeBanner.kt diff --git a/app/src/main/java/com/cornellappdev/score/components/onboarding/HomeScreenFavoritesInfoBanner.kt b/app/src/main/java/com/cornellappdev/score/components/onboarding/HomeScreenFavoritesInfoBanner.kt index 63aeb978..fad3b241 100644 --- a/app/src/main/java/com/cornellappdev/score/components/onboarding/HomeScreenFavoritesInfoBanner.kt +++ b/app/src/main/java/com/cornellappdev/score/components/onboarding/HomeScreenFavoritesInfoBanner.kt @@ -1,47 +1,101 @@ package com.cornellappdev.score.components.onboarding +import androidx.compose.foundation.Image import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.cornellappdev.score.theme.Style.bodyNormal +import com.cornellappdev.score.R import com.cornellappdev.score.theme.Style.bodySemibold +import com.cornellappdev.score.theme.Style.labelsMedium import com.cornellappdev.score.theme.Style.labelsNormal @Composable fun HomeScreenFavoritesInfoBanner( - -){ + toProfile: () -> Unit, + modifier: Modifier = Modifier +) { val gradientRed = Brush.horizontalGradient(0f to Color(0xFFBC2811), 1000f to Color(0xFF62180C)) Row( - modifier = Modifier.fillMaxWidth().background(gradientRed), - horizontalArrangement = Arrangement.spacedBy(12.dp) - ){ + modifier = modifier + .clip(shape = RoundedCornerShape(12.dp)) + .fillMaxWidth() + .background(gradientRed) + .padding(16.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { Column( - - ){ + modifier = Modifier.weight(1f) + ) { Text( text = "Showing all sports", - style = bodySemibold + style = bodySemibold, + color = Color.White ) Text( text = "Select your favorite sports to personalize your feed.", - style = labelsNormal + style = labelsNormal, + color = Color.White ) } + GoToProfileButton(toProfile) + } +} - +@Composable +fun GoToProfileButton( + toProfile: () -> Unit, + modifier: Modifier = Modifier +) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center, + modifier = modifier + .clip(shape = RoundedCornerShape(100.dp)) + .border(width = 1.dp, color = Color.White, shape = RoundedCornerShape(100.dp)) + .background(shape = RoundedCornerShape(100.dp), color = Color.Transparent) + .padding(top = 8.dp, bottom = 8.dp, start = 12.dp, end = 8.dp) + .clickable(onClick = toProfile) + ){ + Text( + text = "Go to Profile", + color = Color.White, + style = labelsMedium + ) + Image( + painter = painterResource(id = R.drawable.ic_right_chevron), + contentDescription = "Right arrow", + modifier = Modifier.size(20.dp) + ) } } +@Preview @Composable -fun GoToProfileButton(){ +private fun GoToProfileButtonPreview(){ + GoToProfileButton({}) +} +@Preview +@Composable +private fun HomeScreenFavoritesInfoBannerPreview(){ + HomeScreenFavoritesInfoBanner({}) } \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/score/components/onboarding/WelcomeBanner.kt b/app/src/main/java/com/cornellappdev/score/components/onboarding/WelcomeBanner.kt new file mode 100644 index 00000000..ab2daeb7 --- /dev/null +++ b/app/src/main/java/com/cornellappdev/score/components/onboarding/WelcomeBanner.kt @@ -0,0 +1,66 @@ +package com.cornellappdev.score.components.onboarding + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.cornellappdev.score.R +import com.cornellappdev.score.theme.Style.heading2 + +@Composable +fun WelcomeBanner( + name: String, + modifier: Modifier = Modifier +) { + val gradientRed = Brush.horizontalGradient(0f to Color(0xFFBC2811), 1000f to Color(0xFF62180C)) + Row( + modifier = modifier + .clip(shape = RoundedCornerShape(12.dp)) + .fillMaxWidth() + .background(gradientRed) + .padding(16.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Image( + painter = painterResource(R.drawable.ic_speaker), + colorFilter = ColorFilter.tint(Color.White), + contentDescription = "Score logo", + modifier = Modifier.size(50.dp) + ) + Row { + Text( + text = "Welcome to Score", + style = heading2, + color = Color.White + ) + Text( + text = " ${name}!", + style = heading2.copy(fontWeight = androidx.compose.ui.text.font.FontWeight(700)), + color = Color.White + ) + } + + } +} + +@Preview +@Composable +private fun WelcomeBannerPreview() { + WelcomeBanner("Claire") +} \ No newline at end of file From 186e2f79cd0659e487a4b9e134172f6e74868f08 Mon Sep 17 00:00:00 2001 From: amjiao Date: Mon, 16 Nov 2026 16:22:38 -0500 Subject: [PATCH 03/10] UI for banners --- .../score/components/GenderDivisionFilter.kt | 1 - .../score/components/SportSelectorHeader.kt | 14 ++++++++-- .../cornellappdev/score/nav/ScoreNavHost.kt | 13 +++++---- .../cornellappdev/score/screen/HomeScreen.kt | 27 +++++++++++++------ 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt b/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt index 7fbcb9cd..9e04d009 100644 --- a/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt +++ b/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt @@ -46,7 +46,6 @@ fun GenderDivisionFilter( Row( modifier = modifier .fillMaxWidth() - .padding(horizontal = 24.dp) .height(48.dp) .border(BorderStroke(1.dp, GrayLight), CircleShape) .padding(5.dp) diff --git a/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt b/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt index dd86dbbb..509be0b8 100644 --- a/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt +++ b/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt @@ -26,7 +26,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.cornellappdev.score.R +import com.cornellappdev.score.components.onboarding.HomeScreenFavoritesInfoBanner import com.cornellappdev.score.model.GenderDivision +import com.cornellappdev.score.model.Sport import com.cornellappdev.score.model.SportSelection import com.cornellappdev.score.theme.CrimsonPrimary import com.cornellappdev.score.theme.GrayMedium @@ -40,8 +42,10 @@ fun SportSelectorHeader( sports: List, selectedGender: GenderDivision, selectedSport: SportSelection, + favoriteSports: Set, onGenderSelected: (GenderDivision) -> Unit, onSportSelected: (SportSelection) -> Unit, + toProfile: () -> Unit, modifier: Modifier = Modifier ) { Column( @@ -54,7 +58,11 @@ fun SportSelectorHeader( selectedGender = selectedGender, onGenderSelected = onGenderSelected ) - Spacer(Modifier.height(24.dp)) + Spacer(Modifier.height(16.dp)) + if (favoriteSports.isEmpty()) { + HomeScreenFavoritesInfoBanner(toProfile) + Spacer(Modifier.height(16.dp)) + } LazyRow( Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(20.dp) @@ -136,7 +144,9 @@ private fun PreviewSportSelectorHeader() = ScorePreview { sports = sportSelectionList, selectedGender = selectedOption, selectedSport = selectedSport, + favoriteSports = emptySet(), onGenderSelected = { selectedOption = it }, - onSportSelected = { selectedSport = it } + onSportSelected = { selectedSport = it }, + toProfile = {} ) } diff --git a/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt b/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt index ba66aa07..c7cd053e 100644 --- a/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt +++ b/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt @@ -12,13 +12,8 @@ import com.cornellappdev.score.model.ScoreEvent import com.cornellappdev.score.nav.root.ScoreScreens import com.cornellappdev.score.nav.root.ScoreScreens.Home import com.cornellappdev.score.screen.GameDetailsScreen -import com.cornellappdev.score.screen.HighlightsScreen -import com.cornellappdev.score.screen.HighlightsSearchScreen import com.cornellappdev.score.screen.HomeScreen import com.cornellappdev.score.screen.PastGamesScreen -import com.cornellappdev.score.util.highlightsList -import com.cornellappdev.score.util.recentSearchList -import com.cornellappdev.score.util.sportList import kotlinx.serialization.builtins.ListSerializer import kotlinx.serialization.json.Json @@ -37,14 +32,18 @@ fun ScoreNavHost(navController: NavHostController) { CompositionLocalProvider(LocalViewModelStoreOwner provides mainScreenViewModelStoreOwner) { HomeScreen(navigateToGameDetails = { navController.navigate(ScoreScreens.GameDetailsPage(it)) - }) + }, + navigateToProfile = {} + ) } } composable { CompositionLocalProvider(LocalViewModelStoreOwner provides mainScreenViewModelStoreOwner) { PastGamesScreen(navigateToGameDetails = { navController.navigate(ScoreScreens.GameDetailsPage(it)) - }) + }, + navigateToProfile = {} + ) } } composable { diff --git a/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt index bc4ae58c..1c0a5240 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt @@ -56,6 +56,8 @@ import com.cornellappdev.score.viewmodel.HomeViewModel @OptIn(ExperimentalMaterial3Api::class) @Composable fun HomeScreen( + navigateToProfile: () -> Unit, + modifier: Modifier = Modifier, homeViewModel: HomeViewModel = hiltViewModel(), navigateToGameDetails: (String) -> Unit = {} ) { @@ -64,7 +66,7 @@ fun HomeScreen( val sheetState = rememberModalBottomSheetState() Column( verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.Top), - modifier = Modifier + modifier = modifier .background(Color.White) ) { when (uiState.loadedState) { @@ -83,7 +85,8 @@ fun HomeScreen( onSportSelected = { homeViewModel.onSportSelected(it) }, navigateToGameDetails = navigateToGameDetails, onRefresh = { homeViewModel.onRefresh() }, - onAdvancedFilterClick = { showBottomSheet = true } + onAdvancedFilterClick = { showBottomSheet = true }, + navigateToProfile = navigateToProfile ) } } @@ -110,8 +113,9 @@ private fun HomeContent( onGenderSelected: (GenderDivision) -> Unit, onSportSelected: (SportSelection) -> Unit, onRefresh: () -> Unit, + onAdvancedFilterClick: () -> Unit, navigateToGameDetails: (String) -> Unit = {}, - onAdvancedFilterClick: () -> Unit + navigateToProfile: () -> Unit ) { ScorePullToRefreshBox(isRefreshing = uiState.loadedState == ApiResponse.Loading, onRefresh) { HomeLazyColumn( @@ -119,7 +123,8 @@ private fun HomeContent( onGenderSelected, onSportSelected, navigateToGameDetails, - onAdvancedFilterClick + onAdvancedFilterClick, + navigateToProfile ) } } @@ -131,7 +136,8 @@ private fun HomeLazyColumn( onGenderSelected: (GenderDivision) -> Unit, onSportSelected: (SportSelection) -> Unit, navigateToGameDetails: (String) -> Unit, - onAdvancedFilterClick: () -> Unit + onAdvancedFilterClick: () -> Unit, + toProfile: () -> Unit ) { LazyColumn(contentPadding = PaddingValues(top = 24.dp)) { if (uiState.filteredGames.isNotEmpty()) { @@ -182,8 +188,10 @@ private fun HomeLazyColumn( sports = uiState.selectionList, selectedGender = uiState.selectedGender, selectedSport = uiState.sportSelect, + favoriteSports = uiState.favoriteSports, onGenderSelected = onGenderSelected, onSportSelected = onSportSelected, + toProfile = toProfile ) } Box(modifier = Modifier.background(White)) { @@ -237,12 +245,14 @@ private fun HomeScreenPreview() = ScorePreview { sportSelect = SportSelection.All, selectionList = sportSelectionList, favoriteSports = emptySet(), - loadedState = ApiResponse.Success(gameList) + loadedState = ApiResponse.Success(gameList), + ), onGenderSelected = {}, onSportSelected = {}, onRefresh = {}, - onAdvancedFilterClick = {} + onAdvancedFilterClick = {}, + navigateToProfile = {} ) } } @@ -261,7 +271,8 @@ private fun HomeScreenEmptyStatePreview() = ScorePreview { onGenderSelected = {}, onSportSelected = {}, onRefresh = {}, - onAdvancedFilterClick = {} + onAdvancedFilterClick = {}, + navigateToProfile = {} ) } From 663ee82b147a649ba51142e5683cfffc5c93139d Mon Sep 17 00:00:00 2001 From: amjiao Date: Mon, 16 Nov 2026 20:17:32 -0500 Subject: [PATCH 04/10] Set up navigation placeholders for "to profile" button --- .../score/screen/PastGamesScreen.kt | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt index 8cd7f112..981e6e56 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt @@ -42,17 +42,20 @@ import com.cornellappdev.score.util.gameList import com.cornellappdev.score.util.sportSelectionList import com.cornellappdev.score.viewmodel.PastGamesUiState import com.cornellappdev.score.viewmodel.PastGamesViewModel +import kotlin.collections.emptyList @Composable fun PastGamesScreen( + modifier: Modifier = Modifier, pastGamesViewModel: PastGamesViewModel = hiltViewModel(), - navigateToGameDetails: (String) -> Unit = {} + navigateToGameDetails: (String) -> Unit = {}, + navigateToProfile: () -> Unit ) { val uiState = pastGamesViewModel.collectUiStateValue() Column( verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.Top), - modifier = Modifier + modifier = modifier .background(Color.White) ) { when (uiState.loadedState) { @@ -70,7 +73,8 @@ fun PastGamesScreen( onGenderSelected = { pastGamesViewModel.onGenderSelected(it) }, onSportSelected = { pastGamesViewModel.onSportSelected(it) }, navigateToGameDetails = navigateToGameDetails, - onRefresh = pastGamesViewModel::onRefresh + onRefresh = pastGamesViewModel::onRefresh, + navigateToProfile = navigateToProfile ) } } @@ -84,10 +88,11 @@ private fun PastGamesContent( onGenderSelected: (GenderDivision) -> Unit, onSportSelected: (SportSelection) -> Unit, onRefresh: () -> Unit, - navigateToGameDetails: (String) -> Unit = {} + navigateToGameDetails: (String) -> Unit = {}, + navigateToProfile: () -> Unit ) { ScorePullToRefreshBox(uiState.loadedState == ApiResponse.Loading, onRefresh = onRefresh) { - PastGamesLazyColumn(uiState, onGenderSelected, onSportSelected, navigateToGameDetails) + PastGamesLazyColumn(uiState, onGenderSelected, onSportSelected, navigateToGameDetails, navigateToProfile) } } @@ -97,7 +102,8 @@ private fun PastGamesLazyColumn( uiState: PastGamesUiState, onGenderSelected: (GenderDivision) -> Unit, onSportSelected: (SportSelection) -> Unit, - navigateToGameDetails: (String) -> Unit + navigateToGameDetails: (String) -> Unit, + navigateToProfile: () -> Unit ) { LazyColumn(contentPadding = PaddingValues(top = 24.dp)) { if (uiState.filteredGames.isNotEmpty()) { @@ -140,7 +146,9 @@ private fun PastGamesLazyColumn( selectedGender = uiState.selectedGender, selectedSport = uiState.sportSelect, onGenderSelected = onGenderSelected, - onSportSelected = onSportSelected + onSportSelected = onSportSelected, + toProfile = navigateToProfile, + favoriteSports = emptySet() //todo pass in a preferences viewmodel ) } Box(modifier = Modifier.background(White)) { @@ -185,6 +193,7 @@ private fun PastGamesPreview() = ScorePreview { onGenderSelected = {}, onSportSelected = {}, onRefresh = {}, + navigateToProfile = {} ) } @@ -201,5 +210,6 @@ private fun PastGamesEmptyStatePreview() = ScorePreview { onGenderSelected = {}, onSportSelected = {}, onRefresh = {}, + navigateToProfile = {} ) } \ No newline at end of file From 8f1429c9ad4fc495a74caedf82d3c99b507ec88d Mon Sep 17 00:00:00 2001 From: amjiao Date: Mon, 16 Nov 2026 20:36:48 -0500 Subject: [PATCH 05/10] Implement new empty state design for past games --- .../score/components/PastGamesEmptyState.kt | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 app/src/main/java/com/cornellappdev/score/components/PastGamesEmptyState.kt diff --git a/app/src/main/java/com/cornellappdev/score/components/PastGamesEmptyState.kt b/app/src/main/java/com/cornellappdev/score/components/PastGamesEmptyState.kt new file mode 100644 index 00000000..f18f4ab3 --- /dev/null +++ b/app/src/main/java/com/cornellappdev/score/components/PastGamesEmptyState.kt @@ -0,0 +1,51 @@ +package com.cornellappdev.score.components + +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.cornellappdev.score.theme.GrayMedium +import com.cornellappdev.score.theme.GrayStroke +import com.cornellappdev.score.theme.Style.bodySemibold +import com.cornellappdev.score.theme.Style.labelsNormal + +@Composable +fun PastGamesEmptyState( + modifier: Modifier = Modifier +) { + Column( + modifier = modifier + .clip(shape = RoundedCornerShape(16.dp)) + .border(width = 1.dp, color = GrayStroke, shape = RoundedCornerShape(16.dp)) + .padding(horizontal = 24.dp, vertical = 32.dp) + .fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(4.dp) + ) { + Text( + text = "No Scores", + style = bodySemibold, + color = GrayMedium + ) + Text( + text = "Sport is out of season, check back soon!", + style = labelsNormal, + color = GrayMedium + ) + } +} + +@Preview +@Composable +private fun PastGamesEmptyStatePreview() { + PastGamesEmptyState() +} \ No newline at end of file From d81a274a5f7c9bc6d65ddb74b1e5f5badf5cfaab Mon Sep 17 00:00:00 2001 From: amjiao Date: Mon, 16 Nov 2026 20:37:42 -0500 Subject: [PATCH 06/10] Add functionality for welcome banner --- .../java/com/cornellappdev/score/ScoreApp.kt | 5 +-- .../cornellappdev/score/nav/ScoreNavHost.kt | 4 +-- .../score/nav/root/RootNavigation.kt | 3 +- .../cornellappdev/score/screen/HomeScreen.kt | 31 ++++++++++++++----- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/cornellappdev/score/ScoreApp.kt b/app/src/main/java/com/cornellappdev/score/ScoreApp.kt index 7d7e246a..a05b5dca 100644 --- a/app/src/main/java/com/cornellappdev/score/ScoreApp.kt +++ b/app/src/main/java/com/cornellappdev/score/ScoreApp.kt @@ -34,7 +34,8 @@ fun ScoreApp( var skippedWelcome by rememberSaveable { mutableStateOf(onboardingPreferences.isOnboardingCompleted()) } - val signedIn = authState is AuthState.SignedIn + val signedInUser = (authState as? AuthState.SignedIn)?.user + val signedIn = signedInUser != null LaunchedEffect(signedIn) { if (signedIn) { @@ -49,7 +50,7 @@ fun ScoreApp( Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { CircularProgressIndicator(color = CrimsonPrimary) } - signedIn || skippedWelcome -> RootNavigation() + signedIn || skippedWelcome -> RootNavigation(welcomeName = signedInUser?.name) else -> OnboardingScreen( onSignUp = onSignIn, diff --git a/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt b/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt index c7cd053e..4549bef1 100644 --- a/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt +++ b/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt @@ -18,7 +18,7 @@ import kotlinx.serialization.builtins.ListSerializer import kotlinx.serialization.json.Json @Composable -fun ScoreNavHost(navController: NavHostController) { +fun ScoreNavHost(navController: NavHostController, welcomeName: String? = null) { // This ViewModelStoreOwner is used to scope the past and home screen view models to the root // screen instead of their individual tabs. This way the view models are not reconstructed // everytime you switch tabs. @@ -30,7 +30,7 @@ fun ScoreNavHost(navController: NavHostController) { ) { composable { CompositionLocalProvider(LocalViewModelStoreOwner provides mainScreenViewModelStoreOwner) { - HomeScreen(navigateToGameDetails = { + HomeScreen(welcomeName = welcomeName, navigateToGameDetails = { navController.navigate(ScoreScreens.GameDetailsPage(it)) }, navigateToProfile = {} diff --git a/app/src/main/java/com/cornellappdev/score/nav/root/RootNavigation.kt b/app/src/main/java/com/cornellappdev/score/nav/root/RootNavigation.kt index 8542ff75..01a3677b 100644 --- a/app/src/main/java/com/cornellappdev/score/nav/root/RootNavigation.kt +++ b/app/src/main/java/com/cornellappdev/score/nav/root/RootNavigation.kt @@ -35,6 +35,7 @@ import kotlinx.serialization.Serializable @Composable fun RootNavigation( modifier: Modifier = Modifier, + welcomeName: String? = null, rootNavigationViewModel: RootNavigationViewModel = hiltViewModel(), ) { val navController = rememberNavController() @@ -89,7 +90,7 @@ fun RootNavigation( ) { innerPadding -> Box(modifier = Modifier.padding(innerPadding)) { CompositionLocalProvider(LocalInfiniteLoading provides animatedValue) { - ScoreNavHost(navController) + ScoreNavHost(navController, welcomeName) } } } diff --git a/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt index 1c0a5240..e4d875f3 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt @@ -36,6 +36,7 @@ import com.cornellappdev.score.components.EmptyStateBox import com.cornellappdev.score.components.ErrorState import com.cornellappdev.score.components.GameCard import com.cornellappdev.score.components.GamesCarousel +import com.cornellappdev.score.components.onboarding.WelcomeBanner import com.cornellappdev.score.components.LoadingScreen import com.cornellappdev.score.components.ScorePreview import com.cornellappdev.score.components.ScorePullToRefreshBox @@ -58,6 +59,7 @@ import com.cornellappdev.score.viewmodel.HomeViewModel fun HomeScreen( navigateToProfile: () -> Unit, modifier: Modifier = Modifier, + welcomeName: String? = null, homeViewModel: HomeViewModel = hiltViewModel(), navigateToGameDetails: (String) -> Unit = {} ) { @@ -81,6 +83,7 @@ fun HomeScreen( is ApiResponse.Success -> { HomeContent( uiState = uiState, + welcomeName = welcomeName, onGenderSelected = { homeViewModel.onGenderSelected(it) }, onSportSelected = { homeViewModel.onSportSelected(it) }, navigateToGameDetails = navigateToGameDetails, @@ -114,8 +117,9 @@ private fun HomeContent( onSportSelected: (SportSelection) -> Unit, onRefresh: () -> Unit, onAdvancedFilterClick: () -> Unit, - navigateToGameDetails: (String) -> Unit = {}, - navigateToProfile: () -> Unit + navigateToProfile: () -> Unit, + welcomeName: String? = null, + navigateToGameDetails: (String) -> Unit = {} ) { ScorePullToRefreshBox(isRefreshing = uiState.loadedState == ApiResponse.Loading, onRefresh) { HomeLazyColumn( @@ -124,7 +128,8 @@ private fun HomeContent( onSportSelected, navigateToGameDetails, onAdvancedFilterClick, - navigateToProfile + navigateToProfile, + welcomeName ) } } @@ -137,9 +142,21 @@ private fun HomeLazyColumn( onSportSelected: (SportSelection) -> Unit, navigateToGameDetails: (String) -> Unit, onAdvancedFilterClick: () -> Unit, - toProfile: () -> Unit + toProfile: () -> Unit, + welcomeName: String? = null ) { LazyColumn(contentPadding = PaddingValues(top = 24.dp)) { + if (welcomeName != null) { + item { + WelcomeBanner( + name = welcomeName, + modifier = Modifier.padding(horizontal = 24.dp) + ) + } + item { + Spacer(Modifier.height(24.dp)) + } + } if (uiState.filteredGames.isNotEmpty()) { item { Text( @@ -245,14 +262,14 @@ private fun HomeScreenPreview() = ScorePreview { sportSelect = SportSelection.All, selectionList = sportSelectionList, favoriteSports = emptySet(), - loadedState = ApiResponse.Success(gameList), - + loadedState = ApiResponse.Success(gameList) ), onGenderSelected = {}, onSportSelected = {}, onRefresh = {}, onAdvancedFilterClick = {}, - navigateToProfile = {} + navigateToProfile = {}, + welcomeName = "Claire" ) } } From 57834de07538ca1d330c3a64fd49b649d6a11fe2 Mon Sep 17 00:00:00 2001 From: amjiao Date: Mon, 16 Nov 2026 20:38:33 -0500 Subject: [PATCH 07/10] Use past games empty state --- .../score/screen/PastGamesScreen.kt | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt index 981e6e56..5b3882f1 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -21,12 +22,11 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.cornellappdev.score.R -import com.cornellappdev.score.components.EmptyStateBox import com.cornellappdev.score.components.ErrorState import com.cornellappdev.score.components.GamesCarousel import com.cornellappdev.score.components.LoadingScreen import com.cornellappdev.score.components.PastGameCard +import com.cornellappdev.score.components.PastGamesEmptyState import com.cornellappdev.score.components.ScorePreview import com.cornellappdev.score.components.ScorePullToRefreshBox import com.cornellappdev.score.components.SportSelectorHeader @@ -42,7 +42,6 @@ import com.cornellappdev.score.util.gameList import com.cornellappdev.score.util.sportSelectionList import com.cornellappdev.score.viewmodel.PastGamesUiState import com.cornellappdev.score.viewmodel.PastGamesViewModel -import kotlin.collections.emptyList @Composable fun PastGamesScreen( @@ -92,7 +91,13 @@ private fun PastGamesContent( navigateToProfile: () -> Unit ) { ScorePullToRefreshBox(uiState.loadedState == ApiResponse.Loading, onRefresh = onRefresh) { - PastGamesLazyColumn(uiState, onGenderSelected, onSportSelected, navigateToGameDetails, navigateToProfile) + PastGamesLazyColumn( + uiState, + onGenderSelected, + onSportSelected, + navigateToGameDetails, + navigateToProfile + ) } } @@ -174,7 +179,13 @@ private fun PastGamesLazyColumn( } } else { item { - EmptyStateBox(icon = R.drawable.ic_speaker_gray, title = "No games yet.") + Column( + modifier = Modifier + .padding(horizontal = 24.dp) + .fillMaxSize() + ) { + PastGamesEmptyState() + } } } } From 5905456d7597f3c9340197597e55efa9ed229296 Mon Sep 17 00:00:00 2001 From: amjiao Date: Mon, 16 Nov 2026 20:57:12 -0500 Subject: [PATCH 08/10] Order sports in sport filter by seasonality --- .../cornellappdev/score/screen/HomeScreen.kt | 2 +- .../score/viewmodel/HomeViewModel.kt | 31 +++++++++++-- .../score/viewmodel/PastGamesViewModel.kt | 45 +++++++++++++++---- 3 files changed, 64 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt index e4d875f3..964cadb6 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt @@ -36,11 +36,11 @@ import com.cornellappdev.score.components.EmptyStateBox import com.cornellappdev.score.components.ErrorState import com.cornellappdev.score.components.GameCard import com.cornellappdev.score.components.GamesCarousel -import com.cornellappdev.score.components.onboarding.WelcomeBanner import com.cornellappdev.score.components.LoadingScreen import com.cornellappdev.score.components.ScorePreview import com.cornellappdev.score.components.ScorePullToRefreshBox import com.cornellappdev.score.components.SportSelectorHeader +import com.cornellappdev.score.components.onboarding.WelcomeBanner import com.cornellappdev.score.model.ApiResponse import com.cornellappdev.score.model.GenderDivision import com.cornellappdev.score.model.SportSelection diff --git a/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt index 6a9b17d2..79af5934 100644 --- a/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt +++ b/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt @@ -41,6 +41,7 @@ data class HomeUiState( } else { true } + else -> game.gender == selectedGender.displayName } val matchesSport = when (sportSelect) { @@ -53,9 +54,18 @@ data class HomeUiState( } val matchesDate = when (dateFilter) { DateFilter.TODAY -> game.date == LocalDate.now() - DateFilter.WITHIN_7_DAYS -> game.date?.isBefore(LocalDate.now().plusDays(8)) == true && (game.date?.isAfter(LocalDate.now().minusDays(1)) == true) - DateFilter.WITHIN_A_MONTH -> game.date?.isBefore(LocalDate.now().plusMonths(1)) == true && (game.date?.isAfter(LocalDate.now().minusDays(1)) == true) - DateFilter.OVER_A_MONTH -> game.date?.isAfter(LocalDate.now().plusMonths(1)) == true + DateFilter.WITHIN_7_DAYS -> game.date?.isBefore( + LocalDate.now().plusDays(8) + ) == true && (game.date?.isAfter(LocalDate.now().minusDays(1)) == true) + + DateFilter.WITHIN_A_MONTH -> game.date?.isBefore( + LocalDate.now().plusMonths(1) + ) == true && (game.date?.isAfter(LocalDate.now().minusDays(1)) == true) + + DateFilter.OVER_A_MONTH -> game.date?.isAfter( + LocalDate.now().plusMonths(1) + ) == true + null -> true } matchesGender && matchesSport && matchesLocation && matchesDate @@ -160,6 +170,19 @@ class HomeViewModel @Inject constructor( favorites: Set, upcomingGames: List ): List { - return Sport.getSportSelectionList(gender) + val nextGameDateBySport = upcomingGames + .groupBy { it.sport } + .mapValues { (_, games) -> games.mapNotNull { it.date }.minOrNull() } + + return Sport.getSportSelectionList(gender).sortedWith( + compareBy { if (it is SportSelection.All) 0 else 1 } + .thenBy { selection -> + (selection as? SportSelection.SportSelect) + ?.sport + ?.displayName + ?.let(nextGameDateBySport::get) + ?: LocalDate.MAX + } + ) } } diff --git a/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt index 6eebb7a3..14f36c61 100644 --- a/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt +++ b/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt @@ -33,6 +33,7 @@ data class PastGamesUiState( } else { true } + else -> game.gender == selectedGender.displayName } val matchesSport = (sportSelect is SportSelection.All || @@ -71,24 +72,30 @@ class PastGamesViewModel @Inject constructor( init { asyncCollect(scoreRepository.upcomingGamesFlow) { response -> applyMutation { + val loadedState = response.map { list -> + list.map { game -> + game.toGameCardData() + }.filter { game -> + game.date?.isBefore(LocalDate.now()) ?: false + }.sortedByDescending { it.date } + } + val pastGames = (loadedState as? ApiResponse.Success)?.data.orEmpty() copy( - loadedState = response.map { list -> - list.map { game -> - game.toGameCardData() - }.filter { game -> - game.date?.isBefore(LocalDate.now()) ?: false - }.sortedByDescending { it.date } - } + loadedState = loadedState, + selectionList = selectionListFor(selectedGender, pastGames) ) } } } - + fun onGenderSelected(gender: GenderDivision) { applyMutation { copy( selectedGender = gender, - selectionList = Sport.getSportSelectionList(gender), + selectionList = selectionListFor( + gender, + (loadedState as? ApiResponse.Success)?.data.orEmpty() + ), ) } } @@ -106,4 +113,24 @@ class PastGamesViewModel @Inject constructor( scoreRepository.fetchGames() } + + private fun selectionListFor( + gender: GenderDivision, + pastGames: List + ): List { + val mostRecentGameBySport = pastGames + .groupBy { it.sport } + .mapValues { (_, games) -> games.mapNotNull { it.date }.maxOrNull() } + + return Sport.getSportSelectionList(gender).sortedWith( + compareBy { if (it is SportSelection.All) 0 else 1 } + .thenByDescending { selection -> + (selection as? SportSelection.SportSelect) + ?.sport + ?.displayName + ?.let(mostRecentGameBySport::get) + ?: LocalDate.MIN + } + ) + } } \ No newline at end of file From 95d355374f657a5357dd9bf3ffc3d02629ab7c2f Mon Sep 17 00:00:00 2001 From: Emil Jiang Date: Wed, 18 Nov 2026 15:30:47 -0500 Subject: [PATCH 09/10] Route new accounts through profile and sports onboarding --- .../java/com/cornellappdev/score/ScoreApp.kt | 27 +++++-- .../score/auth/AuthRepository.kt | 25 ++++++- .../com/cornellappdev/score/auth/AuthState.kt | 19 ++++- .../cornellappdev/score/auth/AuthViewModel.kt | 17 +++++ .../screen/OnboardingProfileSelectScreen.kt | 46 +++++------- .../score/screen/OnboardingSequence.kt | 70 ++++++++----------- .../score/viewmodel/OnboardingViewModel.kt | 15 ++-- app/src/main/res/values/strings.xml | 1 + 8 files changed, 139 insertions(+), 81 deletions(-) diff --git a/app/src/main/java/com/cornellappdev/score/ScoreApp.kt b/app/src/main/java/com/cornellappdev/score/ScoreApp.kt index a05b5dca..c6e4fa0f 100644 --- a/app/src/main/java/com/cornellappdev/score/ScoreApp.kt +++ b/app/src/main/java/com/cornellappdev/score/ScoreApp.kt @@ -7,6 +7,7 @@ import androidx.compose.material3.CircularProgressIndicator import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.key import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue @@ -17,9 +18,11 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.cornellappdev.score.auth.AuthState import com.cornellappdev.score.auth.AuthStatusOverlay import com.cornellappdev.score.auth.AuthViewModel +import com.cornellappdev.score.auth.OnboardingStage import com.cornellappdev.score.model.OnboardingPreferencesRepository import com.cornellappdev.score.nav.root.RootNavigation import com.cornellappdev.score.screen.OnboardingScreen +import com.cornellappdev.score.screen.OnboardingSequence import com.cornellappdev.score.theme.CrimsonPrimary @Composable @@ -34,11 +37,11 @@ fun ScoreApp( var skippedWelcome by rememberSaveable { mutableStateOf(onboardingPreferences.isOnboardingCompleted()) } - val signedInUser = (authState as? AuthState.SignedIn)?.user - val signedIn = signedInUser != null + val signedInState = authState as? AuthState.SignedIn + val onboardingComplete = signedInState?.onboardingStage == OnboardingStage.COMPLETE - LaunchedEffect(signedIn) { - if (signedIn) { + LaunchedEffect(onboardingComplete) { + if (onboardingComplete) { onboardingPreferences.markOnboardingCompleted() skippedWelcome = true } @@ -50,7 +53,21 @@ fun ScoreApp( Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { CircularProgressIndicator(color = CrimsonPrimary) } - signedIn || skippedWelcome -> RootNavigation(welcomeName = signedInUser?.name) + signedInState != null && !onboardingComplete -> + key(signedInState.user.id) { + OnboardingSequence( + stage = signedInState.onboardingStage, + displayName = signedInState.user.name, + onProfileComplete = { + authViewModel.completeOnboardingStep(OnboardingStage.PROFILE) + }, + onOnboardingComplete = { + authViewModel.completeOnboardingStep(OnboardingStage.SPORTS) + }, + ) + } + onboardingComplete || skippedWelcome -> + RootNavigation(welcomeName = signedInState?.user?.name) else -> OnboardingScreen( onSignUp = onSignIn, diff --git a/app/src/main/java/com/cornellappdev/score/auth/AuthRepository.kt b/app/src/main/java/com/cornellappdev/score/auth/AuthRepository.kt index 64ba6243..6774c7a6 100644 --- a/app/src/main/java/com/cornellappdev/score/auth/AuthRepository.kt +++ b/app/src/main/java/com/cornellappdev/score/auth/AuthRepository.kt @@ -30,13 +30,18 @@ constructor(private val api: AuthApi, private val storage: SessionStorage) { suspend fun signIn(identity: GoogleIdentity) = mutex.withLock { require(identity.user.email.endsWith("@cornell.edu", ignoreCase = true)) + var onboardingStage = OnboardingStage.COMPLETE val tokens = try { api.login(identity.firebaseIdToken) } catch (_: UserNotFoundException) { - api.signup(identity.firebaseIdToken) + val signupTokens = api.signup(identity.firebaseIdToken) + onboardingStage = OnboardingStage.PROFILE + signupTokens } - saveSession(AuthSession(identity.user, tokens.accessToken, tokens.refreshToken)) + saveSession( + AuthSession(identity.user, tokens.accessToken, tokens.refreshToken, onboardingStage) + ) restored = true } @@ -59,6 +64,19 @@ constructor(private val api: AuthApi, private val storage: SessionStorage) { } } + suspend fun completeOnboardingStep(expectedStage: OnboardingStage) = + mutex.withLock { + val current = checkNotNull(session) + check(current.onboardingStage == expectedStage) + val nextStage = + when (expectedStage) { + OnboardingStage.PROFILE -> OnboardingStage.SPORTS + OnboardingStage.SPORTS -> OnboardingStage.COMPLETE + OnboardingStage.COMPLETE -> error("Onboarding is already complete") + } + saveSession(current.copy(onboardingStage = nextStage)) + } + suspend fun signOut() { val previous = mutex.withLock { @@ -96,6 +114,7 @@ constructor(private val api: AuthApi, private val storage: SessionStorage) { } private fun publishState() { - mutableState.value = session?.let { AuthState.SignedIn(it.user) } ?: AuthState.SignedOut + mutableState.value = + session?.let { AuthState.SignedIn(it.user, it.onboardingStage) } ?: AuthState.SignedOut } } diff --git a/app/src/main/java/com/cornellappdev/score/auth/AuthState.kt b/app/src/main/java/com/cornellappdev/score/auth/AuthState.kt index f8b0eb6c..d4d7f3f1 100644 --- a/app/src/main/java/com/cornellappdev/score/auth/AuthState.kt +++ b/app/src/main/java/com/cornellappdev/score/auth/AuthState.kt @@ -12,13 +12,28 @@ sealed interface AuthState { data object SignedOut : AuthState - data class SignedIn(val user: AuthUser) : AuthState + data class SignedIn( + val user: AuthUser, + val onboardingStage: OnboardingStage = OnboardingStage.COMPLETE, + ) : AuthState +} + +@Serializable +enum class OnboardingStage { + PROFILE, + SPORTS, + COMPLETE, } @Serializable data class AuthUser(val id: String, val name: String, val email: String) @Serializable -data class AuthSession(val user: AuthUser, val accessToken: String, val refreshToken: String) +data class AuthSession( + val user: AuthUser, + val accessToken: String, + val refreshToken: String, + val onboardingStage: OnboardingStage = OnboardingStage.COMPLETE, +) data class AuthTokens(val accessToken: String, val refreshToken: String) diff --git a/app/src/main/java/com/cornellappdev/score/auth/AuthViewModel.kt b/app/src/main/java/com/cornellappdev/score/auth/AuthViewModel.kt index 63bb0d0e..8a691e29 100644 --- a/app/src/main/java/com/cornellappdev/score/auth/AuthViewModel.kt +++ b/app/src/main/java/com/cornellappdev/score/auth/AuthViewModel.kt @@ -61,6 +61,23 @@ constructor(private val repository: AuthRepository, private val google: GoogleSi } } + fun completeOnboardingStep(stage: OnboardingStage) { + if (mutableSignInState.value.busy) return + mutableSignInState.value = SignInState(busy = true) + viewModelScope.launch { + try { + repository.completeOnboardingStep(stage) + mutableSignInState.value = SignInState() + } catch (error: CancellationException) { + mutableSignInState.value = SignInState() + throw error + } catch (error: Exception) { + Log.e(TAG, "Could not save onboarding progress", error) + mutableSignInState.value = SignInState(error = R.string.auth_onboarding_save_failed) + } + } + } + private companion object { const val TAG = "AuthViewModel" } diff --git a/app/src/main/java/com/cornellappdev/score/screen/OnboardingProfileSelectScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/OnboardingProfileSelectScreen.kt index 9ffe9190..afb91aa6 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/OnboardingProfileSelectScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/OnboardingProfileSelectScreen.kt @@ -33,50 +33,42 @@ import com.cornellappdev.score.theme.Style fun OnboardingProfileSelectScreen( onNext: (ProfilePicture) -> Unit, modifier: Modifier = Modifier, - displayName: String? = null + displayName: String? = null, + initiallySelectedPicture: ProfilePicture = ProfilePicture.BLANK, ) { - var selectedPicture by rememberSaveable { mutableStateOf(ProfilePicture.BLANK) } + var selectedPicture by rememberSaveable { mutableStateOf(initiallySelectedPicture) } val name = displayName ?: stringResource(R.string.onboarding_default_name) - Box( - modifier = modifier - .fillMaxSize() - .background(Color.White) - ) { + Box(modifier = modifier.fillMaxSize().background(Color.White)) { Column(modifier = Modifier.fillMaxSize()) { Column( - modifier = Modifier - .fillMaxWidth() - .padding(top = 80.dp), - horizontalAlignment = Alignment.CenterHorizontally + modifier = Modifier.fillMaxWidth().padding(top = 80.dp), + horizontalAlignment = Alignment.CenterHorizontally, ) { Text( text = stringResource(R.string.edit_profile), style = Style.heading1, - color = GrayPrimary + color = GrayPrimary, ) Spacer(Modifier.height(4.dp)) Text( text = stringResource(R.string.onboarding_profile_subtitle), style = Style.bodyMedium, - color = GrayPrimary + color = GrayPrimary, ) Spacer(Modifier.height(40.dp)) Image( painter = painterResource(selectedPicture.drawable), - contentDescription = stringResource( - R.string.selected_profile_picture, - stringResource(selectedPicture.label) - ), - modifier = Modifier.size(100.dp) + contentDescription = + stringResource( + R.string.selected_profile_picture, + stringResource(selectedPicture.label), + ), + modifier = Modifier.size(100.dp), ) Spacer(Modifier.height(16.dp)) - Text( - text = name, - style = Style.bodyMedium, - color = Color.Black - ) + Text(text = name, style = Style.bodyMedium, color = Color.Black) Spacer(Modifier.height(60.dp)) Text( @@ -84,15 +76,13 @@ fun OnboardingProfileSelectScreen( style = Style.metricMedium, color = Color.Black, textAlign = TextAlign.Center, - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 24.dp) + modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp), ) Spacer(Modifier.height(24.dp)) ProfilePictureOptions( selectedPicture = selectedPicture, onPictureSelected = { selectedPicture = it }, - modifier = Modifier.fillMaxWidth() + modifier = Modifier.fillMaxWidth(), ) } @@ -100,7 +90,7 @@ fun OnboardingProfileSelectScreen( OnboardingFooter( buttonText = stringResource(R.string.next), onClick = { onNext(selectedPicture) }, - activeStep = 0 + activeStep = 0, ) } } diff --git a/app/src/main/java/com/cornellappdev/score/screen/OnboardingSequence.kt b/app/src/main/java/com/cornellappdev/score/screen/OnboardingSequence.kt index 0daf53ec..14048d39 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/OnboardingSequence.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/OnboardingSequence.kt @@ -3,63 +3,55 @@ package com.cornellappdev.score.screen import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel +import com.cornellappdev.score.auth.OnboardingStage +import com.cornellappdev.score.model.ProfileFavorite import com.cornellappdev.score.viewmodel.OnboardingSequenceViewModel -private enum class OnboardingStep { - WELCOME, - PROFILE_SELECT, - SPORT_SELECT -} - @Composable fun OnboardingSequence( + stage: OnboardingStage, + displayName: String, + onProfileComplete: () -> Unit, onOnboardingComplete: () -> Unit, - viewModel: OnboardingSequenceViewModel = hiltViewModel() + viewModel: OnboardingSequenceViewModel = hiltViewModel(), ) { - var onboardingStep by rememberSaveable { - mutableStateOf(OnboardingStep.WELCOME) - } - - val completeOnboarding = remember { - onOnboardingComplete - } - - when (onboardingStep) { - OnboardingStep.WELCOME -> OnboardingScreen( - onSignUp = { onboardingStep = OnboardingStep.PROFILE_SELECT }, - onLogIn = completeOnboarding, - onLater = completeOnboarding - ) - - OnboardingStep.PROFILE_SELECT -> OnboardingProfileSelectScreen( - onNext = { selectedPicture -> - viewModel.saveProfilePicture(selectedPicture.name) - onboardingStep = OnboardingStep.SPORT_SELECT - } - ) + when (stage) { + OnboardingStage.PROFILE -> + OnboardingProfileSelectScreen( + displayName = displayName, + initiallySelectedPicture = viewModel.getProfilePicture(), + onNext = { selectedPicture -> + viewModel.saveProfilePicture(selectedPicture.name) + onProfileComplete() + }, + ) - OnboardingStep.SPORT_SELECT -> { - var selectedFavorites by remember { - mutableStateOf(viewModel.getFavoriteSports()) + OnboardingStage.SPORTS -> { + var selectedKeys by rememberSaveable { + mutableStateOf(viewModel.getFavoriteSports().joinToString("|") { it.storageKey }) } + val selectedFavorites = + selectedKeys.split('|').mapNotNull(ProfileFavorite::fromStorageKey) OnboardingFavoriteSportsScreen( favorites = selectedFavorites, onToggleFavorite = { favorite -> - selectedFavorites = if (favorite in selectedFavorites) { - selectedFavorites - favorite - } else { - selectedFavorites + favorite - } + val updatedFavorites = + if (favorite in selectedFavorites) { + selectedFavorites - favorite + } else { + selectedFavorites + favorite + } + selectedKeys = updatedFavorites.joinToString("|") { it.storageKey } }, onFinish = { viewModel.saveFavoriteSports(selectedFavorites.toSet()) - completeOnboarding() - } + onOnboardingComplete() + }, ) } + OnboardingStage.COMPLETE -> Unit } } diff --git a/app/src/main/java/com/cornellappdev/score/viewmodel/OnboardingViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/OnboardingViewModel.kt index 69cee28c..28b7f968 100644 --- a/app/src/main/java/com/cornellappdev/score/viewmodel/OnboardingViewModel.kt +++ b/app/src/main/java/com/cornellappdev/score/viewmodel/OnboardingViewModel.kt @@ -3,16 +3,23 @@ package com.cornellappdev.score.viewmodel import androidx.lifecycle.ViewModel import com.cornellappdev.score.model.OnboardingPreferencesRepository import com.cornellappdev.score.model.ProfileFavorite +import com.cornellappdev.score.screen.ProfilePicture import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject @HiltViewModel -class OnboardingSequenceViewModel @Inject constructor( - private val onboardingPreferencesRepository: OnboardingPreferencesRepository -) : ViewModel() { +class OnboardingSequenceViewModel +@Inject +constructor(private val onboardingPreferencesRepository: OnboardingPreferencesRepository) : + ViewModel() { fun getFavoriteSports(): List = onboardingPreferencesRepository.getFavoriteSports().toList() + fun getProfilePicture(): ProfilePicture = + ProfilePicture.entries.find { + it.name == onboardingPreferencesRepository.getProfilePicture() + } ?: ProfilePicture.BLANK + fun saveProfilePicture(pictureName: String) { onboardingPreferencesRepository.saveProfilePicture(pictureName) } @@ -20,4 +27,4 @@ class OnboardingSequenceViewModel @Inject constructor( fun saveFavoriteSports(favorites: Set) { onboardingPreferencesRepository.saveFavoriteSports(favorites) } -} \ No newline at end of file +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 95bc6697..45034716 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -56,4 +56,5 @@ Couldn’t sign in. Check your connection and try again. Account No Google account is available for sign-in. Add your Cornell Google account to this device and try again. + Couldn’t save your progress. Please try again. From 4996c761ac2bb13c535879798eb2491c05114e7d Mon Sep 17 00:00:00 2001 From: amjiao Date: Thu, 19 Nov 2026 15:17:11 -0500 Subject: [PATCH 10/10] Add GenderFilter enum for HomeScreen filter --- .../score/components/GenderDivisionFilter.kt | 36 +++--- .../score/components/SportSelectorHeader.kt | 18 +-- .../com/cornellappdev/score/model/Sport.kt | 28 +++-- .../cornellappdev/score/screen/HomeScreen.kt | 110 +++++++++--------- .../score/screen/PastGamesScreen.kt | 22 ++-- .../score/viewmodel/HomeViewModel.kt | 30 ++--- .../score/viewmodel/PastGamesViewModel.kt | 28 ++--- 7 files changed, 137 insertions(+), 135 deletions(-) diff --git a/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt b/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt index 9e04d009..36e57164 100644 --- a/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt +++ b/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt @@ -24,23 +24,23 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.semantics.Role import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.cornellappdev.score.model.GenderDivision +import com.cornellappdev.score.model.GameFilter import com.cornellappdev.score.theme.CrimsonPrimary import com.cornellappdev.score.theme.GrayLight import com.cornellappdev.score.theme.GrayMedium import com.cornellappdev.score.theme.Style import com.cornellappdev.score.theme.White -/** Accessible, single-choice filter shared by the Home screen and onboarding. */ +/** Accessible, single-choice game filter used by the Home and Scores screens. */ @Composable -fun GenderDivisionFilter( - selectedGender: GenderDivision, - onGenderSelected: (GenderDivision) -> Unit, +fun GameFilterSelector( + selectedFilter: GameFilter, + onFilterSelected: (GameFilter) -> Unit, modifier: Modifier = Modifier, - options: List = listOf( - GenderDivision.FAVORITES, - GenderDivision.MALE, - GenderDivision.FEMALE + options: List = listOf( + GameFilter.FAVORITES, + GameFilter.MALE, + GameFilter.FEMALE ) ) { Row( @@ -52,8 +52,8 @@ fun GenderDivisionFilter( .selectableGroup(), verticalAlignment = Alignment.CenterVertically ) { - options.forEach { gender -> - val selected = gender == selectedGender + options.forEach { filter -> + val selected = filter == selectedFilter Box( modifier = Modifier .weight(1f) @@ -65,12 +65,12 @@ fun GenderDivisionFilter( .selectable( selected = selected, role = Role.RadioButton, - onClick = { onGenderSelected(gender) } + onClick = { onFilterSelected(filter) } ), contentAlignment = Alignment.Center ) { Text( - text = gender.displayName, + text = filter.displayName, style = if (selected) Style.bodySemibold else Style.bodyMedium, color = if (selected) White else GrayMedium ) @@ -81,13 +81,13 @@ fun GenderDivisionFilter( @Preview(showBackground = true) @Composable -private fun GenderDivisionFilterPreview() { +private fun GameFilterSelectorPreview() { ScorePreview { - var selectedGender by remember { mutableStateOf(GenderDivision.FAVORITES) } + var selectedFilter by remember { mutableStateOf(GameFilter.FAVORITES) } - GenderDivisionFilter( - selectedGender = selectedGender, - onGenderSelected = { selectedGender = it } + GameFilterSelector( + selectedFilter = selectedFilter, + onFilterSelected = { selectedFilter = it } ) } } diff --git a/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt b/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt index 509be0b8..d6b4c6ad 100644 --- a/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt +++ b/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt @@ -27,7 +27,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.cornellappdev.score.R import com.cornellappdev.score.components.onboarding.HomeScreenFavoritesInfoBanner -import com.cornellappdev.score.model.GenderDivision +import com.cornellappdev.score.model.GameFilter import com.cornellappdev.score.model.Sport import com.cornellappdev.score.model.SportSelection import com.cornellappdev.score.theme.CrimsonPrimary @@ -40,10 +40,10 @@ import com.cornellappdev.score.util.sportSelectionList @Composable fun SportSelectorHeader( sports: List, - selectedGender: GenderDivision, + selectedFilter: GameFilter, selectedSport: SportSelection, favoriteSports: Set, - onGenderSelected: (GenderDivision) -> Unit, + onFilterSelected: (GameFilter) -> Unit, onSportSelected: (SportSelection) -> Unit, toProfile: () -> Unit, modifier: Modifier = Modifier @@ -54,9 +54,9 @@ fun SportSelectorHeader( .background(color = White), horizontalAlignment = Alignment.CenterHorizontally ) { - GenderDivisionFilter( - selectedGender = selectedGender, - onGenderSelected = onGenderSelected + GameFilterSelector( + selectedFilter = selectedFilter, + onFilterSelected = onFilterSelected ) Spacer(Modifier.height(16.dp)) if (favoriteSports.isEmpty()) { @@ -137,15 +137,15 @@ fun SportSelector( @Preview @Composable private fun PreviewSportSelectorHeader() = ScorePreview { - var selectedOption by remember { mutableStateOf(GenderDivision.FAVORITES) } + var selectedOption by remember { mutableStateOf(GameFilter.FAVORITES) } var selectedSport: SportSelection by remember { mutableStateOf(SportSelection.All) } SportSelectorHeader( sports = sportSelectionList, - selectedGender = selectedOption, + selectedFilter = selectedOption, selectedSport = selectedSport, favoriteSports = emptySet(), - onGenderSelected = { selectedOption = it }, + onFilterSelected = { selectedOption = it }, onSportSelected = { selectedSport = it }, toProfile = {} ) diff --git a/app/src/main/java/com/cornellappdev/score/model/Sport.kt b/app/src/main/java/com/cornellappdev/score/model/Sport.kt index 3b1e691c..ac7d5191 100644 --- a/app/src/main/java/com/cornellappdev/score/model/Sport.kt +++ b/app/src/main/java/com/cornellappdev/score/model/Sport.kt @@ -168,20 +168,20 @@ enum class Sport( return entries.find { it.displayName.equals(name, ignoreCase = true) } } - fun getSportSelectionList(selectedGender: GenderDivision?): List { - val filteredSports = when (selectedGender) { - GenderDivision.MALE -> Sport.entries.filter { it.gender == GenderDivision.MALE || it.gender == GenderDivision.ALL } - GenderDivision.FEMALE -> Sport.entries.filter { it.gender == GenderDivision.FEMALE || it.gender == GenderDivision.ALL } - GenderDivision.FAVORITES, - GenderDivision.ALL, + fun getSportSelectionList(selectedFilter: GameFilter?): List { + val filteredSports = when (selectedFilter) { + GameFilter.MALE -> Sport.entries.filter { it.gender == GenderDivision.MALE || it.gender == GenderDivision.ALL } + GameFilter.FEMALE -> Sport.entries.filter { it.gender == GenderDivision.FEMALE || it.gender == GenderDivision.ALL } + GameFilter.FAVORITES, + GameFilter.ALL, null -> Sport.entries }.filter { isValidSport(it.displayName) } return listOf(SportSelection.All) + filteredSports.map { SportSelection.SportSelect(it) } } - fun getHomeSportSelectionList(selectedGender: GenderDivision?): List = - getSportSelectionList(selectedGender) + fun getHomeSportSelectionList(selectedFilter: GameFilter?): List = + getSportSelectionList(selectedFilter) } } @@ -193,9 +193,6 @@ sealed class SportSelection { enum class GenderDivision( val displayName: String ) { - FAVORITES( - "Favorites" - ), ALL( "All" ), @@ -206,3 +203,12 @@ enum class GenderDivision( "Women's" ) } + +enum class GameFilter( + val displayName: String +) { + FAVORITES("Favorites"), + ALL("All"), + MALE("Men's"), + FEMALE("Women's") +} diff --git a/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt index 964cadb6..2eafdc3e 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt @@ -42,7 +42,8 @@ import com.cornellappdev.score.components.ScorePullToRefreshBox import com.cornellappdev.score.components.SportSelectorHeader import com.cornellappdev.score.components.onboarding.WelcomeBanner import com.cornellappdev.score.model.ApiResponse -import com.cornellappdev.score.model.GenderDivision +import com.cornellappdev.score.model.GameFilter +import com.cornellappdev.score.model.Sport import com.cornellappdev.score.model.SportSelection import com.cornellappdev.score.theme.GrayPrimary import com.cornellappdev.score.theme.GrayStroke @@ -84,11 +85,10 @@ fun HomeScreen( HomeContent( uiState = uiState, welcomeName = welcomeName, - onGenderSelected = { homeViewModel.onGenderSelected(it) }, + onFilterSelected = { homeViewModel.onFilterSelected(it) }, onSportSelected = { homeViewModel.onSportSelected(it) }, navigateToGameDetails = navigateToGameDetails, onRefresh = { homeViewModel.onRefresh() }, - onAdvancedFilterClick = { showBottomSheet = true }, navigateToProfile = navigateToProfile ) } @@ -113,10 +113,9 @@ fun HomeScreen( @Composable private fun HomeContent( uiState: HomeUiState, - onGenderSelected: (GenderDivision) -> Unit, + onFilterSelected: (GameFilter) -> Unit, onSportSelected: (SportSelection) -> Unit, onRefresh: () -> Unit, - onAdvancedFilterClick: () -> Unit, navigateToProfile: () -> Unit, welcomeName: String? = null, navigateToGameDetails: (String) -> Unit = {} @@ -124,10 +123,9 @@ private fun HomeContent( ScorePullToRefreshBox(isRefreshing = uiState.loadedState == ApiResponse.Loading, onRefresh) { HomeLazyColumn( uiState, - onGenderSelected, + onFilterSelected, onSportSelected, navigateToGameDetails, - onAdvancedFilterClick, navigateToProfile, welcomeName ) @@ -138,14 +136,17 @@ private fun HomeContent( @OptIn(ExperimentalFoundationApi::class) private fun HomeLazyColumn( uiState: HomeUiState, - onGenderSelected: (GenderDivision) -> Unit, + onFilterSelected: (GameFilter) -> Unit, onSportSelected: (SportSelection) -> Unit, navigateToGameDetails: (String) -> Unit, - onAdvancedFilterClick: () -> Unit, toProfile: () -> Unit, welcomeName: String? = null ) { - LazyColumn(contentPadding = PaddingValues(top = 24.dp)) { + Box(Modifier.fillMaxSize()) { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(top = 24.dp) + ) { if (welcomeName != null) { item { WelcomeBanner( @@ -157,25 +158,22 @@ private fun HomeLazyColumn( Spacer(Modifier.height(24.dp)) } } - if (uiState.filteredGames.isNotEmpty()) { - item { - Text( - text = "Upcoming", - style = heading1, - color = GrayPrimary, - modifier = Modifier - .fillMaxWidth() - .padding(start = 24.dp) - ) - } - item { - Spacer(Modifier.height(16.dp)) - } + item { + Text( + text = "Upcoming", + style = heading1, + color = GrayPrimary, + modifier = Modifier + .fillMaxWidth() + .padding(start = 24.dp) + ) } - if (uiState.filteredGames.isNotEmpty()) { - item { - GamesCarousel(uiState.upcomingGames, navigateToGameDetails) - } + item { + Spacer(Modifier.height(16.dp)) + } + + item { + GamesCarousel(uiState.upcomingGames, navigateToGameDetails) } stickyHeader { Column( @@ -193,20 +191,14 @@ private fun HomeLazyColumn( text = "Game Schedule", style = title, ) - //removed for 2/2026 release -// IconButton( -// icon = painterResource(id = R.drawable.advanced_filter), -// contentDescription = "Advanced filter", -// onClick = onAdvancedFilterClick -// ) } Spacer(modifier = Modifier.height(16.dp)) SportSelectorHeader( sports = uiState.selectionList, - selectedGender = uiState.selectedGender, + selectedFilter = uiState.selectedFilter, selectedSport = uiState.sportSelect, favoriteSports = uiState.favoriteSports, - onGenderSelected = onGenderSelected, + onFilterSelected = onFilterSelected, onSportSelected = onSportSelected, toProfile = toProfile ) @@ -224,26 +216,32 @@ private fun HomeLazyColumn( Spacer(modifier = Modifier.height(24.dp)) } items(uiState.filteredGames) { - val game = it Column(modifier = Modifier.padding(horizontal = 24.dp)) { GameCard( - teamLogo = game.teamLogo, - team = game.team, - date = game.dateString, - isLive = game.isLive, - genderIcon = painterResource(game.genderIcon), - sportIcon = painterResource(game.sportIcon), - location = game.location, + teamLogo = it.teamLogo, + team = it.team, + date = it.dateString, + isLive = it.isLive, + genderIcon = painterResource(it.genderIcon), + sportIcon = painterResource(it.sportIcon), + location = it.location, topCornerRound = true, - onClick = { navigateToGameDetails(game.id) } + onClick = { navigateToGameDetails(it.id) } ) Spacer(modifier = Modifier.height(16.dp)) } } - } else { - item { - EmptyStateBox(icon = R.drawable.ic_speaker_gray, title = "No games yet.") - } + } + } + if (uiState.filteredGames.isEmpty()) { + EmptyStateBox( + icon = R.drawable.ic_speaker_gray, + title = "No games yet.", + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(bottom = 24.dp), + height = 200.dp + ) } } } @@ -258,16 +256,15 @@ private fun HomeScreenPreview() = ScorePreview { ) { HomeContent( HomeUiState( - selectedGender = GenderDivision.FAVORITES, + selectedFilter = GameFilter.FAVORITES, sportSelect = SportSelection.All, selectionList = sportSelectionList, favoriteSports = emptySet(), loadedState = ApiResponse.Success(gameList) ), - onGenderSelected = {}, + onFilterSelected = {}, onSportSelected = {}, onRefresh = {}, - onAdvancedFilterClick = {}, navigateToProfile = {}, welcomeName = "Claire" ) @@ -279,16 +276,15 @@ private fun HomeScreenPreview() = ScorePreview { private fun HomeScreenEmptyStatePreview() = ScorePreview { HomeContent( HomeUiState( - selectedGender = GenderDivision.FAVORITES, - sportSelect = SportSelection.All, + selectedFilter = GameFilter.FAVORITES, + sportSelect = SportSelection.SportSelect(Sport.FOOTBALL), selectionList = sportSelectionList, favoriteSports = emptySet(), - loadedState = ApiResponse.Success(emptyList()) + loadedState = ApiResponse.Success(gameList) ), - onGenderSelected = {}, + onFilterSelected = {}, onSportSelected = {}, onRefresh = {}, - onAdvancedFilterClick = {}, navigateToProfile = {} ) } diff --git a/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt index 5b3882f1..86a66f5c 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt @@ -31,7 +31,7 @@ import com.cornellappdev.score.components.ScorePreview import com.cornellappdev.score.components.ScorePullToRefreshBox import com.cornellappdev.score.components.SportSelectorHeader import com.cornellappdev.score.model.ApiResponse -import com.cornellappdev.score.model.GenderDivision +import com.cornellappdev.score.model.GameFilter import com.cornellappdev.score.model.SportSelection import com.cornellappdev.score.theme.GrayPrimary import com.cornellappdev.score.theme.GrayStroke @@ -69,7 +69,7 @@ fun PastGamesScreen( is ApiResponse.Success -> { PastGamesContent( uiState = uiState, - onGenderSelected = { pastGamesViewModel.onGenderSelected(it) }, + onFilterSelected = { pastGamesViewModel.onFilterSelected(it) }, onSportSelected = { pastGamesViewModel.onSportSelected(it) }, navigateToGameDetails = navigateToGameDetails, onRefresh = pastGamesViewModel::onRefresh, @@ -84,7 +84,7 @@ fun PastGamesScreen( @Composable private fun PastGamesContent( uiState: PastGamesUiState, - onGenderSelected: (GenderDivision) -> Unit, + onFilterSelected: (GameFilter) -> Unit, onSportSelected: (SportSelection) -> Unit, onRefresh: () -> Unit, navigateToGameDetails: (String) -> Unit = {}, @@ -93,7 +93,7 @@ private fun PastGamesContent( ScorePullToRefreshBox(uiState.loadedState == ApiResponse.Loading, onRefresh = onRefresh) { PastGamesLazyColumn( uiState, - onGenderSelected, + onFilterSelected, onSportSelected, navigateToGameDetails, navigateToProfile @@ -105,7 +105,7 @@ private fun PastGamesContent( @OptIn(ExperimentalFoundationApi::class) private fun PastGamesLazyColumn( uiState: PastGamesUiState, - onGenderSelected: (GenderDivision) -> Unit, + onFilterSelected: (GameFilter) -> Unit, onSportSelected: (SportSelection) -> Unit, navigateToGameDetails: (String) -> Unit, navigateToProfile: () -> Unit @@ -148,9 +148,9 @@ private fun PastGamesLazyColumn( Spacer(modifier = Modifier.height(8.dp)) SportSelectorHeader( sports = uiState.selectionList, - selectedGender = uiState.selectedGender, + selectedFilter = uiState.selectedFilter, selectedSport = uiState.sportSelect, - onGenderSelected = onGenderSelected, + onFilterSelected = onFilterSelected, onSportSelected = onSportSelected, toProfile = navigateToProfile, favoriteSports = emptySet() //todo pass in a preferences viewmodel @@ -196,12 +196,12 @@ private fun PastGamesLazyColumn( private fun PastGamesPreview() = ScorePreview { PastGamesContent( uiState = PastGamesUiState( - selectedGender = GenderDivision.ALL, + selectedFilter = GameFilter.ALL, sportSelect = SportSelection.All, selectionList = sportSelectionList, loadedState = ApiResponse.Success(gameList) ), - onGenderSelected = {}, + onFilterSelected = {}, onSportSelected = {}, onRefresh = {}, navigateToProfile = {} @@ -213,12 +213,12 @@ private fun PastGamesPreview() = ScorePreview { private fun PastGamesEmptyStatePreview() = ScorePreview { PastGamesContent( uiState = PastGamesUiState( - selectedGender = GenderDivision.ALL, + selectedFilter = GameFilter.ALL, sportSelect = SportSelection.All, selectionList = sportSelectionList, loadedState = ApiResponse.Success(emptyList()) ), - onGenderSelected = {}, + onFilterSelected = {}, onSportSelected = {}, onRefresh = {}, navigateToProfile = {} diff --git a/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt index 79af5934..0c5b6c97 100644 --- a/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt +++ b/app/src/main/java/com/cornellappdev/score/viewmodel/HomeViewModel.kt @@ -5,7 +5,7 @@ import com.cornellappdev.score.components.LocationFilter import com.cornellappdev.score.components.PriceFilter import com.cornellappdev.score.model.ApiResponse import com.cornellappdev.score.model.GameCardData -import com.cornellappdev.score.model.GenderDivision +import com.cornellappdev.score.model.GameFilter import com.cornellappdev.score.model.OnboardingPreferencesRepository import com.cornellappdev.score.model.ScoreRepository import com.cornellappdev.score.model.Sport @@ -17,7 +17,7 @@ import java.time.LocalDate import javax.inject.Inject data class HomeUiState( - val selectedGender: GenderDivision, + val selectedFilter: GameFilter, val sportSelect: SportSelection, val selectionList: List, val favoriteSports: Set, @@ -34,15 +34,15 @@ data class HomeUiState( get() { val favoriteSportNames = favoriteSports.map { it.displayName } return games.filter { game -> - val matchesGender = when (selectedGender) { - GenderDivision.ALL -> true - GenderDivision.FAVORITES -> if (favoriteSports.isNotEmpty()) { + val matchesGender = when (selectedFilter) { + GameFilter.ALL -> true + GameFilter.FAVORITES -> if (favoriteSports.isNotEmpty()) { game.sport in favoriteSportNames } else { true } - else -> game.gender == selectedGender.displayName + else -> game.gender == selectedFilter.displayName } val matchesSport = when (sportSelect) { is SportSelection.SportSelect -> game.sport == sportSelect.sport.displayName @@ -82,9 +82,9 @@ class HomeViewModel @Inject constructor( preferencesRepository: OnboardingPreferencesRepository ) : BaseViewModel( HomeUiState( - selectedGender = GenderDivision.FAVORITES, + selectedFilter = GameFilter.FAVORITES, sportSelect = SportSelection.All, - selectionList = Sport.getSportSelectionList(GenderDivision.FAVORITES), + selectionList = Sport.getSportSelectionList(GameFilter.FAVORITES), favoriteSports = preferencesRepository.getFavoriteSportNames() .mapNotNull { runCatching { Sport.valueOf(it) }.getOrNull() } .toSet(), @@ -93,7 +93,7 @@ class HomeViewModel @Inject constructor( ) { init { applyMutation { - copy(selectionList = selectionListFor(selectedGender, favoriteSports, emptyList())) + copy(selectionList = selectionListFor(selectedFilter, favoriteSports, emptyList())) } scoreRepository.fetchGames() asyncCollect(scoreRepository.upcomingGamesFlow) { response -> @@ -108,7 +108,7 @@ class HomeViewModel @Inject constructor( copy( loadedState = loadedState, selectionList = selectionListFor( - selectedGender, + selectedFilter, favoriteSports, (loadedState as? ApiResponse.Success)?.data.orEmpty() ) @@ -124,12 +124,12 @@ class HomeViewModel @Inject constructor( scoreRepository.fetchGames() } - fun onGenderSelected(gender: GenderDivision) { + fun onFilterSelected(filter: GameFilter) { applyMutation { copy( - selectedGender = gender, + selectedFilter = filter, selectionList = selectionListFor( - gender, + filter, favoriteSports, (loadedState as? ApiResponse.Success)?.data.orEmpty() ), @@ -166,7 +166,7 @@ class HomeViewModel @Inject constructor( } private fun selectionListFor( - gender: GenderDivision, + filter: GameFilter, favorites: Set, upcomingGames: List ): List { @@ -174,7 +174,7 @@ class HomeViewModel @Inject constructor( .groupBy { it.sport } .mapValues { (_, games) -> games.mapNotNull { it.date }.minOrNull() } - return Sport.getSportSelectionList(gender).sortedWith( + return Sport.getSportSelectionList(filter).sortedWith( compareBy { if (it is SportSelection.All) 0 else 1 } .thenBy { selection -> (selection as? SportSelection.SportSelect) diff --git a/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt index 14f36c61..0d563f45 100644 --- a/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt +++ b/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt @@ -2,7 +2,7 @@ package com.cornellappdev.score.viewmodel import com.cornellappdev.score.model.ApiResponse import com.cornellappdev.score.model.GameCardData -import com.cornellappdev.score.model.GenderDivision +import com.cornellappdev.score.model.GameFilter import com.cornellappdev.score.model.OnboardingPreferencesRepository import com.cornellappdev.score.model.ScoreRepository import com.cornellappdev.score.model.Sport @@ -14,7 +14,7 @@ import java.time.LocalDate import javax.inject.Inject data class PastGamesUiState( - val selectedGender: GenderDivision, + val selectedFilter: GameFilter, val sportSelect: SportSelection, val selectionList: List, val favoriteSports: Set = emptySet(), @@ -26,15 +26,15 @@ data class PastGamesUiState( is ApiResponse.Success -> { val favoriteSportNames = favoriteSports.map { it.displayName } loadedState.data.filter { game -> - val matchesGender = when (selectedGender) { - GenderDivision.ALL -> true - GenderDivision.FAVORITES -> if (favoriteSports.isNotEmpty()) { + val matchesGender = when (selectedFilter) { + GameFilter.ALL -> true + GameFilter.FAVORITES -> if (favoriteSports.isNotEmpty()) { game.sport in favoriteSportNames } else { true } - else -> game.gender == selectedGender.displayName + else -> game.gender == selectedFilter.displayName } val matchesSport = (sportSelect is SportSelection.All || (sportSelect is SportSelection.SportSelect && game.sport == sportSelect.sport.displayName)) @@ -60,9 +60,9 @@ class PastGamesViewModel @Inject constructor( preferencesRepository: OnboardingPreferencesRepository ) : BaseViewModel( PastGamesUiState( - selectedGender = GenderDivision.FAVORITES, + selectedFilter = GameFilter.FAVORITES, sportSelect = SportSelection.All, - selectionList = Sport.getSportSelectionList(GenderDivision.FAVORITES), + selectionList = Sport.getSportSelectionList(GameFilter.FAVORITES), favoriteSports = preferencesRepository.getFavoriteSportNames() .mapNotNull { runCatching { Sport.valueOf(it) }.getOrNull() } .toSet(), @@ -82,18 +82,18 @@ class PastGamesViewModel @Inject constructor( val pastGames = (loadedState as? ApiResponse.Success)?.data.orEmpty() copy( loadedState = loadedState, - selectionList = selectionListFor(selectedGender, pastGames) + selectionList = selectionListFor(selectedFilter, pastGames) ) } } } - fun onGenderSelected(gender: GenderDivision) { + fun onFilterSelected(filter: GameFilter) { applyMutation { copy( - selectedGender = gender, + selectedFilter = filter, selectionList = selectionListFor( - gender, + filter, (loadedState as? ApiResponse.Success)?.data.orEmpty() ), ) @@ -115,14 +115,14 @@ class PastGamesViewModel @Inject constructor( } private fun selectionListFor( - gender: GenderDivision, + filter: GameFilter, pastGames: List ): List { val mostRecentGameBySport = pastGames .groupBy { it.sport } .mapValues { (_, games) -> games.mapNotNull { it.date }.maxOrNull() } - return Sport.getSportSelectionList(gender).sortedWith( + return Sport.getSportSelectionList(filter).sortedWith( compareBy { if (it is SportSelection.All) 0 else 1 } .thenByDescending { selection -> (selection as? SportSelection.SportSelect)