From 812aef14ed7fab124659825eb5fb00b56b94001b Mon Sep 17 00:00:00 2001 From: "A.Akira" Date: Mon, 13 Nov 2017 18:56:36 +0900 Subject: [PATCH 1/3] Fix overwrite icon color. --- .../aakira/compoundicontextview/CompoundIconTextView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compoundicontextview/src/main/java/com/github/aakira/compoundicontextview/CompoundIconTextView.java b/compoundicontextview/src/main/java/com/github/aakira/compoundicontextview/CompoundIconTextView.java index fd61098..bbb09f2 100644 --- a/compoundicontextview/src/main/java/com/github/aakira/compoundicontextview/CompoundIconTextView.java +++ b/compoundicontextview/src/main/java/com/github/aakira/compoundicontextview/CompoundIconTextView.java @@ -258,8 +258,10 @@ private Drawable resource2VectorDrawable(@DrawableRes final int resourceId, @Col // See if we need to 'fix' the drawableLeft fixDrawable(drawable); // Set color - DrawableCompat.setTint(drawable, iconColor); - DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN); + if(iconColor != UNDEFINED_RESOURCE) { + DrawableCompat.setTint(drawable, iconColor); + DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN); + } // Resize Bitmap return new BitmapDrawable(context.getResources(), Bitmap.createScaledBitmap(drawable2Bitmap(drawable, iconWidth, iconHeight), iconWidth, iconHeight, true)); From 9386410c9258d21ff1156c14915ba971cfe990e4 Mon Sep 17 00:00:00 2001 From: "A.Akira" Date: Mon, 13 Nov 2017 18:59:28 +0900 Subject: [PATCH 2/3] Bump up ther version code and name. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index c66a218..15b0efb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,8 +19,8 @@ org.gradle.jvmargs=-Xmx1536m # This library version -LIBRARY_VERSION_CODE=2 -LIBRARY_VERSION_NAME=1.1.0 +LIBRARY_VERSION_CODE=3 +LIBRARY_VERSION_NAME=1.2.0 # App information From 81fa20ed5b7057c785205b712cc8821d23f5ce12 Mon Sep 17 00:00:00 2001 From: "A.Akira" Date: Mon, 13 Nov 2017 19:00:26 +0900 Subject: [PATCH 3/3] Update readme. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c5c3e58..93df28f 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ buildscript { } dependencies { - compile 'com.github.aakira:compound-icon-textview:1.1.0@aar' + compile 'com.github.aakira:compound-icon-textview:1.2.0@aar' } ``` ## Using libraries