Refactor package structure

app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt

@@ -23,12 +23,12 @@ import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.dao.DownloadLabel
+import com.hippo.ehviewer.image.Image
 import com.hippo.ehviewer.spider.SpiderDen
 import com.hippo.ehviewer.spider.SpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.OnSpiderListener
 import com.hippo.ehviewer.spider.readCompatFromUniFile
 import com.hippo.ehviewer.spider.write
-import com.hippo.image.Image
 import com.hippo.yorozuya.ConcurrentPool
 import com.hippo.yorozuya.MathUtils
 import com.hippo.yorozuya.ObjectUtils

app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.kt

@@ -21,8 +21,8 @@ import android.net.Uri
 import android.os.ParcelFileDescriptor
 import android.util.Log
 import com.hippo.ehviewer.Settings
-import com.hippo.image.Image
-import com.hippo.image.rewriteGifSource
+import com.hippo.ehviewer.image.Image
+import com.hippo.ehviewer.image.rewriteGifSource
 import com.hippo.unifile.UniFile
 import com.hippo.yorozuya.FileUtils
 import kotlinx.coroutines.CoroutineScope

app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.kt

@@ -16,11 +16,11 @@
 package com.hippo.ehviewer.gallery
 
 import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.image.Image
 import com.hippo.ehviewer.spider.SpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.Companion.obtainSpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.Companion.releaseSpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.OnSpiderListener
-import com.hippo.image.Image
 import com.hippo.unifile.UniFile
 import com.hippo.yorozuya.SimpleHandler
 import java.util.Locale

app/src/main/java/com/hippo/ehviewer/image/Image.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License along with EhViewer.
  * If not, see <https://www.gnu.org/licenses/>.
  */
-package com.hippo.image
+package com.hippo.ehviewer.image
 
 import android.graphics.ColorSpace
 import android.graphics.ImageDecoder

app/src/main/java/com/hippo/ehviewer/preference/AccountPreference.kt

@@ -26,7 +26,7 @@ import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.ui.SettingsActivity
 import com.hippo.ehviewer.ui.scene.BaseScene
-import com.hippo.preference.MessagePreference
+import com.hippo.ehviewer.widget.preference.MessagePreference
 import com.hippo.util.addTextToClipboard
 import okhttp3.Cookie
 import okhttp3.HttpUrl.Companion.toHttpUrl

app/src/main/java/com/hippo/ehviewer/preference/ImageLimitsPreference.kt

@@ -9,7 +9,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.ui.SettingsActivity
-import com.hippo.preference.DialogPreference
+import com.hippo.ehviewer.widget.preference.DialogPreference
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 

app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.kt

@@ -29,8 +29,8 @@ import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.EhProxySelector
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.widget.preference.DialogPreference
 import com.hippo.network.InetValidator
-import com.hippo.preference.DialogPreference
 import com.hippo.yorozuya.MathUtils
 import com.hippo.yorozuya.ViewUtils
 

app/src/main/java/com/hippo/ehviewer/preference/TaskPreference.kt

@@ -21,7 +21,7 @@ import androidx.appcompat.app.AlertDialog
 import com.google.android.material.snackbar.Snackbar
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.ui.SettingsActivity
-import com.hippo.preference.DialogPreference
+import com.hippo.ehviewer.widget.preference.DialogPreference
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt

@@ -28,8 +28,8 @@ import com.hippo.ehviewer.client.getImageKey
 import com.hippo.ehviewer.coil.edit
 import com.hippo.ehviewer.coil.read
 import com.hippo.ehviewer.gallery.SUPPORT_IMAGE_EXTENSIONS
-import com.hippo.image.Image.CloseableSource
-import com.hippo.image.rewriteGifSource2
+import com.hippo.ehviewer.image.Image.CloseableSource
+import com.hippo.ehviewer.image.rewriteGifSource2
 import com.hippo.unifile.UniFile
 import com.hippo.unifile.openOutputStream
 import com.hippo.util.sendTo

app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt

@@ -37,7 +37,7 @@ import com.hippo.ehviewer.client.parser.GalleryDetailParser.parsePreviewList
 import com.hippo.ehviewer.client.parser.GalleryDetailParser.parsePreviewPages
 import com.hippo.ehviewer.client.parser.GalleryMultiPageViewerPTokenParser
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
-import com.hippo.image.Image
+import com.hippo.ehviewer.image.Image
 import com.hippo.unifile.UniFile
 import com.hippo.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO

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

@@ -21,7 +21,6 @@ import android.content.Intent
 import android.os.Build
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
-import com.hippo.app.ListCheckBoxDialogBuilder
 import com.hippo.ehviewer.EhApplication.Companion.favouriteStatusRouter
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
@@ -31,6 +30,7 @@ import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.download.DownloadService
 import com.hippo.ehviewer.ui.scene.BaseScene
+import com.hippo.ehviewer.widget.ListCheckBoxDialogBuilder
 import com.hippo.unifile.UniFile
 import com.hippo.util.requestPermission
 import com.hippo.yorozuya.collect.LongList

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

@@ -50,8 +50,6 @@ import androidx.navigation.ui.onNavDestinationSelected2
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.snackbar.Snackbar
-import com.hippo.app.BaseDialogBuilder
-import com.hippo.app.EditTextDialogBuilder
 import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
@@ -62,13 +60,15 @@ import com.hippo.ehviewer.client.parser.GalleryDetailUrlParser
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
 import com.hippo.ehviewer.databinding.ActivityMainBinding
 import com.hippo.ehviewer.download.DownloadService
+import com.hippo.ehviewer.image.Image
 import com.hippo.ehviewer.ui.login.LoginActivity
 import com.hippo.ehviewer.ui.scene.BaseScene
 import com.hippo.ehviewer.ui.scene.GalleryDetailScene
 import com.hippo.ehviewer.ui.scene.GalleryListScene
 import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs
 import com.hippo.ehviewer.ui.scene.ProgressScene
-import com.hippo.image.Image
+import com.hippo.ehviewer.widget.BaseDialogBuilder
+import com.hippo.ehviewer.widget.EditTextDialogBuilder
 import com.hippo.util.addTextToClipboard
 import com.hippo.util.getClipboardManager
 import com.hippo.util.getParcelableExtraCompat

app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt

@@ -27,7 +27,6 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
-import com.hippo.app.BaseDialogBuilder
 import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.BuildConfig
 import com.hippo.ehviewer.EhDB
@@ -36,6 +35,7 @@ import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.ui.scene.BaseScene
+import com.hippo.ehviewer.widget.BaseDialogBuilder
 import com.hippo.util.ExceptionUtils
 import com.hippo.util.LogCat
 import com.hippo.util.ReadableTime

app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.kt

@@ -21,12 +21,12 @@ import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
-import com.hippo.app.BaseDialogBuilder
 import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
 import com.hippo.ehviewer.ui.scene.BaseScene
+import com.hippo.ehviewer.widget.BaseDialogBuilder
 import com.hippo.unifile.UniFile
 import com.hippo.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchNonCancellable

app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.kt

@@ -37,11 +37,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.checkbox.MaterialCheckBox
 import com.google.android.material.textfield.TextInputLayout
-import com.hippo.app.BaseDialogBuilder
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhFilter
 import com.hippo.ehviewer.dao.Filter
-import com.hippo.view.ViewTransition
+import com.hippo.ehviewer.widget.BaseDialogBuilder
+import com.hippo.ehviewer.widget.ViewTransition
 import com.hippo.yorozuya.ViewUtils
 
 class FilterFragment : BaseFragment() {
@@ -73,7 +73,8 @@ class FilterFragment : BaseFragment() {
         val recyclerView =
             inflater.inflate(R.layout.rv_layout, container, false) as RecyclerView
         val tip = getTipView(R.string.filter)
-        mViewTransition = ViewTransition(recyclerView, tip)
+        mViewTransition =
+            ViewTransition(recyclerView, tip)
         val fab = getFabViewAndShow()
         val drawable = ContextCompat.getDrawable(requireActivity(), R.drawable.big_filter)
         drawable?.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)

app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.kt

@@ -30,11 +30,11 @@ import androidx.fragment.app.DialogFragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.textfield.TextInputLayout
-import com.hippo.app.BaseDialogBuilder
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.Hosts
 import com.hippo.ehviewer.R
-import com.hippo.view.ViewTransition
+import com.hippo.ehviewer.widget.BaseDialogBuilder
+import com.hippo.ehviewer.widget.ViewTransition
 
 class HostsFragment : BaseFragment(), View.OnClickListener {
     private var hosts: Hosts? = null
@@ -56,7 +56,8 @@ class HostsFragment : BaseFragment(), View.OnClickListener {
     ): View {
         val recyclerView = inflater.inflate(R.layout.rv_layout, container, false) as RecyclerView
         val tip = getTipView(R.string.hosts)
-        mViewTransition = ViewTransition(recyclerView, tip)
+        mViewTransition =
+            ViewTransition(recyclerView, tip)
         val fab = getFabViewAndShow()
         adapter = HostsAdapter()
         recyclerView.adapter = adapter

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

@@ -45,13 +45,6 @@ import androidx.recyclerview.widget.SimpleItemAnimator
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import arrow.core.partially1
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.hippo.app.BaseDialogBuilder
-import com.hippo.app.CheckBoxDialogBuilder
-import com.hippo.app.EditTextDialogBuilder
-import com.hippo.easyrecyclerview.EasyRecyclerView
-import com.hippo.easyrecyclerview.EasyRecyclerView.CustomChoiceListener
-import com.hippo.easyrecyclerview.FastScroller.OnDragHandlerListener
-import com.hippo.easyrecyclerview.HandlerDrawable
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
@@ -68,13 +61,20 @@ import com.hippo.ehviewer.download.DownloadService.Companion.clear
 import com.hippo.ehviewer.spider.SpiderDen
 import com.hippo.ehviewer.ui.widget.EhAsyncCropThumb
 import com.hippo.ehviewer.ui.widget.setMD3Content
+import com.hippo.ehviewer.widget.BaseDialogBuilder
+import com.hippo.ehviewer.widget.CheckBoxDialogBuilder
+import com.hippo.ehviewer.widget.EditTextDialogBuilder
+import com.hippo.ehviewer.widget.FabLayout
+import com.hippo.ehviewer.widget.FabLayout.OnClickFabListener
+import com.hippo.ehviewer.widget.FabLayout.OnExpandListener
+import com.hippo.ehviewer.widget.ViewTransition
+import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
+import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView.CustomChoiceListener
+import com.hippo.ehviewer.widget.easyrecyclerview.FastScroller.OnDragHandlerListener
+import com.hippo.ehviewer.widget.easyrecyclerview.HandlerDrawable
+import com.hippo.ehviewer.widget.recyclerview.AutoStaggeredGridLayoutManager
+import com.hippo.ehviewer.widget.recyclerview.STRATEGY_MIN_SIZE
 import com.hippo.unifile.UniFile
-import com.hippo.view.ViewTransition
-import com.hippo.widget.FabLayout
-import com.hippo.widget.FabLayout.OnClickFabListener
-import com.hippo.widget.FabLayout.OnExpandListener
-import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager
-import com.hippo.widget.recyclerview.STRATEGY_MIN_SIZE
 import com.hippo.yorozuya.FileUtils
 import com.hippo.yorozuya.ObjectUtils
 import com.hippo.yorozuya.collect.LongList
@@ -247,7 +247,8 @@ class DownloadsScene :
             // Workaround
             (fabLayout.parent as ViewGroup).removeView(fabLayout)
             container!!.addView(fabLayout)
-            mViewTransition = ViewTransition(content, tip)
+            mViewTransition =
+                ViewTransition(content, tip)
             val drawable = ContextCompat.getDrawable(requireContext(), R.drawable.big_download)
             drawable!!.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
             tip.setCompoundDrawables(null, drawable, null, null)

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

@@ -41,11 +41,6 @@ import com.google.android.material.datepicker.DateValidatorPointBackward
 import com.google.android.material.datepicker.DateValidatorPointForward
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.hippo.app.BaseDialogBuilder
-import com.hippo.drawable.AddDeleteDrawable
-import com.hippo.easyrecyclerview.EasyRecyclerView
-import com.hippo.easyrecyclerview.EasyRecyclerView.CustomChoiceListener
-import com.hippo.easyrecyclerview.FastScroller.OnDragHandlerListener
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
@@ -56,12 +51,17 @@ import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.parser.FavoritesParser
 import com.hippo.ehviewer.ui.CommonOperations
+import com.hippo.ehviewer.widget.AddDeleteDrawable
+import com.hippo.ehviewer.widget.BaseDialogBuilder
+import com.hippo.ehviewer.widget.ContentLayout
+import com.hippo.ehviewer.widget.FabLayout
+import com.hippo.ehviewer.widget.FabLayout.OnClickFabListener
+import com.hippo.ehviewer.widget.FabLayout.OnExpandListener
 import com.hippo.ehviewer.widget.GalleryInfoContentHelper
+import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
+import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView.CustomChoiceListener
+import com.hippo.ehviewer.widget.easyrecyclerview.FastScroller.OnDragHandlerListener
 import com.hippo.util.getParcelableCompat
-import com.hippo.widget.ContentLayout
-import com.hippo.widget.FabLayout
-import com.hippo.widget.FabLayout.OnClickFabListener
-import com.hippo.widget.FabLayout.OnExpandListener
 import com.hippo.yorozuya.ObjectUtils
 import com.hippo.yorozuya.SimpleHandler
 import com.hippo.yorozuya.ViewUtils
@@ -229,7 +229,8 @@ class FavoritesScene :
         updateSearchBar()
         updateJumpFab()
         val colorID = theme.resolveColor(com.google.android.material.R.attr.colorOnSurface)
-        mActionFabDrawable = AddDeleteDrawable(context, colorID)
+        mActionFabDrawable =
+            AddDeleteDrawable(context, colorID)
         mFabLayout!!.primaryFab!!.setImageDrawable(mActionFabDrawable)
         mFabLayout!!.setExpanded(expanded = false, animation = false)
         mFabLayout!!.setAutoCancel(true)

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

@@ -24,13 +24,13 @@ import androidx.annotation.IntDef
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ItemDecoration
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.hippo.easyrecyclerview.MarginItemDecoration
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager
-import com.hippo.widget.recyclerview.STRATEGY_MIN_SIZE
-import com.hippo.widget.recyclerview.STRATEGY_SUITABLE_SIZE
+import com.hippo.ehviewer.widget.easyrecyclerview.MarginItemDecoration
+import com.hippo.ehviewer.widget.recyclerview.AutoStaggeredGridLayoutManager
+import com.hippo.ehviewer.widget.recyclerview.STRATEGY_MIN_SIZE
+import com.hippo.ehviewer.widget.recyclerview.STRATEGY_SUITABLE_SIZE
 
 abstract class GalleryAdapter(
     private val mResources: Resources,

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

@@ -60,9 +60,6 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.hippo.app.BaseDialogBuilder
-import com.hippo.app.EditTextDialogBuilder
-import com.hippo.easyrecyclerview.EasyRecyclerView
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.WindowInsetsAnimationHelper
 import com.hippo.ehviewer.client.EhEngine
@@ -78,17 +75,20 @@ import com.hippo.ehviewer.ui.jumpToReaderByPage
 import com.hippo.ehviewer.ui.navWithUrl
 import com.hippo.ehviewer.ui.openBrowser
 import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs
-import com.hippo.text.URLImageGetter
+import com.hippo.ehviewer.widget.BaseDialogBuilder
+import com.hippo.ehviewer.widget.EditTextDialogBuilder
+import com.hippo.ehviewer.widget.FabLayout
+import com.hippo.ehviewer.widget.LinkifyTextView
+import com.hippo.ehviewer.widget.ObservedTextView
+import com.hippo.ehviewer.widget.URLImageGetter
+import com.hippo.ehviewer.widget.ViewTransition
+import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
 import com.hippo.util.ExceptionUtils
 import com.hippo.util.ReadableTime
 import com.hippo.util.TextUrl
 import com.hippo.util.addTextToClipboard
 import com.hippo.util.getParcelableCompat
 import com.hippo.util.toBBCode
-import com.hippo.view.ViewTransition
-import com.hippo.widget.FabLayout
-import com.hippo.widget.LinkifyTextView
-import com.hippo.widget.ObservedTextView
 import com.hippo.yorozuya.AnimationUtils
 import com.hippo.yorozuya.SimpleAnimatorListener
 import com.hippo.yorozuya.StringUtils
@@ -276,7 +276,8 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
         mFab!!.setOnClickListener(this)
         addAboveSnackView(mEditPanel)
         addAboveSnackView(mFabLayout)
-        mViewTransition = ViewTransition(mRecyclerView, tip)
+        mViewTransition =
+            ViewTransition(mRecyclerView, tip)
         updateView(false)
         return view
     }

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

@@ -116,9 +116,6 @@ import coil.annotation.ExperimentalCoilApi
 import coil.imageLoader
 import com.google.android.material.progressindicator.CircularProgressIndicator
 import com.google.android.material.snackbar.Snackbar
-import com.hippo.app.BaseDialogBuilder
-import com.hippo.app.CheckBoxDialogBuilder
-import com.hippo.app.EditTextDialogBuilder
 import com.hippo.ehviewer.EhApplication.Companion.galleryDetailCache
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
@@ -162,17 +159,20 @@ import com.hippo.ehviewer.ui.widget.EhAsyncPreview
 import com.hippo.ehviewer.ui.widget.GalleryDetailHeaderCard
 import com.hippo.ehviewer.ui.widget.GalleryDetailRating
 import com.hippo.ehviewer.ui.widget.setMD3Content
+import com.hippo.ehviewer.widget.BaseDialogBuilder
+import com.hippo.ehviewer.widget.CheckBoxDialogBuilder
+import com.hippo.ehviewer.widget.EditTextDialogBuilder
 import com.hippo.ehviewer.widget.GalleryRatingBar
 import com.hippo.ehviewer.widget.GalleryRatingBar.OnUserRateListener
-import com.hippo.text.URLImageGetter
+import com.hippo.ehviewer.widget.ObservedTextView
+import com.hippo.ehviewer.widget.URLImageGetter
+import com.hippo.ehviewer.widget.recyclerview.calculateSuitableSpanCount
 import com.hippo.util.AppHelper
 import com.hippo.util.ExceptionUtils
 import com.hippo.util.ReadableTime
 import com.hippo.util.addTextToClipboard
 import com.hippo.util.getParcelableCompat
 import com.hippo.util.getSystemService
-import com.hippo.widget.ObservedTextView
-import com.hippo.widget.recyclerview.calculateSuitableSpanCount
 import com.hippo.yorozuya.FileUtils
 import com.hippo.yorozuya.ViewUtils
 import com.hippo.yorozuya.collect.IntList

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

@@ -52,11 +52,6 @@ import com.google.android.material.datepicker.DateValidatorPointBackward
 import com.google.android.material.datepicker.DateValidatorPointForward
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.hippo.app.BaseDialogBuilder
-import com.hippo.app.EditTextDialogBuilder
-import com.hippo.drawable.AddDeleteDrawable
-import com.hippo.easyrecyclerview.EasyRecyclerView
-import com.hippo.easyrecyclerview.FastScroller.OnDragHandlerListener
 import com.hippo.ehviewer.EhApplication.Companion.favouriteStatusRouter
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.FavouriteStatusRouter
@@ -88,14 +83,19 @@ import com.hippo.ehviewer.ui.CommonOperations
 import com.hippo.ehviewer.ui.addToFavorites
 import com.hippo.ehviewer.ui.dialog.SelectItemWithIconAdapter
 import com.hippo.ehviewer.ui.removeFromFavorites
+import com.hippo.ehviewer.widget.AddDeleteDrawable
+import com.hippo.ehviewer.widget.BaseDialogBuilder
+import com.hippo.ehviewer.widget.BringOutTransition
+import com.hippo.ehviewer.widget.EditTextDialogBuilder
+import com.hippo.ehviewer.widget.FabLayout
+import com.hippo.ehviewer.widget.FabLayout.OnClickFabListener
+import com.hippo.ehviewer.widget.FabLayout.OnExpandListener
 import com.hippo.ehviewer.widget.GalleryInfoContentHelper
 import com.hippo.ehviewer.widget.SearchLayout
+import com.hippo.ehviewer.widget.ViewTransition
+import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
+import com.hippo.ehviewer.widget.easyrecyclerview.FastScroller.OnDragHandlerListener
 import com.hippo.util.getParcelableCompat
-import com.hippo.view.BringOutTransition
-import com.hippo.view.ViewTransition
-import com.hippo.widget.FabLayout
-import com.hippo.widget.FabLayout.OnClickFabListener
-import com.hippo.widget.FabLayout.OnExpandListener
 import com.hippo.yorozuya.AnimationUtils
 import com.hippo.yorozuya.SimpleAnimatorListener
 import com.hippo.yorozuya.StringUtils
@@ -359,7 +359,10 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
         container!!.addView(binding.fabLayout)
         val paddingTopSB = resources.getDimensionPixelOffset(R.dimen.gallery_padding_top_search_bar)
         val paddingBottomFab = resources.getDimensionPixelOffset(R.dimen.gallery_padding_bottom_fab)
-        mViewTransition = BringOutTransition(binding.contentLayout, binding.searchLayout)
+        mViewTransition = BringOutTransition(
+            binding.contentLayout,
+            binding.searchLayout,
+        )
         mHelper = GalleryListHelper()
         binding.contentLayout.setHelper(mHelper!!)
         binding.contentLayout.fastScroller.setOnDragHandlerListener(this)
@@ -397,7 +400,8 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
         binding.fabLayout.addOnExpandListener(this)
         addAboveSnackView(binding.fabLayout)
         val colorID = theme.resolveColor(com.google.android.material.R.attr.colorOnSurface)
-        mActionFabDrawable = AddDeleteDrawable(context, colorID)
+        mActionFabDrawable =
+            AddDeleteDrawable(context, colorID)
         binding.fabLayout.primaryFab!!.setImageDrawable(mActionFabDrawable)
         mSearchFab!!.setOnClickListener { onApplySearch() }
 

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

@@ -58,8 +58,8 @@ import com.hippo.ehviewer.ui.navToReader
 import com.hippo.ehviewer.ui.widget.EhPreviewItem
 import com.hippo.ehviewer.ui.widget.rememberDialogState
 import com.hippo.ehviewer.ui.widget.setMD3Content
+import com.hippo.ehviewer.widget.recyclerview.calculateSuitableSpanCount
 import com.hippo.util.getParcelableCompat
-import com.hippo.widget.recyclerview.calculateSuitableSpanCount
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import moe.tarsin.coroutines.runSuspendCatching

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

@@ -64,7 +64,6 @@ import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemContentType
 import androidx.paging.compose.itemKey
 import arrow.core.partially1
-import com.hippo.app.BaseDialogBuilder
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
@@ -80,6 +79,7 @@ import com.hippo.ehviewer.ui.widget.Deferred
 import com.hippo.ehviewer.ui.widget.GalleryInfoListItem
 import com.hippo.ehviewer.ui.widget.rememberDialogState
 import com.hippo.ehviewer.ui.widget.setMD3Content
+import com.hippo.ehviewer.widget.BaseDialogBuilder
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.system.pxToDp

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

@@ -25,8 +25,8 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhEngine
+import com.hippo.ehviewer.widget.ViewTransition
 import com.hippo.util.ExceptionUtils
-import com.hippo.view.ViewTransition
 import com.hippo.yorozuya.ViewUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
@@ -153,7 +153,8 @@ class ProgressScene : BaseScene(), View.OnClickListener {
         mTip!!.setCompoundDrawables(null, drawable, null, null)
         mTip!!.setOnClickListener(this)
         mTip!!.text = mError
-        mViewTransition = ViewTransition(progress, mTip)
+        mViewTransition =
+            ViewTransition(progress, mTip)
         if (mValid) {
             mViewTransition!!.showView(0, false)
         } else {

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

@@ -19,11 +19,11 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.search.SearchView
 import com.google.android.material.search.SearchView.TransitionListener
 import com.google.android.material.shape.MaterialShapeDrawable
-import com.hippo.app.BaseDialogBuilder
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.databinding.SceneSearchbarBinding
+import com.hippo.ehviewer.widget.BaseDialogBuilder
 import com.hippo.ehviewer.widget.SearchDatabase
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.flow.Flow

app/src/main/java/com/hippo/ehviewer/widget/AddDeleteDrawable.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.drawable;
+package com.hippo.ehviewer.widget;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;

app/src/main/java/com/hippo/ehviewer/widget/BaseDialogBuilder.kt

@@ -1,4 +1,4 @@
-package com.hippo.app
+package com.hippo.ehviewer.widget
 
 import android.content.Context
 import com.google.android.material.dialog.MaterialAlertDialogBuilder

app/src/main/java/com/hippo/ehviewer/widget/BringOutTransition.java

@@ -14,15 +14,12 @@
  * limitations under the License.
  */
 
-package com.hippo.view;
+package com.hippo.ehviewer.widget;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.view.View;
 
-import com.hippo.ehviewer.widget.SearchLayout;
-import com.hippo.widget.ContentLayout;
-
 public class BringOutTransition extends ViewTransition {
 
     public BringOutTransition(ContentLayout contentLayout, SearchLayout mSearchLayout) {

app/src/main/java/com/hippo/ehviewer/widget/CheckBoxDialogBuilder.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.app
+package com.hippo.ehviewer.widget
 
 import android.content.Context
 import android.view.LayoutInflater

app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.widget
+package com.hippo.ehviewer.widget
 
 import android.app.Activity
 import android.content.Context
@@ -27,15 +27,14 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
-import com.hippo.easyrecyclerview.HandlerDrawable
-import com.hippo.easyrecyclerview.LayoutManagerUtils
-import com.hippo.easyrecyclerview.LayoutManagerUtils.OnScrollToPositionListener
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.databinding.WidgetContentLayoutBinding
+import com.hippo.ehviewer.widget.ViewTransition.OnShowViewListener
+import com.hippo.ehviewer.widget.easyrecyclerview.HandlerDrawable
+import com.hippo.ehviewer.widget.easyrecyclerview.LayoutManagerUtils
+import com.hippo.ehviewer.widget.easyrecyclerview.LayoutManagerUtils.OnScrollToPositionListener
 import com.hippo.util.ExceptionUtils
 import com.hippo.util.getParcelableCompat
-import com.hippo.view.ViewTransition
-import com.hippo.view.ViewTransition.OnShowViewListener
 import com.hippo.yorozuya.IntIdGenerator
 import com.hippo.yorozuya.LayoutUtils
 import com.hippo.yorozuya.collect.IntList
@@ -241,7 +240,11 @@ class ContentLayout(context: Context, attrs: AttributeSet? = null) : FrameLayout
             val drawable = ContextCompat.getDrawable(context, R.drawable.big_sad_pandroid)!!
             drawable.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
             binding.tip.setCompoundDrawables(null, drawable, null, null)
-            mViewTransition = ViewTransition(binding.contentView, binding.progress, binding.tip)
+            mViewTransition = ViewTransition(
+                binding.contentView,
+                binding.progress,
+                binding.tip,
+            )
             mViewTransition.setOnShowViewListener(this)
             binding.recyclerView.addOnScrollListener(mOnScrollListener)
             binding.refreshLayout.setOnRefreshListener(mOnRefreshListener)

app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java

@@ -26,7 +26,6 @@ import android.webkit.WebView;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.hippo.app.BaseDialogBuilder;
 import com.hippo.ehviewer.R;
 
 public class DialogWebChromeClient extends WebChromeClient {

app/src/main/java/com/hippo/ehviewer/widget/DrawerView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.widget;
+package com.hippo.ehviewer.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;

app/src/main/java/com/hippo/ehviewer/widget/EditTextDialogBuilder.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.app
+package com.hippo.ehviewer.widget
 
 import android.content.Context
 import android.content.DialogInterface

app/src/main/java/com/hippo/ehviewer/widget/FabLayout.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.widget
+package com.hippo.ehviewer.widget
 
 import android.animation.Animator
 import android.content.Context

app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt

@@ -21,7 +21,7 @@ import android.os.Parcelable
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.FavouriteStatusRouter
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.widget.ContentLayout.ContentHelper
+import com.hippo.ehviewer.widget.ContentLayout.ContentHelper
 import com.hippo.yorozuya.IntIdGenerator
 import java.time.Instant
 import java.time.ZoneOffset

app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.kt

@@ -34,7 +34,7 @@ import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.image.Image
+import com.hippo.ehviewer.image.Image
 import com.hippo.unifile.UniFile
 import com.hippo.util.pickVisualMedia
 import kotlinx.coroutines.launch

app/src/main/java/com/hippo/ehviewer/widget/IndicatingListView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.widget;
+package com.hippo.ehviewer.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;

app/src/main/java/com/hippo/ehviewer/widget/LinkifyTextView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.widget;
+package com.hippo.ehviewer.widget;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

app/src/main/java/com/hippo/ehviewer/widget/ListCheckBoxDialogBuilder.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.app
+package com.hippo.ehviewer.widget
 
 import android.content.Context
 import android.view.LayoutInflater

app/src/main/java/com/hippo/ehviewer/widget/ObservedTextView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.widget;
+package com.hippo.ehviewer.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;

app/src/main/java/com/hippo/ehviewer/widget/RadioGridGroup.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.widget;
+package com.hippo.ehviewer.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;

app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt

@@ -40,15 +40,13 @@ import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
-import com.hippo.app.BaseDialogBuilder
-import com.hippo.easyrecyclerview.EasyRecyclerView
-import com.hippo.easyrecyclerview.MarginItemDecoration
-import com.hippo.easyrecyclerview.SimpleHolder
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.widget.RadioGridGroup
+import com.hippo.ehviewer.widget.easyrecyclerview.EasyRecyclerView
+import com.hippo.ehviewer.widget.easyrecyclerview.MarginItemDecoration
+import com.hippo.ehviewer.widget.easyrecyclerview.SimpleHolder
 import com.hippo.yorozuya.NumberUtils
 import com.hippo.yorozuya.ViewUtils
 

app/src/main/java/com/hippo/ehviewer/widget/SimpleGridLayout.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.widget;
+package com.hippo.ehviewer.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;

app/src/main/java/com/hippo/ehviewer/widget/URLImageGetter.kt

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.text
+package com.hippo.ehviewer.widget
 
 import android.graphics.drawable.Drawable
 import android.text.Html.ImageGetter
-import com.hippo.drawable.UnikeryDrawable
-import com.hippo.widget.ObservedTextView
 
 class URLImageGetter(
     private val mTextView: ObservedTextView,

app/src/main/java/com/hippo/ehviewer/widget/UnikeryDrawable.kt

@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.drawable
+package com.hippo.ehviewer.widget
 
 import android.graphics.drawable.AnimatedImageDrawable
 import android.graphics.drawable.Drawable
 import coil.imageLoader
 import coil.request.ImageRequest
 import com.hippo.ehviewer.coil.imageRequest
-import com.hippo.widget.ObservedTextView
 
 class UnikeryDrawable(private val mTextView: ObservedTextView, url: String) :
     WrapDrawable(),

app/src/main/java/com/hippo/ehviewer/widget/ViewTransition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.view;
+package com.hippo.ehviewer.widget;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;

app/src/main/java/com/hippo/ehviewer/widget/WrapDrawable.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.drawable;
+package com.hippo.ehviewer.widget;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;

app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/EasyRecyclerView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.easyrecyclerview;
+package com.hippo.ehviewer.widget.easyrecyclerview;
 
 import android.content.Context;
 import android.os.Parcel;

app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/FastScroller.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.easyrecyclerview;
+package com.hippo.ehviewer.widget.easyrecyclerview;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;

app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/HandlerDrawable.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.easyrecyclerview;
+package com.hippo.ehviewer.widget.easyrecyclerview;
 
 import android.graphics.Canvas;
 import android.graphics.Color;

app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/LayoutManagerUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.easyrecyclerview;
+package com.hippo.ehviewer.widget.easyrecyclerview;
 
 import android.content.Context;
 import android.graphics.PointF;

app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/MarginItemDecoration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.easyrecyclerview;
+package com.hippo.ehviewer.widget.easyrecyclerview;
 
 import android.graphics.Rect;
 import android.view.View;

app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleHolder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.easyrecyclerview;
+package com.hippo.ehviewer.widget.easyrecyclerview;
 
 import android.view.View;
 

app/src/main/java/com/hippo/ehviewer/widget/easyrecyclerview/SimpleSmoothScroller.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.easyrecyclerview;
+package com.hippo.ehviewer.widget.easyrecyclerview;
 
 import android.content.Context;
 

app/src/main/java/com/hippo/ehviewer/widget/preference/DialogPreference.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.preference;
+package com.hippo.ehviewer.widget.preference;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -37,7 +37,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.preference.Preference;
 
-import com.hippo.app.BaseDialogBuilder;
+import com.hippo.ehviewer.widget.BaseDialogBuilder;
 import com.hippo.ehviewer.R;
 
 /**

app/src/main/java/com/hippo/ehviewer/widget/preference/MessagePreference.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.preference;
+package com.hippo.ehviewer.widget.preference;
 
 import android.content.Context;
 import android.content.res.TypedArray;

app/src/main/java/com/hippo/ehviewer/widget/preference/UrlPreference.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.preference
+package com.hippo.ehviewer.widget.preference
 
 import android.content.Context
 import android.util.AttributeSet

app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefresh.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.widget.pullrefresh
+package com.hippo.ehviewer.widget.pullrefresh
 
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset

app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicator.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.widget.pullrefresh
+package com.hippo.ehviewer.widget.pullrefresh
 
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.core.LinearEasing

app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshIndicatorTransform.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.widget.pullrefresh
+package com.hippo.ehviewer.widget.pullrefresh
 
 import androidx.compose.animation.core.LinearOutSlowInEasing
 import androidx.compose.ui.Modifier

app/src/main/java/com/hippo/ehviewer/widget/pullrefresh/PullRefreshState.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.widget.pullrefresh
+package com.hippo.ehviewer.widget.pullrefresh
 
 import androidx.compose.animation.core.animate
 import androidx.compose.foundation.MutatorMutex

app/src/main/java/com/hippo/ehviewer/widget/recyclerview/AutoStaggeredGridLayoutManager.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.widget.recyclerview
+package com.hippo.ehviewer.widget.recyclerview
 
 import android.view.View
 import androidx.compose.runtime.Composable