Skip to content

Render Owner in the horizontal list when editing Admins. #5736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+18 −3
Open

Render Owner in the horizontal list when editing Admins. #5736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...in/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ internal fun aChangeRolesStateWithOwners() = aChangeRolesState(
}
},
selectedUsers = persistentListOf(
aMatrixUser(id = "@alice:server.org", displayName = "Alice"),
aMatrixUser(id = "@bob:server.org", displayName = "Bob"),
aMatrixUser(id = "@carol:server.org", displayName = "Carol"),
)
)
19 changes: 18 additions & 1 deletion ...main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -71,6 +74,7 @@ import io.element.android.libraries.matrix.ui.components.SelectedUsersRowList
import io.element.android.libraries.matrix.ui.model.getAvatarData
import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.toImmutableList

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down Expand Up @@ -226,7 +230,20 @@ private fun SearchResultsList(
state = lazyListState,
) {
item {
selectedUsersList(selectedUsers)
if (currentRole == RoomMember.Role.Admin) {
val ownersAndSelectedUsers by remember {
derivedStateOf {
// Also include the owners in the horizontal list
val owners = searchResults.owners.map {
it.toMatrixUser()
}
(owners + selectedUsers).toImmutableList()
}
}
selectedUsersList(ownersAndSelectedUsers)
} else {
selectedUsersList(selectedUsers)
}
}
if (searchResults.owners.isNotEmpty()) {
stickyHeader { ListSectionHeader(text = stringResource(R.string.screen_room_roles_and_permissions_owners)) }
Expand Down
Loading