From c5737e51b0d9cc55ccbbbf7a23e4bfdd67c51e10 Mon Sep 17 00:00:00 2001 From: k1ngsterr1 Date: Sat, 7 Mar 2026 17:34:36 +0500 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B5=20=D0=BF=D1=80=D0=BE=D0=BA?= =?UTF-8?q?=D1=80=D1=83=D1=87=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA?= =?UTF-8?q?=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=BC=20=D1=81=D0=BE=D0=BE=D0=B1?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=D0=BC=20=D0=B8=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D0=BA=D0=B0=20"=D0=9F=D1=80=D0=BE=D0=BA=D1=80?= =?UTF-8?q?=D1=83=D1=82=D0=B8=D1=82=D1=8C=20=D0=B2=D0=BD=D0=B8=D0=B7"=20?= =?UTF-8?q?=D0=B2=20ChatDetailScreen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt | 3 ++- .../rosetta/messenger/ui/components/AppleEmojiEditText.kt | 5 +++-- 2 files changed, 5 insertions(+), 3 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 6904e51..b2cbfc4 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 @@ -1156,7 +1156,8 @@ fun ChatDetailScreen( color = Color.White, maxLines = 1, overflow = android.text.TextUtils.TruncateAt.END, - enableLinks = false + enableLinks = false, + minHeightMultiplier = 1.1f ) if (!isSavedMessages && !isGroupChat && diff --git a/app/src/main/java/com/rosetta/messenger/ui/components/AppleEmojiEditText.kt b/app/src/main/java/com/rosetta/messenger/ui/components/AppleEmojiEditText.kt index f9428b2..954da89 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/components/AppleEmojiEditText.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/components/AppleEmojiEditText.kt @@ -358,13 +358,14 @@ fun AppleEmojiText( enableMentions: Boolean = false, onMentionClick: ((String) -> Unit)? = null, onClick: (() -> Unit)? = null, // 🔥 Обычный tap (selection mode в MessageBubble) - onLongClick: (() -> Unit)? = null // 🔥 Callback для long press (selection в MessageBubble) + onLongClick: (() -> Unit)? = null, // 🔥 Callback для long press (selection в MessageBubble) + minHeightMultiplier: Float = 1.5f ) { val fontSizeValue = if (fontSize == androidx.compose.ui.unit.TextUnit.Unspecified) 15f else fontSize.value // Минимальная высота для корректного отображения emoji - val minHeight = (fontSizeValue * 1.5).toInt() + val minHeight = (fontSizeValue * minHeightMultiplier).toInt() // Преобразуем FontWeight в Android typeface style val typefaceStyle = when (fontWeight) {