From 117f32272110131f95a0e6825ae2dd5eeebba914 Mon Sep 17 00:00:00 2001 From: Emil Jiang Date: Wed, 18 Nov 2026 15:59:09 -0500 Subject: [PATCH 1/2] Restore tabs and connect profile to onboarding preferences --- .../cornellappdev/score/nav/ScoreNavHost.kt | 84 ++++++++++++------- .../score/nav/ScoreNavigationBar.kt | 9 +- .../score/nav/root/RootNavigation.kt | 48 +++++++---- .../score/screen/ProfileScreen.kt | 18 ++-- 4 files changed, 104 insertions(+), 55 deletions(-) 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 4549bef1..e6273662 100644 --- a/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt +++ b/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt @@ -3,11 +3,17 @@ package com.cornellappdev.score.nav import GameScoreSummaryScreenDetail import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider +import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.toRoute +import com.cornellappdev.score.model.ProfileData +import com.cornellappdev.score.screen.ProfileScreen +import com.cornellappdev.score.screen.HighlightsScreen +import com.cornellappdev.score.screen.HighlightsSearchScreen +import com.cornellappdev.score.viewmodel.OnboardingSequenceViewModel import com.cornellappdev.score.model.ScoreEvent import com.cornellappdev.score.nav.root.ScoreScreens import com.cornellappdev.score.nav.root.ScoreScreens.Home @@ -30,20 +36,27 @@ fun ScoreNavHost(navController: NavHostController, welcomeName: String? = null) ) { composable { CompositionLocalProvider(LocalViewModelStoreOwner provides mainScreenViewModelStoreOwner) { - HomeScreen(welcomeName = welcomeName, navigateToGameDetails = { - navController.navigate(ScoreScreens.GameDetailsPage(it)) - }, - navigateToProfile = {} - ) + HomeScreen( + welcomeName = welcomeName, + navigateToGameDetails = { + navController.navigate(ScoreScreens.GameDetailsPage(it)) + }, + navigateToProfile = { + navController.navigate(ScoreScreens.ProfileScreen) { launchSingleTop = true } + } + ) } } composable { CompositionLocalProvider(LocalViewModelStoreOwner provides mainScreenViewModelStoreOwner) { - PastGamesScreen(navigateToGameDetails = { - navController.navigate(ScoreScreens.GameDetailsPage(it)) - }, - navigateToProfile = {} - ) + PastGamesScreen( + navigateToGameDetails = { + navController.navigate(ScoreScreens.GameDetailsPage(it)) + }, + navigateToProfile = { + navController.navigate(ScoreScreens.ProfileScreen) { launchSingleTop = true } + } + ) } } composable { @@ -66,26 +79,35 @@ fun ScoreNavHost(navController: NavHostController, welcomeName: String? = null) navController.navigateUp() }) } -//// removed for 2/2026 release -// composable { backStackEntry -> -// CompositionLocalProvider(LocalViewModelStoreOwner provides mainScreenViewModelStoreOwner) { -// HighlightsScreen(toSearchScreen = { navController.navigate(ScoreScreens.HighlightsSearchScreen) }) -// } -// } -// -// composable { backStackEntry -> -// CompositionLocalProvider(LocalViewModelStoreOwner provides mainScreenViewModelStoreOwner) { -// HighlightsSearchScreen( -// sportList = sportList, -// recentSearchList = recentSearchList, -// highlightsList = highlightsList, -// query = "", -// header = "Search all highlights", -// {}, -// {} -// ) -// } -// } + composable { + HighlightsScreen( + toSearchScreen = { navController.navigate(ScoreScreens.HighlightsSearchScreen) } + ) + } + composable { + HighlightsSearchScreen( + sportList = emptyList(), + recentSearchList = emptyList(), + highlightsList = emptyList(), + query = "", + header = "Search all highlights", + onItemClick = {}, + onCloseClick = { navController.navigateUp() } + ) + } + composable { + val viewModel: OnboardingSequenceViewModel = hiltViewModel() + ProfileScreen( + data = ProfileData( + name = welcomeName?.takeIf { it.isNotBlank() } ?: "Guest", + favorites = viewModel.getFavoriteSports(), + bookmarks = emptyList() + ), + initialPicture = viewModel.getProfilePicture(), + onPictureSelected = { viewModel.saveProfilePicture(it.name) }, + onFavoritesChanged = { viewModel.saveFavoriteSports(it.toSet()) }, + showBottomBar = false + ) + } } } - diff --git a/app/src/main/java/com/cornellappdev/score/nav/ScoreNavigationBar.kt b/app/src/main/java/com/cornellappdev/score/nav/ScoreNavigationBar.kt index 91af73de..a87f41a4 100644 --- a/app/src/main/java/com/cornellappdev/score/nav/ScoreNavigationBar.kt +++ b/app/src/main/java/com/cornellappdev/score/nav/ScoreNavigationBar.kt @@ -29,7 +29,10 @@ fun ScoreNavigationBar( containerColor = Color.Transparent ) { tabs.map { item -> - val isSelected = item.screen == navBackStackEntry?.toScreen() + val currentScreen = navBackStackEntry?.toScreen() + val isSelected = item.screen == currentScreen || + (item.screen == ScoreScreens.HighlightsScreen && + currentScreen == ScoreScreens.HighlightsSearchScreen) NavigationBarItem( selected = isSelected, @@ -41,7 +44,9 @@ fun ScoreNavigationBar( Icon( painter = painterResource(id = if (isSelected) item.selectedIcon else item.unselectedIcon), contentDescription = null, - tint = Color.Unspecified + tint = if (item.screen == ScoreScreens.ProfileScreen) { + if (isSelected) CrimsonPrimary else GrayPrimary + } else Color.Unspecified ) }, label = { 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 01a3677b..1ac91d6f 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 @@ -83,7 +83,13 @@ fun RootNavigation( color = Color.White, shape = RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp) ) { - ScoreNavigationBar({ navController.navigate(it) }, navBackStackEntry) + ScoreNavigationBar({ screen -> + navController.navigate(screen) { + popUpTo(ScoreScreens.Home) { saveState = true } + launchSingleTop = true + restoreState = true + } + }, navBackStackEntry) } }, containerColor = White @@ -111,12 +117,15 @@ sealed class ScoreScreens { @Serializable data class GameScoreSummaryPage(val scoreEvents: String) : ScoreScreens() -////removed for 2/2026 release -// @Serializable -// data object HighlightsScreen : ScoreScreens() -// -// @Serializable -// data object HighlightsSearchScreen : ScoreScreens() + @Serializable + data object HighlightsScreen : ScoreScreens() + + @Serializable + data object HighlightsSearchScreen : ScoreScreens() + + @Serializable + data object ProfileScreen : ScoreScreens() + } fun NavBackStackEntry.toScreen(): ScoreScreens? = @@ -125,9 +134,9 @@ fun NavBackStackEntry.toScreen(): ScoreScreens? = "GameDetailsPage" -> toRoute() "ScoresScreen" -> toRoute() "GameScoreSummaryPage" -> toRoute() - //removed for 2/2026 release -// "HighlightsScreen" -> toRoute() -// "HighlightsSearchScreen" -> toRoute() + "HighlightsScreen" -> toRoute() + "HighlightsSearchScreen" -> toRoute() + "ProfileScreen" -> toRoute() else -> throw IllegalArgumentException("Invalid screen") } @@ -145,17 +154,22 @@ val tabs = listOf( selectedIcon = R.drawable.ic_schedule_filled, screen = ScoreScreens.Home, ), - //removed for 2/2026 review -// NavItem( -// label = "Highlights", -// unselectedIcon = R.drawable.ic_nav_star, -// selectedIcon = R.drawable.ic_nav_star_filled, -// screen = ScoreScreens.HighlightsScreen, -// ), NavItem( label = "Scores", unselectedIcon = R.drawable.ic_scores, selectedIcon = R.drawable.ic_scores_filled, screen = ScoreScreens.ScoresScreen, ), + NavItem( + label = "Highlights", + unselectedIcon = R.drawable.ic_nav_star, + selectedIcon = R.drawable.ic_nav_star_filled, + screen = ScoreScreens.HighlightsScreen, + ), + NavItem( + label = "Profile", + unselectedIcon = R.drawable.profile_person, + selectedIcon = R.drawable.profile_person, + screen = ScoreScreens.ProfileScreen, + ), ) \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/score/screen/ProfileScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/ProfileScreen.kt index 090fdf22..e8d98ffa 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/ProfileScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/ProfileScreen.kt @@ -63,15 +63,19 @@ import com.cornellappdev.score.theme.GrayStroke import com.cornellappdev.score.theme.SpotColor import com.cornellappdev.score.theme.Style -/** Standalone sample backed by replaceable dummy data; avatar editing is inherited from PR #115. */ +/** Profile flow shared by the app navigation and standalone previews. */ @Composable fun ProfileScreen( modifier: Modifier = Modifier, data: ProfileData = sampleProfileData, onEditSports: () -> Unit = {}, - onShowAllBookmarks: () -> Unit = {} + onShowAllBookmarks: () -> Unit = {}, + initialPicture: ProfilePicture = ProfilePicture.BLANK, + onPictureSelected: (ProfilePicture) -> Unit = {}, + onFavoritesChanged: (List) -> Unit = {}, + showBottomBar: Boolean = true ) { - var selectedPicture by rememberSaveable { mutableStateOf(ProfilePicture.TENNIS) } + var selectedPicture by rememberSaveable { mutableStateOf(initialPicture) } var editingPicture by rememberSaveable { mutableStateOf(false) } var showingSettings by rememberSaveable { mutableStateOf(false) } @@ -104,13 +108,17 @@ fun ProfileScreen( onToggleFavorite = { favorite -> favorites = if (favorite in favorites) favorites - favorite else favorites + favorite + onFavoritesChanged(favorites) }, onBack = { editingSports = false } ) } else if (editingPicture) { EditProfileScreen( selectedPicture, - { selectedPicture = it }, + { + selectedPicture = it + onPictureSelected(it) + }, { editingPicture = false }) } else { ProfileContent( @@ -126,7 +134,7 @@ fun ProfileScreen( ) } } - if (!editingSports && !showingSettings) ProfileTabBar() + if (showBottomBar && !editingSports && !showingSettings) ProfileTabBar() } } From 3f296b2a10d01df3418c1b302230bf1689d19290 Mon Sep 17 00:00:00 2001 From: Emil Jiang Date: Wed, 18 Nov 2026 16:08:08 -0500 Subject: [PATCH 2/2] Fix profile ViewModel injection lint error --- .../cornellappdev/score/nav/ScoreNavHost.kt | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) 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 e6273662..ef434760 100644 --- a/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt +++ b/app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt @@ -96,18 +96,26 @@ fun ScoreNavHost(navController: NavHostController, welcomeName: String? = null) ) } composable { - val viewModel: OnboardingSequenceViewModel = hiltViewModel() - ProfileScreen( - data = ProfileData( - name = welcomeName?.takeIf { it.isNotBlank() } ?: "Guest", - favorites = viewModel.getFavoriteSports(), - bookmarks = emptyList() - ), - initialPicture = viewModel.getProfilePicture(), - onPictureSelected = { viewModel.saveProfilePicture(it.name) }, - onFavoritesChanged = { viewModel.saveFavoriteSports(it.toSet()) }, - showBottomBar = false - ) + ProfileRoute(displayName = welcomeName) } } } + + +@Composable +private fun ProfileRoute( + displayName: String?, + viewModel: OnboardingSequenceViewModel = hiltViewModel() +) { + ProfileScreen( + data = ProfileData( + name = displayName?.takeIf { it.isNotBlank() } ?: "Guest", + favorites = viewModel.getFavoriteSports(), + bookmarks = emptyList() + ), + initialPicture = viewModel.getProfilePicture(), + onPictureSelected = { viewModel.saveProfilePicture(it.name) }, + onFavoritesChanged = { viewModel.saveFavoriteSports(it.toSet()) }, + showBottomBar = false + ) +}