Using qualifier annotation for bindings of SelectUsersPresenter

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

@@ -16,9 +16,4 @@
 
 package io.element.android.features.createroom.impl.addpeople
 
-import io.element.android.libraries.matrix.ui.model.MatrixUser
-import kotlinx.collections.immutable.ImmutableList
-
-sealed interface AddPeopleEvents {
-    data class UpdateSelection(val users: ImmutableList<MatrixUser>) : AddPeopleEvents
-}
+sealed interface AddPeopleEvents

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

@@ -24,9 +24,9 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.SessionScope
 
-@ContributesNode(AppScope::class)
+@ContributesNode(SessionScope::class)
 class AddPeopleNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,

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

@@ -17,30 +17,28 @@
 package io.element.android.features.createroom.impl.addpeople
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import io.element.android.features.selectusers.api.MULTI_SELECTION_USERS_VARIANT
+import io.element.android.features.selectusers.api.SelectUsersPresenter
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.matrix.ui.model.MatrixUser
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
 import javax.inject.Inject
+import javax.inject.Named
 
 // TODO add unit tests
-class AddPeoplePresenter @Inject constructor() : Presenter<AddPeopleState> {
+class AddPeoplePresenter @Inject constructor(
+    @Named(MULTI_SELECTION_USERS_VARIANT)
+    private val selectUsersPresenter: SelectUsersPresenter,
+) : Presenter<AddPeopleState> {
 
     @Composable
     override fun present(): AddPeopleState {
-        val selectedUsers: MutableState<ImmutableList<MatrixUser>> = remember { mutableStateOf(persistentListOf(aMatrixUser("test"))) }
+        val selectUsersState = selectUsersPresenter.present()
 
         fun handleEvents(event: AddPeopleEvents) {
-            when (event) {
-                is AddPeopleEvents.UpdateSelection -> selectedUsers.value = event.users
-            }
+            // do nothing for now
         }
 
         return AddPeopleState(
-            selectedUsers = selectedUsers.value,
+            selectUsersState = selectUsersState,
             eventSink = ::handleEvents,
         )
     }

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

@@ -16,10 +16,9 @@
 
 package io.element.android.features.createroom.impl.addpeople
 
-import io.element.android.libraries.matrix.ui.model.MatrixUser
-import kotlinx.collections.immutable.ImmutableList
+import io.element.android.features.selectusers.api.SelectUsersState
 
 data class AddPeopleState(
-    val selectedUsers: ImmutableList<MatrixUser>,
+    val selectUsersState: SelectUsersState,
     val eventSink: (AddPeopleEvents) -> Unit,
 )

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

@@ -17,27 +17,31 @@
 package io.element.android.features.createroom.impl.addpeople
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.selectusers.api.aSelectUsersState
+import io.element.android.features.selectusers.api.aSetOfSelectedUsers
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.ui.model.MatrixUser
-import kotlinx.collections.immutable.persistentListOf
 
 open class AddPeopleStateProvider : PreviewParameterProvider<AddPeopleState> {
     override val values: Sequence<AddPeopleState>
         get() = sequenceOf(
             aAddPeopleState(),
             aAddPeopleState().copy(
-                selectedUsers = persistentListOf(
-                    aMatrixUser(userName = ""),
-                    aMatrixUser(userName = "User"),
-                    aMatrixUser(userName = "User with long name"),
-                )
+                selectUsersState = aSelectUsersState().copy(selectedUsers = aSetOfSelectedUsers())
+            ),
+            aAddPeopleState(isSearchActive = true),
+            aAddPeopleState(isSearchActive = true).copy(
+                selectUsersState = aSelectUsersState().copy(selectedUsers = aSetOfSelectedUsers())
             )
         )
 }
 
-fun aAddPeopleState() = AddPeopleState(
-    selectedUsers = persistentListOf(),
+fun aAddPeopleState(isSearchActive: Boolean = false) = AddPeopleState(
+    selectUsersState = aSelectUsersState().copy(
+        isMultiSelectionEnabled = true,
+        isSearchActive = isSearchActive,
+    ),
     eventSink = {}
 )
 

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

@@ -18,13 +18,10 @@ package io.element.android.features.createroom.impl.addpeople
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -32,6 +29,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import io.element.android.features.selectusers.api.SelectUsersView
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
@@ -49,13 +47,12 @@ fun AddPeopleView(
     onBackPressed: () -> Unit = {},
     onNextPressed: () -> Unit = {},
 ) {
-    var isSearchActive by rememberSaveable { mutableStateOf(false) }
     val eventSink = state.eventSink
 
     Scaffold(
         topBar = {
             AddPeopleViewTopBar(
-                hasSelectedUsers = state.selectedUsers.isNotEmpty(),
+                hasSelectedUsers = state.selectUsersState.selectedUsers.isNotEmpty(),
                 onBackPressed = onBackPressed,
                 onNextPressed = onNextPressed,
             )
@@ -66,7 +63,10 @@ fun AddPeopleView(
                 .fillMaxSize()
                 .padding(padding),
         ) {
-            // TODO use reusable searchUser bar with multi selection
+            SelectUsersView(
+                modifier = Modifier.fillMaxWidth(),
+                state = state.selectUsersState,
+            )
         }
     }
 }

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

@@ -17,19 +17,22 @@
 package io.element.android.features.createroom.impl.root
 
 import androidx.compose.runtime.Composable
-import io.element.android.features.selectusers.api.SelectSingleUserPresenter
+import io.element.android.features.selectusers.api.SINGLE_SELECTION_USERS_VARIANT
+import io.element.android.features.selectusers.api.SelectUsersPresenter
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.ui.model.MatrixUser
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Named
 
 class CreateRoomRootPresenter @Inject constructor(
-    private val selectSingleUserPresenter: SelectSingleUserPresenter,
+    @Named(SINGLE_SELECTION_USERS_VARIANT)
+    private val selectUsersPresenter: SelectUsersPresenter,
 ) : Presenter<CreateRoomRootState> {
 
     @Composable
     override fun present(): CreateRoomRootState {
-        val selectUsersState = selectSingleUserPresenter.present()
+        val selectUsersState = selectUsersPresenter.present()
 
         fun handleEvents(event: CreateRoomRootEvents) {
             when (event) {

features/selectusers/api/src/main/kotlin/io/element/android/features/selectusers/api/SelectUsersPresenter.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 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.selectusers.api
+
+import io.element.android.libraries.architecture.Presenter
+
+const val SINGLE_SELECTION_USERS_VARIANT = "single_selection_users"
+const val MULTI_SELECTION_USERS_VARIANT = "multi_selection_users"
+
+interface SelectUsersPresenter : Presenter<SelectUsersState>

features/selectusers/impl/src/main/kotlin/io/element/android/features/selectusers/impl/DefaultSelectMultipleUsersPresenter.kt

@@ -17,17 +17,18 @@
 package io.element.android.features.selectusers.impl
 
 import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.features.selectusers.api.SelectMultipleUsersPresenter
+import io.element.android.features.selectusers.api.MULTI_SELECTION_USERS_VARIANT
+import io.element.android.features.selectusers.api.SelectUsersPresenter
 import io.element.android.libraries.di.SessionScope
 import javax.inject.Inject
+import javax.inject.Named
 
 // TODO add unit tests
 @ContributesBinding(
     scope = SessionScope::class,
-    boundType = SelectMultipleUsersPresenter::class,
+    boundType = SelectUsersPresenter::class
 )
+@Named(MULTI_SELECTION_USERS_VARIANT)
 class DefaultSelectMultipleUsersPresenter @Inject constructor() :
-    DefaultSelectUsersPresenter,
-    SelectMultipleUsersPresenter {
-    override val isMultiSelectionEnabled: Boolean = true
-}
+    SelectUsersPresenter by DefaultSelectUsersPresenter(isMultiSelectionEnabled = true)
+

features/selectusers/impl/src/main/kotlin/io/element/android/features/selectusers/impl/DefaultSelectSingleUserPresenter.kt

@@ -17,16 +17,16 @@
 package io.element.android.features.selectusers.impl
 
 import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.features.selectusers.api.SelectSingleUserPresenter
+import io.element.android.features.selectusers.api.SINGLE_SELECTION_USERS_VARIANT
+import io.element.android.features.selectusers.api.SelectUsersPresenter
 import io.element.android.libraries.di.SessionScope
 import javax.inject.Inject
+import javax.inject.Named
 
 @ContributesBinding(
     scope = SessionScope::class,
-    boundType = SelectSingleUserPresenter::class,
+    boundType = SelectUsersPresenter::class
 )
+@Named(SINGLE_SELECTION_USERS_VARIANT)
 class DefaultSelectSingleUserPresenter @Inject constructor() :
-    DefaultSelectUsersPresenter,
-    SelectSingleUserPresenter {
-    override val isMultiSelectionEnabled: Boolean = false
-}
+    SelectUsersPresenter by DefaultSelectUsersPresenter(isMultiSelectionEnabled = false)

features/selectusers/impl/src/main/kotlin/io/element/android/features/selectusers/impl/DefaultSelectUsersPresenter.kt

@@ -25,8 +25,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import io.element.android.features.selectusers.api.SelectUsersEvents
+import io.element.android.features.selectusers.api.SelectUsersPresenter
 import io.element.android.features.selectusers.api.SelectUsersState
-import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.core.MatrixPatterns
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.ui.model.MatrixUser
@@ -37,9 +37,7 @@ import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 
-interface DefaultSelectUsersPresenter : Presenter<SelectUsersState> {
-
-    val isMultiSelectionEnabled: Boolean
+class DefaultSelectUsersPresenter(private val isMultiSelectionEnabled: Boolean) : SelectUsersPresenter {
 
     @Composable
     override fun present(): SelectUsersState {