From d5b6ca3a7e7eaa77e88c3c4affa9c64d377c05a2 Mon Sep 17 00:00:00 2001 From: k1ngsterr1 Date: Mon, 16 Mar 2026 21:26:03 +0700 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B5=D0=BB=D1=8B=D0=B9=20=D1=86=D0=B2?= =?UTF-8?q?=D0=B5=D1=82=20=D0=B4=D0=B0=D1=82=D1=8B=20=D0=B8=20=D0=BF=D1=83?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B3=D0=BE=20=D1=81=D1=82=D0=B5=D0=B9=D1=82?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=BE=D0=B1=D0=BE=D1=8F=D1=85,?= =?UTF-8?q?=20=D1=84=D0=B8=D0=BA=D1=81=20=D0=BE=D0=B1=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=B2=20=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=BF=D0=BF=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - dateHeader и empty state текст белые при тёмной теме или обоях - Увеличена минимальная ширина бабла для групповых сообщений - Медиа-бабл расширяется для имени отправителя в группе Co-Authored-By: Claude Opus 4.6 (1M context) --- .../messenger/ui/chats/ChatDetailScreen.kt | 6 +++--- .../ui/chats/components/ChatDetailComponents.kt | 15 ++++++++++----- 2 files changed, 13 insertions(+), 8 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 2b22aa7..53cdcf0 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 @@ -210,7 +210,7 @@ fun ChatDetailScreen( val chatWallpaperResId = remember(chatWallpaperId) { ThemeWallpapers.drawableResOrNull(chatWallpaperId) } val textColor = if (isDarkTheme) Color.White else Color.Black val secondaryTextColor = if (isDarkTheme) Color(0xFF8E8E93) else Color(0xFF8E8E93) - val dateHeaderTextColor = if (isDarkTheme) Color.White else secondaryTextColor + val dateHeaderTextColor = if (isDarkTheme || chatWallpaperResId != null) Color.White else secondaryTextColor val headerIconColor = Color.White // 🔥 Keyboard & Emoji Coordinator @@ -2399,7 +2399,7 @@ fun ChatDetailScreen( "No messages yet", fontSize = 16.sp, color = - secondaryTextColor, + dateHeaderTextColor, fontWeight = FontWeight .Medium @@ -2419,7 +2419,7 @@ fun ChatDetailScreen( "Send a message to start the conversation", fontSize = 14.sp, color = - secondaryTextColor + dateHeaderTextColor .copy( alpha = 0.7f diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt index 4b43821..20ed071 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt @@ -752,18 +752,23 @@ fun MessageBubble( 280.dp } + val hasGroupSenderName = showGroupSenderLabel && !message.isOutgoing && senderName.isNotBlank() val bubbleWidthModifier = if (isSafeSystemMessage) { Modifier.widthIn(min = 220.dp, max = 320.dp) } else if (isStandaloneGroupInvite) { Modifier.widthIn(min = 180.dp, max = 260.dp) } else if (hasImageWithCaption || hasOnlyMedia) { - Modifier.width( - photoWidth - ) // 🔥 Фиксированная ширина = размер фото (убирает лишний - // отступ) + if (hasGroupSenderName) { + Modifier.widthIn(min = photoWidth) + } else { + Modifier.width( + photoWidth + ) // 🔥 Фиксированная ширина = размер фото (убирает лишний + // отступ) + } } else { - Modifier.widthIn(min = 60.dp, max = 280.dp) + Modifier.widthIn(min = if (hasGroupSenderName) 120.dp else 60.dp, max = 280.dp) } Box(