Navigation multiplatform (#308)

michaelbel · May 5, 2024 · 5c4e6a9 · 5c4e6a9
1 parent b18b49d
commit 5c4e6a9
Show file tree

Hide file tree

Showing 23 changed files with 102 additions and 220 deletions.
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -19,8 +19,6 @@ kotlin {
             api(libs.bundles.koin.common)
             implementation(compose.material3)
             implementation(libs.bundles.kotlinx.coroutines.common)
-            /*implementation(libs.bundles.compose.viewmodel.common)*/
-            implementation(libs.bundles.paging.common)
         }
         androidMain.dependencies {
             api(libs.bundles.kotlinx.coroutines.android)
@@ -34,6 +32,7 @@ kotlin {
             api(libs.bundles.koin.compose.work.android)
             implementation(libs.bundles.appcompat.android)
             implementation(libs.bundles.browser.android)
+            implementation(libs.bundles.paging.common) // fixme ломает navigation
         }
         val desktopMain by getting
         desktopMain.dependencies {

diff --git a/core/interactor/build.gradle.kts b/core/interactor/build.gradle.kts
@@ -21,7 +21,7 @@ kotlin {
             implementation(compose.runtime)
             implementation(compose.runtimeSaveable)
             implementation(libs.bundles.kotlinx.coroutines.common)
-            implementation(libs.bundles.paging.common)
+            implementation(libs.bundles.room.paging.common)
         }
     }
 }

diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts
@@ -20,7 +20,7 @@ kotlin {
         val desktopMain by getting
         desktopMain.dependencies {
             api(libs.bundles.compose.navigation.common)
-            api(libs.bundles.precompose.desktop)
+            api(libs.bundles.compose.viewmodel.common)
         }
     }
 }

diff --git a/core/persistence/build.gradle.kts b/core/persistence/build.gradle.kts
@@ -20,7 +20,6 @@ kotlin {
             api(project(":core:common"))
             api(project(":core:network"))
             implementation(libs.bundles.datastore.common)
-            implementation(libs.bundles.paging.common)
             implementation(libs.bundles.room.common)
             implementation(libs.bundles.sqlite.common)
             implementation(libs.bundles.okio.common)

diff --git a/core/repository/build.gradle.kts b/core/repository/build.gradle.kts
@@ -17,7 +17,7 @@ kotlin {
         commonMain.dependencies {
             api(project(":core:persistence"))
             implementation(libs.bundles.kotlinx.coroutines.common)
-            implementation(libs.bundles.paging.common)
+            implementation(libs.bundles.room.paging.common)
         }
     }
 }

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -23,9 +23,8 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             implementation(project(":core:persistence"))
-            implementation(libs.bundles.paging.common)
-            implementation(libs.bundles.constraintlayout.common)
             implementation(libs.bundles.coil.common)
+            implementation(libs.bundles.constraintlayout.common)
             implementation(compose.components.resources)
             implementation(compose.foundation)
             implementation(compose.material)
@@ -43,6 +42,7 @@ kotlin {
             api(libs.bundles.coil.android)
             api(libs.bundles.compose.android)
             api(libs.bundles.google.material.android)
+            implementation(libs.bundles.paging.common) // fixme ломает navigation
         }
     }
 }

diff --git a/core/work/build.gradle.kts b/core/work/build.gradle.kts
@@ -18,7 +18,6 @@ kotlin {
             implementation(project(":core:interactor"))
             implementation(project(":core:notifications"))
             implementation(libs.bundles.kotlinx.serialization.common)
-            implementation(libs.bundles.paging.common)
         }
         androidMain.dependencies {
             implementation(libs.bundles.work.android)

diff --git a/desktopApp/src/jvmMain/kotlin/org/michaelbel/movies/MainWindowContent.kt b/desktopApp/src/jvmMain/kotlin/org/michaelbel/movies/MainWindowContent.kt
@@ -1,8 +1,9 @@
 package org.michaelbel.movies
 
 import androidx.compose.runtime.Composable
-import moe.tlaster.precompose.navigation.NavHost
-import moe.tlaster.precompose.navigation.rememberNavigator
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.rememberNavController
 import org.michaelbel.movies.account.accountGraph
 import org.michaelbel.movies.account.navigateToAccount
 import org.michaelbel.movies.auth.authGraph
@@ -18,44 +19,10 @@ import org.michaelbel.movies.settings.navigateToSettings
 import org.michaelbel.movies.settings.settingsGraph
 
 @Composable
-internal fun MainWindowContent() {
-    val navHostController = rememberNavigator()
-
+internal fun MainWindowContent(
+    navHostController: NavHostController = rememberNavController()
+) {
     NavHost(
-        navigator = navHostController,
-        initialRoute = "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
-        )
-    }
-
-    /*val navHostController: NavHostController = rememberNavController()
-    androidx.navigation.compose.NavHost(
         navController = navHostController,
         startDestination = "feed"
     ) {
@@ -86,5 +53,5 @@ internal fun MainWindowContent() {
         settingsGraph(
             navigateBack = navHostController::popBackStack
         )
-    }*/
+    }
 }
diff --git a/desktopApp/src/jvmMain/kotlin/org/michaelbel/movies/MoviesDesktop.kt b/desktopApp/src/jvmMain/kotlin/org/michaelbel/movies/MoviesDesktop.kt
@@ -1,35 +1,66 @@
 package org.michaelbel.movies
 
-import androidx.compose.ui.window.singleWindowApplication
-import moe.tlaster.precompose.PreComposeApp
-import org.koin.core.context.startKoin
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.window.Window
+import androidx.compose.ui.window.application
+import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import org.michaelbel.movies.common.ThemeData
 import org.michaelbel.movies.common.theme.AppTheme
-import org.michaelbel.movies.di.appKoinModule
 import org.michaelbel.movies.ui.theme.MoviesTheme
 
-fun main() {
-    startKoin {
-        modules(appKoinModule)
+fun main() = application {
+    Window(onCloseRequest = ::exitApplication, title = "Movies") {
+        App()
     }
+}
 
-    singleWindowApplication(
-        title = "Movies",
-        icon = null
+@Composable
+private fun App() = withViewModelStoreOwner {
+    MoviesTheme(
+        themeData = ThemeData(
+            appTheme = AppTheme.FollowSystem,
+            dynamicColors = false,
+            paletteKey = 0,
+            seedColor = 0
+        ),
+        theme = AppTheme.FollowSystem,
+        enableEdgeToEdge = { _,_ -> }
     ) {
-        PreComposeApp {
-            MoviesTheme(
-                themeData = ThemeData(
-                    appTheme = AppTheme.FollowSystem,
-                    dynamicColors = false,
-                    paletteKey = 0,
-                    seedColor = 0
-                ),
-                theme = AppTheme.FollowSystem,
-                enableEdgeToEdge = { _,_ -> }
-            ) {
-                MainWindowContent()
-            }
-        }
+        MainWindowContent()
+    }
+}
+
+private class ComposeViewModelStoreOwner: ViewModelStoreOwner {
+    override val viewModelStore = ViewModelStore()
+    fun dispose() { viewModelStore.clear() }
+}
+
+@Composable
+private fun rememberComposeViewModelStoreOwner(): ViewModelStoreOwner {
+    val viewModelStoreOwner = remember { ComposeViewModelStoreOwner() }
+    DisposableEffect(viewModelStoreOwner) {
+        onDispose { viewModelStoreOwner.dispose() }
+    }
+    return viewModelStoreOwner
+}
+
+@Composable
+internal fun withViewModelStoreOwner(content: @Composable () -> Unit) {
+    if (LocalViewModelStoreOwner.current != null) {
+        // Normal case: use system-provided owner
+        content()
+    } else {
+        // Fallback case: use ViewModelStoreOwner with scope of this composable.
+        // It's required for Compose Multiplatform for now because it's not providing default value yet.
+        // Expected to be fixed in Compose Multiplatform 1.7.0
+        CompositionLocalProvider(
+            LocalViewModelStoreOwner provides rememberComposeViewModelStoreOwner(),
+            content = content
+        )
     }
 }
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
@@ -3,26 +3,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
 
-fun Navigator.navigateToAccount() {
-    navigate(AccountDestination.route)
-}
-
-fun RouteBuilder.accountGraph(
-    navigateBack: () -> Unit
-) {
-    dialog(
-        route = AccountDestination.route
-    ) {
-        AccountRoute(
-            onBackClick = navigateBack
-        )
-    }
-}
-
 fun NavController.navigateToAccount() {
     navigate(AccountDestination.route)
 }

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
@@ -3,26 +3,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
 
-fun Navigator.navigateToAuth() {
-    navigate(AuthDestination.route)
-}
-
-fun RouteBuilder.authGraph(
-    navigateBack: () -> Unit
-) {
-    dialog(
-        route = AuthDestination.route,
-    ) {
-        AuthRoute(
-            onBackClick = navigateBack
-        )
-    }
-}
-
 fun NavController.navigateToAuth() {
     navigate(AuthDestination.route)
 }

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,29 +1,14 @@
 package org.michaelbel.movies.details
 
+import androidx.compose.foundation.clickable
 import androidx.compose.material.Text
+import androidx.compose.ui.Modifier
 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.persistence.database.typealiases.MovieId
 import org.michaelbel.movies.persistence.database.typealiases.PagingKey
 
-fun Navigator.navigateToDetails(pagingKey: PagingKey, movieId: MovieId) {
-    navigate("movie?movieList=$pagingKey&movieId=$movieId")
-}
-
-fun RouteBuilder.detailsGraph(
-    navigateBack: () -> Unit,
-    navigateToGallery: (MovieId) -> Unit
-) {
-    scene(
-        route = DetailsDestination.route
-    ) {
-        Text("details")
-    }
-}
-
 fun NavController.navigateToDetails(pagingKey: PagingKey, movieId: MovieId) {
     navigate("movie?movieList=$pagingKey&movieId=$movieId")
 }
@@ -35,6 +20,9 @@ fun NavGraphBuilder.detailsGraph(
     composable(
         route = DetailsDestination.route
     ) {
-        Text("details")
+        Text(
+            text = "Details",
+            modifier = Modifier.clickable { navigateBack() }
+        )
     }
 }
diff --git a/feature/feed-impl/build.gradle.kts b/feature/feed-impl/build.gradle.kts
@@ -22,15 +22,17 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:navigation"))
-            api(project(":core:platform-services:interactor"))
             api(project(":core:ui"))
             api(project(":core:common"))
+            api(project(":core:navigation"))
             api(project(":core:interactor"))
             implementation(project(":core:notifications"))
-            implementation(libs.bundles.paging.common)
+            api(project(":core:platform-services:interactor"))
             implementation(libs.bundles.constraintlayout.common)
         }
+        androidMain.dependencies {
+            implementation(libs.bundles.paging.common) // fixme ломает navigation
+        }
         val desktopMain by getting
         desktopMain.dependencies {
             implementation(compose.foundation)

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
@@ -2,32 +2,8 @@ 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
 
-fun RouteBuilder.feedGraph(
-    navigateToSearch: () -> Unit,
-    navigateToAuth: () -> Unit,
-    navigateToAccount: () -> Unit,
-    navigateToSettings: () -> Unit,
-    navigateToDetails: (String, Int) -> Unit
-) {
-    scene(
-        route = FeedDestination.route,
-        deepLinks = listOf(
-            "movies://redirect_url?request_token={request_token}&approved={approved}"
-        )
-    ) {
-        FeedRoute(
-            onNavigateToSearch = navigateToSearch,
-            onNavigateToAccount = navigateToAccount,
-            onNavigateToAuth = navigateToAuth,
-            onNavigateToSettings = navigateToSettings,
-            onNavigateToDetails = navigateToDetails
-        )
-    }
-}
-
 fun NavGraphBuilder.feedGraph(
     navigateToSearch: () -> Unit,
     navigateToAuth: () -> Unit,