New Feature: Added support for background drawables

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/CornerFamily.kt

@@ -1,14 +1,6 @@
 package soup.neumorphism
 
-import androidx.annotation.IntDef
-import androidx.annotation.RestrictTo
-
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-@IntDef(CornerFamily.ROUNDED, CornerFamily.OVAL)
-@Retention(AnnotationRetention.SOURCE)
-annotation class CornerFamily {
-    companion object {
-        const val ROUNDED = 0
-        const val OVAL = 1
-    }
+enum class CornerFamily {
+    ROUNDED,
+    OVAL
 }

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

@@ -8,6 +8,7 @@ import android.util.Log
 import androidx.annotation.ColorInt
 import androidx.appcompat.widget.AppCompatButton
 import soup.neumorphism.internal.util.NeumorphResources
+import kotlin.math.roundToInt
 
 open class NeumorphButton @JvmOverloads constructor(
     context: Context,
@@ -19,11 +20,6 @@ open class NeumorphButton @JvmOverloads constructor(
     private var isInitialized: Boolean = false
     private val shapeDrawable: NeumorphShapeDrawable
 
-    private var insetStart = 0
-    private var insetEnd = 0
-    private var insetTop = 0
-    private var insetBottom = 0
-
     init {
         val a = context.obtainStyledAttributes(
             attrs, R.styleable.NeumorphButton, defStyleAttr, defStyleRes
@@ -32,25 +28,19 @@ 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 inset = a.getDimensionPixelSize(
-            R.styleable.NeumorphButton_neumorph_inset, 0
-        )
-        val insetStart = a.getDimensionPixelSize(
-            R.styleable.NeumorphButton_neumorph_insetStart, -1
-        )
-        val insetEnd = a.getDimensionPixelSize(
-            R.styleable.NeumorphButton_neumorph_insetEnd, -1
-        )
-        val insetTop = a.getDimensionPixelSize(
-            R.styleable.NeumorphButton_neumorph_insetTop, -1
-        )
-        val insetBottom = a.getDimensionPixelSize(
-            R.styleable.NeumorphButton_neumorph_insetBottom, -1
-        )
+        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
-        )
+        ).roundToInt()
+
+        val shadowRadius = a.getDimension(
+            R.styleable.NeumorphButton_neumorph_shadowRadius, 15f
+        ).roundToInt()
+
         val shadowColorLight = NeumorphResources.getColor(
             context, a,
             R.styleable.NeumorphButton_neumorph_shadowColorLight,
@@ -67,19 +57,15 @@ open class NeumorphButton @JvmOverloads constructor(
             setInEditMode(isInEditMode)
             setShapeType(shapeType)
             setShadowElevation(shadowElevation)
+            setShadowRadius(shadowRadius)
             setShadowColorLight(shadowColorLight)
             setShadowColorDark(shadowColorDark)
             setBackgroundDrawable(backgroundDrawable)
             setFillColor(fillColor)
             setStroke(strokeWidth, strokeColor)
             setTranslationZ(translationZ)
         }
-        internalSetInset(
-            if (insetStart >= 0) insetStart else inset,
-            if (insetTop >= 0) insetTop else inset,
-            if (insetEnd >= 0) insetEnd else inset,
-            if (insetBottom >= 0) insetBottom else inset
-        )
+
         setBackgroundInternal(shapeDrawable)
         isInitialized = true
     }
@@ -136,51 +122,28 @@ 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()
     }
 
-    fun setInset(left: Int, top: Int, right: Int, bottom: Int) {
-        internalSetInset(left, top, right, bottom)
+    fun setShadowElevation(shadowElevation: Int) {
+        shapeDrawable.setShadowElevation(shadowElevation)
     }
 
-    private fun internalSetInset(left: Int, top: Int, right: Int, bottom: Int) {
-        var changed = false
-        if (insetStart != left) {
-            changed = true
-            insetStart = left
-        }
-        if (insetTop != top) {
-            changed = true
-            insetTop = top
-        }
-        if (insetEnd != right) {
-            changed = true
-            insetEnd = right
-        }
-        if (insetBottom != bottom) {
-            changed = true
-            insetBottom = bottom
-        }
-
-        if (changed) {
-            shapeDrawable.setInset(left, top, right, bottom)
-            requestLayout()
-            invalidateOutline()
-        }
+    fun getShadowElevation(): Int {
+        return shapeDrawable.getShadowElevation()
     }
 
-    fun setShadowElevation(shadowElevation: Float) {
-        shapeDrawable.setShadowElevation(shadowElevation)
+    fun setNeumorphShadowRadius(shadowRadius: Int) {
+        shapeDrawable.setShadowRadius(shadowRadius)
     }
 
-    fun getShadowElevation(): Float {
-        return shapeDrawable.getShadowElevation()
+    fun getNeumorphShadowRadius(): Int {
+        return shapeDrawable.getShadowRadius()
     }
 
     fun setShadowColorLight(@ColorInt shadowColor: Int) {

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

@@ -10,6 +10,7 @@ import android.view.View
 import android.widget.FrameLayout
 import androidx.annotation.ColorInt
 import soup.neumorphism.internal.util.NeumorphResources
+import kotlin.math.roundToInt
 
 open class NeumorphCardView @JvmOverloads constructor(
     context: Context,
@@ -21,11 +22,6 @@ open class NeumorphCardView @JvmOverloads constructor(
     private var isInitialized: Boolean = false
     private val shapeDrawable: NeumorphShapeDrawable
 
-    private var insetStart = 0
-    private var insetEnd = 0
-    private var insetTop = 0
-    private var insetBottom = 0
-
     init {
         val a = context.obtainStyledAttributes(
             attrs, R.styleable.NeumorphCardView, defStyleAttr, defStyleRes
@@ -34,25 +30,19 @@ 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 inset = a.getDimensionPixelSize(
-            R.styleable.NeumorphCardView_neumorph_inset, 0
-        )
-        val insetStart = a.getDimensionPixelSize(
-            R.styleable.NeumorphCardView_neumorph_insetStart, -1
-        )
-        val insetEnd = a.getDimensionPixelSize(
-            R.styleable.NeumorphCardView_neumorph_insetEnd, -1
-        )
-        val insetTop = a.getDimensionPixelSize(
-            R.styleable.NeumorphCardView_neumorph_insetTop, -1
-        )
-        val insetBottom = a.getDimensionPixelSize(
-            R.styleable.NeumorphCardView_neumorph_insetBottom, -1
-        )
+        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()
+
+        val shadowRadius = a.getDimension(
+            R.styleable.NeumorphCardView_neumorph_shadowRadius, 15f
+        ).roundToInt()
+
         val shadowColorLight = NeumorphResources.getColor(
             context, a,
             R.styleable.NeumorphCardView_neumorph_shadowColorLight,
@@ -69,19 +59,14 @@ open class NeumorphCardView @JvmOverloads constructor(
             setInEditMode(isInEditMode)
             setShapeType(shapeType)
             setShadowElevation(shadowElevation)
+            setShadowRadius(shadowRadius)
             setShadowColorLight(shadowColorLight)
             setShadowColorDark(shadowColorDark)
             setBackgroundDrawable(backgroundDrawable)
             setFillColor(fillColor)
             setStroke(strokeWidth, strokeColor)
             setTranslationZ(translationZ)
         }
-        internalSetInset(
-            if (insetStart >= 0) insetStart else inset,
-            if (insetTop >= 0) insetTop else inset,
-            if (insetEnd >= 0) insetEnd else inset,
-            if (insetBottom >= 0) insetBottom else inset
-        )
         setBackgroundInternal(shapeDrawable)
         isInitialized = true
     }
@@ -148,51 +133,28 @@ 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()
     }
 
-    fun setInset(left: Int, top: Int, right: Int, bottom: Int) {
-        internalSetInset(left, top, right, bottom)
+    fun setShadowElevation(shadowElevation: Int) {
+        shapeDrawable.setShadowElevation(shadowElevation)
     }
 
-    private fun internalSetInset(left: Int, top: Int, right: Int, bottom: Int) {
-        var changed = false
-        if (insetStart != left) {
-            changed = true
-            insetStart = left
-        }
-        if (insetTop != top) {
-            changed = true
-            insetTop = top
-        }
-        if (insetEnd != right) {
-            changed = true
-            insetEnd = right
-        }
-        if (insetBottom != bottom) {
-            changed = true
-            insetBottom = bottom
-        }
-
-        if (changed) {
-            shapeDrawable.setInset(left, top, right, bottom)
-            requestLayout()
-            invalidateOutline()
-        }
+    fun getShadowElevation(): Int {
+        return shapeDrawable.getShadowElevation()
     }
 
-    fun setShadowElevation(shadowElevation: Float) {
-        shapeDrawable.setShadowElevation(shadowElevation)
+    fun setNeumorphShadowRadius(shadowRadius: Int) {
+        shapeDrawable.setShadowRadius(shadowRadius)
     }
 
-    fun getShadowElevation(): Float {
-        return shapeDrawable.getShadowElevation()
+    fun getNeumorphShadowRadius(): Int {
+        return shapeDrawable.getShadowRadius()
     }
 
     fun setShadowColorLight(@ColorInt shadowColor: Int) {