Correct the PR comments and fixing init bug

Sérgio Moura · Sérgio Moura · commit ddf0ee27fe19 · 2016-02-19T09:04:08.000Z
diff --git a/roundedimageview/src/main/java/com/makeramen/roundedimageview/RoundedImageView.java b/roundedimageview/src/main/java/com/makeramen/roundedimageview/RoundedImageView.java
@@ -163,13 +163,16 @@ public RoundedImageView(Context context, AttributeSet attrs, int defStyle) {
     updateDrawableAttrs();
     updateBackgroundDrawableAttrs(true);
 
-    if(mMutateBackground){
+    if (mMutateBackground) {
         // when setBackground() is called by View constructor, mMutateBackground is not loaded from the attribute,
         // so it's false by default, what doesn't allow to create the RoundedDrawable. At this point, after load
         // mMutateBackground and updated BackgroundDrawable to RoundedDrawable, the View's background drawable needs to
         // be changed to this new drawable.
 
+      if (BuildConfig.VERSION_CODE >= Build.VERSION_CODES.JELLY_BEAN)
         super.setBackground(mBackgroundDrawable);
+      else
+        super.setBackgroundDrawable(mBackgroundDrawable);
     }
 
     a.recycle();
@@ -278,27 +281,22 @@ private Drawable resolveResource() {
 
   @Override
   public void setBackground(Drawable background) {
-      mBackgroundDrawable = background;
-      updateBackgroundDrawableAttrs(true);
-      if(BuildConfig.VERSION_CODE >= Build.VERSION_CODES.JELLY_BEAN)
-          super.setBackground(mBackgroundDrawable);
-      else
-          super.setBackgroundDrawable(mBackgroundDrawable);
+    setBackgroundDrawable(background);
   }
 
   @Override
   public void setBackgroundResource(@DrawableRes int resId) {
     if (mBackgroundResource != resId) {
       mBackgroundResource = resId;
       mBackgroundDrawable = resolveBackgroundResource();
-      setBackground(mBackgroundDrawable);
+      setBackgroundDrawable(mBackgroundDrawable);
     }
   }
 
   @Override
   public void setBackgroundColor(int color) {
     mBackgroundDrawable = new ColorDrawable(color);
-    setBackground(mBackgroundDrawable);
+    setBackgroundDrawable(mBackgroundDrawable);
   }
 
   private Drawable resolveBackgroundResource() {
@@ -320,15 +318,15 @@ private Drawable resolveBackgroundResource() {
   }
 
   private void updateDrawableAttrs() {
-    updateAttrs(mDrawable);
+    updateAttrs(mDrawable, mScaleType);
   }
 
   private void updateBackgroundDrawableAttrs(boolean convert) {
     if (mMutateBackground) {
       if (convert) {
         mBackgroundDrawable = RoundedDrawable.fromDrawable(mBackgroundDrawable);
       }
-      updateBackgroundAttrs(mBackgroundDrawable);
+      updateAttrs(mBackgroundDrawable, ScaleType.FIT_XY);
     }
   }
 
@@ -357,12 +355,12 @@ private void applyColorMod() {
     }
   }
 
-  private void updateAttrs(Drawable drawable) {
+  private void updateAttrs(Drawable drawable, ScaleType scaleType) {
     if (drawable == null) { return; }
 
     if (drawable instanceof RoundedDrawable) {
       ((RoundedDrawable) drawable)
-              .setScaleType(mScaleType)
+              .setScaleType(scaleType)
               .setBorderWidth(mBorderWidth)
               .setBorderColor(mBorderColor)
               .setOval(mIsOval)
@@ -382,47 +380,20 @@ private void updateAttrs(Drawable drawable) {
       // loop through layers to and set drawable attrs
       LayerDrawable ld = ((LayerDrawable) drawable);
       for (int i = 0, layers = ld.getNumberOfLayers(); i < layers; i++) {
-        updateAttrs(ld.getDrawable(i));
-      }
-    }
-  }
-
-  private void updateBackgroundAttrs(Drawable drawable) {
-    if (drawable == null) { return; }
-
-    if (drawable instanceof RoundedDrawable) {
-      ((RoundedDrawable) drawable)
-              //It's expected for a Background to fit the drawable to
-              //cover all background, so its ScaleType should be FIT_XY
-              .setScaleType(ScaleType.FIT_XY)
-              .setBorderWidth(mBorderWidth)
-              .setBorderColor(mBorderColor)
-              .setOval(mIsOval)
-              .setTileModeX(mTileModeX)
-              .setTileModeY(mTileModeY);
-
-      if (mCornerRadii != null) {
-        ((RoundedDrawable) drawable).setCornerRadius(
-                mCornerRadii[Corner.TOP_LEFT],
-                mCornerRadii[Corner.TOP_RIGHT],
-                mCornerRadii[Corner.BOTTOM_RIGHT],
-                mCornerRadii[Corner.BOTTOM_LEFT]);
-      }
-
-      applyColorMod();
-    } else if (drawable instanceof LayerDrawable) {
-      // loop through layers to and set drawable attrs
-      LayerDrawable ld = ((LayerDrawable) drawable);
-      for (int i = 0, layers = ld.getNumberOfLayers(); i < layers; i++) {
-        updateBackgroundAttrs(ld.getDrawable(i));
+        updateAttrs(ld.getDrawable(i), scaleType);
       }
     }
   }
 
   @Override
   @Deprecated
   public void setBackgroundDrawable(Drawable background) {
-    setBackground(background);
+    mBackgroundDrawable = background;
+    updateBackgroundDrawableAttrs(true);
+    if (BuildConfig.VERSION_CODE >= Build.VERSION_CODES.JELLY_BEAN)
+      super.setBackground(mBackgroundDrawable);
+    else
+      super.setBackgroundDrawable(mBackgroundDrawable);
   }
 
   /**
