Move :core to :core:common

(cherry picked from commit aa498360db90350f2642e6320dc55e7d474df1fd)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/domain/base/BasePreferences.kt
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt
#	app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt
#	core/common/src/main/kotlin/eu/kanade/tachiyomi/util/storage/CbzCrypto.kt
#	data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt
#	data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt
#	domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt
#	domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt
#	settings.gradle.kts
#	source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt
#	source-local/src/androidMain/kotlin/tachiyomi/source/local/image/LocalCoverManager.kt
This commit is contained in:
AntsyLich
2024-01-29 15:11:28 +06:00
committed by Jobobby04
parent fec9f1f10c
commit dacfb8a740
346 changed files with 556 additions and 556 deletions
@@ -6,7 +6,7 @@ plugins {
}
android {
namespace = "eu.kanade.tachiyomi.core"
namespace = "eu.kanade.tachiyomi.core.common"
kotlinOptions {
freeCompilerArgs += listOf(
@@ -1,9 +1,9 @@
package eu.kanade.tachiyomi.core.security
import dev.icerock.moko.resources.StringResource
import tachiyomi.core.preference.Preference
import tachiyomi.core.preference.PreferenceStore
import tachiyomi.core.preference.getEnum
import tachiyomi.core.common.preference.Preference
import tachiyomi.core.common.preference.PreferenceStore
import tachiyomi.core.common.preference.getEnum
import tachiyomi.i18n.MR
import tachiyomi.i18n.sy.SYMR
@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.network
import android.content.Context
import app.cash.quickjs.QuickJs
import tachiyomi.core.util.lang.withIOContext
import tachiyomi.core.common.util.lang.withIOContext
/**
* Util for evaluating JavaScript in sources.
@@ -1,7 +1,7 @@
package eu.kanade.tachiyomi.network
import tachiyomi.core.preference.Preference
import tachiyomi.core.preference.PreferenceStore
import tachiyomi.core.common.preference.Preference
import tachiyomi.core.common.preference.PreferenceStore
class NetworkPreferences(
private val preferenceStore: PreferenceStore,
@@ -14,7 +14,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.Interceptor
import okhttp3.Request
import okhttp3.Response
import tachiyomi.core.i18n.stringResource
import tachiyomi.core.common.i18n.stringResource
import tachiyomi.i18n.MR
import java.io.IOException
import java.util.concurrent.CountDownLatch
@@ -13,7 +13,7 @@ import okhttp3.Headers
import okhttp3.Interceptor
import okhttp3.Request
import okhttp3.Response
import tachiyomi.core.util.lang.launchUI
import tachiyomi.core.common.util.lang.launchUI
import tachiyomi.i18n.MR
import java.util.Locale
import java.util.concurrent.CountDownLatch
@@ -14,7 +14,7 @@ import net.lingala.zip4j.ZipFile
import net.lingala.zip4j.model.ZipParameters
import net.lingala.zip4j.model.enums.AesKeyStrength
import net.lingala.zip4j.model.enums.EncryptionMethod
import tachiyomi.core.util.system.logcat
import tachiyomi.core.common.util.system.logcat
import uy.kohesive.injekt.injectLazy
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
@@ -6,7 +6,7 @@ import android.content.Context
import android.os.Build
import androidx.core.content.getSystemService
import logcat.LogPriority
import tachiyomi.core.util.system.logcat
import tachiyomi.core.common.util.system.logcat
object DeviceUtil {
@@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.util.system
import android.content.Context
import android.widget.Toast
import dev.icerock.moko.resources.StringResource
import tachiyomi.core.i18n.stringResource
import tachiyomi.core.common.i18n.stringResource
/**
* Display a toast in this context.
@@ -9,7 +9,7 @@ import android.webkit.WebSettings
import android.webkit.WebView
import kotlinx.coroutines.suspendCancellableCoroutine
import logcat.LogPriority
import tachiyomi.core.util.system.logcat
import tachiyomi.core.common.util.system.logcat
import kotlin.coroutines.resume
object WebViewUtil {
@@ -1,6 +1,6 @@
package exh.pref
import tachiyomi.core.preference.PreferenceStore
import tachiyomi.core.common.preference.PreferenceStore
class DelegateSourcePreferences(
private val preferenceStore: PreferenceStore,
@@ -1,4 +1,4 @@
package tachiyomi.core
package tachiyomi.core.common
object Constants {
const val URL_HELP = "https://mihon.app/docs/guides/troubleshooting/"
@@ -1,4 +1,4 @@
package tachiyomi.core.i18n
package tachiyomi.core.common.i18n
import android.content.Context
import dev.icerock.moko.resources.PluralsResource
@@ -1,4 +1,4 @@
package tachiyomi.core.preference
package tachiyomi.core.common.preference
import android.content.SharedPreferences
import android.content.SharedPreferences.Editor
@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onStart
import kotlinx.coroutines.flow.stateIn
import tachiyomi.core.util.system.logcat
import tachiyomi.core.common.util.system.logcat
sealed class AndroidPreference<T>(
private val preferences: SharedPreferences,
@@ -1,17 +1,17 @@
package tachiyomi.core.preference
package tachiyomi.core.common.preference
import android.content.Context
import android.content.SharedPreferences
import androidx.preference.PreferenceManager
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.callbackFlow
import tachiyomi.core.preference.AndroidPreference.BooleanPrimitive
import tachiyomi.core.preference.AndroidPreference.FloatPrimitive
import tachiyomi.core.preference.AndroidPreference.IntPrimitive
import tachiyomi.core.preference.AndroidPreference.LongPrimitive
import tachiyomi.core.preference.AndroidPreference.Object
import tachiyomi.core.preference.AndroidPreference.StringPrimitive
import tachiyomi.core.preference.AndroidPreference.StringSetPrimitive
import tachiyomi.core.common.preference.AndroidPreference.BooleanPrimitive
import tachiyomi.core.common.preference.AndroidPreference.FloatPrimitive
import tachiyomi.core.common.preference.AndroidPreference.IntPrimitive
import tachiyomi.core.common.preference.AndroidPreference.LongPrimitive
import tachiyomi.core.common.preference.AndroidPreference.Object
import tachiyomi.core.common.preference.AndroidPreference.StringPrimitive
import tachiyomi.core.common.preference.AndroidPreference.StringSetPrimitive
class AndroidPreferenceStore(
context: Context,
@@ -1,4 +1,4 @@
package tachiyomi.core.preference
package tachiyomi.core.common.preference
sealed class CheckboxState<T>(open val value: T) {
@@ -1,4 +1,4 @@
package tachiyomi.core.preference
package tachiyomi.core.common.preference
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.Flow
@@ -1,4 +1,4 @@
package tachiyomi.core.preference
package tachiyomi.core.common.preference
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.Flow
@@ -30,7 +30,7 @@ interface Preference<T> {
return key.startsWith(PRIVATE_PREFIX)
}
fun privateKey(key: String): String {
return "${PRIVATE_PREFIX}$key"
return "$PRIVATE_PREFIX$key"
}
/**
@@ -41,7 +41,7 @@ interface Preference<T> {
return key.startsWith(APP_STATE_PREFIX)
}
fun appStateKey(key: String): String {
return "${APP_STATE_PREFIX}$key"
return "$APP_STATE_PREFIX$key"
}
private const val APP_STATE_PREFIX = "__APP_STATE_"
@@ -1,4 +1,4 @@
package tachiyomi.core.preference
package tachiyomi.core.common.preference
interface PreferenceStore {
@@ -1,4 +1,4 @@
package tachiyomi.core.preference
package tachiyomi.core.common.preference
enum class TriState {
DISABLED, // Disable filter
@@ -1,9 +1,9 @@
package tachiyomi.core.storage
package tachiyomi.core.common.storage
import android.content.Context
import android.os.Environment
import androidx.core.net.toUri
import tachiyomi.core.i18n.stringResource
import tachiyomi.core.common.i18n.stringResource
import tachiyomi.i18n.MR
import java.io.File
@@ -1,4 +1,4 @@
package tachiyomi.core.storage
package tachiyomi.core.common.storage
import java.io.File
@@ -1,4 +1,4 @@
package tachiyomi.core.storage
package tachiyomi.core.common.storage
import com.hippo.unifile.UniFile
@@ -1,4 +1,4 @@
package tachiyomi.core.storage
package tachiyomi.core.common.storage
import android.content.Context
import android.os.Build
@@ -1,3 +1,3 @@
package tachiyomi.core.util.lang
package tachiyomi.core.common.util.lang
fun Boolean.toLong() = if (this) 1L else 0L
@@ -1,4 +1,4 @@
package tachiyomi.core.util.lang
package tachiyomi.core.common.util.lang
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.CoroutineStart
@@ -1,4 +1,4 @@
package tachiyomi.core.util.lang
package tachiyomi.core.common.util.lang
import kotlinx.coroutines.CancellableContinuation
import kotlinx.coroutines.CancellationException
@@ -1,4 +1,4 @@
package tachiyomi.core.util.lang
package tachiyomi.core.common.util.lang
import java.text.Collator
import java.util.Locale
@@ -1,4 +1,4 @@
package tachiyomi.core.util.system
package tachiyomi.core.common.util.system
import android.content.Context
import android.content.res.Configuration
@@ -1,4 +1,4 @@
package tachiyomi.core.util.system
package tachiyomi.core.common.util.system
import logcat.LogPriority
import logcat.asLog