yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 2 Wiki Activity

优化

Browse Source
This commit is contained in:
Horis
2023-01-17 09:59:10 +08:00
parent f7ebaaa5ad
commit f23d38077e
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt
+9 -4
View File
@@ -3,6 +3,7 @@ package io.legado.app.ui.book.read.page.delegate
import android.graphics.Canvas import android.graphics.Canvas
import android.view.MotionEvent import android.view.MotionEvent
import android.view.VelocityTracker import android.view.VelocityTracker
import io.legado.app.data.entities.Book
import io.legado.app.help.book.isImage import io.legado.app.help.book.isImage
import io.legado.app.model.ReadBook import io.legado.app.model.ReadBook
import io.legado.app.ui.book.read.page.ReadView import io.legado.app.ui.book.read.page.ReadView
@@ -132,11 +133,13 @@ class ScrollPageDelegate(readView: ReadView) : PageDelegate(readView) {
*/ */
private fun calcNextPageOffset(): Int { private fun calcNextPageOffset(): Int {
val visibleHeight = ChapterProvider.visibleHeight val visibleHeight = ChapterProvider.visibleHeight
if (ReadBook.book?.isImage == true) { val book = ReadBook.book!!
if (book.isImage) {
return -visibleHeight return -visibleHeight
} }
val visiblePage = readView.getCurVisiblePage() val visiblePage = readView.getCurVisiblePage()
if (visiblePage.isImageOrEmpty()) { val isTextStyle = book.getImageStyle().equals(Book.imgStyleText, true)
if (!isTextStyle && visiblePage.hasImageOrEmpty()) {
return -visibleHeight return -visibleHeight
} }
val lastLineTop = visiblePage.lines.last().lineTop.toInt() val lastLineTop = visiblePage.lines.last().lineTop.toInt()
@@ -146,11 +149,13 @@ class ScrollPageDelegate(readView: ReadView) : PageDelegate(readView) {
private fun calcPrevPageOffset(): Int { private fun calcPrevPageOffset(): Int {
val visibleHeight = ChapterProvider.visibleHeight val visibleHeight = ChapterProvider.visibleHeight
if (ReadBook.book?.isImage == true) { val book = ReadBook.book!!
if (book.isImage) {
return visibleHeight return visibleHeight
} }
val visiblePage = readView.getCurVisiblePage() val visiblePage = readView.getCurVisiblePage()
if (visiblePage.isImageOrEmpty()) { val isTextStyle = book.getImageStyle().equals(Book.imgStyleText, true)
if (!isTextStyle && visiblePage.hasImageOrEmpty()) {
return visibleHeight return visibleHeight
} }
val firstLineBottom = visiblePage.lines.first().lineBottom.toInt() val firstLineBottom = visiblePage.lines.first().lineBottom.toInt()
app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt
+2 -2
View File
@@ -233,7 +233,7 @@ data class TextPage(
return null return null
} }
fun isImageOrEmpty(): Boolean { fun hasImageOrEmpty(): Boolean {
return textLines.all { it.isTitle || it.isImage } return textLines.any { it.isImage }
} }
} }