From 680e2cb4c882839b18dbb0c0ae6ede5b1edbd913 Mon Sep 17 00:00:00 2001 From: gedoor Date: Wed, 11 Nov 2020 12:21:41 +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 --- .../java/io/legado/app/constant/PreferKey.kt | 1 - .../main/java/io/legado/app/help/AppConfig.kt | 12 +--- .../read/config/ClickActionConfigDialog.kt | 55 ++++++++----------- .../legado/app/ui/book/read/page/PageView.kt | 8 +-- app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/pref_config_read.xml | 7 --- 9 files changed, 32 insertions(+), 55 deletions(-) diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt index 9f86fb509..1f99d7cba 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -5,7 +5,6 @@ object PreferKey { const val language = "language" const val themeMode = "themeMode" const val hideStatusBar = "hideStatusBar" - const val clickTurnPage = "clickTurnPage" const val clickActionTopLeft = "clickActionTopLeft" const val clickActionTopCenter = "clickActionTopCenter" const val clickActionTopRight = "clickActionTopRight" diff --git a/app/src/main/java/io/legado/app/help/AppConfig.kt b/app/src/main/java/io/legado/app/help/AppConfig.kt index 96317e7a6..a6064e855 100644 --- a/app/src/main/java/io/legado/app/help/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/AppConfig.kt @@ -137,24 +137,16 @@ object AppConfig { val importKeepName get() = App.INSTANCE.getPrefBoolean(PreferKey.importKeepName) - val clickTurnPage get() = App.INSTANCE.getPrefBoolean(PreferKey.clickTurnPage, true) - val clickActionTopLeft get() = App.INSTANCE.getPrefInt(PreferKey.clickActionTopLeft, 2) val clickActionTopCenter get() = App.INSTANCE.getPrefInt(PreferKey.clickActionTopCenter, 2) val clickActionTopRight get() = App.INSTANCE.getPrefInt(PreferKey.clickActionTopRight, 1) val clickActionMiddleLeft get() = App.INSTANCE.getPrefInt(PreferKey.clickActionMiddleLeft, 2) val clickActionMiddleCenter - get() = App.INSTANCE.getPrefInt( - PreferKey.clickActionMiddleCenter, - 0 - ) + get() = App.INSTANCE.getPrefInt(PreferKey.clickActionMiddleCenter, 0) val clickActionMiddleRight get() = App.INSTANCE.getPrefInt(PreferKey.clickActionMiddleRight, 1) val clickActionBottomLeft get() = App.INSTANCE.getPrefInt(PreferKey.clickActionBottomLeft, 2) val clickActionBottomCenter - get() = App.INSTANCE.getPrefInt( - PreferKey.clickActionBottomCenter, - 1 - ) + get() = App.INSTANCE.getPrefInt(PreferKey.clickActionBottomCenter, 1) val clickActionBottomRight get() = App.INSTANCE.getPrefInt(PreferKey.clickActionBottomRight, 1) } 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 c737b2867..ca6e14fd0 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 @@ -19,6 +19,8 @@ import org.jetbrains.anko.sdk27.listeners.onClick class ClickActionConfigDialog : BaseDialogFragment() { + private val actions = linkedMapOf() + override fun onStart() { super.onStart() (activity as ReadBookActivity).bottomDialog++ @@ -43,27 +45,23 @@ class ClickActionConfigDialog : BaseDialogFragment() { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { view.setBackgroundColor(getCompatColor(R.color.translucent)) + actions[-1] = getString(R.string.non_action) + actions[0] = getString(R.string.menu) + actions[1] = getString(R.string.next_page) + actions[2] = getString(R.string.prev_page) initData() initViewEvent() } private fun initData() = with(AppConfig) { - tv_top_left.text = getActionString(clickActionTopLeft) - tv_top_center.text = getActionString(clickActionTopCenter) - tv_top_right.text = getActionString(clickActionTopRight) - tv_middle_left.text = getActionString(clickActionMiddleLeft) - tv_middle_right.text = getActionString(clickActionMiddleRight) - tv_bottom_left.text = getActionString(clickActionBottomLeft) - tv_bottom_center.text = getActionString(clickActionBottomCenter) - tv_bottom_right.text = getActionString(clickActionBottomRight) - } - - private fun getActionString(action: Int): String { - return when (action) { - 0 -> getString(R.string.menu) - 2 -> getString(R.string.prev_page) - else -> getString(R.string.next_page) - } + tv_top_left.text = actions[clickActionTopLeft] + tv_top_center.text = actions[clickActionTopCenter] + tv_top_right.text = actions[clickActionTopRight] + tv_middle_left.text = actions[clickActionMiddleLeft] + tv_middle_right.text = actions[clickActionMiddleRight] + tv_bottom_left.text = actions[clickActionBottomLeft] + tv_bottom_center.text = actions[clickActionBottomCenter] + tv_bottom_right.text = actions[clickActionBottomRight] } private fun initViewEvent() { @@ -73,64 +71,59 @@ class ClickActionConfigDialog : BaseDialogFragment() { tv_top_left.onClick { selectAction { action -> putPrefInt(PreferKey.clickActionTopLeft, action) - (it as? TextView)?.text = getActionString(action) + (it as? TextView)?.text = actions[action] } } tv_top_center.onClick { selectAction { action -> putPrefInt(PreferKey.clickActionTopCenter, action) - (it as? TextView)?.text = getActionString(action) + (it as? TextView)?.text = actions[action] } } tv_top_right.onClick { selectAction { action -> putPrefInt(PreferKey.clickActionTopRight, action) - (it as? TextView)?.text = getActionString(action) + (it as? TextView)?.text = actions[action] } } tv_middle_left.onClick { selectAction { action -> putPrefInt(PreferKey.clickActionMiddleLeft, action) - (it as? TextView)?.text = getActionString(action) + (it as? TextView)?.text = actions[action] } } tv_middle_right.onClick { selectAction { action -> putPrefInt(PreferKey.clickActionMiddleRight, action) - (it as? TextView)?.text = getActionString(action) + (it as? TextView)?.text = actions[action] } } tv_bottom_left.onClick { selectAction { action -> putPrefInt(PreferKey.clickActionBottomLeft, action) - (it as? TextView)?.text = getActionString(action) + (it as? TextView)?.text = actions[action] } } tv_bottom_center.onClick { selectAction { action -> putPrefInt(PreferKey.clickActionBottomCenter, action) - (it as? TextView)?.text = getActionString(action) + (it as? TextView)?.text = actions[action] } } tv_bottom_right.onClick { selectAction { action -> putPrefInt(PreferKey.clickActionBottomRight, action) - (it as? TextView)?.text = getActionString(action) + (it as? TextView)?.text = actions[action] } } } private fun selectAction(success: (action: Int) -> Unit) { - val actions = arrayListOf( - getString(R.string.menu), - getString(R.string.next_page), - getString(R.string.prev_page) - ) selector( getString(R.string.select_action), - actions + actions.values.toList() ) { _, index -> - success.invoke(index) + success.invoke(actions.keys.toList()[index]) } } diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt index 741bf7dfe..2cf00e902 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt @@ -295,12 +295,8 @@ class PageView(context: Context, attrs: AttributeSet) : private fun click(action: Int) { when (action) { 0 -> callBack.showActionMenu() - 1 -> if (AppConfig.clickTurnPage) { - pageDelegate?.nextPageByAnim(defaultAnimationSpeed) - } - 2 -> if (AppConfig.clickTurnPage) { - pageDelegate?.prevPageByAnim(defaultAnimationSpeed) - } + 1 -> pageDelegate?.nextPageByAnim(defaultAnimationSpeed) + 2 -> pageDelegate?.prevPageByAnim(defaultAnimationSpeed) } } diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index f78fcf275..bbf6b58b4 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -784,5 +784,6 @@ 关闭 下一页 上一页 + 无操作 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8a8aa56bb..10e26d259 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -784,5 +784,6 @@ 关闭 下一页 上一页 + 无操作 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index e07855dc9..545b0173f 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -787,5 +787,6 @@ 关闭 下一页 上一页 + 无操作 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 87e5db401..91f4a2920 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -790,5 +790,6 @@ 关闭 下一页 上一页 + 无操作 diff --git a/app/src/main/res/xml/pref_config_read.xml b/app/src/main/res/xml/pref_config_read.xml index 43b827dfb..65b8c94e9 100644 --- a/app/src/main/res/xml/pref_config_read.xml +++ b/app/src/main/res/xml/pref_config_read.xml @@ -62,13 +62,6 @@ app:iconSpaceReserved="false" app:isBottomBackground="true" /> - -