From 816a22ec69ff9db79dfb8b3963e59b5d8f781723 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 9 Jun 2023 10:25:06 -0400
Subject: [PATCH] More adjustments to borders and spacing between screen
 elements for different event types

---
 .../com/vitorpamplona/amethyst/ui/note/BlankNote.kt    | 10 ++++++----
 .../com/vitorpamplona/amethyst/ui/note/NoteCompose.kt  |  6 +++++-
 .../com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt |  5 +++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt
index 7304691b7..49de14db3 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt
@@ -46,10 +46,12 @@ fun BlankNote(modifier: Modifier = Modifier, isQuote: Boolean = false, idHex: St
                     )
                 }
 
-                Divider(
-                    modifier = Modifier.padding(vertical = 10.dp),
-                    thickness = 0.25.dp
-                )
+                if (!isQuote) {
+                    Divider(
+                        modifier = Modifier.padding(vertical = 10.dp),
+                        thickness = 0.25.dp
+                    )
+                }
             }
         }
     }
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 77db20531..a1d8817ba 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
@@ -187,7 +187,7 @@ fun NoteCompose(
                     onLongClick = { popupExpanded = true }
                 )
             },
-            isBoostedNote
+            isBoostedNote || isQuotedNote
         )
 
         NoteQuickActionMenu(baseNote, popupExpanded, { popupExpanded = false }, accountViewModel)
@@ -528,6 +528,10 @@ private fun NoteWithReactions(
                 accountViewModel,
                 nav
             )
+        } else {
+            if (!isQuotedNote && !isBoostedNote) {
+                Spacer(modifier = Modifier.height(10.dp))
+            }
         }
 
         if (!isQuotedNote && !isBoostedNote) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
index d9b2a6b4f..729d6184d 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.widget.Toast
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.border
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -84,7 +85,7 @@ fun ReactionsRow(baseNote: Note, showReactionDetail: Boolean, accountViewModel:
         mutableStateOf<Boolean>(false)
     }
 
-    Spacer(modifier = Modifier.height(8.dp))
+    Spacer(modifier = Modifier.height(8.dp).border(1.dp, Color.Red))
 
     Row(verticalAlignment = CenterVertically, modifier = Modifier.padding(start = 10.dp)) {
         if (showReactionDetail) {
@@ -269,7 +270,7 @@ fun ReplyReaction(
     grayTint: Color,
     accountViewModel: AccountViewModel,
     showCounter: Boolean = true,
-    iconSize: Dp = 20.dp,
+    iconSize: Dp = 18.dp,
     onPress: () -> Unit
 ) {
     val context = LocalContext.current