Merge branch 'master' of https://github.com/mgz0227/legado

app/src/main/assets/help/ruleHelp.md

@@ -1,6 +1,5 @@
 # 源规则帮助
 
-* [阅读3.0(Legado)规则说明](https://mgz0227.github.io/The-tutorial-of-Legado/)
 * [书源帮助文档](https://alanskycn.gitee.io/teachme/Rule/source.html)
 * [订阅源帮助文档](https://alanskycn.gitee.io/teachme/Rule/rss.html)
 * 辅助键盘❓中可插入URL参数模板,打开帮助,js教程,正则教程,选择文件

app/src/main/java/io/legado/app/model/ReadBook.kt

@@ -288,21 +288,26 @@ object ReadBook : CoroutineScope by MainScope() {
     }
 
     fun setPageIndex(index: Int) {
-        val textChapter = curTextChapter
+        recycleRecorders(durPageIndex, index)
-        if (textChapter != null) {
-            val pageIndex = durPageIndex
-            if (index > pageIndex) {
-                textChapter.getPage(index - 2)?.recycleRecorders()
-            }
-            if (index < pageIndex) {
-                textChapter.getPage(index + 3)?.recycleRecorders()
-            }
-        }
         durChapterPos = curTextChapter?.getReadLength(index) ?: index
         saveRead(true)
         curPageChanged(true)
     }
 
+    fun recycleRecorders(beforeIndex: Int, afterIndex: Int) {
+        executor.execute {
+            val textChapter = curTextChapter
+            if (textChapter != null) {
+                if (afterIndex > beforeIndex) {
+                    textChapter.getPage(afterIndex - 2)?.recycleRecorders()
+                }
+                if (afterIndex < beforeIndex) {
+                    textChapter.getPage(afterIndex + 3)?.recycleRecorders()
+                }
+            }
+        }
+    }
+
     fun openChapter(index: Int, durChapterPos: Int = 0, success: (() -> Unit)? = null) {
         if (index < chapterSize) {
             clearTextChapter()

app/src/main/java/io/legado/app/ui/book/read/page/entities/TextLine.kt

@@ -79,8 +79,8 @@ data class TextLine(
         }
     }
 
-    fun getColumnReverseAt(index: Int): BaseColumn {
+    fun getColumnReverseAt(index: Int, offset: Int = 0): BaseColumn {
-        return textColumns[textColumns.lastIndex - index]
+        return textColumns[textColumns.lastIndex - offset - index]
     }
 
     fun getColumnsCount(): Int {

app/src/main/java/io/legado/app/ui/book/read/page/provider/TextChapterLayout.kt

@@ -622,7 +622,7 @@ class TextChapterLayout(
         val spaceSize = words.count { it == " " }
         textLine.startX = absStartX + startX
         if (spaceSize > 1) {
-            val d = residualWidth / (spaceSize - 1)
+            val d = residualWidth / spaceSize
             textLine.wordSpacing = d
             var x = startX
             for (index in words.indices) {
@@ -735,14 +735,25 @@ class TextChapterLayout(
      * 超出边界处理
      */
     private fun exceed(absStartX: Int, textLine: TextLine, words: List<String>) {
+        var size = words.size
+        if (size < 2) return
         val visibleEnd = absStartX + visibleWidth
-        val endX = textLine.columns.lastOrNull()?.end?.roundToInt() ?: return
+        val columns = textLine.columns
+        var offset = 0
+        val endColumn = if (words.last() == " ") {
+            size--
+            offset++
+            columns[columns.lastIndex - 1]
+        } else {
+            columns.last()
+        }
+        val endX = endColumn.end.roundToInt()
         if (endX > visibleEnd) {
             textLine.exceed = true
-            val cc = (endX - visibleEnd) / words.size
+            val cc = (endX - visibleEnd) / size
-            for (i in 0..words.lastIndex) {
+            for (i in 0..<size) {
-                textLine.getColumnReverseAt(i).let {
+                textLine.getColumnReverseAt(i, offset).let {
-                    val py = cc * (words.size - i)
+                    val py = cc * (size - i)
                     it.start -= py
                     it.end -= py
                 }