Extract badge data separately when forming LibraryItem (#3382)

This commit is contained in:
AntsyLich
2026-06-04 18:25:42 +00:00
committed by GitHub
parent a1ad33baef
commit c612a6ca8d
7 changed files with 53 additions and 47 deletions
@@ -10,7 +10,7 @@ import eu.kanade.presentation.theme.TachiyomiPreviewTheme
import tachiyomi.presentation.core.components.Badge
@Composable
internal fun DownloadsBadge(count: Long) {
internal fun DownloadsBadge(count: Int) {
if (count > 0) {
Badge(
text = "$count",
@@ -44,13 +44,13 @@ internal fun LibraryComfortableGrid(
lastModified = manga.coverLastModified,
),
coverBadgeStart = {
DownloadsBadge(count = libraryItem.downloadCount)
UnreadBadge(count = libraryItem.unreadCount)
DownloadsBadge(count = libraryItem.badges.downloadCount)
UnreadBadge(count = libraryItem.badges.unreadCount)
},
coverBadgeEnd = {
LanguageBadge(
isLocal = libraryItem.isLocal,
sourceLanguage = libraryItem.sourceLanguage,
isLocal = libraryItem.badges.isLocal,
sourceLanguage = libraryItem.badges.sourceLanguage,
)
},
onLongClick = { onLongClick(libraryItem.libraryManga) },
@@ -45,13 +45,13 @@ internal fun LibraryCompactGrid(
lastModified = manga.coverLastModified,
),
coverBadgeStart = {
DownloadsBadge(count = libraryItem.downloadCount)
UnreadBadge(count = libraryItem.unreadCount)
DownloadsBadge(count = libraryItem.badges.downloadCount)
UnreadBadge(count = libraryItem.badges.unreadCount)
},
coverBadgeEnd = {
LanguageBadge(
isLocal = libraryItem.isLocal,
sourceLanguage = libraryItem.sourceLanguage,
isLocal = libraryItem.badges.isLocal,
sourceLanguage = libraryItem.badges.sourceLanguage,
)
},
onLongClick = { onLongClick(libraryItem.libraryManga) },
@@ -54,11 +54,11 @@ internal fun LibraryList(
lastModified = manga.coverLastModified,
),
badge = {
DownloadsBadge(count = libraryItem.downloadCount)
UnreadBadge(count = libraryItem.unreadCount)
DownloadsBadge(count = libraryItem.badges.downloadCount)
UnreadBadge(count = libraryItem.badges.unreadCount)
LanguageBadge(
isLocal = libraryItem.isLocal,
sourceLanguage = libraryItem.sourceLanguage,
isLocal = libraryItem.badges.isLocal,
sourceLanguage = libraryItem.badges.sourceLanguage,
)
},
onLongClick = { onLongClick(libraryItem.libraryManga) },