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

Cleanup

Browse source
This commit is contained in:
Benoit Marty 2023-06-26 18:45:51 +02:00 • committed by Benoit Marty
parent 2cef47c271
commit 2efbfab939
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt
View file

@ -159,14 +159,14 @@ class InviteListPresenter @Inject constructor(
id = i.userId.value, id = i.userId.value,
name = i.displayName, name = i.displayName,
url = i.avatarUrl, url = i.avatarUrl,
size = AvatarSize.RoomListItem, size = AvatarSize.RoomInviteItem,
) )
else else
AvatarData( AvatarData(
id = roomId.value, id = roomId.value,
name = name, name = name,
url = avatarURLString, url = avatarURLString,
size = AvatarSize.RoomListItem, size = AvatarSize.RoomInviteItem,
) )
val alias = if (isDirect) val alias = if (isDirect)

4
features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt
View file

@ -96,7 +96,7 @@ internal fun DefaultInviteSummaryRow(
verticalAlignment = Alignment.Top verticalAlignment = Alignment.Top
) { ) {
Avatar( Avatar(
invite.roomAvatarData.copy(size = AvatarSize.RoomListItem), invite.roomAvatarData,
) )
Column( Column(
@ -173,7 +173,7 @@ private fun SenderRow(sender: InviteSender) {
modifier = Modifier.padding(top = 6.dp), modifier = Modifier.padding(top = 6.dp),
) { ) {
Avatar( Avatar(
avatarData = sender.avatarData.copy(size = AvatarSize.InviteSender), avatarData = sender.avatarData,
) )
Text( Text(
text = stringResource(R.string.screen_invites_invited_you, sender.displayName, sender.userId.value).let { text -> text = stringResource(R.string.screen_invites_invited_you, sender.displayName, sender.userId.value).let { text ->

2
features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt
View file

@ -27,7 +27,7 @@ data class InviteListInviteSummary(
val roomId: RoomId, val roomId: RoomId,
val roomName: String = "", val roomName: String = "",
val roomAlias: String? = null, 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 sender: InviteSender? = null,
val isDirect: Boolean = false, val isDirect: Boolean = false,
val isNew: Boolean = false, val isNew: Boolean = false,

1
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
View file

@ -36,5 +36,6 @@ enum class AvatarSize(val dp: Dp) {
MessageActionSender(32.dp), MessageActionSender(32.dp),
RoomInviteItem(52.dp),
InviteSender(16.dp), InviteSender(16.dp),
} }