diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt index af11ef978..61cafdd4d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt @@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.ui.base.controller.RootController import eu.kanade.tachiyomi.ui.base.controller.RxController import eu.kanade.tachiyomi.ui.base.controller.TabbedController import eu.kanade.tachiyomi.ui.browse.extension.ExtensionController +import eu.kanade.tachiyomi.ui.browse.migration.MigrationController import eu.kanade.tachiyomi.ui.browse.source.SourceController import kotlinx.android.synthetic.main.main_activity.tabs import uy.kohesive.injekt.injectLazy @@ -111,7 +112,8 @@ class BrowseController : private val tabTitles = listOf( R.string.label_sources, - R.string.label_extensions + R.string.label_extensions, + R.string.label_migration ) .map { resources!!.getString(it) } @@ -124,6 +126,7 @@ class BrowseController : val controller: Controller = when (position) { SOURCES_CONTROLLER -> SourceController() EXTENSIONS_CONTROLLER -> ExtensionController() + MIGRATION_CONTROLLER -> MigrationController() else -> error("Wrong position $position") } router.setRoot(RouterTransaction.with(controller)) @@ -140,5 +143,6 @@ class BrowseController : const val SOURCES_CONTROLLER = 0 const val EXTENSIONS_CONTROLLER = 1 + const val MIGRATION_CONTROLLER = 2 } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt index 52a79a624..7b1292ebb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt @@ -113,7 +113,7 @@ class MigrationController : if (item is MangaItem) { PreMigrationController.navigateToMigration( Injekt.get().skipPreMigration().get(), - router, + parentController!!.router, listOf(item.manga.id!!) ) } else if (item is SourceItem) { @@ -138,7 +138,7 @@ class MigrationController : withContext(Dispatchers.Main) { PreMigrationController.navigateToMigration( Injekt.get().skipPreMigration().get(), - router, + parentController!!.router, sourceMangas ) } 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 ce5071b13..76c90ac06 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,7 +11,6 @@ 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.setting.SettingsController import eu.kanade.tachiyomi.ui.setting.SettingsMainController @@ -68,14 +67,6 @@ class MoreController : router.pushController(DownloadController().withFadeTransaction()) } } - preference { - titleRes = R.string.label_migration - iconRes = R.drawable.baseline_swap_calls_24 - iconTint = tintColor - onClick { - router.pushController(MigrationController().withFadeTransaction()) - } - } if (preferences.eh_isHentaiEnabled().get()) { preference { titleRes = R.string.eh_batch_add diff --git a/app/src/main/res/drawable/ic_compare_arrows_black_24dp.xml b/app/src/main/res/drawable/ic_compare_arrows_black_24dp.xml deleted file mode 100644 index 261c56592..000000000 --- a/app/src/main/res/drawable/ic_compare_arrows_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 75844c99e..22e6c9174 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,7 +20,7 @@ Sources Categories Backup - Source migration + Migration Extensions Extension info Help