From 7d49afaac7edd9d10b416556e32f5af1154a8629 Mon Sep 17 00:00:00 2001 From: Tyler Wong Date: Sat, 9 May 2020 22:02:45 -0700 Subject: [PATCH 1/2] Update Coil --- build.gradle | 2 +- .../io/noties/markwon/image/coil/CoilImagesPlugin.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 51aa9d6c..98c4146c 100644 --- a/build.gradle +++ b/build.gradle @@ -80,7 +80,7 @@ ext { 'dagger' : "com.google.dagger:dagger:$daggerVersion", 'picasso' : 'com.squareup.picasso:picasso:2.71828', 'glide' : 'com.github.bumptech.glide:glide:4.9.0', - 'coil' : 'io.coil-kt:coil:0.8.0' + 'coil' : 'io.coil-kt:coil:0.10.1' ] deps['annotationProcessor'] = [ diff --git a/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java b/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java index 5d15dcfd..9f307f35 100644 --- a/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java +++ b/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java @@ -15,7 +15,6 @@ import java.util.Map; import coil.Coil; import coil.ImageLoader; -import coil.api.ImageLoaders; import coil.request.LoadRequest; import coil.request.RequestDisposable; import coil.target.Target; @@ -48,7 +47,7 @@ public class CoilImagesPlugin extends AbstractMarkwonPlugin { @NonNull @Override public LoadRequest load(@NonNull AsyncDrawable drawable) { - return ImageLoaders.newLoadBuilder(Coil.loader(), context) + return LoadRequest.builder(context) .data(drawable.getDestination()) .build(); } @@ -57,7 +56,7 @@ public class CoilImagesPlugin extends AbstractMarkwonPlugin { public void cancel(@NonNull RequestDisposable disposable) { disposable.dispose(); } - }, Coil.loader()); + }, Coil.imageLoader(context)); } @NonNull @@ -67,7 +66,7 @@ public class CoilImagesPlugin extends AbstractMarkwonPlugin { @NonNull @Override public LoadRequest load(@NonNull AsyncDrawable drawable) { - return ImageLoaders.newLoadBuilder(imageLoader, context) + return LoadRequest.builder(context) .data(drawable.getDestination()) .build(); } From e386880978db334e7517ba280fd79bbc15613d00 Mon Sep 17 00:00:00 2001 From: Tyler Wong Date: Sat, 9 May 2020 22:10:54 -0700 Subject: [PATCH 2/2] Fix deprecation --- .../java/io/noties/markwon/image/coil/CoilImagesPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java b/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java index 9f307f35..b71543a7 100644 --- a/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java +++ b/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java @@ -128,7 +128,7 @@ public class CoilImagesPlugin extends AbstractMarkwonPlugin { LoadRequest request = coilStore.load(drawable).newBuilder() .target(target) .build(); - RequestDisposable disposable = imageLoader.load(request); + RequestDisposable disposable = imageLoader.execute(request); cache.put(drawable, disposable); }