Create a reusable selectusers feature module

2023-03-14 17:27:41 +01:00 · 2023-03-14 17:27:41 +01:00 · 31f8c92b58
commit 31f8c92b58
parent de05c761ce
17 changed files with 579 additions and 82 deletions
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt
@ -28,8 +28,8 @@ import com.bumble.appyx.navmodel.backstack.operation.push
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
+import io.element.android.features.createroom.impl.addpeople.AddPeopleNode
 import io.element.android.features.createroom.impl.root.CreateRoomRootNode
-import io.element.android.features.createroom.impl.selectusers.SelectUsersNode
 import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.createNode
@ -67,7 +67,7 @@ class CreateRoomFlowNode @AssistedInject constructor(
                }
                createNode<CreateRoomRootNode>(buildContext, plugins = listOf(callback))
            }
-            NavTarget.NewRoom -> createNode<SelectUsersNode>(buildContext)
+            NavTarget.NewRoom -> createNode<AddPeopleNode>(buildContext)
        }
    }

--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersEvents.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersEvents.kt
@ -14,11 +14,11 @@
 * limitations under the License.
 */

-package io.element.android.features.createroom.impl.selectusers
+package io.element.android.features.createroom.impl.addpeople

 import io.element.android.libraries.matrix.ui.model.MatrixUser
+import kotlinx.collections.immutable.ImmutableList

-sealed interface SelectUsersEvents {
-    data class AddToSelection(val matrixUser: MatrixUser) : SelectUsersEvents
-    data class RemoveFromSelection(val matrixUser: MatrixUser) : SelectUsersEvents
+sealed interface AddPeopleEvents {
+    data class UpdateSelection(val users: ImmutableList<MatrixUser>) : AddPeopleEvents
 }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersNode.kt
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package io.element.android.features.createroom.impl.selectusers
+package io.element.android.features.createroom.impl.addpeople

 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@ -27,16 +27,16 @@ import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.di.AppScope

@ContributesNode(AppScope::class)
-class SelectUsersNode @AssistedInject constructor(
+class AddPeopleNode @AssistedInject constructor(
    @Assisted buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
-    private val presenter: SelectUsersPresenter,
+    private val presenter: AddPeoplePresenter,
 ) : Node(buildContext, plugins = plugins) {

    @Composable
    override fun View(modifier: Modifier) {
        val state = presenter.present()
-        SelectUsersView(
+        AddPeopleView(
            state = state,
            modifier = modifier,
            onBackPressed = { navigateUp() },
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersPresenter.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersPresenter.kt
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package io.element.android.features.createroom.impl.selectusers
+package io.element.android.features.createroom.impl.addpeople

 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
@ -24,24 +24,22 @@ 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 kotlinx.collections.immutable.toImmutableList
 import javax.inject.Inject

 // TODO add unit tests
-class SelectUsersPresenter @Inject constructor() : Presenter<SelectUsersState> {
+class AddPeoplePresenter @Inject constructor() : Presenter<AddPeopleState> {

    @Composable
-    override fun present(): SelectUsersState {
-        val selectedUsers: MutableState<ImmutableList<MatrixUser>> = remember { mutableStateOf(persistentListOf()) }
+    override fun present(): AddPeopleState {
+        val selectedUsers: MutableState<ImmutableList<MatrixUser>> = remember { mutableStateOf(persistentListOf(aMatrixUser("test"))) }

-        fun handleEvents(event: SelectUsersEvents) {
+        fun handleEvents(event: AddPeopleEvents) {
            when (event) {
-                is SelectUsersEvents.AddToSelection -> selectedUsers.value = selectedUsers.value.plus(event.matrixUser).toImmutableList()
-                is SelectUsersEvents.RemoveFromSelection -> selectedUsers.value = selectedUsers.value.minus(event.matrixUser).toImmutableList()
+                is AddPeopleEvents.UpdateSelection -> selectedUsers.value = event.users
            }
        }

-        return SelectUsersState(
+        return AddPeopleState(
            selectedUsers = selectedUsers.value,
            eventSink = ::handleEvents,
        )
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersState.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersState.kt
@ -14,12 +14,12 @@
 * limitations under the License.
 */

-package io.element.android.features.createroom.impl.selectusers
+package io.element.android.features.createroom.impl.addpeople

 import io.element.android.libraries.matrix.ui.model.MatrixUser
 import kotlinx.collections.immutable.ImmutableList

-data class SelectUsersState(
+data class AddPeopleState(
    val selectedUsers: ImmutableList<MatrixUser>,
-    val eventSink: (SelectUsersEvents) -> Unit,
+    val eventSink: (AddPeopleEvents) -> Unit,
 )
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersStateProvider.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersStateProvider.kt
@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package io.element.android.features.createroom.impl.selectusers
+package io.element.android.features.createroom.impl.addpeople

 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
@ -22,11 +22,11 @@ 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 SelectUsersStateProvider : PreviewParameterProvider<SelectUsersState> {
-    override val values: Sequence<SelectUsersState>
+open class AddPeopleStateProvider : PreviewParameterProvider<AddPeopleState> {
+    override val values: Sequence<AddPeopleState>
        get() = sequenceOf(
-            aSelectUsersState(),
-            aSelectUsersState().copy(
+            aAddPeopleState(),
+            aAddPeopleState().copy(
                selectedUsers = persistentListOf(
                    aMatrixUser(userName = ""),
                    aMatrixUser(userName = "User"),
@ -36,7 +36,7 @@ open class SelectUsersStateProvider : PreviewParameterProvider<SelectUsersState>
        )
 }

-fun aSelectUsersState() = SelectUsersState(
+fun aAddPeopleState() = AddPeopleState(
    selectedUsers = persistentListOf(),
    eventSink = {}
 )
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2022 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.createroom.impl.addpeople
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+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
+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.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.preview.ElementPreviewDark
+import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
+import io.element.android.libraries.designsystem.theme.components.Scaffold
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TextButton
+import io.element.android.libraries.ui.strings.R as StringR
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AddPeopleView(
+    state: AddPeopleState,
+    modifier: Modifier = Modifier,
+    onBackPressed: () -> Unit = {},
+    onNextPressed: () -> Unit = {},
+) {
+    var isSearchActive by rememberSaveable { mutableStateOf(false) }
+    val eventSink = state.eventSink
+
+    Scaffold(
+        topBar = {
+            AddPeopleViewTopBar(
+                hasSelectedUsers = state.selectedUsers.isNotEmpty(),
+                onBackPressed = onBackPressed,
+                onNextPressed = onNextPressed,
+            )
+        }
+    ) { padding ->
+        Column(
+            modifier = modifier
+                .fillMaxSize()
+                .padding(padding),
+        ) {
+            // TODO use reusable searchUser bar with multi selection
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AddPeopleViewTopBar(
+    hasSelectedUsers: Boolean,
+    modifier: Modifier = Modifier,
+    onBackPressed: () -> Unit = {},
+    onNextPressed: () -> Unit = {},
+) {
+    CenterAlignedTopAppBar(
+        modifier = modifier,
+        title = {
+            Text(
+                text = stringResource(id = StringR.string.add_people),
+                fontSize = 16.sp,
+                fontWeight = FontWeight.SemiBold,
+            )
+        },
+        navigationIcon = { BackButton(onClick = onBackPressed) },
+        actions = {
+            TextButton(
+                modifier = Modifier.padding(horizontal = 8.dp),
+                onClick = onNextPressed,
+            ) {
+                val textActionResId = if (hasSelectedUsers) StringR.string.action_next else StringR.string.action_skip
+                Text(
+                    text = stringResource(id = textActionResId),
+                    fontSize = 16.sp,
+                )
+            }
+        }
+    )
+}
+
+@Preview
+@Composable
+internal fun ChangeServerViewLightPreview(@PreviewParameter(AddPeopleStateProvider::class) state: AddPeopleState) =
+    ElementPreviewLight { ContentToPreview(state) }
+
+@Preview
+@Composable
+internal fun ChangeServerViewDarkPreview(@PreviewParameter(AddPeopleStateProvider::class) state: AddPeopleState) =
+    ElementPreviewDark { ContentToPreview(state) }
+
+@Composable
+private fun ContentToPreview(state: AddPeopleState) {
+    AddPeopleView(state = state)
+}
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersView.kt
@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2022 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.createroom.impl.selectusers
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-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.libraries.designsystem.components.avatar.Avatar
-import io.element.android.libraries.designsystem.components.avatar.AvatarSize
-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
-import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
-import io.element.android.libraries.designsystem.theme.components.Icon
-import io.element.android.libraries.designsystem.theme.components.IconButton
-import io.element.android.libraries.designsystem.theme.components.Scaffold
-import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.designsystem.theme.components.TextButton
-import io.element.android.libraries.matrix.ui.model.MatrixUser
-import io.element.android.libraries.matrix.ui.model.getBestName
-import io.element.android.libraries.ui.strings.R as StringR
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SelectUsersView(
-    state: SelectUsersState,
-    modifier: Modifier = Modifier,
-    onBackPressed: () -> Unit = {},
-    onNextPressed: () -> Unit = {},
-) {
-    val eventSink = state.eventSink
-
-    Scaffold(
-        topBar = {
-            SelectUsersViewTopBar(
-                hasSelectedUsers = state.selectedUsers.isNotEmpty(),
-                onBackPressed = onBackPressed,
-                onNextPressed = onNextPressed,
-            )
-        }
-    ) { padding ->
-        Column(
-            modifier = modifier
-                .fillMaxSize()
-                .padding(padding)
-        ) {
-            // TODO create a SearchUserView with multi selection option + callbacks
-            SelectedUsersList(
-                modifier = Modifier.padding(horizontal = 16.dp),
-                selectedUsers = state.selectedUsers,
-                onUserRemoved = { eventSink(SelectUsersEvents.RemoveFromSelection(it)) }
-            )
-        }
-    }
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SelectUsersViewTopBar(
-    hasSelectedUsers: Boolean,
-    modifier: Modifier = Modifier,
-    onBackPressed: () -> Unit = {},
-    onNextPressed: () -> Unit = {},
-) {
-    CenterAlignedTopAppBar(
-        modifier = modifier,
-        title = {
-            Text(
-                text = stringResource(id = StringR.string.add_people),
-                fontSize = 16.sp,
-                fontWeight = FontWeight.SemiBold,
-            )
-        },
-        navigationIcon = { BackButton(onClick = onBackPressed) },
-        actions = {
-            TextButton(
-                modifier = Modifier.padding(horizontal = 8.dp),
-                onClick = onNextPressed,
-            ) {
-                val textActionResId = if (hasSelectedUsers) StringR.string.action_next else StringR.string.action_skip
-                Text(
-                    text = stringResource(id = textActionResId),
-                    fontSize = 16.sp,
-                )
-            }
-        }
-    )
-}
-
-@Composable
-fun SelectedUsersList(
-    selectedUsers: List<MatrixUser>,
-    modifier: Modifier = Modifier,
-    onUserRemoved: (MatrixUser) -> Unit = {},
-) {
-    LazyRow(
-        modifier = modifier,
-        horizontalArrangement = Arrangement.spacedBy(24.dp),
-    ) {
-        items(selectedUsers) { matrixUser ->
-            SelectedUser(
-                matrixUser = matrixUser,
-                onUserRemoved = onUserRemoved,
-            )
-        }
-    }
-}
-
-@Composable
-fun SelectedUser(
-    matrixUser: MatrixUser,
-    modifier: Modifier = Modifier,
-    onUserRemoved: (MatrixUser) -> Unit,
-) {
-    Box(modifier = modifier.width(56.dp)) {
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-        ) {
-            Avatar(matrixUser.avatarData.copy(size = AvatarSize.Custom(56)))
-            Text(
-                text = matrixUser.getBestName(),
-                overflow = TextOverflow.Ellipsis,
-                maxLines = 1,
-                style = MaterialTheme.typography.bodyLarge,
-            )
-        }
-        IconButton(
-            modifier = Modifier
-                .clip(CircleShape)
-                .background(MaterialTheme.colorScheme.primary)
-                .size(20.dp)
-                .align(Alignment.TopEnd),
-            onClick = { onUserRemoved(matrixUser) }
-        ) {
-            Icon(
-                imageVector = Icons.Default.Close,
-                contentDescription = stringResource(id = StringR.string.action_remove),
-                tint = MaterialTheme.colorScheme.onPrimary,
-            )
-        }
-    }
-}
-
-@Preview
-@Composable
-internal fun ChangeServerViewLightPreview(@PreviewParameter(SelectUsersStateProvider::class) state: SelectUsersState) =
-    ElementPreviewLight { ContentToPreview(state) }
-
-@Preview
-@Composable
-internal fun ChangeServerViewDarkPreview(@PreviewParameter(SelectUsersStateProvider::class) state: SelectUsersState) =
-    ElementPreviewDark { ContentToPreview(state) }
-
-@Composable
-private fun ContentToPreview(state: SelectUsersState) {
-    SelectUsersView(state = state)
-}