Skip to content

Fix ChannelAvatar not using UserAvatar from ComponentFactory #6407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VelikovPetar wants to merge 1 commit into
base: develop
Choose a base branch
from
+20 −13
Open

Fix ChannelAvatar not using UserAvatar from ComponentFactory #6407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions ...ose/src/main/java/io/getstream/chat/android/compose/ui/components/avatar/ChannelAvatar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import io.getstream.chat.android.compose.ui.components.common.CountBadge
import io.getstream.chat.android.compose.ui.components.common.CountBadgeSize
import io.getstream.chat.android.compose.ui.theme.ChatTheme
import io.getstream.chat.android.compose.ui.theme.StreamTokens
import io.getstream.chat.android.compose.ui.theme.UserAvatarParams
import io.getstream.chat.android.compose.ui.util.applyIf
import io.getstream.chat.android.models.Channel
import io.getstream.chat.android.models.User
Expand Down Expand Up @@ -85,11 +86,13 @@ public fun ChannelAvatar(
val directMessageRecipient = directMessageRecipient(channel, currentUser)

if (directMessageRecipient != null) {
UserAvatar(
modifier = testTagModifier,
user = directMessageRecipient,
showIndicator = showIndicator,
showBorder = showBorder,
ChatTheme.componentFactory.UserAvatar(
params = UserAvatarParams(
modifier = testTagModifier,
user = directMessageRecipient,
showIndicator = showIndicator,
showBorder = showBorder,
),
)
} else {
StackedGroupAvatar(
Expand Down Expand Up @@ -209,10 +212,12 @@ private fun StackedGroupAvatar(
1 -> {
val colors = ChatTheme.colors

UserAvatar(
user = channel.members.first().user,
showBorder = showBorder,
modifier = baseModifier.align(alignments[0]),
ChatTheme.componentFactory.UserAvatar(
params = UserAvatarParams(
user = channel.members.first().user,
showBorder = showBorder,
modifier = baseModifier.align(alignments[0]),
),
)

UserAvatarIconPlaceholder(
Expand All @@ -234,10 +239,12 @@ private fun StackedGroupAvatar(
}
}
for (i in alignments.indices) {
UserAvatar(
user = displayMembers[i].user,
showBorder = showBorder,
modifier = baseModifier.align(alignments[i]),
ChatTheme.componentFactory.UserAvatar(
params = UserAvatarParams(
user = displayMembers[i].user,
showBorder = showBorder,
modifier = baseModifier.align(alignments[i]),
),
)
}
if (membersCount > 4) {
Expand Down
Loading