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) }