diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/EhTagDatabase.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/EhTagDatabase.kt index a8ea671a0..44a69397f 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/client/EhTagDatabase.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/client/EhTagDatabase.kt @@ -82,7 +82,7 @@ object EhTagDatabase : CoroutineScope { data class Tag(val tag: String, val hint: String?, val score: Float) - context(ctx: Context) + context(_: Context) fun suggestion(rawKeyword: String, expectTranslate: Boolean): List { val keyword = PREFIXES.fold(rawKeyword) { kwd, pfx -> kwd.removePrefix(pfx) } if (!initialized || keyword.isEmpty()) return emptyList() diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/CommonOperations.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/CommonOperations.kt index e27b4a227..dd74b8c01 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/CommonOperations.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/CommonOperations.kt @@ -114,7 +114,7 @@ suspend fun keepNoMediaFileStatus(downloadDir: Path = downloadLocation) { fun getFavoriteIcon(favorited: Boolean) = if (favorited) Icons.Default.Favorite else Icons.Default.FavoriteBorder -context(_: DialogState, context: MainActivity) +context(_: DialogState, _: MainActivity) suspend fun startDownload(forceDefault: Boolean, vararg galleryInfos: BaseGalleryInfo) { if (isAtLeastT) { requestPermission(Manifest.permission.POST_NOTIFICATIONS) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryList.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryList.kt index e38b4a313..ddac830db 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryList.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/GalleryList.kt @@ -79,7 +79,7 @@ operator fun PaddingValues.plus(r: PaddingValues) = object : PaddingValues { } @Composable -context(_: CoroutineScope, ctx: Context) +context(_: CoroutineScope, _: Context) fun GalleryList( modifier: Modifier = Modifier, data: LazyPagingItems, diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderScreen.kt index b793fea0f..8f6948aa1 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderScreen.kt @@ -377,7 +377,7 @@ fun ReaderScreen(pageLoader: PageLoader, info: BaseGalleryInfo?) { } } -context(ctx: Context, state: DialogState, nav: DestinationsNavigator) +context(_: Context, _: DialogState, nav: DestinationsNavigator) suspend inline fun usePageLoader(args: ReaderScreenArgs, crossinline block: suspend (PageLoader) -> T) = when (args) { is ReaderScreenArgs.Gallery -> { val info = args.info diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailContent.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailContent.kt index 2f881667d..96909857b 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailContent.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailContent.kt @@ -829,7 +829,7 @@ private fun GalleryDetail.collectPreviewItems() = rememberInVM(previewList) { }.flow.cachedIn(viewModelScope) }.collectAsLazyPagingItems() -context(ctx: Context) +context(_: Context) private fun LazyGridScope.galleryPreview(detail: GalleryDetail, data: LazyPagingItems, onClick: (Int) -> Unit) { val isV2Thumb = detail.previewList.first() is V2GalleryPreview items( diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/MainNav.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/MainNav.kt index 5bff9c76d..eadce3a79 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/MainNav.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/MainNav.kt @@ -25,7 +25,7 @@ private fun urlToDestination(url: String): Direction? { } @MainThread -context(nav: DestinationsNavigator) +context(_: DestinationsNavigator) fun navWithUrl(url: String): Boolean { val dest = urlToDestination(url) ?: return false navigate(dest) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt index b1afe0bad..c99c1d58f 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt @@ -182,7 +182,7 @@ suspend fun awaitResult( ) } -context(ctx: Context, state: DialogState) +context(_: Context, _: DialogState) suspend fun awaitSelectTags(): List = dialog { cont -> val selected = remember { mutableStateListOf() } val state = rememberTextFieldState() diff --git a/app/src/main/kotlin/com/hippo/ehviewer/util/ClipboardUtil.kt b/app/src/main/kotlin/com/hippo/ehviewer/util/ClipboardUtil.kt index 587c3f1c6..1ba68ee66 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/util/ClipboardUtil.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/util/ClipboardUtil.kt @@ -39,7 +39,7 @@ fun copyTextToClipboard(text: CharSequence?, isSensitive: Boolean) { ) } -context(ctx: Context) +context(_: Context) fun addTextToClipboard(text: CharSequence?, useToast: Boolean = false) { copyTextToClipboard(text, false) // Avoid double notify user since system have done that on Tiramisu above diff --git a/app/src/main/kotlin/com/hippo/ehviewer/util/LauncherUtils.kt b/app/src/main/kotlin/com/hippo/ehviewer/util/LauncherUtils.kt index 16aaef830..75e84c947 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/util/LauncherUtils.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/util/LauncherUtils.kt @@ -46,7 +46,7 @@ private val lifecycle: Lifecycle } } -context(ctx: Context) +context(_: Context) suspend fun awaitActivityResult(contract: ActivityResultContract, input: I): O { val key = "activity_rq#${atomicInteger.fetchAndIncrement()}" var launcher: ActivityResultLauncher? = null diff --git a/app/src/main/kotlin/moe/tarsin/ContextBridges.kt b/app/src/main/kotlin/moe/tarsin/ContextBridges.kt index 7993ec1c3..006e409a4 100644 --- a/app/src/main/kotlin/moe/tarsin/ContextBridges.kt +++ b/app/src/main/kotlin/moe/tarsin/ContextBridges.kt @@ -39,7 +39,7 @@ fun string(@StringRes id: Int, vararg args: Any?) = ctx.getString(id, *args) context(activity: MainActivity) fun tip(message: String, useToast: Boolean = false) = activity.showTip(message, useToast) -context(activity: MainActivity) +context(_: MainActivity) fun tip(@StringRes id: Int, useToast: Boolean = false) = tip(string(id), useToast) context(state: SnackbarHostState) diff --git a/app/src/main/kotlin/moe/tarsin/coroutines/Result.kt b/app/src/main/kotlin/moe/tarsin/coroutines/Result.kt index 18be31679..e75707423 100644 --- a/app/src/main/kotlin/moe/tarsin/coroutines/Result.kt +++ b/app/src/main/kotlin/moe/tarsin/coroutines/Result.kt @@ -13,5 +13,5 @@ inline fun runSuspendCatching(block: () -> R) = runCatching(block).except T.runSuspendCatching(block: T.() -> R) = runCatching(block).except() -context(state: SnackbarHostState, scope: CoroutineScope) +context(_: SnackbarHostState, _: CoroutineScope) inline fun runSwallowingWithUI(block: () -> R) = runSuspendCatching(block).onFailure { e -> launch { snackbar(e.displayString()) } }