From 561b19c44798c1c5da5d036061ee63d10f5676e7 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Tue, 14 May 2024 10:16:41 -0400
Subject: [PATCH] Better rendering drafts in the thread

---
 app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt   | 4 +++-
 .../java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt   | 5 +++--
 .../com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
index 5cae304bb..d0d08ce6b 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
@@ -210,10 +210,12 @@ open class Note(val idHex: String) {
         }
     }
 
+    val levelFormatter = DateTimeFormatter.ofPattern("uuuu-MM-dd-HH:mm:ss")
+
     fun formattedDateTime(timestamp: Long): String {
         return Instant.ofEpochSecond(timestamp)
             .atZone(ZoneId.systemDefault())
-            .format(DateTimeFormatter.ofPattern("uuuu-MM-dd-HH:mm:ss"))
+            .format(levelFormatter)
     }
 
     data class LevelSignature(val signature: String, val createdAt: Long?, val author: User?)
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 5a8ea4785..0ee39630a 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, quotesLeft, backgroundColor, accountViewModel, nav)
+        is DraftEvent -> RenderDraft(baseNote, quotesLeft, unPackReply, 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)
@@ -736,6 +736,7 @@ fun ObserveDraftEvent(
 fun RenderDraft(
     note: Note,
     quotesLeft: Int,
+    unPackReply: Boolean,
     backgroundColor: MutableState<Color>,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
@@ -750,7 +751,7 @@ fun RenderDraft(
             canPreview = true,
             editState = edits,
             quotesLeft = quotesLeft,
-            unPackReply = true,
+            unPackReply = unPackReply,
             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 6868861f6..3bdaf5684 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, 3, backgroundColor, accountViewModel, nav)
+                        RenderDraft(baseNote, 3, true, backgroundColor, accountViewModel, nav)
                     } else if (noteEvent is HighlightEvent) {
                         DisplayHighlight(
                             noteEvent.quote(),