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

Rename parameter since it can reference a userId or a roomId

Browse source
This commit is contained in:
Benoit Marty 2024-05-15 09:25:59 +02:00
parent 39d702db5b
commit f72e257a20
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt
View file

@ -114,7 +114,7 @@ fun EditUserProfileView(
) { ) {
Spacer(modifier = Modifier.height(24.dp)) Spacer(modifier = Modifier.height(24.dp))
EditableAvatarView( EditableAvatarView(
userId = state.userId?.value, matrixId = state.userId?.value,
displayName = state.displayName, displayName = state.displayName,
avatarUrl = state.userAvatarUrl, avatarUrl = state.userAvatarUrl,
avatarSize = AvatarSize.RoomHeader, avatarSize = AvatarSize.RoomHeader,

2
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
View file

@ -118,7 +118,7 @@ fun RoomDetailsEditView(
) { ) {
Spacer(modifier = Modifier.height(24.dp)) Spacer(modifier = Modifier.height(24.dp))
EditableAvatarView( EditableAvatarView(
userId = state.roomId.value, matrixId = state.roomId.value,
displayName = state.roomName, displayName = state.roomName,
avatarUrl = state.roomAvatarUrl, avatarUrl = state.roomAvatarUrl,
avatarSize = AvatarSize.EditRoomDetails, avatarSize = AvatarSize.EditRoomDetails,

4
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
View file

@ -42,7 +42,7 @@ import io.element.android.libraries.designsystem.theme.components.Icon
@Composable @Composable
fun EditableAvatarView( fun EditableAvatarView(
userId: String?, matrixId: String?,
displayName: String?, displayName: String?,
avatarUrl: Uri?, avatarUrl: Uri?,
avatarSize: AvatarSize, avatarSize: AvatarSize,
@ -61,7 +61,7 @@ fun EditableAvatarView(
) { ) {
when (avatarUrl?.scheme) { when (avatarUrl?.scheme) {
null, "mxc" -> { null, "mxc" -> {
userId?.let { matrixId?.let {
Avatar( Avatar(
avatarData = AvatarData(it, displayName, avatarUrl?.toString(), size = avatarSize), avatarData = AvatarData(it, displayName, avatarUrl?.toString(), size = avatarSize),
modifier = Modifier.fillMaxSize(), modifier = Modifier.fillMaxSize(),