Update project

michaelbel · Apr 23, 2024 · 7d62d97 · 7d62d97
1 parent dfaa806
commit 7d62d97
Show file tree

Hide file tree

Showing 9 changed files with 167 additions and 0 deletions.
diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts
@@ -19,6 +19,7 @@ kotlin {
         }
         val desktopMain by getting
         desktopMain.dependencies {
+            api(libs.bundles.compose.navigation.common)
             api(libs.bundles.precompose.desktop)
         }
     }

diff --git a/desktopApp/src/jvmMain/kotlin/org/michaelbel/movies/MainWindowContent.kt b/desktopApp/src/jvmMain/kotlin/org/michaelbel/movies/MainWindowContent.kt
@@ -53,4 +53,38 @@ internal fun MainWindowContent() {
             navigateBack = navHostController::popBackStack
         )
     }
+
+    /*val navHostController: NavHostController = rememberNavController()
+    androidx.navigation.compose.NavHost(
+        navController = navHostController,
+        startDestination = "feed"
+    ) {
+        authGraph(
+            navigateBack = navHostController::popBackStack
+        )
+        accountGraph(
+            navigateBack = navHostController::popBackStack
+        )
+        feedGraph(
+            navigateToSearch = navHostController::navigateToSearch,
+            navigateToAuth = navHostController::navigateToAuth,
+            navigateToAccount = navHostController::navigateToAccount,
+            navigateToSettings = navHostController::navigateToSettings,
+            navigateToDetails = navHostController::navigateToDetails
+        )
+        detailsGraph(
+            navigateBack = navHostController::popBackStack,
+            navigateToGallery = navHostController::navigateToGallery
+        )
+        galleryGraph(
+            navigateBack = navHostController::popBackStack
+        )
+        searchGraph(
+            navigateBack = navHostController::popBackStack,
+            navigateToDetails = navHostController::navigateToDetails,
+        )
+        settingsGraph(
+            navigateBack = navHostController::popBackStack
+        )
+    }*/
 }
diff --git a/feature/account/src/desktopMain/kotlin/org/michaelbel/movies/account/AccountNavigation.kt b/feature/account/src/desktopMain/kotlin/org/michaelbel/movies/account/AccountNavigation.kt
@@ -1,5 +1,8 @@
 package org.michaelbel.movies.account
 
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.dialog
 import moe.tlaster.precompose.navigation.Navigator
 import moe.tlaster.precompose.navigation.RouteBuilder
 import org.michaelbel.movies.account.ui.AccountRoute
@@ -18,4 +21,20 @@ fun RouteBuilder.accountGraph(
             onBackClick = navigateBack
         )
     }
+}
+
+fun NavController.navigateToAccount() {
+    navigate(AccountDestination.route)
+}
+
+fun NavGraphBuilder.accountGraph(
+    navigateBack: () -> Unit
+) {
+    dialog(
+        route = AccountDestination.route
+    ) {
+        AccountRoute(
+            onBackClick = navigateBack
+        )
+    }
 }
diff --git a/feature/auth/src/desktopMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.kt b/feature/auth/src/desktopMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.kt
@@ -1,5 +1,8 @@
 package org.michaelbel.movies.auth
 
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.dialog
 import moe.tlaster.precompose.navigation.Navigator
 import moe.tlaster.precompose.navigation.RouteBuilder
 import org.michaelbel.movies.auth.ui.AuthRoute
@@ -18,4 +21,20 @@ fun RouteBuilder.authGraph(
             onBackClick = navigateBack
         )
     }
+}
+
+fun NavController.navigateToAuth() {
+    navigate(AuthDestination.route)
+}
+
+fun NavGraphBuilder.authGraph(
+    navigateBack: () -> Unit
+) {
+    dialog(
+        route = AuthDestination.route,
+    ) {
+        AuthRoute(
+            onBackClick = navigateBack
+        )
+    }
 }
diff --git a/feature/details/src/desktopMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.kt b/feature/details/src/desktopMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.kt
@@ -1,6 +1,9 @@
 package org.michaelbel.movies.details
 
 import androidx.compose.material.Text
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
 import moe.tlaster.precompose.navigation.Navigator
 import moe.tlaster.precompose.navigation.RouteBuilder
 
@@ -17,4 +20,19 @@ fun RouteBuilder.detailsGraph(
     ) {
         Text("details")
     }
+}
+
+fun NavController.navigateToDetails(movieList: String, movieId: Int) {
+    navigate("movie?movieList=$movieList&movieId=$movieId")
+}
+
+fun NavGraphBuilder.detailsGraph(
+    navigateBack: () -> Unit,
+    navigateToGallery: (Int) -> Unit
+) {
+    composable(
+        route = DetailsDestination.route
+    ) {
+        Text("details")
+    }
 }
diff --git a/feature/feed/src/desktopMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.kt b/feature/feed/src/desktopMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.kt
@@ -1,5 +1,7 @@
 package org.michaelbel.movies.feed
 
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
 import moe.tlaster.precompose.navigation.RouteBuilder
 import org.michaelbel.movies.feed.ui.FeedRoute
 
@@ -24,4 +26,24 @@ fun RouteBuilder.feedGraph(
             onNavigateToDetails = navigateToDetails
         )
     }
+}
+
+fun NavGraphBuilder.feedGraph(
+    navigateToSearch: () -> Unit,
+    navigateToAuth: () -> Unit,
+    navigateToAccount: () -> Unit,
+    navigateToSettings: () -> Unit,
+    navigateToDetails: (String, Int) -> Unit
+) {
+    composable(
+        route = FeedDestination.route
+    ) {
+        FeedRoute(
+            onNavigateToSearch = navigateToSearch,
+            onNavigateToAccount = navigateToAccount,
+            onNavigateToAuth = navigateToAuth,
+            onNavigateToSettings = navigateToSettings,
+            onNavigateToDetails = navigateToDetails
+        )
+    }
 }
diff --git a/feature/gallery/src/desktopMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.kt b/feature/gallery/src/desktopMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.kt
@@ -1,6 +1,9 @@
 package org.michaelbel.movies.gallery
 
 import androidx.compose.material.Text
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
 import moe.tlaster.precompose.navigation.Navigator
 import moe.tlaster.precompose.navigation.RouteBuilder
 
@@ -16,4 +19,18 @@ fun RouteBuilder.galleryGraph(
     ) {
         Text("gallery")
     }
+}
+
+fun NavController.navigateToGallery(movieId: Int) {
+    navigate("gallery/$movieId")
+}
+
+fun NavGraphBuilder.galleryGraph(
+    navigateBack: () -> Unit,
+) {
+    composable(
+        route = GalleryDestination.route
+    ) {
+        Text("gallery")
+    }
 }
diff --git a/feature/search/src/desktopMain/kotlin/org/michaelbel/movies/search/SearchNavigation.kt b/feature/search/src/desktopMain/kotlin/org/michaelbel/movies/search/SearchNavigation.kt
@@ -1,6 +1,9 @@
 package org.michaelbel.movies.search
 
 import androidx.compose.material.Text
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
 import moe.tlaster.precompose.navigation.Navigator
 import moe.tlaster.precompose.navigation.RouteBuilder
 
@@ -17,4 +20,19 @@ fun RouteBuilder.searchGraph(
     ) {
         Text("Feed")
     }
+}
+
+fun NavController.navigateToSearch() {
+    navigate(SearchDestination.route)
+}
+
+fun NavGraphBuilder.searchGraph(
+    navigateBack: () -> Unit,
+    navigateToDetails: (String, Int) -> Unit,
+) {
+    composable(
+        route = SearchDestination.route
+    ) {
+        Text("Feed")
+    }
 }
diff --git a/feature/settings/src/desktopMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.kt b/feature/settings/src/desktopMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.kt
@@ -1,5 +1,8 @@
 package org.michaelbel.movies.settings
 
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
 import moe.tlaster.precompose.navigation.Navigator
 import moe.tlaster.precompose.navigation.RouteBuilder
 import org.michaelbel.movies.settings.ui.SettingsRoute
@@ -18,4 +21,20 @@ fun RouteBuilder.settingsGraph(
             onBackClick = navigateBack
         )
     }
+}
+
+fun NavController.navigateToSettings() {
+    navigate(SettingsDestination.route)
+}
+
+fun NavGraphBuilder.settingsGraph(
+    navigateBack: () -> Unit
+) {
+    composable(
+        route = SettingsDestination.route
+    ) {
+        SettingsRoute(
+            onBackClick = navigateBack
+        )
+    }
 }