mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-10-31 08:15:02 +00:00
Fix owners not displayed in the horizontal list.
This commit is contained in:
+8
-12
@@ -30,8 +30,6 @@ import androidx.compose.foundation.lazy.items
|
|||||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
import androidx.compose.foundation.lazy.rememberLazyListState
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.derivedStateOf
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
@@ -230,17 +228,15 @@ private fun SearchResultsList(
|
|||||||
state = lazyListState,
|
state = lazyListState,
|
||||||
) {
|
) {
|
||||||
item {
|
item {
|
||||||
val usersInHorizontalRow by remember {
|
val usersInHorizontalRow = remember(searchResults.owners, selectedUsers) {
|
||||||
derivedStateOf {
|
if (currentRole == RoomMember.Role.Admin) {
|
||||||
if (currentRole == RoomMember.Role.Admin) {
|
// Also include the owners in the horizontal list
|
||||||
// Also include the owners in the horizontal list
|
val owners = searchResults.owners.map {
|
||||||
val owners = searchResults.owners.map {
|
it.toMatrixUser()
|
||||||
it.toMatrixUser()
|
|
||||||
}
|
|
||||||
(owners + selectedUsers).toImmutableList()
|
|
||||||
} else {
|
|
||||||
selectedUsers
|
|
||||||
}
|
}
|
||||||
|
(owners + selectedUsers).toImmutableList()
|
||||||
|
} else {
|
||||||
|
selectedUsers
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
selectedUsersList(usersInHorizontalRow)
|
selectedUsersList(usersInHorizontalRow)
|
||||||
|
|||||||
Reference in New Issue
Block a user