Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update AndroidDrawablePainter #110

Merged
merged 2 commits into from Oct 6, 2020
Merged

Update AndroidDrawablePainter #110

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5450a4
Update AndroidDrawablePainter
chrisbanes Oct 6, 2020
fa7a691
Don't scale if the drawable has no intrinsic size
chrisbanes Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 19 additions & 7 deletions ...ding-core/src/main/java/dev/chrisbanes/accompanist/imageloading/AndroidDrawablePainter.kt
View file
Open in desktop
Expand Up @@ -39,21 +39,19 @@ import androidx.compose.ui.graphics.painter.ColorPainter
import androidx.compose.ui.graphics.painter.ImagePainter
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.graphics.withSave
import androidx.compose.ui.unit.LayoutDirection
import androidx.core.graphics.drawable.DrawableCompat
import kotlin.math.roundToInt

/**
* A [Painter] which draws an Android [Drawable]. Supports [Animatable] drawables.
*
* Taken from https://goo.gle/compose-drawable-painter
*/
class AndroidDrawablePainter(
private val drawable: Drawable
) : Painter() {
private val drawableSize = Size(
drawable.intrinsicWidth.toFloat(),
drawable.intrinsicWidth.toFloat()
)

private var invalidateTick by mutableStateOf(0)
private var startedAnimatable = drawable is Animatable && drawable.isRunning

Expand Down Expand Up @@ -102,7 +100,11 @@ class AndroidDrawablePainter(
)
}

override val intrinsicSize: Size get() = drawableSize
override val intrinsicSize: Size
get() = Size(
drawable.intrinsicWidth.toFloat(),
drawable.intrinsicHeight.toFloat()
)

override fun DrawScope.onDraw() {
if (!startedAnimatable && drawable is Animatable && !drawable.isRunning) {
Expand All @@ -116,7 +118,17 @@ class AndroidDrawablePainter(
invalidateTick

drawable.setBounds(0, 0, size.width.toInt(), size.height.toInt())
drawable.draw(canvas.nativeCanvas)

canvas.withSave {
// Painters are responsible for scaling content to meet the canvas size
if (drawable.intrinsicWidth > 0 && drawable.intrinsicHeight > 0) {
canvas.scale(
sx = size.width / drawable.intrinsicWidth,
sy = size.height / drawable.intrinsicHeight
)
}
drawable.draw(canvas.nativeCanvas)
}
}
}
}
Expand Down