fix(android): drop unused navController from ShellScaffold
CI on 5c2011e6 caught it: removing the MiniPlayer kebab also removed
the only consumer of ShellScaffold's navController parameter, which
detekt's UnusedParameter rule flagged. Per YAGNI, dropping the param
entirely instead of @Suppress'ing a dead carry; if a future banner
or shell-level affordance needs nav, plumb it back in at that point.
Touches the public signature so all 10+ call sites in MinstrelNavGraph
also lose the `navController = navController` argument.
This commit is contained in:
@@ -70,56 +70,56 @@ private fun NavGraphBuilder.inShellTopLevel(
|
|||||||
) {
|
) {
|
||||||
composable<Home> {
|
composable<Home> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
HomeScreen(navController = navController)
|
HomeScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<Library> {
|
composable<Library> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
LibraryScreen(navController = navController)
|
LibraryScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<Search> {
|
composable<Search> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
SearchScreen(navController = navController)
|
SearchScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<Discover> {
|
composable<Discover> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
DiscoverScreen(navController = navController)
|
DiscoverScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<Playlists> {
|
composable<Playlists> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
PlaylistsListScreen(navController = navController)
|
PlaylistsListScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<Settings> {
|
composable<Settings> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
SettingsScreen(navController = navController)
|
SettingsScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<Admin> {
|
composable<Admin> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
AdminLandingScreen(navController = navController)
|
AdminLandingScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<Requests> {
|
composable<Requests> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
RequestsScreen(navController = navController)
|
RequestsScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -150,42 +150,42 @@ private fun NavGraphBuilder.inShellDetail(
|
|||||||
) {
|
) {
|
||||||
composable<AlbumDetail> {
|
composable<AlbumDetail> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
AlbumDetailScreen(navController = navController)
|
AlbumDetailScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<ArtistDetail> {
|
composable<ArtistDetail> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
ArtistDetailScreen(navController = navController)
|
ArtistDetailScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<PlaylistDetail> {
|
composable<PlaylistDetail> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
PlaylistDetailScreen(navController = navController)
|
PlaylistDetailScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<AdminRequests> {
|
composable<AdminRequests> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
AdminRequestsScreen(navController = navController)
|
AdminRequestsScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<AdminQuarantine> {
|
composable<AdminQuarantine> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
AdminQuarantineScreen(navController = navController)
|
AdminQuarantineScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
composable<AdminUsers> {
|
composable<AdminUsers> {
|
||||||
WithAnimatedScope {
|
WithAnimatedScope {
|
||||||
ShellScaffold(navController = navController, onExpandPlayer = expandPlayer) {
|
ShellScaffold(onExpandPlayer = expandPlayer) {
|
||||||
AdminUsersScreen(navController = navController)
|
AdminUsersScreen(navController = navController)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import androidx.compose.runtime.LaunchedEffect
|
|||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.hilt.navigation.compose.hiltViewModel
|
import androidx.hilt.navigation.compose.hiltViewModel
|
||||||
import androidx.navigation.NavHostController
|
|
||||||
import com.fabledsword.minstrel.connectivity.ui.ConnectionErrorBanner
|
import com.fabledsword.minstrel.connectivity.ui.ConnectionErrorBanner
|
||||||
import com.fabledsword.minstrel.player.ui.MiniPlayer
|
import com.fabledsword.minstrel.player.ui.MiniPlayer
|
||||||
import com.fabledsword.minstrel.player.ui.PlaybackErrorViewModel
|
import com.fabledsword.minstrel.player.ui.PlaybackErrorViewModel
|
||||||
@@ -38,14 +37,13 @@ import com.fabledsword.minstrel.shared.widgets.trackactions.TrackActionsViewMode
|
|||||||
* back-only AppBar.
|
* back-only AppBar.
|
||||||
*
|
*
|
||||||
* [onExpandPlayer] is the navigate-to-NowPlaying callback passed
|
* [onExpandPlayer] is the navigate-to-NowPlaying callback passed
|
||||||
* through to MiniPlayer's tap-handler. [navController] is kept on
|
* through to MiniPlayer's tap-handler. No NavHostController parameter
|
||||||
* the signature for future shell-level navigation needs (banner taps
|
* because nothing inside the shell currently navigates - if a banner
|
||||||
* etc.); MiniPlayer itself no longer carries a kebab so doesn't need
|
* (UpdateBanner / VersionTooOldBanner / ConnectionErrorBanner) ever
|
||||||
* nav callbacks any more.
|
* grows tap-to-navigate, plumb a NavHostController in at that point.
|
||||||
*/
|
*/
|
||||||
@Composable
|
@Composable
|
||||||
fun ShellScaffold(
|
fun ShellScaffold(
|
||||||
navController: NavHostController,
|
|
||||||
onExpandPlayer: () -> Unit,
|
onExpandPlayer: () -> Unit,
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
trackActionsViewModel: TrackActionsViewModel = hiltViewModel(),
|
trackActionsViewModel: TrackActionsViewModel = hiltViewModel(),
|
||||||
|
|||||||
Reference in New Issue
Block a user