Merge pull request #5 from Omega-R/develop

Fixed tint drawable

Author: anton-knyazev

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlin_version = '1.2.30'
-    ext.supportLibraryVersion = '27.1.0'
+    ext.supportLibraryVersion = '27.1.1'
     ext.targetSdkVersion = 27
     ext.compileSdkVersion = 27
     ext.minSdkVersion = 14
@@ -14,7 +14,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 

center_icon_button/src/main/java/com/omega_r/libs/OmegaCenterIconButton.java

@@ -68,18 +68,21 @@ private void init(Context context, AttributeSet attrs) {
     private void updateTint() {
         if (tintColor != Color.TRANSPARENT) {
             Drawable[] drawables = getCompoundDrawables();
-            for (Drawable drawable : drawables) {
+            if (drawables.length != DRAWABLES_LENGTH) return;
+
+            Drawable[] wrappedDrawables = new Drawable[DRAWABLES_LENGTH];
+            for (int i = 0; i < DRAWABLES_LENGTH; i++) {
+                Drawable drawable = drawables[i];
                 if (drawable != null) {
                     Drawable wrappedDrawable = DrawableCompat.wrap(drawable).mutate();
                     DrawableCompat.setTint(wrappedDrawable, tintColor);
+                    wrappedDrawables[i] = wrappedDrawable;
                 }
             }
-            if (drawables.length == DRAWABLES_LENGTH) {
-                setCompoundDrawablesWithIntrinsicBounds(drawables[DRAWABLE_LEFT_POSITION],
-                                                        drawables[DRAWABLE_TOP_POSITION],
-                                                        drawables[DRAWABLE_RIGHT_POSITION],
-                                                        drawables[DRAWABLE_BOTTOM_POSITION]);
-            }
+            setCompoundDrawablesWithIntrinsicBounds(wrappedDrawables[DRAWABLE_LEFT_POSITION],
+                                                    wrappedDrawables[DRAWABLE_TOP_POSITION],
+                                                    wrappedDrawables[DRAWABLE_RIGHT_POSITION],
+                                                    wrappedDrawables[DRAWABLE_BOTTOM_POSITION]);
         }
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip