diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 440f0a528e..7d5b3803e4 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -2,7 +2,6 @@ -keep,allowoptimization class eu.kanade.** { public protected *; } -keep,allowoptimization class tachiyomi.** { public protected *; } --keep,allowoptimization class dev.yokai.** { public protected *; } -keep,allowoptimization class yokai.** { public protected *; } # Keep common dependencies used in extensions @@ -74,11 +73,11 @@ kotlinx.serialization.KSerializer serializer(...); } --keep,includedescriptorclasses class dev.yokai.**$$serializer { *; } --keepclassmembers class dev.yokai.** { +-keep,includedescriptorclasses class yokai.**$$serializer { *; } +-keepclassmembers class yokai.** { *** Companion; } --keepclasseswithmembers class dev.yokai.** { +-keepclasseswithmembers class yokai.** { kotlinx.serialization.KSerializer serializer(...); } diff --git a/app/src/main/java/dev/yokai/core/di/DomainModule.kt b/app/src/main/java/dev/yokai/core/di/DomainModule.kt deleted file mode 100644 index 0ae891ce9f..0000000000 --- a/app/src/main/java/dev/yokai/core/di/DomainModule.kt +++ /dev/null @@ -1,56 +0,0 @@ -package dev.yokai.core.di - -import dev.yokai.data.chapter.ChapterRepositoryImpl -import dev.yokai.domain.extension.repo.ExtensionRepoRepository -import dev.yokai.data.extension.repo.ExtensionRepoRepositoryImpl -import dev.yokai.data.library.custom.CustomMangaRepositoryImpl -import dev.yokai.data.manga.MangaRepositoryImpl -import dev.yokai.domain.chapter.ChapterRepository -import dev.yokai.domain.chapter.interactor.GetAvailableScanlators -import dev.yokai.domain.chapter.interactor.GetChapters -import dev.yokai.domain.extension.interactor.TrustExtension -import dev.yokai.domain.extension.repo.interactor.CreateExtensionRepo -import dev.yokai.domain.extension.repo.interactor.DeleteExtensionRepo -import dev.yokai.domain.extension.repo.interactor.GetExtensionRepo -import dev.yokai.domain.extension.repo.interactor.GetExtensionRepoCount -import dev.yokai.domain.extension.repo.interactor.ReplaceExtensionRepo -import dev.yokai.domain.extension.repo.interactor.UpdateExtensionRepo -import dev.yokai.domain.library.custom.CustomMangaRepository -import dev.yokai.domain.library.custom.interactor.CreateCustomManga -import dev.yokai.domain.library.custom.interactor.DeleteCustomManga -import dev.yokai.domain.library.custom.interactor.GetCustomManga -import dev.yokai.domain.library.custom.interactor.RelinkCustomManga -import dev.yokai.domain.manga.MangaRepository -import dev.yokai.domain.manga.interactor.GetLibraryManga -import uy.kohesive.injekt.api.InjektModule -import uy.kohesive.injekt.api.InjektRegistrar -import uy.kohesive.injekt.api.addFactory -import uy.kohesive.injekt.api.addSingletonFactory -import uy.kohesive.injekt.api.get - -class DomainModule : InjektModule { - override fun InjektRegistrar.registerInjectables() { - addFactory { TrustExtension(get(), get()) } - - addSingletonFactory { ExtensionRepoRepositoryImpl(get()) } - addFactory { CreateExtensionRepo(get()) } - addFactory { DeleteExtensionRepo(get()) } - addFactory { GetExtensionRepo(get()) } - addFactory { GetExtensionRepoCount(get()) } - addFactory { ReplaceExtensionRepo(get()) } - addFactory { UpdateExtensionRepo(get(), get()) } - - addSingletonFactory { CustomMangaRepositoryImpl(get()) } - addFactory { CreateCustomManga(get()) } - addFactory { DeleteCustomManga(get()) } - addFactory { GetCustomManga(get()) } - addFactory { RelinkCustomManga(get()) } - - addSingletonFactory { MangaRepositoryImpl(get()) } - addFactory { GetLibraryManga(get()) } - - addSingletonFactory { ChapterRepositoryImpl(get()) } - addFactory { GetAvailableScanlators(get()) } - addFactory { GetChapters(get()) } - } -} diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index b987a461de..8dfe4020ca 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -34,13 +34,6 @@ import coil3.request.crossfade import coil3.util.DebugLogger import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import dev.yokai.core.CrashlyticsLogWriter -import dev.yokai.core.di.AppModule -import dev.yokai.core.di.DomainModule -import dev.yokai.core.di.PreferenceModule -import dev.yokai.core.migration.Migrator -import dev.yokai.core.migration.migrations.migrations -import dev.yokai.domain.base.BasePreferences import eu.kanade.tachiyomi.appwidget.TachiyomiWidgetManager import eu.kanade.tachiyomi.core.preference.Preference import eu.kanade.tachiyomi.core.preference.PreferenceStore @@ -67,6 +60,13 @@ import org.conscrypt.Conscrypt import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.core.CrashlyticsLogWriter +import yokai.core.di.AppModule +import yokai.core.di.DomainModule +import yokai.core.di.PreferenceModule +import yokai.core.migration.Migrator +import yokai.core.migration.migrations.migrations +import yokai.domain.base.BasePreferences import java.security.Security open class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factory { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt index 2beea4c0e0..1d5cfad071 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt @@ -4,7 +4,6 @@ import android.content.Context import android.net.Uri import co.touchlab.kermit.Logger import com.hippo.unifile.UniFile -import dev.yokai.domain.storage.StorageManager import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.backup.BackupFileValidator import eu.kanade.tachiyomi.data.backup.create.creators.CategoriesBackupCreator @@ -22,6 +21,7 @@ import okio.sink import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.storage.StorageManager import java.io.FileOutputStream class BackupCreator( diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreatorJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreatorJob.kt index e808c44b2e..d7d9c7b1b8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreatorJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreatorJob.kt @@ -14,7 +14,6 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import co.touchlab.kermit.Logger import com.hippo.unifile.UniFile -import dev.yokai.domain.storage.StorageManager import eu.kanade.tachiyomi.data.backup.BackupNotifier import eu.kanade.tachiyomi.data.notification.Notifications import eu.kanade.tachiyomi.data.preference.PreferencesHelper @@ -24,6 +23,7 @@ import eu.kanade.tachiyomi.util.system.notificationManager import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.storage.StorageManager import java.util.concurrent.* class BackupCreatorJob(private val context: Context, workerParams: WorkerParameters) : diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt index 57d32c64df..b02d67cfbd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt @@ -1,8 +1,5 @@ package eu.kanade.tachiyomi.data.backup.models -import dev.yokai.core.metadata.ComicInfo -import dev.yokai.core.metadata.ComicInfoPublishingStatus -import dev.yokai.domain.library.custom.model.CustomMangaInfo import eu.kanade.tachiyomi.data.database.models.ChapterImpl import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.MangaImpl @@ -12,6 +9,7 @@ import eu.kanade.tachiyomi.source.model.UpdateStrategy import eu.kanade.tachiyomi.util.chapter.ChapterUtil import kotlinx.serialization.Serializable import kotlinx.serialization.protobuf.ProtoNumber +import yokai.domain.library.custom.model.CustomMangaInfo @Suppress("DEPRECATION") @Serializable diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaBackupRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaBackupRestorer.kt index bd4c679800..bf67bfedb7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaBackupRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaBackupRestorer.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.backup.restore.restorers -import dev.yokai.domain.library.custom.model.CustomMangaInfo import eu.kanade.tachiyomi.data.backup.models.BackupCategory import eu.kanade.tachiyomi.data.backup.models.BackupHistory import eu.kanade.tachiyomi.data.backup.models.BackupManga @@ -18,6 +17,7 @@ import eu.kanade.tachiyomi.util.manga.MangaUtil import eu.kanade.tachiyomi.util.system.launchNow import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import yokai.domain.library.custom.model.CustomMangaInfo import kotlin.math.max class MangaBackupRestorer( diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt index fe5b8707ba..e7081dacef 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.data.download import android.content.Context import com.hippo.unifile.UniFile -import dev.yokai.domain.storage.StorageManager import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Manga @@ -16,7 +15,8 @@ import kotlinx.coroutines.flow.onEach import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy -import java.util.concurrent.TimeUnit +import yokai.domain.storage.StorageManager +import java.util.concurrent.* /** * Cache where we dump the downloads directory from the filesystem. This class is needed because diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt index b367ef10bc..d95f4aaf36 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.data.download import android.content.Context import co.touchlab.kermit.Logger import com.hippo.unifile.UniFile -import dev.yokai.domain.download.DownloadPreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Manga @@ -18,6 +17,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import uy.kohesive.injekt.injectLazy +import yokai.domain.download.DownloadPreferences /** * This class is used to manage chapter downloads in the application. It must be instantiated once diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt index 94798455c1..3af8726cbd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt @@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.data.download import android.content.Context import com.hippo.unifile.UniFile -import dev.yokai.domain.download.DownloadPreferences -import dev.yokai.domain.storage.StorageManager import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Chapter @@ -17,6 +15,8 @@ import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import uy.kohesive.injekt.injectLazy +import yokai.domain.download.DownloadPreferences +import yokai.domain.storage.StorageManager /** * This class is used to provide the directories where the downloads should be saved. diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt index 7de8c33063..cb933673c0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt @@ -6,10 +6,6 @@ import android.os.Looper import co.touchlab.kermit.Logger import com.hippo.unifile.UniFile import com.jakewharton.rxrelay.PublishRelay -import dev.yokai.core.metadata.COMIC_INFO_FILE -import dev.yokai.core.metadata.ComicInfo -import dev.yokai.core.metadata.getComicInfo -import dev.yokai.domain.download.DownloadPreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.cache.ChapterCache import eu.kanade.tachiyomi.data.database.DatabaseHelper @@ -52,11 +48,13 @@ import rx.Subscription import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers import uy.kohesive.injekt.injectLazy +import yokai.core.metadata.COMIC_INFO_FILE +import yokai.core.metadata.ComicInfo +import yokai.core.metadata.getComicInfo +import yokai.domain.download.DownloadPreferences import java.io.BufferedOutputStream import java.io.File -import java.util.zip.CRC32 -import java.util.zip.ZipEntry -import java.util.zip.ZipOutputStream +import java.util.zip.* /** * This class is the one in charge of downloading chapters. diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt index 9b4522f885..119173a80f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt @@ -2,16 +2,6 @@ package eu.kanade.tachiyomi.data.library import android.content.Context import com.hippo.unifile.UniFile -import dev.yokai.core.metadata.COMIC_INFO_EDITS_FILE -import dev.yokai.core.metadata.ComicInfo -import dev.yokai.core.metadata.ComicInfoPublishingStatus -import dev.yokai.core.metadata.copyFromComicInfo -import dev.yokai.domain.library.custom.interactor.CreateCustomManga -import dev.yokai.domain.library.custom.interactor.DeleteCustomManga -import dev.yokai.domain.library.custom.interactor.GetCustomManga -import dev.yokai.domain.library.custom.interactor.RelinkCustomManga -import dev.yokai.domain.library.custom.model.CustomMangaInfo -import dev.yokai.domain.library.custom.model.CustomMangaInfo.Companion.getMangaInfo import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.MangaImpl import kotlinx.coroutines.CoroutineScope @@ -26,6 +16,16 @@ import nl.adaptivity.xmlutil.serialization.XML import nl.adaptivity.xmlutil.serialization.XmlSerialName import nl.adaptivity.xmlutil.serialization.XmlValue import uy.kohesive.injekt.injectLazy +import yokai.core.metadata.COMIC_INFO_EDITS_FILE +import yokai.core.metadata.ComicInfo +import yokai.core.metadata.ComicInfoPublishingStatus +import yokai.core.metadata.copyFromComicInfo +import yokai.domain.library.custom.interactor.CreateCustomManga +import yokai.domain.library.custom.interactor.DeleteCustomManga +import yokai.domain.library.custom.interactor.GetCustomManga +import yokai.domain.library.custom.interactor.RelinkCustomManga +import yokai.domain.library.custom.model.CustomMangaInfo +import yokai.domain.library.custom.model.CustomMangaInfo.Companion.getMangaInfo import java.nio.charset.StandardCharsets class CustomMangaManager(val context: Context) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt index ff57dc1644..c3822b108c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt @@ -20,7 +20,6 @@ import co.touchlab.kermit.Logger import coil3.imageLoader import coil3.request.CachePolicy import coil3.request.ImageRequest -import dev.yokai.domain.manga.interactor.GetLibraryManga import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.database.DatabaseHelper @@ -75,12 +74,12 @@ import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.sync.withPermit import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import yokai.domain.manga.interactor.GetLibraryManga import java.io.File import java.lang.ref.WeakReference import java.util.* -import java.util.concurrent.CancellationException -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicInteger +import java.util.concurrent.* +import java.util.concurrent.atomic.* class LibraryUpdateJob(private val context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt index 89a7f4552e..88a4ee5904 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.data.updater import android.content.Context import android.os.Build import androidx.annotation.VisibleForTesting -import dev.yokai.domain.base.models.Version import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.network.GET @@ -15,6 +14,7 @@ import eu.kanade.tachiyomi.util.system.withIOContext import kotlinx.serialization.json.Json import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import yokai.domain.base.models.Version import java.util.* import java.util.concurrent.* diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt index bf1a537fe1..78064329de 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt @@ -5,8 +5,6 @@ import android.graphics.drawable.Drawable import android.os.Build import android.os.Parcelable import co.touchlab.kermit.Logger -import dev.yokai.domain.base.BasePreferences -import dev.yokai.domain.extension.interactor.TrustExtension import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.extension.api.ExtensionApi import eu.kanade.tachiyomi.extension.model.Extension @@ -28,6 +26,8 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.parcelize.Parcelize import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import yokai.domain.base.BasePreferences +import yokai.domain.extension.interactor.TrustExtension import java.util.* import java.util.concurrent.* diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt index deb9db4962..45e29886a0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt @@ -18,8 +18,6 @@ import androidx.work.OneTimeWorkRequestBuilder import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkManager import androidx.work.WorkerParameters -import dev.yokai.domain.base.BasePreferences -import dev.yokai.domain.base.BasePreferences.ExtensionInstaller import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.library.LibraryUpdateJob import eu.kanade.tachiyomi.data.notification.NotificationReceiver @@ -39,6 +37,8 @@ import rikka.shizuku.Shizuku import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.base.BasePreferences +import yokai.domain.base.BasePreferences.ExtensionInstaller import java.util.concurrent.* class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParameters) : diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionApi.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionApi.kt index 3f5d66b553..a33e307fb6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionApi.kt @@ -2,9 +2,6 @@ package eu.kanade.tachiyomi.extension.api import android.content.Context import co.touchlab.kermit.Logger -import dev.yokai.domain.extension.repo.interactor.GetExtensionRepo -import dev.yokai.domain.extension.repo.interactor.UpdateExtensionRepo -import dev.yokai.domain.extension.repo.model.ExtensionRepo import eu.kanade.tachiyomi.extension.ExtensionManager import eu.kanade.tachiyomi.extension.model.Extension import eu.kanade.tachiyomi.extension.model.LoadResult @@ -21,6 +18,9 @@ import kotlinx.serialization.json.Json import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.extension.repo.interactor.GetExtensionRepo +import yokai.domain.extension.repo.interactor.UpdateExtensionRepo +import yokai.domain.extension.repo.model.ExtensionRepo internal class ExtensionApi { diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt index ba3f76a02a..a55237f1b2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt @@ -12,14 +12,12 @@ import android.os.Environment import androidx.core.content.ContextCompat import androidx.core.net.toUri import co.touchlab.kermit.Logger -import dev.yokai.domain.base.BasePreferences import eu.kanade.tachiyomi.extension.ExtensionInstallerJob import eu.kanade.tachiyomi.extension.ExtensionManager import eu.kanade.tachiyomi.extension.ShizukuInstaller import eu.kanade.tachiyomi.extension.model.InstallStep import eu.kanade.tachiyomi.ui.extension.ExtensionIntallInfo import eu.kanade.tachiyomi.util.storage.getUriCompat -import eu.kanade.tachiyomi.util.system.e import eu.kanade.tachiyomi.util.system.isPackageInstalled import eu.kanade.tachiyomi.util.system.launchUI import eu.kanade.tachiyomi.util.system.toast @@ -47,6 +45,7 @@ import kotlinx.coroutines.launch import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.base.BasePreferences import java.io.File /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt index be326567fd..10775f75a3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt @@ -9,7 +9,6 @@ import android.os.Build import androidx.core.content.pm.PackageInfoCompat import co.touchlab.kermit.Logger import dalvik.system.PathClassLoader -import dev.yokai.domain.extension.interactor.TrustExtension import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.extension.model.Extension @@ -23,6 +22,7 @@ import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll import kotlinx.coroutines.runBlocking import uy.kohesive.injekt.injectLazy +import yokai.domain.extension.interactor.TrustExtension import java.io.File import java.nio.file.Files import java.nio.file.attribute.BasicFileAttributes diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt index 79fdf61fd8..d90d7b729d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt @@ -5,11 +5,6 @@ import androidx.core.net.toFile import co.touchlab.kermit.Logger import com.github.junrar.Archive import com.hippo.unifile.UniFile -import dev.yokai.core.metadata.COMIC_INFO_FILE -import dev.yokai.core.metadata.ComicInfo -import dev.yokai.core.metadata.copyFromComicInfo -import dev.yokai.core.metadata.toComicInfo -import dev.yokai.domain.storage.StorageManager import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList @@ -37,10 +32,15 @@ import nl.adaptivity.xmlutil.serialization.XML import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.core.metadata.COMIC_INFO_FILE +import yokai.core.metadata.ComicInfo +import yokai.core.metadata.copyFromComicInfo +import yokai.core.metadata.toComicInfo +import yokai.domain.storage.StorageManager import java.io.FileInputStream import java.io.InputStream import java.nio.charset.StandardCharsets -import java.util.concurrent.TimeUnit +import java.util.concurrent.* class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSource { companion object { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt index c9ab2547a5..d070c78fcd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt @@ -12,7 +12,6 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.interpolator.view.animation.FastOutSlowInInterpolator import androidx.interpolator.view.animation.LinearOutSlowInInterpolator import androidx.viewbinding.ViewBinding -import dev.yokai.domain.SplashState import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.main.SearchActivity @@ -22,6 +21,7 @@ import eu.kanade.tachiyomi.util.system.getThemeWithExtras import eu.kanade.tachiyomi.util.system.setLocaleByAppCompat import eu.kanade.tachiyomi.util.system.setThemeByPref import uy.kohesive.injekt.injectLazy +import yokai.domain.SplashState abstract class BaseActivity : AppCompatActivity() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseComposeController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseComposeController.kt index 12d73c68b1..8f78c042ec 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseComposeController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseComposeController.kt @@ -7,7 +7,7 @@ import android.view.ViewGroup import androidx.compose.runtime.Composable import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy -import dev.yokai.presentation.theme.YokaiTheme +import yokai.presentation.theme.YokaiTheme abstract class BaseComposeController(bundle: Bundle? = null) : BaseController(bundle) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/crash/CrashActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/crash/CrashActivity.kt index a34a81d8cf..151c82120a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/crash/CrashActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/crash/CrashActivity.kt @@ -17,9 +17,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import dev.yokai.presentation.onboarding.InfoScreen -import dev.yokai.presentation.theme.Size -import dev.yokai.presentation.theme.YokaiTheme import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.main.MainActivity @@ -27,6 +24,9 @@ import eu.kanade.tachiyomi.util.CrashLogUtil import eu.kanade.tachiyomi.util.system.setThemeByPref import kotlinx.coroutines.launch import uy.kohesive.injekt.injectLazy +import yokai.presentation.onboarding.InfoScreen +import yokai.presentation.theme.Size +import yokai.presentation.theme.YokaiTheme class CrashActivity : AppCompatActivity() { internal val preferences: PreferencesHelper by injectLazy() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionAdapter.kt index 4a2f38db5d..56e962497b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionAdapter.kt @@ -1,13 +1,13 @@ package eu.kanade.tachiyomi.ui.extension import android.widget.TextView -import dev.yokai.domain.base.BasePreferences -import dev.yokai.domain.base.BasePreferences.ExtensionInstaller import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.extension.ExtensionAdapter.OnButtonClickListener import uy.kohesive.injekt.injectLazy +import yokai.domain.base.BasePreferences +import yokai.domain.base.BasePreferences.ExtensionInstaller /** * Adapter that holds the catalogue cards. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt index 66f5fd628b..51747b9292 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt @@ -12,8 +12,6 @@ import androidx.core.view.updatePaddingRelative import androidx.recyclerview.widget.RecyclerView import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.tabs.TabLayout -import dev.yokai.domain.base.BasePreferences -import dev.yokai.domain.base.BasePreferences.ExtensionInstaller import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.R @@ -46,6 +44,8 @@ import eu.kanade.tachiyomi.util.view.withFadeTransaction import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.base.BasePreferences +import yokai.domain.base.BasePreferences.ExtensionInstaller class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt index 8f2ecacda8..a424533e29 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.library import android.os.Build import android.view.HapticFeedbackConstants import android.view.View -import dev.yokai.domain.ui.UiPreferences import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.R @@ -18,7 +17,8 @@ import eu.kanade.tachiyomi.util.system.timeSpanFromNow import eu.kanade.tachiyomi.util.system.withDefContext import kotlinx.coroutines.runBlocking import uy.kohesive.injekt.injectLazy -import java.util.Locale +import yokai.domain.ui.UiPreferences +import java.util.* /** * Adapter storing a list of manga in a certain category. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index c41df7bfb7..7d5ece7a90 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -51,7 +51,6 @@ import com.bluelinelabs.conductor.ControllerChangeType import com.github.florent37.viewtooltip.ViewTooltip import com.google.android.material.snackbar.BaseTransientBottomBar import com.google.android.material.snackbar.Snackbar -import dev.yokai.domain.ui.UiPreferences import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.SelectableAdapter import eu.davidea.flexibleadapter.items.IFlexible @@ -130,7 +129,8 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import java.util.Locale +import yokai.domain.ui.UiPreferences +import java.util.* import kotlin.math.abs import kotlin.math.max import kotlin.math.roundToInt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt index ac0d7a9e5f..4f90d3d102 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt @@ -11,7 +11,6 @@ import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager -import dev.yokai.domain.ui.UiPreferences import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.AbstractSectionableItem import eu.davidea.flexibleadapter.items.IFilterable @@ -27,6 +26,7 @@ import eu.kanade.tachiyomi.widget.AutofitRecyclerView import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.ui.UiPreferences class LibraryItem( val manga: LibraryManga, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index 46b5a97c40..a6793f04ba 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -1,8 +1,5 @@ package eu.kanade.tachiyomi.ui.library -import dev.yokai.domain.chapter.interactor.GetChapters -import dev.yokai.domain.manga.interactor.GetLibraryManga -import dev.yokai.util.isLewd import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.core.preference.minusAssign import eu.kanade.tachiyomi.core.preference.plusAssign @@ -57,8 +54,11 @@ import kotlinx.coroutines.withContext import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.chapter.interactor.GetChapters +import yokai.domain.manga.interactor.GetLibraryManga +import yokai.util.isLewd import java.util.* -import java.util.concurrent.TimeUnit +import java.util.concurrent.* import kotlin.math.roundToInt import kotlin.random.Random diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 2bf412774f..63de0578ad 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -67,10 +67,6 @@ import com.google.android.material.snackbar.Snackbar import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback import com.google.common.primitives.Floats.max import com.google.common.primitives.Ints.max -import dev.yokai.core.migration.Migrator -import dev.yokai.domain.base.BasePreferences -import dev.yokai.presentation.extension.repo.ExtensionRepoController -import dev.yokai.presentation.onboarding.OnboardingController import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper @@ -143,20 +139,10 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.withContext import uy.kohesive.injekt.injectLazy -import kotlin.collections.List -import kotlin.collections.MutableList -import kotlin.collections.MutableMap -import kotlin.collections.distinct -import kotlin.collections.filterNotNull -import kotlin.collections.firstOrNull -import kotlin.collections.forEach -import kotlin.collections.forEachIndexed -import kotlin.collections.lastOrNull -import kotlin.collections.listOf -import kotlin.collections.map -import kotlin.collections.maxByOrNull -import kotlin.collections.orEmpty -import kotlin.collections.plus +import yokai.core.migration.Migrator +import yokai.domain.base.BasePreferences +import yokai.presentation.extension.repo.ExtensionRepoController +import yokai.presentation.onboarding.OnboardingController import kotlin.collections.set import kotlin.math.abs import kotlin.math.min diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt index a978c0b6f4..996cd6bd2b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt @@ -8,7 +8,6 @@ import androidx.core.view.isVisible import com.bluelinelabs.conductor.Controller import com.bluelinelabs.conductor.RouterTransaction import com.bluelinelabs.conductor.changehandler.SimpleSwapChangeHandler -import dev.yokai.domain.chapter.interactor.GetChapters import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.notification.NotificationReceiver @@ -30,6 +29,7 @@ import kotlinx.coroutines.runBlocking import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.chapter.interactor.GetChapters class SearchActivity : MainActivity() { private val getChapters: GetChapters by injectLazy() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt index bc3376c189..98fa984ca9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt @@ -10,10 +10,6 @@ import coil3.request.CachePolicy import coil3.request.ImageRequest import coil3.request.SuccessResult import com.hippo.unifile.UniFile -import dev.yokai.domain.chapter.interactor.GetAvailableScanlators -import dev.yokai.domain.chapter.interactor.GetChapters -import dev.yokai.domain.library.custom.model.CustomMangaInfo -import dev.yokai.domain.storage.StorageManager import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.cache.CoverCache @@ -75,6 +71,10 @@ import kotlinx.coroutines.withContext import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.chapter.interactor.GetAvailableScanlators +import yokai.domain.chapter.interactor.GetChapters +import yokai.domain.library.custom.model.CustomMangaInfo +import yokai.domain.storage.StorageManager import java.io.File import java.io.FileOutputStream import java.io.OutputStream diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/BaseMigrationPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/BaseMigrationPresenter.kt index 621a144146..adefca875a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/BaseMigrationPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/BaseMigrationPresenter.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.ui.migration -import dev.yokai.domain.ui.UiPreferences import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.preference.PreferenceValues @@ -18,6 +17,7 @@ import kotlinx.coroutines.withContext import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.ui.UiPreferences abstract class BaseMigrationPresenter( protected val sourceManager: SourceManager = Injekt.get(), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt index d0fa10a0f3..28296d92be 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.ui.migration.manga.process import android.view.MenuItem -import dev.yokai.domain.library.custom.model.CustomMangaInfo.Companion.getMangaInfo -import dev.yokai.domain.ui.UiPreferences import eu.davidea.flexibleadapter.FlexibleAdapter import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.database.DatabaseHelper @@ -24,7 +22,9 @@ import kotlinx.coroutines.withContext import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy -import java.util.Date +import yokai.domain.library.custom.model.CustomMangaInfo.Companion.getMangaInfo +import yokai.domain.ui.UiPreferences +import java.util.* class MigrationProcessAdapter( val controller: MigrationListController, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/StatsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/StatsPresenter.kt index 22b3feb365..7f11e17272 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/StatsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/StatsPresenter.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.ui.more.stats -import dev.yokai.domain.manga.interactor.GetLibraryManga import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.LibraryManga @@ -21,6 +20,7 @@ import kotlinx.coroutines.runBlocking import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.manga.interactor.GetLibraryManga /** * Presenter of [StatsController]. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/details/StatsDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/details/StatsDetailsPresenter.kt index 39e6381dfa..4426f2bda1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/details/StatsDetailsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/details/StatsDetailsPresenter.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.more.stats.details import android.graphics.drawable.Drawable import android.text.format.DateUtils import androidx.annotation.DrawableRes -import dev.yokai.domain.manga.interactor.GetLibraryManga import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Category @@ -33,6 +32,7 @@ import kotlinx.coroutines.runBlocking import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.manga.interactor.GetLibraryManga import java.util.* import java.util.concurrent.* import kotlin.math.roundToInt 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 8e43856f43..bb86c1089c 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 @@ -75,9 +75,6 @@ import com.google.android.material.snackbar.Snackbar import com.google.android.material.transition.platform.MaterialContainerTransform import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback import com.hippo.unifile.UniFile -import dev.yokai.domain.base.BasePreferences -import dev.yokai.domain.ui.settings.ReaderPreferences -import dev.yokai.domain.ui.settings.ReaderPreferences.LandscapeCutoutBehaviour import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.core.preference.toggle @@ -161,6 +158,9 @@ import kotlinx.coroutines.flow.sample import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import uy.kohesive.injekt.injectLazy +import yokai.domain.base.BasePreferences +import yokai.domain.ui.settings.ReaderPreferences +import yokai.domain.ui.settings.ReaderPreferences.LandscapeCutoutBehaviour import java.io.ByteArrayOutputStream import java.text.DecimalFormat import java.text.DecimalFormatSymbols diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index 85b7a645ae..2a93e5bc3d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -9,9 +9,6 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import co.touchlab.kermit.Logger import com.hippo.unifile.UniFile -import dev.yokai.domain.chapter.interactor.GetChapters -import dev.yokai.domain.download.DownloadPreferences -import dev.yokai.domain.storage.StorageManager import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.database.DatabaseHelper @@ -76,8 +73,11 @@ import rx.schedulers.Schedulers import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.chapter.interactor.GetChapters +import yokai.domain.download.DownloadPreferences +import yokai.domain.storage.StorageManager import java.util.* -import java.util.concurrent.CancellationException +import java.util.concurrent.* /** * Presenter used by the activity to perform background operations. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt index c48950eb74..1c2eaf4ad5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt @@ -29,7 +29,6 @@ import com.davemorrissey.labs.subscaleview.ImageSource import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE import com.github.chrisbanes.photoview.PhotoView -import dev.yokai.domain.ui.settings.ReaderPreferences.CutoutBehaviour import eu.kanade.tachiyomi.data.coil.cropBorders import eu.kanade.tachiyomi.data.coil.customDecoder import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerConfig @@ -39,6 +38,7 @@ import eu.kanade.tachiyomi.util.system.GLUtil import eu.kanade.tachiyomi.util.system.ImageUtil import eu.kanade.tachiyomi.util.system.animatorDurationScale import okio.BufferedSource +import yokai.domain.ui.settings.ReaderPreferences.CutoutBehaviour /** * A wrapper view for showing page image. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt index bf8a525342..19e01b2d33 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt @@ -17,8 +17,8 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.platform.AbstractComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.core.view.isVisible -import dev.yokai.presentation.component.CombinedCircularProgressIndicator -import dev.yokai.presentation.theme.YokaiTheme +import yokai.presentation.component.CombinedCircularProgressIndicator +import yokai.presentation.theme.YokaiTheme /** * A custom progress bar that always rotates while being determinate. By always rotating we give diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt index c383e71700..9c56531f49 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.ui.reader.viewer.pager import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView -import dev.yokai.domain.ui.settings.ReaderPreferences -import dev.yokai.domain.ui.settings.ReaderPreferences.CutoutBehaviour import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.reader.settings.PageLayout import eu.kanade.tachiyomi.ui.reader.viewer.ViewerConfig @@ -12,13 +10,14 @@ import eu.kanade.tachiyomi.ui.reader.viewer.navigation.EdgeNavigation import eu.kanade.tachiyomi.ui.reader.viewer.navigation.KindlishNavigation import eu.kanade.tachiyomi.ui.reader.viewer.navigation.LNavigation import eu.kanade.tachiyomi.ui.reader.viewer.navigation.RightAndLeftNavigation -import eu.kanade.tachiyomi.util.system.DeviceUtil import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.drop import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import yokai.domain.ui.settings.ReaderPreferences +import yokai.domain.ui.settings.ReaderPreferences.CutoutBehaviour /** * Configuration used by pager viewers. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt index fe4df22dd4..f234446a44 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt @@ -12,7 +12,6 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.compose.material3.CircularProgressIndicator import androidx.compose.ui.platform.ComposeView import androidx.core.view.updatePaddingRelative -import dev.yokai.presentation.theme.YokaiTheme import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter @@ -24,6 +23,7 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.MainScope import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch +import yokai.presentation.theme.YokaiTheme /** * View of the ViewPager that contains a chapter transition. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt index 04bcef632a..c508a1c506 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt @@ -11,7 +11,6 @@ import androidx.compose.material3.CircularProgressIndicator import androidx.compose.ui.platform.ComposeView import androidx.core.view.isNotEmpty import androidx.core.view.isVisible -import dev.yokai.presentation.theme.YokaiTheme import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter @@ -21,6 +20,7 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.MainScope import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch +import yokai.presentation.theme.YokaiTheme /** * Holder of the webtoon viewer that contains a chapter transition. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaAdapter.kt index a3c07408c9..1b31dc9505 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaAdapter.kt @@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.ui.recents import android.view.View import androidx.recyclerview.widget.ItemTouchHelper -import dev.yokai.domain.recents.RecentsPreferences -import dev.yokai.domain.ui.UiPreferences import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.core.preference.Preference import eu.kanade.tachiyomi.data.database.models.Chapter @@ -16,10 +14,12 @@ import kotlinx.coroutines.flow.drop import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import uy.kohesive.injekt.injectLazy +import yokai.domain.recents.RecentsPreferences +import yokai.domain.ui.UiPreferences import java.text.DecimalFormat import java.text.DecimalFormatSymbols import java.text.SimpleDateFormat -import java.util.Locale +import java.util.* class RecentMangaAdapter(val delegate: RecentsInterface) : BaseChapterAdapter>(delegate) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt index c00a4f8277..7fb00484f7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt @@ -1,8 +1,5 @@ package eu.kanade.tachiyomi.ui.recents -import dev.yokai.domain.chapter.interactor.GetChapters -import dev.yokai.domain.recents.RecentsPreferences -import dev.yokai.domain.ui.UiPreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Chapter @@ -37,12 +34,12 @@ import kotlinx.coroutines.withContext import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.chapter.interactor.GetChapters +import yokai.domain.recents.RecentsPreferences +import yokai.domain.ui.UiPreferences import java.text.SimpleDateFormat -import java.util.Calendar -import java.util.Date -import java.util.Locale -import java.util.TreeMap -import java.util.concurrent.TimeUnit +import java.util.* +import java.util.concurrent.* import kotlin.math.abs import kotlin.math.roundToInt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsComposeController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsComposeController.kt index 95ad8ef61e..9912f988fe 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsComposeController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsComposeController.kt @@ -2,11 +2,11 @@ package eu.kanade.tachiyomi.ui.setting import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider -import dev.yokai.domain.ComposableAlertDialog -import dev.yokai.presentation.settings.ComposableSettings import eu.kanade.tachiyomi.ui.base.controller.BaseComposeController import eu.kanade.tachiyomi.util.compose.LocalAlertDialog import eu.kanade.tachiyomi.util.compose.LocalBackPress +import yokai.domain.ComposableAlertDialog +import yokai.presentation.settings.ComposableSettings abstract class SettingsComposeController: BaseComposeController(), SettingsControllerInterface { override fun getTitle(): String? = __getTitle() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLegacyController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLegacyController.kt index f015a72b69..0bc0b95ad9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLegacyController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLegacyController.kt @@ -16,7 +16,6 @@ import androidx.preference.PreferenceGroup import androidx.preference.PreferenceScreen import com.bluelinelabs.conductor.ControllerChangeHandler import com.bluelinelabs.conductor.ControllerChangeType -import dev.yokai.domain.base.BasePreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.changesIn @@ -30,6 +29,7 @@ import eu.kanade.tachiyomi.util.view.scrollViewWith import eu.kanade.tachiyomi.widget.LinearLayoutManagerAccurateOffset import kotlinx.coroutines.MainScope import uy.kohesive.injekt.injectLazy +import yokai.domain.base.BasePreferences import java.util.* abstract class SettingsLegacyController : PreferenceController(), SettingsControllerInterface, BackHandlerControllerInterface, BaseControllerPreferenceControllerCommonInterface { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt index ea27eca7bd..aea22e49d9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt @@ -16,8 +16,6 @@ import androidx.lifecycle.lifecycleScope import androidx.preference.PreferenceScreen import co.touchlab.kermit.Logger import com.hippo.unifile.UniFile -import dev.yokai.domain.base.BasePreferences.ExtensionInstaller -import dev.yokai.domain.extension.interactor.TrustExtension import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper @@ -79,6 +77,8 @@ import rikka.sui.Sui import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.base.BasePreferences.ExtensionInstaller +import yokai.domain.extension.interactor.TrustExtension import java.io.File class SettingsAdvancedController : SettingsLegacyController() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsBrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsBrowseController.kt index 79afd510ce..7fe8ecb483 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsBrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsBrowseController.kt @@ -6,8 +6,6 @@ import android.os.Build import android.provider.Settings import androidx.preference.PreferenceScreen import androidx.preference.SwitchPreferenceCompat -import dev.yokai.domain.base.BasePreferences.ExtensionInstaller -import dev.yokai.presentation.extension.repo.ExtensionRepoController import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.notification.Notifications @@ -35,6 +33,8 @@ import eu.kanade.tachiyomi.util.lang.addBetaTag import eu.kanade.tachiyomi.util.view.snack import eu.kanade.tachiyomi.util.view.withFadeTransaction import uy.kohesive.injekt.injectLazy +import yokai.domain.base.BasePreferences.ExtensionInstaller +import yokai.presentation.extension.repo.ExtensionRepoController class SettingsBrowseController : SettingsLegacyController() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt index 8450c664bd..f0c051cd86 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt @@ -1,8 +1,8 @@ package eu.kanade.tachiyomi.ui.setting.controllers -import dev.yokai.presentation.settings.ComposableSettings -import dev.yokai.presentation.settings.screen.SettingsDataScreen import eu.kanade.tachiyomi.ui.setting.SettingsComposeController +import yokai.presentation.settings.ComposableSettings +import yokai.presentation.settings.screen.SettingsDataScreen class SettingsDataController : SettingsComposeController() { override fun getComposableSettings(): ComposableSettings = SettingsDataScreen diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDownloadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDownloadController.kt index 5c82542fc6..8bc8edbea3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDownloadController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDownloadController.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.setting.controllers import android.content.Intent import androidx.preference.PreferenceScreen import com.bluelinelabs.conductor.Controller -import dev.yokai.domain.download.DownloadPreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Category @@ -22,6 +21,7 @@ import eu.kanade.tachiyomi.ui.setting.triStateListPreference import eu.kanade.tachiyomi.util.lang.addBetaTag import eu.kanade.tachiyomi.util.view.withFadeTransaction import uy.kohesive.injekt.injectLazy +import yokai.domain.download.DownloadPreferences import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys class SettingsDownloadController : SettingsLegacyController() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsGeneralController.kt index 76e8aefd71..a68f8f3ef3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsGeneralController.kt @@ -9,7 +9,6 @@ import android.view.View import androidx.appcompat.app.AppCompatDelegate import androidx.core.os.LocaleListCompat import androidx.preference.PreferenceScreen -import dev.yokai.domain.base.BasePreferences import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.updater.AppDownloadInstallJob @@ -30,7 +29,8 @@ import eu.kanade.tachiyomi.ui.setting.titleRes import eu.kanade.tachiyomi.util.lang.addBetaTag import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder import eu.kanade.tachiyomi.util.system.systemLangContext -import java.util.Locale +import yokai.domain.base.BasePreferences +import java.util.* import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys class SettingsGeneralController : SettingsLegacyController() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsLibraryController.kt index 56750540f3..f8f0107387 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsLibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsLibraryController.kt @@ -1,12 +1,18 @@ package eu.kanade.tachiyomi.ui.setting.controllers import androidx.preference.PreferenceScreen -import dev.yokai.domain.manga.interactor.GetLibraryManga import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Category import eu.kanade.tachiyomi.data.library.LibraryUpdateJob -import eu.kanade.tachiyomi.data.preference.* +import eu.kanade.tachiyomi.data.preference.DEVICE_BATTERY_NOT_LOW +import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING +import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI +import eu.kanade.tachiyomi.data.preference.DelayedLibrarySuggestionsJob +import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD +import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED +import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ +import eu.kanade.tachiyomi.data.preference.changesIn import eu.kanade.tachiyomi.ui.category.CategoryController import eu.kanade.tachiyomi.ui.library.LibraryPresenter import eu.kanade.tachiyomi.ui.library.display.TabbedLibraryDisplaySheet @@ -30,6 +36,7 @@ import eu.kanade.tachiyomi.util.view.withFadeTransaction import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.manga.interactor.GetLibraryManga import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys class SettingsLibraryController : SettingsLegacyController() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsReaderController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsReaderController.kt index f571862d83..c03b434d07 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsReaderController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsReaderController.kt @@ -3,9 +3,6 @@ package eu.kanade.tachiyomi.ui.setting.controllers import android.content.ComponentName import android.content.Intent import androidx.preference.PreferenceScreen -import dev.yokai.domain.ui.settings.ReaderPreferences -import dev.yokai.domain.ui.settings.ReaderPreferences.CutoutBehaviour -import dev.yokai.domain.ui.settings.ReaderPreferences.LandscapeCutoutBehaviour import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferenceValues import eu.kanade.tachiyomi.data.preference.changesIn @@ -33,6 +30,9 @@ import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.isTablet import eu.kanade.tachiyomi.util.view.activityBinding import uy.kohesive.injekt.injectLazy +import yokai.domain.ui.settings.ReaderPreferences +import yokai.domain.ui.settings.ReaderPreferences.CutoutBehaviour +import yokai.domain.ui.settings.ReaderPreferences.LandscapeCutoutBehaviour import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys class SettingsReaderController : SettingsLegacyController() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/legacy/SettingsDataLegacyController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/legacy/SettingsDataLegacyController.kt index f9798ea8f8..d60a938d20 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/legacy/SettingsDataLegacyController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/legacy/SettingsDataLegacyController.kt @@ -14,8 +14,6 @@ import androidx.core.net.toUri import androidx.lifecycle.lifecycleScope import androidx.preference.PreferenceScreen import com.hippo.unifile.UniFile -import dev.yokai.domain.storage.StorageManager -import dev.yokai.domain.storage.StoragePreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.backup.BackupFileValidator import eu.kanade.tachiyomi.data.backup.create.BackupCreatorJob @@ -47,6 +45,8 @@ import eu.kanade.tachiyomi.util.system.withUIContext import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import uy.kohesive.injekt.injectLazy +import yokai.domain.storage.StorageManager +import yokai.domain.storage.StoragePreferences @Deprecated("Migrating to compose") class SettingsDataLegacyController : SettingsLegacyController() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt index 21d732ce2b..6ae7b0be1f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt @@ -23,9 +23,6 @@ import com.bluelinelabs.conductor.ControllerChangeHandler import com.bluelinelabs.conductor.ControllerChangeType import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.snackbar.Snackbar -import dev.yokai.domain.base.BasePreferences -import dev.yokai.domain.base.BasePreferences.ExtensionInstaller -import dev.yokai.presentation.extension.repo.ExtensionRepoController import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.R @@ -71,8 +68,10 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.parcelize.Parcelize import uy.kohesive.injekt.injectLazy -import java.util.Date -import java.util.Locale +import yokai.domain.base.BasePreferences +import yokai.domain.base.BasePreferences.ExtensionInstaller +import yokai.presentation.extension.repo.ExtensionRepoController +import java.util.* import kotlin.math.max /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt index f99e815b5a..b11d1fe133 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.ui.source.browse import co.touchlab.kermit.Logger -import dev.yokai.domain.ui.UiPreferences import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.database.DatabaseHelper @@ -40,6 +39,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import yokai.domain.ui.UiPreferences /** * Presenter of [BrowseSourceController]. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchCardAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchCardAdapter.kt index 98c9a5c94d..fe7a50c216 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchCardAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchCardAdapter.kt @@ -1,10 +1,10 @@ package eu.kanade.tachiyomi.ui.source.globalsearch -import dev.yokai.domain.ui.UiPreferences import eu.davidea.flexibleadapter.FlexibleAdapter import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.preference.PreferencesHelper import uy.kohesive.injekt.injectLazy +import yokai.domain.ui.UiPreferences /** * Adapter that holds the manga items from search results. diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/compose/Locals.kt b/app/src/main/java/eu/kanade/tachiyomi/util/compose/Locals.kt index bd0c944828..d9590305dd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/compose/Locals.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/compose/Locals.kt @@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.ProvidableCompositionLocal import androidx.compose.runtime.compositionLocalOf import androidx.compose.runtime.staticCompositionLocalOf -import dev.yokai.domain.ComposableAlertDialog +import yokai.domain.ComposableAlertDialog val ProvidableCompositionLocal.currentOrThrow @Composable diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt index 4abbe9a1f5..5ddb330b16 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt @@ -9,12 +9,12 @@ import androidx.preference.PreferenceManager import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.StaggeredGridLayoutManager -import dev.yokai.domain.ui.UiPreferences import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.library.LibraryItem import eu.kanade.tachiyomi.util.system.dpToPx import eu.kanade.tachiyomi.util.system.pxToDp import eu.kanade.tachiyomi.util.system.rootWindowInsetsCompat +import yokai.domain.ui.UiPreferences import kotlin.math.abs import kotlin.math.max import kotlin.math.pow diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/BaseTabbedScrollView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/BaseTabbedScrollView.kt index bf87207972..e1847819ea 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/BaseTabbedScrollView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/BaseTabbedScrollView.kt @@ -4,15 +4,15 @@ import android.content.Context import android.util.AttributeSet import androidx.core.widget.NestedScrollView import androidx.viewbinding.ViewBinding -import dev.yokai.domain.recents.RecentsPreferences -import dev.yokai.domain.ui.UiPreferences -import dev.yokai.domain.ui.settings.ReaderPreferences import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.library.LibraryController import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.ui.recents.RecentsController import eu.kanade.tachiyomi.util.view.RecyclerWindowInsetsListener import uy.kohesive.injekt.injectLazy +import yokai.domain.recents.RecentsPreferences +import yokai.domain.ui.UiPreferences +import yokai.domain.ui.settings.ReaderPreferences abstract class BaseTabbedScrollView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : NestedScrollView(context, attrs) { diff --git a/app/src/main/java/dev/yokai/core/CrashlyticsLogWriter.kt b/app/src/main/java/yokai/core/CrashlyticsLogWriter.kt similarity index 97% rename from app/src/main/java/dev/yokai/core/CrashlyticsLogWriter.kt rename to app/src/main/java/yokai/core/CrashlyticsLogWriter.kt index 16c3508d86..f8934e84fd 100644 --- a/app/src/main/java/dev/yokai/core/CrashlyticsLogWriter.kt +++ b/app/src/main/java/yokai/core/CrashlyticsLogWriter.kt @@ -1,4 +1,4 @@ -package dev.yokai.core +package yokai.core import co.touchlab.kermit.DefaultFormatter import co.touchlab.kermit.LogWriter diff --git a/app/src/main/java/dev/yokai/core/di/AppModule.kt b/app/src/main/java/yokai/core/di/AppModule.kt similarity index 96% rename from app/src/main/java/dev/yokai/core/di/AppModule.kt rename to app/src/main/java/yokai/core/di/AppModule.kt index 3edafc645a..7c4fb05ce1 100644 --- a/app/src/main/java/dev/yokai/core/di/AppModule.kt +++ b/app/src/main/java/yokai/core/di/AppModule.kt @@ -1,4 +1,4 @@ -package dev.yokai.core.di +package yokai.core.di import android.app.Application import androidx.core.content.ContextCompat @@ -7,10 +7,6 @@ import app.cash.sqldelight.db.SqlDriver import app.cash.sqldelight.driver.android.AndroidSqliteDriver import com.chuckerteam.chucker.api.ChuckerCollector import com.chuckerteam.chucker.api.ChuckerInterceptor -import dev.yokai.data.AndroidDatabaseHandler -import dev.yokai.data.DatabaseHandler -import dev.yokai.domain.SplashState -import dev.yokai.domain.storage.StorageManager import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.core.storage.AndroidStorageFolderProvider import eu.kanade.tachiyomi.data.cache.ChapterCache @@ -37,6 +33,10 @@ import uy.kohesive.injekt.api.InjektRegistrar import uy.kohesive.injekt.api.addSingleton import uy.kohesive.injekt.api.addSingletonFactory import uy.kohesive.injekt.api.get +import yokai.data.AndroidDatabaseHandler +import yokai.data.DatabaseHandler +import yokai.domain.SplashState +import yokai.domain.storage.StorageManager class AppModule(val app: Application) : InjektModule { diff --git a/app/src/main/java/yokai/core/di/DomainModule.kt b/app/src/main/java/yokai/core/di/DomainModule.kt new file mode 100644 index 0000000000..9fe30c7eaf --- /dev/null +++ b/app/src/main/java/yokai/core/di/DomainModule.kt @@ -0,0 +1,56 @@ +package yokai.core.di + +import uy.kohesive.injekt.api.InjektModule +import uy.kohesive.injekt.api.InjektRegistrar +import uy.kohesive.injekt.api.addFactory +import uy.kohesive.injekt.api.addSingletonFactory +import uy.kohesive.injekt.api.get +import yokai.data.chapter.ChapterRepositoryImpl +import yokai.data.extension.repo.ExtensionRepoRepositoryImpl +import yokai.data.library.custom.CustomMangaRepositoryImpl +import yokai.data.manga.MangaRepositoryImpl +import yokai.domain.chapter.ChapterRepository +import yokai.domain.chapter.interactor.GetAvailableScanlators +import yokai.domain.chapter.interactor.GetChapters +import yokai.domain.extension.interactor.TrustExtension +import yokai.domain.extension.repo.ExtensionRepoRepository +import yokai.domain.extension.repo.interactor.CreateExtensionRepo +import yokai.domain.extension.repo.interactor.DeleteExtensionRepo +import yokai.domain.extension.repo.interactor.GetExtensionRepo +import yokai.domain.extension.repo.interactor.GetExtensionRepoCount +import yokai.domain.extension.repo.interactor.ReplaceExtensionRepo +import yokai.domain.extension.repo.interactor.UpdateExtensionRepo +import yokai.domain.library.custom.CustomMangaRepository +import yokai.domain.library.custom.interactor.CreateCustomManga +import yokai.domain.library.custom.interactor.DeleteCustomManga +import yokai.domain.library.custom.interactor.GetCustomManga +import yokai.domain.library.custom.interactor.RelinkCustomManga +import yokai.domain.manga.MangaRepository +import yokai.domain.manga.interactor.GetLibraryManga + +class DomainModule : InjektModule { + override fun InjektRegistrar.registerInjectables() { + addFactory { TrustExtension(get(), get()) } + + addSingletonFactory { ExtensionRepoRepositoryImpl(get()) } + addFactory { CreateExtensionRepo(get()) } + addFactory { DeleteExtensionRepo(get()) } + addFactory { GetExtensionRepo(get()) } + addFactory { GetExtensionRepoCount(get()) } + addFactory { ReplaceExtensionRepo(get()) } + addFactory { UpdateExtensionRepo(get(), get()) } + + addSingletonFactory { CustomMangaRepositoryImpl(get()) } + addFactory { CreateCustomManga(get()) } + addFactory { DeleteCustomManga(get()) } + addFactory { GetCustomManga(get()) } + addFactory { RelinkCustomManga(get()) } + + addSingletonFactory { MangaRepositoryImpl(get()) } + addFactory { GetLibraryManga(get()) } + + addSingletonFactory { ChapterRepositoryImpl(get()) } + addFactory { GetAvailableScanlators(get()) } + addFactory { GetChapters(get()) } + } +} diff --git a/app/src/main/java/dev/yokai/core/di/PreferenceModule.kt b/app/src/main/java/yokai/core/di/PreferenceModule.kt similarity index 81% rename from app/src/main/java/dev/yokai/core/di/PreferenceModule.kt rename to app/src/main/java/yokai/core/di/PreferenceModule.kt index f926828a56..cd50285aa7 100644 --- a/app/src/main/java/dev/yokai/core/di/PreferenceModule.kt +++ b/app/src/main/java/yokai/core/di/PreferenceModule.kt @@ -1,13 +1,6 @@ -package dev.yokai.core.di +package yokai.core.di import android.app.Application -import dev.yokai.domain.base.BasePreferences -import dev.yokai.domain.download.DownloadPreferences -import dev.yokai.domain.recents.RecentsPreferences -import dev.yokai.domain.source.SourcePreferences -import dev.yokai.domain.storage.StoragePreferences -import dev.yokai.domain.ui.UiPreferences -import dev.yokai.domain.ui.settings.ReaderPreferences import eu.kanade.tachiyomi.core.preference.AndroidPreferenceStore import eu.kanade.tachiyomi.core.preference.PreferenceStore import eu.kanade.tachiyomi.core.storage.AndroidStorageFolderProvider @@ -18,6 +11,13 @@ import uy.kohesive.injekt.api.InjektModule import uy.kohesive.injekt.api.InjektRegistrar import uy.kohesive.injekt.api.addSingletonFactory import uy.kohesive.injekt.api.get +import yokai.domain.base.BasePreferences +import yokai.domain.download.DownloadPreferences +import yokai.domain.recents.RecentsPreferences +import yokai.domain.source.SourcePreferences +import yokai.domain.storage.StoragePreferences +import yokai.domain.ui.UiPreferences +import yokai.domain.ui.settings.ReaderPreferences class PreferenceModule(val application: Application) : InjektModule { override fun InjektRegistrar.registerInjectables() { diff --git a/app/src/main/java/dev/yokai/core/metadata/ComicInfo.kt b/app/src/main/java/yokai/core/metadata/ComicInfo.kt similarity index 99% rename from app/src/main/java/dev/yokai/core/metadata/ComicInfo.kt rename to app/src/main/java/yokai/core/metadata/ComicInfo.kt index a4be9ec371..268888b756 100644 --- a/app/src/main/java/dev/yokai/core/metadata/ComicInfo.kt +++ b/app/src/main/java/yokai/core/metadata/ComicInfo.kt @@ -1,4 +1,4 @@ -package dev.yokai.core.metadata +package yokai.core.metadata import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Manga diff --git a/app/src/main/java/dev/yokai/core/migration/Migration.kt b/app/src/main/java/yokai/core/migration/Migration.kt similarity index 94% rename from app/src/main/java/dev/yokai/core/migration/Migration.kt rename to app/src/main/java/yokai/core/migration/Migration.kt index 16832a4f9e..d27e59d705 100644 --- a/app/src/main/java/dev/yokai/core/migration/Migration.kt +++ b/app/src/main/java/yokai/core/migration/Migration.kt @@ -1,4 +1,4 @@ -package dev.yokai.core.migration +package yokai.core.migration interface Migration { val version: Float diff --git a/app/src/main/java/dev/yokai/core/migration/MigrationCompletedListener.kt b/app/src/main/java/yokai/core/migration/MigrationCompletedListener.kt similarity index 60% rename from app/src/main/java/dev/yokai/core/migration/MigrationCompletedListener.kt rename to app/src/main/java/yokai/core/migration/MigrationCompletedListener.kt index 6d3a687682..51f548b25d 100644 --- a/app/src/main/java/dev/yokai/core/migration/MigrationCompletedListener.kt +++ b/app/src/main/java/yokai/core/migration/MigrationCompletedListener.kt @@ -1,3 +1,3 @@ -package dev.yokai.core.migration +package yokai.core.migration typealias MigrationCompletedListener = () -> Unit diff --git a/app/src/main/java/dev/yokai/core/migration/MigrationContext.kt b/app/src/main/java/yokai/core/migration/MigrationContext.kt similarity index 84% rename from app/src/main/java/dev/yokai/core/migration/MigrationContext.kt rename to app/src/main/java/yokai/core/migration/MigrationContext.kt index 16c8d096b7..ceb1f37971 100644 --- a/app/src/main/java/dev/yokai/core/migration/MigrationContext.kt +++ b/app/src/main/java/yokai/core/migration/MigrationContext.kt @@ -1,4 +1,4 @@ -package dev.yokai.core.migration +package yokai.core.migration import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/dev/yokai/core/migration/MigrationJobFactory.kt b/app/src/main/java/yokai/core/migration/MigrationJobFactory.kt similarity index 97% rename from app/src/main/java/dev/yokai/core/migration/MigrationJobFactory.kt rename to app/src/main/java/yokai/core/migration/MigrationJobFactory.kt index c83279f2ea..df5c3963bd 100644 --- a/app/src/main/java/dev/yokai/core/migration/MigrationJobFactory.kt +++ b/app/src/main/java/yokai/core/migration/MigrationJobFactory.kt @@ -1,4 +1,4 @@ -package dev.yokai.core.migration +package yokai.core.migration import co.touchlab.kermit.Logger import kotlinx.coroutines.CompletableDeferred diff --git a/app/src/main/java/dev/yokai/core/migration/MigrationStrategy.kt b/app/src/main/java/yokai/core/migration/MigrationStrategy.kt similarity index 98% rename from app/src/main/java/dev/yokai/core/migration/MigrationStrategy.kt rename to app/src/main/java/yokai/core/migration/MigrationStrategy.kt index 56e44bf8cc..2cc7ac71b2 100644 --- a/app/src/main/java/dev/yokai/core/migration/MigrationStrategy.kt +++ b/app/src/main/java/yokai/core/migration/MigrationStrategy.kt @@ -1,4 +1,4 @@ -package dev.yokai.core.migration +package yokai.core.migration import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/dev/yokai/core/migration/MigrationStrategyFactory.kt b/app/src/main/java/yokai/core/migration/MigrationStrategyFactory.kt similarity index 95% rename from app/src/main/java/dev/yokai/core/migration/MigrationStrategyFactory.kt rename to app/src/main/java/yokai/core/migration/MigrationStrategyFactory.kt index 2094ffebb0..781a177871 100644 --- a/app/src/main/java/dev/yokai/core/migration/MigrationStrategyFactory.kt +++ b/app/src/main/java/yokai/core/migration/MigrationStrategyFactory.kt @@ -1,4 +1,4 @@ -package dev.yokai.core.migration +package yokai.core.migration class MigrationStrategyFactory( private val factory: MigrationJobFactory, diff --git a/app/src/main/java/dev/yokai/core/migration/Migrator.kt b/app/src/main/java/yokai/core/migration/Migrator.kt similarity index 97% rename from app/src/main/java/dev/yokai/core/migration/Migrator.kt rename to app/src/main/java/yokai/core/migration/Migrator.kt index 52ecbe105f..89b83b4830 100644 --- a/app/src/main/java/dev/yokai/core/migration/Migrator.kt +++ b/app/src/main/java/yokai/core/migration/Migrator.kt @@ -1,4 +1,4 @@ -package dev.yokai.core.migration +package yokai.core.migration import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/ChapterCacheMigration.kt b/app/src/main/java/yokai/core/migration/migrations/ChapterCacheMigration.kt similarity index 82% rename from app/src/main/java/dev/yokai/core/migration/migrations/ChapterCacheMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/ChapterCacheMigration.kt index 3b2793be1d..8ad3be15b6 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/ChapterCacheMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/ChapterCacheMigration.kt @@ -1,8 +1,8 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext import java.io.File /** diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/CoverCacheMigration.kt b/app/src/main/java/yokai/core/migration/migrations/CoverCacheMigration.kt similarity index 83% rename from app/src/main/java/dev/yokai/core/migration/migrations/CoverCacheMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/CoverCacheMigration.kt index ad1f809258..2ba0635cea 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/CoverCacheMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/CoverCacheMigration.kt @@ -1,8 +1,8 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext import java.io.File /** diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/CustomInfoMigration.kt b/app/src/main/java/yokai/core/migration/migrations/CustomInfoMigration.kt similarity index 73% rename from app/src/main/java/dev/yokai/core/migration/migrations/CustomInfoMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/CustomInfoMigration.kt index ecc043d567..609c7f0850 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/CustomInfoMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/CustomInfoMigration.kt @@ -1,8 +1,8 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.ui.library.LibraryPresenter +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class CustomInfoMigration : Migration { override val version: Float = 66f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/CutoutMigration.kt b/app/src/main/java/yokai/core/migration/migrations/CutoutMigration.kt similarity index 82% rename from app/src/main/java/dev/yokai/core/migration/migrations/CutoutMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/CutoutMigration.kt index ff030c0495..f4ff91ce3f 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/CutoutMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/CutoutMigration.kt @@ -1,14 +1,14 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import androidx.preference.PreferenceManager -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext -import dev.yokai.domain.ui.settings.ReaderPreferences -import dev.yokai.domain.ui.settings.ReaderPreferences.CutoutBehaviour -import dev.yokai.domain.ui.settings.ReaderPreferences.LandscapeCutoutBehaviour import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.data.preference.PreferenceKeys import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerConfig +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext +import yokai.domain.ui.settings.ReaderPreferences +import yokai.domain.ui.settings.ReaderPreferences.CutoutBehaviour +import yokai.domain.ui.settings.ReaderPreferences.LandscapeCutoutBehaviour class CutoutMigration : Migration { override val version: Float = 121f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/DoHMigration.kt b/app/src/main/java/yokai/core/migration/migrations/DoHMigration.kt similarity index 86% rename from app/src/main/java/dev/yokai/core/migration/migrations/DoHMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/DoHMigration.kt index dc8fa5e6fe..a4c075faa0 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/DoHMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/DoHMigration.kt @@ -1,12 +1,12 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import androidx.core.content.edit import androidx.preference.PreferenceManager -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.data.preference.PreferenceKeys import eu.kanade.tachiyomi.network.PREF_DOH_CLOUDFLARE +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class DoHMigration : Migration { override val version: Float = 71f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/DownloadedChaptersMigration.kt b/app/src/main/java/yokai/core/migration/migrations/DownloadedChaptersMigration.kt similarity index 74% rename from app/src/main/java/dev/yokai/core/migration/migrations/DownloadedChaptersMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/DownloadedChaptersMigration.kt index 495a78b48d..617d5b4d04 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/DownloadedChaptersMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/DownloadedChaptersMigration.kt @@ -1,9 +1,9 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.data.download.DownloadProvider +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class DownloadedChaptersMigration : Migration { override val version: Float = 54f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/EnabledLanguageMigration.kt b/app/src/main/java/yokai/core/migration/migrations/EnabledLanguageMigration.kt similarity index 81% rename from app/src/main/java/dev/yokai/core/migration/migrations/EnabledLanguageMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/EnabledLanguageMigration.kt index 4a4d4d8589..94606f6287 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/EnabledLanguageMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/EnabledLanguageMigration.kt @@ -1,10 +1,10 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.plusAssign +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class EnabledLanguageMigration : Migration { override val version: Float = 83f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/EvernoteJobUpgradeMigration.kt b/app/src/main/java/yokai/core/migration/migrations/EvernoteJobUpgradeMigration.kt similarity index 82% rename from app/src/main/java/dev/yokai/core/migration/migrations/EvernoteJobUpgradeMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/EvernoteJobUpgradeMigration.kt index 8156de774c..fde6f98c2e 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/EvernoteJobUpgradeMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/EvernoteJobUpgradeMigration.kt @@ -1,11 +1,11 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.data.library.LibraryUpdateJob import eu.kanade.tachiyomi.data.updater.AppUpdateJob +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext /** * Restore jobs after upgrading to evernote's job scheduler. diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/ExtensionInstallerEnumMigration.kt b/app/src/main/java/yokai/core/migration/migrations/ExtensionInstallerEnumMigration.kt similarity index 87% rename from app/src/main/java/dev/yokai/core/migration/migrations/ExtensionInstallerEnumMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/ExtensionInstallerEnumMigration.kt index 1993733182..d3aada9dd1 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/ExtensionInstallerEnumMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/ExtensionInstallerEnumMigration.kt @@ -1,10 +1,10 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import androidx.preference.PreferenceManager -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext -import dev.yokai.domain.base.BasePreferences import eu.kanade.tachiyomi.App +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext +import yokai.domain.base.BasePreferences /** * Upstream no longer use Int for extension installer prefs, this solves incompatibility with upstreams backup diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/InternalChapterCacheUpdateMigration.kt b/app/src/main/java/yokai/core/migration/migrations/InternalChapterCacheUpdateMigration.kt similarity index 76% rename from app/src/main/java/dev/yokai/core/migration/migrations/InternalChapterCacheUpdateMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/InternalChapterCacheUpdateMigration.kt index ab21e51f0d..f46459c4d3 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/InternalChapterCacheUpdateMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/InternalChapterCacheUpdateMigration.kt @@ -1,8 +1,8 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext import java.io.File /** diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/LibrarySortMigration.kt b/app/src/main/java/yokai/core/migration/migrations/LibrarySortMigration.kt similarity index 87% rename from app/src/main/java/dev/yokai/core/migration/migrations/LibrarySortMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/LibrarySortMigration.kt index 643c74b9a4..a93d94d81e 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/LibrarySortMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/LibrarySortMigration.kt @@ -1,11 +1,11 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import androidx.core.content.edit import androidx.preference.PreferenceManager -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.ui.library.LibrarySort +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class LibrarySortMigration : Migration { override val version: Float = 110f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/LibraryUpdateResetMigration.kt b/app/src/main/java/yokai/core/migration/migrations/LibraryUpdateResetMigration.kt similarity index 76% rename from app/src/main/java/dev/yokai/core/migration/migrations/LibraryUpdateResetMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/LibraryUpdateResetMigration.kt index 82ff102477..8076de703b 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/LibraryUpdateResetMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/LibraryUpdateResetMigration.kt @@ -1,9 +1,9 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.data.library.LibraryUpdateJob +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class LibraryUpdateResetMigration : Migration { override val version: Float = 105f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/Migrations.kt b/app/src/main/java/yokai/core/migration/migrations/Migrations.kt similarity index 92% rename from app/src/main/java/dev/yokai/core/migration/migrations/Migrations.kt rename to app/src/main/java/yokai/core/migration/migrations/Migrations.kt index 4acbc83755..67c33c0a11 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/Migrations.kt +++ b/app/src/main/java/yokai/core/migration/migrations/Migrations.kt @@ -1,8 +1,8 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf +import yokai.core.migration.Migration val migrations: ImmutableList = persistentListOf( SetupAppUpdateMigration(), diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/MyAnimeListMigration.kt b/app/src/main/java/yokai/core/migration/migrations/MyAnimeListMigration.kt similarity index 85% rename from app/src/main/java/dev/yokai/core/migration/migrations/MyAnimeListMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/MyAnimeListMigration.kt index 8585ba6173..c299c511c1 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/MyAnimeListMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/MyAnimeListMigration.kt @@ -1,11 +1,11 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.util.system.toast +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext /** * Force MAL log out due to login flow change diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/NetworkPrefsMigration.kt b/app/src/main/java/yokai/core/migration/migrations/NetworkPrefsMigration.kt similarity index 83% rename from app/src/main/java/dev/yokai/core/migration/migrations/NetworkPrefsMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/NetworkPrefsMigration.kt index f52aed4ddd..8a153c96e6 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/NetworkPrefsMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/NetworkPrefsMigration.kt @@ -1,10 +1,10 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import androidx.preference.PreferenceManager -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.network.NetworkPreferences +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class NetworkPrefsMigration : Migration { override val version: Float = 137f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/PrefsMigration.kt b/app/src/main/java/yokai/core/migration/migrations/PrefsMigration.kt similarity index 90% rename from app/src/main/java/dev/yokai/core/migration/migrations/PrefsMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/PrefsMigration.kt index 5c3fe365e1..7798916d35 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/PrefsMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/PrefsMigration.kt @@ -1,12 +1,12 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import androidx.preference.PreferenceManager -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.data.preference.PreferenceValues import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.recents.RecentsPresenter +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext import kotlin.math.max class PrefsMigration : Migration { diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/ReaderUpdateMigration.kt b/app/src/main/java/yokai/core/migration/migrations/ReaderUpdateMigration.kt similarity index 87% rename from app/src/main/java/dev/yokai/core/migration/migrations/ReaderUpdateMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/ReaderUpdateMigration.kt index 0d3df4acab..b75355df8d 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/ReaderUpdateMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/ReaderUpdateMigration.kt @@ -1,12 +1,12 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import androidx.preference.PreferenceManager -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.library.LibraryPresenter import eu.kanade.tachiyomi.util.system.withIOContext +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class ReaderUpdateMigration : Migration { override val version: Float = 88f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/RepoJsonMigration.kt b/app/src/main/java/yokai/core/migration/migrations/RepoJsonMigration.kt similarity index 82% rename from app/src/main/java/dev/yokai/core/migration/migrations/RepoJsonMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/RepoJsonMigration.kt index 2f2318bf66..9ef7b1b3d2 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/RepoJsonMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/RepoJsonMigration.kt @@ -1,13 +1,13 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import co.touchlab.kermit.Logger -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext -import dev.yokai.domain.extension.repo.ExtensionRepoRepository -import dev.yokai.domain.extension.repo.exception.SaveExtensionRepoException import eu.kanade.tachiyomi.core.preference.Preference import eu.kanade.tachiyomi.core.preference.PreferenceStore import eu.kanade.tachiyomi.util.system.withIOContext +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext +import yokai.domain.extension.repo.ExtensionRepoRepository +import yokai.domain.extension.repo.exception.SaveExtensionRepoException class RepoJsonMigration : Migration { override val version: Float = 130f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/RotationTypeEnumMigration.kt b/app/src/main/java/yokai/core/migration/migrations/RotationTypeEnumMigration.kt similarity index 91% rename from app/src/main/java/dev/yokai/core/migration/migrations/RotationTypeEnumMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/RotationTypeEnumMigration.kt index 48a24fa251..ae3da7a410 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/RotationTypeEnumMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/RotationTypeEnumMigration.kt @@ -1,11 +1,11 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import androidx.core.content.edit import androidx.preference.PreferenceManager -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.ui.reader.settings.OrientationType +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class RotationTypeEnumMigration : Migration { override val version: Float = 77f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/RotationTypeMigration.kt b/app/src/main/java/yokai/core/migration/migrations/RotationTypeMigration.kt similarity index 81% rename from app/src/main/java/dev/yokai/core/migration/migrations/RotationTypeMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/RotationTypeMigration.kt index a990cbf873..d505aac434 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/RotationTypeMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/RotationTypeMigration.kt @@ -1,10 +1,10 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import androidx.core.content.edit import androidx.preference.PreferenceManager -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class RotationTypeMigration : Migration { override val version: Float = 73f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/SetupAppUpdateMigration.kt b/app/src/main/java/yokai/core/migration/migrations/SetupAppUpdateMigration.kt similarity index 78% rename from app/src/main/java/dev/yokai/core/migration/migrations/SetupAppUpdateMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/SetupAppUpdateMigration.kt index 6006fd171e..f0b4bf0792 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/SetupAppUpdateMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/SetupAppUpdateMigration.kt @@ -1,10 +1,10 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.data.updater.AppUpdateJob +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class SetupAppUpdateMigration : Migration { override val version: Float = Migration.ALWAYS diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/SetupBackupCreateMigration.kt b/app/src/main/java/yokai/core/migration/migrations/SetupBackupCreateMigration.kt similarity index 75% rename from app/src/main/java/dev/yokai/core/migration/migrations/SetupBackupCreateMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/SetupBackupCreateMigration.kt index b535e435cb..c8ae6a0c36 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/SetupBackupCreateMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/SetupBackupCreateMigration.kt @@ -1,9 +1,9 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.data.backup.create.BackupCreatorJob +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class SetupBackupCreateMigration : Migration { override val version: Float = Migration.ALWAYS diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/SetupExtensionUpdateMigration.kt b/app/src/main/java/yokai/core/migration/migrations/SetupExtensionUpdateMigration.kt similarity index 75% rename from app/src/main/java/dev/yokai/core/migration/migrations/SetupExtensionUpdateMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/SetupExtensionUpdateMigration.kt index 507a5eb6d1..225d52d26f 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/SetupExtensionUpdateMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/SetupExtensionUpdateMigration.kt @@ -1,9 +1,9 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.extension.ExtensionUpdateJob +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class SetupExtensionUpdateMigration : Migration { override val version: Float = Migration.ALWAYS diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/SetupLibraryUpdateMigration.kt b/app/src/main/java/yokai/core/migration/migrations/SetupLibraryUpdateMigration.kt similarity index 75% rename from app/src/main/java/dev/yokai/core/migration/migrations/SetupLibraryUpdateMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/SetupLibraryUpdateMigration.kt index fd6d3de533..029d9e91d2 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/SetupLibraryUpdateMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/SetupLibraryUpdateMigration.kt @@ -1,9 +1,9 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.data.library.LibraryUpdateJob +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class SetupLibraryUpdateMigration : Migration { override val version: Float = Migration.ALWAYS diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/ShortcutsMigration.kt b/app/src/main/java/yokai/core/migration/migrations/ShortcutsMigration.kt similarity index 91% rename from app/src/main/java/dev/yokai/core/migration/migrations/ShortcutsMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/ShortcutsMigration.kt index 195a638c95..5512494c40 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/ShortcutsMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/ShortcutsMigration.kt @@ -1,13 +1,13 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import androidx.core.content.edit import androidx.preference.PreferenceManager -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.data.library.LibraryUpdateJob import eu.kanade.tachiyomi.data.preference.PreferenceKeys import eu.kanade.tachiyomi.data.preference.PreferencesHelper +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class ShortcutsMigration : Migration { override val version: Float = 75f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/ThePurgeMigration.kt b/app/src/main/java/yokai/core/migration/migrations/ThePurgeMigration.kt similarity index 79% rename from app/src/main/java/dev/yokai/core/migration/migrations/ThePurgeMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/ThePurgeMigration.kt index e739dd15fc..5953873ea9 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/ThePurgeMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/ThePurgeMigration.kt @@ -1,10 +1,10 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations import androidx.core.content.edit import androidx.preference.PreferenceManager -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class ThePurgeMigration : Migration { override val version: Float = 112f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/TrackerPrivateSettingsMigration.kt b/app/src/main/java/yokai/core/migration/migrations/TrackerPrivateSettingsMigration.kt similarity index 86% rename from app/src/main/java/dev/yokai/core/migration/migrations/TrackerPrivateSettingsMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/TrackerPrivateSettingsMigration.kt index 6aff6401ff..a3200a4d60 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/TrackerPrivateSettingsMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/TrackerPrivateSettingsMigration.kt @@ -1,9 +1,9 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.core.preference.Preference import eu.kanade.tachiyomi.core.preference.PreferenceStore +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class TrackerPrivateSettingsMigration : Migration { override val version: Float = 108f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/UpdateIntervalMigration.kt b/app/src/main/java/yokai/core/migration/migrations/UpdateIntervalMigration.kt similarity index 85% rename from app/src/main/java/dev/yokai/core/migration/migrations/UpdateIntervalMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/UpdateIntervalMigration.kt index 1569b96d18..a86649a6eb 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/UpdateIntervalMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/UpdateIntervalMigration.kt @@ -1,10 +1,10 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.data.library.LibraryUpdateJob import eu.kanade.tachiyomi.data.preference.PreferencesHelper +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext class UpdateIntervalMigration : Migration { override val version: Float = 86f diff --git a/app/src/main/java/dev/yokai/core/migration/migrations/WorkManagerMigration.kt b/app/src/main/java/yokai/core/migration/migrations/WorkManagerMigration.kt similarity index 87% rename from app/src/main/java/dev/yokai/core/migration/migrations/WorkManagerMigration.kt rename to app/src/main/java/yokai/core/migration/migrations/WorkManagerMigration.kt index 9eff8814cf..2417b203d7 100644 --- a/app/src/main/java/dev/yokai/core/migration/migrations/WorkManagerMigration.kt +++ b/app/src/main/java/yokai/core/migration/migrations/WorkManagerMigration.kt @@ -1,7 +1,5 @@ -package dev.yokai.core.migration.migrations +package yokai.core.migration.migrations -import dev.yokai.core.migration.Migration -import dev.yokai.core.migration.MigrationContext import eu.kanade.tachiyomi.App import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.data.backup.create.BackupCreatorJob @@ -9,6 +7,8 @@ import eu.kanade.tachiyomi.data.library.LibraryUpdateJob import eu.kanade.tachiyomi.data.updater.AppUpdateJob import eu.kanade.tachiyomi.extension.ExtensionUpdateJob import eu.kanade.tachiyomi.ui.library.LibraryPresenter +import yokai.core.migration.Migration +import yokai.core.migration.MigrationContext /** * Restore jobs after migrating from Evernote's job scheduler to WorkManager. diff --git a/app/src/main/java/dev/yokai/data/AndroidDatabaseHandler.kt b/app/src/main/java/yokai/data/AndroidDatabaseHandler.kt similarity index 99% rename from app/src/main/java/dev/yokai/data/AndroidDatabaseHandler.kt rename to app/src/main/java/yokai/data/AndroidDatabaseHandler.kt index 8ed92f3e92..e66d3b2fe8 100644 --- a/app/src/main/java/dev/yokai/data/AndroidDatabaseHandler.kt +++ b/app/src/main/java/yokai/data/AndroidDatabaseHandler.kt @@ -1,4 +1,4 @@ -package dev.yokai.data +package yokai.data import app.cash.sqldelight.Query import app.cash.sqldelight.coroutines.asFlow diff --git a/app/src/main/java/dev/yokai/data/DatabaseAdapter.kt b/app/src/main/java/yokai/data/DatabaseAdapter.kt similarity index 93% rename from app/src/main/java/dev/yokai/data/DatabaseAdapter.kt rename to app/src/main/java/yokai/data/DatabaseAdapter.kt index d26141845e..9c60ce4a38 100644 --- a/app/src/main/java/dev/yokai/data/DatabaseAdapter.kt +++ b/app/src/main/java/yokai/data/DatabaseAdapter.kt @@ -1,7 +1,7 @@ -package dev.yokai.data +package yokai.data import app.cash.sqldelight.ColumnAdapter -import java.util.Date +import java.util.* val dateAdapter = object : ColumnAdapter { override fun decode(databaseValue: Long): Date = Date(databaseValue) diff --git a/app/src/main/java/dev/yokai/data/DatabaseHandler.kt b/app/src/main/java/yokai/data/DatabaseHandler.kt similarity index 94% rename from app/src/main/java/dev/yokai/data/DatabaseHandler.kt rename to app/src/main/java/yokai/data/DatabaseHandler.kt index 5232f8cb2e..8297d8a927 100644 --- a/app/src/main/java/dev/yokai/data/DatabaseHandler.kt +++ b/app/src/main/java/yokai/data/DatabaseHandler.kt @@ -1,7 +1,6 @@ -package dev.yokai.data +package yokai.data import app.cash.sqldelight.Query -import app.cash.sqldelight.Transacter import kotlinx.coroutines.flow.Flow import tachiyomi.data.Database diff --git a/app/src/main/java/dev/yokai/data/TransactionContext.kt b/app/src/main/java/yokai/data/TransactionContext.kt similarity index 98% rename from app/src/main/java/dev/yokai/data/TransactionContext.kt rename to app/src/main/java/yokai/data/TransactionContext.kt index 53e0086c1b..14e74a50d7 100644 --- a/app/src/main/java/dev/yokai/data/TransactionContext.kt +++ b/app/src/main/java/yokai/data/TransactionContext.kt @@ -1,4 +1,4 @@ -package dev.yokai.data +package yokai.data import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Job @@ -6,8 +6,8 @@ import kotlinx.coroutines.asContextElement import kotlinx.coroutines.runBlocking import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.withContext -import java.util.concurrent.RejectedExecutionException -import java.util.concurrent.atomic.AtomicInteger +import java.util.concurrent.* +import java.util.concurrent.atomic.* import kotlin.coroutines.ContinuationInterceptor import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext diff --git a/app/src/main/java/dev/yokai/data/chapter/ChapterRepositoryImpl.kt b/app/src/main/java/yokai/data/chapter/ChapterRepositoryImpl.kt similarity index 89% rename from app/src/main/java/dev/yokai/data/chapter/ChapterRepositoryImpl.kt rename to app/src/main/java/yokai/data/chapter/ChapterRepositoryImpl.kt index 95b2375261..9d471e5f10 100644 --- a/app/src/main/java/dev/yokai/data/chapter/ChapterRepositoryImpl.kt +++ b/app/src/main/java/yokai/data/chapter/ChapterRepositoryImpl.kt @@ -1,10 +1,10 @@ -package dev.yokai.data.chapter +package yokai.data.chapter -import dev.yokai.data.DatabaseHandler -import dev.yokai.domain.chapter.ChapterRepository import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.util.system.toInt import kotlinx.coroutines.flow.Flow +import yokai.data.DatabaseHandler +import yokai.domain.chapter.ChapterRepository class ChapterRepositoryImpl(private val handler: DatabaseHandler) : ChapterRepository { override suspend fun getChapters(mangaId: Long, filterScanlators: Boolean): List = diff --git a/app/src/main/java/dev/yokai/data/extension/repo/ExtensionRepoRepositoryImpl.kt b/app/src/main/java/yokai/data/extension/repo/ExtensionRepoRepositoryImpl.kt similarity index 90% rename from app/src/main/java/dev/yokai/data/extension/repo/ExtensionRepoRepositoryImpl.kt rename to app/src/main/java/yokai/data/extension/repo/ExtensionRepoRepositoryImpl.kt index dbcce92598..a85e870b30 100644 --- a/app/src/main/java/dev/yokai/data/extension/repo/ExtensionRepoRepositoryImpl.kt +++ b/app/src/main/java/yokai/data/extension/repo/ExtensionRepoRepositoryImpl.kt @@ -1,12 +1,12 @@ -package dev.yokai.data.extension.repo +package yokai.data.extension.repo import android.database.sqlite.SQLiteException -import dev.yokai.data.DatabaseHandler -import dev.yokai.domain.extension.repo.ExtensionRepoRepository -import dev.yokai.domain.extension.repo.exception.SaveExtensionRepoException -import dev.yokai.domain.extension.repo.model.ExtensionRepo import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map +import yokai.data.DatabaseHandler +import yokai.domain.extension.repo.ExtensionRepoRepository +import yokai.domain.extension.repo.exception.SaveExtensionRepoException +import yokai.domain.extension.repo.model.ExtensionRepo class ExtensionRepoRepositoryImpl(private val handler: DatabaseHandler): ExtensionRepoRepository { override fun subscribeAll(): Flow> = diff --git a/app/src/main/java/dev/yokai/data/library/custom/CustomMangaRepositoryImpl.kt b/app/src/main/java/yokai/data/library/custom/CustomMangaRepositoryImpl.kt similarity index 90% rename from app/src/main/java/dev/yokai/data/library/custom/CustomMangaRepositoryImpl.kt rename to app/src/main/java/yokai/data/library/custom/CustomMangaRepositoryImpl.kt index 4d290162cf..b599c5c49f 100644 --- a/app/src/main/java/dev/yokai/data/library/custom/CustomMangaRepositoryImpl.kt +++ b/app/src/main/java/yokai/data/library/custom/CustomMangaRepositoryImpl.kt @@ -1,13 +1,13 @@ -package dev.yokai.data.library.custom +package yokai.data.library.custom import android.database.sqlite.SQLiteException import co.touchlab.kermit.Logger -import dev.yokai.data.DatabaseHandler -import dev.yokai.domain.library.custom.CustomMangaRepository -import dev.yokai.domain.library.custom.exception.SaveCustomMangaException -import dev.yokai.domain.library.custom.model.CustomMangaInfo import eu.kanade.tachiyomi.util.system.e import kotlinx.coroutines.flow.Flow +import yokai.data.DatabaseHandler +import yokai.domain.library.custom.CustomMangaRepository +import yokai.domain.library.custom.exception.SaveCustomMangaException +import yokai.domain.library.custom.model.CustomMangaInfo class CustomMangaRepositoryImpl(private val handler: DatabaseHandler) : CustomMangaRepository { override fun subscribeAll(): Flow> = diff --git a/app/src/main/java/dev/yokai/data/manga/MangaRepositoryImpl.kt b/app/src/main/java/yokai/data/manga/MangaRepositoryImpl.kt similarity index 87% rename from app/src/main/java/dev/yokai/data/manga/MangaRepositoryImpl.kt rename to app/src/main/java/yokai/data/manga/MangaRepositoryImpl.kt index 0874543ac6..71f190e9ff 100644 --- a/app/src/main/java/dev/yokai/data/manga/MangaRepositoryImpl.kt +++ b/app/src/main/java/yokai/data/manga/MangaRepositoryImpl.kt @@ -1,10 +1,10 @@ -package dev.yokai.data.manga +package yokai.data.manga -import dev.yokai.data.DatabaseHandler -import dev.yokai.domain.manga.MangaRepository import eu.kanade.tachiyomi.data.database.models.LibraryManga import eu.kanade.tachiyomi.data.database.models.Manga import kotlinx.coroutines.flow.Flow +import yokai.data.DatabaseHandler +import yokai.domain.manga.MangaRepository class MangaRepositoryImpl(private val handler: DatabaseHandler) : MangaRepository { override suspend fun getManga(): List = diff --git a/app/src/main/java/dev/yokai/domain/ComposableAlertDialog.kt b/app/src/main/java/yokai/domain/ComposableAlertDialog.kt similarity index 92% rename from app/src/main/java/dev/yokai/domain/ComposableAlertDialog.kt rename to app/src/main/java/yokai/domain/ComposableAlertDialog.kt index aaaa768a90..9be777dd38 100644 --- a/app/src/main/java/dev/yokai/domain/ComposableAlertDialog.kt +++ b/app/src/main/java/yokai/domain/ComposableAlertDialog.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain +package yokai.domain import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue diff --git a/app/src/main/java/dev/yokai/domain/Result.kt b/app/src/main/java/yokai/domain/Result.kt similarity index 89% rename from app/src/main/java/dev/yokai/domain/Result.kt rename to app/src/main/java/yokai/domain/Result.kt index 5267482aac..0af255791d 100644 --- a/app/src/main/java/dev/yokai/domain/Result.kt +++ b/app/src/main/java/yokai/domain/Result.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain +package yokai.domain sealed class Result { data class Success(val data: T? = null) : Result() diff --git a/app/src/main/java/dev/yokai/domain/SplashState.kt b/app/src/main/java/yokai/domain/SplashState.kt similarity index 72% rename from app/src/main/java/dev/yokai/domain/SplashState.kt rename to app/src/main/java/yokai/domain/SplashState.kt index be63e5bf26..2cf0df755e 100644 --- a/app/src/main/java/dev/yokai/domain/SplashState.kt +++ b/app/src/main/java/yokai/domain/SplashState.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain +package yokai.domain class SplashState { var shown = false diff --git a/app/src/main/java/dev/yokai/domain/base/BasePreferences.kt b/app/src/main/java/yokai/domain/base/BasePreferences.kt similarity index 98% rename from app/src/main/java/dev/yokai/domain/base/BasePreferences.kt rename to app/src/main/java/yokai/domain/base/BasePreferences.kt index d141611d19..2d2754d087 100644 --- a/app/src/main/java/dev/yokai/domain/base/BasePreferences.kt +++ b/app/src/main/java/yokai/domain/base/BasePreferences.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.base +package yokai.domain.base import androidx.annotation.StringRes import eu.kanade.tachiyomi.R diff --git a/app/src/main/java/dev/yokai/domain/base/models/Version.kt b/app/src/main/java/yokai/domain/base/models/Version.kt similarity index 98% rename from app/src/main/java/dev/yokai/domain/base/models/Version.kt rename to app/src/main/java/yokai/domain/base/models/Version.kt index d80e95dfd8..c1c70e11f1 100644 --- a/app/src/main/java/dev/yokai/domain/base/models/Version.kt +++ b/app/src/main/java/yokai/domain/base/models/Version.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.base.models +package yokai.domain.base.models data class Version( val type: Type, diff --git a/app/src/main/java/dev/yokai/domain/chapter/ChapterRepository.kt b/app/src/main/java/yokai/domain/chapter/ChapterRepository.kt similarity index 93% rename from app/src/main/java/dev/yokai/domain/chapter/ChapterRepository.kt rename to app/src/main/java/yokai/domain/chapter/ChapterRepository.kt index 34c0d23e75..c241b3f291 100644 --- a/app/src/main/java/dev/yokai/domain/chapter/ChapterRepository.kt +++ b/app/src/main/java/yokai/domain/chapter/ChapterRepository.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.chapter +package yokai.domain.chapter import eu.kanade.tachiyomi.data.database.models.Chapter import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/dev/yokai/domain/chapter/interactor/GetAvailableScanlators.kt b/app/src/main/java/yokai/domain/chapter/interactor/GetAvailableScanlators.kt similarity index 74% rename from app/src/main/java/dev/yokai/domain/chapter/interactor/GetAvailableScanlators.kt rename to app/src/main/java/yokai/domain/chapter/interactor/GetAvailableScanlators.kt index e5dfceb7d5..8fd46a6381 100644 --- a/app/src/main/java/dev/yokai/domain/chapter/interactor/GetAvailableScanlators.kt +++ b/app/src/main/java/yokai/domain/chapter/interactor/GetAvailableScanlators.kt @@ -1,6 +1,6 @@ -package dev.yokai.domain.chapter.interactor +package yokai.domain.chapter.interactor -import dev.yokai.domain.chapter.ChapterRepository +import yokai.domain.chapter.ChapterRepository class GetAvailableScanlators( private val chapterRepository: ChapterRepository, diff --git a/app/src/main/java/dev/yokai/domain/chapter/interactor/GetChapters.kt b/app/src/main/java/yokai/domain/chapter/interactor/GetChapters.kt similarity index 85% rename from app/src/main/java/dev/yokai/domain/chapter/interactor/GetChapters.kt rename to app/src/main/java/yokai/domain/chapter/interactor/GetChapters.kt index 66bb1a4bb1..66cea3f52e 100644 --- a/app/src/main/java/dev/yokai/domain/chapter/interactor/GetChapters.kt +++ b/app/src/main/java/yokai/domain/chapter/interactor/GetChapters.kt @@ -1,7 +1,7 @@ -package dev.yokai.domain.chapter.interactor +package yokai.domain.chapter.interactor -import dev.yokai.domain.chapter.ChapterRepository import eu.kanade.tachiyomi.data.database.models.Manga +import yokai.domain.chapter.ChapterRepository class GetChapters( private val chapterRepository: ChapterRepository, diff --git a/app/src/main/java/dev/yokai/domain/download/DownloadPreferences.kt b/app/src/main/java/yokai/domain/download/DownloadPreferences.kt similarity index 86% rename from app/src/main/java/dev/yokai/domain/download/DownloadPreferences.kt rename to app/src/main/java/yokai/domain/download/DownloadPreferences.kt index 67cf5d9363..6b92f6281e 100644 --- a/app/src/main/java/dev/yokai/domain/download/DownloadPreferences.kt +++ b/app/src/main/java/yokai/domain/download/DownloadPreferences.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.download +package yokai.domain.download import eu.kanade.tachiyomi.core.preference.PreferenceStore diff --git a/app/src/main/java/dev/yokai/domain/extension/interactor/TrustExtension.kt b/app/src/main/java/yokai/domain/extension/interactor/TrustExtension.kt similarity index 84% rename from app/src/main/java/dev/yokai/domain/extension/interactor/TrustExtension.kt rename to app/src/main/java/yokai/domain/extension/interactor/TrustExtension.kt index bfedc29ef6..356ebeb1a2 100644 --- a/app/src/main/java/dev/yokai/domain/extension/interactor/TrustExtension.kt +++ b/app/src/main/java/yokai/domain/extension/interactor/TrustExtension.kt @@ -1,12 +1,10 @@ -package dev.yokai.domain.extension.interactor +package yokai.domain.extension.interactor import android.content.pm.PackageInfo import androidx.core.content.pm.PackageInfoCompat -import dev.yokai.domain.extension.repo.ExtensionRepoRepository -import dev.yokai.domain.source.SourcePreferences import eu.kanade.tachiyomi.core.preference.getAndSet -import uy.kohesive.injekt.Injekt -import uy.kohesive.injekt.api.get +import yokai.domain.extension.repo.ExtensionRepoRepository +import yokai.domain.source.SourcePreferences class TrustExtension( private val extensionRepoRepository: ExtensionRepoRepository, diff --git a/app/src/main/java/dev/yokai/domain/extension/repo/ExtensionRepoRepository.kt b/app/src/main/java/yokai/domain/extension/repo/ExtensionRepoRepository.kt similarity index 91% rename from app/src/main/java/dev/yokai/domain/extension/repo/ExtensionRepoRepository.kt rename to app/src/main/java/yokai/domain/extension/repo/ExtensionRepoRepository.kt index 10416beafc..b64d9cfb53 100644 --- a/app/src/main/java/dev/yokai/domain/extension/repo/ExtensionRepoRepository.kt +++ b/app/src/main/java/yokai/domain/extension/repo/ExtensionRepoRepository.kt @@ -1,7 +1,7 @@ -package dev.yokai.domain.extension.repo +package yokai.domain.extension.repo -import dev.yokai.domain.extension.repo.model.ExtensionRepo import kotlinx.coroutines.flow.Flow +import yokai.domain.extension.repo.model.ExtensionRepo interface ExtensionRepoRepository { fun subscribeAll(): Flow> diff --git a/app/src/main/java/dev/yokai/domain/extension/repo/exception/SaveExtensionRepoException.kt b/app/src/main/java/yokai/domain/extension/repo/exception/SaveExtensionRepoException.kt similarity index 86% rename from app/src/main/java/dev/yokai/domain/extension/repo/exception/SaveExtensionRepoException.kt rename to app/src/main/java/yokai/domain/extension/repo/exception/SaveExtensionRepoException.kt index bf7762a556..397705b526 100644 --- a/app/src/main/java/dev/yokai/domain/extension/repo/exception/SaveExtensionRepoException.kt +++ b/app/src/main/java/yokai/domain/extension/repo/exception/SaveExtensionRepoException.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.extension.repo.exception +package yokai.domain.extension.repo.exception import java.io.IOException diff --git a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/CreateExtensionRepo.kt b/app/src/main/java/yokai/domain/extension/repo/interactor/CreateExtensionRepo.kt similarity index 89% rename from app/src/main/java/dev/yokai/domain/extension/repo/interactor/CreateExtensionRepo.kt rename to app/src/main/java/yokai/domain/extension/repo/interactor/CreateExtensionRepo.kt index dedb58698b..c7e793a877 100644 --- a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/CreateExtensionRepo.kt +++ b/app/src/main/java/yokai/domain/extension/repo/interactor/CreateExtensionRepo.kt @@ -1,13 +1,13 @@ -package dev.yokai.domain.extension.repo.interactor +package yokai.domain.extension.repo.interactor import co.touchlab.kermit.Logger -import dev.yokai.domain.extension.repo.ExtensionRepoRepository -import dev.yokai.domain.extension.repo.exception.SaveExtensionRepoException -import dev.yokai.domain.extension.repo.model.ExtensionRepo -import dev.yokai.domain.extension.repo.service.ExtensionRepoService import eu.kanade.tachiyomi.network.NetworkHelper import okhttp3.OkHttpClient import uy.kohesive.injekt.injectLazy +import yokai.domain.extension.repo.ExtensionRepoRepository +import yokai.domain.extension.repo.exception.SaveExtensionRepoException +import yokai.domain.extension.repo.model.ExtensionRepo +import yokai.domain.extension.repo.service.ExtensionRepoService class CreateExtensionRepo( private val extensionRepoRepository: ExtensionRepoRepository diff --git a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/DeleteExtensionRepo.kt b/app/src/main/java/yokai/domain/extension/repo/interactor/DeleteExtensionRepo.kt similarity index 64% rename from app/src/main/java/dev/yokai/domain/extension/repo/interactor/DeleteExtensionRepo.kt rename to app/src/main/java/yokai/domain/extension/repo/interactor/DeleteExtensionRepo.kt index b0882df664..19926d3589 100644 --- a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/DeleteExtensionRepo.kt +++ b/app/src/main/java/yokai/domain/extension/repo/interactor/DeleteExtensionRepo.kt @@ -1,6 +1,6 @@ -package dev.yokai.domain.extension.repo.interactor +package yokai.domain.extension.repo.interactor -import dev.yokai.domain.extension.repo.ExtensionRepoRepository +import yokai.domain.extension.repo.ExtensionRepoRepository class DeleteExtensionRepo( private val extensionRepoRepository: ExtensionRepoRepository diff --git a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/GetExtensionRepo.kt b/app/src/main/java/yokai/domain/extension/repo/interactor/GetExtensionRepo.kt similarity index 63% rename from app/src/main/java/dev/yokai/domain/extension/repo/interactor/GetExtensionRepo.kt rename to app/src/main/java/yokai/domain/extension/repo/interactor/GetExtensionRepo.kt index 52be3f55c8..150afbd9ed 100644 --- a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/GetExtensionRepo.kt +++ b/app/src/main/java/yokai/domain/extension/repo/interactor/GetExtensionRepo.kt @@ -1,8 +1,8 @@ -package dev.yokai.domain.extension.repo.interactor +package yokai.domain.extension.repo.interactor -import dev.yokai.domain.extension.repo.ExtensionRepoRepository -import dev.yokai.domain.extension.repo.model.ExtensionRepo import kotlinx.coroutines.flow.Flow +import yokai.domain.extension.repo.ExtensionRepoRepository +import yokai.domain.extension.repo.model.ExtensionRepo class GetExtensionRepo( private val extensionRepoRepository: ExtensionRepoRepository diff --git a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/GetExtensionRepoCount.kt b/app/src/main/java/yokai/domain/extension/repo/interactor/GetExtensionRepoCount.kt similarity index 58% rename from app/src/main/java/dev/yokai/domain/extension/repo/interactor/GetExtensionRepoCount.kt rename to app/src/main/java/yokai/domain/extension/repo/interactor/GetExtensionRepoCount.kt index e41f63498b..e753d6ab2c 100644 --- a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/GetExtensionRepoCount.kt +++ b/app/src/main/java/yokai/domain/extension/repo/interactor/GetExtensionRepoCount.kt @@ -1,6 +1,6 @@ -package dev.yokai.domain.extension.repo.interactor +package yokai.domain.extension.repo.interactor -import dev.yokai.domain.extension.repo.ExtensionRepoRepository +import yokai.domain.extension.repo.ExtensionRepoRepository class GetExtensionRepoCount( private val extensionRepoRepository: ExtensionRepoRepository diff --git a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/ReplaceExtensionRepo.kt b/app/src/main/java/yokai/domain/extension/repo/interactor/ReplaceExtensionRepo.kt similarity index 54% rename from app/src/main/java/dev/yokai/domain/extension/repo/interactor/ReplaceExtensionRepo.kt rename to app/src/main/java/yokai/domain/extension/repo/interactor/ReplaceExtensionRepo.kt index 37f5fcea7b..5310ff81bb 100644 --- a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/ReplaceExtensionRepo.kt +++ b/app/src/main/java/yokai/domain/extension/repo/interactor/ReplaceExtensionRepo.kt @@ -1,7 +1,7 @@ -package dev.yokai.domain.extension.repo.interactor +package yokai.domain.extension.repo.interactor -import dev.yokai.domain.extension.repo.ExtensionRepoRepository -import dev.yokai.domain.extension.repo.model.ExtensionRepo +import yokai.domain.extension.repo.ExtensionRepoRepository +import yokai.domain.extension.repo.model.ExtensionRepo class ReplaceExtensionRepo( private val extensionRepoRepository: ExtensionRepoRepository diff --git a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/UpdateExtensionRepo.kt b/app/src/main/java/yokai/domain/extension/repo/interactor/UpdateExtensionRepo.kt similarity index 79% rename from app/src/main/java/dev/yokai/domain/extension/repo/interactor/UpdateExtensionRepo.kt rename to app/src/main/java/yokai/domain/extension/repo/interactor/UpdateExtensionRepo.kt index 19bcbe4e02..8494bc931e 100644 --- a/app/src/main/java/dev/yokai/domain/extension/repo/interactor/UpdateExtensionRepo.kt +++ b/app/src/main/java/yokai/domain/extension/repo/interactor/UpdateExtensionRepo.kt @@ -1,12 +1,12 @@ -package dev.yokai.domain.extension.repo.interactor +package yokai.domain.extension.repo.interactor -import dev.yokai.domain.extension.repo.ExtensionRepoRepository -import dev.yokai.domain.extension.repo.model.ExtensionRepo -import dev.yokai.domain.extension.repo.service.ExtensionRepoService import eu.kanade.tachiyomi.network.NetworkHelper import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll import kotlinx.coroutines.coroutineScope +import yokai.domain.extension.repo.ExtensionRepoRepository +import yokai.domain.extension.repo.model.ExtensionRepo +import yokai.domain.extension.repo.service.ExtensionRepoService class UpdateExtensionRepo( private val extensionRepoRepository: ExtensionRepoRepository, diff --git a/app/src/main/java/dev/yokai/domain/extension/repo/model/ExtensionRepo.kt b/app/src/main/java/yokai/domain/extension/repo/model/ExtensionRepo.kt similarity index 78% rename from app/src/main/java/dev/yokai/domain/extension/repo/model/ExtensionRepo.kt rename to app/src/main/java/yokai/domain/extension/repo/model/ExtensionRepo.kt index fc2eaa7fb5..338ea18944 100644 --- a/app/src/main/java/dev/yokai/domain/extension/repo/model/ExtensionRepo.kt +++ b/app/src/main/java/yokai/domain/extension/repo/model/ExtensionRepo.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.extension.repo.model +package yokai.domain.extension.repo.model data class ExtensionRepo( val baseUrl: String, diff --git a/app/src/main/java/dev/yokai/domain/extension/repo/service/ExtensionRepoService.kt b/app/src/main/java/yokai/domain/extension/repo/service/ExtensionRepoService.kt similarity index 94% rename from app/src/main/java/dev/yokai/domain/extension/repo/service/ExtensionRepoService.kt rename to app/src/main/java/yokai/domain/extension/repo/service/ExtensionRepoService.kt index 7af640dc3c..6facca5e46 100644 --- a/app/src/main/java/dev/yokai/domain/extension/repo/service/ExtensionRepoService.kt +++ b/app/src/main/java/yokai/domain/extension/repo/service/ExtensionRepoService.kt @@ -1,7 +1,6 @@ -package dev.yokai.domain.extension.repo.service +package yokai.domain.extension.repo.service import androidx.core.net.toUri -import dev.yokai.domain.extension.repo.model.ExtensionRepo import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.HttpException import eu.kanade.tachiyomi.network.awaitSuccess @@ -13,6 +12,7 @@ import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive import okhttp3.OkHttpClient import uy.kohesive.injekt.injectLazy +import yokai.domain.extension.repo.model.ExtensionRepo class ExtensionRepoService( private val client: OkHttpClient, diff --git a/app/src/main/java/dev/yokai/domain/library/custom/CustomMangaRepository.kt b/app/src/main/java/yokai/domain/library/custom/CustomMangaRepository.kt similarity index 90% rename from app/src/main/java/dev/yokai/domain/library/custom/CustomMangaRepository.kt rename to app/src/main/java/yokai/domain/library/custom/CustomMangaRepository.kt index a2cf529a2f..80cf303788 100644 --- a/app/src/main/java/dev/yokai/domain/library/custom/CustomMangaRepository.kt +++ b/app/src/main/java/yokai/domain/library/custom/CustomMangaRepository.kt @@ -1,7 +1,7 @@ -package dev.yokai.domain.library.custom +package yokai.domain.library.custom -import dev.yokai.domain.library.custom.model.CustomMangaInfo import kotlinx.coroutines.flow.Flow +import yokai.domain.library.custom.model.CustomMangaInfo interface CustomMangaRepository { fun subscribeAll(): Flow> diff --git a/app/src/main/java/dev/yokai/domain/library/custom/exception/SaveCustomMangaException.kt b/app/src/main/java/yokai/domain/library/custom/exception/SaveCustomMangaException.kt similarity index 86% rename from app/src/main/java/dev/yokai/domain/library/custom/exception/SaveCustomMangaException.kt rename to app/src/main/java/yokai/domain/library/custom/exception/SaveCustomMangaException.kt index d4af3e5a18..2297c7f1dc 100644 --- a/app/src/main/java/dev/yokai/domain/library/custom/exception/SaveCustomMangaException.kt +++ b/app/src/main/java/yokai/domain/library/custom/exception/SaveCustomMangaException.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.library.custom.exception +package yokai.domain.library.custom.exception import java.io.IOException diff --git a/app/src/main/java/dev/yokai/domain/library/custom/interactor/CreateCustomManga.kt b/app/src/main/java/yokai/domain/library/custom/interactor/CreateCustomManga.kt similarity index 75% rename from app/src/main/java/dev/yokai/domain/library/custom/interactor/CreateCustomManga.kt rename to app/src/main/java/yokai/domain/library/custom/interactor/CreateCustomManga.kt index a1bf1f392d..f9876761cd 100644 --- a/app/src/main/java/dev/yokai/domain/library/custom/interactor/CreateCustomManga.kt +++ b/app/src/main/java/yokai/domain/library/custom/interactor/CreateCustomManga.kt @@ -1,8 +1,8 @@ -package dev.yokai.domain.library.custom.interactor +package yokai.domain.library.custom.interactor -import dev.yokai.domain.library.custom.CustomMangaRepository -import dev.yokai.domain.library.custom.exception.SaveCustomMangaException -import dev.yokai.domain.library.custom.model.CustomMangaInfo +import yokai.domain.library.custom.CustomMangaRepository +import yokai.domain.library.custom.exception.SaveCustomMangaException +import yokai.domain.library.custom.model.CustomMangaInfo class CreateCustomManga( private val customMangaRepository: CustomMangaRepository, diff --git a/app/src/main/java/dev/yokai/domain/library/custom/interactor/DeleteCustomManga.kt b/app/src/main/java/yokai/domain/library/custom/interactor/DeleteCustomManga.kt similarity index 71% rename from app/src/main/java/dev/yokai/domain/library/custom/interactor/DeleteCustomManga.kt rename to app/src/main/java/yokai/domain/library/custom/interactor/DeleteCustomManga.kt index 5551f4d4d7..c1c077b48f 100644 --- a/app/src/main/java/dev/yokai/domain/library/custom/interactor/DeleteCustomManga.kt +++ b/app/src/main/java/yokai/domain/library/custom/interactor/DeleteCustomManga.kt @@ -1,6 +1,6 @@ -package dev.yokai.domain.library.custom.interactor +package yokai.domain.library.custom.interactor -import dev.yokai.domain.library.custom.CustomMangaRepository +import yokai.domain.library.custom.CustomMangaRepository class DeleteCustomManga( private val customMangaRepository: CustomMangaRepository, diff --git a/app/src/main/java/dev/yokai/domain/library/custom/interactor/GetCustomManga.kt b/app/src/main/java/yokai/domain/library/custom/interactor/GetCustomManga.kt similarity index 65% rename from app/src/main/java/dev/yokai/domain/library/custom/interactor/GetCustomManga.kt rename to app/src/main/java/yokai/domain/library/custom/interactor/GetCustomManga.kt index a01fbfc38b..848b5ec53e 100644 --- a/app/src/main/java/dev/yokai/domain/library/custom/interactor/GetCustomManga.kt +++ b/app/src/main/java/yokai/domain/library/custom/interactor/GetCustomManga.kt @@ -1,6 +1,6 @@ -package dev.yokai.domain.library.custom.interactor +package yokai.domain.library.custom.interactor -import dev.yokai.domain.library.custom.CustomMangaRepository +import yokai.domain.library.custom.CustomMangaRepository class GetCustomManga( private val customMangaRepository: CustomMangaRepository, diff --git a/app/src/main/java/dev/yokai/domain/library/custom/interactor/RelinkCustomManga.kt b/app/src/main/java/yokai/domain/library/custom/interactor/RelinkCustomManga.kt similarity index 63% rename from app/src/main/java/dev/yokai/domain/library/custom/interactor/RelinkCustomManga.kt rename to app/src/main/java/yokai/domain/library/custom/interactor/RelinkCustomManga.kt index 8eaa50161f..58d322336c 100644 --- a/app/src/main/java/dev/yokai/domain/library/custom/interactor/RelinkCustomManga.kt +++ b/app/src/main/java/yokai/domain/library/custom/interactor/RelinkCustomManga.kt @@ -1,6 +1,6 @@ -package dev.yokai.domain.library.custom.interactor +package yokai.domain.library.custom.interactor -import dev.yokai.domain.library.custom.CustomMangaRepository +import yokai.domain.library.custom.CustomMangaRepository class RelinkCustomManga( private val customMangaRepository: CustomMangaRepository, diff --git a/app/src/main/java/dev/yokai/domain/library/custom/model/CustomMangaInfo.kt b/app/src/main/java/yokai/domain/library/custom/model/CustomMangaInfo.kt similarity index 95% rename from app/src/main/java/dev/yokai/domain/library/custom/model/CustomMangaInfo.kt rename to app/src/main/java/yokai/domain/library/custom/model/CustomMangaInfo.kt index 82b4014da0..ac658f6a6f 100644 --- a/app/src/main/java/dev/yokai/domain/library/custom/model/CustomMangaInfo.kt +++ b/app/src/main/java/yokai/domain/library/custom/model/CustomMangaInfo.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.library.custom.model +package yokai.domain.library.custom.model import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.MangaImpl diff --git a/app/src/main/java/dev/yokai/domain/manga/MangaRepository.kt b/app/src/main/java/yokai/domain/manga/MangaRepository.kt similarity index 92% rename from app/src/main/java/dev/yokai/domain/manga/MangaRepository.kt rename to app/src/main/java/yokai/domain/manga/MangaRepository.kt index 5cf2a537ba..24f67af320 100644 --- a/app/src/main/java/dev/yokai/domain/manga/MangaRepository.kt +++ b/app/src/main/java/yokai/domain/manga/MangaRepository.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.manga +package yokai.domain.manga import eu.kanade.tachiyomi.data.database.models.LibraryManga import eu.kanade.tachiyomi.data.database.models.Manga diff --git a/app/src/main/java/dev/yokai/domain/manga/interactor/GetLibraryManga.kt b/app/src/main/java/yokai/domain/manga/interactor/GetLibraryManga.kt similarity index 79% rename from app/src/main/java/dev/yokai/domain/manga/interactor/GetLibraryManga.kt rename to app/src/main/java/yokai/domain/manga/interactor/GetLibraryManga.kt index ffe03f9d5f..b2d3904107 100644 --- a/app/src/main/java/dev/yokai/domain/manga/interactor/GetLibraryManga.kt +++ b/app/src/main/java/yokai/domain/manga/interactor/GetLibraryManga.kt @@ -1,8 +1,8 @@ -package dev.yokai.domain.manga.interactor +package yokai.domain.manga.interactor -import dev.yokai.domain.manga.MangaRepository import eu.kanade.tachiyomi.data.database.models.LibraryManga import kotlinx.coroutines.flow.Flow +import yokai.domain.manga.MangaRepository class GetLibraryManga( private val mangaRepository: MangaRepository, diff --git a/app/src/main/java/dev/yokai/domain/recents/RecentsPreferences.kt b/app/src/main/java/yokai/domain/recents/RecentsPreferences.kt similarity index 95% rename from app/src/main/java/dev/yokai/domain/recents/RecentsPreferences.kt rename to app/src/main/java/yokai/domain/recents/RecentsPreferences.kt index 7777aa8898..8f361b04b3 100644 --- a/app/src/main/java/dev/yokai/domain/recents/RecentsPreferences.kt +++ b/app/src/main/java/yokai/domain/recents/RecentsPreferences.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.recents +package yokai.domain.recents import eu.kanade.tachiyomi.core.preference.PreferenceStore import eu.kanade.tachiyomi.core.preference.getEnum diff --git a/app/src/main/java/dev/yokai/domain/source/SourcePreferences.kt b/app/src/main/java/yokai/domain/source/SourcePreferences.kt similarity index 87% rename from app/src/main/java/dev/yokai/domain/source/SourcePreferences.kt rename to app/src/main/java/yokai/domain/source/SourcePreferences.kt index ee9158ad05..be863ebf5b 100644 --- a/app/src/main/java/dev/yokai/domain/source/SourcePreferences.kt +++ b/app/src/main/java/yokai/domain/source/SourcePreferences.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.source +package yokai.domain.source import eu.kanade.tachiyomi.core.preference.PreferenceStore diff --git a/app/src/main/java/dev/yokai/domain/storage/StorageManager.kt b/app/src/main/java/yokai/domain/storage/StorageManager.kt similarity index 98% rename from app/src/main/java/dev/yokai/domain/storage/StorageManager.kt rename to app/src/main/java/yokai/domain/storage/StorageManager.kt index c5ab262c68..2d47d57232 100644 --- a/app/src/main/java/dev/yokai/domain/storage/StorageManager.kt +++ b/app/src/main/java/yokai/domain/storage/StorageManager.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.storage +package yokai.domain.storage import android.content.Context import androidx.core.net.toUri diff --git a/app/src/main/java/dev/yokai/domain/storage/StoragePreferences.kt b/app/src/main/java/yokai/domain/storage/StoragePreferences.kt similarity index 92% rename from app/src/main/java/dev/yokai/domain/storage/StoragePreferences.kt rename to app/src/main/java/yokai/domain/storage/StoragePreferences.kt index a8abb3fb69..a17a9178e3 100644 --- a/app/src/main/java/dev/yokai/domain/storage/StoragePreferences.kt +++ b/app/src/main/java/yokai/domain/storage/StoragePreferences.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.storage +package yokai.domain.storage import eu.kanade.tachiyomi.core.preference.Preference import eu.kanade.tachiyomi.core.preference.PreferenceStore diff --git a/app/src/main/java/dev/yokai/domain/ui/UiPreferences.kt b/app/src/main/java/yokai/domain/ui/UiPreferences.kt similarity index 76% rename from app/src/main/java/dev/yokai/domain/ui/UiPreferences.kt rename to app/src/main/java/yokai/domain/ui/UiPreferences.kt index 0982f39082..64abb74567 100644 --- a/app/src/main/java/dev/yokai/domain/ui/UiPreferences.kt +++ b/app/src/main/java/yokai/domain/ui/UiPreferences.kt @@ -1,9 +1,7 @@ -package dev.yokai.domain.ui +package yokai.domain.ui import eu.kanade.tachiyomi.core.preference.PreferenceStore -import eu.kanade.tachiyomi.core.preference.getEnum import eu.kanade.tachiyomi.data.preference.PreferenceKeys -import eu.kanade.tachiyomi.ui.recents.RecentMangaAdapter class UiPreferences(private val preferenceStore: PreferenceStore) { fun recentsViewType() = preferenceStore.getInt("recents_view_type", 0) diff --git a/app/src/main/java/dev/yokai/domain/ui/settings/ReaderPreferences.kt b/app/src/main/java/yokai/domain/ui/settings/ReaderPreferences.kt similarity index 97% rename from app/src/main/java/dev/yokai/domain/ui/settings/ReaderPreferences.kt rename to app/src/main/java/yokai/domain/ui/settings/ReaderPreferences.kt index 839c4e7d21..74a87e464f 100644 --- a/app/src/main/java/dev/yokai/domain/ui/settings/ReaderPreferences.kt +++ b/app/src/main/java/yokai/domain/ui/settings/ReaderPreferences.kt @@ -1,4 +1,4 @@ -package dev.yokai.domain.ui.settings +package yokai.domain.ui.settings import androidx.annotation.StringRes import eu.kanade.tachiyomi.R diff --git a/app/src/main/java/dev/yokai/presentation/Scaffold.kt b/app/src/main/java/yokai/presentation/Scaffold.kt similarity index 98% rename from app/src/main/java/dev/yokai/presentation/Scaffold.kt rename to app/src/main/java/yokai/presentation/Scaffold.kt index 9c1b75cb9a..29169a7a5f 100644 --- a/app/src/main/java/dev/yokai/presentation/Scaffold.kt +++ b/app/src/main/java/yokai/presentation/Scaffold.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation +package yokai.presentation import android.app.Activity import android.os.Build @@ -27,8 +27,8 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalView import androidx.compose.ui.res.stringResource import androidx.core.view.WindowInsetsControllerCompat -import dev.yokai.presentation.component.ToolTipButton import eu.kanade.tachiyomi.R +import yokai.presentation.component.ToolTipButton @Composable fun YokaiScaffold( diff --git a/app/src/main/java/dev/yokai/presentation/component/AppIcon.kt b/app/src/main/java/yokai/presentation/component/AppIcon.kt similarity index 98% rename from app/src/main/java/dev/yokai/presentation/component/AppIcon.kt rename to app/src/main/java/yokai/presentation/component/AppIcon.kt index 33e7c275b0..b90a0b559f 100644 --- a/app/src/main/java/dev/yokai/presentation/component/AppIcon.kt +++ b/app/src/main/java/yokai/presentation/component/AppIcon.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component +package yokai.presentation.component import android.graphics.Bitmap import android.graphics.drawable.AdaptiveIconDrawable diff --git a/app/src/main/java/dev/yokai/presentation/component/CircularProgressIndicator.kt b/app/src/main/java/yokai/presentation/component/CircularProgressIndicator.kt similarity index 99% rename from app/src/main/java/dev/yokai/presentation/component/CircularProgressIndicator.kt rename to app/src/main/java/yokai/presentation/component/CircularProgressIndicator.kt index 6a85f90196..55a4b729fa 100644 --- a/app/src/main/java/dev/yokai/presentation/component/CircularProgressIndicator.kt +++ b/app/src/main/java/yokai/presentation/component/CircularProgressIndicator.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component +package yokai.presentation.component import androidx.compose.animation.AnimatedContent import androidx.compose.animation.core.LinearEasing diff --git a/app/src/main/java/dev/yokai/presentation/component/EmptyScreen.kt b/app/src/main/java/yokai/presentation/component/EmptyScreen.kt similarity index 98% rename from app/src/main/java/dev/yokai/presentation/component/EmptyScreen.kt rename to app/src/main/java/yokai/presentation/component/EmptyScreen.kt index 6b5dfea057..dc9d4c66df 100644 --- a/app/src/main/java/dev/yokai/presentation/component/EmptyScreen.kt +++ b/app/src/main/java/yokai/presentation/component/EmptyScreen.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component +package yokai.presentation.component import android.content.res.Configuration import androidx.compose.foundation.Image diff --git a/app/src/main/java/dev/yokai/presentation/component/Gap.kt b/app/src/main/java/yokai/presentation/component/Gap.kt similarity index 95% rename from app/src/main/java/dev/yokai/presentation/component/Gap.kt rename to app/src/main/java/yokai/presentation/component/Gap.kt index 8d21b3cae6..69576900dc 100644 --- a/app/src/main/java/dev/yokai/presentation/component/Gap.kt +++ b/app/src/main/java/yokai/presentation/component/Gap.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component +package yokai.presentation.component import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.RowScope diff --git a/app/src/main/java/dev/yokai/presentation/component/LabeledCheckbox.kt b/app/src/main/java/yokai/presentation/component/LabeledCheckbox.kt similarity index 94% rename from app/src/main/java/dev/yokai/presentation/component/LabeledCheckbox.kt rename to app/src/main/java/yokai/presentation/component/LabeledCheckbox.kt index 6ab18fe06d..0e1d0b9ccf 100644 --- a/app/src/main/java/dev/yokai/presentation/component/LabeledCheckbox.kt +++ b/app/src/main/java/yokai/presentation/component/LabeledCheckbox.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component +package yokai.presentation.component import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp -import dev.yokai.presentation.theme.Size +import yokai.presentation.theme.Size @Composable fun LabeledCheckbox( diff --git a/app/src/main/java/dev/yokai/presentation/component/ThemeItem.kt b/app/src/main/java/yokai/presentation/component/ThemeItem.kt similarity index 98% rename from app/src/main/java/dev/yokai/presentation/component/ThemeItem.kt rename to app/src/main/java/yokai/presentation/component/ThemeItem.kt index 5821ddecf4..c2619f75c6 100644 --- a/app/src/main/java/dev/yokai/presentation/component/ThemeItem.kt +++ b/app/src/main/java/yokai/presentation/component/ThemeItem.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component +package yokai.presentation.component import android.content.Context import android.content.res.Configuration @@ -37,12 +37,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import com.google.accompanist.themeadapter.material3.createMdc3Theme -import dev.yokai.presentation.theme.HalfAlpha -import dev.yokai.presentation.theme.SecondaryItemAlpha -import dev.yokai.presentation.theme.Size import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.Themes import eu.kanade.tachiyomi.util.system.isInNightMode +import yokai.presentation.theme.HalfAlpha +import yokai.presentation.theme.SecondaryItemAlpha +import yokai.presentation.theme.Size private data class ContextTheme( val colorScheme: ColorScheme, diff --git a/app/src/main/java/dev/yokai/presentation/component/ToolTip.kt b/app/src/main/java/yokai/presentation/component/ToolTip.kt similarity index 99% rename from app/src/main/java/dev/yokai/presentation/component/ToolTip.kt rename to app/src/main/java/yokai/presentation/component/ToolTip.kt index 6607e867ad..a4fd5dec64 100644 --- a/app/src/main/java/dev/yokai/presentation/component/ToolTip.kt +++ b/app/src/main/java/yokai/presentation/component/ToolTip.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component +package yokai.presentation.component import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/app/src/main/java/dev/yokai/presentation/component/TrackLogoIcon.kt b/app/src/main/java/yokai/presentation/component/TrackLogoIcon.kt similarity index 93% rename from app/src/main/java/dev/yokai/presentation/component/TrackLogoIcon.kt rename to app/src/main/java/yokai/presentation/component/TrackLogoIcon.kt index cc18fac295..b08c66a54a 100644 --- a/app/src/main/java/dev/yokai/presentation/component/TrackLogoIcon.kt +++ b/app/src/main/java/yokai/presentation/component/TrackLogoIcon.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component +package yokai.presentation.component import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -15,8 +15,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import dev.yokai.presentation.core.util.clickableNoIndication import eu.kanade.tachiyomi.data.track.TrackService +import yokai.presentation.core.util.clickableNoIndication @Composable fun TrackLogoIcon( diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/Preference.kt b/app/src/main/java/yokai/presentation/component/preference/Preference.kt similarity index 99% rename from app/src/main/java/dev/yokai/presentation/component/preference/Preference.kt rename to app/src/main/java/yokai/presentation/component/preference/Preference.kt index 710bae4d1a..f0b09b06fd 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/Preference.kt +++ b/app/src/main/java/yokai/presentation/component/preference/Preference.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference +package yokai.presentation.component.preference import androidx.compose.runtime.Composable import androidx.compose.runtime.remember diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/PreferenceCommon.kt b/app/src/main/java/yokai/presentation/component/preference/PreferenceCommon.kt similarity index 94% rename from app/src/main/java/dev/yokai/presentation/component/preference/PreferenceCommon.kt rename to app/src/main/java/yokai/presentation/component/preference/PreferenceCommon.kt index 90c03d3ab7..5eb2c83b80 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/PreferenceCommon.kt +++ b/app/src/main/java/yokai/presentation/component/preference/PreferenceCommon.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference +package yokai.presentation.component.preference import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/PreferenceItem.kt b/app/src/main/java/yokai/presentation/component/preference/PreferenceItem.kt similarity index 90% rename from app/src/main/java/dev/yokai/presentation/component/preference/PreferenceItem.kt rename to app/src/main/java/yokai/presentation/component/preference/PreferenceItem.kt index 5d276011a1..e7d866c688 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/PreferenceItem.kt +++ b/app/src/main/java/yokai/presentation/component/preference/PreferenceItem.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference +package yokai.presentation.component.preference import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically @@ -12,19 +12,19 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.structuralEqualityPolicy import androidx.compose.ui.unit.dp -import dev.yokai.presentation.component.preference.widget.EditTextPreferenceWidget -import dev.yokai.presentation.component.preference.widget.InfoWidget -import dev.yokai.presentation.component.preference.widget.ListPreferenceWidget -import dev.yokai.presentation.component.preference.widget.MultiSelectListPreferenceWidget -import dev.yokai.presentation.component.preference.widget.SliderPreferenceWidget -import dev.yokai.presentation.component.preference.widget.SwitchPreferenceWidget -import dev.yokai.presentation.component.preference.widget.TextPreferenceWidget -import dev.yokai.presentation.component.preference.widget.TrackingPreferenceWidget import eu.kanade.tachiyomi.core.storage.preference.collectAsState import eu.kanade.tachiyomi.data.track.TrackPreferences import kotlinx.coroutines.launch import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import yokai.presentation.component.preference.widget.EditTextPreferenceWidget +import yokai.presentation.component.preference.widget.InfoWidget +import yokai.presentation.component.preference.widget.ListPreferenceWidget +import yokai.presentation.component.preference.widget.MultiSelectListPreferenceWidget +import yokai.presentation.component.preference.widget.SliderPreferenceWidget +import yokai.presentation.component.preference.widget.SwitchPreferenceWidget +import yokai.presentation.component.preference.widget.TextPreferenceWidget +import yokai.presentation.component.preference.widget.TrackingPreferenceWidget val LocalPreferenceHighlighted = compositionLocalOf(structuralEqualityPolicy()) { false } val LocalPreferenceMinHeight = compositionLocalOf(structuralEqualityPolicy()) { 56.dp } diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/widget/BasePreferenceWidget.kt b/app/src/main/java/yokai/presentation/component/preference/widget/BasePreferenceWidget.kt similarity index 95% rename from app/src/main/java/dev/yokai/presentation/component/preference/widget/BasePreferenceWidget.kt rename to app/src/main/java/yokai/presentation/component/preference/widget/BasePreferenceWidget.kt index 62c9bda989..5b7e657042 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/widget/BasePreferenceWidget.kt +++ b/app/src/main/java/yokai/presentation/component/preference/widget/BasePreferenceWidget.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference.widget +package yokai.presentation.component.preference.widget import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.RepeatMode @@ -30,9 +30,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import dev.yokai.presentation.component.preference.LocalPreferenceHighlighted -import dev.yokai.presentation.component.preference.LocalPreferenceMinHeight import kotlinx.coroutines.delay +import yokai.presentation.component.preference.LocalPreferenceHighlighted +import yokai.presentation.component.preference.LocalPreferenceMinHeight import kotlin.time.Duration.Companion.seconds @Composable diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/widget/EditTextPreferenceWidget.kt b/app/src/main/java/yokai/presentation/component/preference/widget/EditTextPreferenceWidget.kt similarity index 97% rename from app/src/main/java/dev/yokai/presentation/component/preference/widget/EditTextPreferenceWidget.kt rename to app/src/main/java/yokai/presentation/component/preference/widget/EditTextPreferenceWidget.kt index a2472d23f2..29d51754fb 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/widget/EditTextPreferenceWidget.kt +++ b/app/src/main/java/yokai/presentation/component/preference/widget/EditTextPreferenceWidget.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference.widget +package yokai.presentation.component.preference.widget import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material.icons.Icons @@ -22,7 +22,6 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.window.DialogProperties -import eu.kanade.tachiyomi.R import kotlinx.coroutines.launch diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/widget/InfoWidget.kt b/app/src/main/java/yokai/presentation/component/preference/widget/InfoWidget.kt similarity index 86% rename from app/src/main/java/dev/yokai/presentation/component/preference/widget/InfoWidget.kt rename to app/src/main/java/yokai/presentation/component/preference/widget/InfoWidget.kt index f09b27483c..334cfd0dde 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/widget/InfoWidget.kt +++ b/app/src/main/java/yokai/presentation/component/preference/widget/InfoWidget.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference.widget +package yokai.presentation.component.preference.widget import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -10,8 +10,8 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import dev.yokai.presentation.core.util.secondaryItemAlpha -import dev.yokai.presentation.theme.Size +import yokai.presentation.core.util.secondaryItemAlpha +import yokai.presentation.theme.Size @Composable internal fun InfoWidget(text: String) { diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/widget/ListPreferenceWidget.kt b/app/src/main/java/yokai/presentation/component/preference/widget/ListPreferenceWidget.kt similarity index 98% rename from app/src/main/java/dev/yokai/presentation/component/preference/widget/ListPreferenceWidget.kt rename to app/src/main/java/yokai/presentation/component/preference/widget/ListPreferenceWidget.kt index 9524bc4c29..c5f63ff76f 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/widget/ListPreferenceWidget.kt +++ b/app/src/main/java/yokai/presentation/component/preference/widget/ListPreferenceWidget.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference.widget +package yokai.presentation.component.preference.widget import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/widget/MultiListPreferenceWidget.kt b/app/src/main/java/yokai/presentation/component/preference/widget/MultiListPreferenceWidget.kt similarity index 94% rename from app/src/main/java/dev/yokai/presentation/component/preference/widget/MultiListPreferenceWidget.kt rename to app/src/main/java/yokai/presentation/component/preference/widget/MultiListPreferenceWidget.kt index 672c505fad..9be0ef736f 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/widget/MultiListPreferenceWidget.kt +++ b/app/src/main/java/yokai/presentation/component/preference/widget/MultiListPreferenceWidget.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference.widget +package yokai.presentation.component.preference.widget import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material3.AlertDialog @@ -12,8 +12,8 @@ import androidx.compose.runtime.setValue import androidx.compose.runtime.toMutableStateList import androidx.compose.ui.res.stringResource import androidx.compose.ui.window.DialogProperties -import dev.yokai.presentation.component.LabeledCheckbox -import dev.yokai.presentation.component.preference.Preference +import yokai.presentation.component.LabeledCheckbox +import yokai.presentation.component.preference.Preference @Composable fun MultiSelectListPreferenceWidget( diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/widget/PreferenceGroupHeader.kt b/app/src/main/java/yokai/presentation/component/preference/widget/PreferenceGroupHeader.kt similarity index 93% rename from app/src/main/java/dev/yokai/presentation/component/preference/widget/PreferenceGroupHeader.kt rename to app/src/main/java/yokai/presentation/component/preference/widget/PreferenceGroupHeader.kt index f78b0b1cde..136c3e21bf 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/widget/PreferenceGroupHeader.kt +++ b/app/src/main/java/yokai/presentation/component/preference/widget/PreferenceGroupHeader.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference.widget +package yokai.presentation.component.preference.widget import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/widget/SliderPreferenceWidget.kt b/app/src/main/java/yokai/presentation/component/preference/widget/SliderPreferenceWidget.kt similarity index 79% rename from app/src/main/java/dev/yokai/presentation/component/preference/widget/SliderPreferenceWidget.kt rename to app/src/main/java/yokai/presentation/component/preference/widget/SliderPreferenceWidget.kt index 82b0ff0c0f..54c4c8b7e3 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/widget/SliderPreferenceWidget.kt +++ b/app/src/main/java/yokai/presentation/component/preference/widget/SliderPreferenceWidget.kt @@ -1,9 +1,6 @@ -package dev.yokai.presentation.component.preference.widget +package yokai.presentation.component.preference.widget -import androidx.compose.foundation.layout.padding import androidx.compose.material3.Slider -import androidx.compose.material3.SliderState -import androidx.compose.material3.Switch import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/widget/SwitchPreferenceWidget.kt b/app/src/main/java/yokai/presentation/component/preference/widget/SwitchPreferenceWidget.kt similarity index 93% rename from app/src/main/java/dev/yokai/presentation/component/preference/widget/SwitchPreferenceWidget.kt rename to app/src/main/java/yokai/presentation/component/preference/widget/SwitchPreferenceWidget.kt index 8a66912363..89ad67b33d 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/widget/SwitchPreferenceWidget.kt +++ b/app/src/main/java/yokai/presentation/component/preference/widget/SwitchPreferenceWidget.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference.widget +package yokai.presentation.component.preference.widget import androidx.compose.foundation.layout.padding import androidx.compose.material3.Switch diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/widget/TextPreferenceWidget.kt b/app/src/main/java/yokai/presentation/component/preference/widget/TextPreferenceWidget.kt similarity index 92% rename from app/src/main/java/dev/yokai/presentation/component/preference/widget/TextPreferenceWidget.kt rename to app/src/main/java/yokai/presentation/component/preference/widget/TextPreferenceWidget.kt index cf5662c482..8a4a677d76 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/widget/TextPreferenceWidget.kt +++ b/app/src/main/java/yokai/presentation/component/preference/widget/TextPreferenceWidget.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference.widget +package yokai.presentation.component.preference.widget import androidx.compose.foundation.layout.padding import androidx.compose.material3.Icon @@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector -import dev.yokai.presentation.core.util.secondaryItemAlpha +import yokai.presentation.core.util.secondaryItemAlpha @Composable fun TextPreferenceWidget( diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/widget/TrackingPreferenceWidget.kt b/app/src/main/java/yokai/presentation/component/preference/widget/TrackingPreferenceWidget.kt similarity index 92% rename from app/src/main/java/dev/yokai/presentation/component/preference/widget/TrackingPreferenceWidget.kt rename to app/src/main/java/yokai/presentation/component/preference/widget/TrackingPreferenceWidget.kt index 76db0502ba..a902ee89df 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/widget/TrackingPreferenceWidget.kt +++ b/app/src/main/java/yokai/presentation/component/preference/widget/TrackingPreferenceWidget.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference.widget +package yokai.presentation.component.preference.widget import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box @@ -16,11 +16,11 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import dev.yokai.presentation.component.TrackLogoIcon -import dev.yokai.presentation.component.preference.LocalPreferenceHighlighted import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.appwidget.util.stringResource import eu.kanade.tachiyomi.data.track.TrackService +import yokai.presentation.component.TrackLogoIcon +import yokai.presentation.component.preference.LocalPreferenceHighlighted @Composable fun TrackingPreferenceWidget( diff --git a/app/src/main/java/dev/yokai/presentation/component/preference/widget/TriStateListDialog.kt b/app/src/main/java/yokai/presentation/component/preference/widget/TriStateListDialog.kt similarity index 99% rename from app/src/main/java/dev/yokai/presentation/component/preference/widget/TriStateListDialog.kt rename to app/src/main/java/yokai/presentation/component/preference/widget/TriStateListDialog.kt index c7579ed825..4b52546aa6 100644 --- a/app/src/main/java/dev/yokai/presentation/component/preference/widget/TriStateListDialog.kt +++ b/app/src/main/java/yokai/presentation/component/preference/widget/TriStateListDialog.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.component.preference.widget +package yokai.presentation.component.preference.widget import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/dev/yokai/presentation/core/util/ModifierExtensions.kt b/app/src/main/java/yokai/presentation/core/util/ModifierExtensions.kt similarity index 85% rename from app/src/main/java/dev/yokai/presentation/core/util/ModifierExtensions.kt rename to app/src/main/java/yokai/presentation/core/util/ModifierExtensions.kt index 81c98b2887..86116f4db1 100644 --- a/app/src/main/java/dev/yokai/presentation/core/util/ModifierExtensions.kt +++ b/app/src/main/java/yokai/presentation/core/util/ModifierExtensions.kt @@ -1,10 +1,10 @@ -package dev.yokai.presentation.core.util +package yokai.presentation.core.util import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha -import dev.yokai.presentation.theme.SecondaryItemAlpha +import yokai.presentation.theme.SecondaryItemAlpha fun Modifier.secondaryItemAlpha(): Modifier = this.alpha(SecondaryItemAlpha) diff --git a/app/src/main/java/dev/yokai/presentation/extension/ExtensionDetailsController.kt b/app/src/main/java/yokai/presentation/extension/ExtensionDetailsController.kt similarity index 90% rename from app/src/main/java/dev/yokai/presentation/extension/ExtensionDetailsController.kt rename to app/src/main/java/yokai/presentation/extension/ExtensionDetailsController.kt index cba61953f4..be3968b8e3 100644 --- a/app/src/main/java/dev/yokai/presentation/extension/ExtensionDetailsController.kt +++ b/app/src/main/java/yokai/presentation/extension/ExtensionDetailsController.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.extension +package yokai.presentation.extension import android.os.Bundle import androidx.compose.material3.Text diff --git a/app/src/main/java/dev/yokai/presentation/extension/repo/ExtensionRepoController.kt b/app/src/main/java/yokai/presentation/extension/repo/ExtensionRepoController.kt similarity index 90% rename from app/src/main/java/dev/yokai/presentation/extension/repo/ExtensionRepoController.kt rename to app/src/main/java/yokai/presentation/extension/repo/ExtensionRepoController.kt index 814f92a371..f99b28c24a 100644 --- a/app/src/main/java/dev/yokai/presentation/extension/repo/ExtensionRepoController.kt +++ b/app/src/main/java/yokai/presentation/extension/repo/ExtensionRepoController.kt @@ -1,11 +1,11 @@ -package dev.yokai.presentation.extension.repo +package yokai.presentation.extension.repo import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider -import dev.yokai.domain.ComposableAlertDialog import eu.kanade.tachiyomi.ui.base.controller.BaseComposeController import eu.kanade.tachiyomi.util.compose.LocalAlertDialog import eu.kanade.tachiyomi.util.compose.LocalBackPress +import yokai.domain.ComposableAlertDialog class ExtensionRepoController() : BaseComposeController() { diff --git a/app/src/main/java/dev/yokai/presentation/extension/repo/ExtensionRepoScreen.kt b/app/src/main/java/yokai/presentation/extension/repo/ExtensionRepoScreen.kt similarity index 94% rename from app/src/main/java/dev/yokai/presentation/extension/repo/ExtensionRepoScreen.kt rename to app/src/main/java/yokai/presentation/extension/repo/ExtensionRepoScreen.kt index 176731ff99..c2138028c2 100644 --- a/app/src/main/java/dev/yokai/presentation/extension/repo/ExtensionRepoScreen.kt +++ b/app/src/main/java/yokai/presentation/extension/repo/ExtensionRepoScreen.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.extension.repo +package yokai.presentation.extension.repo import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.padding @@ -25,20 +25,20 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel -import dev.yokai.domain.ComposableAlertDialog -import dev.yokai.domain.extension.repo.model.ExtensionRepo -import dev.yokai.presentation.AppBarType -import dev.yokai.presentation.YokaiScaffold -import dev.yokai.presentation.component.EmptyScreen -import dev.yokai.presentation.component.ToolTipButton -import dev.yokai.presentation.extension.repo.component.ExtensionRepoInput -import dev.yokai.presentation.extension.repo.component.ExtensionRepoItem import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.compose.LocalAlertDialog import eu.kanade.tachiyomi.util.compose.LocalBackPress import eu.kanade.tachiyomi.util.compose.currentOrThrow import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.flow.collectLatest +import yokai.domain.ComposableAlertDialog +import yokai.domain.extension.repo.model.ExtensionRepo +import yokai.presentation.AppBarType +import yokai.presentation.YokaiScaffold +import yokai.presentation.component.EmptyScreen +import yokai.presentation.component.ToolTipButton +import yokai.presentation.extension.repo.component.ExtensionRepoInput +import yokai.presentation.extension.repo.component.ExtensionRepoItem @Composable fun ExtensionRepoScreen( diff --git a/app/src/main/java/dev/yokai/presentation/extension/repo/ExtensionRepoViewModel.kt b/app/src/main/java/yokai/presentation/extension/repo/ExtensionRepoViewModel.kt similarity index 89% rename from app/src/main/java/dev/yokai/presentation/extension/repo/ExtensionRepoViewModel.kt rename to app/src/main/java/yokai/presentation/extension/repo/ExtensionRepoViewModel.kt index a5b701ca4d..dad43d22f9 100644 --- a/app/src/main/java/dev/yokai/presentation/extension/repo/ExtensionRepoViewModel.kt +++ b/app/src/main/java/yokai/presentation/extension/repo/ExtensionRepoViewModel.kt @@ -1,15 +1,9 @@ -package dev.yokai.presentation.extension.repo +package yokai.presentation.extension.repo import androidx.annotation.StringRes import androidx.compose.runtime.Immutable import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import dev.yokai.domain.extension.repo.interactor.CreateExtensionRepo -import dev.yokai.domain.extension.repo.interactor.DeleteExtensionRepo -import dev.yokai.domain.extension.repo.interactor.GetExtensionRepo -import dev.yokai.domain.extension.repo.interactor.ReplaceExtensionRepo -import dev.yokai.domain.extension.repo.interactor.UpdateExtensionRepo -import dev.yokai.domain.extension.repo.model.ExtensionRepo import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.extension.ExtensionManager import eu.kanade.tachiyomi.util.system.launchIO @@ -21,6 +15,12 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.update import uy.kohesive.injekt.injectLazy +import yokai.domain.extension.repo.interactor.CreateExtensionRepo +import yokai.domain.extension.repo.interactor.DeleteExtensionRepo +import yokai.domain.extension.repo.interactor.GetExtensionRepo +import yokai.domain.extension.repo.interactor.ReplaceExtensionRepo +import yokai.domain.extension.repo.interactor.UpdateExtensionRepo +import yokai.domain.extension.repo.model.ExtensionRepo class ExtensionRepoViewModel : ViewModel() { diff --git a/app/src/main/java/dev/yokai/presentation/extension/repo/component/ExtensionRepoItem.kt b/app/src/main/java/yokai/presentation/extension/repo/component/ExtensionRepoItem.kt similarity index 96% rename from app/src/main/java/dev/yokai/presentation/extension/repo/component/ExtensionRepoItem.kt rename to app/src/main/java/yokai/presentation/extension/repo/component/ExtensionRepoItem.kt index 7e6fb4a5b6..8601ee9b83 100644 --- a/app/src/main/java/dev/yokai/presentation/extension/repo/component/ExtensionRepoItem.kt +++ b/app/src/main/java/yokai/presentation/extension/repo/component/ExtensionRepoItem.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.extension.repo.component +package yokai.presentation.extension.repo.component import android.content.res.Configuration import androidx.compose.foundation.basicMarquee @@ -30,10 +30,10 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import dev.yokai.domain.extension.repo.model.ExtensionRepo -import dev.yokai.presentation.component.Gap -import dev.yokai.presentation.theme.Size import eu.kanade.tachiyomi.util.compose.textHint +import yokai.domain.extension.repo.model.ExtensionRepo +import yokai.presentation.component.Gap +import yokai.presentation.theme.Size // TODO: Redesign // - Edit diff --git a/app/src/main/java/dev/yokai/presentation/onboarding/InfoScreen.kt b/app/src/main/java/yokai/presentation/onboarding/InfoScreen.kt similarity index 96% rename from app/src/main/java/dev/yokai/presentation/onboarding/InfoScreen.kt rename to app/src/main/java/yokai/presentation/onboarding/InfoScreen.kt index e887afaf6e..d26622c5dc 100644 --- a/app/src/main/java/dev/yokai/presentation/onboarding/InfoScreen.kt +++ b/app/src/main/java/yokai/presentation/onboarding/InfoScreen.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.onboarding +package yokai.presentation.onboarding import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.RocketLaunch import androidx.compose.material.icons.outlined.RocketLaunch import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults @@ -32,8 +31,8 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.zIndex -import dev.yokai.presentation.core.util.secondaryItemAlpha -import dev.yokai.presentation.theme.Size +import yokai.presentation.core.util.secondaryItemAlpha +import yokai.presentation.theme.Size @Composable fun InfoScreen( diff --git a/app/src/main/java/dev/yokai/presentation/onboarding/OnboardingController.kt b/app/src/main/java/yokai/presentation/onboarding/OnboardingController.kt similarity index 91% rename from app/src/main/java/dev/yokai/presentation/onboarding/OnboardingController.kt rename to app/src/main/java/yokai/presentation/onboarding/OnboardingController.kt index 37f5c6a11c..d5efeee846 100644 --- a/app/src/main/java/dev/yokai/presentation/onboarding/OnboardingController.kt +++ b/app/src/main/java/yokai/presentation/onboarding/OnboardingController.kt @@ -1,12 +1,12 @@ -package dev.yokai.presentation.onboarding +package yokai.presentation.onboarding import androidx.activity.compose.BackHandler import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue -import dev.yokai.domain.base.BasePreferences import eu.kanade.tachiyomi.core.storage.preference.collectAsState import eu.kanade.tachiyomi.ui.base.controller.BaseComposeController import uy.kohesive.injekt.injectLazy +import yokai.domain.base.BasePreferences class OnboardingController : BaseComposeController() { diff --git a/app/src/main/java/dev/yokai/presentation/onboarding/OnboardingScreen.kt b/app/src/main/java/yokai/presentation/onboarding/OnboardingScreen.kt similarity index 88% rename from app/src/main/java/dev/yokai/presentation/onboarding/OnboardingScreen.kt rename to app/src/main/java/yokai/presentation/onboarding/OnboardingScreen.kt index 72f40a6df4..8c1ccd7353 100644 --- a/app/src/main/java/dev/yokai/presentation/onboarding/OnboardingScreen.kt +++ b/app/src/main/java/yokai/presentation/onboarding/OnboardingScreen.kt @@ -1,6 +1,5 @@ -package dev.yokai.presentation.onboarding +package yokai.presentation.onboarding -import android.annotation.SuppressLint import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.background @@ -19,14 +18,13 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource -import androidx.compose.ui.tooling.preview.Preview -import dev.yokai.presentation.onboarding.steps.PermissionStep -import dev.yokai.presentation.onboarding.steps.StorageStep -import dev.yokai.presentation.onboarding.steps.ThemeStep -import dev.yokai.presentation.theme.Size import eu.kanade.tachiyomi.R import soup.compose.material.motion.animation.materialSharedAxisX import soup.compose.material.motion.animation.rememberSlideDistance +import yokai.presentation.onboarding.steps.PermissionStep +import yokai.presentation.onboarding.steps.StorageStep +import yokai.presentation.onboarding.steps.ThemeStep +import yokai.presentation.theme.Size @Composable fun OnboardingScreen( diff --git a/app/src/main/java/dev/yokai/presentation/onboarding/steps/OnboardingStep.kt b/app/src/main/java/yokai/presentation/onboarding/steps/OnboardingStep.kt similarity index 75% rename from app/src/main/java/dev/yokai/presentation/onboarding/steps/OnboardingStep.kt rename to app/src/main/java/yokai/presentation/onboarding/steps/OnboardingStep.kt index 0ead72e670..c2d262a634 100644 --- a/app/src/main/java/dev/yokai/presentation/onboarding/steps/OnboardingStep.kt +++ b/app/src/main/java/yokai/presentation/onboarding/steps/OnboardingStep.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.onboarding.steps +package yokai.presentation.onboarding.steps import androidx.compose.runtime.Composable diff --git a/app/src/main/java/dev/yokai/presentation/onboarding/steps/PermissionStep.kt b/app/src/main/java/yokai/presentation/onboarding/steps/PermissionStep.kt similarity index 98% rename from app/src/main/java/dev/yokai/presentation/onboarding/steps/PermissionStep.kt rename to app/src/main/java/yokai/presentation/onboarding/steps/PermissionStep.kt index 3ba699bf44..78d76190d7 100644 --- a/app/src/main/java/dev/yokai/presentation/onboarding/steps/PermissionStep.kt +++ b/app/src/main/java/yokai/presentation/onboarding/steps/PermissionStep.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.onboarding.steps +package yokai.presentation.onboarding.steps import android.Manifest import android.annotation.SuppressLint @@ -33,9 +33,9 @@ import androidx.core.content.getSystemService import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.compose.LocalLifecycleOwner -import dev.yokai.presentation.component.Gap -import dev.yokai.presentation.theme.Size import eu.kanade.tachiyomi.R +import yokai.presentation.component.Gap +import yokai.presentation.theme.Size internal class PermissionStep : OnboardingStep { diff --git a/app/src/main/java/dev/yokai/presentation/onboarding/steps/StorageStep.kt b/app/src/main/java/yokai/presentation/onboarding/steps/StorageStep.kt similarity index 82% rename from app/src/main/java/dev/yokai/presentation/onboarding/steps/StorageStep.kt rename to app/src/main/java/yokai/presentation/onboarding/steps/StorageStep.kt index 418137c76a..70e27d8933 100644 --- a/app/src/main/java/dev/yokai/presentation/onboarding/steps/StorageStep.kt +++ b/app/src/main/java/yokai/presentation/onboarding/steps/StorageStep.kt @@ -1,11 +1,6 @@ -package dev.yokai.presentation.onboarding.steps +package yokai.presentation.onboarding.steps import android.content.ActivityNotFoundException -import android.content.Intent -import android.net.Uri -import androidx.activity.compose.ManagedActivityResultLauncher -import androidx.activity.compose.rememberLauncherForActivityResult -import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth @@ -23,17 +18,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.stringResource -import com.hippo.unifile.UniFile -import dev.yokai.domain.storage.StoragePreferences -import dev.yokai.presentation.component.preference.storageLocationText -import dev.yokai.presentation.settings.screen.data.storageLocationPicker -import dev.yokai.presentation.theme.Size import eu.kanade.tachiyomi.R -import eu.kanade.tachiyomi.core.preference.Preference import eu.kanade.tachiyomi.util.system.toast -import eu.kanade.tachiyomi.util.system.tryTakePersistableUriPermission import kotlinx.coroutines.flow.collectLatest import uy.kohesive.injekt.injectLazy +import yokai.domain.storage.StoragePreferences +import yokai.presentation.component.preference.storageLocationText +import yokai.presentation.settings.screen.data.storageLocationPicker +import yokai.presentation.theme.Size internal class StorageStep : OnboardingStep { diff --git a/app/src/main/java/dev/yokai/presentation/onboarding/steps/ThemeStep.kt b/app/src/main/java/yokai/presentation/onboarding/steps/ThemeStep.kt similarity index 98% rename from app/src/main/java/dev/yokai/presentation/onboarding/steps/ThemeStep.kt rename to app/src/main/java/yokai/presentation/onboarding/steps/ThemeStep.kt index d793937e83..08377ee5d1 100644 --- a/app/src/main/java/dev/yokai/presentation/onboarding/steps/ThemeStep.kt +++ b/app/src/main/java/yokai/presentation/onboarding/steps/ThemeStep.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.onboarding.steps +package yokai.presentation.onboarding.steps import android.app.Activity import android.content.Context @@ -24,14 +24,14 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.core.app.ActivityCompat import com.google.android.material.color.DynamicColors -import dev.yokai.presentation.component.ThemeItem -import dev.yokai.presentation.theme.Size import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.core.storage.preference.collectAsState import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.util.system.Themes import eu.kanade.tachiyomi.util.system.appDelegateNightMode import uy.kohesive.injekt.injectLazy +import yokai.presentation.component.ThemeItem +import yokai.presentation.theme.Size internal class ThemeStep : OnboardingStep { override val isComplete: Boolean = true diff --git a/app/src/main/java/dev/yokai/presentation/settings/ComposableSettings.kt b/app/src/main/java/yokai/presentation/settings/ComposableSettings.kt similarity index 90% rename from app/src/main/java/dev/yokai/presentation/settings/ComposableSettings.kt rename to app/src/main/java/yokai/presentation/settings/ComposableSettings.kt index 6bcbd2da33..74e96a7337 100644 --- a/app/src/main/java/dev/yokai/presentation/settings/ComposableSettings.kt +++ b/app/src/main/java/yokai/presentation/settings/ComposableSettings.kt @@ -1,11 +1,11 @@ -package dev.yokai.presentation.settings +package yokai.presentation.settings import androidx.annotation.StringRes import androidx.compose.foundation.layout.RowScope import androidx.compose.runtime.Composable import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.ui.res.stringResource -import dev.yokai.presentation.component.preference.Preference +import yokai.presentation.component.preference.Preference interface ComposableSettings { @Composable diff --git a/app/src/main/java/dev/yokai/presentation/settings/SettingsCommonWidget.kt b/app/src/main/java/yokai/presentation/settings/SettingsCommonWidget.kt similarity index 92% rename from app/src/main/java/dev/yokai/presentation/settings/SettingsCommonWidget.kt rename to app/src/main/java/yokai/presentation/settings/SettingsCommonWidget.kt index d12149e545..3d6cd91655 100644 --- a/app/src/main/java/dev/yokai/presentation/settings/SettingsCommonWidget.kt +++ b/app/src/main/java/yokai/presentation/settings/SettingsCommonWidget.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.settings +package yokai.presentation.settings import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -15,12 +15,6 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEachIndexed -import dev.yokai.presentation.AppBarType -import dev.yokai.presentation.YokaiScaffold -import dev.yokai.presentation.component.Gap -import dev.yokai.presentation.component.preference.Preference -import dev.yokai.presentation.component.preference.PreferenceItem -import dev.yokai.presentation.component.preference.widget.PreferenceGroupHeader import eu.kanade.tachiyomi.core.storage.preference.collectAsState import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.util.compose.LocalAlertDialog @@ -28,6 +22,12 @@ import eu.kanade.tachiyomi.util.compose.LocalBackPress import eu.kanade.tachiyomi.util.compose.currentOrThrow import kotlinx.coroutines.delay import uy.kohesive.injekt.injectLazy +import yokai.presentation.AppBarType +import yokai.presentation.YokaiScaffold +import yokai.presentation.component.Gap +import yokai.presentation.component.preference.Preference +import yokai.presentation.component.preference.PreferenceItem +import yokai.presentation.component.preference.widget.PreferenceGroupHeader import kotlin.time.Duration.Companion.seconds @Composable diff --git a/app/src/main/java/dev/yokai/presentation/settings/screen/SettingsDataScreen.kt b/app/src/main/java/yokai/presentation/settings/screen/SettingsDataScreen.kt similarity index 93% rename from app/src/main/java/dev/yokai/presentation/settings/screen/SettingsDataScreen.kt rename to app/src/main/java/yokai/presentation/settings/screen/SettingsDataScreen.kt index adc0455ad5..483a1a8998 100644 --- a/app/src/main/java/dev/yokai/presentation/settings/screen/SettingsDataScreen.kt +++ b/app/src/main/java/yokai/presentation/settings/screen/SettingsDataScreen.kt @@ -1,11 +1,9 @@ -package dev.yokai.presentation.settings.screen +package yokai.presentation.settings.screen import android.content.ActivityNotFoundException import android.content.Context import android.content.Intent -import android.net.Uri import android.widget.Toast -import androidx.activity.compose.ManagedActivityResultLauncher import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.layout.IntrinsicSize @@ -27,18 +25,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import co.touchlab.kermit.Logger -import com.hippo.unifile.UniFile -import dev.yokai.domain.storage.StorageManager -import dev.yokai.domain.storage.StoragePreferences -import dev.yokai.presentation.component.preference.Preference -import dev.yokai.presentation.component.preference.storageLocationText -import dev.yokai.presentation.component.preference.widget.BasePreferenceWidget -import dev.yokai.presentation.component.preference.widget.PrefsHorizontalPadding -import dev.yokai.presentation.settings.ComposableSettings -import dev.yokai.presentation.settings.screen.data.CreateBackup -import dev.yokai.presentation.settings.screen.data.RestoreBackup -import dev.yokai.presentation.settings.screen.data.StorageInfo -import dev.yokai.presentation.settings.screen.data.storageLocationPicker import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.backup.BackupFileValidator import eu.kanade.tachiyomi.data.backup.create.BackupCreatorJob @@ -53,7 +39,6 @@ import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.e import eu.kanade.tachiyomi.util.system.launchNonCancellable import eu.kanade.tachiyomi.util.system.toast -import eu.kanade.tachiyomi.util.system.tryTakePersistableUriPermission import eu.kanade.tachiyomi.util.system.withUIContext import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentMapOf @@ -61,6 +46,17 @@ import kotlinx.coroutines.launch import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy +import yokai.domain.storage.StorageManager +import yokai.domain.storage.StoragePreferences +import yokai.presentation.component.preference.Preference +import yokai.presentation.component.preference.storageLocationText +import yokai.presentation.component.preference.widget.BasePreferenceWidget +import yokai.presentation.component.preference.widget.PrefsHorizontalPadding +import yokai.presentation.settings.ComposableSettings +import yokai.presentation.settings.screen.data.CreateBackup +import yokai.presentation.settings.screen.data.RestoreBackup +import yokai.presentation.settings.screen.data.StorageInfo +import yokai.presentation.settings.screen.data.storageLocationPicker object SettingsDataScreen : ComposableSettings { @Composable diff --git a/app/src/main/java/dev/yokai/presentation/settings/screen/data/AlertDialogs.kt b/app/src/main/java/yokai/presentation/settings/screen/data/AlertDialogs.kt similarity index 97% rename from app/src/main/java/dev/yokai/presentation/settings/screen/data/AlertDialogs.kt rename to app/src/main/java/yokai/presentation/settings/screen/data/AlertDialogs.kt index 83c1568160..fa93bd4df5 100644 --- a/app/src/main/java/dev/yokai/presentation/settings/screen/data/AlertDialogs.kt +++ b/app/src/main/java/yokai/presentation/settings/screen/data/AlertDialogs.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.settings.screen.data +package yokai.presentation.settings.screen.data import android.content.Context import android.net.Uri @@ -15,7 +15,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.res.stringResource import com.hippo.unifile.UniFile -import dev.yokai.presentation.component.LabeledCheckbox import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.backup.BackupFileValidator.Results import eu.kanade.tachiyomi.data.backup.create.BackupCreatorJob @@ -23,6 +22,7 @@ import eu.kanade.tachiyomi.data.backup.create.BackupOptions import eu.kanade.tachiyomi.data.backup.models.Backup import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob import eu.kanade.tachiyomi.util.system.toast +import yokai.presentation.component.LabeledCheckbox @Composable fun RestoreBackup( diff --git a/app/src/main/java/dev/yokai/presentation/settings/screen/data/Storage.kt b/app/src/main/java/yokai/presentation/settings/screen/data/Storage.kt similarity index 95% rename from app/src/main/java/dev/yokai/presentation/settings/screen/data/Storage.kt rename to app/src/main/java/yokai/presentation/settings/screen/data/Storage.kt index 3e72c350ca..6306b69a40 100644 --- a/app/src/main/java/dev/yokai/presentation/settings/screen/data/Storage.kt +++ b/app/src/main/java/yokai/presentation/settings/screen/data/Storage.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.settings.screen.data +package yokai.presentation.settings.screen.data import android.content.Intent import android.net.Uri diff --git a/app/src/main/java/dev/yokai/presentation/settings/screen/data/StorageInfo.kt b/app/src/main/java/yokai/presentation/settings/screen/data/StorageInfo.kt similarity index 91% rename from app/src/main/java/dev/yokai/presentation/settings/screen/data/StorageInfo.kt rename to app/src/main/java/yokai/presentation/settings/screen/data/StorageInfo.kt index a13329f3aa..2eaad2078d 100644 --- a/app/src/main/java/dev/yokai/presentation/settings/screen/data/StorageInfo.kt +++ b/app/src/main/java/yokai/presentation/settings/screen/data/StorageInfo.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.settings.screen.data +package yokai.presentation.settings.screen.data import android.text.format.Formatter import androidx.compose.foundation.layout.Arrangement @@ -13,11 +13,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import dev.yokai.presentation.core.util.secondaryItemAlpha -import dev.yokai.presentation.theme.Size -import dev.yokai.presentation.theme.header import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.storage.DiskUtil +import yokai.presentation.core.util.secondaryItemAlpha +import yokai.presentation.theme.Size +import yokai.presentation.theme.header import java.io.File @Composable diff --git a/app/src/main/java/dev/yokai/presentation/theme/Constants.kt b/app/src/main/java/yokai/presentation/theme/Constants.kt similarity index 91% rename from app/src/main/java/dev/yokai/presentation/theme/Constants.kt rename to app/src/main/java/yokai/presentation/theme/Constants.kt index f49ac886dd..139084edac 100644 --- a/app/src/main/java/dev/yokai/presentation/theme/Constants.kt +++ b/app/src/main/java/yokai/presentation/theme/Constants.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.theme +package yokai.presentation.theme import androidx.compose.ui.unit.dp diff --git a/app/src/main/java/dev/yokai/presentation/theme/Theme.kt b/app/src/main/java/yokai/presentation/theme/Theme.kt similarity index 94% rename from app/src/main/java/dev/yokai/presentation/theme/Theme.kt rename to app/src/main/java/yokai/presentation/theme/Theme.kt index 00abf5d108..77e10348f1 100644 --- a/app/src/main/java/dev/yokai/presentation/theme/Theme.kt +++ b/app/src/main/java/yokai/presentation/theme/Theme.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.theme +package yokai.presentation.theme import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/dev/yokai/presentation/theme/Typography.kt b/app/src/main/java/yokai/presentation/theme/Typography.kt similarity index 91% rename from app/src/main/java/dev/yokai/presentation/theme/Typography.kt rename to app/src/main/java/yokai/presentation/theme/Typography.kt index 3945046725..bb69ed9fe0 100644 --- a/app/src/main/java/dev/yokai/presentation/theme/Typography.kt +++ b/app/src/main/java/yokai/presentation/theme/Typography.kt @@ -1,4 +1,4 @@ -package dev.yokai.presentation.theme +package yokai.presentation.theme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Typography diff --git a/app/src/main/java/dev/yokai/util/LewdMangaChecker.kt b/app/src/main/java/yokai/util/LewdMangaChecker.kt similarity index 95% rename from app/src/main/java/dev/yokai/util/LewdMangaChecker.kt rename to app/src/main/java/yokai/util/LewdMangaChecker.kt index 2f3e084b7c..823c174316 100644 --- a/app/src/main/java/dev/yokai/util/LewdMangaChecker.kt +++ b/app/src/main/java/yokai/util/LewdMangaChecker.kt @@ -1,10 +1,10 @@ -package dev.yokai.util +package yokai.util import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.source.SourceManager import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import java.util.Locale +import java.util.* fun Manga.isLewd(): Boolean { val sourceName = Injekt.get().get(source)?.name diff --git a/app/src/test/java/dev/yokai/core/migration/MigratorTest.kt b/app/src/test/java/dev/yokai/core/migration/MigratorTest.kt index d22a9e55de..e955c886ca 100644 --- a/app/src/test/java/dev/yokai/core/migration/MigratorTest.kt +++ b/app/src/test/java/dev/yokai/core/migration/MigratorTest.kt @@ -1,4 +1,4 @@ -package dev.yokai.core.migration +package yokai.core.migration import io.mockk.slot import io.mockk.spyk