优化 #5713

app/src/main/java/io/legado/app/ui/widget/NoChildScrollNestedScrollView.kt

@@ -11,12 +11,19 @@ class NoChildScrollNestedScrollView @JvmOverloads constructor(
     attrs: AttributeSet? = null,
 ) : NestedScrollView(context, attrs) {
 
-    override fun requestChildRectangleOnScreen(
+    private var isRequestChildFocus = false
-        child: View,
+
-        rectangle: Rect?,
+    override fun requestChildFocus(child: View?, focused: View?) {
-        immediate: Boolean
+        isRequestChildFocus = true
-    ): Boolean {
+        super.requestChildFocus(child, focused)
-        return false
+        isRequestChildFocus = false
+    }
+
+    override fun computeScrollDeltaToGetChildRectOnScreen(rect: Rect?): Int {
+        if (isRequestChildFocus) {
+            return 0
+        }
+        return super.computeScrollDeltaToGetChildRectOnScreen(rect)
     }
 
 }

app/src/main/java/io/legado/app/ui/widget/recycler/NoChildScrollLinearLayoutManager.kt

@@ -1,7 +1,6 @@
 package io.legado.app.ui.widget.recycler
 
 import android.content.Context
-import android.graphics.Rect
 import android.util.AttributeSet
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -14,23 +13,13 @@ class NoChildScrollLinearLayoutManager @JvmOverloads constructor(
     defStyleRes: Int = 0
 ) : LinearLayoutManager(context, attrs, defStyleAttr, defStyleRes) {
 
-    override fun requestChildRectangleOnScreen(
+    override fun onRequestChildFocus(
         parent: RecyclerView,
+        state: RecyclerView.State,
         child: View,
-        rect: Rect,
+        focused: View?
-        immediate: Boolean,
-        focusedChildVisible: Boolean
     ): Boolean {
-        return false
+        return true
-    }
-
-    override fun requestChildRectangleOnScreen(
-        parent: RecyclerView,
-        child: View,
-        rect: Rect,
-        immediate: Boolean
-    ): Boolean {
-        return false
     }
 
 }