From e4377c7e0c3b3d0fb37d18d0215007043746da78 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Thu, 1 Jun 2023 09:42:26 +0100 Subject: [PATCH] Create room: show divider between users in search --- .../createroom/impl/components/SearchUserBar.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchUserBar.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchUserBar.kt index be87e1cf51..9abae4d2cb 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchUserBar.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchUserBar.kt @@ -19,11 +19,12 @@ package io.element.android.features.createroom.impl.components import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import io.element.android.libraries.designsystem.theme.components.Divider import io.element.android.libraries.designsystem.theme.components.SearchBar import io.element.android.libraries.designsystem.theme.components.SearchBarResultState import io.element.android.libraries.matrix.api.user.MatrixUser @@ -68,7 +69,7 @@ fun SearchUserBar( resultHandler = { users -> LazyColumn { if (isMultiSelectionEnabled) { - items(users) { matrixUser -> + itemsIndexed(users) { index, matrixUser -> SearchMultipleUsersResultItem( modifier = Modifier.fillMaxWidth(), matrixUser = matrixUser, @@ -81,14 +82,20 @@ fun SearchUserBar( } } ) + if (index < users.lastIndex) { + Divider() + } } } else { - items(users) { matrixUser -> + itemsIndexed(users) { index, matrixUser -> SearchSingleUserResultItem( modifier = Modifier.fillMaxWidth(), matrixUser = matrixUser, onClick = { onUserSelected(matrixUser) } ) + if (index < users.lastIndex) { + Divider() + } } } }