From d74f18012b881f46939d1e2e34b7f569e76cf4f3 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Wed, 12 Jul 2023 07:55:54 +0800
Subject: [PATCH] Refactor package layout

---
 .../java/com/hippo/ehviewer/EhApplication.kt  |  3 +++
 .../com/hippo/ehviewer/client/EhEngine.kt     |  2 +-
 .../hippo/ehviewer/client/EhTagDatabase.kt    |  2 +-
 .../ehviewer/download/DownloadManager.kt      |  2 +-
 .../com/hippo/ehviewer/ui/CommonOperations.kt |  2 +-
 .../com/hippo/ehviewer/ui/MainActivity.kt     |  2 +-
 .../hippo/ehviewer/ui/legacy/SearchLayout.kt  |  2 +-
 .../com/hippo/ehviewer/ui/main/GalleryInfo.kt |  2 +-
 .../ehviewer/ui/scene/GalleryDetailScene.kt   |  2 +-
 .../hippo/ehviewer/ui/settings/AboutScreen.kt |  2 +-
 .../ehviewer/ui/settings/AdvancedScreen.kt    |  2 +-
 .../ehviewer/ui/settings/DownloadScreen.kt    |  2 +-
 .../hippo/ehviewer/{ => util}/AppConfig.kt    |  4 +---
 .../com/hippo/ehviewer/{ => util}/Crash.kt    | 21 ++-----------------
 .../{ => util}/FavouriteStatusRouter.kt       |  3 ++-
 .../java/com/hippo/ehviewer/util/JSONUtils.kt | 13 ------------
 .../tachiyomi/ui/reader/ReaderActivity.kt     |  2 +-
 17 files changed, 20 insertions(+), 48 deletions(-)
 rename app/src/main/java/com/hippo/ehviewer/{ => util}/AppConfig.kt (95%)
 rename app/src/main/java/com/hippo/ehviewer/{ => util}/Crash.kt (78%)
 rename app/src/main/java/com/hippo/ehviewer/{ => util}/FavouriteStatusRouter.kt (95%)
 delete mode 100644 app/src/main/java/com/hippo/ehviewer/util/JSONUtils.kt

diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
index 36869f2d9..51a35efb9 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
@@ -45,6 +45,9 @@ 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.AppConfig
+import com.hippo.ehviewer.util.Crash
+import com.hippo.ehviewer.util.FavouriteStatusRouter
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime
 import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
index 12b521626..870c54a3d 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
@@ -18,7 +18,6 @@ package com.hippo.ehviewer.client
 import android.util.Log
 import arrow.fx.coroutines.parMap
 import arrow.fx.coroutines.parZip
-import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.GalleryInfo
@@ -47,6 +46,7 @@ import com.hippo.ehviewer.client.parser.VoteTagParser
 import com.hippo.ehviewer.dailycheck.showEventNotification
 import com.hippo.ehviewer.dailycheck.today
 import com.hippo.ehviewer.network.StatusCodeException
+import com.hippo.ehviewer.util.AppConfig
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import kotlinx.serialization.json.add
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.kt b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.kt
index 7305766db..a6fc2868a 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.kt
@@ -19,9 +19,9 @@ import android.content.Context
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 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.util.AppConfig
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.copyToFile
 import kotlinx.coroutines.CoroutineScope
diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt
index 6b3c571b8..e6113380a 100644
--- a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt
+++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt
@@ -19,7 +19,6 @@ import android.net.Uri
 import android.util.Log
 import android.util.SparseLongArray
 import com.google.android.material.math.MathUtils
-import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.GalleryInfo
@@ -31,6 +30,7 @@ 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.util.AppConfig
 import com.hippo.ehviewer.util.ConcurrentPool
 import com.hippo.ehviewer.util.LongList
 import com.hippo.ehviewer.util.SimpleHandler
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
index e141055e2..ac928d949 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
@@ -32,7 +32,6 @@ import androidx.compose.material3.Text
 import androidx.compose.ui.res.stringResource
 import androidx.core.content.ContextCompat
 import com.hippo.ehviewer.EhDB
-import com.hippo.ehviewer.FavouriteStatusRouter
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
@@ -48,6 +47,7 @@ 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.FavouriteStatusRouter
 import com.hippo.ehviewer.util.LongList
 import com.hippo.ehviewer.util.requestPermission
 import com.hippo.unifile.UniFile
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
index ed888e95f..807dca5d8 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
@@ -45,7 +45,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.ehviewer.AppConfig
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.Settings.launchPage
@@ -66,6 +65,7 @@ import com.hippo.ehviewer.ui.scene.GalleryListScene.Companion.toStartArgs
 import com.hippo.ehviewer.ui.scene.ProgressScene
 import com.hippo.ehviewer.ui.scene.navAnimated
 import com.hippo.ehviewer.ui.scene.navWithUrl
+import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.addTextToClipboard
 import com.hippo.ehviewer.util.getParcelableExtraCompat
 import com.hippo.ehviewer.util.getUrlFromClipboard
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
index 2537a9161..8656bd157 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
@@ -34,7 +34,6 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
-import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.ListUrlBuilder
@@ -44,6 +43,7 @@ import com.hippo.ehviewer.ui.main.AdvancedSearchOption
 import com.hippo.ehviewer.ui.main.ImageSearch
 import com.hippo.ehviewer.ui.main.NormalSearch
 import com.hippo.ehviewer.ui.main.SearchAdvanced
+import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.pickVisualMedia
 import com.hippo.unifile.UniFile
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryInfo.kt b/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryInfo.kt
index bd21a2199..c47c42c7e 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryInfo.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/main/GalleryInfo.kt
@@ -34,7 +34,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
-import com.hippo.ehviewer.FavouriteStatusRouter
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
@@ -42,6 +41,7 @@ import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.ui.tools.CrystalCard
 import com.hippo.ehviewer.ui.tools.ElevatedCard
 import com.hippo.ehviewer.ui.tools.GalleryListCardRating
+import com.hippo.ehviewer.util.FavouriteStatusRouter
 
 @Composable
 fun GalleryInfoListItem(
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
index f231e349f..17b5744e2 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
@@ -103,7 +103,6 @@ import coil.imageLoader
 import com.google.android.material.snackbar.Snackbar
 import com.hippo.ehviewer.EhApplication.Companion.galleryDetailCache
 import com.hippo.ehviewer.EhDB
-import com.hippo.ehviewer.FavouriteStatusRouter
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhCookieStore
@@ -159,6 +158,7 @@ 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.FavouriteStatusRouter
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.IntList
 import com.hippo.ehviewer.util.ReadableTime
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/AboutScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/AboutScreen.kt
index 4490e69ed..3fe851117 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/settings/AboutScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/AboutScreen.kt
@@ -29,7 +29,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.text.parseAsHtml
-import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.BuildConfig
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
@@ -41,6 +40,7 @@ import com.hippo.ehviewer.ui.tools.rememberDialogState
 import com.hippo.ehviewer.ui.tools.toAnnotatedString
 import com.hippo.ehviewer.updater.AppUpdater
 import com.hippo.ehviewer.updater.Release
+import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.ExceptionUtils
 import com.hippo.ehviewer.util.installPackage
 import eu.kanade.tachiyomi.util.lang.withUIContext
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt
index 80076d21d..e49907487 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt
@@ -29,7 +29,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.BuildConfig
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
@@ -38,6 +37,7 @@ import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.ui.LocalNavController
 import com.hippo.ehviewer.ui.tools.observed
+import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.ReadableTime
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt
index 8c9814bfa..564ebc106 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt
@@ -25,7 +25,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
@@ -41,6 +40,7 @@ import com.hippo.ehviewer.ui.keepNoMediaFileStatus
 import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
 import com.hippo.ehviewer.ui.tools.observed
 import com.hippo.ehviewer.ui.tools.rememberedAccessor
+import com.hippo.ehviewer.util.AppConfig
 import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.util.lang.launchNonCancellable
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/hippo/ehviewer/AppConfig.kt b/app/src/main/java/com/hippo/ehviewer/util/AppConfig.kt
similarity index 95%
rename from app/src/main/java/com/hippo/ehviewer/AppConfig.kt
rename to app/src/main/java/com/hippo/ehviewer/util/AppConfig.kt
index a22a2aa6f..afeda9a5d 100644
--- a/app/src/main/java/com/hippo/ehviewer/AppConfig.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/AppConfig.kt
@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer
+package com.hippo.ehviewer.util
 
 import android.os.Environment
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.ehviewer.util.FileUtils
-import com.hippo.ehviewer.util.ReadableTime
 import splitties.init.appCtx
 import java.io.File
 
diff --git a/app/src/main/java/com/hippo/ehviewer/Crash.kt b/app/src/main/java/com/hippo/ehviewer/util/Crash.kt
similarity index 78%
rename from app/src/main/java/com/hippo/ehviewer/Crash.kt
rename to app/src/main/java/com/hippo/ehviewer/util/Crash.kt
index e3eec9a79..a45ca1421 100644
--- a/app/src/main/java/com/hippo/ehviewer/Crash.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/Crash.kt
@@ -1,25 +1,8 @@
-/*
- * Copyright 2019 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hippo.ehviewer
+package com.hippo.ehviewer.util
 
 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.BuildConfig
 import java.io.File
 import java.io.FileWriter
 import java.io.PrintWriter
diff --git a/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.kt b/app/src/main/java/com/hippo/ehviewer/util/FavouriteStatusRouter.kt
similarity index 95%
rename from app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.kt
rename to app/src/main/java/com/hippo/ehviewer/util/FavouriteStatusRouter.kt
index b634edc67..433ef97cc 100644
--- a/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/FavouriteStatusRouter.kt
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer
+package com.hippo.ehviewer.util
 
+import com.hippo.ehviewer.EhDB
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
diff --git a/app/src/main/java/com/hippo/ehviewer/util/JSONUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/JSONUtils.kt
deleted file mode 100644
index a43442d51..000000000
--- a/app/src/main/java/com/hippo/ehviewer/util/JSONUtils.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hippo.ehviewer.util
-
-import org.json.JSONArray
-
-fun <T> JSONArray.iter() = object : Iterable<T> {
-    override fun iterator() = object : Iterator<T> {
-        var index = 0
-        override fun hasNext() = index != length()
-
-        @Suppress("UNCHECKED_CAST")
-        override fun next() = get(index++) as T
-    }
-}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index ce0755c62..cb6eead7b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -63,7 +63,6 @@ import androidx.core.view.WindowInsetsControllerCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.shape.MaterialShapeDrawable
-import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.BuildConfig
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhUrl
@@ -76,6 +75,7 @@ import com.hippo.ehviewer.image.Image
 import com.hippo.ehviewer.ui.EhActivity
 import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
 import com.hippo.ehviewer.ui.setMD3Content
+import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.ExceptionUtils
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.getParcelableCompat