From 9a3ec56eb40a90bfa93ee04f1b825ac6f8816488 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 2 Feb 2020 18:13:13 -0500 Subject: [PATCH] Move edit categories to library settings --- .../eu/kanade/tachiyomi/ui/library/LibraryController.kt | 4 ---- .../tachiyomi/ui/setting/SettingsLibraryController.kt | 9 +++++++++ app/src/main/res/menu/library.xml | 5 ----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index 12c5dd7bed..10a4bafcd0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -31,7 +31,6 @@ import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.SecondaryDrawerController import eu.kanade.tachiyomi.ui.base.controller.TabbedController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction -import eu.kanade.tachiyomi.ui.category.CategoryController import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.ui.migration.MigrationController @@ -372,9 +371,6 @@ class LibraryController( R.id.action_update_library -> { activity?.let { LibraryUpdateService.start(it) } } - R.id.action_edit_categories -> { - router.pushController(CategoryController().withFadeTransaction()) - } R.id.action_source_migration -> { router.pushController(MigrationController().withFadeTransaction()) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt index ec05351162..9efc5b6b0e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt @@ -13,6 +13,8 @@ import eu.kanade.tachiyomi.data.library.LibraryUpdateJob import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.getOrDefault import eu.kanade.tachiyomi.ui.base.controller.DialogController +import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.category.CategoryController import kotlinx.android.synthetic.main.pref_library_columns.view.landscape_columns import kotlinx.android.synthetic.main.pref_library_columns.view.portrait_columns import rx.Observable @@ -151,6 +153,13 @@ class SettingsLibraryController : SettingsController() { preferenceCategory { titleRes = R.string.pref_category_library_categories + preference { + titleRes = R.string.action_edit_categories + onClick { + router.pushController(CategoryController().withFadeTransaction()) + } + } + intListPreference { key = Keys.defaultCategory titleRes = R.string.default_category diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml index 3e366bebf9..337f5feaa7 100644 --- a/app/src/main/res/menu/library.xml +++ b/app/src/main/res/menu/library.xml @@ -22,11 +22,6 @@ android:title="@string/action_update_library" app:showAsAction="ifRoom" /> - -