feat: Make it work

Author: TEYSSANDIER Raphael

FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/App.kt

@@ -96,8 +96,15 @@ fun App() {
                 }
             }
 
-            FloconNavigation {
-                networkNavigation()
+            FloconSurface(
+                modifier = Modifier.fillMaxSize()
+            ) {
+                FloconNavigation(
+                    navigationState = navigationState,
+                    modifier = Modifier.fillMaxSize()
+                ) {
+                    networkNavigation()
+                }
             }
 //            Box(
 //                Modifier

FloconDesktop/gradle/libs.versions.toml

@@ -37,7 +37,7 @@ buildconfig = "5.6.8"
 paging = "3.3.2"
 
 # TODO Sort
-nav3Core = "1.0.0-alpha10"
+nav3Core = "1.0.0+dev3004"
 navEvent = "1.0.0-alpha09"
 lifecycleViewmodelNav3 = "2.10.0-alpha04"
 kotlinxSerializationCore = "1.8.1"
@@ -95,8 +95,8 @@ other-jsontree = { module = "com.sebastianneubauer.jsontree:jsontree", version.r
 ui-tooling-preview-desktop = { module = "org.jetbrains.compose.ui:ui-tooling-preview-desktop", version.ref = "uiToolingPreviewDesktop" }
 
 # TODO Sort
-androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "nav3Core" }
-androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "nav3Core" }
+#compose-navigation3-runtime = { module = "org.jetbrains.androidx.navigation3:navigation3-runtime", version.ref = "nav3Core" }
+compose-navigation3-ui = { module = "org.jetbrains.androidx.navigation3:navigation3-ui", version.ref = "nav3Core" }
 
 androidx-navigationevent-core = { group = "androidx.navigationevent", name = "navigationevent", version.ref = "navEvent" }
 androidx-navigationevent-compose = { group = "androidx.navigationevent", name = "navigationevent-compose", version.ref = "navEvent" }

FloconDesktop/library/designsystem/build.gradle.kts

@@ -32,8 +32,8 @@ kotlin {
                 api(compose.components.uiToolingPreview)
                 api(libs.other.jsontree)
 
-                api(libs.androidx.navigation3.ui)
-                api(libs.androidx.navigation3.runtime)
+                api(libs.compose.navigation3.ui)
+//                api(libs.compose.navigation3.runtime)
 
                 // Not KMP yet
 //                api(libs.androidx.lifecycle.viewmodel.navigation3)

FloconDesktop/navigation/src/commonMain/kotlin/io/github/openflocon/navigation/FloconNavigation.kt

@@ -1,46 +1,55 @@
 package io.github.openflocon.navigation
 
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.navigation3.runtime.EntryProviderBuilder
 import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
+import androidx.navigation3.scene.rememberSceneSetupNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import androidx.navigationevent.NavigationEventDispatcher
 import androidx.navigationevent.NavigationEventDispatcherOwner
 import androidx.navigationevent.compose.LocalNavigationEventDispatcherOwner
 import androidx.navigationevent.compose.NavigationEventDispatcherOwner
-import org.koin.compose.koinInject
 
 @Composable
 fun FloconNavigation(
+    navigationState: FloconNavigationState,
+    modifier: Modifier = Modifier,
     builder: EntryProviderBuilder<FloconRoute>.() -> Unit
 ) {
-    val navigationState = koinInject<FloconNavigationState>()
     val dispatcher = remember { NavigationEventDispatcher() }
     val parent = remember {
         object : NavigationEventDispatcherOwner {
             override val navigationEventDispatcher: NavigationEventDispatcher = dispatcher
         }
     }
-    
+
     LocalNavigationEventDispatcherOwner.provides(parent)
 
     NavigationEventDispatcherOwner(parent = parent) {
         NavDisplay(
             backStack = navigationState.stack,
+            transitionSpec = { fadeIn() togetherWith fadeOut() },
+            popTransitionSpec = { fadeIn() togetherWith fadeOut() },
+            predictivePopTransitionSpec = { fadeIn() togetherWith fadeOut() },
             entryDecorators = listOf(
-//                rememberSceneSetupNavEntryDecorator(),
-//                rememberSavedStateNavEntryDecorator()
+                rememberSceneSetupNavEntryDecorator(),
+                rememberSavedStateNavEntryDecorator()
             ),
             onBack = { navigationState.back(it) },
             entryProvider = entryProvider {
                 entry<LoadingRoute> {
                     Box(Modifier)
                 }
                 builder()
-            }
+            },
+            modifier = modifier
         )
     }
 }

FloconDesktop/navigation/src/commonMain/kotlin/io/github/openflocon/navigation/FloconNavigationState.kt

@@ -1,8 +1,10 @@
 package io.github.openflocon.navigation
 
+import androidx.compose.runtime.mutableStateListOf
+
 class FloconNavigationState internal constructor() {
 
-    private val _stack = mutableListOf<FloconRoute>(LoadingRoute)
+    private val _stack = mutableStateListOf<FloconRoute>(LoadingRoute)
     val stack: List<FloconRoute> = _stack
 
     fun navigate(route: FloconRoute) {

FloconDesktop/settings.gradle.kts

@@ -11,6 +11,7 @@ pluginManagement {
             }
         }
         mavenCentral()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         gradlePluginPortal()
     }
 }
@@ -24,6 +25,7 @@ dependencyResolutionManagement {
                 includeGroupAndSubgroups("com.google")
             }
         }
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         mavenCentral()
     }
 }