Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display the list of selected users when search is not active

Browse source
This commit is contained in:
Maxime NATUREL 2023-03-16 10:29:31 +01:00 • committed by Florian Renaud
parent bb0edaf8d8
commit 997d4c87a1
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
features/selectusers/api/src/main/kotlin/io/element/android/features/selectusers/api/SelectUsersStateProvider.kt
View file

@ -26,6 +26,11 @@ open class SelectUsersStateProvider : PreviewParameterProvider<SelectUsersState>
override val values: Sequence<SelectUsersState>
get() = sequenceOf(
aSelectUsersState(),
aSelectUsersState().copy(
isSearchActive = false,
selectedUsers = aSetOfSelectedUsers(),
isMultiSelectionEnabled = true
),
aSelectUsersState().copy(isSearchActive = true),
aSelectUsersState().copy(isSearchActive = true, searchQuery = "someone"),
aSelectUsersState().copy(isSearchActive = true, searchQuery = "someone", isMultiSelectionEnabled = true),

13
features/selectusers/api/src/main/kotlin/io/element/android/features/selectusers/api/SelectUsersView.kt
View file

@ -92,6 +92,17 @@ fun SelectUsersView(
onUserDeselected(it)
},
)
if (state.isMultiSelectionEnabled && !state.isSearchActive && state.selectedUsers.isNotEmpty()) {
SelectedUsersList(
modifier = Modifier.padding(16.dp),
selectedUsers = state.selectedUsers,
onUserRemoved = {
eventSink(SelectUsersEvents.RemoveFromSelection(it))
onUserDeselected(it)
},
)
}
}
}
@ -157,7 +168,7 @@ fun SearchUserBar(
},
colors = if (!active) SearchBarDefaults.colors() else SearchBarDefaults.colors(containerColor = Color.Transparent),
content = {
if (isMultiSelectionEnabled && selectedUsers.isNotEmpty()) {
if (isMultiSelectionEnabled && active && selectedUsers.isNotEmpty()) {
SelectedUsersList(
modifier = Modifier.padding(16.dp),
selectedUsers = selectedUsers,