Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions app/src/main/java/com/cornellappdev/score/ScoreApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
}
Expand All @@ -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,
Expand Down
25 changes: 22 additions & 3 deletions app/src/main/java/com/cornellappdev/score/auth/AuthRepository.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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 {
Expand Down Expand Up @@ -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
}
}
19 changes: 17 additions & 2 deletions app/src/main/java/com/cornellappdev/score/auth/AuthState.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
31 changes: 29 additions & 2 deletions app/src/main/java/com/cornellappdev/score/auth/AuthViewModel.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,16 @@ 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<GenderDivision> = listOf(
GenderDivision.FAVORITES,
GenderDivision.MALE,
GenderDivision.FEMALE
)

) {
Row(
modifier = modifier
.fillMaxWidth()
.padding(horizontal = 24.dp)
.height(48.dp)
.border(BorderStroke(1.dp, GrayLight), CircleShape)
.padding(5.dp)
Expand Down Expand Up @@ -85,7 +83,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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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()
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -40,8 +42,10 @@ fun SportSelectorHeader(
sports: List<SportSelection>,
selectedGender: GenderDivision,
selectedSport: SportSelection,
favoriteSports: Set<Sport>,
onGenderSelected: (GenderDivision) -> Unit,
onSportSelected: (SportSelection) -> Unit,
toProfile: () -> Unit,
modifier: Modifier = Modifier
) {
Column(
Expand All @@ -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)
Expand Down Expand Up @@ -129,14 +137,16 @@ 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(
sports = sportSelectionList,
selectedGender = selectedOption,
selectedSport = selectedSport,
favoriteSports = emptySet(),
onGenderSelected = { selectedOption = it },
onSportSelected = { selectedSport = it }
onSportSelected = { selectedSport = it },
toProfile = {}
)
}
Loading
Loading