From e8404ad62a1d1370e5e54f4f37e003040fdfa20e Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Mon, 13 Mar 2023 11:15:38 +0100 Subject: [PATCH] Update avatar size on search results --- .../createroom/impl/root/CreateRoomRootView.kt | 2 +- .../designsystem/components/avatar/AvatarSize.kt | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt index 05e770cf96..1276d8837e 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt @@ -222,7 +222,7 @@ fun CreateRoomSearchResultItem( MatrixUserRow( modifier = modifier.heightIn(min = 56.dp), matrixUser = matrixUser, - avatarSize = AvatarSize.SMALL, + avatarSize = AvatarSize.Custom(36), onClick = onClick, ) } 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 35689817b0..5ad7b87856 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 @@ -18,11 +18,15 @@ package io.element.android.libraries.designsystem.components.avatar import androidx.compose.ui.unit.dp -enum class AvatarSize(val value: Int) { - SMALL(32), - MEDIUM(40), - BIG(48), - HUGE(96); +sealed class AvatarSize(open val value: Int) { - val dp = value.dp + val dp get() = value.dp + + object SMALL : AvatarSize(32) + object MEDIUM : AvatarSize(40) + object BIG : AvatarSize(48) + object HUGE : AvatarSize(96) + + // FIXME maybe remove this field and switch back to an enum (or remove this class) when design system will be integrated + data class Custom(override val value: Int) : AvatarSize(value) }