From c1d6d965cda89e9aa59023abd2733af253a498f7 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 13 Jan 2023 09:39:45 -0500
Subject: [PATCH] Improves Note's padding and click area.

---
 .../amethyst/ui/note/BoostSetCompose.kt             | 13 +++++++++----
 .../amethyst/ui/note/LikeSetCompose.kt              |  9 +++++++--
 .../java/com/vitorpamplona/amethyst/ui/note/Note.kt |  3 +--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BoostSetCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BoostSetCompose.kt
index cc56f2706..c337cdb9e 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BoostSetCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BoostSetCompose.kt
@@ -40,15 +40,20 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import nostr.postr.events.TextNoteEvent
 
 @Composable
-fun BoostSetCompose(likeSetCard: BoostSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
+fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
     val noteState by likeSetCard.note.live.observeAsState()
     val note = noteState?.note
 
     if (note?.event == null) {
-        BlankNote(modifier, isInnerNote)
+        BlankNote(Modifier, isInnerNote)
     } else {
-        Column(modifier = modifier) {
-            Row(modifier = Modifier.padding(horizontal = if (!isInnerNote) 12.dp else 0.dp)) {
+        Column() {
+            Row(modifier = Modifier
+                .padding(
+                    start = if (!isInnerNote) 12.dp else 0.dp,
+                    end = if (!isInnerNote) 12.dp else 0.dp,
+                    top = 10.dp)
+            ) {
 
                 // Draws the like picture outside the boosted card.
                 if (!isInnerNote) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/LikeSetCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/LikeSetCompose.kt
index b54cca4b5..6e2c149ea 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/LikeSetCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/LikeSetCompose.kt
@@ -44,10 +44,15 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
     val note = noteState?.note
 
     if (note?.event == null) {
-        BlankNote(modifier, isInnerNote)
+        BlankNote(Modifier, isInnerNote)
     } else {
         Column(modifier = modifier) {
-            Row(modifier = Modifier.padding(horizontal = if (!isInnerNote) 12.dp else 0.dp)) {
+            Row(                modifier = Modifier
+                .padding(
+                    start = if (!isInnerNote) 12.dp else 0.dp,
+                    end = if (!isInnerNote) 12.dp else 0.dp,
+                    top = 10.dp)
+            ) {
 
                 // Draws the like picture outside the boosted card.
                 if (!isInnerNote) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Note.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Note.kt
index b629984e8..4b4818325 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Note.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Note.kt
@@ -43,14 +43,13 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
         val authorState by note.author!!.live.observeAsState()
         val author = authorState?.user
 
-        Column(modifier = modifier) {
+        Column(modifier = modifier.clickable ( onClick = { navController.navigate("Note/${note.idHex}") } )) {
             Row(
                 modifier = Modifier
                     .padding(
                         start = if (!isInnerNote) 12.dp else 0.dp,
                         end = if (!isInnerNote) 12.dp else 0.dp,
                         top = 10.dp)
-                    .clickable ( onClick = { navController.navigate("Note/${note.idHex}") } )
             ) {
 
                 // Draws the boosted picture outside the boosted card.