Refactor package layout

2023-07-12 07:48:21 +08:00
1 parent 19f9105640
commit 3609379284
@@ -17,8 +17,8 @@ package com.hippo.ehviewer

 import android.os.Environment
 import com.hippo.ehviewer.client.exception.ParseException
+import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.yorozuya.FileUtils
 import splitties.init.appCtx
 import java.io.File

@@ -17,9 +17,9 @@ package com.hippo.ehviewer

 import android.os.Build
 import android.os.Debug
+import com.hippo.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.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
@@ -45,8 +45,8 @@ import com.hippo.ehviewer.okhttp.httpClient
 import com.hippo.ehviewer.spider.cronetHttpClient
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
 import com.hippo.ehviewer.ui.lockObserver
+import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.yorozuya.FileUtils
 import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
@@ -22,8 +22,8 @@ import androidx.compose.runtime.setValue
 import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.EhApplication.Companion.nonCacheOkHttpClient
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.yorozuya.FileUtils
-import com.hippo.ehviewer.yorozuya.copyToFile
+import com.hippo.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.copyToFile
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -24,7 +24,7 @@ import com.hippo.ehviewer.client.ehUrl
 import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.ui.main.AdvanceTable
 import com.hippo.ehviewer.util.encodeUTF8
-import com.hippo.ehviewer.yorozuya.toIntOrDefault
+import com.hippo.ehviewer.util.toIntOrDefault
 import kotlinx.parcelize.Parcelize
 import java.io.UnsupportedEncodingException
 import java.net.URLDecoder
@@ -37,10 +37,10 @@ import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.client.exception.PiningException
 import com.hippo.ehviewer.client.getThumbKey
 import com.hippo.ehviewer.util.ExceptionUtils
-import com.hippo.ehviewer.yorozuya.toFloatOrDefault
-import com.hippo.ehviewer.yorozuya.toIntOrDefault
-import com.hippo.ehviewer.yorozuya.trimAnd
-import com.hippo.ehviewer.yorozuya.unescapeXml
+import com.hippo.ehviewer.util.toFloatOrDefault
+import com.hippo.ehviewer.util.toIntOrDefault
+import com.hippo.ehviewer.util.trimAnd
+import com.hippo.ehviewer.util.unescapeXml
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser

 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.yorozuya.toLongOrDefault
+import com.hippo.ehviewer.util.toLongOrDefault
 import java.util.regex.Pattern

 /**
@@ -22,7 +22,7 @@ import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
 import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
 import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.util.ExceptionUtils
-import com.hippo.ehviewer.yorozuya.toIntOrDefault
+import com.hippo.ehviewer.util.toIntOrDefault
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import java.util.regex.Pattern
@@ -17,7 +17,7 @@ package com.hippo.ehviewer.client.parser

 import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.client.parseAs
-import com.hippo.ehviewer.yorozuya.unescapeXml
+import com.hippo.ehviewer.util.unescapeXml
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser

 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.ehviewer.yorozuya.unescapeXml
+import com.hippo.ehviewer.util.unescapeXml
 import java.util.regex.Pattern

 object GalleryPageParser {
@@ -16,8 +16,8 @@
 package com.hippo.ehviewer.client.parser

 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.yorozuya.toIntOrDefault
-import com.hippo.ehviewer.yorozuya.toLongOrDefault
+import com.hippo.ehviewer.util.toIntOrDefault
+import com.hippo.ehviewer.util.toLongOrDefault
 import java.util.regex.Pattern

 /**
@@ -15,9 +15,9 @@
 */
 package com.hippo.ehviewer.client.parser

-import com.hippo.ehviewer.yorozuya.toIntOrDefault
-import com.hippo.ehviewer.yorozuya.toLongOrDefault
-import com.hippo.ehviewer.yorozuya.unescapeXml
+import com.hippo.ehviewer.util.toIntOrDefault
+import com.hippo.ehviewer.util.toLongOrDefault
+import com.hippo.ehviewer.util.unescapeXml
 import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
@@ -31,9 +31,9 @@ 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.ehviewer.yorozuya.ConcurrentPool
-import com.hippo.ehviewer.yorozuya.SimpleHandler
-import com.hippo.ehviewer.yorozuya.collect.LongList
+import com.hippo.ehviewer.util.ConcurrentPool
+import com.hippo.ehviewer.util.LongList
+import com.hippo.ehviewer.util.SimpleHandler
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.CoroutineScope
@@ -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.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.LongList
 import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.util.SimpleHandler
 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
@@ -23,7 +23,7 @@ import android.util.Log
 import com.hippo.ehviewer.Settings.archivePasswds
 import com.hippo.ehviewer.image.Image
 import com.hippo.ehviewer.image.rewriteGifSource
-import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.util.FileUtils
 import com.hippo.unifile.UniFile
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
@@ -21,7 +21,7 @@ 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.ehviewer.util.SimpleHandler
 import com.hippo.unifile.UniFile
 import java.util.Locale

@@ -31,8 +31,8 @@ import com.hippo.ehviewer.download.downloadLocation
 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.FileUtils
 import com.hippo.ehviewer.util.sendTo
-import com.hippo.ehviewer.yorozuya.FileUtils
 import com.hippo.unifile.UniFile
 import com.hippo.unifile.openOutputStream
 import okhttp3.MediaType.Companion.toMediaType
@@ -48,8 +48,8 @@ import com.hippo.ehviewer.download.downloadLocation
 import com.hippo.ehviewer.ui.legacy.ListCheckBoxDialogBuilder
 import com.hippo.ehviewer.ui.scene.BaseScene
 import com.hippo.ehviewer.ui.tools.DialogState
+import com.hippo.ehviewer.util.LongList
 import com.hippo.ehviewer.util.requestPermission
-import com.hippo.ehviewer.yorozuya.collect.LongList
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.lang.launchNow
@@ -17,7 +17,7 @@ import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.drakeet.drawer.FullDraggableHelper
 import com.google.android.material.snackbar.Snackbar.SnackbarLayout
-import com.hippo.ehviewer.yorozuya.dp2px
+import com.hippo.ehviewer.util.dp2px

 class AboveSnackerLayout : FrameLayout, AttachedBehavior, FullDraggableHelper.Callback {
    private val helper: FullDraggableHelper
@@ -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.ehviewer.util.AnimationUtils
+import com.hippo.ehviewer.util.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,
@@ -29,10 +29,10 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
 import com.google.android.material.math.MathUtils.dist
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.yorozuya.AnimationUtils
-import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener
-import com.hippo.ehviewer.yorozuya.SimpleHandler
-import com.hippo.ehviewer.yorozuya.dp2px
+import com.hippo.ehviewer.util.AnimationUtils
+import com.hippo.ehviewer.util.SimpleAnimatorListener
+import com.hippo.ehviewer.util.SimpleHandler
+import com.hippo.ehviewer.util.dp2px
 import kotlin.math.abs

 class FastScroller : View {
@@ -21,7 +21,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView.LayoutManager
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.google.android.material.math.MathUtils
-import com.hippo.ehviewer.yorozuya.SimpleHandler
+import com.hippo.ehviewer.util.SimpleHandler
 import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
 import kotlin.math.abs
@@ -93,9 +93,9 @@ import com.hippo.ehviewer.ui.main.requestOf
 import com.hippo.ehviewer.ui.navToReader
 import com.hippo.ehviewer.ui.setMD3Content
 import com.hippo.ehviewer.ui.tools.CropDefaults
+import com.hippo.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.LongList
 import com.hippo.ehviewer.util.sendTo
-import com.hippo.ehviewer.yorozuya.FileUtils
-import com.hippo.ehviewer.yorozuya.collect.LongList
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchNonCancellable
@@ -80,10 +80,10 @@ import com.hippo.ehviewer.ui.legacy.ViewTransition
 import com.hippo.ehviewer.ui.legacy.WindowInsetsAnimationHelper
 import com.hippo.ehviewer.ui.setMD3Content
 import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.SimpleHandler
 import com.hippo.ehviewer.util.getValue
 import com.hippo.ehviewer.util.lazyMut
 import com.hippo.ehviewer.util.setValue
-import com.hippo.ehviewer.yorozuya.SimpleHandler
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.lang.withIOContext
@@ -33,7 +33,7 @@ import com.hippo.ehviewer.ui.legacy.AutoStaggeredGridLayoutManager
 import com.hippo.ehviewer.ui.legacy.MarginItemDecoration
 import com.hippo.ehviewer.ui.legacy.STRATEGY_MIN_SIZE
 import com.hippo.ehviewer.ui.legacy.STRATEGY_SUITABLE_SIZE
-import com.hippo.ehviewer.yorozuya.dp2px
+import com.hippo.ehviewer.util.dp2px
 import splitties.init.appCtx

 private val diffCallback = object : DiffUtil.ItemCallback<GalleryInfo>() {
@@ -81,15 +81,15 @@ import com.hippo.ehviewer.ui.legacy.ViewTransition
 import com.hippo.ehviewer.ui.legacy.WindowInsetsAnimationHelper
 import com.hippo.ehviewer.ui.openBrowser
 import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs
+import com.hippo.ehviewer.util.AnimationUtils
 import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.IntList
 import com.hippo.ehviewer.util.ReadableTime
+import com.hippo.ehviewer.util.SimpleAnimatorListener
 import com.hippo.ehviewer.util.TextUrl
 import com.hippo.ehviewer.util.addTextToClipboard
 import com.hippo.ehviewer.util.getParcelableCompat
 import com.hippo.ehviewer.util.toBBCode
-import com.hippo.ehviewer.yorozuya.AnimationUtils
-import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener
-import com.hippo.ehviewer.yorozuya.collect.IntList
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import moe.tarsin.coroutines.runSuspendCatching
@@ -159,11 +159,11 @@ import com.hippo.ehviewer.ui.tools.FilledTertiaryIconToggleButton
 import com.hippo.ehviewer.ui.tools.GalleryDetailRating
 import com.hippo.ehviewer.util.AppHelper
 import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.IntList
 import com.hippo.ehviewer.util.ReadableTime
 import com.hippo.ehviewer.util.addTextToClipboard
 import com.hippo.ehviewer.util.getParcelableCompat
-import com.hippo.ehviewer.yorozuya.FileUtils
-import com.hippo.ehviewer.yorozuya.collect.IntList
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.CancellationException
@@ -96,13 +96,13 @@ import com.hippo.ehviewer.ui.setMD3Content
 import com.hippo.ehviewer.ui.settings.showNewVersion
 import com.hippo.ehviewer.ui.tools.DialogState
 import com.hippo.ehviewer.updater.AppUpdater
+import com.hippo.ehviewer.util.AnimationUtils
 import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.SimpleAnimatorListener
 import com.hippo.ehviewer.util.getParcelableCompat
 import com.hippo.ehviewer.util.getValue
 import com.hippo.ehviewer.util.lazyMut
 import com.hippo.ehviewer.util.setValue
-import com.hippo.ehviewer.yorozuya.AnimationUtils
-import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.lang.withIOContext
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util

 import android.view.animation.Interpolator
 import androidx.interpolator.view.animation.FastOutLinearInInterpolator
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util

 class ConcurrentPool<T>(size: Int) {
    private val mArray: Array<T?>
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util

 import java.io.File
 import java.util.Locale
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util

 import okhttp3.ResponseBody
 import java.io.File
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.yorozuya.collect
+package com.hippo.ehviewer.util

 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util

 import android.content.Context
 import android.util.TypedValue.COMPLEX_UNIT_DIP
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.yorozuya.collect
+package com.hippo.ehviewer.util

 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util

 import java.io.BufferedReader
 import java.io.FileReader
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util

 import android.animation.Animator

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

 import android.os.Handler
 import android.os.Looper
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.yorozuya
+package com.hippo.ehviewer.util

 import org.jsoup.parser.Parser