From f7ab963db9f5413da72f9541b84545f5d842ab0f Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 9 Feb 2024 14:37:49 -0500
Subject: [PATCH] Small fixes in the use of modifiers

---
 .../com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt    | 3 ++-
 .../vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt    | 6 ++++--
 .../amethyst/ui/screen/loggedIn/ProfileScreen.kt          | 8 +++++---
 .../java/com/vitorpamplona/amethyst/ui/theme/Shape.kt     | 1 +
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt
index a8cc82304..01b80009c 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt
@@ -57,6 +57,7 @@ import com.vitorpamplona.amethyst.ui.navigation.routeFor
 import com.vitorpamplona.amethyst.ui.screen.BadgeCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
+import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
 import com.vitorpamplona.amethyst.ui.theme.newItemBackgroundColor
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.launch
@@ -162,7 +163,7 @@ fun BadgeCompose(
                             Icon(
                                 imageVector = Icons.Default.MoreVert,
                                 null,
-                                modifier = Modifier.size(15.dp),
+                                modifier = Size15Modifier,
                                 tint = MaterialTheme.colorScheme.placeholderText,
                             )
 
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 84eec451d..91e90d159 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
@@ -128,6 +128,8 @@ import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.EditFieldBorder
 import com.vitorpamplona.amethyst.ui.theme.EditFieldTrailingIconModifier
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding
+import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size24Modifier
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.lessImportantLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -396,13 +398,13 @@ fun NoteMaster(
                         )
 
                         IconButton(
-                            modifier = Modifier.then(Modifier.size(24.dp)),
+                            modifier = Size24Modifier,
                             onClick = enablePopup,
                         ) {
                             Icon(
                                 imageVector = Icons.Default.MoreVert,
                                 null,
-                                modifier = Modifier.size(15.dp),
+                                modifier = Size15Modifier,
                                 tint = MaterialTheme.colorScheme.placeholderText,
                             )
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
index 82ece50df..6899e929b 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
@@ -155,7 +155,9 @@ import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.ButtonPadding
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
+import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size16Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size25Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
 import com.vitorpamplona.amethyst.ui.theme.ZeroPadding
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -996,7 +998,7 @@ private fun DrawAdditionalInfo(
             Icon(
                 imageVector = Icons.Default.ContentCopy,
                 contentDescription = stringResource(id = R.string.copy_npub_to_clipboard),
-                modifier = Modifier.size(15.dp),
+                modifier = Size15Modifier,
                 tint = MaterialTheme.colorScheme.placeholderText,
             )
         }
@@ -1016,13 +1018,13 @@ private fun DrawAdditionalInfo(
         }
 
         IconButton(
-            modifier = Modifier.size(25.dp),
+            modifier = Size25Modifier,
             onClick = { dialogOpen = true },
         ) {
             Icon(
                 painter = painterResource(R.drawable.ic_qrcode),
                 contentDescription = stringResource(id = R.string.show_npub_as_a_qr_code),
-                modifier = Modifier.size(15.dp),
+                modifier = Size15Modifier,
                 tint = MaterialTheme.colorScheme.placeholderText,
             )
         }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt
index 67f1cb8ac..1f8ba22ff 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt
@@ -116,6 +116,7 @@ val Size19Modifier = Modifier.size(19.dp)
 val Size20Modifier = Modifier.size(20.dp)
 val Size22Modifier = Modifier.size(22.dp)
 val Size24Modifier = Modifier.size(24.dp)
+val Size25Modifier = Modifier.size(25.dp)
 val Size26Modifier = Modifier.size(26.dp)
 val Size30Modifier = Modifier.size(30.dp)
 val Size35Modifier = Modifier.size(35.dp)