From 5a20c145244078c5d2a7618a0c1552edef91fda8 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Tue, 14 Mar 2023 15:23:29 +0100
Subject: [PATCH] Set avatar size value to dp

---
 .../createroom/impl/root/CreateRoomRootView.kt    |  2 +-
 .../designsystem/components/avatar/Avatar.kt      |  2 +-
 .../designsystem/components/avatar/AvatarSize.kt  | 15 +++++++--------
 .../libraries/matrix/ui/media/AvatarDataExt.kt    |  3 ++-
 4 files changed, 11 insertions(+), 11 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 1276d8837e..8d5a2f02a6 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.Custom(36),
+        avatarSize = AvatarSize.Custom(36.dp),
         onClick = onClick,
     )
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt
index 222d2a1502..06aa4435a0 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt
@@ -94,7 +94,7 @@ private fun InitialsAvatar(
         Text(
             modifier = Modifier.align(Alignment.Center),
             text = avatarData.getInitial(),
-            fontSize = (avatarData.size.value / 2).sp,
+            fontSize = (avatarData.size.dp / 2).value.sp,
             color = Color.White,
         )
     }
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 5ad7b87856..97069bab6f 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
@@ -16,17 +16,16 @@
 
 package io.element.android.libraries.designsystem.components.avatar
 
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
-sealed class AvatarSize(open val value: Int) {
+sealed class AvatarSize(open val dp: Dp) {
 
-    val dp get() = value.dp
-
-    object SMALL : AvatarSize(32)
-    object MEDIUM : AvatarSize(40)
-    object BIG : AvatarSize(48)
-    object HUGE : AvatarSize(96)
+    object SMALL : AvatarSize(32.dp)
+    object MEDIUM : AvatarSize(40.dp)
+    object BIG : AvatarSize(48.dp)
+    object HUGE : AvatarSize(96.dp)
 
     // 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)
+    data class Custom(override val dp: Dp) : AvatarSize(dp)
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataExt.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataExt.kt
index f12842eff0..b2bf7e2140 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataExt.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataExt.kt
@@ -19,8 +19,9 @@ package io.element.android.libraries.matrix.ui.media
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.api.media.MediaResolver
 import org.matrix.rustcomponents.sdk.mediaSourceFromUrl
+import kotlin.math.roundToInt
 
 fun AvatarData.toMetadata(): MediaResolver.Meta {
     val mediaSource = url?.let { mediaSourceFromUrl(it) }
-    return MediaResolver.Meta(source = mediaSource, kind = MediaResolver.Kind.Thumbnail(size.value))
+    return MediaResolver.Meta(source = mediaSource, kind = MediaResolver.Kind.Thumbnail(size.dp.value.roundToInt()))
 }