From 800896be8802b269171c48773c9922ebc65240d4 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 13 Jun 2023 10:52:12 +0200 Subject: [PATCH 1/2] Timeline: fix ReplyToContent clip on click --- .../messages/impl/timeline/components/TimelineItemEventRow.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt index f84a899c6b..4eec5cbda8 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt @@ -251,6 +251,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), ) } @@ -295,7 +296,6 @@ private fun ReplyToContent( } Row( modifier - .clip(RoundedCornerShape(6.dp)) .background(MaterialTheme.colorScheme.surface) .padding(paddings) ) { From 8ddc1090b19ca065e0e9d7311dc51b27e0cb3d2f Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 13 Jun 2023 11:20:24 +0200 Subject: [PATCH 2/2] Timeline: fix wrong username for reply --- .../messages/impl/timeline/components/TimelineItemEventRow.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt index 4eec5cbda8..270f76b010 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt @@ -243,7 +243,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,