Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

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

Browse source 
Feature/fga/fix reply timeline UI
This commit is contained in:
ganfra 2023-06-15 11:38:30 +02:00 • committed by GitHub
commit 7b84a7d8fe
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
View file

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