From 39ae84301a5a9feb5784051f89c433d23074fc58 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 23 May 2020 18:40:33 -0400 Subject: [PATCH] Move migration classes under browse --- .../kanade/tachiyomi/ui/{ => browse}/migration/MangaAdapter.kt | 2 +- .../kanade/tachiyomi/ui/{ => browse}/migration/MangaHolder.kt | 2 +- .../eu/kanade/tachiyomi/ui/{ => browse}/migration/MangaItem.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/MigrationController.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/MigrationFlags.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/MigrationPresenter.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/SearchController.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/SearchPresenter.kt | 2 +- .../tachiyomi/ui/{ => browse}/migration/SelectionHeader.kt | 2 +- .../kanade/tachiyomi/ui/{ => browse}/migration/SourceAdapter.kt | 2 +- .../kanade/tachiyomi/ui/{ => browse}/migration/SourceHolder.kt | 2 +- .../eu/kanade/tachiyomi/ui/{ => browse}/migration/SourceItem.kt | 2 +- .../eu/kanade/tachiyomi/ui/{ => browse}/migration/ViewState.kt | 2 +- .../eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt | 2 +- app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt | 2 +- 15 files changed, 15 insertions(+), 15 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 (98%) 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/MigrationPresenter.kt (98%) 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 (99%) 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 (95%) rename app/src/main/java/eu/kanade/tachiyomi/ui/{ => browse}/migration/SourceHolder.kt (96%) 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 (82%) 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 5cf41f0cd6..ad6045759a 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 a3f337c7a6..56d40f3072 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 04c951beaf..4678965340 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 98% 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 85cf3ebe2f..21f3c1a05e 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 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 b3f9a4ef22..826eee35ea 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/MigrationPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationPresenter.kt similarity index 98% 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 d3769d2a53..4e9172ce31 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 43e22220bd..330d001d18 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 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 99% 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 b701e97e58..a837ad9c5a 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 android.os.Bundle import com.jakewharton.rxrelay.BehaviorRelay 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 9530c68bc7..f211d6f666 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 95% 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 64a3ba412a..7711fcc24a 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 96% 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 284dc2e143..a96848b9c5 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 0e24f06337..3c6cbe5d6a 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 82% 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 5fbab91221..fb5d5f0e0c 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/manga/info/MangaInfoController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt index eda3d1edff..da1fef09eb 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,13 +24,13 @@ import eu.kanade.tachiyomi.source.model.SManga 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.SearchController import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController 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.SearchController 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 253ac016a2..c3263e8167 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