Skip to content

Commit 7e54dfa

Browse files
VelikovPetarclaude
andauthored
Fix ChannelAvatar not using UserAvatar from ComponentFactory (#6407)
Co-authored-by: Claude <noreply@anthropic.com>
1 parent c823b08 commit 7e54dfa

1 file changed

Lines changed: 20 additions & 13 deletions

File tree

  • stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/avatar

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/avatar/ChannelAvatar.kt

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import io.getstream.chat.android.compose.ui.components.common.CountBadge
4646
import io.getstream.chat.android.compose.ui.components.common.CountBadgeSize
4747
import io.getstream.chat.android.compose.ui.theme.ChatTheme
4848
import io.getstream.chat.android.compose.ui.theme.StreamTokens
49+
import io.getstream.chat.android.compose.ui.theme.UserAvatarParams
4950
import io.getstream.chat.android.compose.ui.util.applyIf
5051
import io.getstream.chat.android.models.Channel
5152
import io.getstream.chat.android.models.User
@@ -85,11 +86,13 @@ public fun ChannelAvatar(
8586
val directMessageRecipient = directMessageRecipient(channel, currentUser)
8687

8788
if (directMessageRecipient != null) {
88-
UserAvatar(
89-
modifier = testTagModifier,
90-
user = directMessageRecipient,
91-
showIndicator = showIndicator,
92-
showBorder = showBorder,
89+
ChatTheme.componentFactory.UserAvatar(
90+
params = UserAvatarParams(
91+
modifier = testTagModifier,
92+
user = directMessageRecipient,
93+
showIndicator = showIndicator,
94+
showBorder = showBorder,
95+
),
9396
)
9497
} else {
9598
StackedGroupAvatar(
@@ -209,10 +212,12 @@ private fun StackedGroupAvatar(
209212
1 -> {
210213
val colors = ChatTheme.colors
211214

212-
UserAvatar(
213-
user = channel.members.first().user,
214-
showBorder = showBorder,
215-
modifier = baseModifier.align(alignments[0]),
215+
ChatTheme.componentFactory.UserAvatar(
216+
params = UserAvatarParams(
217+
user = channel.members.first().user,
218+
showBorder = showBorder,
219+
modifier = baseModifier.align(alignments[0]),
220+
),
216221
)
217222

218223
UserAvatarIconPlaceholder(
@@ -234,10 +239,12 @@ private fun StackedGroupAvatar(
234239
}
235240
}
236241
for (i in alignments.indices) {
237-
UserAvatar(
238-
user = displayMembers[i].user,
239-
showBorder = showBorder,
240-
modifier = baseModifier.align(alignments[i]),
242+
ChatTheme.componentFactory.UserAvatar(
243+
params = UserAvatarParams(
244+
user = displayMembers[i].user,
245+
showBorder = showBorder,
246+
modifier = baseModifier.align(alignments[i]),
247+
),
241248
)
242249
}
243250
if (membersCount > 4) {

0 commit comments

Comments
 (0)