From 63139a5c086874762d28e2badc30c3ca18f12382 Mon Sep 17 00:00:00 2001 From: simakover Date: Sun, 23 May 2021 00:17:35 +0500 Subject: [PATCH] hide update and history buttons option (#324) * hide update and history buttons option * Move updates and history button in More then hiding Co-authored-by: jobobby04 --- .../data/preference/PreferenceKeys.kt | 4 ++++ .../data/preference/PreferencesHelper.kt | 4 ++++ .../kanade/tachiyomi/ui/main/MainActivity.kt | 4 ++++ .../tachiyomi/ui/more/MoreController.kt | 22 +++++++++++++++++++ .../ui/setting/SettingsGeneralController.kt | 10 +++++++++ app/src/main/res/values/strings.xml | 2 ++ 6 files changed, 46 insertions(+) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt index 1a8820679..a42a8b92f 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt @@ -15,6 +15,10 @@ object PreferenceKeys { const val hideBottomBar = "pref_hide_bottom_bar_on_scroll" + const val hideUpdatesButton = "pref_hide_updates_button" + + const val hideHistoryButton = "pref_hide_history_button" + const val enableTransitionsPager = "pref_enable_transitions_pager_key" const val enableTransitionsWebtoon = "pref_enable_transitions_webtoon_key" diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index fc8c8cba5..bf1b7e098 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -66,6 +66,10 @@ class PreferencesHelper(val context: Context) { fun hideBottomBar() = flowPrefs.getBoolean(Keys.hideBottomBar, true) + fun hideUpdatesButton() = flowPrefs.getBoolean(Keys.hideUpdatesButton, false) + + fun hideHistoryButton() = flowPrefs.getBoolean(Keys.hideHistoryButton, false) + fun bottomBarLabels() = flowPrefs.getBoolean(Keys.bottomBarLabels, true) fun useBiometricLock() = flowPrefs.getBoolean(Keys.useBiometricLock, false) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 665e75967..fc41d6afe 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -515,6 +515,10 @@ class MainActivity : BaseViewBindingActivity() { if (visible) { if (collapse) { bottomNavAnimator.expand() + val navUpdates = binding.bottomNav.menu.findItem(R.id.nav_updates) + navUpdates.isVisible = !preferences.hideUpdatesButton().get() + val navHistory = binding.bottomNav.menu.findItem(R.id.nav_history) + navHistory.isVisible = !preferences.hideHistoryButton().get() } bottomViewNavigationBehavior?.slideUp(binding.bottomNav) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt index e87b15597..8ad6cf78c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt @@ -16,6 +16,8 @@ import eu.kanade.tachiyomi.ui.base.controller.RootController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.category.CategoryController import eu.kanade.tachiyomi.ui.download.DownloadController +import eu.kanade.tachiyomi.ui.recent.history.HistoryController +import eu.kanade.tachiyomi.ui.recent.updates.UpdatesController import eu.kanade.tachiyomi.ui.setting.SettingsController import eu.kanade.tachiyomi.ui.setting.SettingsMainController import eu.kanade.tachiyomi.util.preference.add @@ -75,6 +77,26 @@ class MoreController : } preferenceCategory { + if (preferences.hideUpdatesButton().get()) { + preference { + titleRes = R.string.label_recent_updates + iconRes = R.drawable.ic_new_releases_state + iconTint = tintColor + onClick { + router.pushController(UpdatesController().withFadeTransaction()) + } + } + } + if (preferences.hideHistoryButton().get()) { + preference { + titleRes = R.string.label_recent_manga + iconRes = R.drawable.ic_history_24dp + iconTint = tintColor + onClick { + router.pushController(HistoryController().withFadeTransaction()) + } + } + } preference { titleRes = R.string.label_download_queue 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 dbf48a3ae..e43fcfb2f 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 @@ -51,6 +51,16 @@ class SettingsGeneralController : SettingsController() { titleRes = R.string.pref_hide_bottom_bar_on_scroll defaultValue = true } + switchPreference { + key = Keys.hideUpdatesButton + titleRes = R.string.pref_hide_updates_button + defaultValue = false + } + switchPreference { + key = Keys.hideHistoryButton + titleRes = R.string.pref_hide_history_button + defaultValue = false + } switchPreference { key = Keys.bottomBarLabels titleRes = R.string.pref_show_bottom_bar_labels diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 60b6ff5a5..1f6a5004b 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -165,6 +165,8 @@ Date format Confirm exit Hide bottom bar on scroll + Move Update button to the More tab + Move History button to the More tab Always show bottom bar labels Manage notifications