mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-26 11:07:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use single layout for grid badges

Browse Source
This commit is contained in:
arkon
2021-10-09 17:26:53 -04:00
parent 98c0e5271f
commit c95a269460
8 changed files with 138 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceComfortableGridHolder.kt
View File

@ -39,11 +39,11 @@ class SourceComfortableGridHolder(private val view: View, private val adapter: F
binding.thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
// For rounded corners
binding.leftBadges.clipToOutline = true
binding.rightBadges.clipToOutline = true
binding.badges.leftBadges.clipToOutline = true
binding.badges.rightBadges.clipToOutline = true
// Set favorite badge
binding.favoriteText.isVisible = manga.favorite
binding.badges.favoriteText.isVisible = manga.favorite
setImage(manga)
}

14
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceCompactGridHolder.kt
View File

@ -9,7 +9,7 @@ import coil.transition.CrossfadeTransition
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.kanade.tachiyomi.data.coil.MangaCoverFetcher
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.databinding.SourceComfortableGridItemBinding
import eu.kanade.tachiyomi.databinding.SourceCompactGridItemBinding
import eu.kanade.tachiyomi.widget.StateImageViewTarget
/**
@ -20,10 +20,10 @@ import eu.kanade.tachiyomi.widget.StateImageViewTarget
* @param adapter the adapter handling this holder.
* @constructor creates a new catalogue holder.
*/
open class SourceGridHolder(private val view: View, private val adapter: FlexibleAdapter<*>) :
SourceHolder<SourceComfortableGridItemBinding>(view, adapter) {
open class SourceCompactGridHolder(private val view: View, private val adapter: FlexibleAdapter<*>) :
SourceHolder<SourceCompactGridItemBinding>(view, adapter) {
override val binding = SourceComfortableGridItemBinding.bind(view)
override val binding = SourceCompactGridItemBinding.bind(view)
/**
* Method called from [CatalogueAdapter.onBindViewHolder]. It updates the data for this
@ -39,11 +39,11 @@ open class SourceGridHolder(private val view: View, private val adapter: Flexibl
binding.thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
// For rounded corners
binding.leftBadges.clipToOutline = true
binding.rightBadges.clipToOutline = true
binding.badges.leftBadges.clipToOutline = true
binding.badges.rightBadges.clipToOutline = true
// Set favorite badge
binding.favoriteText.isVisible = manga.favorite
binding.badges.favoriteText.isVisible = manga.favorite
setImage(manga)
}

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
View File

@ -48,7 +48,7 @@ class SourceItem(val manga: Manga, private val displayMode: Preference<DisplayMo
Gravity.BOTTOM
)
}
SourceGridHolder(view, adapter)
SourceCompactGridHolder(view, adapter)
}
DisplayModeSetting.COMFORTABLE_GRID -> {
val binding = SourceComfortableGridItemBinding.bind(view)

12
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryComfortableGridHolder.kt
View File

@ -36,26 +36,26 @@ class LibraryComfortableGridHolder(
binding.title.text = item.manga.title
// For rounded corners
binding.leftBadges.clipToOutline = true
binding.rightBadges.clipToOutline = true
binding.badges.leftBadges.clipToOutline = true
binding.badges.rightBadges.clipToOutline = true
// Update the unread count and its visibility.
with(binding.unreadText) {
with(binding.badges.unreadText) {
isVisible = item.unreadCount > 0
text = item.unreadCount.toString()
}
// Update the download count and its visibility.
with(binding.downloadText) {
with(binding.badges.downloadText) {
isVisible = item.downloadCount > 0
text = item.downloadCount.toString()
}
// Update the source language and its visibility
with(binding.languageText) {
with(binding.badges.languageText) {
isVisible = item.sourceLanguage.isNotEmpty()
text = item.sourceLanguage
}
// set local visibility if its local manga
binding.localText.isVisible = item.isLocal
binding.badges.localText.isVisible = item.isLocal
// For rounded corners
binding.card.clipToOutline = true

12
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.kt
View File

@ -34,26 +34,26 @@ open class LibraryCompactGridHolder(
binding.title.text = item.manga.title
// For rounded corners
binding.leftBadges.clipToOutline = true
binding.rightBadges.clipToOutline = true
binding.badges.leftBadges.clipToOutline = true
binding.badges.rightBadges.clipToOutline = true
// Update the unread count and its visibility.
with(binding.unreadText) {
with(binding.badges.unreadText) {
isVisible = item.unreadCount > 0
text = item.unreadCount.toString()
}
// Update the download count and its visibility.
with(binding.downloadText) {
with(binding.badges.downloadText) {
isVisible = item.downloadCount > 0
text = item.downloadCount.toString()
}
// Update the source language and its visibility
with(binding.languageText) {
with(binding.badges.languageText) {
isVisible = item.sourceLanguage.isNotEmpty()
text = item.sourceLanguage
}
// set local visibility if its local manga
binding.localText.isVisible = item.isLocal
binding.badges.localText.isVisible = item.isLocal
// For rounded corners
binding.card.clipToOutline = true