diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
index 98fdb6e5c..a479a3fa1 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
@@ -42,8 +42,8 @@ import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.DownloadService
 import com.hippo.ehviewer.download.downloadLocation
-import com.hippo.ehviewer.ui.compose.DialogState
 import com.hippo.ehviewer.ui.legacy.ListCheckBoxDialogBuilder
+import com.hippo.ehviewer.ui.main.DialogState
 import com.hippo.ehviewer.ui.scene.BaseScene
 import com.hippo.ehviewer.util.requestPermission
 import com.hippo.ehviewer.yorozuya.collect.LongList
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 76c0738e7..5bd896c40 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt
@@ -15,11 +15,11 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.ui.compose.setMD3Content
 import com.hippo.ehviewer.ui.login.CookieSignInScene
 import com.hippo.ehviewer.ui.login.SelectSiteScreen
 import com.hippo.ehviewer.ui.login.SignInScreen
 import com.hippo.ehviewer.ui.login.WebviewSignInScreen
+import com.hippo.ehviewer.ui.main.setMD3Content
 import com.hippo.ehviewer.ui.settings.AboutScreen
 import com.hippo.ehviewer.ui.settings.AdvancedScreen
 import com.hippo.ehviewer.ui.settings.BaseScreen
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleRatingView.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleRatingView.kt
index 9432a32c1..f63828d19 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleRatingView.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleRatingView.kt
@@ -8,7 +8,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.AbstractComposeView
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
-import com.hippo.ehviewer.ui.compose.GalleryListCardRating
+import com.hippo.ehviewer.ui.main.GalleryListCardRating
 
 class SimpleRatingView @JvmOverloads constructor(
     context: Context,
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
index e9960335e..97a154ea3 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
@@ -59,7 +59,7 @@ import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.ui.FINISH_ROUTE_NAME
 import com.hippo.ehviewer.ui.LocalNavController
 import com.hippo.ehviewer.ui.SELECT_SITE_ROUTE_NAME
-import com.hippo.ehviewer.ui.compose.rememberDialogState
+import com.hippo.ehviewer.ui.main.rememberDialogState
 import com.hippo.ehviewer.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
index 3eef6db62..9d57f2f52 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
@@ -66,7 +66,7 @@ import com.hippo.ehviewer.ui.FINISH_ROUTE_NAME
 import com.hippo.ehviewer.ui.LocalNavController
 import com.hippo.ehviewer.ui.SELECT_SITE_ROUTE_NAME
 import com.hippo.ehviewer.ui.WEBVIEW_SIGN_IN_ROUTE_NAME
-import com.hippo.ehviewer.ui.compose.rememberDialogState
+import com.hippo.ehviewer.ui.main.rememberDialogState
 import com.hippo.ehviewer.ui.openBrowser
 import com.hippo.ehviewer.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/Card.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/Card.kt
similarity index 96%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/Card.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/Card.kt
index 3ee51a79f..8f3ca4c1e 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/Card.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/Card.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.main
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.ColumnScope
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/CropDefaults.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/CropDefaults.kt
similarity index 87%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/CropDefaults.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/CropDefaults.kt
index beb788e50..dfddebc4f 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/CropDefaults.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/CropDefaults.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.main
 
 object CropDefaults {
     private const val CROP_MIN_ASPECT = 0.5F
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/DeferedComposable.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/DeferedComposable.kt
similarity index 93%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/DeferedComposable.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/DeferedComposable.kt
index df1d00719..9611b0380 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/DeferedComposable.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/DeferedComposable.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.main
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/Dialog.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/Dialog.kt
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/Dialog.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/Dialog.kt
index 5efc921d4..6b04ce10c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/Dialog.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/Dialog.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.main
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/Dummy.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/Dummy.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/Dummy.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/Dummy.kt
index 7b63332e6..28265c907 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/Dummy.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/Dummy.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.main
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.combinedClickable
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/RatingWidget.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/RatingWidget.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/RatingWidget.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/RatingWidget.kt
index a9e3c4a8e..bc5a2058c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/RatingWidget.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/RatingWidget.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.main
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/RememberGlobally.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/RememberGlobally.kt
similarity index 98%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/RememberGlobally.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/RememberGlobally.kt
index 52622a75f..def374ec1 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/RememberGlobally.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/RememberGlobally.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.main
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/State.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/State.kt
similarity index 95%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/State.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/State.kt
index a4c53bb23..5bebcb80a 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/State.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/State.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.main
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/Theme.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/Theme.kt
similarity index 93%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/Theme.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/Theme.kt
index 9db449c99..e94b5db21 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/Theme.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/Theme.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.main
 
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/data/EhAsyncThumb.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/data/EhAsyncThumb.kt
similarity index 94%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/data/EhAsyncThumb.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/data/EhAsyncThumb.kt
index 1abd6b699..2529bb74f 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/data/EhAsyncThumb.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/data/EhAsyncThumb.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose.data
+package com.hippo.ehviewer.ui.main.data
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
@@ -14,7 +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
+import com.hippo.ehviewer.ui.main.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/main/data/GalleryDetail.kt
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryDetail.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/data/GalleryDetail.kt
index e6ce577d2..fbd3fc5d0 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryDetail.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/data/GalleryDetail.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose.data
+package com.hippo.ehviewer.ui.main.data
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryInfo.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/data/GalleryInfo.kt
similarity index 96%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryInfo.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/data/GalleryInfo.kt
index 4ad0e5d46..8e6676abe 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryInfo.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/data/GalleryInfo.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose.data
+package com.hippo.ehviewer.ui.main.data
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -34,9 +34,9 @@ import androidx.compose.ui.unit.dp
 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.ElevatedCard
-import com.hippo.ehviewer.ui.compose.GalleryListCardRating
+import com.hippo.ehviewer.ui.main.CrystalCard
+import com.hippo.ehviewer.ui.main.ElevatedCard
+import com.hippo.ehviewer.ui.main.GalleryListCardRating
 
 @Composable
 fun GalleryInfoListItem(
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryPreview.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/data/GalleryPreview.kt
similarity index 96%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryPreview.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/main/data/GalleryPreview.kt
index ac640d95b..90a255ad0 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryPreview.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/data/GalleryPreview.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose.data
+package com.hippo.ehviewer.ui.main.data
 
 import android.graphics.drawable.BitmapDrawable
 import androidx.compose.foundation.layout.Box
@@ -27,8 +27,8 @@ 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.ui.compose.CropDefaults
-import com.hippo.ehviewer.ui.compose.CrystalCard
+import com.hippo.ehviewer.ui.main.CropDefaults
+import com.hippo.ehviewer.ui.main.CrystalCard
 
 @Composable
 @ReadOnlyComposable
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 c0f3be60b..acb1cc6b2 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
@@ -77,9 +77,6 @@ import com.hippo.ehviewer.download.DownloadService
 import com.hippo.ehviewer.download.DownloadService.Companion.clear
 import com.hippo.ehviewer.spider.SpiderDen
 import com.hippo.ehviewer.spider.putToDownloadDir
-import com.hippo.ehviewer.ui.compose.CropDefaults
-import com.hippo.ehviewer.ui.compose.data.requestOf
-import com.hippo.ehviewer.ui.compose.setMD3Content
 import com.hippo.ehviewer.ui.legacy.AutoStaggeredGridLayoutManager
 import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
 import com.hippo.ehviewer.ui.legacy.CheckBoxDialogBuilder
@@ -93,6 +90,9 @@ import com.hippo.ehviewer.ui.legacy.FastScroller.OnDragHandlerListener
 import com.hippo.ehviewer.ui.legacy.HandlerDrawable
 import com.hippo.ehviewer.ui.legacy.STRATEGY_MIN_SIZE
 import com.hippo.ehviewer.ui.legacy.ViewTransition
+import com.hippo.ehviewer.ui.main.CropDefaults
+import com.hippo.ehviewer.ui.main.data.requestOf
+import com.hippo.ehviewer.ui.main.setMD3Content
 import com.hippo.ehviewer.ui.navToReader
 import com.hippo.ehviewer.util.sendTo
 import com.hippo.ehviewer.yorozuya.FileUtils
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 d8378f009..19c9ce643 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
@@ -151,11 +151,6 @@ import com.hippo.ehviewer.ui.GalleryInfoBottomSheet
 import com.hippo.ehviewer.ui.LocalNavController
 import com.hippo.ehviewer.ui.MainActivity
 import com.hippo.ehviewer.ui.addToFavorites
-import com.hippo.ehviewer.ui.compose.CrystalCard
-import com.hippo.ehviewer.ui.compose.GalleryDetailRating
-import com.hippo.ehviewer.ui.compose.data.EhPreviewItem
-import com.hippo.ehviewer.ui.compose.data.GalleryDetailHeaderCard
-import com.hippo.ehviewer.ui.compose.setMD3Content
 import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
 import com.hippo.ehviewer.ui.legacy.CheckBoxDialogBuilder
 import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
@@ -164,6 +159,11 @@ import com.hippo.ehviewer.ui.legacy.GalleryRatingBar.OnUserRateListener
 import com.hippo.ehviewer.ui.legacy.ObservedTextView
 import com.hippo.ehviewer.ui.legacy.URLImageGetter
 import com.hippo.ehviewer.ui.legacy.calculateSuitableSpanCount
+import com.hippo.ehviewer.ui.main.CrystalCard
+import com.hippo.ehviewer.ui.main.GalleryDetailRating
+import com.hippo.ehviewer.ui.main.data.EhPreviewItem
+import com.hippo.ehviewer.ui.main.data.GalleryDetailHeaderCard
+import com.hippo.ehviewer.ui.main.setMD3Content
 import com.hippo.ehviewer.ui.navToReader
 import com.hippo.ehviewer.ui.openBrowser
 import com.hippo.ehviewer.ui.removeFromFavorites
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
index 5c64b06da..041c9d8f4 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
@@ -36,8 +36,8 @@ import com.google.accompanist.themeadapter.material3.Mdc3Theme
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.Settings.listThumbSize
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.ui.compose.data.GalleryInfoGridItem
-import com.hippo.ehviewer.ui.compose.data.GalleryInfoListItem
+import com.hippo.ehviewer.ui.main.data.GalleryInfoGridItem
+import com.hippo.ehviewer.ui.main.data.GalleryInfoListItem
 import eu.kanade.tachiyomi.util.system.pxToDp
 
 abstract class GalleryHolder(composeView: CheckableComposeView) : RecyclerView.ViewHolder(composeView) {
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 697536a6f..229e64083 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
@@ -78,8 +78,6 @@ import com.hippo.ehviewer.databinding.ItemDrawerListBinding
 import com.hippo.ehviewer.databinding.SceneGalleryListBinding
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.DownloadManager.DownloadInfoListener
-import com.hippo.ehviewer.ui.compose.DialogState
-import com.hippo.ehviewer.ui.compose.setMD3Content
 import com.hippo.ehviewer.ui.doGalleryInfoAction
 import com.hippo.ehviewer.ui.legacy.AddDeleteDrawable
 import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
@@ -94,6 +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.main.DialogState
+import com.hippo.ehviewer.ui.main.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 35a77c04a..69ca4b2b1 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
@@ -55,11 +55,11 @@ 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.ui.compose.data.EhPreviewItem
-import com.hippo.ehviewer.ui.compose.rememberDialogState
-import com.hippo.ehviewer.ui.compose.rememberMemorized
-import com.hippo.ehviewer.ui.compose.setMD3Content
 import com.hippo.ehviewer.ui.legacy.calculateSuitableSpanCount
+import com.hippo.ehviewer.ui.main.data.EhPreviewItem
+import com.hippo.ehviewer.ui.main.rememberDialogState
+import com.hippo.ehviewer.ui.main.rememberMemorized
+import com.hippo.ehviewer.ui.main.setMD3Content
 import com.hippo.ehviewer.ui.navToReader
 import com.hippo.ehviewer.util.getParcelableCompat
 import kotlinx.coroutines.Dispatchers
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 2b27872fe..dcddbd689 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
@@ -65,11 +65,11 @@ import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings.listThumbSize
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.ui.compose.Deferred
-import com.hippo.ehviewer.ui.compose.data.GalleryInfoListItem
-import com.hippo.ehviewer.ui.compose.rememberDialogState
-import com.hippo.ehviewer.ui.compose.setMD3Content
 import com.hippo.ehviewer.ui.doGalleryInfoAction
+import com.hippo.ehviewer.ui.main.Deferred
+import com.hippo.ehviewer.ui.main.data.GalleryInfoListItem
+import com.hippo.ehviewer.ui.main.rememberDialogState
+import com.hippo.ehviewer.ui.main.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 473ca7bc2..4dc20e660 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.compose.setMD3Content
+import com.hippo.ehviewer.ui.main.setMD3Content
 import com.hippo.ehviewer.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import moe.tarsin.coroutines.runSuspendCatching
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt
index d020f8f5f..381613094 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt
@@ -40,8 +40,8 @@ import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.client.systemDns
 import com.hippo.ehviewer.ui.LocalNavController
-import com.hippo.ehviewer.ui.compose.observed
 import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
+import com.hippo.ehviewer.ui.main.observed
 import com.hippo.ehviewer.util.LogCat
 import com.hippo.ehviewer.util.ReadableTime
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt
index 27096040b..4101645ee 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt
@@ -37,10 +37,10 @@ import com.hippo.ehviewer.download.downloadLocation
 import com.hippo.ehviewer.spider.SpiderQueen
 import com.hippo.ehviewer.spider.readCompatFromUniFile
 import com.hippo.ehviewer.ui.LocalNavController
-import com.hippo.ehviewer.ui.compose.observed
-import com.hippo.ehviewer.ui.compose.rememberedAccessor
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
 import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.main.observed
+import com.hippo.ehviewer.ui.main.rememberedAccessor
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.lang.launchNonCancellable
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/EhScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/EhScreen.kt
index 665e54f1b..a06acb892 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/settings/EhScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/EhScreen.kt
@@ -50,9 +50,9 @@ import com.hippo.ehviewer.ui.LocalNavController
 import com.hippo.ehviewer.ui.MYTAGS_SCREEN
 import com.hippo.ehviewer.ui.SIGN_IN_ROUTE_NAME
 import com.hippo.ehviewer.ui.UCONFIG_SCREEN
-import com.hippo.ehviewer.ui.compose.observed
-import com.hippo.ehviewer.ui.compose.rememberedAccessor
 import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.main.observed
+import com.hippo.ehviewer.ui.main.rememberedAccessor
 import com.hippo.ehviewer.util.whisperClipboard
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/SecurityScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/SecurityScreen.kt
index 09202c4d6..9fae80112 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/settings/SecurityScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/SecurityScreen.kt
@@ -18,9 +18,9 @@ import androidx.compose.ui.res.stringResource
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.ui.LocalNavController
-import com.hippo.ehviewer.ui.compose.observed
-import com.hippo.ehviewer.ui.compose.rememberedAccessor
 import com.hippo.ehviewer.ui.isAuthenticationSupported
+import com.hippo.ehviewer.ui.main.observed
+import com.hippo.ehviewer.ui.main.rememberedAccessor
 
 @Composable
 fun SecurityScreen() {