Room directory : start branching join event

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

@@ -389,7 +389,7 @@ class LoggedInFlowNode @AssistedInject constructor(
             NavTarget.RoomDirectorySearch -> {
                 roomDirectoryEntryPoint.nodeBuilder(this, buildContext)
                     .callback(object : RoomDirectoryEntryPoint.Callback {
-                        override fun onRoomJoined(roomId: RoomId) {
+                        override fun onJoinRoom(roomId: RoomId) {
                             coroutineScope.launch { attachRoom(roomId) }
                         }
                     })

features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDirectoryEntryPoint.kt

@@ -32,7 +32,7 @@ interface RoomDirectoryEntryPoint : FeatureEntryPoint {
     }
 
     interface Callback : Plugin {
-        fun onRoomJoined(roomId: RoomId)
+        fun onJoinRoom(roomId: RoomId)
     }
 }
 

features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPoint.kt

@@ -21,6 +21,7 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint
+import io.element.android.features.roomdirectory.impl.root.RoomDirectoryNode
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.AppScope
 import javax.inject.Inject
@@ -39,7 +40,7 @@ class DefaultRoomDirectoryEntryPoint @Inject constructor() : RoomDirectoryEntryP
             }
 
             override fun build(): Node {
-                return parentNode.createNode<RoomDirectoryFlowNode>(buildContext, plugins)
+                return parentNode.createNode<RoomDirectoryNode>(buildContext, plugins)
             }
         }
     }

features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/RoomDirectoryFlowNode.kt

@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2024 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.features.roomdirectory.impl
-
-import android.os.Parcelable
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.navmodel.backstack.BackStack
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
-import io.element.android.features.roomdirectory.impl.root.RoomDirectoryNode
-import io.element.android.libraries.architecture.BackstackView
-import io.element.android.libraries.architecture.BaseFlowNode
-import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.SessionScope
-import kotlinx.parcelize.Parcelize
-
-@ContributesNode(SessionScope::class)
-class RoomDirectoryFlowNode @AssistedInject constructor(
-    @Assisted buildContext: BuildContext,
-    @Assisted plugins: List<Plugin>,
-) : BaseFlowNode<RoomDirectoryFlowNode.NavTarget>(
-    backstack = BackStack(
-        initialElement = NavTarget.Root,
-        savedStateMap = buildContext.savedStateMap,
-    ),
-    buildContext = buildContext,
-    plugins = plugins,
-) {
-
-    sealed interface NavTarget : Parcelable {
-        @Parcelize
-        data object Root : NavTarget
-    }
-
-    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
-        return when (navTarget) {
-            NavTarget.Root -> {
-                createNode<RoomDirectoryNode>(buildContext)
-            }
-        }
-    }
-
-    @Composable
-    override fun View(modifier: Modifier) {
-        BackstackView()
-    }
-}

features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryEvents.kt

@@ -16,10 +16,7 @@
 
 package io.element.android.features.roomdirectory.impl.root
 
-import io.element.android.libraries.matrix.api.core.RoomId
-
 sealed interface RoomDirectoryEvents {
     data class Search(val query: String) : RoomDirectoryEvents
     data object LoadMore : RoomDirectoryEvents
-    data class JoinRoom(val roomId: RoomId) : RoomDirectoryEvents
 }

features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryNode.kt

@@ -21,10 +21,13 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
+import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
+import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint
 import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.RoomId
 
 @ContributesNode(SessionScope::class)
 class RoomDirectoryNode @AssistedInject constructor(
@@ -33,11 +36,18 @@ class RoomDirectoryNode @AssistedInject constructor(
     private val presenter: RoomDirectoryPresenter,
 ) : Node(buildContext, plugins = plugins) {
 
+    private fun onJoinRoom(roomId: RoomId) {
+        plugins<RoomDirectoryEntryPoint.Callback>().forEach {
+            it.onJoinRoom(roomId)
+        }
+    }
+
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         RoomDirectoryView(
             state = state,
+            onJoinRoom = ::onJoinRoom,
             onBackPressed = ::navigateUp,
             modifier = modifier
         )

features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt

@@ -28,20 +28,20 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import io.element.android.features.roomdirectory.impl.root.model.toUiModel
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryList
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryService
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class RoomDirectoryPresenter @Inject constructor(
-    private val client: MatrixClient,
+    private val dispatchers: CoroutineDispatchers,
-    private val roomDirectoryService: RoomDirectoryService,
+    roomDirectoryService: RoomDirectoryService,
 ) : Presenter<RoomDirectoryState> {
 
     private val roomDirectoryList = roomDirectoryService.createRoomDirectoryList()
@@ -62,9 +62,6 @@ class RoomDirectoryPresenter @Inject constructor(
         }
         fun handleEvents(event: RoomDirectoryEvents) {
             when (event) {
-                is RoomDirectoryEvents.JoinRoom -> {
-                    //coroutineScope.joinRoom(event.roomId)
-                }
                 RoomDirectoryEvents.LoadMore -> {
                     coroutineScope.launch {
                         roomDirectoryList.loadMore()
@@ -90,6 +87,6 @@ class RoomDirectoryPresenter @Inject constructor(
             list
                 .map { roomDescription -> roomDescription.toUiModel() }
                 .toImmutableList()
-        }.flowOn(Dispatchers.Default)
+        }.flowOn(dispatchers.computation)
     }.collectAsState(persistentListOf())
 }

features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt

@@ -67,6 +67,7 @@ import kotlinx.collections.immutable.ImmutableList
 fun RoomDirectoryView(
     state: RoomDirectoryState,
     onBackPressed: () -> Unit,
+    onJoinRoom: (RoomId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
@@ -77,12 +78,10 @@ fun RoomDirectoryView(
         content = { padding ->
             RoomDirectoryContent(
                 state = state,
-                onResultClicked = { roomId ->
+                onResultClicked = onJoinRoom,
-                    state.eventSink(RoomDirectoryEvents.JoinRoom(roomId))
-                },
                 modifier = Modifier
-                        .padding(padding)
+                    .padding(padding)
-                        .consumeWindowInsets(padding)
+                    .consumeWindowInsets(padding)
             )
         }
     )
@@ -171,10 +170,10 @@ private fun RoomDirectoryRoomList(
 @Composable
 private fun LoadMoreIndicator(modifier: Modifier = Modifier) {
     Box(
-            modifier
+        modifier
-                    .fillMaxWidth()
+            .fillMaxWidth()
-                    .wrapContentHeight()
+            .wrapContentHeight()
-                    .padding(8.dp),
+            .padding(8.dp),
         contentAlignment = Alignment.Center,
     ) {
         CircularProgressIndicator(
@@ -244,14 +243,14 @@ private fun RoomDirectoryRoomRow(
 ) {
     Row(
         modifier = modifier
-                .fillMaxWidth()
+            .fillMaxWidth()
-                .clickable { onClick(roomDescription.roomId) }
+            .clickable { onClick(roomDescription.roomId) }
-                .padding(
+            .padding(
-                        top = 12.dp,
+                top = 12.dp,
-                        bottom = 12.dp,
+                bottom = 12.dp,
-                        start = 16.dp,
+                start = 16.dp,
-                )
+            )
-                .height(IntrinsicSize.Min),
+            .height(IntrinsicSize.Min),
     ) {
         Avatar(
             avatarData = roomDescription.avatarData,
@@ -259,8 +258,8 @@ private fun RoomDirectoryRoomRow(
         )
         Column(
             modifier = Modifier
-                    .weight(1f)
+                .weight(1f)
-                    .padding(start = 16.dp)
+                .padding(start = 16.dp)
         ) {
             Text(
                 text = roomDescription.name,
@@ -282,8 +281,8 @@ private fun RoomDirectoryRoomRow(
                 text = stringResource(id = CommonStrings.action_join),
                 color = ElementTheme.colors.textSuccessPrimary,
                 modifier = Modifier
-                        .align(Alignment.CenterVertically)
+                    .align(Alignment.CenterVertically)
-                        .padding(start = 4.dp, end = 12.dp)
+                    .padding(start = 4.dp, end = 12.dp)
             )
         } else {
             Spacer(modifier = Modifier.width(24.dp))
@@ -296,6 +295,7 @@ private fun RoomDirectoryRoomRow(
 fun RoomDirectorySearchViewLightPreview(@PreviewParameter(RoomDirectorySearchStateProvider::class) state: RoomDirectoryState) = ElementPreview {
     RoomDirectoryView(
         state = state,
+        onJoinRoom = {},
         onBackPressed = {},
     )
 }