From 2e2846d354cb11fae75596c80193b5698cb94497 Mon Sep 17 00:00:00 2001 From: Daichi Furiya Date: Fri, 16 Nov 2018 18:01:01 +0900 Subject: [PATCH] refactor support rs (#142) --- transformations/build.gradle | 3 +++ .../transformations/SupportRSBlurTransformation.java | 6 ++++-- .../glide/transformations/internal/RSBlur.java | 1 - .../glide/transformations/internal/SupportRSBlur.java | 11 ++++++----- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/transformations/build.gradle b/transformations/build.gradle index 2e70329..e02dbdb 100644 --- a/transformations/build.gradle +++ b/transformations/build.gradle @@ -6,6 +6,9 @@ android { defaultConfig { minSdkVersion MIN_SDK_VERSION as int targetSdkVersion TARGET_SDK_VERSION as int + + renderscriptTargetApi TARGET_SDK_VERSION as int + renderscriptSupportModeEnabled true } } diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/SupportRSBlurTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/SupportRSBlurTransformation.java index b022972..0f737d9 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/SupportRSBlurTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/SupportRSBlurTransformation.java @@ -21,7 +21,6 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Paint; import android.os.Build; -import android.renderscript.RSRuntimeException; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; @@ -29,6 +28,7 @@ import java.security.MessageDigest; import androidx.annotation.NonNull; import jp.wasabeef.glide.transformations.internal.FastBlur; +import jp.wasabeef.glide.transformations.internal.RSBlur; import jp.wasabeef.glide.transformations.internal.SupportRSBlur; public class SupportRSBlurTransformation extends BitmapTransformation { @@ -76,7 +76,9 @@ public class SupportRSBlurTransformation extends BitmapTransformation { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { try { bitmap = SupportRSBlur.blur(context, bitmap, radius); - } catch (RSRuntimeException e) { + } catch (NoClassDefFoundError e) { + bitmap = RSBlur.blur(context, bitmap, radius); + } catch (RuntimeException e) { bitmap = FastBlur.blur(bitmap, radius, true); } } else { 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 9605cf6..d9693d8 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 @@ -26,7 +26,6 @@ import android.renderscript.ScriptIntrinsicBlur; * limitations under the License. */ -@Deprecated public class RSBlur { @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2) diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/SupportRSBlur.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/SupportRSBlur.java index 78fddb8..7bb654a 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/SupportRSBlur.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/SupportRSBlur.java @@ -4,11 +4,12 @@ import android.annotation.TargetApi; import android.content.Context; import android.graphics.Bitmap; import android.os.Build; -import android.renderscript.Allocation; -import android.renderscript.Element; -import android.renderscript.RSRuntimeException; -import android.renderscript.RenderScript; -import android.renderscript.ScriptIntrinsicBlur; + +import androidx.renderscript.Allocation; +import androidx.renderscript.Element; +import androidx.renderscript.RSRuntimeException; +import androidx.renderscript.RenderScript; +import androidx.renderscript.ScriptIntrinsicBlur; /** * Copyright (C) 2018 Wasabeef