Move cover card outline clipping code from item to holder classes
(cherry picked from commit 471d5d62d5cbd498aed41ad100e1a4169365c00c) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt
This commit is contained in:
parent
b6603c3425
commit
08017a0cd1
@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
|
|||||||
import eu.kanade.tachiyomi.data.glide.GlideApp
|
import eu.kanade.tachiyomi.data.glide.GlideApp
|
||||||
import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
|
import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
|
||||||
import eu.kanade.tachiyomi.widget.StateImageViewTarget
|
import eu.kanade.tachiyomi.widget.StateImageViewTarget
|
||||||
|
import kotlinx.android.synthetic.main.source_grid_item.card
|
||||||
import kotlinx.android.synthetic.main.source_grid_item.progress
|
import kotlinx.android.synthetic.main.source_grid_item.progress
|
||||||
import kotlinx.android.synthetic.main.source_grid_item.thumbnail
|
import kotlinx.android.synthetic.main.source_grid_item.thumbnail
|
||||||
import kotlinx.android.synthetic.main.source_grid_item.title
|
import kotlinx.android.synthetic.main.source_grid_item.title
|
||||||
@ -29,6 +30,9 @@ class SourceGridHolder(private val view: View, private val adapter: FlexibleAdap
|
|||||||
* @param manga the manga to bind.
|
* @param manga the manga to bind.
|
||||||
*/
|
*/
|
||||||
override fun onSetValues(manga: Manga) {
|
override fun onSetValues(manga: Manga) {
|
||||||
|
// Set manga title
|
||||||
|
title.text = manga.title
|
||||||
|
|
||||||
// Set alpha of thumbnail.
|
// Set alpha of thumbnail.
|
||||||
thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
|
thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
|
||||||
|
|
||||||
@ -36,8 +40,8 @@ class SourceGridHolder(private val view: View, private val adapter: FlexibleAdap
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun setImage(manga: Manga) {
|
override fun setImage(manga: Manga) {
|
||||||
// Set manga title
|
// Setting this via XML doesn't work
|
||||||
title.text = manga.title
|
card.clipToOutline = true
|
||||||
|
|
||||||
GlideApp.with(view.context).clear(thumbnail)
|
GlideApp.with(view.context).clear(thumbnail)
|
||||||
if (!manga.thumbnail_url.isNullOrEmpty()) {
|
if (!manga.thumbnail_url.isNullOrEmpty()) {
|
||||||
|
@ -34,9 +34,6 @@ class SourceItem(val manga: Manga, private val catalogueAsList: Preference<Boole
|
|||||||
val parent = adapter.recyclerView
|
val parent = adapter.recyclerView
|
||||||
return if (parent is AutofitRecyclerView) {
|
return if (parent is AutofitRecyclerView) {
|
||||||
view.apply {
|
view.apply {
|
||||||
// Setting this via XML doesn't work
|
|
||||||
card.clipToOutline = true
|
|
||||||
|
|
||||||
card.layoutParams = FrameLayout.LayoutParams(
|
card.layoutParams = FrameLayout.LayoutParams(
|
||||||
MATCH_PARENT, parent.itemWidth / 3 * 4
|
MATCH_PARENT, parent.itemWidth / 3 * 4
|
||||||
)
|
)
|
||||||
|
@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.data.glide.GlideApp
|
|||||||
import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
|
import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
|
||||||
import eu.kanade.tachiyomi.util.isLocal
|
import eu.kanade.tachiyomi.util.isLocal
|
||||||
import eu.kanade.tachiyomi.util.view.visibleIf
|
import eu.kanade.tachiyomi.util.view.visibleIf
|
||||||
|
import kotlinx.android.synthetic.main.source_grid_item.card
|
||||||
import kotlinx.android.synthetic.main.source_grid_item.download_text
|
import kotlinx.android.synthetic.main.source_grid_item.download_text
|
||||||
import kotlinx.android.synthetic.main.source_grid_item.local_text
|
import kotlinx.android.synthetic.main.source_grid_item.local_text
|
||||||
import kotlinx.android.synthetic.main.source_grid_item.thumbnail
|
import kotlinx.android.synthetic.main.source_grid_item.thumbnail
|
||||||
@ -52,6 +53,9 @@ class LibraryGridHolder(
|
|||||||
// set local visibility if its local manga
|
// set local visibility if its local manga
|
||||||
local_text.visibleIf { item.manga.isLocal() }
|
local_text.visibleIf { item.manga.isLocal() }
|
||||||
|
|
||||||
|
// Setting this via XML doesn't work
|
||||||
|
card.clipToOutline = true
|
||||||
|
|
||||||
// Update the cover.
|
// Update the cover.
|
||||||
GlideApp.with(view.context).clear(thumbnail)
|
GlideApp.with(view.context).clear(thumbnail)
|
||||||
GlideApp.with(view.context)
|
GlideApp.with(view.context)
|
||||||
|
@ -44,9 +44,6 @@ class LibraryItem(val manga: LibraryManga, private val libraryAsList: Preference
|
|||||||
val parent = adapter.recyclerView
|
val parent = adapter.recyclerView
|
||||||
return if (parent is AutofitRecyclerView) {
|
return if (parent is AutofitRecyclerView) {
|
||||||
view.apply {
|
view.apply {
|
||||||
// Setting this via XML doesn't work
|
|
||||||
card.clipToOutline = true
|
|
||||||
|
|
||||||
val coverHeight = parent.itemWidth / 3 * 4
|
val coverHeight = parent.itemWidth / 3 * 4
|
||||||
card.layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, coverHeight)
|
card.layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, coverHeight)
|
||||||
gradient.layoutParams = FrameLayout.LayoutParams(
|
gradient.layoutParams = FrameLayout.LayoutParams(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user