Skip to content

Remove highlights and advanced filters for Feb release #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
amjiao wants to merge 1 commit into from
+42 −38
Closed

Remove highlights and advanced filters for Feb release #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 20 additions & 20 deletions app/src/main/java/com/cornellappdev/score/nav/ScoreNavHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,26 @@ fun ScoreNavHost(navController: NavHostController) {
navController.navigateUp()
})
}

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",
{},
{}
)
}
}
//// 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",
// {},
// {}
// )
// }
// }
}
}

29 changes: 16 additions & 13 deletions app/src/main/java/com/cornellappdev/score/nav/root/RootNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,12 @@ sealed class ScoreScreens {
@Serializable
data class GameScoreSummaryPage(val scoreEvents: String) : ScoreScreens()

@Serializable
data object HighlightsScreen : ScoreScreens()

@Serializable
data object HighlightsSearchScreen : ScoreScreens()
////removed for 2/2026 release
// @Serializable
// data object HighlightsScreen : ScoreScreens()
//
// @Serializable
// data object HighlightsSearchScreen : ScoreScreens()
}

fun NavBackStackEntry.toScreen(): ScoreScreens? =
Expand All @@ -123,8 +124,9 @@ fun NavBackStackEntry.toScreen(): ScoreScreens? =
"GameDetailsPage" -> toRoute<ScoreScreens.GameDetailsPage>()
"ScoresScreen" -> toRoute<ScoreScreens.ScoresScreen>()
"GameScoreSummaryPage" -> toRoute<ScoreScreens.GameScoreSummaryPage>()
"HighlightsScreen" -> toRoute<ScoreScreens.HighlightsScreen>()
"HighlightsSearchScreen" -> toRoute<ScoreScreens.HighlightsScreen>()
//removed for 2/2026 release
// "HighlightsScreen" -> toRoute<ScoreScreens.HighlightsScreen>()
// "HighlightsSearchScreen" -> toRoute<ScoreScreens.HighlightsScreen>()
else -> throw IllegalArgumentException("Invalid screen")
}

Expand All @@ -142,12 +144,13 @@ val tabs = listOf(
selectedIcon = R.drawable.ic_schedule_filled,
screen = ScoreScreens.Home,
),
NavItem(
label = "Highlights",
unselectedIcon = R.drawable.ic_nav_star,
selectedIcon = R.drawable.ic_nav_star_filled,
screen = ScoreScreens.HighlightsScreen,
),
//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,
Expand Down
11 changes: 6 additions & 5 deletions app/src/main/java/com/cornellappdev/score/screen/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,12 @@ private fun HomeLazyColumn(
text = "Game Schedule",
style = title,
)
IconButton(
icon = painterResource(id = R.drawable.advanced_filter),
contentDescription = "Advanced filter",
onClick = onAdvancedFilterClick
)
//removed for 2/2026 release
// IconButton(
// icon = painterResource(id = R.drawable.advanced_filter),
// contentDescription = "Advanced filter",
// onClick = onAdvancedFilterClick
// )
}
Spacer(modifier = Modifier.height(16.dp))
SportSelectorHeader(
Expand Down
Loading