Merge pull request #7 from AAkira/fix/overwrite-icon-color

Fix overwrite icon color
AAkira · Nov 13, 2017 · 041fa58 · 041fa58
2 parents 05d5c4a + 81fa20e
commit 041fa58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git 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

diff --git a/...ontextview/src/main/java/com/github/aakira/compoundicontextview/CompoundIconTextView.java b/...ontextview/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));

diff --git 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