From 5fb0fe40de5d43d7e9b290d8aee83786fa79d047 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sat, 16 Apr 2022 12:44:21 -0400 Subject: [PATCH] Fix unread badge showing outlines while setting is off Closes #1189 --- .../java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt | 2 ++ .../main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt | 2 +- .../java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt index ab83c4122e..c204e937f4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt @@ -13,6 +13,7 @@ import eu.kanade.tachiyomi.data.image.coil.loadManga import eu.kanade.tachiyomi.databinding.MangaGridItemBinding import eu.kanade.tachiyomi.util.lang.highlightText import eu.kanade.tachiyomi.util.system.dpToPx +import eu.kanade.tachiyomi.util.view.setCards /** * Class used to hold the displayed data of a manga in the library, like the cover or the title. @@ -56,6 +57,7 @@ class LibraryGridHolder( */ override fun onSetValues(item: LibraryItem) { // Update the title and subtitle of the manga. + setCards(adapter.showOutline, binding.card, binding.unreadDownloadBadge.root) binding.constraintLayout.isVisible = !item.manga.isBlank() binding.title.text = item.manga.title.highlightText(item.filter, color) val authorArtist = if (item.manga.author == item.manga.artist || item.manga.artist.isNullOrBlank()) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt index 9f4921a824..9657ce1fc2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt @@ -26,7 +26,7 @@ abstract class LibraryHolder( init { val card = itemView.findViewById(R.id.card) - val badgeView = itemView.findViewById(R.id.badge_view) + val badgeView = itemView.findViewById(R.id.unread_download_badge) if (card != null && badgeView != null) { setCards(adapter.showOutline, card, badgeView) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt index 932871bb89..5f8247a01b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt @@ -10,6 +10,7 @@ import eu.kanade.tachiyomi.data.image.coil.loadManga import eu.kanade.tachiyomi.databinding.MangaListItemBinding import eu.kanade.tachiyomi.util.lang.highlightText import eu.kanade.tachiyomi.util.system.dpToPx +import eu.kanade.tachiyomi.util.view.setCards /** * Class used to hold the displayed data of a manga in the library, like the cover or the binding.title. @@ -34,6 +35,7 @@ class LibraryListHolder( * @param item the manga item to bind. */ override fun onSetValues(item: LibraryItem) { + setCards(adapter.showOutline, binding.card, binding.unreadDownloadBadge.root) binding.title.isVisible = true binding.constraintLayout.minHeight = 56.dpToPx if (item.manga.isBlank()) {