Draw circle background and border even if no bitmap is set

Author: hdodenhof

circleimageview/src/main/java/de/hdodenhof/circleimageview/CircleImageView.java

@@ -155,23 +155,23 @@ protected void onDraw(Canvas canvas) {
             return;
         }
 
-        if (mBitmap == null) {
-            return;
+        if (mCircleBackgroundColor != Color.TRANSPARENT) {
+            canvas.drawCircle(mDrawableRect.centerX(), mDrawableRect.centerY(), mDrawableRadius, mCircleBackgroundPaint);
         }
 
-        if (mRebuildShader) {
-            mRebuildShader = false;
+        if (mBitmap != null) {
+            if (mRebuildShader) {
+                mRebuildShader = false;
+
+                BitmapShader bitmapShader = new BitmapShader(mBitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
+                bitmapShader.setLocalMatrix(mShaderMatrix);
 
-            BitmapShader bitmapShader = new BitmapShader(mBitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
-            bitmapShader.setLocalMatrix(mShaderMatrix);
+                mBitmapPaint.setShader(bitmapShader);
+            }
 
-            mBitmapPaint.setShader(bitmapShader);
+            canvas.drawCircle(mDrawableRect.centerX(), mDrawableRect.centerY(), mDrawableRadius, mBitmapPaint);
         }
 
-        if (mCircleBackgroundColor != Color.TRANSPARENT) {
-            canvas.drawCircle(mDrawableRect.centerX(), mDrawableRect.centerY(), mDrawableRadius, mCircleBackgroundPaint);
-        }
-        canvas.drawCircle(mDrawableRect.centerX(), mDrawableRect.centerY(), mDrawableRadius, mBitmapPaint);
         if (mBorderWidth > 0) {
             canvas.drawCircle(mBorderRect.centerX(), mBorderRect.centerY(), mBorderRadius, mBorderPaint);
         }