From ebf645acafc213ee4f2df3a09c3c886d05eaf1df Mon Sep 17 00:00:00 2001 From: GG Bond Date: Sat, 24 Feb 2024 21:55:51 +0800 Subject: [PATCH] Refine naming --- app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Coil.kt | 2 +- .../com/hippo/ehviewer/ui/screen/GalleryPreviewScreen.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Coil.kt b/app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Coil.kt index a9b81cbb9..7d534b31e 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Coil.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Coil.kt @@ -17,4 +17,4 @@ inline fun Context.imageRequest(info: GalleryInfo, builder: ImageRequest.Builder inline fun Context.imageRequest(builder: ImageRequest.Builder.() -> Unit = {}) = ImageRequest.Builder(this).apply(builder).build() inline fun diskCache(builder: DiskCache.Builder.() -> Unit) = DiskCache.Builder().apply(builder).build() inline fun Context.imageLoader(builder: ImageLoader.Builder.() -> Unit) = ImageLoader.Builder(this).apply(builder).build() -fun ImageRequest.executeIn(scope: CoroutineScope) = scope.launch { context.imageLoader.execute(this@executeIn) } +fun ImageRequest.launchIn(scope: CoroutineScope) = scope.launch { context.imageLoader.execute(this@launchIn) } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryPreviewScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryPreviewScreen.kt index 3676fd2e0..c960c89b6 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryPreviewScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryPreviewScreen.kt @@ -43,8 +43,8 @@ import com.hippo.ehviewer.client.data.GalleryDetail import com.hippo.ehviewer.client.data.GalleryPreview import com.hippo.ehviewer.coil.justDownload import com.hippo.ehviewer.collectAsState -import com.hippo.ehviewer.ktbuilder.executeIn import com.hippo.ehviewer.ktbuilder.imageRequest +import com.hippo.ehviewer.ktbuilder.launchIn import com.hippo.ehviewer.ui.LockDrawer import com.hippo.ehviewer.ui.main.EhPreviewItem import com.hippo.ehviewer.ui.navToReader @@ -100,7 +100,7 @@ fun GalleryPreviewScreen(galleryDetail: GalleryDetail, toNextPageArg: Boolean, n previewPagesMap[it.position] = it if (Settings.preloadThumbAggressively) { with(context) { - imageRequest(it) { justDownload() }.executeIn(viewModelScope) + imageRequest(it) { justDownload() }.launchIn(viewModelScope) } } }