bump up 1.2.1

Replaced the mask_starfish.png

CHANGELOG.md

@@ -1,10 +1,16 @@
 Change Log
 ==========
+
+Version 1.2.1 *(2015-09-18)*
+----------------------------
+
+Merged NinePatchMaskTransformation to MaskTransformation.
+
 Version 1.2.0 *(2015-09-16)*
 ----------------------------
 
-add new transformations MaskTransformation and NinePatchMaskTransformation.
-Thank you @start141
+add new transformations MaskTransformation and NinePatchMaskTransformation.  
+Thanks to [start141](https://github.com/start141)
 
 Version 1.1.0 *(2015-09-05)*
 ----------------------------

README.md

@@ -32,7 +32,7 @@ repositories {
 }
 
 dependencies {
-    compile 'jp.wasabeef:glide-transformations:1.1.0'
+    compile 'jp.wasabeef:glide-transformations:1.2.1'
     // If you want to use the GPU Filters
     compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.3.0'
 }
@@ -86,7 +86,7 @@ android {
 `BlurTransformation`
 
 ### Mask
-`MaskTransformation`, `NinePatchMaskTransformation`
+`MaskTransformation`
 
 ### GPU Filter (use [GPUImage](https://github.com/CyberAgent/android-gpuimage))
 **Will require add dependencies for GPUImage.**  
@@ -113,6 +113,16 @@ Daichi Furiya (Wasabeef) - <dadadada.chop@gmail.com>
 src="https://raw.githubusercontent.com/wasabeef/art/master/twitter.png" width="75"/>
 </a>
 
+Contributions
+-------
+
+Any contributions are welcome!
+
+Contributers
+-------
+
+* [start141](https://github.com/start141)
+
 Thanks
 -------
 

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.3.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

example/src/main/java/jp/wasabeef/example/glide/MainAdapter.java

@@ -19,7 +19,6 @@ import jp.wasabeef.glide.transformations.CropSquareTransformation;
 import jp.wasabeef.glide.transformations.CropTransformation;
 import jp.wasabeef.glide.transformations.GrayscaleTransformation;
 import jp.wasabeef.glide.transformations.MaskTransformation;
-import jp.wasabeef.glide.transformations.NinePatchMaskTransformation;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
 import jp.wasabeef.glide.transformations.gpu.BrightnessFilterTransformation;
 import jp.wasabeef.glide.transformations.gpu.ContrastFilterTransformation;
@@ -76,22 +75,28 @@ public class MainAdapter extends RecyclerView.Adapter<MainAdapter.ViewHolder> {
 
   @Override public void onBindViewHolder(MainAdapter.ViewHolder holder, int position) {
     switch (mDataSet.get(position)) {
-      case Mask:
+      case Mask: {
+        int width = Utils.dip2px(mContext, 133.33f);
+        int height = Utils.dip2px(mContext, 126.33f);
         Glide.with(mContext)
-            .load(R.drawable.demo)
-            .override(210, 210)
+            .load(R.drawable.check)
+            .override(width, height)
             .bitmapTransform(new CenterCrop(mContext),
-                new MaskTransformation(mContext, R.drawable.mask210))
+                new MaskTransformation(mContext, R.drawable.mask_starfish))
             .into(holder.image);
         break;
-      case NinePatchMask:
+      }
+      case NinePatchMask: {
+        int width = Utils.dip2px(mContext, 150.0f);
+        int height = Utils.dip2px(mContext, 100.0f);
         Glide.with(mContext)
-            .load(R.drawable.demo)
-            .override(300, 300)
+            .load(R.drawable.check)
+            .override(width, height)
             .bitmapTransform(new CenterCrop(mContext),
-                new NinePatchMaskTransformation(mContext, R.drawable.chat_me_mask))
+                new MaskTransformation(mContext, R.drawable.mask_chat_right))
             .into(holder.image);
         break;
+      }
       case CropTop:
         Glide.with(mContext)
             .load(R.drawable.demo)
@@ -191,7 +196,6 @@ public class MainAdapter extends RecyclerView.Adapter<MainAdapter.ViewHolder> {
             .bitmapTransform(
                 new SwirlFilterTransformation(mContext, 0.5f, 1.0f, new PointF(0.5f, 0.5f)))
             .into(holder.image);
-
         break;
       case Brightness:
         Glide.with(mContext)

example/src/main/java/jp/wasabeef/example/glide/Utils.java

@@ -0,0 +1,27 @@
+package jp.wasabeef.example.glide;
+
+/**
+ * Copyright (C) 2015 Wasabeef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import android.content.Context;
+
+public class Utils {
+
+  public static int dip2px(Context context, float dp) {
+    float scale = context.getResources().getDisplayMetrics().density;
+    return (int) (dp * scale + 0.5f);
+  }
+}

gradle.properties

@@ -1,5 +1,5 @@
-VERSION_NAME=1.2.0
-VERSION_CODE=10
+VERSION_NAME=1.2.1
+VERSION_CODE=11
 GROUP=jp.wasabeef
 ARTIFACT_ID=glide-transformations
 

transformations/src/main/java/jp/wasabeef/glide/transformations/MaskTransformation.java

@@ -22,21 +22,30 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.Transformation;
 import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapResource;
-import jp.wasabeef.glide.transformations.internal.Util;
+import jp.wasabeef.glide.transformations.internal.Utils;
 
 public class MaskTransformation implements Transformation<Bitmap> {
 
+  private static Paint mMaskingPaint = new Paint();
   private Context mContext;
   private BitmapPool mBitmapPool;
   private int mMaskId;
 
+  static {
+    mMaskingPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+  }
+
+  /**
+   * @param maskId If you change the mask file, please also rename the mask file, or Glide will get
+   * the cache with the old mask. Because getId() return the same values if using the
+   * same make file name. If you have a good idea please tell us, thanks.
+   */
   public MaskTransformation(Context context, int maskId) {
     mBitmapPool = Glide.get(context).getBitmapPool();
     mContext = context;
@@ -50,29 +59,23 @@ public class MaskTransformation implements Transformation<Bitmap> {
     int width = source.getWidth();
     int height = source.getHeight();
 
-    Bitmap mask = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-
-    Drawable drawable = Util.getMaskDrawable(mContext, mMaskId);
-    drawable.setBounds(0, 0, width, height);
-    Canvas canvas = new Canvas(mask);
-    drawable.draw(canvas);
-
-    Bitmap bitmap = mBitmapPool.get(width, height, Bitmap.Config.ARGB_8888);
-    if (bitmap == null) {
-      bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+    Bitmap result = mBitmapPool.get(width, height, Bitmap.Config.ARGB_8888);
+    if (result == null) {
+      result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
     }
 
-    Paint paint = new Paint();
-    paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+    Drawable mask = Utils.getMaskDrawable(mContext, mMaskId);
 
-    canvas = new Canvas(bitmap);
-    canvas.drawBitmap(mask, new Rect(0, 0, width, height), new Rect(0, 0, width, height), null);
-    canvas.drawBitmap(source, 0, 0, paint);
+    Canvas canvas = new Canvas(result);
+    mask.setBounds(0, 0, width, height);
+    mask.draw(canvas);
+    canvas.drawBitmap(source, 0, 0, mMaskingPaint);
 
-    return BitmapResource.obtain(bitmap, mBitmapPool);
+    return BitmapResource.obtain(result, mBitmapPool);
   }
 
   @Override public String getId() {
-    return "MaskTransformation(maskId=" + mMaskId + ")";
+    return "MaskTransformation(maskId=" + mContext.getResources().getResourceEntryName(mMaskId)
+        + ")";
   }
 }

transformations/src/main/java/jp/wasabeef/glide/transformations/NinePatchMaskTransformation.java

@@ -1,82 +0,0 @@
-package jp.wasabeef.glide.transformations;
-
-/**
- * Copyright (C) 2015 Wasabeef
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.Transformation;
-import com.bumptech.glide.load.engine.Resource;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapResource;
-import com.bumptech.glide.request.target.Target;
-import jp.wasabeef.glide.transformations.internal.Util;
-
-public class NinePatchMaskTransformation implements Transformation<Bitmap> {
-
-  private Context mContext;
-  private BitmapPool mBitmapPool;
-  private int mMaskId;
-
-  public NinePatchMaskTransformation(Context context, int maskId) {
-    mBitmapPool = Glide.get(context).getBitmapPool();
-    mContext = context;
-    mMaskId = maskId;
-  }
-
-  @Override
-  public Resource<Bitmap> transform(Resource<Bitmap> resource, int outWidth, int outHeight) {
-    Bitmap source = resource.get();
-
-    int width = source.getWidth();
-    int height = source.getHeight();
-    int maskWidth = outWidth == Target.SIZE_ORIGINAL ? width : outWidth;
-    int maskHeight = outHeight == Target.SIZE_ORIGINAL ? height : outHeight;
-
-    Bitmap mask = Bitmap.createBitmap(maskWidth, maskHeight, Bitmap.Config.ARGB_8888);
-
-    Drawable drawable = Util.getMaskDrawable(mContext, mMaskId);
-    drawable.setBounds(0, 0, maskWidth, maskHeight);
-    Canvas canvas = new Canvas(mask);
-    drawable.draw(canvas);
-
-    Bitmap bitmap = mBitmapPool.get(width, height, Bitmap.Config.ARGB_8888);
-    if (bitmap == null) {
-      bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-    }
-
-    Paint paint = new Paint();
-    paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-
-    canvas = new Canvas(bitmap);
-    canvas.drawBitmap(mask, new Rect(0, 0, maskWidth, maskHeight), new Rect(0, 0, width, height),
-        null);
-    canvas.drawBitmap(source, 0, 0, paint);
-
-    return BitmapResource.obtain(bitmap, mBitmapPool);
-  }
-
-  @Override public String getId() {
-    return "NinePatchMaskTransformation(mMaskId=" + mMaskId + ")";
-  }
-}

transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java

@@ -20,9 +20,9 @@ import android.os.Build;
  * limitations under the License.
  */
 
-public final class Util {
+public final class Utils {
 
-  private Util() {
+  private Utils() {
     // Utility class.
   }