Merge branch 'gedoor:master' into master

app/src/main/java/io/legado/app/help/storage/Backup.kt

@@ -216,10 +216,14 @@ object Backup {
         coroutineContext.ensureActive()
         withContext(IO) {
             if (list.isNotEmpty()) {
+                AppLog.put("阅读备份 $fileName 列表大小 ${list.size}")
                 val file = FileUtils.createFileIfNotExist(path + File.separator + fileName)
                 file.outputStream().buffered().use {
                     GSON.writeToOutputStream(it, list)
                 }
+                AppLog.put("阅读备份 $fileName 写入大小 ${file.length()}")
+            } else {
+                AppLog.put("阅读备份 $fileName 列表为空")
             }
         }
     }

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

@@ -446,7 +446,10 @@ class TextChapterLayout(
             val textLine = TextLine(isTitle = isTitle)
             if (durY + textHeight > visibleHeight) {
                 val textPage = pendingTextPage
-                textPage.height = textPage.lines.lastOrNull()?.lineBottom ?: 0f
+                val height = textPage.lines.lastOrNull()?.lineBottom ?: 0f
+                if (textPage.height < height) {
+                    textPage.height = height
+                }
                 if (doublePage && absStartX < viewWidth / 2) {
                     //当前页面左列结束
                     textPage.leftLineSize = textPage.lineSize
@@ -528,8 +531,9 @@ class TextChapterLayout(
             val textPage = pendingTextPage
             textPage.addLine(textLine)
             durY += textHeight * lineSpacingExtra
-            if (textPage.height < durY) {
-                textPage.height = durY
+            val height = textPage.lines.lastOrNull()?.lineBottom ?: 0f
+            if (textPage.height < height) {
+                textPage.height = height
             }
         }
         durY += textHeight * paragraphSpacing / 10f