design(mail): композер 1:1 по живой теме — чипы получателей и поля

_mobile-mail.css 3283–4067:
- Поля Кому/Копия/Скрытая: подтверждённые адреса — ЧИПЫ-пилюли 26dp
  (фон #70B62B 12%, рамка 25%, текст 13/18, крестик 14 чёрный-50%),
  хвост — инлайн-ввод 14sp; значение остаётся строкой с запятыми,
  VM/parseRecipients не тронуты. Поле авто-высотой (FlowRow), minHeight 40.
- Заголовок «Новое сообщение» 16/600 (был Bold titleMedium).
- Поля темы/получателей: текст и плейсхолдер 14/500 (был 15).
- Тулбар форматирования: r8 (был 10), фон #FDFDFD, тень темы, паддинг 4.
Кнопка «Отправить» 44dp на всю ширину и скрепка 32 в углу редактора
уже совпадали.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
b-dev-mobile
2026-07-10 02:58:13 +00:00
parent 999b52eb80
commit 3da61da45d
2 changed files with 114 additions and 21 deletions
@@ -331,8 +331,8 @@ private fun MailComposeHeader(
Column(modifier = Modifier.weight(1f).padding(horizontal = 8.dp)) {
Text(
title,
style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold,
style = MaterialTheme.typography.bodyLarge,
fontWeight = FontWeight.SemiBold,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
@@ -457,11 +457,11 @@ private fun MailComposeField(
value = value,
onValueChange = onValueChange,
modifier = Modifier.weight(1f),
textStyle = TextStyle(fontSize = 15.sp, color = F7Colors.TextPrimary),
textStyle = TextStyle(fontSize = 14.sp, lineHeight = 20.sp, color = F7Colors.TextPrimary),
cursorBrush = SolidColor(F7Colors.Primary),
decorationBox = { inner ->
if (value.isEmpty()) {
Text(label, color = F7Colors.TextSecondary, fontSize = 15.sp)
Text(label, color = F7Colors.TextSecondary, fontSize = 14.sp)
}
inner()
},
@@ -507,10 +507,11 @@ private fun MailComposeFormattingToolbar(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 12.dp)
.clip(RoundedCornerShape(10.dp))
.border(1.dp, F7Colors.Border, RoundedCornerShape(10.dp))
.background(Color.White)
.padding(8.dp),
.shadow(1.dp, RoundedCornerShape(8.dp), spotColor = F7Colors.Border)
.clip(RoundedCornerShape(8.dp))
.border(1.dp, F7Colors.Border, RoundedCornerShape(8.dp))
.background(Color(0xFFFDFDFD))
.padding(4.dp),
verticalArrangement = Arrangement.spacedBy(6.dp),
) {
Row(
@@ -3,16 +3,24 @@ package ru.forbion.f7cloud.feature.mail
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.Row
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.widthIn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Close
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
@@ -31,6 +39,13 @@ import ru.forbion.f7cloud.core.designsystem.F7Colors
import ru.forbion.f7cloud.feature.contacts.ContactItem
import ru.forbion.f7cloud.feature.contacts.ContactListRow
/**
* Поле получателей с чипами — как в живой теме (_mobile-mail.css):
* подтверждённые адреса (сегменты строки через запятую) — пилюли 26dp
* (фон #70B62B 12%, рамка 25%, текст 13/18, крестик 14), хвост — инлайн-ввод.
* Значение остаётся строкой «a, b, черновик» — VM/parseRecipients не меняются.
*/
@OptIn(ExperimentalLayoutApi::class)
@Composable
fun MailRecipientComposeField(
label: String,
@@ -43,6 +58,19 @@ fun MailRecipientComposeField(
trailingIconUrl: String? = null,
onTrailingClick: (() -> Unit)? = null,
) {
val parts = value.split(',').map { it.trim() }
val draft = if (value.trimEnd().endsWith(",")) "" else parts.lastOrNull().orEmpty()
val committed = (if (draft.isEmpty()) parts else parts.dropLast(1)).filter { it.isNotBlank() }
fun rebuild(newCommitted: List<String>, newDraft: String): String {
val head = newCommitted.joinToString(", ")
return when {
head.isEmpty() -> newDraft
newDraft.isEmpty() -> "$head, "
else -> "$head, $newDraft"
}
}
Box(modifier = Modifier.fillMaxWidth()) {
Row(
modifier = Modifier
@@ -51,27 +79,55 @@ fun MailRecipientComposeField(
.clip(RoundedCornerShape(8.dp))
.border(1.dp, F7Colors.Border, RoundedCornerShape(8.dp))
.background(Color.White)
.padding(horizontal = 12.dp, vertical = 10.dp),
.heightIn(min = 40.dp)
.padding(4.dp),
verticalAlignment = Alignment.CenterVertically,
) {
BasicTextField(
value = value,
onValueChange = onValueChange,
FlowRow(
modifier = Modifier.weight(1f),
textStyle = TextStyle(fontSize = 15.sp, color = F7Colors.TextPrimary),
cursorBrush = SolidColor(F7Colors.Primary),
decorationBox = { inner ->
if (value.isEmpty()) {
Text(label, color = F7Colors.TextSecondary, fontSize = 15.sp)
}
inner()
},
)
horizontalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(4.dp),
verticalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(4.dp),
) {
committed.forEachIndexed { index, recipient ->
RecipientChip(
text = recipient,
onRemove = {
val rest = committed.toMutableList().also { it.removeAt(index) }
onValueChange(rebuild(rest, draft))
},
)
}
BasicTextField(
value = draft,
onValueChange = { new -> onValueChange(rebuild(committed, new)) },
modifier = Modifier
.widthIn(min = 80.dp)
.weight(1f)
.height(26.dp)
.padding(horizontal = 4.dp),
singleLine = true,
textStyle = TextStyle(
fontSize = 14.sp,
lineHeight = 20.sp,
color = F7Colors.TextPrimary,
),
cursorBrush = SolidColor(F7Colors.Primary),
decorationBox = { inner ->
Box(contentAlignment = Alignment.CenterStart, modifier = Modifier.height(26.dp)) {
if (draft.isEmpty() && committed.isEmpty()) {
Text(label, color = F7Colors.TextSecondary, fontSize = 14.sp)
}
inner()
}
},
)
}
if (trailingIconUrl != null && onTrailingClick != null) {
AsyncImage(
model = trailingIconUrl,
contentDescription = null,
modifier = Modifier
.padding(end = 4.dp)
.size(16.dp)
.clickable(onClick = onTrailingClick),
contentScale = ContentScale.Fit,
@@ -107,3 +163,39 @@ fun MailRecipientComposeField(
}
}
}
@Composable
private fun RecipientChip(text: String, onRemove: () -> Unit) {
Row(
modifier = Modifier
.height(26.dp)
.clip(RoundedCornerShape(100.dp))
.background(F7Colors.Primary.copy(alpha = 0.12f))
.border(1.dp, F7Colors.Primary.copy(alpha = 0.25f), RoundedCornerShape(100.dp))
.padding(start = 6.dp, end = 8.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(4.dp),
) {
Text(
text,
fontSize = 13.sp,
lineHeight = 18.sp,
color = F7Colors.TextPrimary,
maxLines = 1,
overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
modifier = Modifier.widthIn(max = 220.dp),
)
Icon(
imageVector = Icons.Filled.Close,
contentDescription = "Убрать получателя",
tint = F7Colors.TextPrimary.copy(alpha = 0.5f),
modifier = Modifier
.size(14.dp)
.clickable(
interactionSource = androidx.compose.runtime.remember { MutableInteractionSource() },
indication = null,
onClick = onRemove,
),
)
}
}