update parent activity

Add a Bitdeli Badge to README

CHANGELOG.md

@@ -1,6 +1,26 @@
 Change Log
 ==========
 
+Version 1.0.7 *(2015-07-18)*
+----------------------------
+
+Bug fix : Blur not working.
+
+Version 1.0.6 *(2015-04-23)*
+----------------------------
+
+add: CropType(Top, Center, Bottom) for CropTransformation.
+
+Version 1.0.5 *(2015-03-09)*
+----------------------------
+
+Bug fix: Transparency.
+
+Version 1.0.4 *(2015-02-13)*
+----------------------------
+
+Bug fix : remove original bitmap resource recycling.
+
 Version 1.0.3 *(2015-02-05)*
 ----------------------------
 

README.md

@@ -32,7 +32,7 @@ repositories {
 }
 
 dependencies {
-    compile 'jp.wasabeef:glide-transformations:1.0.3@aar'
+    compile 'jp.wasabeef:glide-transformations:1.0.8@aar'
     compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.2.3@aar'
 }
 ```
@@ -54,7 +54,7 @@ You can set a multiple transformations.
 ```java
 BitmapPool pool = Glide.get(this).getBitmapPool();
 Glide.with(this).load(R.drawable.demo).bitmapTransform(
-  new BlurTransformation(this, pool, 5),  new CropCircleTransformation(pool))
+  new BlurTransformation(this, pool, 25, 2),  new CropCircleTransformation(pool))
   .into((ImageView) findViewById(R.id.image));
 ```
 
@@ -67,7 +67,7 @@ android {
     ...
     defaultConfig {
         ...
-        renderscriptTargetApi 21
+        renderscriptTargetApi 22
         renderscriptSupportModeEnabled true
     }
 }
@@ -92,6 +92,15 @@ android {
 ### Other
 `RoundedCornersTransformation`
 
+Applications using Glide Transformations
+---
+
+Please [ping](mailto:dadadada.chop@gmail.com) me or send a pull request if you would like to be added here.
+
+Icon | Application
+------------ | -------------
+<img src="https://lh6.ggpht.com/6zKH_uQY1bxCwXL4DLo_uoFEOXdShi3BgmN6XRHlaJ-oA1svmq6y1PZkmO50nWQn2Lg=w300-rw" width="48" height="48" /> | [Ameba Ownd](https://play.google.com/store/apps/details?id=jp.co.cyberagent.madrid)
+
 Developed By
 -------
 Daichi Furiya (Wasabeef) - <dadadada.chop@gmail.com>

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.+'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
+        classpath 'com.android.tools.build:gradle:1.3.0-beta4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

example/build.gradle

@@ -53,9 +53,8 @@ def getKeyAliasPasswordProperty() {
 
 dependencies {
     compile project(':transformations')
-//    compile 'jp.wasabeef:glide-transformations:1.0.3'
-    compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.2.3'
-    compile 'com.android.support:appcompat-v7:21.+'
-    compile 'com.android.support:recyclerview-v7:21.+'
-    compile 'com.github.bumptech.glide:glide:3.5.1'
+    compile "com.github.bumptech.glide:glide:${GLIDE_VERSION}"
+    compile "jp.co.cyberagent.android.gpuimage:gpuimage-library:${GPUIMAGE_VERSION}"
+    compile "com.android.support:appcompat-v7:${SUPPORT_PACKAGE_VERSION}"
+    compile "com.android.support:recyclerview-v7:${SUPPORT_PACKAGE_VERSION}"
 }

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

@@ -1,7 +1,7 @@
 package jp.wasabeef.example.glide;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
@@ -11,7 +11,7 @@ import java.util.List;
 import jp.wasabeef.example.glide.MainAdapter.Type;
 
 
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -22,7 +22,9 @@ public class MainActivity extends ActionBarActivity {
         recyclerView.setLayoutManager(new GridLayoutManager(this, 2));
 
         List<Type> dataSet = new ArrayList<>();
-        dataSet.add(Type.Crop);
+        dataSet.add(Type.CropTop);
+        dataSet.add(Type.CropCenter);
+        dataSet.add(Type.CropBottom);
         dataSet.add(Type.CropSquare);
         dataSet.add(Type.CropCircle);
         dataSet.add(Type.ColorFilter);

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

@@ -45,7 +45,9 @@ public class MainAdapter extends RecyclerView.Adapter<MainAdapter.ViewHolder> {
     private BitmapPool mPool;
 
     enum Type {
-        Crop,
+        CropTop,
+        CropCenter,
+        CropBottom,
         CropSquare,
         CropCircle,
         ColorFilter,
@@ -79,11 +81,19 @@ public class MainAdapter extends RecyclerView.Adapter<MainAdapter.ViewHolder> {
 
     @Override
     public void onBindViewHolder(MainAdapter.ViewHolder holder, int position) {
-        Transformation<Bitmap> transformation = null;
+        Transformation transformation = null;
         switch (mDataSet.get(position)) {
-            case Crop:
+            case CropTop:
+                transformation =
+                        new CropTransformation(mPool, 300, 100, CropTransformation.CropType.TOP);
+                break;
+            case CropCenter:
                 transformation = new CropTransformation(mPool, 300, 100);
                 break;
+            case CropBottom:
+                transformation =
+                        new CropTransformation(mPool, 300, 100, CropTransformation.CropType.BOTTOM);
+                break;
             case CropSquare:
                 transformation = new CropSquareTransformation(mPool);
                 break;
@@ -100,7 +110,7 @@ public class MainAdapter extends RecyclerView.Adapter<MainAdapter.ViewHolder> {
                 transformation = new RoundedCornersTransformation(mPool, 100, 0);
                 break;
             case Blur:
-                transformation = new BlurTransformation(mContext, mPool, 10);
+                transformation = new BlurTransformation(mContext, mPool, 25, 1);
                 break;
             case Toon:
                 transformation = new ToonFilterTransformation(mContext, mPool);

example/src/main/res/layout/layout_list_item.xml

@@ -6,11 +6,10 @@
 
     <ImageView
         android:id="@+id/image"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:contentDescription="@null"
-        android:src="@drawable/demo"/>
+        android:contentDescription="@null"/>
 
     <TextView
         android:id="@+id/title"

gradle.properties

@@ -1,12 +1,12 @@
-VERSION_NAME=1.0.3
-VERSION_CODE=3
+VERSION_NAME=1.0.8
+VERSION_CODE=8
 GROUP=jp.wasabeef
 ARTIFACT_ID=glide-transformations
 
-COMPILE_SDK_VERSION=21
-BUILD_TOOLS_VERSION=21.1.2
-TARGET_SDK_VERSION=21
-RENDERSCRIPT_TARGET_API=21
+COMPILE_SDK_VERSION=22
+BUILD_TOOLS_VERSION=22.0.1
+TARGET_SDK_VERSION=22
+RENDERSCRIPT_TARGET_API=22
 MIN_SDK_VERSION=11
 
 POM_DESCRIPTION=which provides simple Tranformations to Glide
@@ -22,3 +22,7 @@ POM_DEVELOPER_NAME=Wasabeef
 POM_DEVELOPER_EMAIL=dadadada.chop@gmail.com
 POM_DEVELOPER_URL=wasabeef.jp
 ISSUE_URL=https://github.com/wasabeef/glide-transformations/issues
+
+SUPPORT_PACKAGE_VERSION=22.2.1
+GLIDE_VERSION=3.6.1
+GPUIMAGE_VERSION=1.2.3

transformations/android-artifacts.gradle

@@ -1,6 +1,7 @@
 task androidJavadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
+    classpath += files(ext.androidJar)
 }
 
 task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {

transformations/build.gradle

@@ -15,9 +15,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.github.bumptech.glide:glide:3.5.1'
-    compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.2.3'
+    compile "com.github.bumptech.glide:glide:${GLIDE_VERSION}"
+    compile "jp.co.cyberagent.android.gpuimage:gpuimage-library:${GPUIMAGE_VERSION}"
 }
 
 android.libraryVariants.all { variant ->

transformations/src/main/AndroidManifest.xml

@@ -1,3 +1 @@
-<manifest
-package="jp.wasabeef.glide.transformations">
-</manifest>
+<manifest package="jp.wasabeef.glide.transformations"></manifest>

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

@@ -25,28 +25,35 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.graphics.Rect;
 import android.support.v8.renderscript.Allocation;
+import android.support.v8.renderscript.Element;
 import android.support.v8.renderscript.RenderScript;
 import android.support.v8.renderscript.ScriptIntrinsicBlur;
 
 public class BlurTransformation implements Transformation<Bitmap> {
 
     private static int MAX_RADIUS = 25;
+    private static int DEFAULT_DOWN_SAMPLING = 1;
 
     private Context mContext;
     private BitmapPool mBitmapPool;
 
     private int mRadius;
+    private int mSampling;
 
     public BlurTransformation(Context context, BitmapPool pool) {
-        this(context, pool, MAX_RADIUS);
+        this(context, pool, MAX_RADIUS, DEFAULT_DOWN_SAMPLING);
     }
 
     public BlurTransformation(Context context, BitmapPool pool, int radius) {
+        this(context, pool, radius, DEFAULT_DOWN_SAMPLING);
+    }
+
+    public BlurTransformation(Context context, BitmapPool pool, int radius, int sampling) {
         mContext = context;
         mBitmapPool = pool;
         mRadius = radius;
+        mSampling = sampling;
     }
 
     @Override
@@ -55,26 +62,31 @@ public class BlurTransformation implements Transformation<Bitmap> {
 
         int width = source.getWidth();
         int height = source.getHeight();
+        int scaledWidth = width / mSampling;
+        int scaledHeight = height / mSampling;
 
-        Bitmap.Config config =
-                source.getConfig() != null ? source.getConfig() : Bitmap.Config.ARGB_8888;
-        Bitmap bitmap = mBitmapPool.get(width, height, config);
+        Bitmap bitmap = mBitmapPool.get(scaledWidth, scaledHeight, Bitmap.Config.ARGB_8888);
         if (bitmap == null) {
-            bitmap = Bitmap.createBitmap(width, height, config);
+            bitmap = Bitmap.createBitmap(scaledWidth, scaledHeight, Bitmap.Config.ARGB_8888);
         }
 
         Canvas canvas = new Canvas(bitmap);
-        canvas.drawBitmap(source, 0, 0, null);
+        canvas.scale(1 / (float) mSampling, 1 / (float) mSampling);
+        Paint paint = new Paint();
+        paint.setFlags(Paint.FILTER_BITMAP_FLAG);
+        canvas.drawBitmap(source, 0, 0, paint);
 
         RenderScript rs = RenderScript.create(mContext);
-        Allocation overlayAlloc = Allocation.createFromBitmap(rs, bitmap);
-        ScriptIntrinsicBlur blur = ScriptIntrinsicBlur.create(rs, overlayAlloc.getElement());
-        blur.setInput(overlayAlloc);
-        blur.setRadius(mRadius);
-        blur.forEach(overlayAlloc);
-        overlayAlloc.copyTo(bitmap);
+        Allocation input = Allocation.createFromBitmap(rs, bitmap,
+                Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT);
+        Allocation output = Allocation.createTyped(rs, input.getType());
+        ScriptIntrinsicBlur blur = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs));
+
+        blur.setInput(input);
+        blur.setRadius(mRadius);
+        blur.forEach(output);
+        output.copyTo(bitmap);
 
-        source.recycle();
         rs.destroy();
 
         return BitmapResource.obtain(bitmap, mBitmapPool);
@@ -82,6 +94,6 @@ public class BlurTransformation implements Transformation<Bitmap> {
 
     @Override
     public String getId() {
-        return "BlurTransformation(radius=" + mRadius + ")";
+        return "BlurTransformation(radius=" + mRadius + ", sampling=" + mSampling + ")";
     }
 }

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

@@ -58,8 +58,6 @@ public class ColorFilterTransformation implements Transformation<Bitmap> {
         paint.setColorFilter(new PorterDuffColorFilter(mColor, PorterDuff.Mode.SRC_ATOP));
         canvas.drawBitmap(source, 0, 0, paint);
 
-        source.recycle();
-
         return BitmapResource.obtain(bitmap, mBitmapPool);
     }
 

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

@@ -43,28 +43,26 @@ public class CropCircleTransformation implements Transformation<Bitmap> {
         int width = (source.getWidth() - size) / 2;
         int height = (source.getHeight() - size) / 2;
 
-        Bitmap.Config config =
-                source.getConfig() != null ? source.getConfig() : Bitmap.Config.ARGB_8888;
-        Bitmap bitmap = mBitmapPool.get(size, size, config);
+        Bitmap bitmap = mBitmapPool.get(size, size, Bitmap.Config.ARGB_8888);
         if (bitmap == null) {
-            bitmap = Bitmap.createBitmap(size, size, config);
+            bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         }
 
         Canvas canvas = new Canvas(bitmap);
         Paint paint = new Paint();
         BitmapShader shader = new BitmapShader(source, BitmapShader.TileMode.CLAMP,
                 BitmapShader.TileMode.CLAMP);
-        Matrix matrix = new Matrix();
-        matrix.setTranslate(-width, -height);
-        shader.setLocalMatrix(matrix);
+        if (width != 0 || height != 0) {
+            Matrix matrix = new Matrix();
+            matrix.setTranslate(-width, -height);
+            shader.setLocalMatrix(matrix);
+        }
         paint.setShader(shader);
         paint.setAntiAlias(true);
 
         float r = size / 2f;
         canvas.drawCircle(r, r, r, paint);
 
-        source.recycle();
-
         return BitmapResource.obtain(bitmap, mBitmapPool);
     }
 

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

@@ -48,10 +48,6 @@ public class CropSquareTransformation implements Transformation<Bitmap> {
             bitmap = Bitmap.createBitmap(source, mWidth, mHeight, size, size);
         }
 
-        if (bitmap != source) {
-            source.recycle();
-        }
-
         return BitmapResource.obtain(bitmap, mBitmapPool);
     }
 

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

@@ -31,6 +31,8 @@ public class CropTransformation implements Transformation<Bitmap> {
     private int mWidth;
     private int mHeight;
 
+    private CropType mCropType = CropType.CENTER;
+
     public CropTransformation(BitmapPool pool) {
         mBitmapPool = pool;
     }
@@ -41,15 +43,18 @@ public class CropTransformation implements Transformation<Bitmap> {
         mHeight = height;
     }
 
+    public CropTransformation(BitmapPool pool, int width, int height, CropType cropType) {
+        mBitmapPool = pool;
+        mWidth = width;
+        mHeight = height;
+        mCropType = cropType;
+    }
+
     @Override
     public Resource<Bitmap> transform(Resource<Bitmap> resource, int outWidth, int outHeight) {
         Bitmap source = resource.get();
-        if (mWidth == 0) {
-            mWidth = source.getWidth();
-        }
-        if (mHeight == 0) {
-            mHeight = source.getHeight();
-        }
+        mWidth = mWidth == 0 ? source.getWidth() : mWidth;
+        mHeight = mHeight == 0 ? source.getHeight() : mHeight;
 
         Bitmap.Config config =
                 source.getConfig() != null ? source.getConfig() : Bitmap.Config.ARGB_8888;
@@ -65,19 +70,37 @@ public class CropTransformation implements Transformation<Bitmap> {
         float scaledWidth = scale * source.getWidth();
         float scaledHeight = scale * source.getHeight();
         float left = (mWidth - scaledWidth) / 2;
-        float top = (mHeight - scaledHeight) / 2;
+        float top = getTop(scaledHeight);
         RectF targetRect = new RectF(left, top, left + scaledWidth, top + scaledHeight);
 
         Canvas canvas = new Canvas(bitmap);
         canvas.drawBitmap(source, null, targetRect, null);
 
-        source.recycle();
-
         return BitmapResource.obtain(bitmap, mBitmapPool);
     }
 
     @Override
     public String getId() {
-        return "CropTransformation(width=" + mWidth + ", height=" + mHeight + ")";
+        return "CropTransformation(width=" + mWidth + ", height=" + mHeight + ", cropType="
+                + mCropType + ")";
+    }
+
+    private float getTop(float scaledHeight) {
+        switch (mCropType) {
+            case TOP:
+                return 0;
+            case CENTER:
+                return (mHeight - scaledHeight) / 2;
+            case BOTTOM:
+                return mHeight - scaledHeight;
+            default:
+                return 0;
+        }
+    }
+
+    public enum CropType {
+        TOP,
+        CENTER,
+        BOTTOM
     }
 }

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

@@ -56,8 +56,6 @@ public class GrayscaleTransformation implements Transformation<Bitmap> {
         paint.setColorFilter(new ColorMatrixColorFilter(saturation));
         canvas.drawBitmap(source, 0, 0, paint);
 
-        source.recycle();
-
         return BitmapResource.obtain(bitmap, mBitmapPool);
     }
 

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

@@ -48,11 +48,9 @@ public class RoundedCornersTransformation implements Transformation<Bitmap> {
         int width = source.getWidth();
         int height = source.getHeight();
 
-        Bitmap.Config config =
-                source.getConfig() != null ? source.getConfig() : Bitmap.Config.ARGB_8888;
-        Bitmap bitmap = mBitmapPool.get(width, height, config);
+        Bitmap bitmap = mBitmapPool.get(width, height, Bitmap.Config.ARGB_8888);
         if (bitmap == null) {
-            bitmap = Bitmap.createBitmap(width, height, config);
+            bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
         }
 
         Canvas canvas = new Canvas(bitmap);
@@ -62,8 +60,6 @@ public class RoundedCornersTransformation implements Transformation<Bitmap> {
         canvas.drawRoundRect(new RectF(margin, margin, width - margin, height - margin),
                 radius, radius, paint);
 
-        source.recycle();
-
         return BitmapResource.obtain(bitmap, mBitmapPool);
     }