From e99c31d418891ee101830f3d090fba0831886889 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Wed, 21 May 2025 12:38:18 -0500
Subject: [PATCH] =?UTF-8?q?Refactor:=20Adjust=20padding=20and=20sizes=20in?=
 =?UTF-8?q?=20MessageItem=20and=20Reaction=20compon=E2=80=A6=20(#1898)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesh/ui/message/components/MessageItem.kt |  5 +----
 .../mesh/ui/message/components/Reaction.kt    | 22 +++++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/message/components/MessageItem.kt b/app/src/main/java/com/geeksville/mesh/ui/message/components/MessageItem.kt
index 3df353b76..abb5fe4a4 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/message/components/MessageItem.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/message/components/MessageItem.kt
@@ -90,7 +90,6 @@ internal fun MessageItem(
     } else {
         Modifier.padding(start = 8.dp, top = 8.dp, end = 0.dp, bottom = 6.dp)
     }
-
     if (!fromLocal) {
         UserAvatar(
             node = node,
@@ -99,7 +98,6 @@ internal fun MessageItem(
                 .align(Alignment.Top),
         ) { onChipClick() }
     }
-
     Card(
         modifier = Modifier
             .weight(1f)
@@ -113,7 +111,6 @@ internal fun MessageItem(
         ),
         shape = RoundedCornerShape(topStart, topEnd, bottomStart = 12.dp, bottomEnd = 12.dp)
     ) {
-
         Row(
             modifier = Modifier
                 .fillMaxWidth()
@@ -165,7 +162,7 @@ internal fun MessageItem(
         }
     }
     if (!fromLocal) {
-        ReactionButton(Modifier.padding(16.dp), onSendReaction)
+        ReactionButton(Modifier.padding(4.dp), onSendReaction)
     }
 }
 
diff --git a/app/src/main/java/com/geeksville/mesh/ui/message/components/Reaction.kt b/app/src/main/java/com/geeksville/mesh/ui/message/components/Reaction.kt
index 280af3ff5..7fffc831a 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/message/components/Reaction.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/message/components/Reaction.kt
@@ -37,7 +37,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.EmojiEmotions
 import androidx.compose.material3.Badge
 import androidx.compose.material3.BadgedBox
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -77,11 +77,13 @@ fun ReactionButton(
             onDismiss = { showEmojiPickerDialog = false }
         )
     }
-    IconButton(onClick = { showEmojiPickerDialog = true }) {
+    IconButton(
+        modifier = modifier.size(48.dp),
+        onClick = { showEmojiPickerDialog = true }
+    ) {
         Icon(
             imageVector = Icons.Default.EmojiEmotions,
             contentDescription = "emoji",
-            modifier = modifier.size(16.dp),
         )
     }
 }
@@ -93,13 +95,10 @@ private fun ReactionItem(
     onClick: () -> Unit = {},
 ) {
     BadgedBox(
-        modifier = Modifier.padding(start = 2.dp, top = 8.dp, end = 2.dp, bottom = 4.dp),
+        modifier = Modifier.padding(start = 2.dp, top = 2.dp, end = 2.dp, bottom = 4.dp),
         badge = {
             if (emojiCount > 1) {
-                Badge(
-                    containerColor = MaterialTheme.colorScheme.onBackground,
-                    contentColor = MaterialTheme.colorScheme.background,
-                ) {
+                Badge {
                     Text(
                         fontWeight = FontWeight.Bold,
                         text = emojiCount.toString()
@@ -111,7 +110,7 @@ private fun ReactionItem(
         Surface(
             modifier = Modifier
                 .clickable { onClick() },
-            color = MaterialTheme.colorScheme.surface,
+            color = MaterialTheme.colorScheme.primaryContainer,
             shape = RoundedCornerShape(32.dp),
         ) {
             Text(
@@ -194,7 +193,7 @@ fun ReactionDialog(
         }
     }
 
-    Divider(Modifier.padding(vertical = 8.dp))
+    HorizontalDivider(Modifier.padding(vertical = 8.dp))
 
     LazyColumn(
         modifier = Modifier.fillMaxWidth(),
@@ -238,7 +237,8 @@ fun ReactionItemPreview() {
 fun ReactionRowPreview() {
     AppTheme {
         ReactionRow(
-            fromLocal = true, reactions = listOf(
+            fromLocal = true,
+            reactions = listOf(
                 Reaction(
                     replyId = 1,
                     user = MeshProtos.User.getDefaultInstance(),