Skip to content

[stable-25.0.x] fix(chat): fix media message sizing and align caption/bubble width to it #6628

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

Merged
mahibi merged 1 commit into from
Sep 3, 2026
Merged

[stable-25.0.x] fix(chat): fix media message sizing and align caption/bubble width to it #6628

Show file tree
Hide file tree
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
59 changes: 39 additions & 20 deletions app/src/main/java/com/nextcloud/talk/ui/chat/ChatMessageScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ fun MessageScaffold(
forceTimeBelow: Boolean = false,
forceTimeOverlay: Boolean = false,
bubbleColor: Color? = null,
contentWidthFraction: (availableWidth: Dp) -> Float = { 1f },
content: @Composable () -> Unit
) {
val incoming = uiMessage.incoming
Expand Down Expand Up @@ -227,6 +228,7 @@ fun MessageScaffold(

BoxWithConstraints(modifier = Modifier.fillMaxWidth()) {
val messageBubbleMaxWidth = maxWidth * MESSAGE_BUBBLE_MAX_WIDTH_FRACTION
val resolvedContentMinWidth = messageBubbleMaxWidth * contentWidthFraction(messageBubbleMaxWidth)

Row(
modifier = Modifier.fillMaxWidth(),
Expand All @@ -249,6 +251,7 @@ fun MessageScaffold(
captionText = captionText,
showInlineMetadata = showInlineMetadata,
showQuote = showQuote,
contentMinWidth = resolvedContentMinWidth,
content = content
)
}
Expand Down Expand Up @@ -297,6 +300,7 @@ private fun MessageBubbleWithReactions(
captionText: String?,
showInlineMetadata: Boolean,
showQuote: Boolean,
contentMinWidth: Dp,
content: @Composable () -> Unit
) {
val bubbleModifier = Modifier
Expand Down Expand Up @@ -328,6 +332,8 @@ private fun MessageBubbleWithReactions(
captionText = captionText,
showInlineMetadata = showInlineMetadata,
showQuote = showQuote,
contentMinWidth = contentMinWidth,
contentMaxWidth = maxBubbleWidth,
content = content
)
}
Expand All @@ -353,6 +359,8 @@ private fun MessageBubbleContent(
captionText: String?,
showInlineMetadata: Boolean,
showQuote: Boolean,
contentMinWidth: Dp,
contentMaxWidth: Dp,
content: @Composable () -> Unit
) {
val bubbleContentModifier = if (includePadding) {
Expand All @@ -369,13 +377,16 @@ private fun MessageBubbleContent(
uiMessage = uiMessage,
paddingAlreadyApplied = includePadding,
showQuote = showQuote,
conversationThreadId = conversationThreadId
conversationThreadId = conversationThreadId,
contentMinWidth = contentMinWidth
)
MessageBodyWithMetadata(
uiMessage = uiMessage,
metadataLayoutMode = metadataLayoutMode,
captionText = captionText,
showInlineMetadata = showInlineMetadata,
contentMinWidth = contentMinWidth,
contentMaxWidth = contentMaxWidth,
content = content
)
}
Expand All @@ -386,11 +397,12 @@ private fun MessageHeader(
uiMessage: ChatMessageUi,
paddingAlreadyApplied: Boolean,
showQuote: Boolean,
conversationThreadId: Long?
conversationThreadId: Long?,
contentMinWidth: Dp
) {
if (showQuote) {
uiMessage.parentMessage?.let {
CommonMessageQuote(it)
CommonMessageQuote(it, contentMinWidth = contentMinWidth)
}
}

Expand All @@ -401,12 +413,15 @@ private fun MessageHeader(
)
}

@Suppress("LongParameterList")
@Composable
private fun ColumnScope.MessageBodyWithMetadata(
uiMessage: ChatMessageUi,
metadataLayoutMode: MetadataLayoutMode,
captionText: String?,
showInlineMetadata: Boolean,
contentMinWidth: Dp,
contentMaxWidth: Dp,
suppressMetadata: Boolean = false,
content: @Composable () -> Unit
) {
Expand All @@ -417,6 +432,8 @@ private fun ColumnScope.MessageBodyWithMetadata(
captionText = captionText.orEmpty(),
uiMessage = uiMessage,
showInlineMetadata = showInlineMetadata,
contentMinWidth = contentMinWidth,
contentMaxWidth = contentMaxWidth,
suppressMetadata = suppressMetadata
)
}
Expand All @@ -425,8 +442,7 @@ private fun ColumnScope.MessageBodyWithMetadata(
// Not fillMaxWidth(): OVERLAY is media-only, and media's own content already decides
// its width (e.g. shrinking narrower for portrait) - forcing full width here would
// leave the bubble at full size with empty space beside a narrower image instead of
// letting the bubble shrink to match. OverlayMetadataBadge's alignment is relative to
// this Box's own bounds either way, so it still lands correctly on the content's corner.
// letting the bubble shrink to match.
Box {
content()
if (!suppressMetadata) {
Expand Down Expand Up @@ -477,14 +493,16 @@ private fun ColumnScope.MessageBodyWithMetadata(

@Composable
private fun BoxScope.OverlayMetadataBadge(uiMessage: ChatMessageUi) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.align(Alignment.BottomEnd)
.padding(bottom = 8.dp, end = 8.dp)
.background(Color.Black.copy(alpha = 0.4f), RoundedCornerShape(10.dp))
) {
MessageMetadata(uiMessage = uiMessage, color = Color.White)
Box(modifier = Modifier.matchParentSize()) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.align(Alignment.BottomEnd)
.padding(bottom = 8.dp, end = 8.dp)
.background(Color.Black.copy(alpha = 0.4f), RoundedCornerShape(10.dp))
) {
MessageMetadata(uiMessage = uiMessage, color = Color.White)
}
}
}

Expand Down Expand Up @@ -618,21 +636,22 @@ private fun ColumnScope.CaptionWithMetadata(
captionText: String,
uiMessage: ChatMessageUi,
showInlineMetadata: Boolean,
contentMinWidth: Dp,
contentMaxWidth: Dp,
suppressMetadata: Boolean = false
) {
val highlightSearchTerm = LocalHighlightSearchTerm.current
if (!suppressMetadata && showInlineMetadata) {
Row(
modifier = Modifier
.fillMaxWidth()
.widthIn(min = contentMinWidth)
.padding(horizontal = 8.dp, vertical = 8.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.Bottom
) {
EnrichedText(
uiMessage,
modifier = Modifier
.weight(1f)
.padding(end = 8.dp),
modifier = Modifier.padding(end = 8.dp),
highlightSearchTerm = highlightSearchTerm
)
Row(verticalAlignment = Alignment.CenterVertically) {
Expand All @@ -643,7 +662,7 @@ private fun ColumnScope.CaptionWithMetadata(
EnrichedText(
uiMessage,
modifier = Modifier
// .widthIn(20.dp, 280.dp)
.widthIn(min = contentMinWidth, max = contentMaxWidth)
.padding(start = 8.dp, end = 8.dp),
highlightSearchTerm = highlightSearchTerm
)
Expand All @@ -662,7 +681,7 @@ private fun ColumnScope.CaptionWithMetadata(

@Suppress("LongMethod")
@Composable
fun CommonMessageQuote(message: ChatMessageUi) {
fun CommonMessageQuote(message: ChatMessageUi, contentMinWidth: Dp = 0.dp) {
val lineColor = if (!message.incoming) {
colorScheme.primary
} else {
Expand All @@ -674,7 +693,7 @@ fun CommonMessageQuote(message: ChatMessageUi) {
modifier = Modifier
.padding(vertical = 4.dp)
.combinedClickable(onClick = { onQuotedMessageClick(message.id) })
.fillMaxWidth()
.widthIn(min = contentMinWidth)
.drawBehind {
val barWidth = 4.dp.toPx()
val r = 8.dp.toPx()
Expand Down
Loading
Loading