From 9d726f45498b63436ccab31ca267551546fa54b1 Mon Sep 17 00:00:00 2001 From: b-mob-deck Date: Mon, 13 Jul 2026 07:39:50 +0000 Subject: [PATCH] =?UTF-8?q?feat(deck):=20=D0=B1=D0=B5=D0=B9=D0=B4=D0=B6=20?= =?UTF-8?q?=D1=87=D0=B8=D1=81=D0=BB=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B5=D0=B2=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA=D0=B5=20(P1=20diff?= =?UTF-8?q?=20=E2=80=94=20CardBadges=20=D0=B2=D0=B5=D0=B1=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit parseCard читает commentsCount (модель Card отдаёт), DeckCardRow показывает «💬 N». Green compile; detekt модуля 103=103 к HEAD (без новых замечаний). --- .../java/ru/forbion/f7cloud/feature/deck/DeckRepository.kt | 2 ++ .../main/java/ru/forbion/f7cloud/feature/deck/DeckScreen.kt | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/feature/deck/src/main/java/ru/forbion/f7cloud/feature/deck/DeckRepository.kt b/feature/deck/src/main/java/ru/forbion/f7cloud/feature/deck/DeckRepository.kt index 27196c7..fb7c78d 100644 --- a/feature/deck/src/main/java/ru/forbion/f7cloud/feature/deck/DeckRepository.kt +++ b/feature/deck/src/main/java/ru/forbion/f7cloud/feature/deck/DeckRepository.kt @@ -100,6 +100,7 @@ class DeckRepository { labels = parseLabels(card.optJSONArray("labels")), assignees = parseAssignees(card.optJSONArray("assignedUsers")), assigneeUids = parseAssigneeUids(card.optJSONArray("assignedUsers")), + commentsCount = card.optInt("commentsCount", 0), ) private fun parseLabels(array: JSONArray?): List { @@ -287,6 +288,7 @@ data class DeckCard( val labels: List = emptyList(), val assignees: List = emptyList(), val assigneeUids: List = emptyList(), + val commentsCount: Int = 0, ) data class DeckBoardDetail( diff --git a/feature/deck/src/main/java/ru/forbion/f7cloud/feature/deck/DeckScreen.kt b/feature/deck/src/main/java/ru/forbion/f7cloud/feature/deck/DeckScreen.kt index d285697..0c4a4b4 100644 --- a/feature/deck/src/main/java/ru/forbion/f7cloud/feature/deck/DeckScreen.kt +++ b/feature/deck/src/main/java/ru/forbion/f7cloud/feature/deck/DeckScreen.kt @@ -292,7 +292,7 @@ private fun DeckCardRow(card: DeckCard, onClick: () -> Unit, onToggleDone: () -> ) } val due = card.duedate?.let { formatDeckDue(it) } - if (due != null || card.assignees.isNotEmpty()) { + if (due != null || card.assignees.isNotEmpty() || card.commentsCount > 0) { Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), @@ -301,6 +301,10 @@ private fun DeckCardRow(card: DeckCard, onClick: () -> Unit, onToggleDone: () -> if (due != null) { Text("🗓 $due", style = MaterialTheme.typography.labelMedium, color = F7Colors.TextSecondary) } + if (card.commentsCount > 0) { + val comments = "💬 ${card.commentsCount}" + Text(comments, style = MaterialTheme.typography.labelMedium, color = F7Colors.TextSecondary) + } if (card.assignees.isNotEmpty()) { Text("👤 ${card.assignees.joinToString(", ")}", style = MaterialTheme.typography.labelMedium, color = F7Colors.TextSecondary, maxLines = 1, overflow = TextOverflow.Ellipsis) }