TodoApp. Update Decompose to 0.2.0, enable navigation animations. (#544)

JetBrains · Mar 29, 2021 · 1849838 · 1849838
1 parent 963ab0d
commit 1849838
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 27 deletions.
diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt
@@ -49,7 +49,7 @@ object Deps {
         }
 
         object Decompose {
-            private const val VERSION = "0.1.9"
+            private const val VERSION = "0.2.0"
             const val decompose = "com.arkivanov.decompose:decompose:$VERSION"
             const val decomposeIosX64 = "com.arkivanov.decompose:decompose-iosx64:$VERSION"
             const val decomposeIosArm64 = "com.arkivanov.decompose:decompose-iosarm64:$VERSION"

diff --git a/examples/todoapp/common/compose-ui/src/commonMain/kotlin/example/todo/common/ui/Crossfade.kt b/examples/todoapp/common/compose-ui/src/commonMain/kotlin/example/todo/common/ui/Crossfade.kt
diff --git a/...ples/todoapp/common/compose-ui/src/commonMain/kotlin/example/todo/common/ui/TodoRootUi.kt b/...ples/todoapp/common/compose-ui/src/commonMain/kotlin/example/todo/common/ui/TodoRootUi.kt
@@ -1,16 +1,17 @@
+@file:Suppress("EXPERIMENTAL_API_USAGE")
+
 package example.todo.common.ui
 
 import androidx.compose.runtime.Composable
 import com.arkivanov.decompose.extensions.compose.jetbrains.Children
+import com.arkivanov.decompose.extensions.compose.jetbrains.animation.child.crossfadeScale
 import example.todo.common.root.TodoRoot
 import example.todo.common.root.TodoRoot.Child
 
 @Composable
 fun TodoRootContent(component: TodoRoot) {
-    // Crossfade does not preserve UI state properly since (probably) 0.3.0-build146.
-    // Uncomment when https://issuetracker.google.com/u/1/issues/178729296 is fixed.
-    Children(routerState = component.routerState /*, animation = crossfade()*/) { child, _ ->
-        when (child) {
+    Children(routerState = component.routerState, animation = crossfadeScale()) {
+        when (val child = it.instance) {
             is Child.Main -> TodoMainContent(child.component)
             is Child.Edit -> TodoEditContent(child.component)
         }

diff --git a/...mmon/root/src/commonMain/kotlin/example/todo/common/root/integration/TodoRootComponent.kt b/...mmon/root/src/commonMain/kotlin/example/todo/common/root/integration/TodoRootComponent.kt
@@ -54,7 +54,7 @@ class TodoRootComponent internal constructor(
         router<Configuration, Child>(
             initialConfiguration = Configuration.Main,
             handleBackButton = true,
-            componentFactory = ::createChild
+            childFactory = ::createChild
         )
 
     override val routerState: Value<RouterState<*, Child>> = router.state

diff --git a/...pp/common/root/src/commonTest/kotlin/example/todo/common/root/integration/TodoRootTest.kt b/...pp/common/root/src/commonTest/kotlin/example/todo/common/root/integration/TodoRootTest.kt
@@ -51,7 +51,7 @@ class TodoRootTest {
             todoEdit = { _, itemId, output -> TodoEditFake(itemId, output) }
         )
 
-    private val TodoRoot.activeChild: Child get() = routerState.value.activeChild.component
+    private val TodoRoot.activeChild: Child get() = routerState.value.activeChild.instance
 
     private val Child.component: Any
         get() =