Profile and edit profile screen UI

app/build.gradle.kts

@@ -81,6 +81,7 @@ dependencies {
     implementation(libs.material3)
     implementation("com.google.dagger:hilt-android:2.51.1")
     implementation(libs.androidx.foundation)
+    implementation(libs.foundation)
     kapt("com.google.dagger:hilt-android-compiler:2.51.1")
     implementation("androidx.hilt:hilt-navigation-compose:1.0.0")
     implementation("com.google.accompanist:accompanist-pager:0.24.0-alpha")
@@ -103,6 +104,7 @@ dependencies {
     lintChecks(libs.compose.lint.checks)
     implementation(platform("com.google.firebase:firebase-bom:34.3.0"))
     implementation("com.google.firebase:firebase-analytics")
+    implementation("androidx.compose.material:material-icons-extended:1.6.0")
 }
 
 apollo {

app/src/main/java/com/cornellappdev/score/components/GamesCarousel.kt

@@ -1,76 +1,33 @@
 package com.cornellappdev.score.components
 
-import androidx.compose.foundation.Canvas
 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.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-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 androidx.compose.ui.unit.dp
 import com.cornellappdev.score.R
 import com.cornellappdev.score.model.GameCardData
 import com.cornellappdev.score.theme.CornellRed
-import com.cornellappdev.score.theme.CrimsonPrimary
-import com.cornellappdev.score.theme.GrayLight
 import com.cornellappdev.score.util.gameList
 
-@Composable
-fun DotIndicator(
-    pagerState: androidx.compose.foundation.pager.PagerState,
-    totalPages: Int,
-    modifier: Modifier = Modifier,
-    dotSize: Dp = 14.dp,
-    selectedColor: Color = CrimsonPrimary,
-    unselectedColor: Color = GrayLight
-) {
-    Row(
-        modifier = modifier,
-        horizontalArrangement = Arrangement.spacedBy(32.dp)
-    ) {
-        for (i in 0 until totalPages) {
-            val color = if (i == pagerState.currentPage) selectedColor else unselectedColor
-            Canvas(
-                modifier = Modifier
-                    .size(dotSize)
-                    .padding(2.dp)
-            ) {
-                drawCircle(color = color)
-            }
-        }
-    }
-}
-
 @Composable
 fun GamesCarousel(
     games: List<GameCardData>,
     onClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val pagerState = rememberPagerState(pageCount = { games.size })
-    Column(
-        modifier = modifier
-            .fillMaxWidth(),
-        verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.Top),
+    LazyRow(
+        modifier = modifier.fillMaxWidth(),
+        contentPadding = PaddingValues(horizontal = 24.dp),
+        horizontalArrangement = Arrangement.spacedBy(16.dp)
     ) {
-        HorizontalPager(
-            state = pagerState,
-            modifier = Modifier.fillMaxWidth(),
-            contentPadding = PaddingValues(horizontal = 24.dp),
-            pageSpacing = 24.dp
-        ) { page ->
-            val game = games[page]
+        items(games) { game ->
             FeaturedGameCard(
                 leftTeamLogo = painterResource(R.drawable.cornell_logo),
                 rightTeamLogo = game.teamLogo,
@@ -81,21 +38,12 @@ fun GamesCarousel(
                 genderIcon = painterResource(game.genderIcon),
                 sportIcon = painterResource(game.sportIcon),
                 location = game.location,
-                modifier = Modifier,
-                headerModifier = Modifier,
                 gradientColor1 = CornellRed,
                 gradientColor2 = game.teamColor,
                 leftScore = game.cornellScore?.toInt(),
                 rightScore = game.otherScore?.toInt(),
-                onClick = { onClick(game.id) }
-            )
-        }
-
-        Box(modifier = Modifier.fillMaxWidth()) {
-            DotIndicator(
-                pagerState = pagerState,
-                totalPages = games.size,
-                modifier = Modifier.align(Alignment.Center)
+                onClick = { onClick(game.id) },
+                modifier = Modifier.width(300.dp)
             )
         }
     }
@@ -105,4 +53,4 @@ fun GamesCarousel(
 @Preview
 private fun GamesCarouselPreview() = ScorePreview {
     GamesCarousel(gameList, onClick = {})
-}
+}

app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt

@@ -11,11 +11,13 @@ import androidx.navigation.toRoute
 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.EditProfileScreen
 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.screen.ProfileScreen
 import com.cornellappdev.score.util.highlightsList
 import com.cornellappdev.score.util.recentSearchList
 import com.cornellappdev.score.util.sportList
@@ -47,6 +49,20 @@ fun ScoreNavHost(navController: NavHostController) {
                 })
             }
         }
+        composable<ScoreScreens.Profile> {
+            ProfileScreen(
+                navigateToEditProfile = {
+                    navController.navigate(ScoreScreens.EditProfile)
+                }
+            )
+        }
+        composable<ScoreScreens.EditProfile> {
+            EditProfileScreen(
+                onBackClick = {
+                    navController.navigateUp()
+                }
+            )
+        }
         composable<ScoreScreens.GameDetailsPage> {
             GameDetailsScreen(
                 onBackArrow = {
@@ -89,4 +105,3 @@ fun ScoreNavHost(navController: NavHostController) {
 //        }
     }
 }
-

app/src/main/java/com/cornellappdev/score/nav/ScoreNavigationBar.kt

@@ -8,6 +8,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.NavBackStackEntry
@@ -38,11 +39,20 @@ fun ScoreNavigationBar(
                     selectedIndicatorColor = Color.Transparent
                 ),
                 icon = {
-                    Icon(
-                        painter = painterResource(id = if (isSelected) item.selectedIcon else item.unselectedIcon),
-                        contentDescription = null,
-                        tint = Color.Unspecified
-                    )
+                    val icon = if (isSelected) item.selectedIcon else item.unselectedIcon
+                    if (icon is Int) {
+                        Icon(
+                            painter = painterResource(id = icon),
+                            contentDescription = null,
+                            tint = Color.Unspecified
+                        )
+                    } else if (icon is ImageVector) {
+                        Icon(
+                            imageVector = icon,
+                            contentDescription = null,
+                            tint = if (isSelected) CrimsonPrimary else GrayPrimary
+                        )
+                    }
                 },
                 label = {
                     Text(

app/src/main/java/com/cornellappdev/score/nav/root/RootNavigation.kt

@@ -9,6 +9,10 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.outlined.Person
+import androidx.compose.material.icons.outlined.Schedule
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
@@ -18,6 +22,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.dropShadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.shadow.Shadow
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -65,7 +70,8 @@ fun RootNavigation(
 
     Scaffold(
         modifier = modifier.fillMaxSize(), bottomBar = {
-            if (navBackStackEntry?.toScreen() is ScoreScreens.GameDetailsPage) {
+            val currentScreen = navBackStackEntry?.toScreen()
+            if (currentScreen is ScoreScreens.GameDetailsPage || currentScreen is ScoreScreens.EditProfile) {
                 return@Scaffold
             }
             Surface(
@@ -110,6 +116,12 @@ sealed class ScoreScreens {
     @Serializable
     data class GameScoreSummaryPage(val scoreEvents: String) : ScoreScreens()
 
+    @Serializable
+    data object Profile : ScoreScreens()
+
+    @Serializable
+    data object EditProfile : ScoreScreens()
+
 ////removed for 2/2026 release
 //    @Serializable
 //    data object HighlightsScreen : ScoreScreens()
@@ -124,17 +136,19 @@ fun NavBackStackEntry.toScreen(): ScoreScreens? =
         "GameDetailsPage" -> toRoute<ScoreScreens.GameDetailsPage>()
         "ScoresScreen" -> toRoute<ScoreScreens.ScoresScreen>()
         "GameScoreSummaryPage" -> toRoute<ScoreScreens.GameScoreSummaryPage>()
+        "Profile" -> toRoute<ScoreScreens.Profile>()
+        "EditProfile" -> toRoute<ScoreScreens.EditProfile>()
         //removed for 2/2026 release
 //        "HighlightsScreen" -> toRoute<ScoreScreens.HighlightsScreen>()
 //        "HighlightsSearchScreen" -> toRoute<ScoreScreens.HighlightsScreen>()
-        else -> throw IllegalArgumentException("Invalid screen")
+        else -> null
     }
 
 data class NavItem(
     val screen: ScoreScreens,
     val label: String,
-    val unselectedIcon: Int,
-    val selectedIcon: Int
+    val unselectedIcon: Any,
+    val selectedIcon: Any
 )
 
 val tabs = listOf(
@@ -157,4 +171,10 @@ val tabs = listOf(
         selectedIcon = R.drawable.ic_scores_filled,
         screen = ScoreScreens.ScoresScreen,
     ),
-)
+    NavItem(
+        label = "Profile",
+        unselectedIcon = Icons.Outlined.Person,
+        selectedIcon = Icons.Filled.Person,
+        screen = ScoreScreens.Profile,
+    ),
+)