From b09bb0c3c5b5bd1efd04cafa69f2179abd3a33d0 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Tue, 4 Apr 2023 13:39:12 -0400
Subject: [PATCH] Fixes margins when images are used in the poll

---
 .../vitorpamplona/amethyst/ui/components/ZoomableImageView.kt | 1 -
 .../main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt  | 2 +-
 .../com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt    | 4 +++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableImageView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableImageView.kt
index 19b3b2a24..e547da6bd 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableImageView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableImageView.kt
@@ -69,7 +69,6 @@ fun ZoomableImageView(word: String, images: List<String> = listOf(word)) {
             contentDescription = word,
             contentScale = ContentScale.FillWidth,
             modifier = Modifier
-                .padding(top = 4.dp)
                 .fillMaxWidth()
                 .clip(shape = RoundedCornerShape(15.dp))
                 .border(
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
index f68efbe7a..d84e3b68f 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
@@ -107,7 +107,7 @@ fun PollNote(
                                     )
                                 }
 
-                                Column(modifier = Modifier.fillMaxWidth()) {
+                                Column(modifier = Modifier.fillMaxWidth().padding(10.dp)) {
                                     TranslatableRichTextViewer(
                                         poll_op.value,
                                         canPreview,
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 f1c38eaaa..8ac5fe9e3 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
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -296,8 +297,9 @@ fun NoteMaster(
                 }
             }
 
+            Spacer(modifier = Modifier.height(10.dp))
+
             if (noteEvent is BadgeDefinitionEvent) {
-                Spacer(modifier = Modifier.padding(top = 10.dp))
                 BadgeDisplay(baseNote = note)
             } else if (noteEvent is LongTextNoteEvent) {
                 Row(modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp)) {