fix: Fixed bitmap caching

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
     }
 }
 

neumorphism/src/main/java/soup/neumorphism/NeumorphButton.kt

@@ -28,7 +28,10 @@ open class NeumorphButton @JvmOverloads constructor(
         val fillColor = a.getColorStateList(R.styleable.NeumorphButton_neumorph_backgroundColor)
         val strokeColor = a.getColorStateList(R.styleable.NeumorphButton_neumorph_strokeColor)
         val strokeWidth = a.getDimension(R.styleable.NeumorphButton_neumorph_strokeWidth, 0f)
-        val shapeType = a.getInt(R.styleable.NeumorphButton_neumorph_shapeType, ShapeType.DEFAULT)
+        val shapeType = a.getInt(R.styleable.NeumorphButton_neumorph_shapeType, ShapeType.FLAT.ordinal)
+            .let { ordinal ->
+                ShapeType.values()[ordinal]
+            }
 
         val shadowElevation = a.getDimension(
             R.styleable.NeumorphButton_neumorph_shadowElevation, 0f
@@ -114,12 +117,11 @@ open class NeumorphButton @JvmOverloads constructor(
         return shapeDrawable.getStrokeWidth()
     }
 
-    fun setShapeType(@ShapeType shapeType: Int) {
+    fun setShapeType(shapeType: ShapeType) {
         shapeDrawable.setShapeType(shapeType)
     }
 
-    @ShapeType
-    fun getShapeType(): Int {
+    fun getShapeType(): ShapeType {
         return shapeDrawable.getShapeType()
     }
 

neumorphism/src/main/java/soup/neumorphism/NeumorphCardView.kt

@@ -30,7 +30,11 @@ open class NeumorphCardView @JvmOverloads constructor(
         val fillColor = a.getColorStateList(R.styleable.NeumorphCardView_neumorph_backgroundColor)
         val strokeColor = a.getColorStateList(R.styleable.NeumorphCardView_neumorph_strokeColor)
         val strokeWidth = a.getDimension(R.styleable.NeumorphCardView_neumorph_strokeWidth, 0f)
-        val shapeType = a.getInt(R.styleable.NeumorphCardView_neumorph_shapeType, ShapeType.DEFAULT)
+        val shapeType = a.getInt(R.styleable.NeumorphCardView_neumorph_shapeType, ShapeType.FLAT.ordinal)
+            .let { ordinal ->
+                ShapeType.values()[ordinal]
+            }
+
         val shadowElevation = a.getDimension(
             R.styleable.NeumorphCardView_neumorph_shadowElevation, 0f
         ).roundToInt()
@@ -124,12 +128,11 @@ open class NeumorphCardView @JvmOverloads constructor(
         return shapeDrawable.getStrokeWidth()
     }
 
-    fun setShapeType(@ShapeType shapeType: Int) {
+    fun setShapeType(shapeType: ShapeType) {
         shapeDrawable.setShapeType(shapeType)
     }
 
-    @ShapeType
-    fun getShapeType(): Int {
+    fun getShapeType(): ShapeType {
         return shapeDrawable.getShapeType()
     }
 

neumorphism/src/main/java/soup/neumorphism/NeumorphFloatingActionButton.kt

@@ -29,8 +29,11 @@ open class NeumorphFloatingActionButton @JvmOverloads constructor(
         val fillColor = a.getColorStateList(R.styleable.NeumorphFloatingActionButton_neumorph_backgroundColor)
         val strokeColor = a.getColorStateList(R.styleable.NeumorphFloatingActionButton_neumorph_strokeColor)
         val strokeWidth = a.getDimension(R.styleable.NeumorphFloatingActionButton_neumorph_strokeWidth, 0f)
-        val shapeType =
-            a.getInt(R.styleable.NeumorphFloatingActionButton_neumorph_shapeType, ShapeType.DEFAULT)
+        val shapeType = a.getInt(R.styleable.NeumorphFloatingActionButton_neumorph_shapeType, ShapeType.FLAT.ordinal)
+            .let { ordinal ->
+                ShapeType.values()[ordinal]
+            }
+
         val shadowElevation = a.getDimension(
             R.styleable.NeumorphFloatingActionButton_neumorph_shadowElevation, 0f
         ).roundToInt()
@@ -113,12 +116,11 @@ open class NeumorphFloatingActionButton @JvmOverloads constructor(
         return shapeDrawable.getStrokeWidth()
     }
 
-    fun setShapeType(@ShapeType shapeType: Int) {
+    fun setShapeType(shapeType: ShapeType) {
         shapeDrawable.setShapeType(shapeType)
     }
 
-    @ShapeType
-    fun getShapeType(): Int {
+    fun getShapeType(): ShapeType {
         return shapeDrawable.getShapeType()
     }
 

neumorphism/src/main/java/soup/neumorphism/NeumorphImageButton.kt

@@ -29,7 +29,11 @@ open class NeumorphImageButton @JvmOverloads constructor(
         val fillColor = a.getColorStateList(R.styleable.NeumorphImageButton_neumorph_backgroundColor)
         val strokeColor = a.getColorStateList(R.styleable.NeumorphImageButton_neumorph_strokeColor)
         val strokeWidth = a.getDimension(R.styleable.NeumorphImageButton_neumorph_strokeWidth, 0f)
-        val shapeType = a.getInt(R.styleable.NeumorphImageButton_neumorph_shapeType, ShapeType.DEFAULT)
+        val shapeType = a.getInt(R.styleable.NeumorphImageButton_neumorph_shapeType, ShapeType.FLAT.ordinal)
+            .let { ordinal ->
+                ShapeType.values()[ordinal]
+            }
+
         val shadowElevation = a.getDimension(
             R.styleable.NeumorphImageButton_neumorph_shadowElevation, 0f
         ).roundToInt()
@@ -112,12 +116,11 @@ open class NeumorphImageButton @JvmOverloads constructor(
         return shapeDrawable.getStrokeWidth()
     }
 
-    fun setShapeType(@ShapeType shapeType: Int) {
+    fun setShapeType(shapeType: ShapeType) {
         shapeDrawable.setShapeType(shapeType)
     }
 
-    @ShapeType
-    fun getShapeType(): Int {
+    fun getShapeType(): ShapeType {
         return shapeDrawable.getShapeType()
     }
 

neumorphism/src/main/java/soup/neumorphism/NeumorphImageView.kt

@@ -29,7 +29,11 @@ open class NeumorphImageView @JvmOverloads constructor(
         val fillColor = a.getColorStateList(R.styleable.NeumorphImageView_neumorph_backgroundColor)
         val strokeColor = a.getColorStateList(R.styleable.NeumorphImageView_neumorph_strokeColor)
         val strokeWidth = a.getDimension(R.styleable.NeumorphImageView_neumorph_strokeWidth, 0f)
-        val shapeType = a.getInt(R.styleable.NeumorphImageView_neumorph_shapeType, ShapeType.DEFAULT)
+        val shapeType = a.getInt(R.styleable.NeumorphImageView_neumorph_shapeType, ShapeType.FLAT.ordinal)
+            .let { ordinal ->
+                ShapeType.values()[ordinal]
+            }
+
         val shadowElevation = a.getDimension(
             R.styleable.NeumorphImageView_neumorph_shadowElevation, 0f
         ).roundToInt()
@@ -112,12 +116,11 @@ open class NeumorphImageView @JvmOverloads constructor(
         return shapeDrawable.getStrokeWidth()
     }
 
-    fun setShapeType(@ShapeType shapeType: Int) {
+    fun setShapeType(shapeType: ShapeType) {
         shapeDrawable.setShapeType(shapeType)
     }
 
-    @ShapeType
-    fun getShapeType(): Int {
+    fun getShapeType(): ShapeType {
         return shapeDrawable.getShapeType()
     }
 

neumorphism/src/main/java/soup/neumorphism/NeumorphShapeDrawable.kt

@@ -8,6 +8,7 @@ import android.util.AttributeSet
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.StyleRes
+import soup.neumorphism.internal.drawable.NeumorphShadow
 import soup.neumorphism.internal.shape.Shape
 import soup.neumorphism.internal.shape.ShapeFactory
 
@@ -155,7 +156,7 @@ open class NeumorphShapeDrawable : Drawable {
         return rectF
     }
 
-    fun setShapeType(@ShapeType shapeType: Int) {
+    fun setShapeType(shapeType: ShapeType) {
         if (drawableState.shapeType != shapeType) {
             drawableState.shapeType = shapeType
             updateShadowShape()
@@ -170,11 +171,27 @@ open class NeumorphShapeDrawable : Drawable {
             return
         }
 
-        shadow = ShapeFactory.createReusableShape(drawableState, internalBounds)
+        val appearance = NeumorphShadow.Style(
+            drawableState.shadowElevation,
+            drawableState.blurRadius,
+            drawableState.shapeAppearanceModel.getCornerFamily(),
+            drawableState.shapeAppearanceModel.getCornerSize()
+        )
+
+        val theme = NeumorphShadow.Theme(
+            drawableState.shadowColorLight,
+            drawableState.shadowColorDark
+        )
+
+        shadow = ShapeFactory.createReusableShape(
+            appearance,
+            theme,
+            drawableState.shapeType,
+            internalBounds
+        )
     }
 
-    @ShapeType
-    fun getShapeType(): Int {
+    fun getShapeType(): ShapeType {
         return drawableState.shapeType
     }
 
@@ -280,7 +297,7 @@ open class NeumorphShapeDrawable : Drawable {
             drawBackgroundBitmap(canvas)
         }
 
-        shadow?.draw(canvas, outlinePath)
+        shadow?.draw(canvas)
 
         if (hasStroke()) {
             drawStrokeShape(canvas)
@@ -420,8 +437,7 @@ open class NeumorphShapeDrawable : Drawable {
         var strokeColor: ColorStateList? = null,
         var strokeWidth: Float = 0f,
         var alpha: Int = 255,
-        @ShapeType
-        var shapeType: Int = ShapeType.DEFAULT,
+        var shapeType: ShapeType = ShapeType.FLAT,
         var shadowElevation: Int = 0,
         var blurRadius: Int = 10,
         var shadowColorLight: Int = Color.WHITE,

neumorphism/src/main/java/soup/neumorphism/ShapeType.kt

@@ -1,17 +1,7 @@
 package soup.neumorphism
 
-import androidx.annotation.IntDef
-import androidx.annotation.RestrictTo
-
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-@IntDef(ShapeType.FLAT, ShapeType.PRESSED, ShapeType.BASIN)
-@Retention(AnnotationRetention.SOURCE)
-annotation class ShapeType {
-    companion object {
-        const val FLAT = 0
-        const val PRESSED = 1
-        const val BASIN = 2
-
-        const val DEFAULT = FLAT
-    }
+enum class ShapeType {
+    FLAT,
+    PRESSED,
+    BASIN
 }

neumorphism/src/main/java/soup/neumorphism/internal/shape/BasinShape.kt

@@ -1,38 +1,35 @@
 package soup.neumorphism.internal.shape
 
 import android.graphics.Canvas
-import android.graphics.Path
 import android.graphics.Rect
-import soup.neumorphism.NeumorphShapeDrawable.NeumorphShapeDrawableState
+import soup.neumorphism.ShapeType
 import soup.neumorphism.internal.drawable.NeumorphShadow
-import soup.neumorphism.internal.drawable.NeumorphShape
 
-internal class BasinShape(drawableState: NeumorphShapeDrawableState) : Shape {
+internal class BasinShape(
+    appearance: NeumorphShadow.Style,
+    theme: NeumorphShadow.Theme,
+    bounds: Rect,
+) : Shape {
 
     private val shadows by lazy {
-        val theme = NeumorphShadow.Theme(
-            drawableState.shadowColorLight,
-            drawableState.shadowColorDark
+        val outerShadow = ShapeFactory.createReusableShape(
+            appearance,
+            theme,
+            ShapeType.FLAT,
+            bounds
         )
 
-        val style = NeumorphShadow.Style(
-            drawableState.shadowElevation,
-            drawableState.blurRadius,
-            drawableState.shapeAppearanceModel.getCornerFamily(),
-            drawableState.shapeAppearanceModel.getCornerSize()
+        val innerShadow = ShapeFactory.createReusableShape(
+            appearance,
+            theme,
+            ShapeType.PRESSED,
+            bounds
         )
 
-        listOf(
-            NeumorphShape(style, theme, isOuterShadow = true),
-            NeumorphShape(style, theme, isOuterShadow = false)
-        )
-    }
-
-    override fun draw(canvas: Canvas, outlinePath: Path) {
-        shadows.forEach { it.draw(canvas, outlinePath) }
+        listOf(outerShadow, innerShadow)
     }
 
-    override fun updateShadowBitmap(bounds: Rect) {
-        shadows.forEach { it.updateShadowBitmap(bounds) }
+    override fun draw(canvas: Canvas) {
+        shadows.forEach { it.draw(canvas) }
     }
 }

neumorphism/src/main/java/soup/neumorphism/internal/shape/NeumorphShape.kt

@@ -0,0 +1,33 @@
+package soup.neumorphism.internal.shape
+
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Rect
+import soup.neumorphism.internal.drawable.NeumorphInnerShadow
+import soup.neumorphism.internal.drawable.NeumorphOuterShadow
+import soup.neumorphism.internal.drawable.NeumorphShadow
+
+internal class NeumorphShape(
+    private val appearance: NeumorphShadow.Style,
+    private val theme: NeumorphShadow.Theme,
+    private val bounds: Rect,
+    private val isOuterShadow: Boolean
+) : Shape {
+
+    private var shadowBitmap: Bitmap? = null
+    private val shadow: NeumorphShadow by lazy {
+        if (isOuterShadow) NeumorphOuterShadow(appearance, theme, bounds)
+        else NeumorphInnerShadow(appearance, theme, bounds)
+    }
+
+    override fun draw(canvas: Canvas) {
+        val bitmap = shadowBitmap
+        if (bitmap != null) {
+            canvas.drawBitmap(bitmap, 0f, 0f, null)
+            return
+        }
+
+        shadowBitmap = shadow.drawToBitmap()
+        return draw(canvas)
+    }
+}

neumorphism/src/main/java/soup/neumorphism/internal/shape/Shape.kt

@@ -5,6 +5,5 @@ import android.graphics.Path
 import android.graphics.Rect
 
 internal interface Shape {
-    fun draw(canvas: Canvas, outlinePath: Path)
-    fun updateShadowBitmap(bounds: Rect)
+    fun draw(canvas: Canvas)
 }