From 0f25789d7402e94ba040b4acfc4aeda3c8df4e2a Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 17 May 2023 11:28:25 +0800 Subject: [PATCH] Move EhAsyncThumb to dataflow Composable package --- .../com/hippo/ehviewer/ui/compose/{ => data}/EhAsyncThumb.kt | 3 ++- .../java/com/hippo/ehviewer/ui/compose/data/GalleryDetail.kt | 1 - .../java/com/hippo/ehviewer/ui/compose/data/GalleryInfo.kt | 2 -- .../main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) rename app/src/main/java/com/hippo/ehviewer/ui/compose/{ => data}/EhAsyncThumb.kt (94%) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/EhAsyncThumb.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/data/EhAsyncThumb.kt similarity index 94% rename from app/src/main/java/com/hippo/ehviewer/ui/compose/EhAsyncThumb.kt rename to app/src/main/java/com/hippo/ehviewer/ui/compose/data/EhAsyncThumb.kt index 796e36d8d..9f86d0550 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/compose/EhAsyncThumb.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/data/EhAsyncThumb.kt @@ -1,4 +1,4 @@ -package com.hippo.ehviewer.ui.compose +package com.hippo.ehviewer.ui.compose.data import androidx.compose.runtime.Composable import androidx.compose.runtime.ReadOnlyComposable @@ -14,6 +14,7 @@ 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.ui.compose.CropDefaults @Composable @ReadOnlyComposable diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryDetail.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryDetail.kt index 41f1dd872..e6ce577d2 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryDetail.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryDetail.kt @@ -30,7 +30,6 @@ import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.client.data.GalleryDetail import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.ehviewer.ui.compose.EhAsyncCropThumb @Composable fun GalleryDetailHeaderInfoCard( diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryInfo.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryInfo.kt index fb6bcb5cd..6649e3cf0 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryInfo.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryInfo.kt @@ -35,8 +35,6 @@ import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.client.data.GalleryInfo import com.hippo.ehviewer.download.DownloadManager import com.hippo.ehviewer.ui.compose.CrystalCard -import com.hippo.ehviewer.ui.compose.EhAsyncCropThumb -import com.hippo.ehviewer.ui.compose.EhAsyncThumb import com.hippo.ehviewer.ui.compose.ElevatedCard import com.hippo.ehviewer.ui.compose.GalleryListCardRating 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 8b7ff6f36..9950546ed 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 @@ -59,7 +59,7 @@ 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.spider.SpiderDen -import com.hippo.ehviewer.ui.compose.EhAsyncCropThumb +import com.hippo.ehviewer.ui.compose.data.EhAsyncCropThumb import com.hippo.ehviewer.ui.compose.setMD3Content import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder import com.hippo.ehviewer.ui.legacy.CheckBoxDialogBuilder