From 337ea344f483f3e16f398cde0ecc8e00818b9f3c Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Mon, 25 May 2020 14:18:53 -0400 Subject: [PATCH] Move migration classes under browse --- .../tachiyomi/ui/{ => browse}/migration/MangaAdapter.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/MangaHolder.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/MangaItem.kt | 2 +- .../ui/{ => browse}/migration/MigrationController.kt | 4 ++-- .../tachiyomi/ui/{ => browse}/migration/MigrationFlags.kt | 2 +- .../ui/{ => browse}/migration/MigrationMangaDialog.kt | 4 ++-- .../ui/{ => browse}/migration/MigrationPresenter.kt | 2 +- .../ui/{ => browse}/migration/SearchController.kt | 4 ++-- .../ui/{ => browse}/migration/SearchPresenter.kt | 2 +- .../ui/{ => browse}/migration/SelectionHeader.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/SourceAdapter.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/SourceHolder.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/SourceItem.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/ViewState.kt | 2 +- .../migration/manga/design/MigrationBottomSheetDialog.kt | 4 ++-- .../migration/manga/design/MigrationSourceAdapter.kt | 2 +- .../migration/manga/design/MigrationSourceHolder.kt | 2 +- .../migration/manga/design/MigrationSourceItem.kt | 2 +- .../migration/manga/design/PreMigrationController.kt | 6 +++--- .../migration/manga/process/MigratingManga.kt | 2 +- .../migration/manga/process/MigrationListController.kt | 8 ++++---- .../migration/manga/process/MigrationProcedureConfig.kt | 2 +- .../migration/manga/process/MigrationProcessAdapter.kt | 4 ++-- .../migration/manga/process/MigrationProcessHolder.kt | 2 +- .../migration/manga/process/MigrationProcessItem.kt | 2 +- .../eu/kanade/tachiyomi/ui/library/LibraryController.kt | 5 ++--- .../eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt | 2 +- .../kanade/tachiyomi/ui/manga/MangaAllInOneController.kt | 2 +- .../kanade/tachiyomi/ui/manga/info/MangaInfoController.kt | 2 +- .../java/eu/kanade/tachiyomi/ui/more/MoreController.kt | 2 +- 30 files changed, 41 insertions(+), 42 deletions(-) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/MangaAdapter.kt (90%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/MangaHolder.kt (97%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/MangaItem.kt (95%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/MigrationController.kt (97%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/MigrationFlags.kt (95%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/MigrationMangaDialog.kt (92%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/MigrationPresenter.kt (99%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/SearchController.kt (98%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/SearchPresenter.kt (95%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/SelectionHeader.kt (97%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/SourceAdapter.kt (96%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/SourceHolder.kt (97%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/SourceItem.kt (96%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/ViewState.kt (84%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/manga/design/MigrationBottomSheetDialog.kt (97%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/manga/design/MigrationSourceAdapter.kt (95%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/manga/design/MigrationSourceHolder.kt (96%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/manga/design/MigrationSourceItem.kt (97%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/manga/design/PreMigrationController.kt (97%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/manga/process/MigratingManga.kt (95%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/manga/process/MigrationListController.kt (98%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/manga/process/MigrationProcedureConfig.kt (76%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/manga/process/MigrationProcessAdapter.kt (97%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/manga/process/MigrationProcessHolder.kt (99%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/manga/process/MigrationProcessItem.kt (95%) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaAdapter.kt similarity index 90% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaAdapter.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaAdapter.kt index 5cf41f0cd..ad6045759 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaAdapter.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaHolder.kt similarity index 97% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaHolder.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaHolder.kt index a3f337c7a..56d40f307 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaHolder.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import android.view.View import com.bumptech.glide.load.engine.DiskCacheStrategy diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaItem.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaItem.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaItem.kt index 04c951bea..467896534 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaItem.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import android.view.View import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt similarity index 97% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt index b710e020c..52a79a624 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import android.view.LayoutInflater import android.view.View @@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.databinding.MigrationControllerBinding import eu.kanade.tachiyomi.ui.base.controller.NucleusController -import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController +import eu.kanade.tachiyomi.ui.browse.migration.manga.design.PreMigrationController import eu.kanade.tachiyomi.util.lang.launchUI import exh.util.RecyclerWindowInsetsListener import exh.util.applyWindowInsetsForController diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationFlags.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationFlags.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt index ba24dcbc6..c8946afde 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationFlags.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import eu.kanade.tachiyomi.R diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt similarity index 92% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt index f12724d79..28cd105d5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import android.app.Dialog import android.os.Bundle @@ -6,7 +6,7 @@ import com.afollestad.materialdialogs.MaterialDialog import com.bluelinelabs.conductor.Controller import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.base.controller.DialogController -import eu.kanade.tachiyomi.ui.migration.manga.process.MigrationListController +import eu.kanade.tachiyomi.ui.browse.migration.manga.process.MigrationListController class MigrationMangaDialog(bundle: Bundle? = null) : DialogController(bundle) where T : Controller { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationPresenter.kt similarity index 99% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationPresenter.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationPresenter.kt index 14752112f..ca6aabd7a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationPresenter.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import android.os.Bundle import com.jakewharton.rxrelay.BehaviorRelay diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SearchController.kt similarity index 98% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SearchController.kt index 8c9994770..7cbb99645 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SearchController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import android.app.Dialog import android.os.Bundle @@ -15,9 +15,9 @@ import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.ui.base.controller.DialogController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.browse.migration.manga.process.MigrationListController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchPresenter -import eu.kanade.tachiyomi.ui.migration.manga.process.MigrationListController import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SearchPresenter.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchPresenter.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SearchPresenter.kt index 80619ccc0..898002f96 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SearchPresenter.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.source.CatalogueSource diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SelectionHeader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SelectionHeader.kt similarity index 97% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/SelectionHeader.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SelectionHeader.kt index 7b29f0730..e552bc329 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SelectionHeader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SelectionHeader.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import android.view.View import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceAdapter.kt similarity index 96% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceAdapter.kt index e419c6fda..15e90a28d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceAdapter.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceHolder.kt similarity index 97% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceHolder.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceHolder.kt index 0158927fb..d1fb505e8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceHolder.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import android.view.View import eu.kanade.tachiyomi.R diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceItem.kt similarity index 96% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceItem.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceItem.kt index 0e24f0633..3c6cbe5d6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceItem.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import android.view.View import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/ViewState.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/ViewState.kt similarity index 84% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/ViewState.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/ViewState.kt index 0481ed603..a61a0aa45 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/ViewState.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/ViewState.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration +package eu.kanade.tachiyomi.ui.browse.migration import eu.kanade.tachiyomi.source.Source diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationBottomSheetDialog.kt similarity index 97% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationBottomSheetDialog.kt index d5d17518c..7322e644a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationBottomSheetDialog.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration.manga.design +package eu.kanade.tachiyomi.ui.browse.migration.manga.design import android.app.Activity import android.content.res.Configuration @@ -13,7 +13,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog import com.tfcporciuncula.flow.Preference import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferencesHelper -import eu.kanade.tachiyomi.ui.migration.MigrationFlags +import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.view.gone import eu.kanade.tachiyomi.util.view.visible diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceAdapter.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceAdapter.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceAdapter.kt index 39821522f..a038baa42 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceAdapter.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration.manga.design +package eu.kanade.tachiyomi.ui.browse.migration.manga.design import android.os.Bundle import eu.davidea.flexibleadapter.FlexibleAdapter diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceHolder.kt similarity index 96% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceHolder.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceHolder.kt index 5daff7f88..3b2f41907 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceHolder.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration.manga.design +package eu.kanade.tachiyomi.ui.browse.migration.manga.design import android.graphics.Paint.STRIKE_THRU_TEXT_FLAG import android.view.View diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceItem.kt similarity index 97% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceItem.kt index a9c95ac55..a64d2c4ae 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceItem.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration.manga.design +package eu.kanade.tachiyomi.ui.browse.migration.manga.design import android.os.Parcelable import android.view.View diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/PreMigrationController.kt similarity index 97% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/PreMigrationController.kt index 0b676998f..8959e7b27 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/PreMigrationController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration.manga.design +package eu.kanade.tachiyomi.ui.browse.migration.manga.design import android.os.Bundle import android.view.LayoutInflater @@ -20,8 +20,8 @@ import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.base.controller.BaseController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction -import eu.kanade.tachiyomi.ui.migration.manga.process.MigrationListController -import eu.kanade.tachiyomi.ui.migration.manga.process.MigrationProcedureConfig +import eu.kanade.tachiyomi.ui.browse.migration.manga.process.MigrationListController +import eu.kanade.tachiyomi.ui.browse.migration.manga.process.MigrationProcedureConfig import exh.util.doOnApplyWindowInsets import exh.util.marginBottom import exh.util.updateLayoutParams diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigratingManga.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigratingManga.kt index be29dfbeb..f65b0c2b5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigratingManga.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration.manga.process +package eu.kanade.tachiyomi.ui.browse.migration.manga.process import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Manga diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationListController.kt similarity index 98% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationListController.kt index 2939f14b6..89d6e3543 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationListController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration.manga.process +package eu.kanade.tachiyomi.ui.browse.migration.manga.process import android.content.pm.ActivityInfo import android.graphics.Color @@ -26,11 +26,11 @@ import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.ui.base.controller.BaseController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.browse.migration.MigrationMangaDialog +import eu.kanade.tachiyomi.ui.browse.migration.SearchController +import eu.kanade.tachiyomi.ui.browse.migration.manga.design.PreMigrationController import eu.kanade.tachiyomi.ui.manga.MangaAllInOneController import eu.kanade.tachiyomi.ui.manga.MangaController -import eu.kanade.tachiyomi.ui.migration.MigrationMangaDialog -import eu.kanade.tachiyomi.ui.migration.SearchController -import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource import eu.kanade.tachiyomi.util.lang.launchUI import eu.kanade.tachiyomi.util.system.getResourceColor diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcedureConfig.kt similarity index 76% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcedureConfig.kt index 1c26143d2..6c544e0ad 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcedureConfig.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration.manga.process +package eu.kanade.tachiyomi.ui.browse.migration.manga.process import android.os.Parcelable import kotlinx.android.parcel.Parcelize 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/browse/migration/manga/process/MigrationProcessAdapter.kt similarity index 97% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcessAdapter.kt index 2f27c0d97..ad2ef7fbd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcessAdapter.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration.manga.process +package eu.kanade.tachiyomi.ui.browse.migration.manga.process import android.view.MenuItem import eu.davidea.flexibleadapter.FlexibleAdapter @@ -6,7 +6,7 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.MangaCategory import eu.kanade.tachiyomi.data.preference.PreferencesHelper -import eu.kanade.tachiyomi.ui.migration.MigrationFlags +import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags import eu.kanade.tachiyomi.util.lang.launchUI import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.cancel diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcessHolder.kt similarity index 99% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcessHolder.kt index 6e2132ce3..43ab8372e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcessHolder.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration.manga.process +package eu.kanade.tachiyomi.ui.browse.migration.manga.process import android.view.View import android.widget.PopupMenu diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcessItem.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessItem.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcessItem.kt index df77a57cc..ec0562ecf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcessItem.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.migration.manga.process +package eu.kanade.tachiyomi.ui.browse.migration.manga.process import android.view.View import androidx.recyclerview.widget.RecyclerView 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 378a99e27..9a1d512c4 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 @@ -34,16 +34,15 @@ import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.RootController import eu.kanade.tachiyomi.ui.base.controller.TabbedController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.browse.migration.MigrationController +import eu.kanade.tachiyomi.ui.browse.migration.manga.design.PreMigrationController import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.main.offsetAppbarHeight import eu.kanade.tachiyomi.ui.manga.MangaAllInOneController import eu.kanade.tachiyomi.ui.manga.MangaController -import eu.kanade.tachiyomi.ui.migration.MigrationController -import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController import eu.kanade.tachiyomi.util.hasCustomCover import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.toast -import eu.kanade.tachiyomi.util.view.inflate import eu.kanade.tachiyomi.util.view.visible import exh.favorites.FavoritesIntroDialog import exh.favorites.FavoritesSyncStatus 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 af9715182..cd25b8f54 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -21,7 +21,7 @@ import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter -import eu.kanade.tachiyomi.ui.migration.MigrationFlags +import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource import eu.kanade.tachiyomi.util.isLocal import eu.kanade.tachiyomi.util.lang.combineLatest diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt index 4daa5413b..07d0aa1c0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt @@ -33,6 +33,7 @@ import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.browse.migration.manga.design.PreMigrationController import eu.kanade.tachiyomi.ui.browse.source.SourceController import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController @@ -46,7 +47,6 @@ import eu.kanade.tachiyomi.ui.manga.chapter.DownloadCustomChaptersDialog import eu.kanade.tachiyomi.ui.manga.chapter.MangaAllInOneChapterHolder import eu.kanade.tachiyomi.ui.manga.chapter.MangaAllInOneChapterItem import eu.kanade.tachiyomi.ui.manga.track.TrackController -import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.ui.recent.history.HistoryController import eu.kanade.tachiyomi.ui.recent.updates.UpdatesController diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt index 71d621021..895b85890 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt @@ -24,6 +24,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.all.MergedSource import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.browse.migration.manga.design.PreMigrationController import eu.kanade.tachiyomi.ui.browse.source.SourceController import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController @@ -31,7 +32,6 @@ import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog import eu.kanade.tachiyomi.ui.library.LibraryController import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.manga.MangaController -import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController import eu.kanade.tachiyomi.ui.recent.history.HistoryController import eu.kanade.tachiyomi.ui.recent.updates.UpdatesController import eu.kanade.tachiyomi.ui.webview.WebViewActivity diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt index 54c0fa590..ce5071b13 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt @@ -11,8 +11,8 @@ import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys import eu.kanade.tachiyomi.ui.base.controller.NoToolbarElevationController import eu.kanade.tachiyomi.ui.base.controller.RootController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.browse.migration.MigrationController import eu.kanade.tachiyomi.ui.download.DownloadController -import eu.kanade.tachiyomi.ui.migration.MigrationController import eu.kanade.tachiyomi.ui.setting.SettingsController import eu.kanade.tachiyomi.ui.setting.SettingsMainController import eu.kanade.tachiyomi.util.preference.add