android/app/src/main/java/com/fabledsword/minstrel/nav/MinstrelNavGraph.kt

@@ -5,6 +5,7 @@ import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -28,85 +29,82 @@ fun MinstrelNavGraph(
     modifier: Modifier = Modifier,
 ) {
     val expandPlayer = { navController.navigate(NowPlaying) }
-
     NavHost(
         navController = navController,
         startDestination = Library,
         modifier = modifier.fillMaxSize(),
     ) {
-        // ── In-shell top-level destinations ───────────────────────────
+        inShellTopLevel(navController, expandPlayer)
+        inShellDetail(expandPlayer)
+        outsideShell()
+    }
+}
 
+private fun NavGraphBuilder.inShellTopLevel(
+    navController: NavHostController,
+    expandPlayer: () -> Unit,
+) {
     composable<Home> {
         ShellScaffold(onExpandPlayer = expandPlayer) {
             ComingSoon("Home", "Lands in the next design-drift sub-task.")
         }
     }
-
     composable<Library> {
         ShellScaffold(onExpandPlayer = expandPlayer) {
             LibraryScreen(navController = navController)
         }
     }
-
     composable<Search> {
         ShellScaffold(onExpandPlayer = expandPlayer) {
             ComingSoon("Search", "Lands in a later phase.")
         }
     }
-
     composable<Discover> {
         ShellScaffold(onExpandPlayer = expandPlayer) {
             ComingSoon("Discover", "Lands in Phase 10 (Lidarr requests).")
         }
     }
-
     composable<Playlists> {
         ShellScaffold(onExpandPlayer = expandPlayer) {
             ComingSoon("Playlists", "Lands in Phase 7.")
         }
     }
-
     composable<Settings> {
         ShellScaffold(onExpandPlayer = expandPlayer) {
             ComingSoon("Settings", "Lands in Phase 11.")
         }
     }
-
     composable<Admin> {
         ShellScaffold(onExpandPlayer = expandPlayer) {
             ComingSoon("Admin", "Admin landing — lands in a later phase.")
         }
     }
-
     composable<Requests> {
         ShellScaffold(onExpandPlayer = expandPlayer) {
             ComingSoon("Requests", "Your Lidarr requests — Phase 10.")
         }
     }
+}
 
-        // ── In-shell detail screens (push-on-top) ─────────────────────
+private fun NavGraphBuilder.inShellDetail(expandPlayer: () -> Unit) {
-
     composable<AlbumDetail> { backStackEntry ->
         val route: AlbumDetail = backStackEntry.toRoute()
         ShellScaffold(onExpandPlayer = expandPlayer) {
             ComingSoon("Album", "Album detail for ${route.id} — later 5.x slice.")
         }
     }
-
     composable<ArtistDetail> { backStackEntry ->
         val route: ArtistDetail = backStackEntry.toRoute()
         ShellScaffold(onExpandPlayer = expandPlayer) {
             ComingSoon("Artist", "Artist detail for ${route.id} — later 5.x slice.")
         }
     }
-
     composable<PlaylistDetail> { backStackEntry ->
         val route: PlaylistDetail = backStackEntry.toRoute()
         ShellScaffold(onExpandPlayer = expandPlayer) {
             ComingSoon("Playlist", "Playlist detail for ${route.id} — Phase 7.")
         }
     }
-
     composable<AdminRequests> {
         ShellScaffold(onExpandPlayer = expandPlayer) {
             ComingSoon("Admin · Requests", "Lands with admin slice.")
@@ -122,9 +120,9 @@ fun MinstrelNavGraph(
             ComingSoon("Admin · Users", "Lands with admin slice.")
         }
     }
+}
 
-        // ── Outside-shell full-screen routes ──────────────────────────
+private fun NavGraphBuilder.outsideShell() {
-
     composable<NowPlaying>(
         // Slide up from the bottom on enter; back down on dismiss.
         // Mirrors the Flutter CustomTransitionPage (280ms easeOutCubic).
@@ -135,16 +133,11 @@ fun MinstrelNavGraph(
     ) {
         NowPlayingScreen()
     }
-
     composable<Queue> { ComingSoon("Queue", "Lands in a later 6.x slice.") }
-
     composable<ServerUrl> {
         ComingSoon("Connect to your Minstrel", "Server-URL entry — Phase 11.")
     }
-        composable<Login> {
+    composable<Login> { ComingSoon("Sign in", "Login flow — Phase 11.") }
-            ComingSoon("Sign in", "Login flow — Phase 11.")
-        }
-    }
 }
 
 @Composable