Merge pull request #597 from vector-im/feature/fga/fix_reply_timeline_ui

Feature/fga/fix reply timeline UI
This commit is contained in:
ganfra 2023-06-15 11:38:30 +02:00 committed by GitHub
commit 18cdfdf439

View file

@ -248,7 +248,7 @@ private fun MessageEventBubbleContent(
) {
EqualWidthColumn(modifier = modifier, spacing = 8.dp) {
if (inReplyToDetails != null) {
val senderName = event.senderDisplayName ?: event.senderId.value
val senderName = inReplyToDetails.senderDisplayName ?: inReplyToDetails.senderId.value
val attachmentThumbnailInfo = attachmentThumbnailInfoForInReplyTo(inReplyToDetails)
ReplyToContent(
senderName = senderName,
@ -256,6 +256,7 @@ private fun MessageEventBubbleContent(
attachmentThumbnailInfo = attachmentThumbnailInfo,
modifier = Modifier
.padding(top = 8.dp, start = 8.dp, end = 8.dp)
.clip(RoundedCornerShape(6.dp))
.clickable(enabled = true, onClick = inReplyToClick),
)
}
@ -300,7 +301,6 @@ private fun ReplyToContent(
}
Row(
modifier
.clip(RoundedCornerShape(6.dp))
.background(MaterialTheme.colorScheme.surface)
.padding(paddings)
) {