Merge pull request #10 from minibugdev/drawable-selector

Support selector drawable
minibugdev · Oct 19, 2017 · 4af87a6 · 4af87a6
2 parents 37865d1 + 0860b87
commit 4af87a6
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 2 deletions.
diff --git a/demo/src/main/java/com/minibugdev/drawablebadge/demo/DemoActivity.kt b/demo/src/main/java/com/minibugdev/drawablebadge/demo/DemoActivity.kt
@@ -24,7 +24,7 @@ class DemoActivity : AppCompatActivity() {
 
 	private fun drawBadge(number: Int, position: BadgePosition) {
 		DrawableBadge.Builder(applicationContext)
-			.drawableResId(R.mipmap.ic_launcher)
+			.drawableResId(R.drawable.selector_badge)
 			.badgeColor(R.color.badgeColor)
 			.badgeSize(R.dimen.badge_size)
 			.badgePosition(position)

diff --git a/demo/src/main/res/drawable-hdpi/ic_launcher.png b/demo/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/demo/src/main/res/drawable-hdpi/ic_launcher_round.png b/demo/src/main/res/drawable-hdpi/ic_launcher_round.png
diff --git a/demo/src/main/res/drawable-mdpi/ic_launcher.png b/demo/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/demo/src/main/res/drawable-mdpi/ic_launcher_round.png b/demo/src/main/res/drawable-mdpi/ic_launcher_round.png
diff --git a/demo/src/main/res/drawable-xhdpi/ic_launcher.png b/demo/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/demo/src/main/res/drawable-xhdpi/ic_launcher_round.png b/demo/src/main/res/drawable-xhdpi/ic_launcher_round.png
diff --git a/demo/src/main/res/drawable-xxhdpi/ic_launcher.png b/demo/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/demo/src/main/res/drawable-xxhdpi/ic_launcher_round.png b/demo/src/main/res/drawable-xxhdpi/ic_launcher_round.png
diff --git a/demo/src/main/res/drawable-xxxhdpi/ic_launcher.png b/demo/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/demo/src/main/res/drawable-xxxhdpi/ic_launcher_round.png b/demo/src/main/res/drawable-xxxhdpi/ic_launcher_round.png
diff --git a/demo/src/main/res/drawable/selector_badge.xml b/demo/src/main/res/drawable/selector_badge.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_launcher_round" android:state_pressed="true" />
+    <item android:drawable="@drawable/ic_launcher_round" android:state_focused="true" />
+    <item android:drawable="@drawable/ic_launcher" />
+</selector>
diff --git a/library/src/main/java/com/minibugdev/drawablebadge/DrawableBadge.kt b/library/src/main/java/com/minibugdev/drawablebadge/DrawableBadge.kt
@@ -9,6 +9,7 @@ import android.support.annotation.ColorRes
 import android.support.annotation.DimenRes
 import android.support.annotation.DrawableRes
 import android.support.v4.content.ContextCompat
+import android.support.v4.content.res.ResourcesCompat
 import android.text.TextPaint
 
 class DrawableBadge private constructor(val context: Context,
@@ -34,7 +35,17 @@ class DrawableBadge private constructor(val context: Context,
 		private var isShowBorder: Boolean? = null
 		private var maximumCounter: Int? = null
 
-		fun drawableResId(@DrawableRes drawableRes: Int) = apply { this.bitmap = BitmapFactory.decodeResource(context.resources, drawableRes) }
+		fun drawableResId(@DrawableRes drawableRes: Int) = apply {
+			val res = context.resources
+			bitmap = BitmapFactory.decodeResource(res, drawableRes)
+
+			if (bitmap == null) {
+				val d = ResourcesCompat.getDrawable(res, drawableRes, null)?.current
+				if (d is BitmapDrawable) {
+					bitmap = d.bitmap
+				}
+			}
+		}
 
 		fun drawable(drawable: Drawable) = apply {
 			if (drawable is BitmapDrawable) {