diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt index 5c0623e55..3ef530824 100644 --- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt +++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt @@ -28,6 +28,7 @@ class MangaSelectionDecoration(context: Context) : AbstractSelectionItemDecorati ColorUtils.blendARGB(strokeColor, context.getThemeColor(materialR.attr.colorSurface), 0.8f), 0x74 ) + private val defaultRadius = context.resources.getDimension(R.dimen.list_selector_corner) init { hasBackground = false @@ -51,21 +52,24 @@ class MangaSelectionDecoration(context: Context) : AbstractSelectionItemDecorati bounds: RectF, state: RecyclerView.State, ) { - val radius = (child as? CardView)?.radius ?: 32f + val isCard = child is CardView + val radius = (child as? CardView)?.radius ?: defaultRadius paint.color = fillColor paint.style = Paint.Style.FILL canvas.drawRoundRect(bounds, radius, radius, paint) paint.color = strokeColor paint.style = Paint.Style.STROKE canvas.drawRoundRect(bounds, radius, radius, paint) - checkIcon?.run { - setBounds( - (bounds.left + iconOffset).toInt(), - (bounds.top + iconOffset).toInt(), - (bounds.left + iconOffset + intrinsicWidth).toInt(), - (bounds.top + iconOffset + intrinsicHeight).toInt(), - ) - draw(canvas) + if (isCard) { + checkIcon?.run { + setBounds( + (bounds.left + iconOffset).toInt(), + (bounds.top + iconOffset).toInt(), + (bounds.left + iconOffset + intrinsicWidth).toInt(), + (bounds.top + iconOffset + intrinsicHeight).toInt(), + ) + draw(canvas) + } } } } \ No newline at end of file diff --git a/app/src/main/res/drawable/list_selector.xml b/app/src/main/res/drawable/list_selector.xml index 69666c05d..b1763b045 100644 --- a/app/src/main/res/drawable/list_selector.xml +++ b/app/src/main/res/drawable/list_selector.xml @@ -11,7 +11,7 @@ android:bottom="2dp" android:left="2dp"> - + @@ -22,7 +22,7 @@ android:bottom="2dp" android:left="2dp"> - + @@ -32,7 +32,7 @@ android:bottom="2dp" android:left="2dp"> - + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index c2d158769..282d15034 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -20,6 +20,7 @@ 48dp 16dp 2dp + 12dp 124dp 4dp