From 06d3a753ac154a79c116b683a197473953660212 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 3 May 2020 21:24:00 -0400 Subject: [PATCH] Add manga migration and merge buttons --- .../ui/manga/info/MangaInfoController.kt | 15 +++++++++++++ .../res/layout-land/manga_info_controller.xml | 22 +++++++++++++++++++ .../main/res/layout/manga_info_controller.xml | 22 +++++++++++++++++++ 3 files changed, 59 insertions(+) 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 3c3277ca1..a9f7a8c12 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 @@ -33,6 +33,7 @@ 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 @@ -137,6 +138,20 @@ class MangaInfoController(private val fromSource: Boolean = false) : .launchIn(scope) } + binding.btnMigrate.clicks() + .onEach { + PreMigrationController.navigateToMigration( + preferences.skipPreMigration().get(), + router, + listOf(presenter.manga.id!!) + ) + } + .launchIn(scope) + + binding.btnSmartSearch.clicks() + .onEach { openSmartSearch() } + .launchIn(scope) + // Set SwipeRefresh to refresh manga data. binding.swipeRefresh.refreshes() .onEach { fetchMangaFromSource() } diff --git a/app/src/main/res/layout-land/manga_info_controller.xml b/app/src/main/res/layout-land/manga_info_controller.xml index 0bd179b81..8678e7181 100644 --- a/app/src/main/res/layout-land/manga_info_controller.xml +++ b/app/src/main/res/layout-land/manga_info_controller.xml @@ -256,6 +256,28 @@ app:icon="@drawable/ic_public_24dp" tools:visibility="visible" /> + + + + + + + +