From dc103acea2f056f2dfc5e3e6e986a01caa433320 Mon Sep 17 00:00:00 2001 From: Jay Date: Sat, 8 Feb 2020 21:01:13 -0800 Subject: [PATCH] Moved bottom navigation setting to bottom of the general list In case you can't tell this is going to go away someday --- .../ui/setting/SettingsGeneralController.kt | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index cf376ebd81..b03e7f9fda 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -61,29 +61,6 @@ class SettingsGeneralController : SettingsController() { } } - switchPreference { - key = Keys.useBottomNav - titleRes = R.string.use_bottom_nav - defaultValue = true - onChange { bottomNav -> - bottomNav as Boolean - if (!bottomNav) { - MaterialDialog(activity!!).title(R.string.switch_to_sidebar) - .message(R.string.switch_to_sidebar_summary) - .positiveButton(R.string.action_switch) { - preferences.useBottonNav().set(bottomNav) - switchNavType(bottomNav) - }.negativeButton(android.R.string.no).show() - false - } - else { - switchNavType(bottomNav) - true - } - - } - } - listPreference(activity) { key= Keys.dateFormat titleRes = R.string.pref_date_format @@ -158,6 +135,29 @@ class SettingsGeneralController : SettingsController() { defaultValue = 0 } } + + switchPreference { + key = Keys.useBottomNav + titleRes = R.string.use_bottom_nav + defaultValue = true + onChange { bottomNav -> + bottomNav as Boolean + if (!bottomNav) { + MaterialDialog(activity!!).title(R.string.switch_to_sidebar) + .message(R.string.switch_to_sidebar_summary) + .positiveButton(R.string.action_switch) { + preferences.useBottonNav().set(bottomNav) + switchNavType(bottomNav) + }.negativeButton(android.R.string.no).show() + false + } + else { + switchNavType(bottomNav) + true + } + + } + } } fun switchNavType(bottomNav: Boolean) {