Use single layout for grid badges

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