Tweak package layout

app/src/main/java/com/hippo/ehviewer/ui/main/EhAsyncThumb.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.main.data
+package com.hippo.ehviewer.ui.main
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable

app/src/main/java/com/hippo/ehviewer/ui/main/GalleryDetail.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.main.data
+package com.hippo.ehviewer.ui.main
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column

app/src/main/java/com/hippo/ehviewer/ui/main/GalleryInfo.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.main.data
+package com.hippo.ehviewer.ui.main
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

app/src/main/java/com/hippo/ehviewer/ui/main/GalleryPreview.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.main.data
+package com.hippo.ehviewer.ui.main
 
 import android.graphics.drawable.BitmapDrawable
 import androidx.compose.foundation.layout.Box

app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt

@@ -90,7 +90,7 @@ 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.data.requestOf
+import com.hippo.ehviewer.ui.main.requestOf
 import com.hippo.ehviewer.ui.navToReader
 import com.hippo.ehviewer.ui.tools.CropDefaults
 import com.hippo.ehviewer.ui.tools.setMD3Content

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt

@@ -160,8 +160,8 @@ 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.data.EhPreviewItem
+import com.hippo.ehviewer.ui.main.EhPreviewItem
-import com.hippo.ehviewer.ui.main.data.GalleryDetailHeaderCard
+import com.hippo.ehviewer.ui.main.GalleryDetailHeaderCard
 import com.hippo.ehviewer.ui.navToReader
 import com.hippo.ehviewer.ui.openBrowser
 import com.hippo.ehviewer.ui.removeFromFavorites

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.main.data.GalleryInfoGridItem
+import com.hippo.ehviewer.ui.main.GalleryInfoGridItem
-import com.hippo.ehviewer.ui.main.data.GalleryInfoListItem
+import com.hippo.ehviewer.ui.main.GalleryInfoListItem
 import eu.kanade.tachiyomi.util.system.pxToDp
 
 abstract class GalleryHolder(composeView: CheckableComposeView) : RecyclerView.ViewHolder(composeView) {

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt

@@ -56,7 +56,7 @@ import com.hippo.ehviewer.client.data.GalleryPreview
 import com.hippo.ehviewer.coil.imageRequest
 import com.hippo.ehviewer.coil.justDownload
 import com.hippo.ehviewer.ui.legacy.calculateSuitableSpanCount
-import com.hippo.ehviewer.ui.main.data.EhPreviewItem
+import com.hippo.ehviewer.ui.main.EhPreviewItem
 import com.hippo.ehviewer.ui.navToReader
 import com.hippo.ehviewer.ui.tools.rememberDialogState
 import com.hippo.ehviewer.ui.tools.rememberMemorized

app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt

@@ -66,7 +66,7 @@ import com.hippo.ehviewer.R
 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.data.GalleryInfoListItem
+import com.hippo.ehviewer.ui.main.GalleryInfoListItem
 import com.hippo.ehviewer.ui.tools.Deferred
 import com.hippo.ehviewer.ui.tools.rememberDialogState
 import com.hippo.ehviewer.ui.tools.setMD3Content