Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
64ed51c
first draft of onboarding animation
amjiao Oct 14, 2026
f7bd25d
Complete animation
amjiao Oct 14, 2026
571bcac
Complete onboarding animation
amjiao Oct 16, 2026
cdfaf5e
remove onboarding preview screen from commit
amjiao Oct 16, 2026
2e6d25b
Clean up OnboardingScreen.kt
amjiao Oct 16, 2026
70345f9
Merge branch 'main' of https://github.com/cuappdev/score-android into…
amjiao Oct 16, 2026
539833c
Merge branch 'main' into onboarding
amjiao Oct 16, 2026
5a9d900
Onboarding profile picture selection
amjiao Oct 18, 2026
617b178
Onboarding profile picture selection
amjiao Oct 18, 2026
996fcf7
Merge branch 'onboarding2' of https://github.com/cuappdev/score-andro…
amjiao Oct 19, 2026
a645f2d
Make screen name more informative
amjiao Oct 19, 2026
1f59b71
first draft onboarding profile screen
amjiao Oct 18, 2026
6ceef4e
Make name more informative
amjiao Oct 19, 2026
f69c41e
Rename file
amjiao Oct 19, 2026
0689e24
fix page dot indicator
amjiao Oct 21, 2026
fe3103a
first draft onboarding profile screen
amjiao Oct 18, 2026
bf01222
Make name more informative
amjiao Oct 19, 2026
bb1e5b5
fix page dot indicator
amjiao Oct 21, 2026
b291bdf
Merge branch 'onboarding3' of https://github.com/cuappdev/score-andro…
amjiao Oct 21, 2026
122ab35
Fix profile selector defaults
amjiao Oct 28, 2026
dc900f2
Change onboarding state representation from int to enum
amjiao Oct 28, 2026
ed21b71
Change manual scaling to adaptive
amjiao Oct 28, 2026
49f5e02
Onboarding footer component
amjiao Oct 28, 2026
1597916
Add sport select icons
amjiao Oct 28, 2026
5dd429c
Change SportSelectScreen to not use manual scaling
amjiao Oct 28, 2026
0679464
Use new onboarding footer component
amjiao Oct 28, 2026
9dcfd30
first draft of onboarding animation
amjiao Oct 14, 2026
1c59b90
Complete animation
amjiao Oct 14, 2026
72ae474
Complete onboarding animation
amjiao Oct 16, 2026
9150768
remove onboarding preview screen from commit
amjiao Oct 16, 2026
9d5dbc4
Clean up OnboardingScreen.kt
amjiao Oct 16, 2026
e075ff8
fix nav padding per coderabbit comment
amjiao Oct 21, 2026
08ebb0b
make common onboarding screen origin per coderabbit review
amjiao Oct 21, 2026
d580f98
Onboarding profile picture selection
amjiao Oct 18, 2026
3ebccad
Make screen name more informative
amjiao Oct 19, 2026
62db4eb
Rename file
amjiao Oct 19, 2026
247fd88
Fix profile selector defaults
amjiao Oct 28, 2026
39a605e
Change onboarding state representation from int to enum
amjiao Oct 28, 2026
dda86eb
Change manual scaling to adaptive
amjiao Oct 28, 2026
dc3f8a9
first draft onboarding profile screen
amjiao Oct 18, 2026
d520726
Make name more informative
amjiao Oct 19, 2026
2e36a6a
fix page dot indicator
amjiao Oct 21, 2026
70bfaba
first draft onboarding profile screen
amjiao Oct 18, 2026
4fa2f26
Make name more informative
amjiao Oct 19, 2026
1e2ea23
fix page dot indicator
amjiao Oct 21, 2026
b461368
Onboarding footer component
amjiao Oct 28, 2026
76f0f2f
Add sport select icons
amjiao Oct 28, 2026
4059984
Change SportSelectScreen to not use manual scaling
amjiao Oct 28, 2026
5e961d3
Use new onboarding footer component
amjiao Oct 28, 2026
ef4433f
Restore favorite sports onboarding step
amjiao Oct 28, 2026
ddd821d
Clean up
amjiao Oct 28, 2026
5e8c78b
Merge branch 'onboarding3' of https://github.com/cuappdev/score-andro…
amjiao Oct 28, 2026
0c4cea2
Clean up
amjiao Oct 28, 2026
65ddd3b
Address pr comments
amjiao Nov 1, 2026
eff9a62
Make shared onboarding preference repository
amjiao Nov 1, 2026
24d68df
Merge branch 'onboarding2' of https://github.com/cuappdev/score-andro…
amjiao Nov 1, 2026
b58f6bc
Merge branch 'onboarding' into onboarding2
amjiao Nov 2, 2026
fc6358c
restore onboarding profile selection
amjiao Nov 2, 2026
0b67045
Merge branch 'onboarding2' of https://github.com/cuappdev/score-andro…
amjiao Nov 2, 2026
b715e63
Abstract the gender filter
amjiao Nov 2, 2026
1516091
Update OnboardingFavoriteSportsScreen.kt
amjiao Nov 3, 2026
229e668
Merge branch 'main' of https://github.com/cuappdev/score-android into…
amjiao Nov 11, 2026
bdcc436
Refactor EditFavoriteSportsScreen and OnboardingFavoriteSportScreen t…
amjiao Nov 11, 2026
2e479e9
Make OnboardingFooter dumber ui
amjiao Nov 11, 2026
bc8cdf4
Extract preferences logic
amjiao Nov 11, 2026
77f132f
Reformatting
amjiao Nov 11, 2026
ee159ed
Clean up logic, align sport availability between onboarding and edit …
amjiao Nov 11, 2026
de66613
Update OnboardingFooter call argument
amjiao Nov 11, 2026
7f93999
Merge branch 'main' of https://github.com/cuappdev/score-android into…
amjiao Nov 11, 2026
29371d4
Refactor logic out of setContent
amjiao Nov 16, 2026
1c7c5e1
Refactor for mvvm
amjiao Nov 17, 2026
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
50 changes: 10 additions & 40 deletions app/src/main/java/com/cornellappdev/score/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -41,39 +29,21 @@ class MainActivity : AppCompatActivity() {
enableEdgeToEdge()

val onboardingCompleted = onboardingPreferencesRepository.isOnboardingCompleted()
val preferences = getSharedPreferences(APP_PREFERENCES, MODE_PRIVATE)

setContent {
Comment thread
amjiao marked this conversation as resolved.
Resolved
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()
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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 }
)
}
}
Comment thread
amjiao marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
@@ -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(
Comment thread
amjiao marked this conversation as resolved.
Resolved
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
)
}
}
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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(),
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,31 @@ class OnboardingPreferencesRepository @Inject constructor(
}
}

fun getFavoriteSports(): Set<ProfileFavorite> =
preferences.getStringSet(KEY_ONBOARDING_FAVORITE_SPORTS, emptySet())
.orEmpty()
.mapNotNull { ProfileFavorite.fromStorageKey(it) }
.toSet()

fun saveFavoriteSports(favorites: Set<ProfileFavorite>) {
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"
}
}
Loading
Loading