the-btfash-foundation/Markwon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #244 from tylerbwong/update-coil

Browse Source 
Update Coil Version
This commit is contained in:
Dimitry 2020-05-12 12:23:17 +03:00 committed by GitHub
commit e59911cfde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -80,7 +80,7 @@ ext {
'dagger' : "com.google.dagger:dagger:$daggerVersion", 'dagger' : "com.google.dagger:dagger:$daggerVersion",
'picasso' : 'com.squareup.picasso:picasso:2.71828', 'picasso' : 'com.squareup.picasso:picasso:2.71828',
'glide' : 'com.github.bumptech.glide:glide:4.9.0', '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'] = [ deps['annotationProcessor'] = [

9
markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java
View File

@ -15,7 +15,6 @@ import java.util.Map;
import coil.Coil; import coil.Coil;
import coil.ImageLoader; import coil.ImageLoader;
import coil.api.ImageLoaders;
import coil.request.LoadRequest; import coil.request.LoadRequest;
import coil.request.RequestDisposable; import coil.request.RequestDisposable;
import coil.target.Target; import coil.target.Target;
@ -48,7 +47,7 @@ public class CoilImagesPlugin extends AbstractMarkwonPlugin {
@NonNull @NonNull
@Override @Override
public LoadRequest load(@NonNull AsyncDrawable drawable) { public LoadRequest load(@NonNull AsyncDrawable drawable) {
return ImageLoaders.newLoadBuilder(Coil.loader(), context) return LoadRequest.builder(context)
.data(drawable.getDestination()) .data(drawable.getDestination())
.build(); .build();
} }
@ -57,7 +56,7 @@ public class CoilImagesPlugin extends AbstractMarkwonPlugin {
public void cancel(@NonNull RequestDisposable disposable) { public void cancel(@NonNull RequestDisposable disposable) {
disposable.dispose(); disposable.dispose();
} }
}, Coil.loader()); }, Coil.imageLoader(context));
} }
@NonNull @NonNull
@ -67,7 +66,7 @@ public class CoilImagesPlugin extends AbstractMarkwonPlugin {
@NonNull @NonNull
@Override @Override
public LoadRequest load(@NonNull AsyncDrawable drawable) { public LoadRequest load(@NonNull AsyncDrawable drawable) {
return ImageLoaders.newLoadBuilder(imageLoader, context) return LoadRequest.builder(context)
.data(drawable.getDestination()) .data(drawable.getDestination())
.build(); .build();
} }
@ -129,7 +128,7 @@ public class CoilImagesPlugin extends AbstractMarkwonPlugin {
LoadRequest request = coilStore.load(drawable).newBuilder() LoadRequest request = coilStore.load(drawable).newBuilder()
.target(target) .target(target)
.build(); .build();
RequestDisposable disposable = imageLoader.load(request); RequestDisposable disposable = imageLoader.execute(request);
cache.put(drawable, disposable); cache.put(drawable, disposable);
} }