From 0c305fa0baba40582555edf77ac132787f0b1138 Mon Sep 17 00:00:00 2001 From: Tyler Wong Date: Tue, 12 Nov 2019 23:23:28 -0800 Subject: [PATCH] Expose LoadRequestBuilder --- docs/docs/v4/image-coil/README.md | 2 +- .../markwon/image/coil/CoilImagesPlugin.java | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/docs/docs/v4/image-coil/README.md b/docs/docs/v4/image-coil/README.md index 435ea408..8a15e66e 100644 --- a/docs/docs/v4/image-coil/README.md +++ b/docs/docs/v4/image-coil/README.md @@ -9,7 +9,7 @@ val markwon = Markwon.builder(context) // automatically create Coil instance .usePlugin(CoilImagesPlugin.create(context)) // if you need more control - .usePlugin(CoilImagesPlugin.create(object : CoilImagesPlugin.CoilStore() { + .usePlugin(CoilImagesPlugin.create(object : CoilImagesPlugin.CoilStore { override load(drawable: AsyncDrawable, target: Target): RequestDisposable { return Coil.load(context, drawable.destination) { target(target) 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 6443bd76..3af8b919 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 @@ -14,7 +14,6 @@ import java.util.HashMap; import java.util.Map; import coil.Coil; -import coil.ImageLoader; import coil.api.ImageLoaders; import coil.request.LoadRequest; import coil.request.LoadRequestBuilder; @@ -37,7 +36,7 @@ public class CoilImagesPlugin extends AbstractMarkwonPlugin { public interface CoilStore { @NonNull - RequestDisposable load(@NonNull AsyncDrawable drawable, @NonNull Target target); + LoadRequestBuilder load(@NonNull AsyncDrawable drawable); void cancel(@NonNull RequestDisposable disposable); } @@ -47,13 +46,9 @@ public class CoilImagesPlugin extends AbstractMarkwonPlugin { return create(new CoilStore() { @NonNull @Override - public RequestDisposable load(@NonNull AsyncDrawable drawable, @NonNull Target target) { - ImageLoader imageLoader = Coil.loader(); - LoadRequest request = ImageLoaders.newLoadBuilder(imageLoader, context) - .data(drawable.getDestination()) - .target(target) - .build(); - return imageLoader.load(request); + public LoadRequestBuilder load(@NonNull AsyncDrawable drawable) { + return ImageLoaders.newLoadBuilder(Coil.loader(), context) + .data(drawable.getDestination()); } @Override @@ -107,7 +102,10 @@ public class CoilImagesPlugin extends AbstractMarkwonPlugin { @Override public void load(@NonNull AsyncDrawable drawable) { final Target target = new AsyncDrawableTarget(drawable); - RequestDisposable disposable = coilStore.load(drawable, target); + LoadRequest request = coilStore.load(drawable) + .target(target) + .build(); + RequestDisposable disposable = Coil.loader().load(request); cache.put(drawable, disposable); }