From bb7b79a6e912a27da120dbe6a4dd7e8d62d80ed8 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 22 Nov 2020 16:27:42 -0500 Subject: [PATCH] Add help shortcut for source migration (closes #3951) (cherry picked from commit 56c19e57a9c062341c848975a150ca21d151006e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt --- .../sources/MigrationSourcesController.kt | 23 +++++++++++++++++++ app/src/main/res/menu/source_migration.xml | 11 +++++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 35 insertions(+) create mode 100644 app/src/main/res/menu/source_migration.xml diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt index 557b86c3c..c429af476 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt @@ -1,6 +1,9 @@ package eu.kanade.tachiyomi.ui.browse.migration.sources import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager @@ -16,6 +19,7 @@ import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationContr import eu.kanade.tachiyomi.ui.browse.migration.manga.MigrationMangaController import eu.kanade.tachiyomi.util.lang.await import eu.kanade.tachiyomi.util.lang.launchUI +import eu.kanade.tachiyomi.util.system.openInBrowser import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import rx.schedulers.Schedulers @@ -31,6 +35,10 @@ class MigrationSourcesController : private var adapter: SourceAdapter? = null + init { + setHasOptionsMenu(true) + } + override fun createPresenter(): MigrationSourcesPresenter { return MigrationSourcesPresenter() } @@ -54,6 +62,17 @@ class MigrationSourcesController : super.onDestroyView(view) } + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.source_migration, menu) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + R.id.action_source_migration_help -> activity?.openInBrowser(HELP_URL) + } + return super.onOptionsItemSelected(item) + } + fun setSources(sourcesWithManga: List) { adapter?.updateDataSet(sourcesWithManga) } @@ -95,4 +114,8 @@ class MigrationSourcesController : } } // SY <-- + + companion object { + const val HELP_URL = "https://tachiyomi.org/help/guides/source-migration/" + } } diff --git a/app/src/main/res/menu/source_migration.xml b/app/src/main/res/menu/source_migration.xml new file mode 100644 index 000000000..000574fd0 --- /dev/null +++ b/app/src/main/res/menu/source_migration.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0909eace4..e3db0c425 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -622,6 +622,7 @@ Ch. %1$s - %2$s + Source migration guide Tap to select the source to migrate from Select data to include Select a source to migrate from