From d794ee5b6a9b050a10a0f54c664dde84a7327910 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Mon, 10 Oct 2022 14:15:10 +0800
Subject: [PATCH] feat: add string and fix bug

---
 app/src/main/java/io/legado/app/model/ReadBook.kt                | 1 +
 app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt | 1 +
 app/src/main/res/values-es-rES/strings.xml                       | 1 +
 app/src/main/res/values-ja-rJP/strings.xml                       | 1 +
 app/src/main/res/values-pt-rBR/strings.xml                       | 1 +
 app/src/main/res/values-zh-rHK/strings.xml                       | 1 +
 app/src/main/res/values-zh-rTW/strings.xml                       | 1 +
 app/src/main/res/values-zh/strings.xml                           | 1 +
 app/src/main/res/values/strings.xml                              | 1 +
 9 files changed, 9 insertions(+)

diff --git a/app/src/main/java/io/legado/app/model/ReadBook.kt b/app/src/main/java/io/legado/app/model/ReadBook.kt
index f02052e84..a2508eeea 100644
--- a/app/src/main/java/io/legado/app/model/ReadBook.kt
+++ b/app/src/main/java/io/legado/app/model/ReadBook.kt
@@ -49,6 +49,7 @@ object ReadBook : CoroutineScope by MainScope() {
 
     //暂时保存跳转前进度
     fun saveCurrentBookProcess() {
+        if (lastBookPress != null) return //避免进度条连续跳转不能覆盖最初的进度记录
         lastBookPress = book?.let { BookProgress(it) }
     }
     //恢复跳转前进度
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index bb1086d8d..e346568bf 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -996,6 +996,7 @@ class ReadBookActivity : BaseReadBookActivity(),
 
     /* 恢复到 全文搜索/进度条跳转前的位置 */
     private fun restoreLastBookProcess() {
+        // 默认提示恢复
         alert(R.string.draw) {
             setMessage(R.string.restore_last_book_process)
             yesButton {
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 2c8b223e8..0734a0c1b 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1039,4 +1039,5 @@
     <string name="progress_bar_behavior">进度条行为</string>
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
+    <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
 </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 75fd4a999..469df7678 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1042,4 +1042,5 @@
     <string name="progress_bar_behavior">进度条行为</string>
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
+    <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 65de2d1fb..ac354405a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1042,4 +1042,5 @@
     <string name="progress_bar_behavior">进度条行为</string>
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
+    <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index bad47a622..f4bd21a45 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1039,4 +1039,5 @@
     <string name="progress_bar_behavior">进度条行为</string>
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
+    <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 20d2fe194..c06f9cdbb 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1041,4 +1041,5 @@
     <string name="progress_bar_behavior">进度条行为</string>
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
+    <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index c9026dc78..e40f77f8b 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1041,4 +1041,5 @@
     <string name="progress_bar_behavior">进度条行为</string>
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
+    <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5a7ec3881..1682f1312 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1042,4 +1042,5 @@
     <string name="progress_bar_behavior">进度条行为</string>
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
+    <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
 </resources>