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
90 changes: 60 additions & 30 deletions app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,20 +36,27 @@ fun ScoreNavHost(navController: NavHostController, welcomeName: String? = null)
) {
composable<Home> {
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<ScoreScreens.ScoresScreen> {
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<ScoreScreens.GameDetailsPage> {
Expand All @@ -66,26 +79,43 @@ fun ScoreNavHost(navController: NavHostController, welcomeName: String? = null)
navController.navigateUp()
})
}
//// removed for 2/2026 release
// composable<ScoreScreens.HighlightsScreen> { backStackEntry ->
// CompositionLocalProvider(LocalViewModelStoreOwner provides mainScreenViewModelStoreOwner) {
// HighlightsScreen(toSearchScreen = { navController.navigate(ScoreScreens.HighlightsSearchScreen) })
// }
// }
//
// composable<ScoreScreens.HighlightsSearchScreen> { backStackEntry ->
// CompositionLocalProvider(LocalViewModelStoreOwner provides mainScreenViewModelStoreOwner) {
// HighlightsSearchScreen(
// sportList = sportList,
// recentSearchList = recentSearchList,
// highlightsList = highlightsList,
// query = "",
// header = "Search all highlights",
// {},
// {}
// )
// }
// }
composable<ScoreScreens.HighlightsScreen> {
HighlightsScreen(
toSearchScreen = { navController.navigate(ScoreScreens.HighlightsSearchScreen) }
)
}
composable<ScoreScreens.HighlightsSearchScreen> {
HighlightsSearchScreen(
sportList = emptyList(),
recentSearchList = emptyList(),
highlightsList = emptyList(),
query = "",
header = "Search all highlights",
onItemClick = {},
onCloseClick = { navController.navigateUp() }
)
}
composable<ScoreScreens.ProfileScreen> {
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
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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? =
Expand All @@ -125,9 +134,9 @@ fun NavBackStackEntry.toScreen(): ScoreScreens? =
"GameDetailsPage" -> toRoute<ScoreScreens.GameDetailsPage>()
"ScoresScreen" -> toRoute<ScoreScreens.ScoresScreen>()
"GameScoreSummaryPage" -> toRoute<ScoreScreens.GameScoreSummaryPage>()
//removed for 2/2026 release
// "HighlightsScreen" -> toRoute<ScoreScreens.HighlightsScreen>()
// "HighlightsSearchScreen" -> toRoute<ScoreScreens.HighlightsScreen>()
"HighlightsScreen" -> toRoute<ScoreScreens.HighlightsScreen>()
"HighlightsSearchScreen" -> toRoute<ScoreScreens.HighlightsSearchScreen>()
"ProfileScreen" -> toRoute<ScoreScreens.ProfileScreen>()
else -> throw IllegalArgumentException("Invalid screen")
}

Expand All @@ -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,
),
)
18 changes: 13 additions & 5 deletions app/src/main/java/com/cornellappdev/score/screen/ProfileScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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<ProfileFavorite>) -> 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) }
Expand Down Expand Up @@ -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(
Expand All @@ -126,7 +134,7 @@ fun ProfileScreen(
)
}
}
if (!editingSports && !showingSettings) ProfileTabBar()
if (showBottomBar && !editingSports && !showingSettings) ProfileTabBar()
}
}

Expand Down
Loading