Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #6074 from element-hq/feature/fga/fix_edit_details

Browse source 
Fix RoomDetailsEditView avatar picker for spaces
This commit is contained in:
ganfra 2026-01-23 15:55:37 +01:00 • committed by GitHub
commit b73e15625a
6 changed files with 48 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt
View file

@ -101,9 +101,9 @@ fun RoomDetailsEditView(
.verticalScroll(rememberScrollState())
) {
Spacer(modifier = Modifier.height(24.dp))
val avatarPickerState = remember(state.roomAvatarUrl) {
val avatarPickerState = remember(state.roomAvatarUrl, state.roomRawName) {
val size = AvatarSize.EditRoomDetails
val type = AvatarType.Room()
val type = if (state.isSpace) AvatarType.Space() else AvatarType.Room()
AvatarPickerState.Selected(
avatarData = AvatarData(id = state.roomId.value, name = state.roomRawName, size = size, url = state.roomAvatarUrl),
type = type
@ -112,6 +112,7 @@ fun RoomDetailsEditView(
AvatarPickerView(
state = avatarPickerState,
onClick = ::onAvatarClick,
enabled = state.canChangeAvatar,
modifier = Modifier.align(Alignment.CenterHorizontally),
)
Spacer(modifier = Modifier.height(32.dp))