diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index 19c420460..b2f308ed1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -430,7 +430,6 @@ class MangaController : if (preferences.recommendsInOverflow().get()) menu.findItem(R.id.action_recommend).isVisible = true menu.findItem(R.id.action_merged).isVisible = presenter.manga.source == MERGED_SOURCE_ID menu.findItem(R.id.action_toggle_dedupe).isVisible = false // presenter.manga.source == MERGED_SOURCE_ID - menu.findItem(R.id.action_merge).isVisible = presenter.manga.favorite // SY <-- } @@ -464,8 +463,8 @@ class MangaController : presenter.dedupe = !presenter.dedupe presenter.toggleDedupe() } - R.id.action_merge -> { - openSmartSearch() + R.id.action_migrate -> { + migrateManga() } // SY <-- @@ -966,7 +965,7 @@ class MangaController : /** * Initiates source migration for the specific manga. */ - /* SY private */fun migrateManga() { + private fun migrateManga() { // SY --> PreMigrationController.navigateToMigration( preferences.skipPreMigration().get(), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt index 75d4b754b..a76a721a9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt @@ -142,9 +142,9 @@ class MangaInfoHeaderAdapter( } // SY --> - binding.btnMigrate.isVisible = controller.presenter.manga.favorite - binding.btnMigrate.clicks() - .onEach { controller.migrateManga() } + binding.btnMerge.isVisible = controller.presenter.manga.favorite + binding.btnMerge.clicks() + .onEach { controller.openSmartSearch() } .launchIn(scope) // SY <-- diff --git a/app/src/main/res/layout/manga_info_header.xml b/app/src/main/res/layout/manga_info_header.xml index 803292b72..dee23220e 100644 --- a/app/src/main/res/layout/manga_info_header.xml +++ b/app/src/main/res/layout/manga_info_header.xml @@ -169,20 +169,20 @@ android:text="@string/action_web_view" android:visibility="gone" app:icon="@drawable/ic_public_24dp" - app:layout_constraintEnd_toStartOf="@+id/btn_migrate" + app:layout_constraintEnd_toStartOf="@+id/btn_merge" app:layout_constraintStart_toEndOf="@+id/btn_tracking" app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" /> --> - + app:showAsAction="never" /> - + app:showAsAction="never" />--> See Recommendations + Merge Merge With Another