diff --git a/app/src/main/java/io/legado/app/ui/widget/code/CodeView.kt b/app/src/main/java/io/legado/app/ui/widget/code/CodeView.kt index 30f578436..c3d7c9614 100644 --- a/app/src/main/java/io/legado/app/ui/widget/code/CodeView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/code/CodeView.kt @@ -13,7 +13,7 @@ import android.text.style.ForegroundColorSpan import android.text.style.ReplacementSpan import android.util.AttributeSet import androidx.annotation.ColorInt -import io.legado.app.ui.widget.text.ScrollMultiAutoCompleteTextView +import io.legado.app.ui.widget.text.NestScrollMultiAutoCompleteTextView import java.util.* import java.util.regex.Matcher import java.util.regex.Pattern @@ -21,7 +21,7 @@ import kotlin.math.roundToInt @Suppress("unused") class CodeView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : - ScrollMultiAutoCompleteTextView(context, attrs) { + NestScrollMultiAutoCompleteTextView(context, attrs) { private var tabWidth = 0 private var tabWidthInCharacters = 0 diff --git a/app/src/main/java/io/legado/app/ui/widget/text/InertiaScrollTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/InertiaScrollTextView.kt index 41afecaff..0666d2525 100644 --- a/app/src/main/java/io/legado/app/ui/widget/text/InertiaScrollTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/InertiaScrollTextView.kt @@ -15,7 +15,9 @@ import kotlin.math.abs import kotlin.math.max import kotlin.math.min - +/** + * 惯性滚动 TextView + */ @Suppress("unused") open class InertiaScrollTextView @JvmOverloads constructor( context: Context, diff --git a/app/src/main/java/io/legado/app/ui/widget/text/ScrollMultiAutoCompleteTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/NestScrollMultiAutoCompleteTextView.kt similarity index 95% rename from app/src/main/java/io/legado/app/ui/widget/text/ScrollMultiAutoCompleteTextView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/NestScrollMultiAutoCompleteTextView.kt index 8d8c3fe93..8c6f8d0cb 100644 --- a/app/src/main/java/io/legado/app/ui/widget/text/ScrollMultiAutoCompleteTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/NestScrollMultiAutoCompleteTextView.kt @@ -6,7 +6,10 @@ import android.util.AttributeSet import android.view.MotionEvent import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView -open class ScrollMultiAutoCompleteTextView @JvmOverloads constructor( +/** + * 嵌套滚动 MultiAutoCompleteTextView + */ +open class NestScrollMultiAutoCompleteTextView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : AppCompatMultiAutoCompleteTextView(context, attrs) { diff --git a/app/src/main/java/io/legado/app/ui/widget/text/ScrollTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/NestScrollTextView.kt similarity index 94% rename from app/src/main/java/io/legado/app/ui/widget/text/ScrollTextView.kt rename to app/src/main/java/io/legado/app/ui/widget/text/NestScrollTextView.kt index 336dd8ff3..af33d9dfb 100644 --- a/app/src/main/java/io/legado/app/ui/widget/text/ScrollTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/NestScrollTextView.kt @@ -6,7 +6,12 @@ import android.util.AttributeSet import android.view.MotionEvent import androidx.appcompat.widget.AppCompatTextView -class ScrollTextView(context: Context, attrs: AttributeSet?) : AppCompatTextView(context, attrs) { + +/** + * 嵌套滚动 TextView + */ +class NestScrollTextView(context: Context, attrs: AttributeSet?) : + AppCompatTextView(context, attrs) { //滑动距离的最大边界 private var mOffsetHeight = 0 diff --git a/app/src/main/res/layout-land/activity_book_info.xml b/app/src/main/res/layout-land/activity_book_info.xml index 4ea579f99..5a946d8ac 100644 --- a/app/src/main/res/layout-land/activity_book_info.xml +++ b/app/src/main/res/layout-land/activity_book_info.xml @@ -355,7 +355,7 @@ - -