Updated support for ripple effect

LiteKite · Sep 27, 2020 · e180343 · e180343
1 parent 86a7b6a
commit e180343
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/widgetslib/src/main/kotlin/com/litekite/widget/CircleImageButton.kt b/widgetslib/src/main/kotlin/com/litekite/widget/CircleImageButton.kt
@@ -43,6 +43,7 @@ class CircleImageButton @JvmOverloads constructor(
 		isAntiAlias = true
 	}
 	private var bgDrawable: Drawable? = null
+	private var rippleDrawable: Drawable? = null
 	private var bgBitmap: Bitmap? = null
 	private var imgX = 0f
 	private var imgY = 0f
@@ -58,7 +59,11 @@ class CircleImageButton @JvmOverloads constructor(
 			R.styleable.CircleImageButton_innerPadding,
 			0
 		)
+		rippleDrawable = typedArray.getDrawable(R.styleable.CircleImageButton_rippleDrawable)
+		// Recycles the TypedArray
 		typedArray.recycle()
+		// Sets ripple drawable as background
+		super.setBackground(rippleDrawable)
 	}
 
 	override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
@@ -89,11 +94,15 @@ class CircleImageButton @JvmOverloads constructor(
 	}
 
 	override fun setBackground(background: Drawable?) {
-		super.setBackground(if (background is RippleDrawable) background else null)
+		super.setBackground(if (rippleDrawable is RippleDrawable) rippleDrawable else null)
 		bgDrawable = background
 		postInvalidate()
 	}
 
+	override fun setForeground(foreground: Drawable?) {
+		super.setForeground(null)
+	}
+
 	override fun setImageDrawable(drawable: Drawable?) {
 		super.setImageDrawable(drawable)
 		postInvalidate()

diff --git a/widgetslib/src/main/res/values/attrs.xml b/widgetslib/src/main/res/values/attrs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
    Copyright 2020 LiteKite Startup. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +16,13 @@
 <resources>
 
     <declare-styleable name="CircleImageButton">
+
+        <!--Ripple drawable-->
+        <attr name="rippleDrawable" format="reference" />
+
+        <!--Padding set between background source and image source-->
         <attr name="innerPadding" format="dimension" />
+
     </declare-styleable>
 
 </resources>