From 3168775446ccdb18cb74f75cf333dacc0198d13f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 5 Sep 2023 15:45:12 +0200
Subject: [PATCH] Rename parameter and update comment.

---
 .../impl/timeline/components/TimelineItemEventRow.kt        | 2 +-
 .../libraries/designsystem/components/avatar/Avatar.kt      | 6 +++---
 .../designsystem/components/avatar/UserAvatarPreview.kt     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
index fd9676653f..30478c6ef0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
@@ -346,7 +346,7 @@ private fun MessageSenderInformation(
         }
         // Content
         Row {
-            Avatar(senderAvatar, avatarColors = avatarColors)
+            Avatar(senderAvatar, initialAvatarColors = avatarColors)
             Spacer(modifier = Modifier.width(4.dp))
             Text(
                 text = sender,
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 dc6149d0f6..958f4ca29e 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
@@ -46,7 +46,7 @@ import timber.log.Timber
 fun Avatar(
     avatarData: AvatarData,
     modifier: Modifier = Modifier,
-    avatarColors: AvatarColors? = null,
+    initialAvatarColors: AvatarColors? = null,
     contentDescription: String? = null,
 ) {
     val commonModifier = modifier
@@ -55,7 +55,7 @@ fun Avatar(
     if (avatarData.url.isNullOrBlank()) {
         InitialsAvatar(
             avatarData = avatarData,
-            avatarColors = avatarColors,
+            avatarColors = initialAvatarColors,
             modifier = commonModifier,
         )
     } else {
@@ -91,7 +91,7 @@ private fun InitialsAvatar(
     avatarColors: AvatarColors?,
     modifier: Modifier = Modifier,
 ) {
-    // Use temporary color for default avatar background
+    // Use temporary color for default avatar background, if avatarColors is not provided
     val avatarColor = ElementTheme.colors.bgActionPrimaryDisabled
     Box(
         modifier.background(color = avatarColors?.background ?: avatarColor)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/UserAvatarPreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/UserAvatarPreview.kt
index b9b8f42062..817650ffa7 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/UserAvatarPreview.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/UserAvatarPreview.kt
@@ -43,7 +43,7 @@ internal fun UserAvatarPreview() = ElementPreview {
                 verticalAlignment = Alignment.CenterVertically,
             ) {
                 // Note: it's OK, since the hash of "0" is 0, the hash of "1" is 1, etc.
-                Avatar(anAvatarData(), avatarColors = avatarColors("$it"))
+                Avatar(anAvatarData(), initialAvatarColors = avatarColors("$it"))
                 Text(text = "Color index $it")
             }
         }