diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt index 2ea286bf5..36a6ba14f 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt @@ -17,7 +17,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp -import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga +import mihon.feature.migration.list.models.MigratingManga import tachiyomi.i18n.MR import tachiyomi.i18n.sy.SYMR import tachiyomi.presentation.core.i18n.stringResource diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItem.kt b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItem.kt index 2558f1c12..0fc75bfbe 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItem.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItem.kt @@ -26,7 +26,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import eu.kanade.presentation.manga.components.MangaCover -import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga +import mihon.feature.migration.list.models.MigratingManga import tachiyomi.core.common.util.lang.withIOContext import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.MR diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt index 342abe60a..7f3617ee4 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.unit.dp import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.presentation.util.rememberResourceBitmapPainter import eu.kanade.tachiyomi.R -import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga +import mihon.feature.migration.list.models.MigratingManga import tachiyomi.core.common.util.lang.withIOContext import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.sy.SYMR diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt index 6d128e6ef..681686f59 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt @@ -11,8 +11,8 @@ import eu.kanade.presentation.browse.MigrateSearchScreen import eu.kanade.presentation.browse.components.BulkFavoriteDialogs import eu.kanade.presentation.util.Screen import eu.kanade.tachiyomi.ui.browse.BulkFavoriteScreenModel -import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigrationListScreen import eu.kanade.tachiyomi.ui.manga.MangaScreen +import mihon.feature.migration.list.MigrationListScreen class MigrateSearchScreen(private val mangaId: Long) : Screen() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSourceSearchScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSourceSearchScreen.kt index 100915cd3..e60a0a502 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSourceSearchScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSourceSearchScreen.kt @@ -24,13 +24,13 @@ import eu.kanade.presentation.components.SearchToolbar import eu.kanade.presentation.util.Screen import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.browse.BulkFavoriteScreenModel -import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigrationListScreen import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreenModel import eu.kanade.tachiyomi.ui.browse.source.browse.SourceFilterDialog import eu.kanade.tachiyomi.ui.manga.MangaScreen import eu.kanade.tachiyomi.ui.webview.WebViewScreen import eu.kanade.tachiyomi.util.system.toast import kotlinx.collections.immutable.persistentListOf +import mihon.feature.migration.list.MigrationListScreen import mihon.presentation.core.util.collectAsLazyPagingItems import tachiyomi.core.common.Constants import tachiyomi.domain.manga.model.Manga diff --git a/app/src/main/java/exh/smartsearch/SmartLibrarySearchEngine.kt b/app/src/main/java/exh/smartsearch/SmartLibrarySearchEngine.kt index c0e0b956e..75e2c4bf3 100644 --- a/app/src/main/java/exh/smartsearch/SmartLibrarySearchEngine.kt +++ b/app/src/main/java/exh/smartsearch/SmartLibrarySearchEngine.kt @@ -1,5 +1,6 @@ package exh.smartsearch +import mihon.feature.migration.list.search.BaseSmartSearchEngine import tachiyomi.domain.library.model.LibraryManga class SmartLibrarySearchEngine( diff --git a/app/src/main/java/exh/ui/smartsearch/SmartSearchScreenModel.kt b/app/src/main/java/exh/ui/smartsearch/SmartSearchScreenModel.kt index 710a479b5..399d85ad6 100644 --- a/app/src/main/java/exh/ui/smartsearch/SmartSearchScreenModel.kt +++ b/app/src/main/java/exh/ui/smartsearch/SmartSearchScreenModel.kt @@ -4,8 +4,8 @@ import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.screenModelScope import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.ui.browse.source.SourcesScreen -import exh.smartsearch.SmartSourceSearchEngine import kotlinx.coroutines.CancellationException +import mihon.feature.migration.list.search.SmartSourceSearchEngine import tachiyomi.core.common.util.lang.launchIO import tachiyomi.domain.manga.interactor.NetworkToLocalManga import tachiyomi.domain.manga.model.Manga diff --git a/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreen.kt b/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreen.kt index 7f429d737..31ce0657d 100644 --- a/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreen.kt +++ b/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreen.kt @@ -58,12 +58,12 @@ import eu.kanade.presentation.components.AppBarActions import eu.kanade.presentation.components.SOURCE_SEARCH_BOX_HEIGHT import eu.kanade.presentation.util.Screen import eu.kanade.tachiyomi.source.online.HttpSource -import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigrationListScreen -import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigrationProcedureConfig -import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigrationType import eu.kanade.tachiyomi.util.system.LocaleHelper import kotlinx.collections.immutable.persistentListOf import kotlinx.coroutines.flow.update +import mihon.feature.migration.list.MigrationListScreen +import mihon.feature.migration.list.MigrationProcedureConfig +import mihon.feature.migration.list.MigrationType import sh.calvin.reorderable.ReorderableCollectionItemScope import sh.calvin.reorderable.ReorderableItem import sh.calvin.reorderable.ReorderableLazyListState diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreen.kt b/app/src/main/java/mihon/feature/migration/list/MigrationListScreen.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreen.kt rename to app/src/main/java/mihon/feature/migration/list/MigrationListScreen.kt index 421d15582..0118cc93d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreen.kt +++ b/app/src/main/java/mihon/feature/migration/list/MigrationListScreen.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.browse.migration.advanced.process +package mihon.feature.migration.list import androidx.activity.compose.BackHandler import androidx.compose.runtime.Composable @@ -9,10 +9,6 @@ import androidx.compose.ui.platform.LocalContext import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.presentation.browse.MigrationListScreen -import eu.kanade.presentation.browse.components.MigrationExitDialog -import eu.kanade.presentation.browse.components.MigrationMangaDialog -import eu.kanade.presentation.browse.components.MigrationProgressDialog import eu.kanade.presentation.util.Screen import eu.kanade.tachiyomi.ui.browse.migration.search.MigrateSearchScreen import eu.kanade.tachiyomi.ui.manga.MangaScreen @@ -22,6 +18,10 @@ import exh.util.underEq import kotlinx.collections.immutable.persistentListOf import mihon.feature.migration.config.MigrationConfigScreen import mihon.feature.migration.config.MigrationConfigScreenSheet +import mihon.feature.migration.list.components.MigrationExitDialog +import mihon.feature.migration.list.components.MigrationMangaDialog +import mihon.feature.migration.list.components.MigrationProgressDialog +import mihon.feature.migration.list.models.MigratingManga import tachiyomi.core.common.i18n.pluralStringResource import tachiyomi.core.common.util.lang.withUIContext import tachiyomi.i18n.sy.SYMR @@ -95,7 +95,7 @@ class MigrationListScreen(private val config: MigrationProcedureConfig) : Screen } } } - MigrationListScreen( + MigrationListScreenContent( items = items ?: persistentListOf(), migrationDone = migrationDone, finishedCount = finishedCount, diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt b/app/src/main/java/mihon/feature/migration/list/MigrationListScreenContent.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt rename to app/src/main/java/mihon/feature/migration/list/MigrationListScreenContent.kt index 54f8c3e56..e5f97b3a5 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt +++ b/app/src/main/java/mihon/feature/migration/list/MigrationListScreenContent.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.browse +package mihon.feature.migration.list import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.IntrinsicSize @@ -28,9 +28,9 @@ import eu.kanade.presentation.browse.components.MigrationItem import eu.kanade.presentation.browse.components.MigrationItemResult import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions -import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf +import mihon.feature.migration.list.models.MigratingManga import tachiyomi.core.common.util.lang.withIOContext import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.MR @@ -42,7 +42,7 @@ import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.presentation.core.util.plus @Composable -fun MigrationListScreen( +fun MigrationListScreenContent( items: ImmutableList, migrationDone: Boolean, finishedCount: Int, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt b/app/src/main/java/mihon/feature/migration/list/MigrationListScreenModel.kt similarity index 98% rename from app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt rename to app/src/main/java/mihon/feature/migration/list/MigrationListScreenModel.kt index e98056d02..3dccd9cce 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt +++ b/app/src/main/java/mihon/feature/migration/list/MigrationListScreenModel.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.browse.migration.advanced.process +package mihon.feature.migration.list import android.content.Context import android.widget.Toast @@ -11,9 +11,7 @@ import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.getNameForMangaInfo import eu.kanade.tachiyomi.source.online.all.EHentai -import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga.SearchResult import eu.kanade.tachiyomi.util.system.toast -import exh.smartsearch.SmartSourceSearchEngine import exh.source.MERGED_SOURCE_ID import exh.util.ThrottleManager import kotlinx.collections.immutable.ImmutableList @@ -32,6 +30,9 @@ import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.sync.withPermit import logcat.LogPriority import mihon.domain.migration.usecases.MigrateMangaUseCase +import mihon.feature.migration.list.models.MigratingManga +import mihon.feature.migration.list.models.MigratingManga.SearchResult +import mihon.feature.migration.list.search.SmartSourceSearchEngine import tachiyomi.core.common.util.lang.launchIO import tachiyomi.core.common.util.lang.withUIContext import tachiyomi.core.common.util.system.logcat diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcedureConfig.kt b/app/src/main/java/mihon/feature/migration/list/MigrationProcedureConfig.kt similarity index 84% rename from app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcedureConfig.kt rename to app/src/main/java/mihon/feature/migration/list/MigrationProcedureConfig.kt index 6ef174660..0872b30b6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcedureConfig.kt +++ b/app/src/main/java/mihon/feature/migration/list/MigrationProcedureConfig.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.browse.migration.advanced.process +package mihon.feature.migration.list import java.io.Serializable diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationExitDialog.kt b/app/src/main/java/mihon/feature/migration/list/components/MigrationExitDialog.kt similarity index 94% rename from app/src/main/java/eu/kanade/presentation/browse/components/MigrationExitDialog.kt rename to app/src/main/java/mihon/feature/migration/list/components/MigrationExitDialog.kt index db9924bd9..d588a403f 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationExitDialog.kt +++ b/app/src/main/java/mihon/feature/migration/list/components/MigrationExitDialog.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.browse.components +package mihon.feature.migration.list.components import androidx.compose.material3.AlertDialog import androidx.compose.material3.Text diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationMangaDialog.kt b/app/src/main/java/mihon/feature/migration/list/components/MigrationMangaDialog.kt similarity index 96% rename from app/src/main/java/eu/kanade/presentation/browse/components/MigrationMangaDialog.kt rename to app/src/main/java/mihon/feature/migration/list/components/MigrationMangaDialog.kt index 1f439e960..d346d98d8 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationMangaDialog.kt +++ b/app/src/main/java/mihon/feature/migration/list/components/MigrationMangaDialog.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.browse.components +package mihon.feature.migration.list.components import androidx.compose.material3.AlertDialog import androidx.compose.material3.Text diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationProgressDialog.kt b/app/src/main/java/mihon/feature/migration/list/components/MigrationProgressDialog.kt similarity index 96% rename from app/src/main/java/eu/kanade/presentation/browse/components/MigrationProgressDialog.kt rename to app/src/main/java/mihon/feature/migration/list/components/MigrationProgressDialog.kt index a33dc4aab..c84f7389c 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationProgressDialog.kt +++ b/app/src/main/java/mihon/feature/migration/list/components/MigrationProgressDialog.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.browse.components +package mihon.feature.migration.list.components import androidx.compose.animation.core.animateFloatAsState import androidx.compose.material3.AlertDialog diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt b/app/src/main/java/mihon/feature/migration/list/models/MigratingManga.kt similarity index 96% rename from app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt rename to app/src/main/java/mihon/feature/migration/list/models/MigratingManga.kt index f1cc80587..9d38ac7e7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt +++ b/app/src/main/java/mihon/feature/migration/list/models/MigratingManga.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.browse.migration.advanced.process +package mihon.feature.migration.list.models import android.content.Context import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/exh/smartsearch/BaseSmartSearchEngine.kt b/app/src/main/java/mihon/feature/migration/list/search/BaseSmartSearchEngine.kt similarity index 99% rename from app/src/main/java/exh/smartsearch/BaseSmartSearchEngine.kt rename to app/src/main/java/mihon/feature/migration/list/search/BaseSmartSearchEngine.kt index ca111bc31..9f5fc4dc8 100644 --- a/app/src/main/java/exh/smartsearch/BaseSmartSearchEngine.kt +++ b/app/src/main/java/mihon/feature/migration/list/search/BaseSmartSearchEngine.kt @@ -1,4 +1,4 @@ -package exh.smartsearch +package mihon.feature.migration.list.search import info.debatty.java.stringsimilarity.NormalizedLevenshtein import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/exh/smartsearch/SmartSourceSearchEngine.kt b/app/src/main/java/mihon/feature/migration/list/search/SmartSourceSearchEngine.kt similarity index 95% rename from app/src/main/java/exh/smartsearch/SmartSourceSearchEngine.kt rename to app/src/main/java/mihon/feature/migration/list/search/SmartSourceSearchEngine.kt index 19e32b50f..f1410eb7f 100644 --- a/app/src/main/java/exh/smartsearch/SmartSourceSearchEngine.kt +++ b/app/src/main/java/mihon/feature/migration/list/search/SmartSourceSearchEngine.kt @@ -1,4 +1,4 @@ -package exh.smartsearch +package mihon.feature.migration.list.search import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.model.SManga