diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt index e792e9324..81de31bbc 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterGrid.kt @@ -2,13 +2,14 @@ package io.legato.kazusa.ui.main.bookshelf.books.styleDefalut import android.content.Context import android.os.Bundle -import android.view.View import android.view.ViewGroup import io.legato.kazusa.base.adapter.ItemViewHolder import io.legato.kazusa.data.entities.Book import io.legato.kazusa.databinding.ItemBookshelfGridBinding import io.legato.kazusa.help.book.isLocal import io.legato.kazusa.help.config.AppConfig +import io.legato.kazusa.utils.gone +import io.legato.kazusa.utils.visible class BooksAdapterGrid(context: Context, private val callBack: CallBack) : BaseBooksAdapter(context) { @@ -44,20 +45,20 @@ class BooksAdapterGrid(context: Context, private val callBack: CallBack) : private fun upRefresh(binding: ItemBookshelfGridBinding, item: Book) { if (!item.isLocal && callBack.isUpdate(item.bookUrl)) { - binding.cdUnread.visibility = View.GONE - binding.rlLoading.visibility = View.VISIBLE + binding.cdUnread.gone() + binding.rlLoading.visible() } else { - binding.rlLoading.visibility = View.GONE + binding.rlLoading.gone() if (AppConfig.showUnread) { val unreadCount = item.getUnreadChapterNum() if (unreadCount > 0) { - binding.cdUnread.visibility = View.VISIBLE + binding.cdUnread.visible() binding.tvUnread.text = unreadCount.toString() } else { - binding.cdUnread.visibility = View.GONE + binding.cdUnread.gone() } } else { - binding.cdUnread.visibility = View.GONE + binding.cdUnread.gone() } } } diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterList.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterList.kt index eb5083c70..4899f2614 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterList.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterList.kt @@ -11,7 +11,9 @@ import io.legato.kazusa.data.entities.Book import io.legato.kazusa.databinding.ItemBookshelfListBinding import io.legato.kazusa.help.book.isLocal import io.legato.kazusa.help.config.AppConfig +import io.legato.kazusa.utils.gone import io.legato.kazusa.utils.toTimeAgo +import io.legato.kazusa.utils.visible import splitties.views.onLongClick class BooksAdapterList( @@ -74,11 +76,15 @@ class BooksAdapterList( } else { binding.rlLoading.isVisible = false if (AppConfig.showUnread) { - //binding.tvUnread.setHighlight(item.lastCheckCount > 0) - binding.tvUnread.isVisible = true - binding.tvUnread.text = item.getUnreadChapterNum().toString() + val unreadCount = item.getUnreadChapterNum() + if (unreadCount > 0) { + binding.cdUnread.visible() + binding.tvUnread.text = unreadCount.toString() + } else { + binding.cdUnread.gone() + } } else { - binding.tvUnread.isVisible = false + binding.cdUnread.gone() } } } diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterListCompact.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterListCompact.kt index 79756fd6d..58cf45eb1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterListCompact.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleDefalut/BooksAdapterListCompact.kt @@ -12,7 +12,9 @@ import io.legato.kazusa.data.entities.Book import io.legato.kazusa.databinding.ItemBookshelfListCompactBinding import io.legato.kazusa.help.book.isLocal import io.legato.kazusa.help.config.AppConfig +import io.legato.kazusa.utils.gone import io.legato.kazusa.utils.toTimeAgo +import io.legato.kazusa.utils.visible import splitties.views.onLongClick class BooksAdapterListCompact( @@ -78,11 +80,15 @@ class BooksAdapterListCompact( } else { binding.rlLoading.isVisible = false if (AppConfig.showUnread) { - //binding.tvUnread.setHighlight(item.lastCheckCount > 0) - binding.tvUnread.isVisible = true - binding.tvUnread.text = item.getUnreadChapterNum().toString() + val unreadCount = item.getUnreadChapterNum() + if (unreadCount > 0) { + binding.cdUnread.visible() + binding.tvUnread.text = unreadCount.toString() + } else { + binding.cdUnread.gone() + } } else { - binding.tvUnread.isVisible = false + binding.cdUnread.gone() } } } diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterList.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterList.kt index 0a7733156..2bc5fb54d 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterList.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterList.kt @@ -128,11 +128,15 @@ class BooksAdapterList(context: Context, callBack: CallBack) : } else { binding.rlLoading.isVisible = false if (AppConfig.showUnread) { - //binding.tvUnread.setHighlight(item.lastCheckCount > 0) - binding.tvUnread.isVisible = true - binding.tvUnread.text = item.getUnreadChapterNum().toString() + val unreadCount = item.getUnreadChapterNum() + if (unreadCount > 0) { + binding.cdUnread.visible() + binding.tvUnread.text = unreadCount.toString() + } else { + binding.cdUnread.gone() + } } else { - binding.tvUnread.isVisible = false + binding.cdUnread.gone() } } } diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterListCompact.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterListCompact.kt index 284336140..afd32a71c 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterListCompact.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/styleFold/BooksAdapterListCompact.kt @@ -126,11 +126,15 @@ class BooksAdapterListCompact(context: Context, callBack: CallBack) : } else { binding.rlLoading.isVisible = false if (AppConfig.showUnread) { - //binding.tvUnread.setHighlight(item.lastCheckCount > 0) - binding.tvUnread.isVisible = true - binding.tvUnread.text = item.getUnreadChapterNum().toString() + val unreadCount = item.getUnreadChapterNum() + if (unreadCount > 0) { + binding.cdUnread.visible() + binding.tvUnread.text = unreadCount.toString() + } else { + binding.cdUnread.gone() + } } else { - binding.tvUnread.isVisible = false + binding.cdUnread.gone() } } }