Fix issue #37

TheFinestArtist · Mar 15, 2016 · 51c4b1e · 51c4b1e
1 parent 169f64c
commit 51c4b1e
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/library/src/main/java/com/thefinestartist/finestwebview/FinestWebViewActivity.java b/library/src/main/java/com/thefinestartist/finestwebview/FinestWebViewActivity.java
@@ -9,6 +9,7 @@
 import android.graphics.PorterDuff;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.VectorDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -827,7 +828,6 @@ protected int getMaxWidth() {
     }
 
     protected void updateIcon(ImageButton icon, @DrawableRes int drawableRes) {
-        VectorDrawableCompat drawable = (VectorDrawableCompat) ContextCompat.getDrawable(this, drawableRes);
 
         int[][] states = new int[][]{
                 new int[]{-android.R.attr.state_enabled}, // disabled
@@ -842,8 +842,17 @@ protected void updateIcon(ImageButton icon, @DrawableRes int drawableRes) {
         };
 
         ColorStateList colorStateList = new ColorStateList(states, colors);
-        drawable.setTintList(colorStateList);
-        icon.setImageDrawable(drawable);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            VectorDrawable drawable = (VectorDrawable) ContextCompat.getDrawable(this, drawableRes);
+            drawable.setTintList(colorStateList);
+            icon.setImageDrawable(drawable);
+
+        } else {
+            VectorDrawableCompat drawable = (VectorDrawableCompat) ContextCompat.getDrawable(this, drawableRes);
+            drawable.setTintList(colorStateList);
+            icon.setImageDrawable(drawable);
+        }
     }
 
     @Override