diff --git a/app/src/main/java/com/cornellappdev/score/ScoreApp.kt b/app/src/main/java/com/cornellappdev/score/ScoreApp.kt index 7d7e246a..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,10 +37,11 @@ fun ScoreApp( var skippedWelcome by rememberSaveable { mutableStateOf(onboardingPreferences.isOnboardingCompleted()) } - val signedIn = authState is AuthState.SignedIn + val signedInState = authState as? AuthState.SignedIn + val onboardingComplete = signedInState?.onboardingStage == OnboardingStage.COMPLETE - LaunchedEffect(signedIn) { - if (signedIn) { + LaunchedEffect(onboardingComplete) { + if (onboardingComplete) { onboardingPreferences.markOnboardingCompleted() skippedWelcome = true } @@ -49,7 +53,21 @@ fun ScoreApp( Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { CircularProgressIndicator(color = CrimsonPrimary) } - signedIn || skippedWelcome -> RootNavigation() + 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 b66fc170..8a691e29 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,39 @@ 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) + } } } } + 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" + } + fun dismissError() { mutableSignInState.value = mutableSignInState.value.copy(error = null) } 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..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,38 +24,36 @@ 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, - modifier: Modifier = Modifier -) { - val options = listOf( - GenderDivision.ALL, - GenderDivision.MALE, - GenderDivision.FEMALE +fun GameFilterSelector( + selectedFilter: GameFilter, + onFilterSelected: (GameFilter) -> Unit, + modifier: Modifier = Modifier, + options: List = listOf( + GameFilter.FAVORITES, + GameFilter.MALE, + GameFilter.FEMALE ) - +) { Row( modifier = modifier .fillMaxWidth() - .padding(horizontal = 24.dp) .height(48.dp) .border(BorderStroke(1.dp, GrayLight), CircleShape) .padding(5.dp) .selectableGroup(), verticalAlignment = Alignment.CenterVertically ) { - options.forEach { gender -> - val selected = gender == selectedGender + options.forEach { filter -> + val selected = filter == selectedFilter Box( modifier = Modifier .weight(1f) @@ -67,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 ) @@ -83,13 +81,13 @@ fun GenderDivisionFilter( @Preview(showBackground = true) @Composable -private fun GenderDivisionFilterPreview() { +private fun GameFilterSelectorPreview() { ScorePreview { - var selectedGender by remember { mutableStateOf(GenderDivision.ALL) } + 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/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 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..d6b4c6ad 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.model.GenderDivision +import com.cornellappdev.score.components.onboarding.HomeScreenFavoritesInfoBanner +import com.cornellappdev.score.model.GameFilter +import com.cornellappdev.score.model.Sport import com.cornellappdev.score.model.SportSelection import com.cornellappdev.score.theme.CrimsonPrimary import com.cornellappdev.score.theme.GrayMedium @@ -38,10 +40,12 @@ import com.cornellappdev.score.util.sportSelectionList @Composable fun SportSelectorHeader( sports: List, - selectedGender: GenderDivision, + selectedFilter: GameFilter, selectedSport: SportSelection, - onGenderSelected: (GenderDivision) -> Unit, + favoriteSports: Set, + onFilterSelected: (GameFilter) -> Unit, onSportSelected: (SportSelection) -> Unit, + toProfile: () -> Unit, modifier: Modifier = Modifier ) { Column( @@ -50,11 +54,15 @@ fun SportSelectorHeader( .background(color = White), horizontalAlignment = Alignment.CenterHorizontally ) { - GenderDivisionFilter( - selectedGender = selectedGender, - onGenderSelected = onGenderSelected + GameFilterSelector( + selectedFilter = selectedFilter, + onFilterSelected = onFilterSelected ) - 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) @@ -129,14 +137,16 @@ fun SportSelector( @Preview @Composable private fun PreviewSportSelectorHeader() = ScorePreview { - var selectedOption by remember { mutableStateOf(GenderDivision.ALL) } + var selectedOption by remember { mutableStateOf(GameFilter.FAVORITES) } var selectedSport: SportSelection by remember { mutableStateOf(SportSelection.All) } SportSelectorHeader( sports = sportSelectionList, - selectedGender = selectedOption, + selectedFilter = selectedOption, selectedSport = selectedSport, - onGenderSelected = { selectedOption = it }, - onSportSelected = { selectedSport = it } + favoriteSports = emptySet(), + onFilterSelected = { selectedOption = it }, + onSportSelected = { selectedSport = it }, + toProfile = {} ) } 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..fad3b241 --- /dev/null +++ b/app/src/main/java/com/cornellappdev/score/components/onboarding/HomeScreenFavoritesInfoBanner.kt @@ -0,0 +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.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 + .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, + color = Color.White + ) + Text( + text = "Select your favorite sports to personalize your feed.", + 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 +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 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 cc3b1b59..617269e8 100644 --- a/app/src/main/java/com/cornellappdev/score/model/OnboardingPreferencesRepository.kt +++ b/app/src/main/java/com/cornellappdev/score/model/OnboardingPreferencesRepository.kt @@ -26,11 +26,14 @@ class OnboardingPreferencesRepository @Inject constructor( } fun getFavoriteSports(): Set = - preferences.getStringSet(KEY_ONBOARDING_FAVORITE_SPORTS, emptySet()) + (preferences.getStringSet(KEY_ONBOARDING_FAVORITE_SPORTS, null) + ?: preferences.getStringSet("favorite_sports", emptySet())) .orEmpty() .mapNotNull { ProfileFavorite.fromStorageKey(it) } .toSet() + fun getFavoriteSportNames(): Set = getFavoriteSports().map { it.sport.name }.toSet() + fun saveFavoriteSports(favorites: Set) { preferences.edit { putStringSet(KEY_ONBOARDING_FAVORITE_SPORTS, favorites.map { it.storageKey }.toSet()) 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..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,16 +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.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(selectedFilter: GameFilter?): List = + getSportSelectionList(selectedFilter) } } @@ -189,13 +193,22 @@ sealed class SportSelection { enum class GenderDivision( val displayName: String ) { - FEMALE( - "Women's" + ALL( + "All" ), MALE( "Men's" ), - ALL( - "All" + FEMALE( + "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/nav/ScoreNavHost.kt b/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt index ba66aa07..4549bef1 100644 --- a/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt +++ b/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt @@ -12,18 +12,13 @@ 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 @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. @@ -35,16 +30,20 @@ fun ScoreNavHost(navController: NavHostController) { ) { composable { CompositionLocalProvider(LocalViewModelStoreOwner provides mainScreenViewModelStoreOwner) { - HomeScreen(navigateToGameDetails = { + HomeScreen(welcomeName = welcomeName, 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/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 1536efad..2eafdc3e 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt @@ -36,13 +36,14 @@ 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 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 @@ -57,6 +58,9 @@ import com.cornellappdev.score.viewmodel.HomeViewModel @OptIn(ExperimentalMaterial3Api::class) @Composable fun HomeScreen( + navigateToProfile: () -> Unit, + modifier: Modifier = Modifier, + welcomeName: String? = null, homeViewModel: HomeViewModel = hiltViewModel(), navigateToGameDetails: (String) -> Unit = {} ) { @@ -65,7 +69,7 @@ fun HomeScreen( val sheetState = rememberModalBottomSheetState() Column( verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.Top), - modifier = Modifier + modifier = modifier .background(Color.White) ) { when (uiState.loadedState) { @@ -80,11 +84,12 @@ fun HomeScreen( is ApiResponse.Success -> { HomeContent( uiState = uiState, - onGenderSelected = { homeViewModel.onGenderSelected(it) }, + welcomeName = welcomeName, + onFilterSelected = { homeViewModel.onFilterSelected(it) }, onSportSelected = { homeViewModel.onSportSelected(it) }, navigateToGameDetails = navigateToGameDetails, onRefresh = { homeViewModel.onRefresh() }, - onAdvancedFilterClick = { showBottomSheet = true } + navigateToProfile = navigateToProfile ) } } @@ -93,10 +98,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() } ) } @@ -108,19 +113,21 @@ fun HomeScreen( @Composable private fun HomeContent( uiState: HomeUiState, - onGenderSelected: (GenderDivision) -> Unit, + onFilterSelected: (GameFilter) -> Unit, onSportSelected: (SportSelection) -> Unit, onRefresh: () -> Unit, - navigateToGameDetails: (String) -> Unit = {}, - onAdvancedFilterClick: () -> Unit + navigateToProfile: () -> Unit, + welcomeName: String? = null, + navigateToGameDetails: (String) -> Unit = {} ) { ScorePullToRefreshBox(isRefreshing = uiState.loadedState == ApiResponse.Loading, onRefresh) { HomeLazyColumn( uiState, - onGenderSelected, + onFilterSelected, onSportSelected, navigateToGameDetails, - onAdvancedFilterClick + navigateToProfile, + welcomeName ) } } @@ -129,31 +136,44 @@ 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)) { - if (uiState.filteredGames.isNotEmpty()) { + Box(Modifier.fillMaxSize()) { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(top = 24.dp) + ) { + if (welcomeName != null) { item { - Text( - text = "Upcoming", - style = heading1, - color = GrayPrimary, - modifier = Modifier - .fillMaxWidth() - .padding(start = 24.dp) + WelcomeBanner( + name = welcomeName, + modifier = Modifier.padding(horizontal = 24.dp) ) } item { - Spacer(Modifier.height(16.dp)) + Spacer(Modifier.height(24.dp)) } } - if (uiState.filteredGames.isNotEmpty()) { - item { - GamesCarousel(uiState.upcomingGames, navigateToGameDetails) - } + item { + Text( + text = "Upcoming", + style = heading1, + color = GrayPrimary, + modifier = Modifier + .fillMaxWidth() + .padding(start = 24.dp) + ) + } + item { + Spacer(Modifier.height(16.dp)) + } + + item { + GamesCarousel(uiState.upcomingGames, navigateToGameDetails) } stickyHeader { Column( @@ -171,20 +191,16 @@ 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, - onGenderSelected = onGenderSelected, + favoriteSports = uiState.favoriteSports, + onFilterSelected = onFilterSelected, onSportSelected = onSportSelected, + toProfile = toProfile ) } Box(modifier = Modifier.background(White)) { @@ -200,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 + ) } } } @@ -234,15 +256,17 @@ private fun HomeScreenPreview() = ScorePreview { ) { HomeContent( HomeUiState( - selectedGender = GenderDivision.ALL, + selectedFilter = GameFilter.FAVORITES, sportSelect = SportSelection.All, selectionList = sportSelectionList, + favoriteSports = emptySet(), loadedState = ApiResponse.Success(gameList) ), - onGenderSelected = {}, + onFilterSelected = {}, onSportSelected = {}, onRefresh = {}, - onAdvancedFilterClick = {} + navigateToProfile = {}, + welcomeName = "Claire" ) } } @@ -252,15 +276,16 @@ private fun HomeScreenPreview() = ScorePreview { private fun HomeScreenEmptyStatePreview() = ScorePreview { HomeContent( HomeUiState( - selectedGender = GenderDivision.ALL, - sportSelect = SportSelection.All, + selectedFilter = GameFilter.FAVORITES, + sportSelect = SportSelection.SportSelect(Sport.FOOTBALL), selectionList = sportSelectionList, - loadedState = ApiResponse.Success(emptyList()) + favoriteSports = emptySet(), + loadedState = ApiResponse.Success(gameList) ), - onGenderSelected = {}, + onFilterSelected = {}, onSportSelected = {}, onRefresh = {}, - onAdvancedFilterClick = {} + navigateToProfile = {} ) } 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/screen/PastGamesScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt index 8cd7f112..86a66f5c 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,17 +22,16 @@ 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 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 @@ -45,14 +45,16 @@ import com.cornellappdev.score.viewmodel.PastGamesViewModel @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) { @@ -67,10 +69,11 @@ 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 + onRefresh = pastGamesViewModel::onRefresh, + navigateToProfile = navigateToProfile ) } } @@ -81,13 +84,20 @@ fun PastGamesScreen( @Composable private fun PastGamesContent( uiState: PastGamesUiState, - onGenderSelected: (GenderDivision) -> Unit, + onFilterSelected: (GameFilter) -> 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, + onFilterSelected, + onSportSelected, + navigateToGameDetails, + navigateToProfile + ) } } @@ -95,9 +105,10 @@ private fun PastGamesContent( @OptIn(ExperimentalFoundationApi::class) private fun PastGamesLazyColumn( uiState: PastGamesUiState, - onGenderSelected: (GenderDivision) -> Unit, + onFilterSelected: (GameFilter) -> Unit, onSportSelected: (SportSelection) -> Unit, - navigateToGameDetails: (String) -> Unit + navigateToGameDetails: (String) -> Unit, + navigateToProfile: () -> Unit ) { LazyColumn(contentPadding = PaddingValues(top = 24.dp)) { if (uiState.filteredGames.isNotEmpty()) { @@ -137,10 +148,12 @@ private fun PastGamesLazyColumn( Spacer(modifier = Modifier.height(8.dp)) SportSelectorHeader( sports = uiState.selectionList, - selectedGender = uiState.selectedGender, + selectedFilter = uiState.selectedFilter, selectedSport = uiState.sportSelect, - onGenderSelected = onGenderSelected, - onSportSelected = onSportSelected + onFilterSelected = onFilterSelected, + onSportSelected = onSportSelected, + toProfile = navigateToProfile, + favoriteSports = emptySet() //todo pass in a preferences viewmodel ) } Box(modifier = Modifier.background(White)) { @@ -166,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() + } } } } @@ -177,14 +196,15 @@ 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 = {} ) } @@ -193,13 +213,14 @@ 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 = {} ) } \ No newline at end of file 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..0c5b6c97 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.GameFilter +import com.cornellappdev.score.model.OnboardingPreferencesRepository import com.cornellappdev.score.model.ScoreRepository import com.cornellappdev.score.model.Sport import com.cornellappdev.score.model.SportSelection @@ -13,55 +17,101 @@ import java.time.LocalDate import javax.inject.Inject data class HomeUiState( - val selectedGender: GenderDivision, + val selectedFilter: GameFilter, 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 (selectedFilter) { + GameFilter.ALL -> true + GameFilter.FAVORITES -> if (favoriteSports.isNotEmpty()) { + game.sport in favoriteSportNames + } else { + true + } + + else -> game.gender == selectedFilter.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 - ApiResponse.Loading -> emptyList() - ApiResponse.Error -> emptyList() + null -> true + } + matchesGender && matchesSport && matchesLocation && matchesDate + } } - 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, + selectedFilter = GameFilter.FAVORITES, sportSelect = SportSelection.All, - selectionList = Sport.getSportSelectionList(GenderDivision.ALL), + selectionList = Sport.getSportSelectionList(GameFilter.FAVORITES), + favoriteSports = preferencesRepository.getFavoriteSportNames() + .mapNotNull { runCatching { Sport.valueOf(it) }.getOrNull() } + .toSet(), loadedState = ApiResponse.Loading ) ) { init { + applyMutation { + copy(selectionList = selectionListFor(selectedFilter, 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( + selectedFilter, + favoriteSports, + (loadedState as? ApiResponse.Success)?.data.orEmpty() + ) ) } } @@ -71,24 +121,68 @@ class HomeViewModel @Inject constructor( applyMutation { copy(loadedState = ApiResponse.Loading) } - scoreRepository.fetchGames() } - fun onGenderSelected(gender: GenderDivision) { + fun onFilterSelected(filter: GameFilter) { applyMutation { copy( - selectedGender = gender, - selectionList = Sport.getSportSelectionList(gender), + selectedFilter = filter, + selectionList = selectionListFor( + filter, + 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( + priceFilter = priceFilter, + locationFilter = locationFilter, + dateFilter = dateFilter + ) + } + } + + fun onResetAdvancedFilters() { applyMutation { copy( - sportSelect = sport + priceFilter = null, + locationFilter = null, + dateFilter = null ) } } + + private fun selectionListFor( + filter: GameFilter, + favorites: Set, + upcomingGames: List + ): List { + val nextGameDateBySport = upcomingGames + .groupBy { it.sport } + .mapValues { (_, games) -> games.mapNotNull { it.date }.minOrNull() } + + return Sport.getSportSelectionList(filter).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/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/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/PastGamesViewModel.kt index 84493d81..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,8 @@ 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 import com.cornellappdev.score.model.SportSelection @@ -13,18 +14,32 @@ 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(), 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 (selectedFilter) { + GameFilter.ALL -> true + GameFilter.FAVORITES -> if (favoriteSports.isNotEmpty()) { + game.sport in favoriteSportNames + } else { + true + } + + else -> game.gender == selectedFilter.displayName + } + val matchesSport = (sportSelect is SportSelection.All || + (sportSelect is SportSelection.SportSelect && game.sport == sportSelect.sport.displayName)) + matchesGender && matchesSport + } } ApiResponse.Loading -> emptyList() @@ -41,36 +56,46 @@ data class PastGamesUiState( @HiltViewModel class PastGamesViewModel @Inject constructor( - private val scoreRepository: ScoreRepository + private val scoreRepository: ScoreRepository, + preferencesRepository: OnboardingPreferencesRepository ) : BaseViewModel( PastGamesUiState( - selectedGender = GenderDivision.ALL, + selectedFilter = GameFilter.FAVORITES, sportSelect = SportSelection.All, - selectionList = Sport.getSportSelectionList(GenderDivision.ALL), + selectionList = Sport.getSportSelectionList(GameFilter.FAVORITES), + favoriteSports = preferencesRepository.getFavoriteSportNames() + .mapNotNull { runCatching { Sport.valueOf(it) }.getOrNull() } + .toSet(), loadedState = ApiResponse.Loading ) ) { 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(selectedFilter, pastGames) ) } } } - - fun onGenderSelected(gender: GenderDivision) { + + fun onFilterSelected(filter: GameFilter) { applyMutation { copy( - selectedGender = gender, - selectionList = Sport.getSportSelectionList(gender), + selectedFilter = filter, + selectionList = selectionListFor( + filter, + (loadedState as? ApiResponse.Success)?.data.orEmpty() + ), ) } } @@ -88,4 +113,24 @@ class PastGamesViewModel @Inject constructor( scoreRepository.fetchGames() } + + private fun selectionListFor( + filter: GameFilter, + pastGames: List + ): List { + val mostRecentGameBySport = pastGames + .groupBy { it.sport } + .mapValues { (_, games) -> games.mapNotNull { it.date }.maxOrNull() } + + return Sport.getSportSelectionList(filter).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 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.