From 041eb88aee27d54692a21791b8b79c5b2cfefcb9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 23 Jun 2025 21:24:03 +0200
Subject: [PATCH] Extract UserAvatar to its own file.

---
 .../designsystem/components/avatar/Avatar.kt  | 27 -------------
 .../components/avatar/UserAvatar.kt           | 39 +++++++++++++++++++
 2 files changed, 39 insertions(+), 27 deletions(-)
 create mode 100644 libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/UserAvatar.kt

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 7358bd4ce3..508c945555 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
@@ -57,33 +57,6 @@ fun Avatar(
     }
 }
 
-@Composable
-private fun UserAvatar(
-    avatarData: AvatarData,
-    modifier: Modifier = Modifier,
-    contentDescription: String? = null,
-    forcedAvatarSize: Dp? = null,
-    hideImage: Boolean = false,
-) {
-    if (avatarData.url.isNullOrBlank() || hideImage) {
-        InitialLetterAvatar(
-            avatarData = avatarData,
-            avatarType = AvatarType.User,
-            forcedAvatarSize = forcedAvatarSize,
-            modifier = modifier,
-            contentDescription = contentDescription,
-        )
-    } else {
-        ImageAvatar(
-            avatarData = avatarData,
-            avatarType = AvatarType.User,
-            forcedAvatarSize = forcedAvatarSize,
-            modifier = modifier,
-            contentDescription = contentDescription,
-        )
-    }
-}
-
 @Preview(group = PreviewGroup.Avatars)
 @Composable
 internal fun AvatarPreview(@PreviewParameter(AvatarDataProvider::class) avatarData: AvatarData) =
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/UserAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/UserAvatar.kt
new file mode 100644
index 0000000000..54b0708078
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/UserAvatar.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.designsystem.components.avatar
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.Dp
+
+@Composable
+internal fun UserAvatar(
+    avatarData: AvatarData,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+    forcedAvatarSize: Dp? = null,
+    hideImage: Boolean = false,
+) {
+    if (avatarData.url.isNullOrBlank() || hideImage) {
+        InitialLetterAvatar(
+            avatarData = avatarData,
+            avatarType = AvatarType.User,
+            forcedAvatarSize = forcedAvatarSize,
+            modifier = modifier,
+            contentDescription = contentDescription,
+        )
+    } else {
+        ImageAvatar(
+            avatarData = avatarData,
+            avatarType = AvatarType.User,
+            forcedAvatarSize = forcedAvatarSize,
+            modifier = modifier,
+            contentDescription = contentDescription,
+        )
+    }
+}