design(mail): модалка меток по живой теме
Заголовок 18/600; строки тегов — плашки #F5F5F5 r10 (minHeight 36), имя тега — цветная пилюля MailTagChip (был голый текст). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
|
|||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.heightIn
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.layout.width
|
import androidx.compose.foundation.layout.width
|
||||||
@@ -1328,13 +1329,15 @@ fun MailMessageTagsSheet(
|
|||||||
shape = RoundedCornerShape(16.dp),
|
shape = RoundedCornerShape(16.dp),
|
||||||
color = Color.White,
|
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(
|
Text(
|
||||||
"Изменить метки",
|
"Изменить метки",
|
||||||
style = MaterialTheme.typography.titleMedium,
|
style = MaterialTheme.typography.titleMedium.copy(fontSize = 18.sp),
|
||||||
fontWeight = FontWeight.SemiBold,
|
fontWeight = FontWeight.SemiBold,
|
||||||
|
color = F7Colors.TextPrimary,
|
||||||
)
|
)
|
||||||
Spacer(Modifier.height(12.dp))
|
|
||||||
if (availableTags.isEmpty()) {
|
if (availableTags.isEmpty()) {
|
||||||
Text("Нет доступных меток", color = F7Colors.TextSecondary)
|
Text("Нет доступных меток", color = F7Colors.TextSecondary)
|
||||||
} else {
|
} else {
|
||||||
@@ -1343,17 +1346,20 @@ fun MailMessageTagsSheet(
|
|||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.clip(RoundedCornerShape(8.dp))
|
.heightIn(min = 36.dp)
|
||||||
|
.clip(RoundedCornerShape(10.dp))
|
||||||
|
.background(F7Colors.SurfaceMuted)
|
||||||
.clickable { onToggle(tag) }
|
.clickable { onToggle(tag) }
|
||||||
.padding(vertical = 6.dp),
|
.padding(horizontal = 8.dp, vertical = 4.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||||
) {
|
) {
|
||||||
Checkbox(
|
Checkbox(
|
||||||
checked = checked,
|
checked = checked,
|
||||||
onCheckedChange = { onToggle(tag) },
|
onCheckedChange = { onToggle(tag) },
|
||||||
colors = CheckboxDefaults.colors(checkedColor = F7Colors.Primary),
|
colors = CheckboxDefaults.colors(checkedColor = F7Colors.Primary),
|
||||||
)
|
)
|
||||||
Text(tag.displayName, style = MaterialTheme.typography.bodyMedium)
|
MailTagChip(tag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user