diff --git a/app/src/main/java/com/cornellappdev/score/MainActivity.kt b/app/src/main/java/com/cornellappdev/score/MainActivity.kt index 529b9ffc..e7f14b1f 100644 --- a/app/src/main/java/com/cornellappdev/score/MainActivity.kt +++ b/app/src/main/java/com/cornellappdev/score/MainActivity.kt @@ -6,31 +6,19 @@ import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity 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.core.content.edit import com.cornellappdev.score.model.OnboardingPreferencesRepository import com.cornellappdev.score.nav.root.RootNavigation -import com.cornellappdev.score.screen.OnboardingProfileSelectScreen -import com.cornellappdev.score.screen.OnboardingScreen +import com.cornellappdev.score.screen.OnboardingSequence import com.google.firebase.Firebase import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.analytics.analytics import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject -private const val APP_PREFERENCES = "score_app_preferences" -private const val KEY_ONBOARDING_PROFILE_PICTURE = "onboarding_profile_picture" - private lateinit var firebaseAnalytics: FirebaseAnalytics -private enum class OnboardingStep { - WELCOME, - PROFILE_SELECT, - COMPLETE -} - @AndroidEntryPoint class MainActivity : AppCompatActivity() { @Inject @@ -41,39 +29,21 @@ class MainActivity : AppCompatActivity() { enableEdgeToEdge() val onboardingCompleted = onboardingPreferencesRepository.isOnboardingCompleted() - val preferences = getSharedPreferences(APP_PREFERENCES, MODE_PRIVATE) setContent { - var onboardingStep by rememberSaveable { - mutableStateOf( - if (onboardingCompleted) OnboardingStep.COMPLETE else OnboardingStep.WELCOME - ) + var isOnboardingCompleted by rememberSaveable { + mutableStateOf(onboardingCompleted) } - val completeOnboarding = remember { - { - onboardingPreferencesRepository.markOnboardingCompleted() - onboardingStep = OnboardingStep.COMPLETE - } - } - - when (onboardingStep) { - OnboardingStep.WELCOME -> OnboardingScreen( - onSignUp = { onboardingStep = OnboardingStep.PROFILE_SELECT }, - onLogIn = completeOnboarding, - onLater = completeOnboarding - ) - - OnboardingStep.PROFILE_SELECT -> OnboardingProfileSelectScreen( - onNext = { selectedPicture -> - preferences.edit { - putString(KEY_ONBOARDING_PROFILE_PICTURE, selectedPicture.name) - } - completeOnboarding() + if (isOnboardingCompleted) { + RootNavigation() + } else { + OnboardingSequence( + onOnboardingComplete = { + onboardingPreferencesRepository.markOnboardingCompleted() + isOnboardingCompleted = true } ) - - OnboardingStep.COMPLETE -> RootNavigation() } } diff --git a/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt b/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt new file mode 100644 index 00000000..bfe545a0 --- /dev/null +++ b/app/src/main/java/com/cornellappdev/score/components/GenderDivisionFilter.kt @@ -0,0 +1,95 @@ +package com.cornellappdev.score.components + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.selection.selectable +import androidx.compose.foundation.selection.selectableGroup +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +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.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. */ +@Composable +fun GenderDivisionFilter( + selectedGender: GenderDivision, + onGenderSelected: (GenderDivision) -> Unit, + modifier: Modifier = Modifier +) { + val options = listOf( + GenderDivision.ALL, + GenderDivision.MALE, + GenderDivision.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 + Box( + modifier = Modifier + .weight(1f) + .fillMaxHeight() + .background( + color = if (selected) CrimsonPrimary else Color.Transparent, + shape = CircleShape + ) + .selectable( + selected = selected, + role = Role.RadioButton, + onClick = { onGenderSelected(gender) } + ), + contentAlignment = Alignment.Center + ) { + Text( + text = gender.displayName, + style = if (selected) Style.bodySemibold else Style.bodyMedium, + color = if (selected) White else GrayMedium + ) + } + } + } +} + +@Preview(showBackground = true) +@Composable +private fun GenderDivisionFilterPreview() { + ScorePreview { + var selectedGender by remember { mutableStateOf(GenderDivision.ALL) } + + GenderDivisionFilter( + selectedGender = selectedGender, + onGenderSelected = { selectedGender = it } + ) + } +} diff --git a/app/src/main/java/com/cornellappdev/score/components/OnboardingFooter.kt b/app/src/main/java/com/cornellappdev/score/components/OnboardingFooter.kt new file mode 100644 index 00000000..a273b545 --- /dev/null +++ b/app/src/main/java/com/cornellappdev/score/components/OnboardingFooter.kt @@ -0,0 +1,87 @@ +package com.cornellappdev.score.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.cornellappdev.score.theme.CrimsonPrimary +import com.cornellappdev.score.theme.GrayStroke +import com.cornellappdev.score.theme.Style +import com.cornellappdev.score.theme.White + +@Composable +fun OnboardingFooter( + buttonText: String, + onClick: () -> Unit, + activeStep: Int, + modifier: Modifier = Modifier +) { + Column( + modifier = modifier + .fillMaxWidth() + .background(White) + .padding( + start = 24.dp, + end = 24.dp, + top = 24.dp, + bottom = 60.dp + ), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Button( + onClick = onClick, + modifier = Modifier + .fillMaxWidth() + .height(48.dp), + shape = CircleShape, + colors = ButtonDefaults.buttonColors( + containerColor = CrimsonPrimary, + contentColor = White + ) + ) { + Text(buttonText, style = Style.heading3, color = White) + } + + Spacer(Modifier.height(16.dp)) + Row( + horizontalArrangement = Arrangement.spacedBy(4.dp), + verticalAlignment = Alignment.CenterVertically + ) { + repeat(2) { index -> + val isActive = index == activeStep + Box( + Modifier + .size(8.dp) + .background(if (isActive) CrimsonPrimary else GrayStroke, CircleShape) + ) + } + } + } +} + +@Preview +@Composable +private fun OnboardingFooterPreview() { + ScorePreview { + OnboardingFooter( + buttonText = "Next", + onClick = {}, + activeStep = 0 + ) + } +} 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 fd09f9a8..a36471cb 100644 --- a/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt +++ b/app/src/main/java/com/cornellappdev/score/components/SportSelectorHeader.kt @@ -1,14 +1,10 @@ package com.cornellappdev.score.components -import androidx.compose.foundation.BorderStroke 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.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height @@ -17,7 +13,6 @@ import androidx.compose.foundation.layout.sizeIn import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -26,7 +21,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview @@ -35,10 +29,7 @@ import com.cornellappdev.score.R import com.cornellappdev.score.model.GenderDivision import com.cornellappdev.score.model.SportSelection import com.cornellappdev.score.theme.CrimsonPrimary -import com.cornellappdev.score.theme.GrayLight import com.cornellappdev.score.theme.GrayMedium -import com.cornellappdev.score.theme.Style.bodyMedium -import com.cornellappdev.score.theme.Style.bodySemibold import com.cornellappdev.score.theme.Style.labelsMedium import com.cornellappdev.score.theme.Style.labelsNormal import com.cornellappdev.score.theme.White @@ -59,24 +50,10 @@ fun SportSelectorHeader( .background(color = White), horizontalAlignment = Alignment.CenterHorizontally ) { - Row( - modifier = Modifier - .border( - border = BorderStroke(1.dp, GrayLight), - shape = RoundedCornerShape(100) - ) - .padding(6.dp) - ) { - GenderSelector(GenderDivision.ALL, selectedGender == GenderDivision.ALL) { - onGenderSelected(GenderDivision.ALL) - } - GenderSelector(GenderDivision.MALE, selectedGender == GenderDivision.MALE) { - onGenderSelected(GenderDivision.MALE) - } - GenderSelector(GenderDivision.FEMALE, selectedGender == GenderDivision.FEMALE) { - onGenderSelected(GenderDivision.FEMALE) - } - } + GenderDivisionFilter( + selectedGender = selectedGender, + onGenderSelected = onGenderSelected + ) Spacer(Modifier.height(24.dp)) LazyRow( Modifier.fillMaxWidth(), @@ -116,29 +93,6 @@ fun SportSelectorHeader( } } -@Composable -fun GenderSelector(option: GenderDivision, isSelected: Boolean, onSelect: () -> Unit) { - Box( - modifier = Modifier - .clickable(onClick = { - onSelect() - }) - .width(111.dp) - .background( - color = if (isSelected) CrimsonPrimary else Color.Transparent, - shape = RoundedCornerShape(100) // Rounded background - ) - .padding(vertical = 8.dp, horizontal = 12.dp), - contentAlignment = Alignment.Center - ) { - Text( - text = option.displayName, - style = if (isSelected) bodySemibold else bodyMedium, - color = if (isSelected) White else GrayMedium - ) - } -} - @Composable fun SportSelector( empty: Painter, 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..cc3b1b59 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,31 @@ class OnboardingPreferencesRepository @Inject constructor( } } + fun getFavoriteSports(): Set = + preferences.getStringSet(KEY_ONBOARDING_FAVORITE_SPORTS, emptySet()) + .orEmpty() + .mapNotNull { ProfileFavorite.fromStorageKey(it) } + .toSet() + + fun saveFavoriteSports(favorites: Set) { + preferences.edit { + putStringSet(KEY_ONBOARDING_FAVORITE_SPORTS, favorites.map { it.storageKey }.toSet()) + } + } + + fun getProfilePicture(): String? = + preferences.getString(KEY_ONBOARDING_PROFILE_PICTURE, null) + + fun saveProfilePicture(pictureName: String) { + preferences.edit { + putString(KEY_ONBOARDING_PROFILE_PICTURE, pictureName) + } + } + private companion object { const val PREFERENCES_NAME = "score_app_preferences" const val KEY_ONBOARDING_COMPLETED = "onboarding_completed" + const val KEY_ONBOARDING_PROFILE_PICTURE = "onboarding_profile_picture" + const val KEY_ONBOARDING_FAVORITE_SPORTS = "onboarding_favorite_sports" } } diff --git a/app/src/main/java/com/cornellappdev/score/model/Profile.kt b/app/src/main/java/com/cornellappdev/score/model/Profile.kt index eec378ac..7f9a4396 100644 --- a/app/src/main/java/com/cornellappdev/score/model/Profile.kt +++ b/app/src/main/java/com/cornellappdev/score/model/Profile.kt @@ -8,4 +8,18 @@ data class ProfileData( ) /** A favorite identifies a sport and division, allowing both golf teams to appear separately. */ -data class ProfileFavorite(val sport: Sport, val gender: GenderDivision) +data class ProfileFavorite(val sport: Sport, val gender: GenderDivision) { + val storageKey: String get() = "${sport.name}:${gender.name}" + + companion object { + fun fromStorageKey(key: String): ProfileFavorite? { + val parts = key.split(':', limit = 2) + if (parts.size != 2) return null + 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 + return ProfileFavorite(sport, gender) + } + } +} diff --git a/app/src/main/java/com/cornellappdev/score/screen/EditFavoriteSportsScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/EditFavoriteSportsScreen.kt index b35085ad..fa351bf7 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/EditFavoriteSportsScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/EditFavoriteSportsScreen.kt @@ -2,7 +2,19 @@ package com.cornellappdev.score.screen import androidx.compose.foundation.background import androidx.compose.foundation.border -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.items @@ -13,8 +25,11 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon import androidx.compose.material3.Text -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -32,18 +47,25 @@ import com.cornellappdev.score.components.NavigationHeader import com.cornellappdev.score.model.GenderDivision import com.cornellappdev.score.model.ProfileFavorite import com.cornellappdev.score.model.Sport -import com.cornellappdev.score.theme.* +import com.cornellappdev.score.theme.CrimsonPrimary +import com.cornellappdev.score.theme.GrayLight +import com.cornellappdev.score.theme.GrayMedium +import com.cornellappdev.score.theme.GrayPrimary +import com.cornellappdev.score.theme.GrayStroke +import com.cornellappdev.score.theme.GreenBackground +import com.cornellappdev.score.theme.Style +import com.cornellappdev.score.theme.saturatedGreen -private val favoriteSportComparator = compareBy( +internal val favoriteSportComparator = compareBy( { it.sport.displayName }, { it.gender == GenderDivision.FEMALE } ) -private fun selectedFavoritesFirst(favorites: List): Comparator = +internal fun selectedFavoritesFirst(favorites: List): Comparator = compareBy { it !in favorites }.then(favoriteSportComparator) // Use the complete icon catalog, independent of sports with games in the current season. -private val favoriteSportOptions = Sport.entries.flatMap { sport -> +internal val favoriteSportOptions = Sport.entries.flatMap { sport -> // The profile design includes both golf divisions, unlike the schedule catalog. val divisions = if (sport.gender == GenderDivision.ALL || sport == Sport.GOLF) { listOf(GenderDivision.MALE, GenderDivision.FEMALE) @@ -63,19 +85,57 @@ fun EditFavoriteSportsScreen( .filter { gender == GenderDivision.ALL || it.gender == gender } .sortedWith(selectedFavoritesFirst(favorites)) - Column(modifier.fillMaxSize().background(Color.White)) { + Column(modifier + .fillMaxSize() + .background(Color.White)) { NavigationHeader(stringResource(R.string.edit_favorite_sports), onBack) + FavoriteSportSelectionScreenContents( + favorites = favorites, + options = options, + gender = gender, + onGenderSelected = { gender = it }, + onToggleFavorite = onToggleFavorite, + modifier = Modifier + .fillMaxWidth() + .weight(1f) + ) + } +} + +@Composable +fun FavoriteSportSelectionScreenContents( + favorites: List, + options: List, + gender: GenderDivision, + onGenderSelected: (GenderDivision) -> Unit, + onToggleFavorite: (ProfileFavorite) -> Unit, + modifier: Modifier = Modifier +) { + Column(modifier = modifier) { Row( - Modifier.padding(horizontal = 24.dp, vertical = 32.dp) - .fillMaxWidth().border(1.dp, GrayLight, CircleShape) - .padding(6.dp).selectableGroup() + Modifier + .padding(horizontal = 24.dp, vertical = 32.dp) + .fillMaxWidth() + .border(1.dp, GrayLight, CircleShape) + .padding(6.dp) + .selectableGroup() ) { - GenderDivision.entries.forEach { division -> + val options = listOf( + GenderDivision.ALL, + GenderDivision.MALE, + GenderDivision.FEMALE + ) + options.forEach { division -> val selected = gender == division Box( - Modifier.weight(1f).clip(CircleShape) + Modifier + .weight(1f) + .clip(CircleShape) .background(if (selected) CrimsonPrimary else Color.Transparent) - .selectable(selected, role = Role.Tab, onClick = { gender = division }) + .selectable( + selected, + role = Role.Tab, + onClick = { onGenderSelected(division) }) .padding(vertical = 8.dp), contentAlignment = Alignment.Center ) { @@ -105,16 +165,20 @@ fun EditFavoriteSportsScreen( private fun FavoriteSportOption(favorite: ProfileFavorite, selected: Boolean, onClick: () -> Unit) { val shape = RoundedCornerShape(20.dp) Column( - Modifier.fillMaxWidth() + Modifier + .fillMaxWidth() .semantics(mergeDescendants = true) { contentDescription = "${favorite.gender.displayName} ${favorite.sport.displayName}" } .toggleable(selected, role = Role.Checkbox, onValueChange = { onClick() }), horizontalAlignment = Alignment.CenterHorizontally ) { - Box(Modifier.fillMaxWidth().aspectRatio(1f), contentAlignment = Alignment.Center) { + Box(Modifier + .fillMaxWidth() + .aspectRatio(1f), contentAlignment = Alignment.Center) { Box( - Modifier.fillMaxSize() + Modifier + .fillMaxSize() .background(if (selected) GreenBackground else GrayStroke, shape) .border( if (selected) 3.dp else 1.dp, @@ -130,8 +194,11 @@ private fun FavoriteSportOption(favorite: ProfileFavorite, selected: Boolean, on } if (selected) { Box( - Modifier.align(Alignment.TopStart).offset(x = (-5).dp, y = (-5).dp) - .size(32.dp).background(CrimsonPrimary, CircleShape), + Modifier + .align(Alignment.TopStart) + .offset(x = (-5).dp, y = (-5).dp) + .size(32.dp) + .background(CrimsonPrimary, CircleShape), contentAlignment = Alignment.Center ) { Icon( diff --git a/app/src/main/java/com/cornellappdev/score/screen/OnboardingFavoriteSportsScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/OnboardingFavoriteSportsScreen.kt new file mode 100644 index 00000000..01747a6c --- /dev/null +++ b/app/src/main/java/com/cornellappdev/score/screen/OnboardingFavoriteSportsScreen.kt @@ -0,0 +1,117 @@ +package com.cornellappdev.score.screen + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +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 +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.cornellappdev.score.R +import com.cornellappdev.score.components.OnboardingFooter +import com.cornellappdev.score.components.ScorePreview +import com.cornellappdev.score.model.GenderDivision +import com.cornellappdev.score.model.ProfileFavorite +import com.cornellappdev.score.theme.GrayPrimary +import com.cornellappdev.score.theme.Style +import com.cornellappdev.score.theme.White + +typealias FavoriteSport = ProfileFavorite + +@Composable +fun OnboardingFavoriteSportsScreen( + favorites: List, + onToggleFavorite: (FavoriteSport) -> Unit, + onFinish: () -> Unit, + modifier: Modifier = Modifier +) { + var gender by rememberSaveable { mutableStateOf(GenderDivision.ALL) } + val options = (favorites + favoriteSportOptions).distinct() + .filter { gender == GenderDivision.ALL || it.gender == gender } + .sortedWith(selectedFavoritesFirst(favorites)) + + Box( + modifier = modifier + .fillMaxSize() + .background(White) + ) { + Column(modifier = Modifier.fillMaxSize()) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(top = 79.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = stringResource(R.string.select_favorite_sports), + style = Style.heading1, + color = GrayPrimary, + textAlign = TextAlign.Center + ) + Spacer(Modifier.height(4.dp)) + Text( + text = stringResource(R.string.favorite_sports_subtitle), + style = Style.bodyMedium, + color = GrayPrimary, + textAlign = TextAlign.Center + ) + } + + FavoriteSportSelectionScreenContents( + favorites = favorites, + options = options, + gender = gender, + onGenderSelected = { gender = it }, + onToggleFavorite = onToggleFavorite, + modifier = Modifier.weight(1f) + ) + + OnboardingFooter( + buttonText = when (favorites.size) { + 0 -> stringResource(R.string.finish) + 1 -> stringResource(R.string.finish_with_one_sport) + else -> stringResource(R.string.finish_with_sports, favorites.size) + }, + onClick = onFinish, + activeStep = 1 + ) + } + } +} + +@Preview +@Composable +private fun OnboardingFavoriteSportsScreenPreview() { + ScorePreview { + OnboardingFavoriteSportsScreen( + favorites = emptyList(), + onToggleFavorite = {}, + onFinish = {} + ) + } +} + +@Preview +@Composable +private fun OnboardingFavoriteSportsSelectedScreenPreview() { + ScorePreview { + OnboardingFavoriteSportsScreen( + favorites = emptyList(), + onToggleFavorite = {}, + onFinish = {} + ) + } +} 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 30d02230..9ffe9190 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/OnboardingProfileSelectScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/OnboardingProfileSelectScreen.kt @@ -2,9 +2,7 @@ package com.cornellappdev.score.screen import androidx.compose.foundation.Image import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize @@ -12,9 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.Button -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -28,11 +23,10 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.cornellappdev.score.R -import com.cornellappdev.score.theme.CrimsonPrimary -import com.cornellappdev.score.theme.GrayStroke +import com.cornellappdev.score.components.OnboardingFooter +import com.cornellappdev.score.theme.GrayPrimary import com.cornellappdev.score.theme.Style @Composable @@ -59,13 +53,13 @@ fun OnboardingProfileSelectScreen( Text( text = stringResource(R.string.edit_profile), style = Style.heading1, - color = Color(0xFF333333) + color = GrayPrimary ) Spacer(Modifier.height(4.dp)) Text( text = stringResource(R.string.onboarding_profile_subtitle), style = Style.bodyMedium, - color = Color(0xFF333333) + color = GrayPrimary ) Spacer(Modifier.height(40.dp)) @@ -103,62 +97,15 @@ fun OnboardingProfileSelectScreen( } Spacer(Modifier.weight(1f)) - OnboardingProfileFooter( - onNext = { onNext(selectedPicture) } + OnboardingFooter( + buttonText = stringResource(R.string.next), + onClick = { onNext(selectedPicture) }, + activeStep = 0 ) } } } -@Composable -private fun OnboardingProfileFooter( - onNext: () -> Unit, -) { - Column( - modifier = Modifier - .fillMaxWidth() - .padding( - start = 24.dp, - end = 24.dp, - top = 24.dp, - bottom = 60.dp - ), - horizontalAlignment = Alignment.CenterHorizontally - ) { - Button( - onClick = onNext, - modifier = Modifier - .fillMaxWidth() - .height(48.dp), - shape = CircleShape, - colors = ButtonDefaults.buttonColors( - containerColor = CrimsonPrimary, - contentColor = Color.White - ) - ) { - Text( - text = stringResource(R.string.next), - style = Style.heading3, - color = Color.White - ) - } - - Spacer(Modifier.height(16.dp)) - RowProgressDots() - } -} - -@Composable -private fun RowProgressDots() { - androidx.compose.foundation.layout.Row( - horizontalArrangement = Arrangement.spacedBy(4.dp), - verticalAlignment = Alignment.CenterVertically - ) { - Box(Modifier.size(8.dp).background(CrimsonPrimary, CircleShape)) - Box(Modifier.size(8.dp).background(GrayStroke, CircleShape)) - } -} - @Preview(showBackground = true) @Composable private fun OnboardingProfileSelectScreenPreview() { diff --git a/app/src/main/java/com/cornellappdev/score/screen/OnboardingScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/OnboardingScreen.kt index ab5ebcfc..82d13b8b 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/OnboardingScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/OnboardingScreen.kt @@ -1,6 +1,5 @@ package com.cornellappdev.score.screen -import androidx.annotation.DrawableRes import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.Easing import androidx.compose.animation.core.FastOutLinearInEasing diff --git a/app/src/main/java/com/cornellappdev/score/screen/OnboardingSequence.kt b/app/src/main/java/com/cornellappdev/score/screen/OnboardingSequence.kt new file mode 100644 index 00000000..0daf53ec --- /dev/null +++ b/app/src/main/java/com/cornellappdev/score/screen/OnboardingSequence.kt @@ -0,0 +1,65 @@ +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.viewmodel.OnboardingSequenceViewModel + +private enum class OnboardingStep { + WELCOME, + PROFILE_SELECT, + SPORT_SELECT +} + +@Composable +fun OnboardingSequence( + onOnboardingComplete: () -> Unit, + 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 + } + ) + + OnboardingStep.SPORT_SELECT -> { + var selectedFavorites by remember { + mutableStateOf(viewModel.getFavoriteSports()) + } + OnboardingFavoriteSportsScreen( + favorites = selectedFavorites, + onToggleFavorite = { favorite -> + selectedFavorites = if (favorite in selectedFavorites) { + selectedFavorites - favorite + } else { + selectedFavorites + favorite + } + }, + onFinish = { + viewModel.saveFavoriteSports(selectedFavorites.toSet()) + completeOnboarding() + } + ) + } + } +} diff --git a/app/src/main/java/com/cornellappdev/score/screen/ProfilePictureOptions.kt b/app/src/main/java/com/cornellappdev/score/screen/ProfilePictureOptions.kt index 2caa2550..6cc2330b 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/ProfilePictureOptions.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/ProfilePictureOptions.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.shape.CircleShape diff --git a/app/src/main/java/com/cornellappdev/score/theme/Color.kt b/app/src/main/java/com/cornellappdev/score/theme/Color.kt index f729b769..58f41fd3 100644 --- a/app/src/main/java/com/cornellappdev/score/theme/Color.kt +++ b/app/src/main/java/com/cornellappdev/score/theme/Color.kt @@ -26,4 +26,4 @@ val PennBlue = Color(0x66021E59) val PrincetonOrange = Color(0x66FF6000) val Wash = Color(0xFFF4F4F4) -val Stroke = Color(0xFFD6D6D6) +val Stroke = Color(0xFFD6D6D6) \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/score/viewmodel/OnboardingViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/OnboardingViewModel.kt new file mode 100644 index 00000000..69cee28c --- /dev/null +++ b/app/src/main/java/com/cornellappdev/score/viewmodel/OnboardingViewModel.kt @@ -0,0 +1,23 @@ +package com.cornellappdev.score.viewmodel + +import androidx.lifecycle.ViewModel +import com.cornellappdev.score.model.OnboardingPreferencesRepository +import com.cornellappdev.score.model.ProfileFavorite +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject + +@HiltViewModel +class OnboardingSequenceViewModel @Inject constructor( + private val onboardingPreferencesRepository: OnboardingPreferencesRepository +) : ViewModel() { + fun getFavoriteSports(): List = + onboardingPreferencesRepository.getFavoriteSports().toList() + + fun saveProfilePicture(pictureName: String) { + onboardingPreferencesRepository.saveProfilePicture(pictureName) + } + + fun saveFavoriteSports(favorites: Set) { + onboardingPreferencesRepository.saveFavoriteSports(favorites) + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_light_gray_female_gender.xml b/app/src/main/res/drawable/ic_light_gray_female_gender.xml new file mode 100644 index 00000000..81e066ac --- /dev/null +++ b/app/src/main/res/drawable/ic_light_gray_female_gender.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_light_gray_male_gender.xml b/app/src/main/res/drawable/ic_light_gray_male_gender.xml new file mode 100644 index 00000000..3039fdbb --- /dev/null +++ b/app/src/main/res/drawable/ic_light_gray_male_gender.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 67ca2262..0a64d4f6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -43,4 +43,13 @@ Describe what’s wrong for us. What happened? SUBMIT - \ No newline at end of file + Select Favorite Sports + You can change your picks at any time! + All + Men’s + Women’s + Finish + Finish with %1$d sports + Finish with 1 sport + Remove favorite sport +