diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookContract.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookContract.kt index 01a863cfc..2ab75bf76 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookContract.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookContract.kt @@ -425,7 +425,8 @@ sealed interface ReadBookIntent { data class TextActionDict(val text: String) : ReadBookIntent // Screen / selection config - data object KeepLightChanged : ReadBookIntent + data class KeepLightChanged(val value: String) : ReadBookIntent + data class SetOrientation(val value: String) : ReadBookIntent data class TextSelectAbleChanged(val enabled: Boolean) : ReadBookIntent // Media / TTS diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt index 2f14f8b09..6312747f6 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt @@ -35,6 +35,7 @@ import io.legado.app.domain.usecase.GetReadingProgressUseCase import io.legado.app.domain.usecase.UploadReadingProgressUseCase import io.legado.app.exception.NoStackTraceException import io.legado.app.help.DefaultData +import io.legado.app.ui.config.readConfig.ReadConfig import io.legado.app.help.book.BookHelp import io.legado.app.help.book.ContentProcessor import io.legado.app.help.book.isEpub @@ -581,7 +582,15 @@ class ReadBookViewModel( is ReadBookIntent.SaveMenuButtonConfig -> saveMenuButtonConfig(intent.items) is ReadBookIntent.SaveTitleBarButtonConfig -> saveTitleBarButtonConfig(intent.items) - is ReadBookIntent.KeepLightChanged -> _effects.tryEmit(ReadBookEffect.UpScreenTimeOut) + is ReadBookIntent.KeepLightChanged -> { + ReadConfig.keepLight = intent.value + _readPreferences.update { it.copy(keepLight = intent.value) } + _effects.tryEmit(ReadBookEffect.UpScreenTimeOut) + } + is ReadBookIntent.SetOrientation -> { + ReadConfig.screenOrientation = intent.value + _effects.tryEmit(ReadBookEffect.SetOrientation) + } is ReadBookIntent.TextSelectAbleChanged -> _effects.tryEmit( ReadBookEffect.UpTextSelectAble( intent.enabled diff --git a/app/src/main/java/io/legado/app/ui/book/read/sheet/MoreConfigSheet.kt b/app/src/main/java/io/legado/app/ui/book/read/sheet/MoreConfigSheet.kt index 952db073b..243b8204f 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/sheet/MoreConfigSheet.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/sheet/MoreConfigSheet.kt @@ -56,9 +56,11 @@ fun MoreConfigSheet( ScreenSettings( preferences = preferences, onScreenOrientationChange = { + onIntent(ReadBookIntent.SetOrientation(it)) scope.launch { readSettingsRepository.setScreenOrientation(it) } }, onKeepLightChange = { + onIntent(ReadBookIntent.KeepLightChanged(it)) scope.launch { readSettingsRepository.setKeepLight(it) } }, onHideStatusBarChange = { diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 751f47252..6593850a7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1324,6 +1324,7 @@ 保留启用状态 点击预览图片 反向竖屏 + 反向横屏 删除ruby标签 删除h标签 调整本章页数 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 424d7811c..0423bab46 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1193,6 +1193,7 @@ 保留启用状态 点击预览图片 反向竖屏 + 反向橫屏 删除ruby标签 删除h标签 调整本章页数 diff --git a/app/src/main/res/values/array_values.xml b/app/src/main/res/values/array_values.xml index dff580148..ebb0acf40 100644 --- a/app/src/main/res/values/array_values.xml +++ b/app/src/main/res/values/array_values.xml @@ -50,6 +50,7 @@ 2 3 4 + 5 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index f279eac99..67ab13d29 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -124,6 +124,7 @@ @string/screen_landscape @string/screen_sensor @string/screen_portrait_reversed + @string/screen_landscape_reversed diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7ce227d21..c6dd9e280 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1356,6 +1356,7 @@ Click to preview image Default Homepage Portrait Reversed + Landscape Reversed Delete ruby tag Delete h tag Adjust of chapter page