From a4ce60c8498041ce26c67c088067265307c87155 Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 12 Jul 2023 08:03:45 +0800 Subject: [PATCH] Refactor package layout --- .../java/com/hippo/ehviewer/EhApplication.kt | 8 ++++---- .../java/com/hippo/ehviewer/coil/Extensions.kt | 9 --------- .../java/com/hippo/ehviewer/ktbuilder/Coil.kt | 16 ++++++++++++++++ .../Extensions.kt => ktbuilder/Okhttp.kt} | 2 +- .../java/com/hippo/ehviewer/spider/SpiderInfo.kt | 2 +- .../hippo/ehviewer/ui/legacy/UnikeryDrawable.kt | 2 +- .../com/hippo/ehviewer/ui/main/EhAsyncThumb.kt | 2 +- .../com/hippo/ehviewer/ui/main/GalleryPreview.kt | 2 +- .../hippo/ehviewer/ui/scene/DownloadsScene.kt | 2 +- .../ehviewer/ui/scene/GalleryDetailScene.kt | 2 +- .../ehviewer/ui/scene/GalleryPreviewScreen.kt | 2 +- 11 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 app/src/main/java/com/hippo/ehviewer/ktbuilder/Coil.kt rename app/src/main/java/com/hippo/ehviewer/{okhttp/Extensions.kt => ktbuilder/Okhttp.kt} (93%) diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index 51a35efb9..737a6d2fb 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -32,16 +32,16 @@ import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhTagDatabase import com.hippo.ehviewer.client.data.GalleryDetail import com.hippo.ehviewer.coil.MergeInterceptor -import com.hippo.ehviewer.coil.diskCache -import com.hippo.ehviewer.coil.imageLoader import com.hippo.ehviewer.cronet.isCronetSupported import com.hippo.ehviewer.dailycheck.checkDawn import com.hippo.ehviewer.dao.EhDatabase import com.hippo.ehviewer.download.DownloadManager +import com.hippo.ehviewer.ktbuilder.cache +import com.hippo.ehviewer.ktbuilder.diskCache +import com.hippo.ehviewer.ktbuilder.httpClient +import com.hippo.ehviewer.ktbuilder.imageLoader import com.hippo.ehviewer.legacy.cleanObsoleteCache import com.hippo.ehviewer.legacy.migrateCookies -import com.hippo.ehviewer.okhttp.cache -import com.hippo.ehviewer.okhttp.httpClient import com.hippo.ehviewer.spider.cronetHttpClient import com.hippo.ehviewer.ui.keepNoMediaFileStatus import com.hippo.ehviewer.ui.lockObserver diff --git a/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt b/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt index f024431d6..98be10bd7 100644 --- a/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt +++ b/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt @@ -1,12 +1,9 @@ package com.hippo.ehviewer.coil -import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable -import coil.ImageLoader import coil.decode.DecodeResult import coil.decode.Decoder -import coil.disk.DiskCache import coil.request.CachePolicy import coil.request.ImageRequest import coil.size.Size @@ -37,9 +34,3 @@ fun ImageRequest.Builder.justDownload() = apply { memoryCachePolicy(CachePolicy.DISABLED) decoderFactory { _, _, _ -> stubFactory } } - -inline fun Context.imageRequest(preview: GalleryPreview, builder: ImageRequest.Builder.() -> Unit = {}) = ImageRequest.Builder(this).ehPreview(preview).apply(builder).build() -inline fun Context.imageRequest(info: GalleryInfo, builder: ImageRequest.Builder.() -> Unit = {}) = ImageRequest.Builder(this).ehUrl(info).apply(builder).build() -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() diff --git a/app/src/main/java/com/hippo/ehviewer/ktbuilder/Coil.kt b/app/src/main/java/com/hippo/ehviewer/ktbuilder/Coil.kt new file mode 100644 index 000000000..896caf9c8 --- /dev/null +++ b/app/src/main/java/com/hippo/ehviewer/ktbuilder/Coil.kt @@ -0,0 +1,16 @@ +package com.hippo.ehviewer.ktbuilder + +import android.content.Context +import coil.ImageLoader +import coil.disk.DiskCache +import coil.request.ImageRequest +import com.hippo.ehviewer.client.data.GalleryInfo +import com.hippo.ehviewer.client.data.GalleryPreview +import com.hippo.ehviewer.coil.ehPreview +import com.hippo.ehviewer.coil.ehUrl + +inline fun Context.imageRequest(preview: GalleryPreview, builder: ImageRequest.Builder.() -> Unit = {}) = ImageRequest.Builder(this).ehPreview(preview).apply(builder).build() +inline fun Context.imageRequest(info: GalleryInfo, builder: ImageRequest.Builder.() -> Unit = {}) = ImageRequest.Builder(this).ehUrl(info).apply(builder).build() +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() diff --git a/app/src/main/java/com/hippo/ehviewer/okhttp/Extensions.kt b/app/src/main/java/com/hippo/ehviewer/ktbuilder/Okhttp.kt similarity index 93% rename from app/src/main/java/com/hippo/ehviewer/okhttp/Extensions.kt rename to app/src/main/java/com/hippo/ehviewer/ktbuilder/Okhttp.kt index 2a806714f..ac8d46393 100644 --- a/app/src/main/java/com/hippo/ehviewer/okhttp/Extensions.kt +++ b/app/src/main/java/com/hippo/ehviewer/ktbuilder/Okhttp.kt @@ -1,4 +1,4 @@ -package com.hippo.ehviewer.okhttp +package com.hippo.ehviewer.ktbuilder import okhttp3.Cache import okhttp3.OkHttpClient diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.kt index a64789c61..d10c4010b 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.kt +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderInfo.kt @@ -1,8 +1,8 @@ package com.hippo.ehviewer.spider -import com.hippo.ehviewer.coil.diskCache import com.hippo.ehviewer.coil.edit import com.hippo.ehviewer.coil.read +import com.hippo.ehviewer.ktbuilder.diskCache import com.hippo.ehviewer.legacy.readLegacySpiderInfo import com.hippo.unifile.UniFile import com.hippo.unifile.openInputStream diff --git a/app/src/main/java/com/hippo/ehviewer/ui/legacy/UnikeryDrawable.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/UnikeryDrawable.kt index d0df43f51..0c0cb2618 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/legacy/UnikeryDrawable.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/UnikeryDrawable.kt @@ -19,7 +19,7 @@ import android.graphics.drawable.AnimatedImageDrawable import android.graphics.drawable.Drawable import coil.imageLoader import coil.request.ImageRequest -import com.hippo.ehviewer.coil.imageRequest +import com.hippo.ehviewer.ktbuilder.imageRequest class UnikeryDrawable(private val mTextView: ObservedTextView, url: String) : WrapDrawable(), diff --git a/app/src/main/java/com/hippo/ehviewer/ui/main/EhAsyncThumb.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/EhAsyncThumb.kt index 70232f3a0..58cfe6273 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/main/EhAsyncThumb.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/main/EhAsyncThumb.kt @@ -13,7 +13,7 @@ import coil.compose.AsyncImage import coil.compose.AsyncImagePainter import coil.request.ImageRequest import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.ehviewer.coil.imageRequest +import com.hippo.ehviewer.ktbuilder.imageRequest import com.hippo.ehviewer.ui.tools.CropDefaults @Composable diff --git a/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryPreview.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryPreview.kt index 76045f897..cee9bef89 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryPreview.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryPreview.kt @@ -26,7 +26,7 @@ import coil.compose.AsyncImagePainter import coil.request.ImageRequest import com.hippo.ehviewer.client.data.GalleryPreview import com.hippo.ehviewer.client.data.NormalGalleryPreview -import com.hippo.ehviewer.coil.imageRequest +import com.hippo.ehviewer.ktbuilder.imageRequest import com.hippo.ehviewer.ui.tools.CropDefaults import com.hippo.ehviewer.ui.tools.CrystalCard diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt index f7b19587e..1e940bed2 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt @@ -63,7 +63,6 @@ import com.hippo.ehviewer.Settings.detailSize import com.hippo.ehviewer.Settings.listThumbSize import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.ehviewer.coil.imageRequest import com.hippo.ehviewer.coil.read import com.hippo.ehviewer.dao.DownloadInfo import com.hippo.ehviewer.databinding.DrawerListRvBinding @@ -74,6 +73,7 @@ import com.hippo.ehviewer.download.DownloadManager import com.hippo.ehviewer.download.DownloadManager.DownloadInfoListener import com.hippo.ehviewer.download.DownloadService import com.hippo.ehviewer.download.DownloadService.Companion.clear +import com.hippo.ehviewer.ktbuilder.imageRequest import com.hippo.ehviewer.spider.SpiderDen import com.hippo.ehviewer.spider.putToDownloadDir import com.hippo.ehviewer.ui.legacy.AutoStaggeredGridLayoutManager diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt index 17b5744e2..a2e5ea0a6 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt @@ -121,7 +121,6 @@ import com.hippo.ehviewer.client.parser.ArchiveParser import com.hippo.ehviewer.client.parser.HomeParser import com.hippo.ehviewer.client.parser.ParserUtils import com.hippo.ehviewer.client.parser.TorrentResult -import com.hippo.ehviewer.coil.imageRequest import com.hippo.ehviewer.coil.justDownload import com.hippo.ehviewer.dao.DownloadInfo import com.hippo.ehviewer.dao.Filter @@ -130,6 +129,7 @@ import com.hippo.ehviewer.databinding.DialogArchiveListBinding import com.hippo.ehviewer.databinding.DialogRateBinding import com.hippo.ehviewer.databinding.DialogTorrentListBinding import com.hippo.ehviewer.databinding.ItemGalleryCommentBinding +import com.hippo.ehviewer.ktbuilder.imageRequest import com.hippo.ehviewer.spider.SpiderDen import com.hippo.ehviewer.spider.SpiderQueen import com.hippo.ehviewer.spider.SpiderQueen.Companion.MODE_READ diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt index fcb6eed1d..39088588c 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt @@ -53,8 +53,8 @@ import com.hippo.ehviewer.client.EhEngine import com.hippo.ehviewer.client.EhUrl import com.hippo.ehviewer.client.data.GalleryDetail import com.hippo.ehviewer.client.data.GalleryPreview -import com.hippo.ehviewer.coil.imageRequest import com.hippo.ehviewer.coil.justDownload +import com.hippo.ehviewer.ktbuilder.imageRequest import com.hippo.ehviewer.ui.legacy.calculateSuitableSpanCount import com.hippo.ehviewer.ui.main.EhPreviewItem import com.hippo.ehviewer.ui.navToReader