admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move more things around

Browse Source 
(cherry picked from commit 1730dd6af1f5a9e6f8752a2350b1bd153262a751)

# Conflicts:
#	app/src/main/java/eu/kanade/data/source/SourcePagingSource.kt
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt
#	app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
#	app/src/main/java/eu/kanade/domain/manga/interactor/GetManga.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.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/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.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/more/MoreTab.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/HttpPageLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt
#	data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt
This commit is contained in:
arkon
2023-01-27 22:31:12 -05:00
committed by Jobobby04
parent a51c25bdcf
commit bd0eda0c65
222 changed files with 356 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt
+2 -2
View File
@@ -1,8 +1,8 @@
package eu.kanade.tachiyomi.core.security
import eu.kanade.tachiyomi.core.R
import eu.kanade.tachiyomi.core.preference.PreferenceStore
import eu.kanade.tachiyomi.core.preference.getEnum
import tachiyomi.core.preference.PreferenceStore
import tachiyomi.core.preference.getEnum
class SecurityPreferences(
private val preferenceStore: PreferenceStore,
core/src/main/java/eu/kanade/tachiyomi/network/JavaScriptEngine.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.network
import android.content.Context
import app.cash.quickjs.QuickJs
import eu.kanade.tachiyomi.util.lang.withIOContext
import tachiyomi.core.util.lang.withIOContext
/**
* Util for evaluating JavaScript in sources.
core/src/main/java/eu/kanade/tachiyomi/network/NetworkPreferences.kt
+2 -2
View File
@@ -1,7 +1,7 @@
package eu.kanade.tachiyomi.network
import eu.kanade.tachiyomi.core.preference.Preference
import eu.kanade.tachiyomi.core.preference.PreferenceStore
import tachiyomi.core.preference.Preference
import tachiyomi.core.preference.PreferenceStore
class NetworkPreferences(
private val preferenceStore: PreferenceStore,
core/src/main/java/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt
+1 -1
View File
@@ -7,7 +7,6 @@ import android.webkit.WebView
import android.widget.Toast
import eu.kanade.tachiyomi.core.R
import eu.kanade.tachiyomi.network.NetworkHelper
import eu.kanade.tachiyomi.util.lang.launchUI
import eu.kanade.tachiyomi.util.system.DeviceUtil
import eu.kanade.tachiyomi.util.system.WebViewUtil
import eu.kanade.tachiyomi.util.system.setDefaultSettings
@@ -16,6 +15,7 @@ import okhttp3.Headers
import okhttp3.Interceptor
import okhttp3.Request
import okhttp3.Response
import tachiyomi.core.util.lang.launchUI
import uy.kohesive.injekt.injectLazy
import java.util.Locale
import java.util.concurrent.CountDownLatch
core/src/main/java/eu/kanade/tachiyomi/util/system/DeviceUtil.kt
+1
View File
@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.util.system
import android.annotation.SuppressLint
import android.os.Build
import logcat.LogPriority
import tachiyomi.core.util.system.logcat
object DeviceUtil {
core/src/main/java/eu/kanade/tachiyomi/util/system/WebViewUtil.kt
+1
View File
@@ -7,6 +7,7 @@ import android.webkit.CookieManager
import android.webkit.WebSettings
import android.webkit.WebView
import logcat.LogPriority
import tachiyomi.core.util.system.logcat
object WebViewUtil {
const val SPOOF_PACKAGE_NAME = "org.chromium.chrome"
core/src/main/java/exh/pref/DelegateSourcePreferences.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package exh.pref
import eu.kanade.tachiyomi.core.preference.PreferenceStore
import tachiyomi.core.preference.PreferenceStore
class DelegateSourcePreferences(
private val preferenceStore: PreferenceStore,
core/src/main/java/eu/kanade/tachiyomi/core/preference/AndroidPreference.kt → core/src/main/java/tachiyomi/core/preference/AndroidPreference.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.core.preference
package tachiyomi.core.preference
import android.content.SharedPreferences
import android.content.SharedPreferences.Editor
core/src/main/java/eu/kanade/tachiyomi/core/preference/AndroidPreferenceStore.kt → core/src/main/java/tachiyomi/core/preference/AndroidPreferenceStore.kt
+8 -8
View File
@@ -1,17 +1,17 @@
package eu.kanade.tachiyomi.core.preference
package tachiyomi.core.preference
import android.content.Context
import android.content.SharedPreferences
import androidx.preference.PreferenceManager
import eu.kanade.tachiyomi.core.preference.AndroidPreference.BooleanPrimitive
import eu.kanade.tachiyomi.core.preference.AndroidPreference.FloatPrimitive
import eu.kanade.tachiyomi.core.preference.AndroidPreference.IntPrimitive
import eu.kanade.tachiyomi.core.preference.AndroidPreference.LongPrimitive
import eu.kanade.tachiyomi.core.preference.AndroidPreference.Object
import eu.kanade.tachiyomi.core.preference.AndroidPreference.StringPrimitive
import eu.kanade.tachiyomi.core.preference.AndroidPreference.StringSetPrimitive
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
class AndroidPreferenceStore(
context: Context,
core/src/main/java/eu/kanade/tachiyomi/core/preference/Preference.kt → core/src/main/java/tachiyomi/core/preference/Preference.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.core.preference
package tachiyomi.core.preference
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.Flow
core/src/main/java/eu/kanade/tachiyomi/core/preference/PreferenceStore.kt → core/src/main/java/tachiyomi/core/preference/PreferenceStore.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.core.preference
package tachiyomi.core.preference
interface PreferenceStore {
core/src/main/java/eu/kanade/tachiyomi/core/provider/AndroidBackupFolderProvider.kt → core/src/main/java/tachiyomi/core/provider/AndroidBackupFolderProvider.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.core.provider
package tachiyomi.core.provider
import android.content.Context
import android.os.Environment
core/src/main/java/eu/kanade/tachiyomi/core/provider/AndroidDownloadFolderProvider.kt → core/src/main/java/tachiyomi/core/provider/AndroidDownloadFolderProvider.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.core.provider
package tachiyomi.core.provider
import android.content.Context
import android.os.Environment
core/src/main/java/eu/kanade/tachiyomi/core/provider/FolderProvider.kt → core/src/main/java/tachiyomi/core/provider/FolderProvider.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.core.provider
package tachiyomi.core.provider
import java.io.File
core/src/main/java/eu/kanade/tachiyomi/util/BooleanExtensions.kt → core/src/main/java/tachiyomi/core/util/lang/BooleanExtensions.kt
+1 -1
View File
@@ -1,3 +1,3 @@
package eu.kanade.tachiyomi.util
package tachiyomi.core.util.lang
fun Boolean.toLong() = if (this) 1L else 0L
core/src/main/java/eu/kanade/tachiyomi/util/lang/CoroutinesExtensions.kt → core/src/main/java/tachiyomi/core/util/lang/CoroutinesExtensions.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.util.lang
package tachiyomi.core.util.lang
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.CoroutineStart
core/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt → core/src/main/java/tachiyomi/core/util/lang/RxCoroutineBridge.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.util.lang
package tachiyomi.core.util.lang
import kotlinx.coroutines.CancellableContinuation
import kotlinx.coroutines.CancellationException
core/src/main/java/eu/kanade/tachiyomi/util/system/LogcatExtensions.kt → core/src/main/java/tachiyomi/core/util/system/LogcatExtensions.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.util.system
package tachiyomi.core.util.system
import logcat.LogPriority
import logcat.asLog