pull/94/head
kunfei 5 years ago
parent 70b0625700
commit fdca17fc90
  1. 17
      app/src/main/java/io/legado/app/ui/widget/image/CircleImageView.kt

@ -243,7 +243,11 @@ class CircleImageView : AppCompatImageView {
return try {
val bitmap: Bitmap = if (drawable is ColorDrawable) {
Bitmap.createBitmap(COLORDRAWABLE_DIMENSION, COLORDRAWABLE_DIMENSION, BITMAP_CONFIG)
Bitmap.createBitmap(
COLOR_DRAWABLE_DIMENSION,
COLOR_DRAWABLE_DIMENSION,
BITMAP_CONFIG
)
} else {
Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, BITMAP_CONFIG)
}
@ -260,10 +264,10 @@ class CircleImageView : AppCompatImageView {
}
private fun initializeBitmap() {
if (isDisableCircularTransformation) {
mBitmap = null
mBitmap = if (isDisableCircularTransformation) {
null
} else {
mBitmap = getBitmapFromDrawable(drawable)
getBitmapFromDrawable(drawable)
}
setup()
}
@ -371,12 +375,9 @@ class CircleImageView : AppCompatImageView {
}
companion object {
private val SCALE_TYPE = ScaleType.CENTER_CROP
private val BITMAP_CONFIG = Bitmap.Config.ARGB_8888
private const val COLORDRAWABLE_DIMENSION = 2
private const val COLOR_DRAWABLE_DIMENSION = 2
private const val DEFAULT_BORDER_WIDTH = 0
private const val DEFAULT_BORDER_COLOR = Color.BLACK
private const val DEFAULT_CIRCLE_BACKGROUND_COLOR = Color.TRANSPARENT

Loading…
Cancel
Save