diff --git a/dependencies.gradle b/dependencies.gradle index fcf68c8a19..9ffaee23bc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -147,7 +147,6 @@ ext.libs = [ 'glideImageLoader' : "com.github.piasy:GlideImageLoader:$bigImageViewer", 'progressPieIndicator' : "com.github.piasy:ProgressPieIndicator:$bigImageViewer", 'glideImageViewFactory' : "com.github.piasy:GlideImageViewFactory:$bigImageViewer", - 'glideWebpDecoder' : "com.github.zjupure:webpdecoder:2.3.$glide", 'flowBinding' : "io.github.reactivecircus.flowbinding:flowbinding-android:$flowBinding", 'flowBindingAppcompat' : "io.github.reactivecircus.flowbinding:flowbinding-appcompat:$flowBinding", 'flowBindingMaterial' : "io.github.reactivecircus.flowbinding:flowbinding-material:$flowBinding" diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle index 25b09c436b..e3a4a6661b 100644 --- a/dependencies_groups.gradle +++ b/dependencies_groups.gradle @@ -88,7 +88,6 @@ ext.groups = [ 'com.github.piasy', 'com.github.shyiko.klob', 'com.github.rubensousa', - 'com.github.zjupure', 'com.google', 'com.google.android', 'com.google.api.grpc', diff --git a/vector/build.gradle b/vector/build.gradle index 1456be784b..5fe65e0ffa 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -218,7 +218,6 @@ dependencies { implementation libs.github.bigImageViewer implementation libs.github.glideImageLoader implementation libs.github.glideImageViewFactory - implementation libs.github.glideWebpDecoder // implementation 'com.github.MikeOrtiz:TouchImageView:3.0.2' implementation 'com.github.chrisbanes:PhotoView:2.3.0' diff --git a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt index d92b1594b5..6821484882 100644 --- a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt +++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt @@ -24,14 +24,13 @@ import android.widget.ImageView import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams -import com.bumptech.glide.integration.webp.decoder.WebpDrawable -import com.bumptech.glide.integration.webp.decoder.WebpDrawableTransformation import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.Transformation import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.request.RequestListener +import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.CustomViewTarget import com.bumptech.glide.request.target.Target import im.vector.app.R @@ -183,10 +182,7 @@ class ImageContentRenderer @Inject constructor( }) request = if (animate && mode == Mode.ANIMATED_THUMBNAIL) { // Glide seems to already do some dp to px calculation for animated gifs? - val animatedCornerTransformation = RoundedCorners(cornerRoundnessDp) - request.optionalTransform(animatedCornerTransformation) - .transform(WebpDrawable::class.java, WebpDrawableTransformation(animatedCornerTransformation)) - //request.apply(RequestOptions.bitmapTransform(RoundedCorners(3))) + request.optionalTransform(RoundedCorners(cornerRoundnessDp)) } else { request.dontAnimate() .optionalTransform(cornerTransformation)