Skip to content

Commit

Permalink
Rename dispatcher methods to coroutineContext. (#2357)
Browse files Browse the repository at this point in the history 
* Rename dispatcher methods to coroutineContext.

* Revert.

* Fix.

* Fix remaining renames.
  • Loading branch information
@colinrtwhite
colinrtwhite authored Jul 8, 2024
1 parent 7bb0dab commit cccaea0
Show file tree
Hide file tree
Showing 14 changed files with 140 additions and 138 deletions.
2 changes: 1 addition & 1 deletion coil-compose-core/src/androidInstrumentedTest/kotlin/coil3/compose/AsyncImageTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ class AsyncImageTest {
model = ImageRequest.Builder(LocalContext.current)
.data("https://example.com/image")
.memoryCachePolicy(CachePolicy.ENABLED)
.dispatcher(Dispatchers.Main.immediate)
.coroutineContext(Dispatchers.Main.immediate)
.build(),
contentDescription = null,
imageLoader = imageLoader
Expand Down
6 changes: 3 additions & 3 deletions coil-compose-core/src/commonMain/kotlin/coil3/compose/AsyncImagePainter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,11 @@ class AsyncImagePainter internal constructor(

/** The latest [AsyncImagePainter.Input]. */
internal val _input: MutableStateFlow<Input> = MutableStateFlow(input)
val input: StateFlow<Input> get() = _input.asStateFlow()
val input: StateFlow<Input> = _input.asStateFlow()

/** The latest [AsyncImagePainter.State]. */
private val _state: MutableStateFlow<State> = MutableStateFlow(State.Empty)
val state: StateFlow<State> get() = _state.asStateFlow()
val state: StateFlow<State> = _state.asStateFlow()

override val intrinsicSize: Size
get() = painter?.intrinsicSize ?: Size.Unspecified
Expand Down Expand Up @@ -293,7 +293,7 @@ class AsyncImagePainter internal constructor(
precision(Precision.INEXACT)
}
if (isPreview) {
dispatcher(Dispatchers.Unconfined)
coroutineContext(Dispatchers.Unconfined)
}
applyGlobalLifecycle()
}
Expand Down
34 changes: 17 additions & 17 deletions coil-core/api/android/coil-core.api
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,21 +167,21 @@ public final class coil3/ImageLoader$Builder {
public final fun build ()Lcoil3/ImageLoader;
public final fun components (Lcoil3/ComponentRegistry;)Lcoil3/ImageLoader$Builder;
public final synthetic fun components (Lkotlin/jvm/functions/Function1;)Lcoil3/ImageLoader$Builder;
public final fun decoderDispatcher (Lkotlin/coroutines/CoroutineContext;)Lcoil3/ImageLoader$Builder;
public final fun coroutineContext (Lkotlin/coroutines/CoroutineContext;)Lcoil3/ImageLoader$Builder;
public final fun decoderCoroutineContext (Lkotlin/coroutines/CoroutineContext;)Lcoil3/ImageLoader$Builder;
public final fun diskCache (Lcoil3/disk/DiskCache;)Lcoil3/ImageLoader$Builder;
public final fun diskCache (Lkotlin/jvm/functions/Function0;)Lcoil3/ImageLoader$Builder;
public final fun diskCachePolicy (Lcoil3/request/CachePolicy;)Lcoil3/ImageLoader$Builder;
public final fun dispatcher (Lkotlin/coroutines/CoroutineContext;)Lcoil3/ImageLoader$Builder;
public final fun error (Lcoil3/Image;)Lcoil3/ImageLoader$Builder;
public final fun error (Lkotlin/jvm/functions/Function1;)Lcoil3/ImageLoader$Builder;
public final fun eventListener (Lcoil3/EventListener;)Lcoil3/ImageLoader$Builder;
public final fun eventListenerFactory (Lcoil3/EventListener$Factory;)Lcoil3/ImageLoader$Builder;
public final fun fallback (Lcoil3/Image;)Lcoil3/ImageLoader$Builder;
public final fun fallback (Lkotlin/jvm/functions/Function1;)Lcoil3/ImageLoader$Builder;
public final fun fetcherDispatcher (Lkotlin/coroutines/CoroutineContext;)Lcoil3/ImageLoader$Builder;
public final fun fetcherCoroutineContext (Lkotlin/coroutines/CoroutineContext;)Lcoil3/ImageLoader$Builder;
public final fun fileSystem (Lokio/FileSystem;)Lcoil3/ImageLoader$Builder;
public final fun getExtras ()Lcoil3/Extras$Builder;
public final fun interceptorDispatcher (Lkotlin/coroutines/CoroutineContext;)Lcoil3/ImageLoader$Builder;
public final fun interceptorCoroutineContext (Lkotlin/coroutines/CoroutineContext;)Lcoil3/ImageLoader$Builder;
public final fun logger (Lcoil3/util/Logger;)Lcoil3/ImageLoader$Builder;
public final fun memoryCache (Lcoil3/memory/MemoryCache;)Lcoil3/ImageLoader$Builder;
public final fun memoryCache (Lkotlin/jvm/functions/Function0;)Lcoil3/ImageLoader$Builder;
Expand Down Expand Up @@ -550,7 +550,7 @@ public final class coil3/request/ImageRequest {
public final fun fallback ()Lcoil3/Image;
public final fun getContext ()Landroid/content/Context;
public final fun getData ()Ljava/lang/Object;
public final fun getDecoderDispatcher ()Lkotlin/coroutines/CoroutineContext;
public final fun getDecoderCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
public final fun getDecoderFactory ()Lcoil3/decode/Decoder$Factory;
public final fun getDefaults ()Lcoil3/request/ImageRequest$Defaults;
public final fun getDefined ()Lcoil3/request/ImageRequest$Defined;
Expand All @@ -559,10 +559,10 @@ public final class coil3/request/ImageRequest {
public final fun getErrorFactory ()Lkotlin/jvm/functions/Function1;
public final fun getExtras ()Lcoil3/Extras;
public final fun getFallbackFactory ()Lkotlin/jvm/functions/Function1;
public final fun getFetcherDispatcher ()Lkotlin/coroutines/CoroutineContext;
public final fun getFetcherCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
public final fun getFetcherFactory ()Lkotlin/Pair;
public final fun getFileSystem ()Lokio/FileSystem;
public final fun getInterceptorDispatcher ()Lkotlin/coroutines/CoroutineContext;
public final fun getInterceptorCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
public final fun getListener ()Lcoil3/request/ImageRequest$Listener;
public final fun getMemoryCacheKey ()Ljava/lang/String;
public final fun getMemoryCacheKeyExtras ()Ljava/util/Map;
Expand All @@ -588,22 +588,22 @@ public final class coil3/request/ImageRequest$Builder {
public fun <init> (Lcoil3/request/ImageRequest;Landroid/content/Context;)V
public synthetic fun <init> (Lcoil3/request/ImageRequest;Landroid/content/Context;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun build ()Lcoil3/request/ImageRequest;
public final fun coroutineContext (Lkotlin/coroutines/CoroutineContext;)Lcoil3/request/ImageRequest$Builder;
public final fun data (Ljava/lang/Object;)Lcoil3/request/ImageRequest$Builder;
public final fun decoderDispatcher (Lkotlin/coroutines/CoroutineContext;)Lcoil3/request/ImageRequest$Builder;
public final fun decoderCoroutineContext (Lkotlin/coroutines/CoroutineContext;)Lcoil3/request/ImageRequest$Builder;
public final fun decoderFactory (Lcoil3/decode/Decoder$Factory;)Lcoil3/request/ImageRequest$Builder;
public final fun defaults (Lcoil3/request/ImageRequest$Defaults;)Lcoil3/request/ImageRequest$Builder;
public final fun diskCacheKey (Ljava/lang/String;)Lcoil3/request/ImageRequest$Builder;
public final fun diskCachePolicy (Lcoil3/request/CachePolicy;)Lcoil3/request/ImageRequest$Builder;
public final fun dispatcher (Lkotlin/coroutines/CoroutineContext;)Lcoil3/request/ImageRequest$Builder;
public final fun error (Lcoil3/Image;)Lcoil3/request/ImageRequest$Builder;
public final fun error (Lkotlin/jvm/functions/Function1;)Lcoil3/request/ImageRequest$Builder;
public final fun fallback (Lcoil3/Image;)Lcoil3/request/ImageRequest$Builder;
public final fun fallback (Lkotlin/jvm/functions/Function1;)Lcoil3/request/ImageRequest$Builder;
public final fun fetcherDispatcher (Lkotlin/coroutines/CoroutineContext;)Lcoil3/request/ImageRequest$Builder;
public final fun fetcherCoroutineContext (Lkotlin/coroutines/CoroutineContext;)Lcoil3/request/ImageRequest$Builder;
public final fun fetcherFactory (Lcoil3/fetch/Fetcher$Factory;Lkotlin/reflect/KClass;)Lcoil3/request/ImageRequest$Builder;
public final fun fileSystem (Lokio/FileSystem;)Lcoil3/request/ImageRequest$Builder;
public final fun getExtras ()Lcoil3/Extras$Builder;
public final fun interceptorDispatcher (Lkotlin/coroutines/CoroutineContext;)Lcoil3/request/ImageRequest$Builder;
public final fun interceptorCoroutineContext (Lkotlin/coroutines/CoroutineContext;)Lcoil3/request/ImageRequest$Builder;
public final fun listener (Lcoil3/request/ImageRequest$Listener;)Lcoil3/request/ImageRequest$Builder;
public final fun listener (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)Lcoil3/request/ImageRequest$Builder;
public static synthetic fun listener$default (Lcoil3/request/ImageRequest$Builder;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lcoil3/request/ImageRequest$Builder;
Expand Down Expand Up @@ -638,14 +638,14 @@ public final class coil3/request/ImageRequest$Defaults {
public final fun copy (Lokio/FileSystem;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Lcoil3/request/CachePolicy;Lcoil3/request/CachePolicy;Lcoil3/request/CachePolicy;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcoil3/size/Precision;Lcoil3/Extras;)Lcoil3/request/ImageRequest$Defaults;
public static synthetic fun copy$default (Lcoil3/request/ImageRequest$Defaults;Lokio/FileSystem;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Lcoil3/request/CachePolicy;Lcoil3/request/CachePolicy;Lcoil3/request/CachePolicy;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcoil3/size/Precision;Lcoil3/Extras;ILjava/lang/Object;)Lcoil3/request/ImageRequest$Defaults;
public fun equals (Ljava/lang/Object;)Z
public final fun getDecoderDispatcher ()Lkotlin/coroutines/CoroutineContext;
public final fun getDecoderCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
public final fun getDiskCachePolicy ()Lcoil3/request/CachePolicy;
public final fun getErrorFactory ()Lkotlin/jvm/functions/Function1;
public final fun getExtras ()Lcoil3/Extras;
public final fun getFallbackFactory ()Lkotlin/jvm/functions/Function1;
public final fun getFetcherDispatcher ()Lkotlin/coroutines/CoroutineContext;
public final fun getFetcherCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
public final fun getFileSystem ()Lokio/FileSystem;
public final fun getInterceptorDispatcher ()Lkotlin/coroutines/CoroutineContext;
public final fun getInterceptorCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
public final fun getMemoryCachePolicy ()Lcoil3/request/CachePolicy;
public final fun getNetworkCachePolicy ()Lcoil3/request/CachePolicy;
public final fun getPlaceholderFactory ()Lkotlin/jvm/functions/Function1;
Expand All @@ -664,13 +664,13 @@ public final class coil3/request/ImageRequest$Defined {
public final fun copy (Lokio/FileSystem;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Lcoil3/request/CachePolicy;Lcoil3/request/CachePolicy;Lcoil3/request/CachePolicy;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcoil3/size/SizeResolver;Lcoil3/size/Scale;Lcoil3/size/Precision;)Lcoil3/request/ImageRequest$Defined;
public static synthetic fun copy$default (Lcoil3/request/ImageRequest$Defined;Lokio/FileSystem;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Lcoil3/request/CachePolicy;Lcoil3/request/CachePolicy;Lcoil3/request/CachePolicy;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lcoil3/size/SizeResolver;Lcoil3/size/Scale;Lcoil3/size/Precision;ILjava/lang/Object;)Lcoil3/request/ImageRequest$Defined;
public fun equals (Ljava/lang/Object;)Z
public final fun getDecoderDispatcher ()Lkotlin/coroutines/CoroutineContext;
public final fun getDecoderCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
public final fun getDiskCachePolicy ()Lcoil3/request/CachePolicy;
public final fun getErrorFactory ()Lkotlin/jvm/functions/Function1;
public final fun getFallbackFactory ()Lkotlin/jvm/functions/Function1;
public final fun getFetcherDispatcher ()Lkotlin/coroutines/CoroutineContext;
public final fun getFetcherCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
public final fun getFileSystem ()Lokio/FileSystem;
public final fun getInterceptorDispatcher ()Lkotlin/coroutines/CoroutineContext;
public final fun getInterceptorCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
public final fun getMemoryCachePolicy ()Lcoil3/request/CachePolicy;
public final fun getNetworkCachePolicy ()Lcoil3/request/CachePolicy;
public final fun getPlaceholderFactory ()Lkotlin/jvm/functions/Function1;
Expand Down
Loading

0 comments on commit cccaea0

Please # to comment.