From e7971c9b3e62f34d989fcb8fb00a44fe264c1263 Mon Sep 17 00:00:00 2001
From: k1ngsterr1 <swerss564@gmail.com>
Date: Wed, 14 Jan 2026 03:09:42 +0500
Subject: [PATCH] feat: Refactor emoji picker layout and adjust content padding
 for improved appearance

---
 .../messenger/ui/chats/ChatDetailScreen.kt    | 25 +++++++------------
 .../ui/components/AppleEmojiPicker.kt         |  2 +-
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
index 1eeb36c..2c9c229 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
@@ -2330,25 +2330,18 @@ private fun MessageInputBar(
                     animationSpec = tween(100, easing = FastOutSlowInEasing)
                 )
             ) {
-                Box(
+                AppleEmojiPickerPanel(
+                    isDarkTheme = isDarkTheme,
+                    onEmojiSelected = { emoji ->
+                        onValueChange(value + emoji)
+                    },
+                    onClose = {
+                        onToggleEmojiPicker(false)
+                    },
                     modifier = Modifier
                         .fillMaxWidth()
                         .height(emojiPanelHeight)
-                        .padding(bottom = 16.dp)
-                ) {
-                    AppleEmojiPickerPanel(
-                        isDarkTheme = isDarkTheme,
-                        onEmojiSelected = { emoji ->
-                            onValueChange(value + emoji)
-                        },
-                        onClose = {
-                            onToggleEmojiPicker(false)
-                        },
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(emojiPanelHeight - 16.dp)
-                    )
-                }
+                )
             }
         } // End of if (!isBlocked) for emoji picker
     }
diff --git a/app/src/main/java/com/rosetta/messenger/ui/components/AppleEmojiPicker.kt b/app/src/main/java/com/rosetta/messenger/ui/components/AppleEmojiPicker.kt
index 8687f8b..a244f4e 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/components/AppleEmojiPicker.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/components/AppleEmojiPicker.kt
@@ -700,7 +700,7 @@ fun AppleEmojiPickerPanel(
                     .weight(1f),
                 horizontalArrangement = Arrangement.spacedBy(1.dp),
                 verticalArrangement = Arrangement.spacedBy(1.dp),
-                contentPadding = PaddingValues(start = 12.dp, end = 12.dp, top = 4.dp, bottom = 16.dp)
+                contentPadding = PaddingValues(start = 12.dp, end = 12.dp, top = 4.dp, bottom = 4.dp)
             ) {
                 items(
                     items = displayedEmojis,