From 39b860f4c8270e936d9e127b87ed367c8a6df797 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sun, 1 May 2022 16:07:05 -0400 Subject: [PATCH] minor possible fixes to span of autofit recycler --- .../java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt | 3 +++ .../java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt index 56a92dbcdf..4b5560d724 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt @@ -138,6 +138,9 @@ fun Context.contextCompatDrawable(@DrawableRes resource: Int): Drawable? { val Int.pxToDp: Int get() = (this / Resources.getSystem().displayMetrics.density).toInt() +val Float.pxToDp: Float + get() = (this / Resources.getSystem().displayMetrics.density) + /** * Converts to px. */ diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt index 2704954745..82143852b6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt @@ -28,7 +28,7 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att var columnWidth = -1f set(value) { field = value - if (measuredWidth > 0) { + if (width > 0) { setSpan(true) } } @@ -62,7 +62,7 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att private fun getTempSpan(): Int { if (spanCount == 0 && columnWidth > 0) { - val dpWidth = (measuredWidth.pxToDp / 100f).roundToInt() + val dpWidth = (measuredWidth.toFloat().pxToDp / 100f).roundToInt() return max(1, (dpWidth / columnWidth).roundToInt()) } return 3