From 8204e605e23efefa4149255df2d558e92982b9fd Mon Sep 17 00:00:00 2001
From: b-dev-mobile <b-dev-mobile@f7cloud.ru>
Date: Fri, 10 Jul 2026 03:24:42 +0000
Subject: [PATCH] =?UTF-8?q?design(mail):=20=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BC=D0=B5=D1=82=D0=BE=D0=BA=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=B6=D0=B8=D0=B2=D0=BE=D0=B9=20=D1=82=D0=B5=D0=BC=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Заголовок 18/600; строки тегов — плашки #F5F5F5 r10 (minHeight 36),
имя тега — цветная пилюля MailTagChip (был голый текст).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../f7cloud/feature/mail/MailComponents.kt     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/feature/mail/src/main/java/ru/forbion/f7cloud/feature/mail/MailComponents.kt b/feature/mail/src/main/java/ru/forbion/f7cloud/feature/mail/MailComponents.kt
index 9772161..d78883a 100644
--- a/feature/mail/src/main/java/ru/forbion/f7cloud/feature/mail/MailComponents.kt
+++ b/feature/mail/src/main/java/ru/forbion/f7cloud/feature/mail/MailComponents.kt
@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -1328,13 +1329,15 @@ fun MailMessageTagsSheet(
             shape = RoundedCornerShape(16.dp),
             color = Color.White,
         ) {
-            Column(modifier = Modifier.padding(16.dp)) {
+            Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                // Живая тема: заголовок модалки 18/600; строки тегов — плашки #F5F5F5 r10
+                // (minHeight 36), имя тега — цветная пилюля.
                 Text(
                     "Изменить метки",
-                    style = MaterialTheme.typography.titleMedium,
+                    style = MaterialTheme.typography.titleMedium.copy(fontSize = 18.sp),
                     fontWeight = FontWeight.SemiBold,
+                    color = F7Colors.TextPrimary,
                 )
-                Spacer(Modifier.height(12.dp))
                 if (availableTags.isEmpty()) {
                     Text("Нет доступных меток", color = F7Colors.TextSecondary)
                 } else {
@@ -1343,17 +1346,20 @@ fun MailMessageTagsSheet(
                         Row(
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .clip(RoundedCornerShape(8.dp))
+                                .heightIn(min = 36.dp)
+                                .clip(RoundedCornerShape(10.dp))
+                                .background(F7Colors.SurfaceMuted)
                                 .clickable { onToggle(tag) }
-                                .padding(vertical = 6.dp),
+                                .padding(horizontal = 8.dp, vertical = 4.dp),
                             verticalAlignment = Alignment.CenterVertically,
+                            horizontalArrangement = Arrangement.spacedBy(8.dp),
                         ) {
                             Checkbox(
                                 checked = checked,
                                 onCheckedChange = { onToggle(tag) },
                                 colors = CheckboxDefaults.colors(checkedColor = F7Colors.Primary),
                             )
-                            Text(tag.displayName, style = MaterialTheme.typography.bodyMedium)
+                            MailTagChip(tag)
                         }
                     }
                 }