From 107a5ce6264e55a22f833ec512049ef3be63b9d5 Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 7 Jun 2023 15:39:35 +0800 Subject: [PATCH] Tweak package layout --- app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt | 1 - app/src/main/java/com/hippo/ehviewer/ui/{tools => }/Theme.kt | 2 +- app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt | 2 +- .../main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt | 2 +- .../main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt | 2 +- .../java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt | 2 +- app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt | 2 +- app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) rename app/src/main/java/com/hippo/ehviewer/ui/{tools => }/Theme.kt (93%) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt index 0a52acd77..af1f15ca8 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt @@ -29,7 +29,6 @@ import com.hippo.ehviewer.ui.settings.LicenseScreen import com.hippo.ehviewer.ui.settings.MyTagsScreen import com.hippo.ehviewer.ui.settings.SecurityScreen import com.hippo.ehviewer.ui.settings.UConfigScreen -import com.hippo.ehviewer.ui.tools.setMD3Content class ConfigureActivity : EhActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/tools/Theme.kt b/app/src/main/java/com/hippo/ehviewer/ui/Theme.kt similarity index 93% rename from app/src/main/java/com/hippo/ehviewer/ui/tools/Theme.kt rename to app/src/main/java/com/hippo/ehviewer/ui/Theme.kt index 6dfe64326..34d3f6dd4 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/tools/Theme.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/Theme.kt @@ -1,4 +1,4 @@ -package com.hippo.ehviewer.ui.tools +package com.hippo.ehviewer.ui import androidx.activity.ComponentActivity import androidx.activity.compose.setContent 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 6e6e5d54e..fd936aa8c 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 @@ -92,8 +92,8 @@ import com.hippo.ehviewer.ui.legacy.STRATEGY_MIN_SIZE import com.hippo.ehviewer.ui.legacy.ViewTransition import com.hippo.ehviewer.ui.main.requestOf import com.hippo.ehviewer.ui.navToReader +import com.hippo.ehviewer.ui.setMD3Content import com.hippo.ehviewer.ui.tools.CropDefaults -import com.hippo.ehviewer.ui.tools.setMD3Content import com.hippo.ehviewer.util.sendTo import com.hippo.ehviewer.yorozuya.FileUtils import com.hippo.ehviewer.yorozuya.ObjectUtils 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 94b45546e..cc8d3a27a 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 @@ -166,9 +166,9 @@ import com.hippo.ehviewer.ui.navToReader import com.hippo.ehviewer.ui.openBrowser import com.hippo.ehviewer.ui.removeFromFavorites import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs +import com.hippo.ehviewer.ui.setMD3Content import com.hippo.ehviewer.ui.tools.CrystalCard import com.hippo.ehviewer.ui.tools.GalleryDetailRating -import com.hippo.ehviewer.ui.tools.setMD3Content import com.hippo.ehviewer.util.AppHelper import com.hippo.ehviewer.util.ExceptionUtils import com.hippo.ehviewer.util.ReadableTime diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt index 77511bc09..50f160167 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt @@ -92,8 +92,8 @@ import com.hippo.ehviewer.ui.legacy.GalleryInfoContentHelper import com.hippo.ehviewer.ui.legacy.SearchLayout import com.hippo.ehviewer.ui.legacy.ViewTransition import com.hippo.ehviewer.ui.legacy.WindowInsetsAnimationHelper +import com.hippo.ehviewer.ui.setMD3Content import com.hippo.ehviewer.ui.tools.DialogState -import com.hippo.ehviewer.ui.tools.setMD3Content import com.hippo.ehviewer.util.getParcelableCompat import com.hippo.ehviewer.yorozuya.AnimationUtils import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener 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 d8e1bd5c9..6236df68a 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 @@ -58,9 +58,9 @@ import com.hippo.ehviewer.coil.justDownload import com.hippo.ehviewer.ui.legacy.calculateSuitableSpanCount import com.hippo.ehviewer.ui.main.EhPreviewItem import com.hippo.ehviewer.ui.navToReader +import com.hippo.ehviewer.ui.setMD3Content import com.hippo.ehviewer.ui.tools.rememberDialogState import com.hippo.ehviewer.ui.tools.rememberMemorized -import com.hippo.ehviewer.ui.tools.setMD3Content import com.hippo.ehviewer.util.getParcelableCompat import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt index 5b482e0c5..f461a7688 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt @@ -67,9 +67,9 @@ import com.hippo.ehviewer.Settings.listThumbSize import com.hippo.ehviewer.client.data.GalleryInfo import com.hippo.ehviewer.ui.doGalleryInfoAction import com.hippo.ehviewer.ui.main.GalleryInfoListItem +import com.hippo.ehviewer.ui.setMD3Content import com.hippo.ehviewer.ui.tools.Deferred import com.hippo.ehviewer.ui.tools.rememberDialogState -import com.hippo.ehviewer.ui.tools.setMD3Content import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.system.pxToDp import kotlinx.coroutines.delay diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt index 7467aca6c..4ec2b36ad 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt @@ -27,7 +27,7 @@ import androidx.compose.ui.unit.dp import androidx.navigation.fragment.findNavController import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhEngine -import com.hippo.ehviewer.ui.tools.setMD3Content +import com.hippo.ehviewer.ui.setMD3Content import com.hippo.ehviewer.util.ExceptionUtils import eu.kanade.tachiyomi.util.lang.withUIContext import moe.tarsin.coroutines.runSuspendCatching