ready to release v10.0.2

k0shk0sh · Nov 8, 2016 · 261d653 · 261d653
1 parent 206d6ff
commit 261d653
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 25 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.styleme.floating.toolbox.pro"
         minSdkVersion 18
         targetSdkVersion 25
-        versionCode 101
-        versionName "10.0.1"
+        versionCode 102
+        versionName "10.0.2"
         buildConfigField "String", "FA_HOST", '"k0shk0sh.github.io/FastAccess"'
         buildConfigField "String", "SHARED_URI", '"sharedUri"'
         signingConfig signingConfigs.signing

diff --git a/app/src/main/java/com/fastaccess/ui/widgets/FastBitmapDrawable.java b/app/src/main/java/com/fastaccess/ui/widgets/FastBitmapDrawable.java
@@ -13,6 +13,7 @@
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.util.SparseArray;
@@ -53,68 +54,66 @@ public class FastBitmapDrawable extends Drawable {
 
     public FastBitmapDrawable(Bitmap b) {
         mAlpha = 255;
+        if (b == null) {
+            Drawable colorDrawable = new ColorDrawable(Color.parseColor("#2A456B"));
+            b = Bitmap.createBitmap(40, 40, Bitmap.Config.ARGB_8888);
+            Canvas c = new Canvas(b);
+            colorDrawable.draw(c);
+        }
         mBitmap = b;
-        setBounds(0, 0, b.getWidth(), b.getHeight());
+
+        setBounds(0, 0, mBitmap.getWidth(), mBitmap.getHeight());
     }
 
-    @Override
-    public void draw(@NonNull Canvas canvas) {
+    @Override public void draw(@NonNull Canvas canvas) {
         final Rect r = getBounds();
         // Draw the bitmap into the bounding rect
         canvas.drawBitmap(mBitmap, null, r, mPaint);
     }
 
-    @Override
-    public void setColorFilter(ColorFilter cf) {
+    @Override public void setColorFilter(ColorFilter cf) {
         // No op
     }
 
-    @Override
-    public int getOpacity() {
+    @Override public int getOpacity() {
         return PixelFormat.TRANSLUCENT;
     }
 
-    @Override
-    public void setAlpha(int alpha) {
+    @Override public void setAlpha(int alpha) {
         mAlpha = alpha;
         mPaint.setAlpha(alpha);
     }
 
-    @Override
-    public void setFilterBitmap(boolean filterBitmap) {
+    @Override public void setFilterBitmap(boolean filterBitmap) {
         mPaint.setFilterBitmap(filterBitmap);
         mPaint.setAntiAlias(filterBitmap);
     }
 
-    public int getAlpha() {
-        return mAlpha;
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
+    @Override public int getIntrinsicWidth() {
         int width = getBounds().width();
         if (width == 0) {
             width = mBitmap.getWidth();
         }
         return width;
     }
 
-    @Override
-    public int getIntrinsicHeight() {
+    @Override public int getAlpha() {
+        return mAlpha;
+    }
+
+    @Override public int getIntrinsicHeight() {
         int height = getBounds().height();
         if (height == 0) {
             height = mBitmap.getHeight();
         }
         return height;
     }
 
-    @Override
-    public int getMinimumWidth() {
+    @Override public int getMinimumWidth() {
         return getBounds().width();
     }
 
-    @Override
-    public int getMinimumHeight() {
+    @Override public int getMinimumHeight() {
         return getBounds().height();
     }