Merge pull request #2111 from 821938089/opt-page-scroll

优化滑动翻页
2 years ago · 1564530f84
parent 38e2fe103a fc9259d344
commit 1564530f84
13 changed files with 69 additions and 6 deletions
--- a/app/src/main/java/io/legado/app/constant/PreferKey.kt
+++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt
@ -108,6 +108,7 @@ object PreferKey {
    const val welcomeShowTextDark = "welcomeShowTextDark"
    const val welcomeShowIcon = "welcomeShowIcon"
    const val welcomeShowIconDark = "welcomeShowIconDark"
+    const val pageTouchSlop = "pageTouchSlop"

    const val cPrimary = "colorPrimary"
    const val cAccent = "colorAccent"
--- a/app/src/main/java/io/legado/app/help/config/AppConfig.kt
+++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt
@ -321,6 +321,12 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener {
            appCtx.putPrefString("searchGroup", value)
        }

+    var pageTouchSlop: Int
+        get() = appCtx.getPrefInt(PreferKey.pageTouchSlop, 0)
+        set(value) {
+            appCtx.putPrefInt(PreferKey.pageTouchSlop, value)
+        }
+
    private fun getPrefUserAgent(): String {
        val ua = appCtx.getPrefString(PreferKey.userAgent)
        if (ua.isNullOrBlank()) {
--- a/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt
@ -53,6 +53,7 @@ class ReadView(context: Context, attrs: AttributeSet) :
    val defaultAnimationSpeed = 300
    private var pressDown = false
    private var isMove = false
+    private var isPageMove = false

    //起始点
    var startX: Float = 0f
@ -81,6 +82,13 @@ class ReadView(context: Context, attrs: AttributeSet) :
    private val initialTextPos = TextPos(0, 0, 0)

    val slopSquare by lazy { ViewConfiguration.get(context).scaledTouchSlop }
+    val pageSlopSquare by lazy {
+        if (AppConfig.pageTouchSlop == 0) {
+            slopSquare
+        } else {
+            AppConfig.pageTouchSlop
+        }
+    }
    private val tlRect = RectF()
    private val tcRect = RectF()
    private val trRect = RectF()
@ -188,6 +196,7 @@ class ReadView(context: Context, attrs: AttributeSet) :
                postDelayed(longPressRunnable, longPressTimeout)
                pressDown = true
                isMove = false
+                isPageMove = false
                pageDelegate?.onTouch(event)
                pageDelegate?.onDown()
                setStartPoint(event.x, event.y)
@ -197,12 +206,16 @@ class ReadView(context: Context, attrs: AttributeSet) :
                    isMove =
                        abs(startX - event.x) > slopSquare || abs(startY - event.y) > slopSquare
                }
+                if (!isPageMove) {
+                    isPageMove =
+                        abs(startX - event.x) > pageSlopSquare || abs(startY - event.y) > pageSlopSquare
+                }
                if (isMove) {
                    longPressed = false
                    removeCallbacks(longPressRunnable)
                    if (isTextSelected) {
                        selectText(event.x, event.y)
-                    } else {
+                    } else if (isPageMove) {
                        pageDelegate?.onTouch(event)
                    }
                }
@ -212,7 +225,7 @@ class ReadView(context: Context, attrs: AttributeSet) :
                removeCallbacks(longPressRunnable)
                if (!pressDown) return true
                pressDown = false
-                if (!isMove) {
+                if (!isPageMove) {
                    if (!longPressed && !pressOnTextSelected) {
                        onSingleTapUp()
                        return true
@ -220,7 +233,7 @@ class ReadView(context: Context, attrs: AttributeSet) :
                }
                if (isTextSelected) {
                    callBack.showTextActionMenu()
-                } else if (isMove) {
+                } else if (isPageMove) {
                    pageDelegate?.onTouch(event)
                }
                pressOnTextSelected = false
@ -231,7 +244,7 @@ class ReadView(context: Context, attrs: AttributeSet) :
                pressDown = false
                if (isTextSelected) {
                    callBack.showTextActionMenu()
-                } else if (isMove) {
+                } else if (isPageMove) {
                    pageDelegate?.onTouch(event)
                }
                pressOnTextSelected = false
@ -283,6 +296,7 @@ class ReadView(context: Context, attrs: AttributeSet) :
        kotlin.runCatching {
            curPage.longPress(startX, startY) { relativePos, lineIndex, charIndex ->
                isTextSelected = true
+                pressOnTextSelected = true
                initialTextPos.upData(relativePos, lineIndex, charIndex)
                val startPos = TextPos(relativePos, lineIndex, charIndex)
                val endPos = TextPos(relativePos, lineIndex, charIndex)
@ -357,7 +371,7 @@ class ReadView(context: Context, attrs: AttributeSet) :
     */
    private fun onSingleTapUp() {
        when {
-            isTextSelected -> isTextSelected = false
+            isTextSelected -> Unit
            mcRect.contains(startX, startY) -> if (!isAbortAnim) {
                click(AppConfig.clickActionMC)
            }
--- a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt
@ -11,6 +11,7 @@ abstract class HorizontalPageDelegate(readView: ReadView) : PageDelegate(readVie
    protected var curBitmap: Bitmap? = null
    protected var prevBitmap: Bitmap? = null
    protected var nextBitmap: Bitmap? = null
+    protected val slopSquare by lazy { readView.slopSquare * readView.slopSquare }

    override fun setDirection(direction: PageDirection) {
        super.setDirection(direction)
@ -71,7 +72,7 @@ abstract class HorizontalPageDelegate(readView: ReadView) : PageDelegate(readVie
            val deltaX = (focusX - startX).toInt()
            val deltaY = (focusY - startY).toInt()
            val distance = deltaX * deltaX + deltaY * deltaY
-            isMoved = distance > readView.slopSquare
+            isMoved = distance > slopSquare
            if (isMoved) {
                if (sumX - startX > 0) {
                    //如果上一页不存在
--- a/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt
@ -6,6 +6,7 @@ import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.View
+import android.view.ViewConfiguration
 import androidx.core.view.postDelayed
 import androidx.fragment.app.activityViewModels
 import androidx.preference.ListPreference
@ -42,6 +43,7 @@ class OtherConfigFragment : PreferenceFragment(),
            AppConfig.defaultBookTreeUri = treeUri.toString()
        }
    }
+    private val slopSquare by lazy { ViewConfiguration.get(context).scaledTouchSlop }

    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
        putPrefBoolean(PreferKey.processText, isProcessTextEnabled())
@ -58,6 +60,7 @@ class OtherConfigFragment : PreferenceFragment(),
        }
        upPreferenceSummary(PreferKey.checkSource, CheckSource.summary)
        upPreferenceSummary(PreferKey.bitmapCacheSize, AppConfig.bitmapCacheSize.toString())
+        upPreferenceSummary(PreferKey.pageTouchSlop, slopSquare.toString())
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@ -117,6 +120,16 @@ class OtherConfigFragment : PreferenceFragment(),
                        ImageProvider.bitmapLruCache.resize(ImageProvider.cacheSize)
                    }
            }
+            PreferKey.pageTouchSlop -> {
+                NumberPickerDialog(requireContext())
+                    .setTitle(getString(R.string.page_touch_slop_dialog_title))
+                    .setMaxValue(9999)
+                    .setMinValue(0)
+                    .setValue(AppConfig.pageTouchSlop)
+                    .show {
+                        AppConfig.pageTouchSlop = it
+                    }
+            }
        }
        return super.onPreferenceTreeClick(preference)
    }
@ -168,6 +181,7 @@ class OtherConfigFragment : PreferenceFragment(),
            PreferKey.threadCount -> preference.summary = getString(R.string.threads_num, value)
            PreferKey.webPort -> preference.summary = getString(R.string.web_port_summary, value)
            PreferKey.bitmapCacheSize -> preference.summary = getString(R.string.bitmap_cache_size_summary, value)
+            PreferKey.pageTouchSlop -> preference.summary = getString(R.string.page_touch_slop_summary, value)
            else -> if (preference is ListPreference) {
                val index = preference.findIndexOfValue(value)
                // Set the summary to reflect the new value.
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -1003,4 +1003,7 @@
    <string name="last_read_time_sort">阅读时间排序</string>
    <string name="reading_time_tag">阅读时长:</string>
    <string name="last_read_time_tag">最后阅读时间:</string>
+    <string name="page_touch_slop_title">滑动翻页阈值</string>
+    <string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
+    <string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
 </resources>
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@ -1006,4 +1006,7 @@
    <string name="last_read_time_sort">阅读时间排序</string>
    <string name="reading_time_tag">阅读时长:</string>
    <string name="last_read_time_tag">最后阅读时间:</string>
+    <string name="page_touch_slop_title">滑动翻页阈值</string>
+    <string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
+    <string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -1006,4 +1006,7 @@
    <string name="last_read_time_sort">阅读时间排序</string>
    <string name="reading_time_tag">阅读时长:</string>
    <string name="last_read_time_tag">最后阅读时间:</string>
+    <string name="page_touch_slop_title">滑动翻页阈值</string>
+    <string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
+    <string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
 </resources>
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@ -1003,4 +1003,7 @@
    <string name="last_read_time_sort">阅读时间排序</string>
    <string name="reading_time_tag">阅读时长:</string>
    <string name="last_read_time_tag">最后阅读时间:</string>
+    <string name="page_touch_slop_title">滑动翻页阈值</string>
+    <string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
+    <string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -1005,4 +1005,7 @@
    <string name="last_read_time_sort">阅读时间排序</string>
    <string name="reading_time_tag">阅读时长:</string>
    <string name="last_read_time_tag">最后阅读时间:</string>
+    <string name="page_touch_slop_title">滑动翻页阈值</string>
+    <string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
+    <string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
 </resources>
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@ -1005,4 +1005,7 @@
    <string name="last_read_time_sort">阅读时间排序</string>
    <string name="reading_time_tag">阅读时长:</string>
    <string name="last_read_time_tag">最后阅读时间:</string>
+    <string name="page_touch_slop_title">滑动翻页阈值</string>
+    <string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
+    <string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -1006,4 +1006,7 @@
    <string name="last_read_time_sort">阅读时间排序</string>
    <string name="reading_time_tag">阅读时长:</string>
    <string name="last_read_time_tag">最后阅读时间:</string>
+    <string name="page_touch_slop_title">滑动翻页阈值</string>
+    <string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
+    <string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
 </resources>
--- a/app/src/main/res/xml/pref_config_other.xml
+++ b/app/src/main/res/xml/pref_config_other.xml
@ -128,6 +128,12 @@
            android:title="@string/threads_num_title"
            app:iconSpaceReserved="false" />

+        <io.legado.app.lib.prefs.Preference
+            android:key="pageTouchSlop"
+            android:summary="@string/page_touch_slop_summary"
+            android:title="@string/page_touch_slop_title"
+            app:iconSpaceReserved="false" />
+
        <io.legado.app.lib.prefs.SwitchPreference
            android:defaultValue="true"
            android:key="process_text"