| [Ameba Ownd](https://play.google.com/store/apps/details?id=jp.co.cyberagent.madrid)
| [AbemaTV](https://play.google.com/store/apps/details?id=tv.abema)
+
| [TV Time](https://play.google.com/store/apps/details?id=com.tozelabs.tvshowtime)
+
| [Christmas Radio](https://play.google.com/store/apps/details?id=nl.netwaves.christmasradio)
+
+
Developed By
-------
@@ -106,10 +123,11 @@ Contributions
Any contributions are welcome!
-Contributers
+Contributors
-------
* [start141](https://github.com/start141)
+* [squeeish](https://github.com/squeeish)
Thanks
-------
@@ -119,7 +137,7 @@ Thanks
License
-------
- Copyright 2017 Wasabeef
+ Copyright (C) 2020 Wasabeef
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/build.gradle b/build.gradle
index 8a67314..9d4a8c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,18 +1,30 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- repositories {
- jcenter()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:2.3.0'
- classpath 'com.novoda:bintray-release:0.3.4'
- }
+ ext {
+ kotlin_version = '1.3.72'
+ glide_version = '4.11.0'
+ gpuimage_version = '2.1.0'
+ }
+
+ repositories {
+ google()
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:4.2.0-beta04'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
+ // TODO: Close JCenter on May 1st https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/
+// classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
+// classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+ }
}
allprojects {
- repositories {
- jcenter()
- mavenCentral()
- }
+ repositories {
+ google()
+ mavenCentral()
+ jcenter()
+ }
}
diff --git a/example/build.gradle b/example/build.gradle
index 95d1cc5..1679ca8 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,58 +1,46 @@
apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
android {
compileSdkVersion COMPILE_SDK_VERSION as int
- buildToolsVersion BUILD_TOOLS_VERSION
defaultConfig {
minSdkVersion MIN_SDK_VERSION as int
targetSdkVersion TARGET_SDK_VERSION as int
- versionCode "git rev-list origin/master --count".execute().text.toInteger()
+ versionCode VERSION_CODE as int
versionName VERSION_NAME
}
- signingConfigs {
- release {
- storeFile file(keyStoreProperty)
- keyAlias keyAliasProperty
- storePassword keyStorePasswordProperty
- keyPassword keyAliasPasswordProperty
- }
- }
+ // SigningConfigs
+ apply from: '../signingConfigs/debug.gradle', to: android
buildTypes {
debug {
debuggable true
- zipAlignEnabled true
+ signingConfig signingConfigs.debug
}
release {
debuggable false
zipAlignEnabled true
- signingConfig signingConfigs.release
+ minifyEnabled true
+ shrinkResources true
}
}
}
-def getKeyStoreProperty() {
- return hasProperty('WASABEEF_KEYSTORE') ? WASABEEF_KEYSTORE : "debug.keystore"
-}
-
-def getKeyAliasProperty() {
- return hasProperty('WASABEEF_KEYALIAS') ? WASABEEF_KEYALIAS : "android"
-}
-
-def getKeyStorePasswordProperty() {
- return hasProperty('WASABEEF_KEYSTOREPASSWORD') ? WASABEEF_KEYSTOREPASSWORD : "androiddebugkey"
-}
-
-def getKeyAliasPasswordProperty() {
- return hasProperty('WASABEEF_KEYALIASPASSWORD') ? WASABEEF_KEYALIASPASSWORD : "android"
+repositories {
+// maven { url = "https://oss.sonatype.org/content/repositories/snapshots"}
}
dependencies {
- compile project(':transformations')
- 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}"
+// implementation project(':transformations')
+ implementation 'jp.wasabeef:glide-transformations:4.3.0'
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ implementation "com.github.bumptech.glide:glide:$glide_version"
+ kapt "com.github.bumptech.glide:compiler:$glide_version"
+ implementation "jp.co.cyberagent.android:gpuimage:$gpuimage_version"
+ implementation "androidx.appcompat:appcompat:1.3.0-beta01"
+ implementation "androidx.recyclerview:recyclerview:1.2.0-beta01"
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
}
diff --git a/example/proguard-rules.pro b/example/proguard-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
index 2e838d2..2c18882 100644
--- a/example/src/main/AndroidManifest.xml
+++ b/example/src/main/AndroidManifest.xml
@@ -1,22 +1,21 @@
+ * 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 androidx.annotation.NonNull;
+
+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 com.bumptech.glide.util.Util;
+
+import java.security.MessageDigest;
+
+public abstract class BitmapTransformation implements Transformation
* 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.
@@ -20,88 +20,89 @@
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Paint;
-import android.os.Build;
import android.renderscript.RSRuntimeException;
-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.FastBlur;
-import jp.wasabeef.glide.transformations.internal.RSBlur;
-public class BlurTransformation implements Transformation
* 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.
@@ -22,51 +22,64 @@
import android.graphics.Paint;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.Transformation;
-import com.bumptech.glide.load.engine.Resource;
+
+import androidx.annotation.NonNull;
+
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapResource;
-public class ColorFilterTransformation implements Transformation
* 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.
@@ -18,61 +18,48 @@
import android.content.Context;
import android.graphics.Bitmap;
-import android.graphics.BitmapShader;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.Transformation;
-import com.bumptech.glide.load.engine.Resource;
+
+import androidx.annotation.NonNull;
+
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapResource;
+import com.bumptech.glide.load.resource.bitmap.TransformationUtils;
+import com.bumptech.glide.request.RequestOptions;
-public class CropCircleTransformation implements Transformation
+ * 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.
+ */
+
+public class CropCircleWithBorderTransformation extends BitmapTransformation {
+
+
+ private static final int VERSION = 1;
+ private static final String ID = "jp.wasabeef.glide.transformations.CropCircleWithBorderTransformation." + VERSION;
+
+ private final int borderSize;
+ private final int borderColor;
+
+
+ public CropCircleWithBorderTransformation() {
+ this.borderSize = Utils.toDp(4);
+ this.borderColor = Color.BLACK;
+ }
+
+ public CropCircleWithBorderTransformation(int borderSize, @ColorInt int borderColor) {
+ this.borderSize = borderSize;
+ this.borderColor = borderColor;
+ }
+
+ @Override
+ protected Bitmap transform(@NonNull Context context, @NonNull BitmapPool pool,
+ @NonNull Bitmap toTransform, int outWidth, int outHeight) {
+
+ Bitmap bitmap = TransformationUtils.circleCrop(pool, toTransform, outWidth, outHeight);
+
+ setCanvasBitmapDensity(toTransform, bitmap);
+
+ Paint paint = new Paint();
+ paint.setColor(borderColor);
+ paint.setStyle(Paint.Style.STROKE);
+ paint.setStrokeWidth(borderSize);
+ paint.setAntiAlias(true);
+
+ Canvas canvas = new Canvas(bitmap);
+ canvas.drawCircle(
+ outWidth / 2f,
+ outHeight / 2f,
+ Math.max(outWidth, outHeight) / 2f - borderSize / 2f,
+ paint
+ );
+
+ return bitmap;
+ }
+
+ @Override
+ public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+ messageDigest.update((ID + borderSize + borderColor).getBytes(CHARSET));
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof CropCircleWithBorderTransformation &&
+ ((CropCircleWithBorderTransformation) o).borderSize == borderSize &&
+ ((CropCircleWithBorderTransformation) o).borderColor == borderColor;
+ }
+
+ @Override
+ public int hashCode() {
+ return ID.hashCode() + borderSize * 100 + borderColor + 10;
+ }
+}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java
old mode 100644
new mode 100755
index f71dca9..b8f41d9
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java
@@ -1,14 +1,14 @@
package jp.wasabeef.glide.transformations;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -18,45 +18,46 @@
import android.content.Context;
import android.graphics.Bitmap;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.Transformation;
-import com.bumptech.glide.load.engine.Resource;
+
+import androidx.annotation.NonNull;
+
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapResource;
+import com.bumptech.glide.load.resource.bitmap.TransformationUtils;
-public class CropSquareTransformation implements Transformation
* 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.
@@ -20,13 +20,17 @@
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.RectF;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.Transformation;
-import com.bumptech.glide.load.engine.Resource;
+
+import androidx.annotation.NonNull;
+
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapResource;
-public class CropTransformation implements Transformation
* 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.
@@ -22,49 +22,58 @@
import android.graphics.ColorMatrix;
import android.graphics.ColorMatrixColorFilter;
import android.graphics.Paint;
-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;
-public class GrayscaleTransformation implements Transformation
* 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.
@@ -23,63 +23,74 @@
import android.graphics.PorterDuff;
import android.graphics.PorterDuffXfermode;
import android.graphics.drawable.Drawable;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.Transformation;
-import com.bumptech.glide.load.engine.Resource;
+
+import androidx.annotation.NonNull;
+
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapResource;
-import jp.wasabeef.glide.transformations.internal.Utils;
-public class MaskTransformation implements Transformation
* 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.
@@ -23,13 +23,17 @@
import android.graphics.Paint;
import android.graphics.RectF;
import android.graphics.Shader;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.Transformation;
-import com.bumptech.glide.load.engine.Resource;
+
+import androidx.annotation.NonNull;
+
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapResource;
-public class RoundedCornersTransformation implements Transformation
* 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.
@@ -16,38 +16,52 @@
* limitations under the License.
*/
-import android.content.Context;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import jp.co.cyberagent.android.gpuimage.GPUImageBrightnessFilter;
+import androidx.annotation.NonNull;
+
+import java.security.MessageDigest;
+
+import jp.co.cyberagent.android.gpuimage.filter.GPUImageBrightnessFilter;
/**
* brightness value ranges from -1.0 to 1.0, with 0.0 as the normal level
*/
public class BrightnessFilterTransformation extends GPUFilterTransformation {
- private float mBrightness;
+ private static final int VERSION = 1;
+ private static final String ID =
+ "jp.wasabeef.glide.transformations.gpu.BrightnessFilterTransformation." + VERSION;
- public BrightnessFilterTransformation(Context context) {
- this(context, Glide.get(context).getBitmapPool());
+ private final float brightness;
+
+ public BrightnessFilterTransformation() {
+ this(0.0f);
}
- public BrightnessFilterTransformation(Context context, BitmapPool pool) {
- this(context, pool, 0.0f);
+ public BrightnessFilterTransformation(float brightness) {
+ super(new GPUImageBrightnessFilter());
+ this.brightness = brightness;
+ GPUImageBrightnessFilter filter = getFilter();
+ filter.setBrightness(this.brightness);
}
- public BrightnessFilterTransformation(Context context, float brightness) {
- this(context, Glide.get(context).getBitmapPool(), brightness);
+ @Override
+ public String toString() {
+ return "BrightnessFilterTransformation(brightness=" + brightness + ")";
}
- public BrightnessFilterTransformation(Context context, BitmapPool pool, float brightness) {
- super(context, pool, new GPUImageBrightnessFilter());
- mBrightness = brightness;
- GPUImageBrightnessFilter filter = getFilter();
- filter.setBrightness(mBrightness);
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof BrightnessFilterTransformation &&
+ ((BrightnessFilterTransformation) o).brightness == brightness;
+ }
+
+ @Override
+ public int hashCode() {
+ return ID.hashCode() + (int) ((brightness + 1.0f) * 10);
}
- @Override public String getId() {
- return "BrightnessFilterTransformation(brightness=" + mBrightness + ")";
+ @Override
+ public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+ messageDigest.update((ID + brightness).getBytes(CHARSET));
}
}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java
old mode 100644
new mode 100755
index 99eac5b..b6af2c0
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java
@@ -1,14 +1,14 @@
package jp.wasabeef.glide.transformations.gpu;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -16,38 +16,51 @@
* limitations under the License.
*/
-import android.content.Context;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import jp.co.cyberagent.android.gpuimage.GPUImageContrastFilter;
+import androidx.annotation.NonNull;
+
+import java.security.MessageDigest;
+
+import jp.co.cyberagent.android.gpuimage.filter.GPUImageContrastFilter;
/**
* contrast value ranges from 0.0 to 4.0, with 1.0 as the normal level
*/
public class ContrastFilterTransformation extends GPUFilterTransformation {
- private float mContrast;
+ private static final int VERSION = 1;
+ private static final String ID =
+ "jp.wasabeef.glide.transformations.gpu.ContrastFilterTransformation." + VERSION;
- public ContrastFilterTransformation(Context context) {
- this(context, Glide.get(context).getBitmapPool());
+ private final float contrast;
+
+ public ContrastFilterTransformation() {
+ this(1.0f);
}
- public ContrastFilterTransformation(Context context, BitmapPool pool) {
- this(context, pool, 1.0f);
+ public ContrastFilterTransformation(float contrast) {
+ super(new GPUImageContrastFilter());
+ this.contrast = contrast;
+ GPUImageContrastFilter filter = getFilter();
+ filter.setContrast(this.contrast);
}
- public ContrastFilterTransformation(Context context, float contrast) {
- this(context, Glide.get(context).getBitmapPool(), contrast);
+ @Override
+ public String toString() {
+ return "ContrastFilterTransformation(contrast=" + contrast + ")";
}
- public ContrastFilterTransformation(Context context, BitmapPool pool, float contrast) {
- super(context, pool, new GPUImageContrastFilter());
- mContrast = contrast;
- GPUImageContrastFilter filter = getFilter();
- filter.setContrast(mContrast);
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof ContrastFilterTransformation;
+ }
+
+ @Override
+ public int hashCode() {
+ return ID.hashCode() + (int) (contrast * 10);
}
- @Override public String getId() {
- return "ContrastFilterTransformation(contrast=" + mContrast + ")";
+ @Override
+ public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+ messageDigest.update((ID + contrast).getBytes(CHARSET));
}
}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/GPUFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/GPUFilterTransformation.java
old mode 100644
new mode 100755
index 72898eb..91a0aec
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/GPUFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/GPUFilterTransformation.java
@@ -1,14 +1,14 @@
package jp.wasabeef.glide.transformations.gpu;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -18,48 +18,62 @@
import android.content.Context;
import android.graphics.Bitmap;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.Transformation;
-import com.bumptech.glide.load.engine.Resource;
+
+import androidx.annotation.NonNull;
+
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapResource;
+
+import java.security.MessageDigest;
+
import jp.co.cyberagent.android.gpuimage.GPUImage;
-import jp.co.cyberagent.android.gpuimage.GPUImageFilter;
+import jp.co.cyberagent.android.gpuimage.filter.GPUImageFilter;
+import jp.wasabeef.glide.transformations.BitmapTransformation;
-public class GPUFilterTransformation implements Transformation
* 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.
@@ -16,25 +16,42 @@
* limitations under the License.
*/
-import android.content.Context;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import jp.co.cyberagent.android.gpuimage.GPUImageColorInvertFilter;
+import androidx.annotation.NonNull;
+
+import java.security.MessageDigest;
+
+import jp.co.cyberagent.android.gpuimage.filter.GPUImageColorInvertFilter;
/**
* Invert all the colors in the image.
*/
public class InvertFilterTransformation extends GPUFilterTransformation {
- public InvertFilterTransformation(Context context) {
- this(context, Glide.get(context).getBitmapPool());
- }
+ private static final int VERSION = 1;
+ private static final String ID =
+ "jp.wasabeef.glide.transformations.gpu.InvertFilterTransformation." + VERSION;
- public InvertFilterTransformation(Context context, BitmapPool pool) {
- super(context, pool, new GPUImageColorInvertFilter());
+ public InvertFilterTransformation() {
+ super(new GPUImageColorInvertFilter());
}
- @Override public String getId() {
+ @Override
+ public String toString() {
return "InvertFilterTransformation()";
}
+
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof InvertFilterTransformation;
+ }
+
+ @Override
+ public int hashCode() {
+ return ID.hashCode();
+ }
+
+ @Override
+ public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+ messageDigest.update((ID).getBytes(CHARSET));
+ }
}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java
old mode 100644
new mode 100755
index 5c39a0e..78a5b2d
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java
@@ -1,14 +1,14 @@
package jp.wasabeef.glide.transformations.gpu;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -16,41 +16,54 @@
* limitations under the License.
*/
-import android.content.Context;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import jp.co.cyberagent.android.gpuimage.GPUImageKuwaharaFilter;
+import androidx.annotation.NonNull;
+
+import java.security.MessageDigest;
+
+import jp.co.cyberagent.android.gpuimage.filter.GPUImageKuwaharaFilter;
/**
* Kuwahara all the colors in the image.
- *
+ *
* The radius to sample from when creating the brush-stroke effect, with a default of 25.
* The larger the radius, the slower the filter.
*/
public class KuwaharaFilterTransformation extends GPUFilterTransformation {
- private int mRadius;
+ private static final int VERSION = 1;
+ private static final String ID =
+ "jp.wasabeef.glide.transformations.gpu.KuwaharaFilterTransformation." + VERSION;
- public KuwaharaFilterTransformation(Context context) {
- this(context, Glide.get(context).getBitmapPool());
+ private final int radius;
+
+ public KuwaharaFilterTransformation() {
+ this(25);
}
- public KuwaharaFilterTransformation(Context context, BitmapPool pool) {
- this(context, pool, 25);
+ public KuwaharaFilterTransformation(int radius) {
+ super(new GPUImageKuwaharaFilter());
+ this.radius = radius;
+ GPUImageKuwaharaFilter filter = getFilter();
+ filter.setRadius(this.radius);
}
- public KuwaharaFilterTransformation(Context context, int radius) {
- this(context, Glide.get(context).getBitmapPool(), radius);
+ @Override
+ public String toString() {
+ return "KuwaharaFilterTransformation(radius=" + radius + ")";
}
- public KuwaharaFilterTransformation(Context context, BitmapPool pool, int radius) {
- super(context, pool, new GPUImageKuwaharaFilter());
- mRadius = radius;
- GPUImageKuwaharaFilter filter = getFilter();
- filter.setRadius(mRadius);
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof KuwaharaFilterTransformation;
+ }
+
+ @Override
+ public int hashCode() {
+ return ID.hashCode() + radius * 10;
}
- @Override public String getId() {
- return "KuwaharaFilterTransformation(radius=" + mRadius + ")";
+ @Override
+ public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+ messageDigest.update((ID + radius).getBytes(CHARSET));
}
}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java
old mode 100644
new mode 100755
index a91844b..1b6fd12
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java
@@ -1,14 +1,14 @@
package jp.wasabeef.glide.transformations.gpu;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -16,40 +16,53 @@
* limitations under the License.
*/
-import android.content.Context;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import jp.co.cyberagent.android.gpuimage.GPUImagePixelationFilter;
+import androidx.annotation.NonNull;
+
+import java.security.MessageDigest;
+
+import jp.co.cyberagent.android.gpuimage.filter.GPUImagePixelationFilter;
/**
* Applies a Pixelation effect to the image.
- *
+ *
* The pixel with a default of 10.0.
*/
public class PixelationFilterTransformation extends GPUFilterTransformation {
- private float mPixel;
+ private static final int VERSION = 1;
+ private static final String ID =
+ "jp.wasabeef.glide.transformations.gpu.PixelationFilterTransformation." + VERSION;
- public PixelationFilterTransformation(Context context) {
- this(context, Glide.get(context).getBitmapPool());
+ private final float pixel;
+
+ public PixelationFilterTransformation() {
+ this(10f);
}
- public PixelationFilterTransformation(Context context, BitmapPool pool) {
- this(context, pool, 10f);
+ public PixelationFilterTransformation(float pixel) {
+ super(new GPUImagePixelationFilter());
+ this.pixel = pixel;
+ GPUImagePixelationFilter filter = getFilter();
+ filter.setPixel(this.pixel);
}
- public PixelationFilterTransformation(Context context, float pixel) {
- this(context, Glide.get(context).getBitmapPool(), pixel);
+ @Override
+ public String toString() {
+ return "PixelationFilterTransformation(pixel=" + pixel + ")";
}
- public PixelationFilterTransformation(Context context, BitmapPool pool, float pixel) {
- super(context, pool, new GPUImagePixelationFilter());
- mPixel = pixel;
- GPUImagePixelationFilter filter = getFilter();
- filter.setPixel(mPixel);
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof PixelationFilterTransformation;
+ }
+
+ @Override
+ public int hashCode() {
+ return ID.hashCode() + (int) (pixel * 10);
}
- @Override public String getId() {
- return "PixelationFilterTransformation(pixel=" + mPixel + ")";
+ @Override
+ public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+ messageDigest.update((ID + pixel).getBytes(CHARSET));
}
}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java
old mode 100644
new mode 100755
index 18c5d98..149f009
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java
@@ -1,14 +1,14 @@
package jp.wasabeef.glide.transformations.gpu;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -16,40 +16,53 @@
* limitations under the License.
*/
-import android.content.Context;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import jp.co.cyberagent.android.gpuimage.GPUImageSepiaFilter;
+import androidx.annotation.NonNull;
+
+import java.security.MessageDigest;
+
+import jp.co.cyberagent.android.gpuimage.filter.GPUImageSepiaToneFilter;
/**
* Applies a simple sepia effect.
- *
+ *
* The intensity with a default of 1.0.
*/
public class SepiaFilterTransformation extends GPUFilterTransformation {
- private float mIntensity;
+ private static final int VERSION = 1;
+ private static final String ID =
+ "jp.wasabeef.glide.transformations.gpu.SepiaFilterTransformation." + VERSION;
+
+ private final float intensity;
+
+ public SepiaFilterTransformation() {
+ this(1.0f);
+ }
- public SepiaFilterTransformation(Context context) {
- this(context, Glide.get(context).getBitmapPool());
+ public SepiaFilterTransformation(float intensity) {
+ super(new GPUImageSepiaToneFilter());
+ this.intensity = intensity;
+ GPUImageSepiaToneFilter filter = getFilter();
+ filter.setIntensity(this.intensity);
}
- public SepiaFilterTransformation(Context context, BitmapPool pool) {
- this(context, pool, 1.0f);
+ @Override
+ public String toString() {
+ return "SepiaFilterTransformation(intensity=" + intensity + ")";
}
- public SepiaFilterTransformation(Context context, float intensity) {
- this(context, Glide.get(context).getBitmapPool(), intensity);
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof SepiaFilterTransformation;
}
- public SepiaFilterTransformation(Context context, BitmapPool pool, float intensity) {
- super(context, pool, new GPUImageSepiaFilter());
- mIntensity = intensity;
- GPUImageSepiaFilter filter = getFilter();
- filter.setIntensity(mIntensity);
+ @Override
+ public int hashCode() {
+ return ID.hashCode() + (int) (intensity * 10);
}
- @Override public String getId() {
- return "SepiaFilterTransformation(intensity=" + mIntensity + ")";
+ @Override
+ public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+ messageDigest.update((ID + intensity).getBytes(CHARSET));
}
}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java
old mode 100644
new mode 100755
index e3d9fcb..d737a29
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java
@@ -1,14 +1,14 @@
package jp.wasabeef.glide.transformations.gpu;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -16,22 +16,39 @@
* limitations under the License.
*/
-import android.content.Context;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import jp.co.cyberagent.android.gpuimage.GPUImageSketchFilter;
+import androidx.annotation.NonNull;
+
+import java.security.MessageDigest;
+
+import jp.co.cyberagent.android.gpuimage.filter.GPUImageSketchFilter;
public class SketchFilterTransformation extends GPUFilterTransformation {
- public SketchFilterTransformation(Context context) {
- this(context, Glide.get(context).getBitmapPool());
- }
+ private static final int VERSION = 1;
+ private static final String ID =
+ "jp.wasabeef.glide.transformations.gpu.SketchFilterTransformation." + VERSION;
- public SketchFilterTransformation(Context context, BitmapPool pool) {
- super(context, pool, new GPUImageSketchFilter());
+ public SketchFilterTransformation() {
+ super(new GPUImageSketchFilter());
}
- @Override public String getId() {
+ @Override
+ public String toString() {
return "SketchFilterTransformation()";
}
+
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof SketchFilterTransformation;
+ }
+
+ @Override
+ public int hashCode() {
+ return ID.hashCode();
+ }
+
+ @Override
+ public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+ messageDigest.update((ID).getBytes(CHARSET));
+ }
}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java
old mode 100644
new mode 100755
index 14ad45d..3ff0043
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java
@@ -1,14 +1,14 @@
package jp.wasabeef.glide.transformations.gpu;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -16,52 +16,68 @@
* limitations under the License.
*/
-import android.content.Context;
import android.graphics.PointF;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import jp.co.cyberagent.android.gpuimage.GPUImageSwirlFilter;
+
+import androidx.annotation.NonNull;
+
+import java.security.MessageDigest;
+
+import jp.co.cyberagent.android.gpuimage.filter.GPUImageSwirlFilter;
/**
* Creates a swirl distortion on the image.
*/
public class SwirlFilterTransformation extends GPUFilterTransformation {
- private float mRadius;
- private float mAngle;
- private PointF mCenter;
+ private static final int VERSION = 1;
+ private static final String ID =
+ "jp.wasabeef.glide.transformations.gpu.SwirlFilterTransformation." + VERSION;
- public SwirlFilterTransformation(Context context) {
- this(context, Glide.get(context).getBitmapPool());
- }
-
- public SwirlFilterTransformation(Context context, BitmapPool pool) {
- this(context, pool, .5f, 1.0f, new PointF(0.5f, 0.5f));
- }
+ private final float radius;
+ private final float angle;
+ private final PointF center;
- public SwirlFilterTransformation(Context context, float radius, float angle, PointF center) {
- this(context, Glide.get(context).getBitmapPool(), radius, angle, center);
+ public SwirlFilterTransformation() {
+ this(.5f, 1.0f, new PointF(0.5f, 0.5f));
}
/**
* @param radius from 0.0 to 1.0, default 0.5
- * @param angle minimum 0.0, default 1.0
+ * @param angle minimum 0.0, default 1.0
* @param center default (0.5, 0.5)
*/
- public SwirlFilterTransformation(Context context, BitmapPool pool, float radius, float angle,
- PointF center) {
- super(context, pool, new GPUImageSwirlFilter());
- mRadius = radius;
- mAngle = angle;
- mCenter = center;
+ public SwirlFilterTransformation(float radius, float angle, PointF center) {
+ super(new GPUImageSwirlFilter());
+ this.radius = radius;
+ this.angle = angle;
+ this.center = center;
GPUImageSwirlFilter filter = getFilter();
- filter.setRadius(mRadius);
- filter.setAngle(mAngle);
- filter.setCenter(mCenter);
+ filter.setRadius(this.radius);
+ filter.setAngle(this.angle);
+ filter.setCenter(this.center);
+ }
+
+ @Override
+ public String toString() {
+ return "SwirlFilterTransformation(radius=" + radius + ",angle=" + angle + ",center="
+ + center.toString() + ")";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof SwirlFilterTransformation &&
+ ((SwirlFilterTransformation) o).radius == radius &&
+ ((SwirlFilterTransformation) o).angle == radius &&
+ ((SwirlFilterTransformation) o).center.equals(center.x, center.y);
+ }
+
+ @Override
+ public int hashCode() {
+ return ID.hashCode() + (int) (radius * 1000) + (int) (angle * 10) + center.hashCode();
}
- @Override public String getId() {
- return "SwirlFilterTransformation(radius=" + mRadius +
- ",angle=" + mAngle + ",center=" + mCenter.toString() + ")";
+ @Override
+ public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+ messageDigest.update((ID + radius + angle + center.hashCode()).getBytes(CHARSET));
}
}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java
old mode 100644
new mode 100755
index 9d6bcf7..de11c3e
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java
@@ -1,14 +1,14 @@
package jp.wasabeef.glide.transformations.gpu;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -16,10 +16,11 @@
* limitations under the License.
*/
-import android.content.Context;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import jp.co.cyberagent.android.gpuimage.GPUImageToonFilter;
+import androidx.annotation.NonNull;
+
+import java.security.MessageDigest;
+
+import jp.co.cyberagent.android.gpuimage.filter.GPUImageToonFilter;
/**
* The threshold at which to apply the edges, default of 0.2.
@@ -28,33 +29,46 @@
*/
public class ToonFilterTransformation extends GPUFilterTransformation {
- private float mThreshold;
- private float mQuantizationLevels;
+ private static final int VERSION = 1;
+ private static final String ID =
+ "jp.wasabeef.glide.transformations.gpu.ToonFilterTransformation." + VERSION;
- public ToonFilterTransformation(Context context) {
- this(context, Glide.get(context).getBitmapPool());
+ private final float threshold;
+ private final float quantizationLevels;
+
+ public ToonFilterTransformation() {
+ this(.2f, 10.0f);
}
- public ToonFilterTransformation(Context context, BitmapPool pool) {
- this(context, pool, .2f, 10.0f);
+ public ToonFilterTransformation(float threshold, float quantizationLevels) {
+ super(new GPUImageToonFilter());
+ this.threshold = threshold;
+ this.quantizationLevels = quantizationLevels;
+ GPUImageToonFilter filter = getFilter();
+ filter.setThreshold(this.threshold);
+ filter.setQuantizationLevels(this.quantizationLevels);
}
- public ToonFilterTransformation(Context context, float threshold, float quantizationLevels) {
- this(context, Glide.get(context).getBitmapPool(), threshold, quantizationLevels);
+ @Override
+ public String toString() {
+ return "ToonFilterTransformation(threshold=" + threshold + ",quantizationLevels="
+ + quantizationLevels + ")";
}
- public ToonFilterTransformation(Context context, BitmapPool pool, float threshold,
- float quantizationLevels) {
- super(context, pool, new GPUImageToonFilter());
- mThreshold = threshold;
- mQuantizationLevels = quantizationLevels;
- GPUImageToonFilter filter = getFilter();
- filter.setThreshold(mThreshold);
- filter.setQuantizationLevels(mQuantizationLevels);
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof ToonFilterTransformation &&
+ ((ToonFilterTransformation) o).threshold == threshold &&
+ ((ToonFilterTransformation) o).quantizationLevels == quantizationLevels;
+ }
+
+ @Override
+ public int hashCode() {
+ return ID.hashCode() + (int) (threshold * 1000) + (int) (quantizationLevels * 10);
}
- @Override public String getId() {
- return "ToonFilterTransformation(threshold=" + mThreshold +
- ",quantizationLevels=" + mQuantizationLevels + ")";
+ @Override
+ public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+ messageDigest.update((ID + threshold + quantizationLevels).getBytes(CHARSET));
}
}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java
old mode 100644
new mode 100755
index b3eb248..22450c1
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java
@@ -1,14 +1,14 @@
package jp.wasabeef.glide.transformations.gpu;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -16,12 +16,14 @@
* limitations under the License.
*/
-import android.content.Context;
import android.graphics.PointF;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+
+import androidx.annotation.NonNull;
+
+import java.security.MessageDigest;
import java.util.Arrays;
-import jp.co.cyberagent.android.gpuimage.GPUImageVignetteFilter;
+
+import jp.co.cyberagent.android.gpuimage.filter.GPUImageVignetteFilter;
/**
* Performs a vignetting effect, fading out the image at the edges
@@ -30,41 +32,55 @@
*/
public class VignetteFilterTransformation extends GPUFilterTransformation {
- private PointF mCenter;
- private float[] mVignetteColor;
- private float mVignetteStart;
- private float mVignetteEnd;
+ private static final int VERSION = 1;
+ private static final String ID =
+ "jp.wasabeef.glide.transformations.gpu.VignetteFilterTransformation." + VERSION;
+
+ private final PointF center;
+ private final float[] vignetteColor;
+ private final float vignetteStart;
+ private final float vignetteEnd;
- public VignetteFilterTransformation(Context context) {
- this(context, Glide.get(context).getBitmapPool());
+ public VignetteFilterTransformation() {
+ this(new PointF(0.5f, 0.5f), new float[]{0.0f, 0.0f, 0.0f}, 0.0f, 0.75f);
}
- public VignetteFilterTransformation(Context context, BitmapPool pool) {
- this(context, pool, new PointF(0.5f, 0.5f), new float[] { 0.0f, 0.0f, 0.0f }, 0.0f, 0.75f);
+ public VignetteFilterTransformation(PointF center, float[] color, float start, float end) {
+ super(new GPUImageVignetteFilter());
+ this.center = center;
+ vignetteColor = color;
+ vignetteStart = start;
+ vignetteEnd = end;
+ GPUImageVignetteFilter filter = getFilter();
+ filter.setVignetteCenter(this.center);
+ filter.setVignetteColor(vignetteColor);
+ filter.setVignetteStart(vignetteStart);
+ filter.setVignetteEnd(vignetteEnd);
}
- public VignetteFilterTransformation(Context context, PointF center, float[] color, float start,
- float end) {
- this(context, Glide.get(context).getBitmapPool(), center, color, start, end);
+ @Override
+ public String toString() {
+ return "VignetteFilterTransformation(center=" + center.toString() + ",color=" + Arrays.toString(
+ vignetteColor) + ",start=" + vignetteStart + ",end=" + vignetteEnd + ")";
}
- public VignetteFilterTransformation(Context context, BitmapPool pool, PointF center,
- float[] color, float start, float end) {
- super(context, pool, new GPUImageVignetteFilter());
- mCenter = center;
- mVignetteColor = color;
- mVignetteStart = start;
- mVignetteEnd = end;
- GPUImageVignetteFilter filter = getFilter();
- filter.setVignetteCenter(mCenter);
- filter.setVignetteColor(mVignetteColor);
- filter.setVignetteStart(mVignetteStart);
- filter.setVignetteEnd(mVignetteEnd);
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof VignetteFilterTransformation &&
+ ((VignetteFilterTransformation) o).center.equals(center.x, center.y) &&
+ Arrays.equals(((VignetteFilterTransformation) o).vignetteColor, vignetteColor) &&
+ ((VignetteFilterTransformation) o).vignetteStart == vignetteStart &&
+ ((VignetteFilterTransformation) o).vignetteEnd == vignetteEnd;
+ }
+
+ @Override
+ public int hashCode() {
+ return ID.hashCode() + center.hashCode() + Arrays.hashCode(vignetteColor) +
+ (int) (vignetteStart * 100) + (int) (vignetteEnd * 10);
}
- @Override public String getId() {
- return "VignetteFilterTransformation(center=" + mCenter.toString() +
- ",color=" + Arrays.toString(mVignetteColor) +
- ",start=" + mVignetteStart + ",end=" + mVignetteEnd + ")";
+ @Override
+ public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+ messageDigest.update((ID + center + Arrays.hashCode(vignetteColor) + vignetteStart + vignetteEnd).getBytes(CHARSET));
}
}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/FastBlur.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/FastBlur.java
index 3fcea0a..3275b86 100644
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/FastBlur.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/FastBlur.java
@@ -3,14 +3,14 @@
import android.graphics.Bitmap;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -72,15 +72,15 @@ public static Bitmap blur(Bitmap sentBitmap, int radius, boolean canReuseInBitma
int wh = w * h;
int div = radius + radius + 1;
- int r[] = new int[wh];
- int g[] = new int[wh];
- int b[] = new int[wh];
+ int[] r = new int[wh];
+ int[] g = new int[wh];
+ int[] b = new int[wh];
int rsum, gsum, bsum, x, y, i, p, yp, yi, yw;
- int vmin[] = new int[Math.max(w, h)];
+ int[] vmin = new int[Math.max(w, h)];
int divsum = (div + 1) >> 1;
divsum *= divsum;
- int dv[] = new int[256 * divsum];
+ int[] dv = new int[256 * divsum];
for (i = 0; i < 256 * divsum; i++) {
dv[i] = (i / divsum);
}
@@ -254,4 +254,4 @@ public static Bitmap blur(Bitmap sentBitmap, int radius, boolean canReuseInBitma
return (bitmap);
}
-}
\ No newline at end of file
+}
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java
index 62f4cba..a2827dc 100644
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java
@@ -11,14 +11,14 @@
import android.renderscript.ScriptIntrinsicBlur;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -28,7 +28,6 @@
public class RSBlur {
- @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
public static Bitmap blur(Context context, Bitmap bitmap, int radius) throws RSRuntimeException {
RenderScript rs = null;
Allocation input = null;
@@ -38,7 +37,7 @@ public static Bitmap blur(Context context, Bitmap bitmap, int radius) throws RSR
rs = RenderScript.create(context);
rs.setMessageHandler(new RenderScript.RSMessageHandler());
input = Allocation.createFromBitmap(rs, bitmap, Allocation.MipmapControl.MIPMAP_NONE,
- Allocation.USAGE_SCRIPT);
+ Allocation.USAGE_SCRIPT);
output = Allocation.createTyped(rs, input.getType());
blur = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs));
@@ -48,7 +47,11 @@ public static Bitmap blur(Context context, Bitmap bitmap, int radius) throws RSR
output.copyTo(bitmap);
} finally {
if (rs != null) {
- rs.destroy();
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ RenderScript.releaseAllContexts();
+ } else {
+ rs.destroy();
+ }
}
if (input != null) {
input.destroy();
diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java
index 04f7abc..1b8ee5e 100644
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java
@@ -1,18 +1,19 @@
package jp.wasabeef.glide.transformations.internal;
import android.content.Context;
+import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Build;
/**
- * Copyright (C) 2017 Wasabeef
- *
+ * Copyright (C) 2020 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.
@@ -26,18 +27,7 @@ private Utils() {
// Utility class.
}
- public static Drawable getMaskDrawable(Context context, int maskId) {
- Drawable drawable;
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- drawable = context.getDrawable(maskId);
- } else {
- drawable = context.getResources().getDrawable(maskId);
- }
-
- if (drawable == null) {
- throw new IllegalArgumentException("maskId is invalid");
- }
-
- return drawable;
+ public static int toDp(int px) {
+ return px * (int) Resources.getSystem().getDisplayMetrics().density;
}
}