Refactor package structure

app/src/main/java/com/hippo/ehviewer/AppConfig.java

@@ -24,9 +24,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.hippo.ehviewer.client.exception.ParseException;
-import com.hippo.util.ReadableTime;
-import com.hippo.yorozuya.FileUtils;
-import com.hippo.yorozuya.IOUtils;
+import com.hippo.ehviewer.util.ReadableTime;
+import com.hippo.ehviewer.yorozuya.FileUtils;
+import com.hippo.ehviewer.yorozuya.IOUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;

app/src/main/java/com/hippo/ehviewer/Crash.kt

@@ -17,9 +17,9 @@ package com.hippo.ehviewer
 
 import android.os.Build
 import android.os.Debug
-import com.hippo.util.ReadableTime
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.OSUtils
+import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.yorozuya.OSUtils
 import java.io.File
 import java.io.FileWriter
 import java.io.PrintWriter

app/src/main/java/com/hippo/ehviewer/EhApplication.kt

@@ -38,8 +38,8 @@ import com.hippo.ehviewer.dao.buildMainDB
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.legacy.cleanObsoleteCache
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
-import com.hippo.util.ReadableTime
-import com.hippo.yorozuya.FileUtils
+import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.yorozuya.FileUtils
 import eu.kanade.tachiyomi.core.preference.AndroidPreferenceStore
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.util.lang.launchIO

app/src/main/java/com/hippo/ehviewer/EhDB.kt

@@ -33,7 +33,7 @@ import com.hippo.ehviewer.dao.HistoryInfo
 import com.hippo.ehviewer.dao.LocalFavoriteInfo
 import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.util.sendTo
+import com.hippo.ehviewer.util.sendTo
 
 object EhDB {
     private const val CUR_DB_VER = 4

app/src/main/java/com/hippo/ehviewer/EhProxySelector.kt

@@ -19,8 +19,8 @@ import android.text.TextUtils
 import com.hippo.ehviewer.Settings.proxyIp
 import com.hippo.ehviewer.Settings.proxyPort
 import com.hippo.ehviewer.Settings.proxyType
-import com.hippo.network.InetValidator.isValidInetPort
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.network.InetValidator.isValidInetPort
+import com.hippo.ehviewer.util.ExceptionUtils
 import java.io.IOException
 import java.net.InetAddress
 import java.net.InetSocketAddress

app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.java

@@ -19,7 +19,7 @@ package com.hippo.ehviewer;
 import android.annotation.SuppressLint;
 
 import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.yorozuya.IntIdGenerator;
+import com.hippo.ehviewer.yorozuya.IntIdGenerator;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app/src/main/java/com/hippo/ehviewer/Hosts.java

@@ -29,8 +29,8 @@ import android.util.Pair;
 
 import androidx.annotation.Nullable;
 
-import com.hippo.database.MSQLiteBuilder;
-import com.hippo.util.SqlUtils;
+import com.hippo.ehviewer.database.MSQLiteBuilder;
+import com.hippo.ehviewer.util.SqlUtils;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

app/src/main/java/com/hippo/ehviewer/Settings.kt

@@ -23,9 +23,9 @@ import androidx.preference.PreferenceManager
 import com.hippo.ehviewer.EhApplication.Companion.application
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.ui.scene.GalleryListScene
+import com.hippo.ehviewer.yorozuya.LayoutUtils.dp2pix
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import com.hippo.unifile.UniFile
-import com.hippo.yorozuya.LayoutUtils.dp2pix
-import com.hippo.yorozuya.NumberUtils
 import java.util.Locale
 
 object Settings {

app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.kt

@@ -16,8 +16,8 @@
 package com.hippo.ehviewer.client
 
 import com.hippo.ehviewer.EhApplication
-import com.hippo.network.CookieDatabase
-import com.hippo.network.CookieSet
+import com.hippo.ehviewer.network.CookieDatabase
+import com.hippo.ehviewer.network.CookieSet
 import eu.kanade.tachiyomi.util.lang.launchIO
 import okhttp3.Cookie
 import okhttp3.CookieJar

app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt

@@ -45,7 +45,7 @@ import com.hippo.ehviewer.client.parser.VoteCommentParser
 import com.hippo.ehviewer.client.parser.VoteTagParser
 import com.hippo.ehviewer.dailycheck.showEventNotification
 import com.hippo.ehviewer.dailycheck.today
-import com.hippo.network.StatusCodeException
+import com.hippo.ehviewer.network.StatusCodeException
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import moe.tarsin.coroutines.runSuspendCatching

app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.kt

@@ -20,8 +20,8 @@ import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.EhApplication.Companion.nonCacheOkHttpClient
 import com.hippo.ehviewer.R
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.copyToFile
+import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.yorozuya.copyToFile
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt

@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client
 
 import com.hippo.ehviewer.Settings
-import com.hippo.network.UrlBuilder
+import com.hippo.ehviewer.network.UrlBuilder
 
 object EhUrl {
     const val SITE_E = 0

app/src/main/java/com/hippo/ehviewer/client/data/FavListUrlBuilder.kt

@@ -17,8 +17,8 @@ package com.hippo.ehviewer.client.data
 
 import android.os.Parcelable
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.network.UrlBuilder
-import com.hippo.util.encodeUTF8
+import com.hippo.ehviewer.network.UrlBuilder
+import com.hippo.ehviewer.util.encodeUTF8
 import kotlinx.parcelize.Parcelize
 
 @Parcelize

app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt

@@ -21,11 +21,11 @@ import androidx.annotation.IntDef
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.dao.QuickSearch
-import com.hippo.ehviewer.widget.AdvanceSearchTable
-import com.hippo.network.UrlBuilder
-import com.hippo.util.encodeUTF8
-import com.hippo.yorozuya.NumberUtils
-import com.hippo.yorozuya.StringUtils
+import com.hippo.ehviewer.network.UrlBuilder
+import com.hippo.ehviewer.ui.legacy.AdvanceSearchTable
+import com.hippo.ehviewer.util.encodeUTF8
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
 import kotlinx.parcelize.Parcelize
 import java.io.UnsupportedEncodingException
 import java.net.URLDecoder

app/src/main/java/com/hippo/ehviewer/client/parser/FavoritesParser.kt

@@ -19,8 +19,8 @@ import com.hippo.ehviewer.GetText.getString
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.JsoupUtils
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.JsoupUtils
 import org.jsoup.Jsoup
 
 object FavoritesParser {

app/src/main/java/com/hippo/ehviewer/client/parser/ForumsParser.kt

@@ -17,7 +17,7 @@ package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.util.ExceptionUtils
 import org.jsoup.Jsoup
 
 object ForumsParser {

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryApiParser.kt

@@ -18,7 +18,7 @@ package com.hippo.ehviewer.client.parser
 import com.hippo.ehviewer.client.EhUtils.getCategory
 import com.hippo.ehviewer.client.EhUtils.handleThumbUrlResolution
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import org.json.JSONObject
 
 object GalleryApiParser {

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt

@@ -34,12 +34,12 @@ import com.hippo.ehviewer.client.exception.OffensiveException
 import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.client.exception.PiningException
 import com.hippo.ehviewer.client.getPreviewThumbKey
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.JsoupUtils
-import com.hippo.yorozuya.NumberUtils
-import com.hippo.yorozuya.StringUtils
-import com.hippo.yorozuya.trimAnd
-import com.hippo.yorozuya.unescapeXml
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.JsoupUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
+import com.hippo.ehviewer.yorozuya.trimAnd
+import com.hippo.ehviewer.yorozuya.unescapeXml
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.kt

@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import java.util.regex.Pattern
 
 /**

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.kt

@@ -21,9 +21,9 @@ import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.JsoupUtils
-import com.hippo.yorozuya.NumberUtils
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.JsoupUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt

@@ -20,7 +20,7 @@ import android.os.Build
 import android.text.TextUtils
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.data.ListUrlBuilder
-import com.hippo.yorozuya.Utilities
+import com.hippo.ehviewer.yorozuya.Utilities
 import java.io.UnsupportedEncodingException
 import java.net.MalformedURLException
 import java.net.URL

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryMultiPageViewerPTokenParser.kt

@@ -18,7 +18,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.util.ExceptionUtils
 import org.json.JSONArray
 
 object GalleryMultiPageViewerPTokenParser {

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryNotAvailableParser.kt

@@ -17,8 +17,8 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.JsoupUtils
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.JsoupUtils
 import org.jsoup.Jsoup
 
 object GalleryNotAvailableParser {

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageApiParser.kt

@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.yorozuya.StringUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.regex.Matcher

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.kt

@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.yorozuya.StringUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
 import java.util.regex.Pattern
 
 object GalleryPageParser {

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageUrlParser.kt

@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import java.util.regex.Pattern
 
 /**

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryTokenApiParser.kt

@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.util.ExceptionUtils
 import org.json.JSONObject
 
 object GalleryTokenApiParser {

app/src/main/java/com/hippo/ehviewer/client/parser/ParserUtils.kt

@@ -15,8 +15,8 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.yorozuya.NumberUtils
-import com.hippo.yorozuya.StringUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
 import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter

app/src/main/java/com/hippo/ehviewer/client/parser/ProfileParser.kt

@@ -18,7 +18,7 @@ package com.hippo.ehviewer.client.parser
 import android.util.Log
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.util.ExceptionUtils
+import com.hippo.ehviewer.util.ExceptionUtils
 import org.jsoup.Jsoup
 
 object ProfileParser {

app/src/main/java/com/hippo/ehviewer/database/MSQLiteBuilder.kt

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

app/src/main/java/com/hippo/ehviewer/database/MSQLiteOpenHelper.kt

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.database
+package com.hippo.ehviewer.database
 
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
-import com.hippo.util.SqlUtils
+import com.hippo.ehviewer.util.SqlUtils
 
 internal class MSQLiteOpenHelper(
     context: Context?,

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

@@ -29,11 +29,11 @@ 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.yorozuya.ConcurrentPool
-import com.hippo.yorozuya.MathUtils
-import com.hippo.yorozuya.ObjectUtils
-import com.hippo.yorozuya.SimpleHandler
-import com.hippo.yorozuya.collect.LongList
+import com.hippo.ehviewer.yorozuya.ConcurrentPool
+import com.hippo.ehviewer.yorozuya.MathUtils
+import com.hippo.ehviewer.yorozuya.ObjectUtils
+import com.hippo.ehviewer.yorozuya.SimpleHandler
+import com.hippo.ehviewer.yorozuya.collect.LongList
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import java.util.LinkedList

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

@@ -36,11 +36,11 @@ import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.ui.MainActivity
 import com.hippo.ehviewer.ui.scene.DownloadsScene
-import com.hippo.util.ReadableTime
-import com.hippo.util.getParcelableExtraCompat
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.SimpleHandler
-import com.hippo.yorozuya.collect.LongList
+import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.util.getParcelableExtraCompat
+import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.yorozuya.SimpleHandler
+import com.hippo.ehviewer.yorozuya.collect.LongList
 
 class DownloadService : Service(), DownloadManager.DownloadListener {
     private var mNotifyManager: NotificationManagerCompat? = null

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

@@ -23,8 +23,8 @@ import android.util.Log
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.image.Image
 import com.hippo.ehviewer.image.rewriteGifSource
+import com.hippo.ehviewer.yorozuya.FileUtils
 import com.hippo.unifile.UniFile
-import com.hippo.yorozuya.FileUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers

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

@@ -21,8 +21,8 @@ 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.ehviewer.yorozuya.SimpleHandler
 import com.hippo.unifile.UniFile
-import com.hippo.yorozuya.SimpleHandler
 import java.util.Locale
 
 class EhPageLoader(private val mGalleryInfo: GalleryInfo) : PageLoader2(), OnSpiderListener {

app/src/main/java/com/hippo/ehviewer/legacy/SpiderInfoCompat.kt

@@ -1,7 +1,7 @@
-package com.hippo.compat
+package com.hippo.ehviewer.legacy
 
 import com.hippo.ehviewer.spider.SpiderInfo
-import com.hippo.yorozuya.IOUtils
+import com.hippo.ehviewer.yorozuya.IOUtils
 import java.io.InputStream
 
 fun readLegacySpiderInfo(inputStream: InputStream): SpiderInfo {

app/src/main/java/com/hippo/ehviewer/network/CookieDatabase.kt

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

app/src/main/java/com/hippo/ehviewer/network/CookieSet.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.network
+package com.hippo.ehviewer.network
 
 import okhttp3.Cookie
 import okhttp3.HttpUrl

app/src/main/java/com/hippo/ehviewer/network/InetValidator.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.network
+package com.hippo.ehviewer.network
 
 import java.util.regex.Pattern
 

app/src/main/java/com/hippo/ehviewer/network/StatusCodeException.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.network
+package com.hippo.ehviewer.network
 
 import android.util.SparseArray
 import com.hippo.ehviewer.EhApplication

app/src/main/java/com/hippo/ehviewer/network/UrlBuilder.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.network
+package com.hippo.ehviewer.network
 
 class UrlBuilder(private var mRootUrl: String) {
     private var mQueryMap: MutableMap<String, Any> = HashMap()

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

@@ -25,9 +25,9 @@ import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.ui.SettingsActivity
+import com.hippo.ehviewer.ui.legacy.preference.MessagePreference
 import com.hippo.ehviewer.ui.scene.BaseScene
-import com.hippo.ehviewer.widget.preference.MessagePreference
-import com.hippo.util.addTextToClipboard
+import com.hippo.ehviewer.util.addTextToClipboard
 import okhttp3.Cookie
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import java.util.LinkedList

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.ehviewer.widget.preference.DialogPreference
+import com.hippo.ehviewer.ui.legacy.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,10 +29,10 @@ 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.yorozuya.MathUtils
-import com.hippo.yorozuya.ViewUtils
+import com.hippo.ehviewer.network.InetValidator
+import com.hippo.ehviewer.ui.legacy.preference.DialogPreference
+import com.hippo.ehviewer.yorozuya.MathUtils
+import com.hippo.ehviewer.yorozuya.ViewUtils
 
 class ProxyPreference @JvmOverloads constructor(
     context: Context,

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.ehviewer.widget.preference.DialogPreference
+import com.hippo.ehviewer.ui.legacy.preference.DialogPreference
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

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

@@ -30,10 +30,10 @@ import com.hippo.ehviewer.coil.read
 import com.hippo.ehviewer.gallery.SUPPORT_IMAGE_EXTENSIONS
 import com.hippo.ehviewer.image.Image.CloseableSource
 import com.hippo.ehviewer.image.rewriteGifSource2
+import com.hippo.ehviewer.util.sendTo
+import com.hippo.ehviewer.yorozuya.FileUtils
 import com.hippo.unifile.UniFile
 import com.hippo.unifile.openOutputStream
-import com.hippo.util.sendTo
-import com.hippo.yorozuya.FileUtils
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
 import moe.tarsin.coroutines.runSuspendCatching

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

@@ -1,8 +1,8 @@
 package com.hippo.ehviewer.spider
 
 import coil.disk.DiskCache
-import com.hippo.compat.readLegacySpiderInfo
 import com.hippo.ehviewer.EhApplication
+import com.hippo.ehviewer.legacy.readLegacySpiderInfo
 import com.hippo.unifile.UniFile
 import com.hippo.unifile.openInputStream
 import com.hippo.unifile.openOutputStream

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

@@ -38,8 +38,8 @@ 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.ehviewer.image.Image
+import com.hippo.ehviewer.util.ExceptionUtils
 import com.hippo.unifile.UniFile
-import com.hippo.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

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

@@ -29,11 +29,11 @@ import com.hippo.ehviewer.client.EhEngine
 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.legacy.ListCheckBoxDialogBuilder
 import com.hippo.ehviewer.ui.scene.BaseScene
-import com.hippo.ehviewer.widget.ListCheckBoxDialogBuilder
+import com.hippo.ehviewer.util.requestPermission
+import com.hippo.ehviewer.yorozuya.collect.LongList
 import com.hippo.unifile.UniFile
-import com.hippo.util.requestPermission
-import com.hippo.yorozuya.collect.LongList
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.lang.launchNow
 import eu.kanade.tachiyomi.util.lang.withUIContext

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

@@ -40,7 +40,7 @@ import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.GalleryDetail
 import com.hippo.ehviewer.ui.login.LocalNavController
-import com.hippo.util.tellClipboardWithToast
+import com.hippo.ehviewer.util.tellClipboardWithToast
 
 private const val INDEX_URL = 2
 private const val INDEX_PARENT = 9

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

@@ -61,20 +61,20 @@ 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.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
 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.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.EditTextDialogBuilder
-import com.hippo.util.addTextToClipboard
-import com.hippo.util.getClipboardManager
-import com.hippo.util.getParcelableExtraCompat
-import com.hippo.util.getUrlFromClipboard
-import com.hippo.util.initLauncher
-import com.hippo.yorozuya.IOUtils
+import com.hippo.ehviewer.util.addTextToClipboard
+import com.hippo.ehviewer.util.getClipboardManager
+import com.hippo.ehviewer.util.getParcelableExtraCompat
+import com.hippo.ehviewer.util.getUrlFromClipboard
+import com.hippo.ehviewer.util.initLauncher
+import com.hippo.ehviewer.yorozuya.IOUtils
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.lang.withUIContext

app/src/main/java/com/hippo/ehviewer/ui/compose/Card.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.ColumnScope

app/src/main/java/com/hippo/ehviewer/ui/compose/DeferedComposable.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect

app/src/main/java/com/hippo/ehviewer/ui/compose/Dialog.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.annotation.StringRes
 import androidx.compose.material3.AlertDialog

app/src/main/java/com/hippo/ehviewer/ui/compose/Dummy.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.combinedClickable

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

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

app/src/main/java/com/hippo/ehviewer/ui/compose/GalleryDetailWidgets.kt

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

app/src/main/java/com/hippo/ehviewer/ui/compose/GalleryInfoCard.kt

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

app/src/main/java/com/hippo/ehviewer/ui/compose/RatingWidget.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer

app/src/main/java/com/hippo/ehviewer/ui/compose/Theme.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.widget
+package com.hippo.ehviewer.ui.compose
 
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent

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

@@ -34,12 +34,12 @@ import com.hippo.ehviewer.GetText
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
 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
-import com.hippo.yorozuya.IOUtils
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.LogCat
+import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.yorozuya.IOUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.delay

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

@@ -25,10 +25,10 @@ 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.legacy.BaseDialogBuilder
 import com.hippo.ehviewer.ui.scene.BaseScene
-import com.hippo.ehviewer.widget.BaseDialogBuilder
+import com.hippo.ehviewer.util.ExceptionUtils
 import com.hippo.unifile.UniFile
-import com.hippo.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchNonCancellable
 
 class DownloadFragment : BasePreferenceFragment() {

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

@@ -40,9 +40,9 @@ import com.google.android.material.textfield.TextInputLayout
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhFilter
 import com.hippo.ehviewer.dao.Filter
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.ViewTransition
-import com.hippo.yorozuya.ViewUtils
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.ViewTransition
+import com.hippo.ehviewer.yorozuya.ViewUtils
 
 class FilterFragment : BaseFragment() {
     private var mViewTransition: ViewTransition? = null

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

@@ -33,8 +33,8 @@ import com.google.android.material.textfield.TextInputLayout
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.Hosts
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.widget.BaseDialogBuilder
-import com.hippo.ehviewer.widget.ViewTransition
+import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
+import com.hippo.ehviewer.ui.legacy.ViewTransition
 
 class HostsFragment : BaseFragment(), View.OnClickListener {
     private var hosts: Hosts? = null

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

@@ -31,7 +31,7 @@ import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.databinding.ActivityWebviewBinding
-import com.hippo.ehviewer.widget.DialogWebChromeClient
+import com.hippo.ehviewer.ui.legacy.DialogWebChromeClient
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import rikka.core.res.resolveColor
 

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

@@ -38,8 +38,8 @@ import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhCookieStore.KEY_SETTINGS_PROFILE
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.databinding.ActivityWebviewBinding
+import com.hippo.ehviewer.ui.legacy.DialogWebChromeClient
 import com.hippo.ehviewer.ui.scene.BaseScene
-import com.hippo.ehviewer.widget.DialogWebChromeClient
 import eu.kanade.tachiyomi.util.lang.launchIO
 import okhttp3.Cookie
 import okhttp3.HttpUrl.Companion.toHttpUrl

app/src/main/java/com/hippo/ehviewer/ui/legacy/AboveSnackerLayout.java

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import static androidx.core.util.ObjectsCompat.requireNonNull;
 
@@ -22,7 +22,7 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 
 import com.drakeet.drawer.FullDraggableHelper;
 import com.google.android.material.snackbar.Snackbar;
-import com.hippo.yorozuya.LayoutUtils;
+import com.hippo.ehviewer.yorozuya.LayoutUtils;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

app/src/main/java/com/hippo/ehviewer/ui/legacy/AddDeleteDrawable.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ -30,7 +30,7 @@ import android.graphics.drawable.Drawable;
 import androidx.annotation.Keep;
 
 import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.MathUtils;
+import com.hippo.ehviewer.yorozuya.MathUtils;
 
 public class AddDeleteDrawable extends Drawable {
 

app/src/main/java/com/hippo/ehviewer/ui/legacy/AdvanceSearchTable.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import android.util.AttributeSet
@@ -28,7 +28,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import com.google.android.material.textfield.TextInputLayout
 import com.hippo.ehviewer.R
-import com.hippo.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
 
 class AdvanceSearchTable @JvmOverloads constructor(
     context: Context,

app/src/main/java/com/hippo/ehviewer/ui/legacy/BaseDialogBuilder.kt

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/BringOutTransition.java

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/CheckBoxDialogBuilder.kt

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/ContentLayout.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.app.Activity
 import android.content.Context
@@ -29,15 +29,15 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 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.yorozuya.IntIdGenerator
-import com.hippo.yorozuya.LayoutUtils
-import com.hippo.yorozuya.collect.IntList
+import com.hippo.ehviewer.ui.legacy.ViewTransition.OnShowViewListener
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.HandlerDrawable
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.LayoutManagerUtils
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.LayoutManagerUtils.OnScrollToPositionListener
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.getParcelableCompat
+import com.hippo.ehviewer.yorozuya.IntIdGenerator
+import com.hippo.ehviewer.yorozuya.LayoutUtils
+import com.hippo.ehviewer.yorozuya.collect.IntList
 import rikka.core.res.resolveColor
 
 class ContentLayout(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) {

app/src/main/java/com/hippo/ehviewer/ui/legacy/DialogWebChromeClient.java

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/DrawerView.java

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/EditTextDialogBuilder.kt

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/FabLayout.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.animation.Animator
 import android.content.Context
@@ -27,9 +27,9 @@ import androidx.activity.ComponentActivity
 import androidx.activity.OnBackPressedCallback
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.hippo.ehviewer.R
-import com.hippo.util.getParcelableCompat
-import com.hippo.yorozuya.AnimationUtils
-import com.hippo.yorozuya.SimpleAnimatorListener
+import com.hippo.ehviewer.util.getParcelableCompat
+import com.hippo.ehviewer.yorozuya.AnimationUtils
+import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener
 
 class FabLayout @JvmOverloads constructor(
     context: Context,

app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryInfoContentHelper.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -21,8 +21,8 @@ import android.os.Parcelable
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.FavouriteStatusRouter
 import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.widget.ContentLayout.ContentHelper
-import com.hippo.yorozuya.IntIdGenerator
+import com.hippo.ehviewer.ui.legacy.ContentLayout.ContentHelper
+import com.hippo.ehviewer.yorozuya.IntIdGenerator
 import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter

app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryRatingBar.java

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/ImageSearchLayout.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -35,8 +35,8 @@ import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.data.ListUrlBuilder
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.image.Image
+import com.hippo.ehviewer.util.pickVisualMedia
 import com.hippo.unifile.UniFile
-import com.hippo.util.pickVisualMedia
 import kotlinx.coroutines.launch
 
 class ImageSearchLayout @JvmOverloads constructor(

app/src/main/java/com/hippo/ehviewer/ui/legacy/IndicatingListView.java

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/LinkifyTextView.java

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/ListCheckBoxDialogBuilder.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -24,7 +24,7 @@ import android.widget.CheckBox
 import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
 import com.hippo.ehviewer.R
-import com.hippo.yorozuya.ViewUtils
+import com.hippo.ehviewer.yorozuya.ViewUtils
 
 class ListCheckBoxDialogBuilder(
     context: Context,

app/src/main/java/com/hippo/ehviewer/ui/legacy/ObservedTextView.java

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/RadioGridGroup.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -26,7 +26,7 @@ import android.widget.RadioButton;
 
 import androidx.annotation.IdRes;
 
-import com.hippo.yorozuya.ViewUtils;
+import com.hippo.ehviewer.yorozuya.ViewUtils;
 
 public class RadioGridGroup extends SimpleGridLayout {
 

app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchDatabase.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -25,7 +25,7 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.hippo.util.SqlUtils;
+import com.hippo.ehviewer.util.SqlUtils;
 
 import java.util.LinkedList;
 import java.util.List;

app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt

@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -44,11 +44,11 @@ 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.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
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.EasyRecyclerView
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.MarginItemDecoration
+import com.hippo.ehviewer.ui.legacy.easyrecyclerview.SimpleHolder
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.ViewUtils
 
 @SuppressLint("InflateParams")
 class SearchLayout @JvmOverloads constructor(

app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleGridLayout.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -23,8 +23,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.MathUtils;
-import com.hippo.yorozuya.ViewUtils;
+import com.hippo.ehviewer.yorozuya.MathUtils;
+import com.hippo.ehviewer.yorozuya.ViewUtils;
 
 /**
  * not scrollable

app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleRatingView.kt

@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.content.Context
 import android.util.AttributeSet
@@ -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.widget.GalleryListCardRating
+import com.hippo.ehviewer.ui.compose.GalleryListCardRating
 
 class SimpleRatingView @JvmOverloads constructor(
     context: Context,

app/src/main/java/com/hippo/ehviewer/ui/legacy/URLImageGetter.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.graphics.drawable.Drawable
 import android.text.Html.ImageGetter

app/src/main/java/com/hippo/ehviewer/ui/legacy/UnikeryDrawable.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.widget
+package com.hippo.ehviewer.ui.legacy
 
 import android.graphics.drawable.AnimatedImageDrawable
 import android.graphics.drawable.Drawable

app/src/main/java/com/hippo/ehviewer/ui/legacy/ViewTransition.java

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/WindowInsetsAnimationHelper.java

@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.hippo.ehviewer;
+package com.hippo.ehviewer.ui.legacy;
 
 import android.view.View;
 
@@ -24,7 +24,7 @@ import androidx.annotation.NonNull;
 import androidx.core.view.WindowInsetsAnimationCompat;
 import androidx.core.view.WindowInsetsCompat;
 
-import com.hippo.yorozuya.MathUtils;
+import com.hippo.ehviewer.yorozuya.MathUtils;
 
 import java.util.HashMap;
 import java.util.List;

app/src/main/java/com/hippo/ehviewer/ui/legacy/WrapDrawable.java

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/EasyRecyclerView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.easyrecyclerview;
+package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
 
 import android.content.Context;
 import android.os.Parcel;
@@ -31,7 +31,7 @@ import androidx.annotation.NonNull;
 import androidx.collection.LongSparseArray;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.hippo.yorozuya.NumberUtils;
+import com.hippo.ehviewer.yorozuya.NumberUtils;
 
 /**
  * Add setChoiceMode for RecyclerView

app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/FastScroller.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.easyrecyclerview;
+package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
@@ -33,11 +33,11 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.AnimationUtils;
-import com.hippo.yorozuya.LayoutUtils;
-import com.hippo.yorozuya.MathUtils;
-import com.hippo.yorozuya.SimpleAnimatorListener;
-import com.hippo.yorozuya.SimpleHandler;
+import com.hippo.ehviewer.yorozuya.AnimationUtils;
+import com.hippo.ehviewer.yorozuya.LayoutUtils;
+import com.hippo.ehviewer.yorozuya.MathUtils;
+import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener;
+import com.hippo.ehviewer.yorozuya.SimpleHandler;
 
 public class FastScroller extends View {
 

app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/HandlerDrawable.java

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

app/src/main/java/com/hippo/ehviewer/ui/legacy/easyrecyclerview/LayoutManagerUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hippo.ehviewer.widget.easyrecyclerview;
+package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
 
 import android.content.Context;
 import android.graphics.PointF;
@@ -23,8 +23,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
-import com.hippo.yorozuya.MathUtils;
-import com.hippo.yorozuya.SimpleHandler;
+import com.hippo.ehviewer.yorozuya.MathUtils;
+import com.hippo.ehviewer.yorozuya.SimpleHandler;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;