From 42234d9163de885d072f875463daa20e1e7e9cef Mon Sep 17 00:00:00 2001 From: tarsin Date: Tue, 24 Jan 2023 09:55:17 +0800 Subject: [PATCH] Fioxup! Move GalleryList card longclick dialog to separate file --- .../ehviewer/ui/scene/history/HistoryScreen.kt | 3 --- .../hippo/ehviewer/ui/widget/GalleryInfoCard.kt | 2 +- .../ehviewer/ui/widget/GalleryListOperation.kt | 15 +++++---------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt index 714cc7ef8..a7c159626 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt @@ -44,7 +44,6 @@ import androidx.paging.PagingConfig import androidx.paging.cachedIn import androidx.paging.compose.collectAsLazyPagingItems import androidx.paging.compose.items -import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.R import com.hippo.ehviewer.client.data.GalleryInfo @@ -53,8 +52,6 @@ import com.hippo.ehviewer.ui.widget.GalleryListLongClickDialog import com.hippo.ehviewer.ui.widget.ListInfoCard import eu.kanade.tachiyomi.util.lang.launchIO -val downloadManager = EhApplication.downloadManager - @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) @Composable fun HistoryScreen(hostFragment: HistoryComposeScreenFragmentBridge) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt index ad65d2640..db0c5935c 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt @@ -35,7 +35,7 @@ import com.hippo.ehviewer.client.data.GalleryInfo import eu.kanade.tachiyomi.util.system.pxToDp import java.util.Locale -val downloadManager = EhApplication.downloadManager +private val downloadManager = EhApplication.downloadManager @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryListOperation.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryListOperation.kt index 94389b1ba..c7c0f8dc0 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryListOperation.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryListOperation.kt @@ -23,11 +23,14 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat.startActivity +import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.client.data.GalleryInfo import eu.kanade.tachiyomi.ui.reader.ReaderActivity +private val downloadManager = EhApplication.downloadManager + @Composable private fun DialogSelectorItem( onClick: () -> Unit, @@ -86,11 +89,7 @@ fun GalleryListLongClickDialog( icon = painterResource(id = R.drawable.v_book_open_x24), text = stringResource(id = R.string.read) ) - if (remember { - com.hippo.ehviewer.ui.scene.history.downloadManager.containDownloadInfo( - info.gid - ) - }) { + if (remember { downloadManager.containDownloadInfo(info.gid) }) { DialogSelectorItem( onClick = { dialogStatus = DialogStatus.PRIMARY @@ -124,11 +123,7 @@ fun GalleryListLongClickDialog( text = stringResource(id = R.string.remove_from_favourites) ) } - if (remember { - com.hippo.ehviewer.ui.scene.history.downloadManager.containDownloadInfo( - info.gid - ) - }) { + if (remember { downloadManager.containDownloadInfo(info.gid) }) { DialogSelectorItem( onClick = { dialogStatus = DialogStatus.PRIMARY