From 0c7832534cd709576bd47737cbbb346f74598524 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 26 Jun 2023 18:45:51 +0200 Subject: [PATCH] Cleanup --- .../android/features/invitelist/impl/InviteListPresenter.kt | 4 ++-- .../features/invitelist/impl/components/InviteSummaryRow.kt | 4 ++-- .../features/invitelist/impl/model/InviteListInviteSummary.kt | 2 +- .../libraries/designsystem/components/avatar/AvatarSize.kt | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt index 411a64da53..86bbf4616a 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt +++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt @@ -159,14 +159,14 @@ class InviteListPresenter @Inject constructor( id = i.userId.value, name = i.displayName, url = i.avatarUrl, - size = AvatarSize.RoomListItem, + size = AvatarSize.RoomInviteItem, ) else AvatarData( id = roomId.value, name = name, url = avatarURLString, - size = AvatarSize.RoomListItem, + size = AvatarSize.RoomInviteItem, ) val alias = if (isDirect) diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt index 12da8616df..515bee9321 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt +++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt @@ -96,7 +96,7 @@ internal fun DefaultInviteSummaryRow( verticalAlignment = Alignment.Top ) { Avatar( - invite.roomAvatarData.copy(size = AvatarSize.RoomListItem), + invite.roomAvatarData, ) Column( @@ -173,7 +173,7 @@ private fun SenderRow(sender: InviteSender) { modifier = Modifier.padding(top = 6.dp), ) { Avatar( - avatarData = sender.avatarData.copy(size = AvatarSize.InviteSender), + avatarData = sender.avatarData, ) Text( text = stringResource(R.string.screen_invites_invited_you, sender.displayName, sender.userId.value).let { text -> diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt index 33d5b0a493..cb695d4eda 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt +++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt @@ -27,7 +27,7 @@ data class InviteListInviteSummary( val roomId: RoomId, val roomName: String = "", val roomAlias: String? = null, - val roomAvatarData: AvatarData = AvatarData(roomId.value, roomName, size = AvatarSize.RoomListItem), + val roomAvatarData: AvatarData = AvatarData(roomId.value, roomName, size = AvatarSize.RoomInviteItem), val sender: InviteSender? = null, val isDirect: Boolean = false, val isNew: Boolean = false, diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt index e0e73ad909..33e9767a61 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt @@ -36,5 +36,6 @@ enum class AvatarSize(val dp: Dp) { MessageActionSender(32.dp), + RoomInviteItem(52.dp), InviteSender(16.dp), }