From af6b42cec7823d9c46c07369092db32b6e7cf923 Mon Sep 17 00:00:00 2001 From: Riztard Lanthorn Date: Sat, 30 Oct 2021 23:19:15 +0700 Subject: [PATCH] Hide cutout toggle button if fullscreen is off (#6150) (cherry picked from commit 33a02b47d5e54b207fe2d50cfe0b754db22a6c4b) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt --- .../ui/reader/setting/ReaderGeneralSettings.kt | 14 ++++++++------ .../ui/setting/SettingsReaderController.kt | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt index d621b17bd..30cd02161 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt @@ -39,17 +39,19 @@ class ReaderGeneralSettings @JvmOverloads constructor(context: Context, attrs: A binding.backgroundColor.bindToIntPreference(preferences.readerTheme(), R.array.reader_themes_values) binding.showPageNumber.bindToPreference(preferences.showPageNumber()) binding.fullscreen.bindToPreference(preferences.fullscreen()) + preferences.fullscreen() + .asImmediateFlow { + // If the preference is explicitly disabled, that means the setting was configured since there is a cutout + binding.cutoutShort.isVisible = it && ((context as ReaderActivity).hasCutout || !preferences.cutoutShort().get()) + binding.cutoutShort.bindToPreference(preferences.cutoutShort()) + } + .launchIn((context as ReaderActivity).lifecycleScope) + binding.keepscreen.bindToPreference(preferences.keepScreenOn()) binding.longTap.bindToPreference(preferences.readWithLongTap()) binding.alwaysShowChapterTransition.bindToPreference(preferences.alwaysShowChapterTransition()) // binding.pageTransitions.bindToPreference(preferences.pageTransitions()) - // If the preference is explicitly disabled, that means the setting was configured since there is a cutout - if ((context as ReaderActivity).hasCutout || !preferences.cutoutShort().get()) { - binding.cutoutShort.isVisible = true - binding.cutoutShort.bindToPreference(preferences.cutoutShort()) - } - // SY --> binding.forceHorzSeekbar.bindToPreference(preferences.forceHorizontalSeekbar()) binding.landscapeVerticalSeekbar.bindToPreference(preferences.landscapeVerticalSeekbar()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt index 8be7f6311..ab0590017 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt @@ -139,6 +139,7 @@ class SettingsReaderController : SettingsController() { key = Keys.cutoutShort titleRes = R.string.pref_cutout_short defaultValue = true + preferences.fullscreen().asImmediateFlow { isVisible = it }.launchIn(viewScope) } }