mirror of
https://github.com/null2264/yokai.git
synced 2025-06-21 10:44:42 +00:00
chore: Re-position cutout options
This commit is contained in:
parent
11ae924f25
commit
d992c007c4
1 changed files with 10 additions and 12 deletions
|
@ -116,16 +116,6 @@ class SettingsReaderController : SettingsController() {
|
|||
titleRes = R.string.fullscreen
|
||||
defaultValue = true
|
||||
}
|
||||
switchPreference {
|
||||
key = Keys.keepScreenOn
|
||||
titleRes = R.string.keep_screen_on
|
||||
defaultValue = true
|
||||
}
|
||||
switchPreference {
|
||||
key = Keys.showPageNumber
|
||||
titleRes = R.string.show_page_number
|
||||
defaultValue = true
|
||||
}
|
||||
switchPreference {
|
||||
bindTo(readerPreferences.cutoutShort())
|
||||
// FIXME: Transition from reader to homepage is broken when cutout short is disabled
|
||||
|
@ -139,10 +129,19 @@ class SettingsReaderController : SettingsController() {
|
|||
val values = LandscapeCutoutBehaviour.entries
|
||||
entriesRes = values.map { it.titleResId }.toTypedArray()
|
||||
entryValues = values.map { it.name }
|
||||
defaultValue = LandscapeCutoutBehaviour.HIDE.name
|
||||
|
||||
preferences.fullscreen().changesIn(viewScope) { isVisible = DeviceUtil.hasCutout(activity) && it}
|
||||
}
|
||||
switchPreference {
|
||||
key = Keys.keepScreenOn
|
||||
titleRes = R.string.keep_screen_on
|
||||
defaultValue = true
|
||||
}
|
||||
switchPreference {
|
||||
key = Keys.showPageNumber
|
||||
titleRes = R.string.show_page_number
|
||||
defaultValue = true
|
||||
}
|
||||
}
|
||||
|
||||
preferenceCategory {
|
||||
|
@ -220,7 +219,6 @@ class SettingsReaderController : SettingsController() {
|
|||
val values = CutoutBehaviour.entries
|
||||
entriesRes = values.map { it.titleResId }.toTypedArray()
|
||||
entryValues = values.map { it.name }
|
||||
defaultValue = CutoutBehaviour.HIDE.name
|
||||
|
||||
// Calling this once to show only on cutout
|
||||
isVisible = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue