Merge pull request #4 from ac-opensource/feature/support-for-vector-d…

…rawables Add support for Vector Drawables
Devlight · Apr 11, 2016 · 25c7a16 · 25c7a16
2 parents 186517a + bc6101d
commit 25c7a16
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/library/src/main/java/com/gigamole/library/NavigationTabBar.java b/library/src/main/java/com/gigamole/library/NavigationTabBar.java
@@ -1240,9 +1240,18 @@ public static class Model {
 
         public Model(final Drawable icon, final int color) {
             mColor = color;
-            mIcon = icon != null ? ((BitmapDrawable) icon).getBitmap() :
-                    Bitmap.createBitmap(1, 1, Bitmap.Config.RGB_565);
-
+            if (icon != null) {
+                if(icon instanceof BitmapDrawable) {
+                    mIcon = ((BitmapDrawable) icon).getBitmap();
+                } else {
+                    mIcon = Bitmap.createBitmap(icon.getIntrinsicWidth(),icon.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+                    Canvas canvas = new Canvas(mIcon);
+                    icon.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+                    icon.draw(canvas);
+                }
+            } else {
+                mIcon = Bitmap.createBitmap(1, 1, Bitmap.Config.RGB_565);
+            }
             mBadgeAnimator.addListener(new Animator.AnimatorListener() {
 
                 @Override