mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Display the list of selected users when search is not active
This commit is contained in:
committed by
Florian Renaud
parent
bb0edaf8d8
commit
997d4c87a1
+5
@@ -26,6 +26,11 @@ open class SelectUsersStateProvider : PreviewParameterProvider<SelectUsersState>
|
|||||||
override val values: Sequence<SelectUsersState>
|
override val values: Sequence<SelectUsersState>
|
||||||
get() = sequenceOf(
|
get() = sequenceOf(
|
||||||
aSelectUsersState(),
|
aSelectUsersState(),
|
||||||
|
aSelectUsersState().copy(
|
||||||
|
isSearchActive = false,
|
||||||
|
selectedUsers = aSetOfSelectedUsers(),
|
||||||
|
isMultiSelectionEnabled = true
|
||||||
|
),
|
||||||
aSelectUsersState().copy(isSearchActive = true),
|
aSelectUsersState().copy(isSearchActive = true),
|
||||||
aSelectUsersState().copy(isSearchActive = true, searchQuery = "someone"),
|
aSelectUsersState().copy(isSearchActive = true, searchQuery = "someone"),
|
||||||
aSelectUsersState().copy(isSearchActive = true, searchQuery = "someone", isMultiSelectionEnabled = true),
|
aSelectUsersState().copy(isSearchActive = true, searchQuery = "someone", isMultiSelectionEnabled = true),
|
||||||
|
|||||||
+12
-1
@@ -92,6 +92,17 @@ fun SelectUsersView(
|
|||||||
onUserDeselected(it)
|
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),
|
colors = if (!active) SearchBarDefaults.colors() else SearchBarDefaults.colors(containerColor = Color.Transparent),
|
||||||
content = {
|
content = {
|
||||||
if (isMultiSelectionEnabled && selectedUsers.isNotEmpty()) {
|
if (isMultiSelectionEnabled && active && selectedUsers.isNotEmpty()) {
|
||||||
SelectedUsersList(
|
SelectedUsersList(
|
||||||
modifier = Modifier.padding(16.dp),
|
modifier = Modifier.padding(16.dp),
|
||||||
selectedUsers = selectedUsers,
|
selectedUsers = selectedUsers,
|
||||||
|
|||||||
Reference in New Issue
Block a user