From 3105ade755906bcdf730aac6fa498d0d5ca1ede6 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Sun, 25 Jun 2023 11:00:41 -0400
Subject: [PATCH] Moves Shape constants to the Shape class

---
 .../vitorpamplona/amethyst/ui/note/NoteCompose.kt | 15 ++++++---------
 .../com/vitorpamplona/amethyst/ui/theme/Shape.kt  |  4 ++++
 2 files changed, 10 insertions(+), 9 deletions(-)

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 249865fe6..965f6d184 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
@@ -157,6 +157,9 @@ import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.HalfPadding
 import com.vitorpamplona.amethyst.ui.theme.HalfVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
+import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonBoxModifer
+import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonIconButtonModifier
+import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonIconModifier
 import com.vitorpamplona.amethyst.ui.theme.Size25dp
 import com.vitorpamplona.amethyst.ui.theme.Size30Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size30dp
@@ -2931,27 +2934,21 @@ private fun VerticalRelayPanelWithFlow(
     }
 }
 
-val showMoreRelaysButtonIconButtonModifier = Modifier.size(24.dp)
-val showMoreRelaysButtonIconModifier = Modifier.size(15.dp)
-val showMoreRelaysButtonBoxModifer = Modifier
-    .fillMaxWidth()
-    .height(25.dp)
-
 @Composable
 private fun ShowMoreRelaysButton(onClick: () -> Unit) {
     Row(
-        modifier = showMoreRelaysButtonBoxModifer,
+        modifier = ShowMoreRelaysButtonBoxModifer,
         horizontalArrangement = Arrangement.Center,
         verticalAlignment = Alignment.Top
     ) {
         IconButton(
-            modifier = showMoreRelaysButtonIconButtonModifier,
+            modifier = ShowMoreRelaysButtonIconButtonModifier,
             onClick = onClick
         ) {
             Icon(
                 imageVector = Icons.Default.ExpandMore,
                 null,
-                modifier = showMoreRelaysButtonIconModifier,
+                modifier = ShowMoreRelaysButtonIconModifier,
                 tint = MaterialTheme.colors.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 18fcf4ccd..766fdccde 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
@@ -79,3 +79,7 @@ val ReactionRowHeight = Modifier.height(24.dp).padding(start = 10.dp)
 val Height4dpModifier = Modifier.height(4.dp)
 
 val AccountPictureModifier = Modifier.width(55.dp).height(55.dp).clip(shape = CircleShape)
+
+val ShowMoreRelaysButtonIconButtonModifier = Modifier.size(24.dp)
+val ShowMoreRelaysButtonIconModifier = Modifier.size(15.dp)
+val ShowMoreRelaysButtonBoxModifer = Modifier.fillMaxWidth().height(25.dp)