From c33f7f615f681e35175d37addaadba0012f1512b Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sun, 22 Jan 2023 19:07:32 -0300 Subject: [PATCH] Avoiding recurring inner note rendering. --- .../amethyst/ui/note/ChatroomMessageCompose.kt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt index 8307b2b591..5714698ef1 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt @@ -1,6 +1,7 @@ package com.vitorpamplona.amethyst.ui.note import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.layout.Arrangement @@ -141,15 +142,16 @@ fun ChatroomMessageCompose(baseNote: Note, innerQuote: Boolean = false, accountV } val replyTo = note.replyTo - if (replyTo != null && replyTo.isNotEmpty()) { + if (!innerQuote && replyTo != null && replyTo.isNotEmpty()) { Row(verticalAlignment = Alignment.CenterVertically) { - replyTo.mapIndexed { index, note -> - ChatroomMessageCompose( - note, - innerQuote = true, - accountViewModel = accountViewModel, - navController = navController - ) + replyTo.toSet().mapIndexed { index, note -> + if (note.event != null) + ChatroomMessageCompose( + note, + innerQuote = true, + accountViewModel = accountViewModel, + navController = navController + ) } } }