Skip to content

fix: conversation list title alignment across avatar types [WPB-22273] #4560

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
Garzas wants to merge 1 commit into
base: develop
Choose a base branch
from
+31 −3
Open

fix: conversation list title alignment across avatar types [WPB-22273] #4560

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
34 changes: 31 additions & 3 deletions .../main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationItemFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.ColorFilter
Expand Down Expand Up @@ -57,6 +59,7 @@ import com.wire.android.ui.home.conversationslist.model.toUserInfoLabel
import com.wire.android.ui.markdown.MarkdownConstants
import com.wire.android.ui.theme.WireTheme
import com.wire.android.ui.theme.wireColorScheme
import com.wire.android.ui.theme.wireDimensions
import com.wire.android.util.ui.PreviewMultipleThemes
import com.wire.android.util.ui.UIText
import com.wire.android.util.ui.toUIText
Expand Down Expand Up @@ -184,7 +187,9 @@ private fun GeneralConversationItem(
} else {
ConversationAvatar.Group.Regular(conversationId)
}
GroupConversationAvatar(avatar)
ConversationLeadingAvatar {
GroupConversationAvatar(avatar)
}
}
},
title = {
Expand Down Expand Up @@ -229,14 +234,17 @@ private fun GeneralConversationItem(
with(conversation) {
RowItemTemplate(
modifier = modifier.padding(start = dimensions().spacing8x),
titleStartPadding = dimensions().spacing0x,
leadingIcon = {
Row {
if (isSelectable) {
WireRadioButton(checked = isChecked, onButtonChecked = {
selectOnRadioGroup()
})
}
ConversationUserAvatar(userAvatarData)
ConversationLeadingAvatar {
ConversationUserAvatar(userAvatarData)
}
}
},
title = {
Expand Down Expand Up @@ -275,7 +283,12 @@ private fun GeneralConversationItem(
with(conversation) {
RowItemTemplate(
modifier = modifier.padding(start = dimensions().spacing8x),
leadingIcon = { ConversationUserAvatar(userAvatarData) },
titleStartPadding = dimensions().spacing0x,
leadingIcon = {
ConversationLeadingAvatar {
ConversationUserAvatar(userAvatarData)
}
},
title = {
UserLabel(
userInfoLabel = toUserInfoLabel(),
Expand All @@ -293,6 +306,21 @@ private fun GeneralConversationItem(
}
}

@Composable
private fun ConversationLeadingAvatar(
modifier: Modifier = Modifier,
content: @Composable () -> Unit
) {
val leadingSize = MaterialTheme.wireDimensions.avatarDefaultSize +
(MaterialTheme.wireDimensions.avatarClickablePadding * 2)
Box(
modifier = modifier.size(leadingSize),
contentAlignment = Alignment.Center
) {
content()
}
}

@Composable
fun AudioControlButtons(
playingAudio: PlayingAudioInConversation,
Expand Down