Merge pull request #5166 from element-hq/feature/fga/create_room_flow_rework

Create room flow rework

Author: bmarty

.maestro/tests/roomList/createAndDeleteRoom.yaml

@@ -3,18 +3,18 @@ appId: ${MAESTRO_APP_ID}
 # Purpose: Test the creation and deletion of a room
 - tapOn: "Create a new conversation or room"
 - tapOn: "New room"
-- tapOn: "Search for someone"
-- inputText: ${MAESTRO_INVITEE1_MXID}
-- tapOn:
-    text: ${MAESTRO_INVITEE1_MXID}
-    index: 1
-- tapOn: "Next"
 - tapOn: "e.g. your project name"
 - inputText: "aRoomName"
 - tapOn: "What is this room about?"
 - inputText: "aRoomTopic"
 - tapOn: "Create"
 - takeScreenshot: build/maestro/320-createAndDeleteRoom
+- tapOn: "Search for someone"
+- inputText: ${MAESTRO_INVITEE1_MXID}
+- tapOn:
+    text: ${MAESTRO_INVITEE1_MXID}
+    index: 1
+- tapOn: "Finish"
 - tapOn: "aRoomName"
 - tapOn: "Invite"
 # assert there's 1 member and 1 invitee

appnav/build.gradle.kts

@@ -65,6 +65,7 @@ dependencies {
     testImplementation(projects.features.rageshake.test)
     testImplementation(projects.services.appnavstate.test)
     testImplementation(projects.services.analytics.test)
+    testImplementation(projects.services.toolbox.test)
     testImplementation(libs.test.appyx.junit)
     testImplementation(libs.test.arch.core)
 }

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -46,7 +46,6 @@ import io.element.android.appnav.loggedin.SendQueues
 import io.element.android.appnav.room.RoomFlowNode
 import io.element.android.appnav.room.RoomNavigationTarget
 import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode
-import io.element.android.features.createroom.api.CreateRoomEntryPoint
 import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.features.ftue.api.FtueEntryPoint
 import io.element.android.features.ftue.api.state.FtueService
@@ -60,6 +59,7 @@ import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint
 import io.element.android.features.securebackup.api.SecureBackupEntryPoint
 import io.element.android.features.share.api.ShareEntryPoint
+import io.element.android.features.startchat.api.StartChatEntryPoint
 import io.element.android.features.userprofile.api.UserProfileEntryPoint
 import io.element.android.features.verifysession.api.IncomingVerificationEntryPoint
 import io.element.android.libraries.architecture.BackstackView
@@ -94,15 +94,6 @@ import java.time.Duration
 import java.time.Instant
 import java.util.Optional
 import java.util.UUID
-import kotlin.collections.List
-import kotlin.collections.any
-import kotlin.collections.emptyList
-import kotlin.collections.first
-import kotlin.collections.forEach
-import kotlin.collections.listOf
-import kotlin.collections.mapNotNull
-import kotlin.collections.plus
-import kotlin.collections.setOf
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toKotlinDuration
@@ -113,7 +104,7 @@ class LoggedInFlowNode @AssistedInject constructor(
     @Assisted plugins: List<Plugin>,
     private val homeEntryPoint: HomeEntryPoint,
     private val preferencesEntryPoint: PreferencesEntryPoint,
-    private val createRoomEntryPoint: CreateRoomEntryPoint,
+    private val startChatEntryPoint: StartChatEntryPoint,
     private val appNavigationStateService: AppNavigationStateService,
     private val secureBackupEntryPoint: SecureBackupEntryPoint,
     private val userProfileEntryPoint: UserProfileEntryPoint,
@@ -304,7 +295,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                         backstack.push(NavTarget.Settings())
                     }
 
-                    override fun onCreateRoomClick() {
+                    override fun onStartChatClick() {
                         backstack.push(NavTarget.CreateRoom)
                     }
 
@@ -422,7 +413,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                     .build()
             }
             NavTarget.CreateRoom -> {
-                val callback = object : CreateRoomEntryPoint.Callback {
+                val callback = object : StartChatEntryPoint.Callback {
                     override fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) {
                         backstack.replace(NavTarget.Room(roomIdOrAlias = roomIdOrAlias, serverNames = serverNames))
                     }
@@ -432,7 +423,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                     }
                 }
 
-                createRoomEntryPoint
+                startChatEntryPoint
                     .nodeBuilder(this, buildContext)
                     .callback(callback)
                     .build()

appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt

@@ -19,6 +19,7 @@ import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.services.apperror.api.AppErrorState
 import io.element.android.services.apperror.api.AppErrorStateService
 import io.element.android.services.apperror.impl.DefaultAppErrorStateService
+import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -42,7 +43,9 @@ class RootPresenterTest {
     @Test
     fun `present - passes app error state`() = runTest {
         val presenter = createRootPresenter(
-            appErrorService = DefaultAppErrorStateService().apply {
+            appErrorService = DefaultAppErrorStateService(
+                stringProvider = FakeStringProvider(),
+            ).apply {
                 showError("Bad news", "Something bad happened")
             }
         )
@@ -61,7 +64,9 @@ class RootPresenterTest {
     }
 
     private fun createRootPresenter(
-        appErrorService: AppErrorStateService = DefaultAppErrorStateService(),
+        appErrorService: AppErrorStateService = DefaultAppErrorStateService(
+            stringProvider = FakeStringProvider(),
+        ),
     ): RootPresenter {
         return RootPresenter(
             crashDetectionPresenter = { aCrashDetectionState() },

features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE files in the repository root for full details.
@@ -11,17 +11,17 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
-import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
+import io.element.android.libraries.matrix.api.core.RoomId
 
 interface CreateRoomEntryPoint : FeatureEntryPoint {
     fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+
     interface NodeBuilder {
         fun callback(callback: Callback): NodeBuilder
         fun build(): Node
     }
 
     interface Callback : Plugin {
-        fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>)
-        fun onOpenRoomDirectory()
+        fun onRoomCreated(roomId: RoomId)
     }
 }

features/createroom/impl/build.gradle.kts

@@ -1,4 +1,3 @@
-import extension.ComponentMergingStrategy
 import extension.setupAnvil
 
 /*
@@ -23,7 +22,7 @@ android {
     }
 }
 
-setupAnvil(componentMergingStrategy = ComponentMergingStrategy.KSP)
+setupAnvil()
 
 dependencies {
     implementation(projects.libraries.core)
@@ -41,6 +40,7 @@ dependencies {
     implementation(projects.services.analytics.api)
     implementation(libs.coil.compose)
     implementation(projects.libraries.featureflag.api)
+    implementation(projects.features.invitepeople.api)
     api(projects.features.createroom.api)
 
     testImplementation(libs.test.junit)
@@ -56,7 +56,7 @@ dependencies {
     testImplementation(projects.libraries.mediaupload.test)
     testImplementation(projects.libraries.permissions.test)
     testImplementation(projects.libraries.usersearch.test)
-    testImplementation(projects.features.createroom.test)
+    testImplementation(projects.features.startchat.test)
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.tests.testutils)
     testImplementation(libs.androidx.compose.ui.test.junit)

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/ConfigureRoomFlowNode.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE files in the repository root for full details.
@@ -8,28 +8,25 @@
 package io.element.android.features.createroom.impl
 
 import android.os.Parcelable
-import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.navigation.transition.JumpToEndTransitionHandler
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.operation.replace
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.features.createroom.DefaultCreateRoomNavigator
 import io.element.android.features.createroom.api.CreateRoomEntryPoint
-import io.element.android.features.createroom.impl.joinbyaddress.JoinRoomByAddressNode
-import io.element.android.features.createroom.impl.root.CreateRoomRootNode
+import io.element.android.features.createroom.impl.addpeople.AddPeopleNode
+import io.element.android.features.createroom.impl.configureroom.ConfigureRoomNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
-import io.element.android.libraries.architecture.OverlayView
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.RoomId
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(SessionScope::class)
@@ -38,53 +35,48 @@ class CreateRoomFlowNode @AssistedInject constructor(
     @Assisted plugins: List<Plugin>,
 ) : BaseFlowNode<CreateRoomFlowNode.NavTarget>(
     backstack = BackStack(
-        initialElement = NavTarget.Root,
+        initialElement = NavTarget.ConfigureRoom,
         savedStateMap = buildContext.savedStateMap,
     ),
     buildContext = buildContext,
     plugins = plugins
 ) {
-    sealed interface NavTarget : Parcelable {
-        @Parcelize
-        data object Root : NavTarget
-
-        @Parcelize
-        data object NewRoom : NavTarget
-
-        @Parcelize
-        data object JoinByAddress : NavTarget
+    private fun onRoomCreated(roomId: RoomId) {
+        plugins<CreateRoomEntryPoint.Callback>().forEach { it.onRoomCreated(roomId) }
     }
 
-    private val navigator = DefaultCreateRoomNavigator(
-        backstack = backstack,
-        overlay = overlay,
-        openRoom = { roomIdOrAlias, viaServers ->
-            plugins<CreateRoomEntryPoint.Callback>().forEach { it.onOpenRoom(roomIdOrAlias, viaServers) }
-        },
-        openRoomDirectory = {
-            plugins<CreateRoomEntryPoint.Callback>().forEach { it.onOpenRoomDirectory() }
-        }
-    )
-
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
-            NavTarget.Root -> {
-                createNode<CreateRoomRootNode>(buildContext = buildContext, plugins = listOf(navigator))
+            NavTarget.ConfigureRoom -> {
+                val callback = object : ConfigureRoomNode.Callback {
+                    override fun onCreateRoomSuccess(roomId: RoomId) {
+                        backstack.replace(NavTarget.AddPeople(roomId))
+                    }
+                }
+                createNode<ConfigureRoomNode>(buildContext, plugins = listOf(callback))
             }
-            NavTarget.NewRoom -> {
-                createNode<ConfigureRoomFlowNode>(buildContext = buildContext, plugins = listOf(navigator))
-            }
-            NavTarget.JoinByAddress -> {
-                createNode<JoinRoomByAddressNode>(buildContext = buildContext, plugins = listOf(navigator))
+            is NavTarget.AddPeople -> {
+                val inputs = AddPeopleNode.Inputs(navTarget.roomId)
+                val callback: AddPeopleNode.Callback = object : AddPeopleNode.Callback {
+                    override fun onFinish() {
+                        onRoomCreated(navTarget.roomId)
+                    }
+                }
+                createNode<AddPeopleNode>(buildContext, plugins = listOf(inputs, callback))
             }
         }
     }
 
     @Composable
     override fun View(modifier: Modifier) {
-        Box(modifier = modifier) {
-            BackstackView()
-            OverlayView(transitionHandler = remember { JumpToEndTransitionHandler() })
-        }
+        BackstackView()
+    }
+
+    sealed interface NavTarget : Parcelable {
+        @Parcelize
+        data object ConfigureRoom : NavTarget
+
+        @Parcelize
+        data class AddPeople(val roomId: RoomId) : NavTarget
     }
 }