From 827512b22569b2a20dfa1e2dae43f74a8fef2fa3 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 4 Apr 2024 18:06:27 -0400 Subject: [PATCH] Avoids circular rendering of Drafts. --- .../java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt | 5 +++-- .../com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt index 6d5c42ce8..5a8ea4785 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt @@ -562,7 +562,7 @@ private fun RenderNoteRow( is AppDefinitionEvent -> RenderAppDefinition(baseNote, accountViewModel, nav) is AudioTrackEvent -> RenderAudioTrack(baseNote, accountViewModel, nav) is AudioHeaderEvent -> RenderAudioHeader(baseNote, accountViewModel, nav) - is DraftEvent -> RenderDraft(baseNote, backgroundColor, accountViewModel, nav) + is DraftEvent -> RenderDraft(baseNote, quotesLeft, backgroundColor, accountViewModel, nav) is ReactionEvent -> RenderReaction(baseNote, quotesLeft, backgroundColor, accountViewModel, nav) is RepostEvent -> RenderRepost(baseNote, quotesLeft, backgroundColor, accountViewModel, nav) is GenericRepostEvent -> RenderRepost(baseNote, quotesLeft, backgroundColor, accountViewModel, nav) @@ -735,6 +735,7 @@ fun ObserveDraftEvent( @Composable fun RenderDraft( note: Note, + quotesLeft: Int, backgroundColor: MutableState, accountViewModel: AccountViewModel, nav: (String) -> Unit, @@ -748,7 +749,7 @@ fun RenderDraft( makeItShort = false, canPreview = true, editState = edits, - quotesLeft = 3, + quotesLeft = quotesLeft, unPackReply = true, accountViewModel = accountViewModel, nav = nav, diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt index 08924100c..c44cd2d7b 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt @@ -554,7 +554,7 @@ fun NoteMaster( } else if (noteEvent is AppDefinitionEvent) { RenderAppDefinition(baseNote, accountViewModel, nav) } else if (noteEvent is DraftEvent) { - RenderDraft(baseNote, backgroundColor, accountViewModel, nav) + RenderDraft(baseNote, 3, backgroundColor, accountViewModel, nav) } else if (noteEvent is HighlightEvent) { DisplayHighlight( noteEvent.quote(),