Move :core to :core:common

core/common/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    namespace = "eu.kanade.tachiyomi.core"
+    namespace = "eu.kanade.tachiyomi.core.common"
 
     kotlinOptions {
         freeCompilerArgs += listOf(

core/common/src/main/kotlin/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt

@@ -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
 
 class SecurityPreferences(

core/common/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt

@@ -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.

core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkPreferences.kt

@@ -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,

core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt

@@ -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

core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt

@@ -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

core/common/src/main/kotlin/eu/kanade/tachiyomi/util/system/DeviceUtil.kt

@@ -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 {
 

core/common/src/main/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt

@@ -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.

core/common/src/main/kotlin/eu/kanade/tachiyomi/util/system/WebViewUtil.kt

@@ -8,7 +8,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 {

core/common/src/main/kotlin/tachiyomi/core/common/Constants.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core
+package tachiyomi.core.common
 
 object Constants {
     const val URL_HELP = "https://mihon.app/docs/guides/troubleshooting/"

core/common/src/main/kotlin/tachiyomi/core/common/i18n/Localize.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.i18n
+package tachiyomi.core.common.i18n
 
 import android.content.Context
 import dev.icerock.moko.resources.PluralsResource

core/common/src/main/kotlin/tachiyomi/core/common/preference/AndroidPreference.kt

@@ -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,

core/common/src/main/kotlin/tachiyomi/core/common/preference/AndroidPreferenceStore.kt

@@ -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,

core/common/src/main/kotlin/tachiyomi/core/common/preference/CheckboxState.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.preference
+package tachiyomi.core.common.preference
 
 sealed class CheckboxState<T>(open val value: T) {
 

core/common/src/main/kotlin/tachiyomi/core/common/preference/InMemoryPreferenceStore.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.preference
+package tachiyomi.core.common.preference
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow

core/common/src/main/kotlin/tachiyomi/core/common/preference/Preference.kt

@@ -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_"

core/common/src/main/kotlin/tachiyomi/core/common/preference/PreferenceStore.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.preference
+package tachiyomi.core.common.preference
 
 interface PreferenceStore {
 

core/common/src/main/kotlin/tachiyomi/core/common/preference/TriState.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.preference
+package tachiyomi.core.common.preference
 
 enum class TriState {
     DISABLED, // Disable filter

core/common/src/main/kotlin/tachiyomi/core/common/storage/AndroidStorageFolderProvider.kt

@@ -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
 

core/common/src/main/kotlin/tachiyomi/core/common/storage/FolderProvider.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.storage
+package tachiyomi.core.common.storage
 
 import java.io.File
 

core/common/src/main/kotlin/tachiyomi/core/common/storage/UniFileExtensions.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.storage
+package tachiyomi.core.common.storage
 
 import com.hippo.unifile.UniFile
 

core/common/src/main/kotlin/tachiyomi/core/common/storage/UniFileTempFileManager.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.storage
+package tachiyomi.core.common.storage
 
 import android.content.Context
 import android.os.Build

core/common/src/main/kotlin/tachiyomi/core/common/util/lang/BooleanExtensions.kt

@@ -1,3 +1,3 @@
-package tachiyomi.core.util.lang
+package tachiyomi.core.common.util.lang
 
 fun Boolean.toLong() = if (this) 1L else 0L

core/common/src/main/kotlin/tachiyomi/core/common/util/lang/CoroutinesExtensions.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.util.lang
+package tachiyomi.core.common.util.lang
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart

core/common/src/main/kotlin/tachiyomi/core/common/util/lang/RxCoroutineBridge.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.util.lang
+package tachiyomi.core.common.util.lang
 
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.InternalCoroutinesApi

core/common/src/main/kotlin/tachiyomi/core/common/util/lang/SortUtil.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.util.lang
+package tachiyomi.core.common.util.lang
 
 import java.text.Collator
 import java.util.Locale

core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.util.system
+package tachiyomi.core.common.util.system
 
 import android.content.Context
 import android.content.res.Configuration

core/common/src/main/kotlin/tachiyomi/core/common/util/system/LogcatExtensions.kt

@@ -1,4 +1,4 @@
-package tachiyomi.core.util.system
+package tachiyomi.core.common.util.system
 
 import logcat.LogPriority
 import logcat.asLog