From 2c82e6c44731b139fca52bc403519e7bcbecf751 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 21 Jul 2023 11:21:07 -0400
Subject: [PATCH] Adjustments to Modifiers in the Chatroom screen

---
 .../ui/screen/loggedIn/ChannelScreen.kt       | 23 ++++++++-----------
 .../vitorpamplona/amethyst/ui/theme/Shape.kt  | 11 +++++++++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
index 9fb9ed30a..2a88bc3f8 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
@@ -19,7 +19,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
@@ -124,6 +123,10 @@ import com.vitorpamplona.amethyst.ui.screen.equalImmutableLists
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
+import com.vitorpamplona.amethyst.ui.theme.EditFieldBorder
+import com.vitorpamplona.amethyst.ui.theme.EditFieldLeadingIconModifier
+import com.vitorpamplona.amethyst.ui.theme.EditFieldModifier
+import com.vitorpamplona.amethyst.ui.theme.EditFieldTrailingIconModifier
 import com.vitorpamplona.amethyst.ui.theme.Size25dp
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
 import com.vitorpamplona.amethyst.ui.theme.SmallBorder
@@ -351,15 +354,13 @@ fun EditFieldRow(
     accountViewModel: AccountViewModel,
     onSendNewMessage: () -> Unit
 ) {
-    val context = LocalContext.current
-
     Row(
-        modifier = Modifier
-            .padding(start = 10.dp, end = 10.dp, bottom = 10.dp, top = 5.dp)
-            .fillMaxWidth(),
+        modifier = EditFieldModifier,
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically
     ) {
+        val context = LocalContext.current
+
         MyTextField(
             value = channelScreenModel.message,
             onValueChange = {
@@ -368,7 +369,7 @@ fun EditFieldRow(
             keyboardOptions = KeyboardOptions.Default.copy(
                 capitalization = KeyboardCapitalization.Sentences
             ),
-            shape = RoundedCornerShape(25.dp),
+            shape = EditFieldBorder,
             modifier = Modifier.weight(1f, true),
             placeholder = {
                 Text(
@@ -383,18 +384,14 @@ fun EditFieldRow(
                         onSendNewMessage()
                     },
                     isActive = channelScreenModel.message.text.isNotBlank() && !channelScreenModel.isUploadingImage,
-                    modifier = Modifier
-                        .height(32.dp)
-                        .padding(end = 10.dp)
+                    modifier = EditFieldTrailingIconModifier
                 )
             },
             leadingIcon = {
                 UploadFromGallery(
                     isUploading = channelScreenModel.isUploadingImage,
                     tint = MaterialTheme.colors.placeholderText,
-                    modifier = Modifier
-                        .height(32.dp)
-                        .padding(start = 2.dp)
+                    modifier = EditFieldLeadingIconModifier
                 ) {
                     val fileServer = if (isPrivate) {
                         // TODO: Make private servers
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 1161e6c48..97b7bcd30 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
@@ -28,6 +28,7 @@ val TabRowHeight = Modifier.height(40.dp)
 val SmallBorder = RoundedCornerShape(7.dp)
 val QuoteBorder = RoundedCornerShape(15.dp)
 val ButtonBorder = RoundedCornerShape(20.dp)
+val EditFieldBorder = RoundedCornerShape(25.dp)
 
 val ChatBubbleShapeMe = RoundedCornerShape(15.dp, 15.dp, 3.dp, 15.dp)
 val ChatBubbleShapeThem = RoundedCornerShape(3.dp, 15.dp, 15.dp, 15.dp)
@@ -118,3 +119,13 @@ val ChatHeadlineBorders = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.
 val VolumeBottomIconSize = Modifier.size(70.dp).padding(10.dp)
 val PinBottomIconSize = Modifier.size(70.dp).padding(10.dp)
 val NIP05IconSize = Modifier.size(14.dp).padding(top = 1.dp, start = 1.dp, end = 1.dp)
+
+val EditFieldModifier = Modifier
+    .padding(start = 10.dp, end = 10.dp, bottom = 10.dp, top = 5.dp)
+    .fillMaxWidth()
+val EditFieldTrailingIconModifier = Modifier
+    .height(32.dp)
+    .padding(start = 5.dp, end = 10.dp)
+val EditFieldLeadingIconModifier = Modifier
+    .height(32.dp)
+    .padding(start = 2.dp)