Improved CircleBitmapDisplayer

Author: nostra13

library/src/main/java/com/nostra13/universalimageloader/core/display/CircleBitmapDisplayer.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2011-2014 Sergey Tarasevich
+ * Copyright 2015 Sergey Tarasevich
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,25 +35,29 @@
  * Can display bitmap cropped by a circle. This implementation works only with ImageViews wrapped
  * in ImageViewAware.
  * <br />
- * This implementation is inspired by
- * <a href="http://www.curious-creature.org/2012/12/11/android-recipe-1-image-with-rounded-corners/">
- * Romain Guy's article</a>. It rounds images using custom drawable drawing. Original bitmap isn't changed.
- * <br />
- * <br />
  * If this implementation doesn't meet your needs then consider
  * <a href="https://github.com/vinc3m1/RoundedImageView">RoundedImageView</a> or
  * <a href="https://github.com/Pkmmte/CircularImageView">CircularImageView</a> projects for usage.
+ *
+ * @author Qualtagh, Sergey Tarasevich (nostra13[at]gmail[dot]com)
+ * @since 1.9.5
  */
 public class CircleBitmapDisplayer implements BitmapDisplayer {
 
 	protected final Integer strokeColor;
+	protected final float strokeWidth;
 
 	public CircleBitmapDisplayer() {
 		this(null);
 	}
 
 	public CircleBitmapDisplayer(Integer strokeColor) {
+		this(strokeColor, 0);
+	}
+
+	public CircleBitmapDisplayer(Integer strokeColor, float strokeWidth) {
 		this.strokeColor = strokeColor;
+		this.strokeWidth = strokeWidth;
 	}
 
 	@Override
@@ -62,46 +66,53 @@ public void display(Bitmap bitmap, ImageAware imageAware, LoadedFrom loadedFrom)
 			throw new IllegalArgumentException("ImageAware should wrap ImageView. ImageViewAware is expected.");
 		}
 
-		imageAware.setImageDrawable(new RoundedDrawable(bitmap, strokeColor));
+		imageAware.setImageDrawable(new CircleDrawable(bitmap, strokeColor, strokeWidth));
 	}
 
-	public static class RoundedDrawable extends Drawable {
+	public static class CircleDrawable extends Drawable {
 
 		protected float radius;
 
-		protected final RectF mRect = new RectF(),
-				mBitmapRect;
+		protected final RectF mRect = new RectF();
+		protected final RectF mBitmapRect;
 		protected final BitmapShader bitmapShader;
 		protected final Paint paint;
 		protected final Paint strokePaint;
+		protected final float strokeWidth;
+		protected float strokeRadius;
 
-		public RoundedDrawable(Bitmap bitmap, Integer strokeColor) {
+		public CircleDrawable(Bitmap bitmap, Integer strokeColor, float strokeWidth) {
 			radius = Math.min(bitmap.getWidth(), bitmap.getHeight()) / 2;
 
 			bitmapShader = new BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
-			mBitmapRect = new RectF (0, 0, bitmap.getWidth(), bitmap.getHeight());
-			
+			mBitmapRect = new RectF(0, 0, bitmap.getWidth(), bitmap.getHeight());
+
 			paint = new Paint();
 			paint.setAntiAlias(true);
 			paint.setShader(bitmapShader);
 			paint.setFilterBitmap(true);
 			paint.setDither(true);
-			if (strokeColor == null) strokePaint = null;
-			else {
+
+			if (strokeColor == null) {
+				strokePaint = null;
+			} else {
 				strokePaint = new Paint();
 				strokePaint.setStyle(Paint.Style.STROKE);
 				strokePaint.setColor(strokeColor);
-				strokePaint.setStrokeWidth(0.0F);
+				strokePaint.setStrokeWidth(strokeWidth);
 				strokePaint.setAntiAlias(true);
 			}
+			this.strokeWidth = strokeWidth;
+			strokeRadius = radius - strokeWidth / 2;
 		}
 
 		@Override
 		protected void onBoundsChange(Rect bounds) {
 			super.onBoundsChange(bounds);
 			mRect.set(0, 0, bounds.width(), bounds.height());
 			radius = Math.min(bounds.width(), bounds.height()) / 2;
-			
+			strokeRadius = radius - strokeWidth / 2;
+
 			// Resize the original bitmap to fit the new bound
 			Matrix shaderMatrix = new Matrix();
 			shaderMatrix.setRectToRect(mBitmapRect, mRect, Matrix.ScaleToFit.FILL);
@@ -111,7 +122,9 @@ protected void onBoundsChange(Rect bounds) {
 		@Override
 		public void draw(Canvas canvas) {
 			canvas.drawCircle(radius, radius, radius, paint);
-			if (strokePaint != null) canvas.drawCircle(radius, radius, radius, strokePaint);
+			if (strokePaint != null) {
+				canvas.drawCircle(radius, radius, strokeRadius, strokePaint);
+			}
 		}
 
 		@Override

sample/src/main/java/com/nostra13/universalimageloader/sample/fragment/ImageGalleryFragment.java

@@ -27,8 +27,10 @@
 import android.widget.BaseAdapter;
 import android.widget.Gallery;
 import android.widget.ImageView;
+
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
 import com.nostra13.universalimageloader.sample.Constants;
 import com.nostra13.universalimageloader.sample.R;
 import com.nostra13.universalimageloader.sample.activity.SimpleImageActivity;
@@ -82,6 +84,7 @@ private static class ImageAdapter extends BaseAdapter {
 					.cacheOnDisk(true)
 					.considerExifParams(true)
 					.bitmapConfig(Bitmap.Config.RGB_565)
+					.displayer(new RoundedBitmapDisplayer(20))
 					.build();
 		}
 
@@ -110,4 +113,4 @@ public View getView(int position, View convertView, ViewGroup parent) {
 			return imageView;
 		}
 	}
-}
+}

sample/src/main/java/com/nostra13/universalimageloader/sample/fragment/ImageListFragment.java

@@ -17,6 +17,7 @@
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -27,10 +28,11 @@
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.display.CircleBitmapDisplayer;
 import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
-import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
 import com.nostra13.universalimageloader.sample.Constants;
@@ -86,7 +88,8 @@ private static class ImageAdapter extends BaseAdapter {
 					.cacheInMemory(true)
 					.cacheOnDisk(true)
 					.considerExifParams(true)
-					.displayer(new RoundedBitmapDisplayer(20)).build();
+					.displayer(new CircleBitmapDisplayer(Color.WHITE, 5))
+					.build();
 		}
 
 		@Override
@@ -147,4 +150,4 @@ public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
 			}
 		}
 	}
-}
+}