From c0cc59a31bb5208fcdcafac4afceace0221e8e96 Mon Sep 17 00:00:00 2001 From: kunfei Date: Tue, 25 Oct 2022 22:44:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/help/config/AppConfig.kt | 10 ++++++++++ .../io/legado/app/ui/book/read/ReadBookViewModel.kt | 4 ++++ .../ui/book/read/config/ClickActionConfigDialog.kt | 12 +----------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/config/AppConfig.kt b/app/src/main/java/io/legado/app/help/config/AppConfig.kt index 763f63da1..25ae7b98d 100644 --- a/app/src/main/java/io/legado/app/help/config/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt @@ -416,5 +416,15 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { set(value) { appCtx.putPrefInt(PreferKey.sourceEditMaxLine, value) } + + fun detectClickArea() { + if (clickActionTL * clickActionTC * clickActionTR + * clickActionML * clickActionMC * clickActionMR + * clickActionBL * clickActionBC * clickActionBR != 0 + ) { + appCtx.putPrefInt(PreferKey.clickActionMC, 0) + appCtx.toastOnUi("当前没有配置菜单区域,自动恢复中间区域为菜单.") + } + } } 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 6449df098..04bfa3865 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 @@ -49,6 +49,10 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) { var searchResultIndex: Int = 0 private var changeSourceCoroutine: Coroutine<*>? = null + init { + AppConfig.detectClickArea() + } + /** * 初始化 */ diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ClickActionConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ClickActionConfigDialog.kt index 73324071a..7d8a019bb 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/ClickActionConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ClickActionConfigDialog.kt @@ -14,9 +14,7 @@ import io.legado.app.lib.dialogs.selector import io.legado.app.ui.book.read.ReadBookActivity import io.legado.app.utils.getCompatColor import io.legado.app.utils.putPrefInt -import io.legado.app.utils.toastOnUi import io.legado.app.utils.viewbindingdelegate.viewBinding -import splitties.init.appCtx /** * 点击区域设置 @@ -142,15 +140,7 @@ class ClickActionConfigDialog : BaseDialogFragment(R.layout.dialog_click_action_ override fun onDestroy() { super.onDestroy() - AppConfig.run { - if (clickActionTL * clickActionTC * clickActionTR - * clickActionML * clickActionMC * clickActionMR - * clickActionBL * clickActionBC * clickActionBR != 0 - ) { - putPrefInt(PreferKey.clickActionMC, 0) - appCtx.toastOnUi("当前没有配置菜单区域,自动恢复中间区域为菜单.") - } - } + AppConfig.detectClickArea() } } \ No newline at end of file