Merge pull request #58 from vector-im/feature/bma/investigation

Add animation between screens

app/src/main/kotlin/io/element/android/x/MainActivity.kt

@@ -48,7 +48,7 @@ class MainActivity : NodeComponentActivity() {
                             buildContext = it,
                             appComponentOwner = applicationContext as DaggerComponentOwner,
                             authenticationService = appBindings.authenticationService(),
-                            rootPresenter = appBindings.rootPresenter()
+                            presenter = appBindings.rootPresenter()
                         )
                     }
                 }

app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt

@@ -32,16 +32,17 @@ import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.node.node
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.push
+import io.element.android.features.preferences.PreferencesFlowNode
+import io.element.android.features.roomlist.RoomListNode
+import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.DaggerComponentOwner
-import io.element.android.x.di.SessionComponent
-import io.element.android.features.preferences.PreferencesFlowNode
-import io.element.android.features.roomlist.RoomListNode
 import io.element.android.libraries.matrix.MatrixClient
 import io.element.android.libraries.matrix.core.RoomId
 import io.element.android.libraries.matrix.core.SessionId
 import io.element.android.libraries.matrix.ui.di.MatrixUIBindings
+import io.element.android.x.di.SessionComponent
 import kotlinx.parcelize.Parcelize
 
 class LoggedInFlowNode(
@@ -124,6 +125,11 @@ class LoggedInFlowNode(
 
     @Composable
     override fun View(modifier: Modifier) {
-        Children(navModel = backstack)
+        Children(
+            navModel = backstack,
+            modifier = modifier,
+            // Animate navigation to settings and to a room
+            transitionHandler = rememberDefaultTransitionHandler(),
+        )
     }
 }

app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt

@@ -26,9 +26,10 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.node.node
 import com.bumble.appyx.navmodel.backstack.BackStack
-import com.bumble.appyx.navmodel.backstack.operation.replace
+import com.bumble.appyx.navmodel.backstack.operation.push
 import io.element.android.features.login.LoginFlowNode
 import io.element.android.features.onboarding.OnBoardingScreen
+import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 
@@ -62,7 +63,7 @@ class NotLoggedInFlowNode(
         return when (navTarget) {
             NavTarget.OnBoarding -> node(buildContext) {
                 OnBoardingScreen(
-                    onSignIn = { backstack.replace(NavTarget.LoginFlow) }
+                    onSignIn = { backstack.push(NavTarget.LoginFlow) }
                 )
             }
             NavTarget.LoginFlow -> LoginFlowNode(buildContext)
@@ -71,6 +72,11 @@ class NotLoggedInFlowNode(
 
     @Composable
     override fun View(modifier: Modifier) {
-        Children(navModel = backstack)
+        Children(
+            navModel = backstack,
+            modifier = modifier,
+            // Animate navigation to login screen
+            transitionHandler = rememberDefaultTransitionHandler(),
+        )
     }
 }

app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt

@@ -25,12 +25,12 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.navmodel.backstack.BackStack
+import io.element.android.features.messages.MessagesNode
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.DaggerComponentOwner
-import io.element.android.x.di.RoomComponent
-import io.element.android.features.messages.MessagesNode
 import io.element.android.libraries.matrix.room.MatrixRoom
+import io.element.android.x.di.RoomComponent
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 
@@ -70,6 +70,9 @@ class RoomFlowNode(
 
     @Composable
     override fun View(modifier: Modifier) {
-        Children(navModel = backstack)
+        Children(
+            navModel = backstack,
+            modifier = modifier,
+        )
     }
 }

app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt

@@ -36,10 +36,11 @@ import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
+import io.element.android.features.rageshake.bugreport.BugReportNode
+import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.DaggerComponentOwner
-import io.element.android.features.rageshake.bugreport.BugReportNode
 import io.element.android.libraries.matrix.MatrixClient
 import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.core.SessionId
@@ -60,7 +61,7 @@ class RootFlowNode(
     ),
     private val appComponentOwner: DaggerComponentOwner,
     private val authenticationService: MatrixAuthenticationService,
-    rootPresenter: RootPresenter
+    presenter: RootPresenter
 ) :
     ParentNode<RootFlowNode.NavTarget>(
         navModel = backstack,
@@ -70,7 +71,7 @@ class RootFlowNode(
     DaggerComponentOwner by appComponentOwner {
 
     private val matrixClientsHolder = ConcurrentHashMap<SessionId, MatrixClient>()
-    private val presenterConnector = presenterConnector(rootPresenter)
+    private val presenterConnector = presenterConnector(presenter)
 
     override fun onBuilt() {
         super.onBuilt()
@@ -107,9 +108,14 @@ class RootFlowNode(
         val state by presenterConnector.stateFlow.collectAsState()
         RootView(
             state = state,
+            modifier = modifier,
             onOpenBugReport = this::onOpenBugReport,
         ) {
-            Children(navModel = backstack)
+            Children(
+                navModel = backstack,
+                // Animate opening the bug report screen
+                transitionHandler = rememberDefaultTransitionHandler(),
+            )
         }
     }