From 497737444bf3b75ab800fb7fb45e537bfacac379 Mon Sep 17 00:00:00 2001
From: david082321 <7046617+david082321@users.noreply.github.com>
Date: Fri, 26 Jun 2020 15:33:38 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
将"没有上一页"与"没有下一页",移到res/values/strings.xml
---
.../io/legado/app/ui/book/read/page/delegate/PageDelegate.kt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
index 2f3bf9728..1f46e1dfa 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
@@ -15,6 +15,7 @@ import io.legado.app.help.ReadBookConfig
import io.legado.app.ui.book.read.page.ContentView
import io.legado.app.ui.book.read.page.PageView
import kotlin.math.abs
+import io.legado.app.R
abstract class PageDelegate(protected val pageView: PageView) :
GestureDetector.SimpleOnGestureListener() {
@@ -316,7 +317,7 @@ abstract class PageDelegate(protected val pageView: PageView) :
val hasPrev = pageView.pageFactory.hasPrev()
if (!hasPrev) {
if (!snackBar.isShown) {
- snackBar.setText("没有上一页")
+ snackBar.setText(R.string.no_prev_page)
snackBar.show()
}
}
@@ -330,7 +331,7 @@ abstract class PageDelegate(protected val pageView: PageView) :
val hasNext = pageView.pageFactory.hasNext()
if (!hasNext) {
if (!snackBar.isShown) {
- snackBar.setText("没有下一页")
+ snackBar.setText(R.string.no_next_page)
snackBar.show()
}
}
From 5b53569861ad57f3d2aeabe1cd4fd5f257ec0209 Mon Sep 17 00:00:00 2001
From: david082321 <7046617+david082321@users.noreply.github.com>
Date: Fri, 26 Jun 2020 15:36:24 +0800
Subject: [PATCH 2/4] Update strings.xml
---
app/src/main/res/values/strings.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b32c7ffbd..ab9bdaa15 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -377,6 +377,8 @@
登录%s
成功
当前源没有配置登陆地址
+ 没有上一页
+ 没有下一页
源名称(sourceName)
From dd7bd6a02aaee18c06fdcfa0be5b43a2d44e2c2e Mon Sep 17 00:00:00 2001
From: david082321 <7046617+david082321@users.noreply.github.com>
Date: Fri, 26 Jun 2020 15:37:57 +0800
Subject: [PATCH 3/4] Update strings.xml
---
app/src/main/res/values-zh-rHK/strings.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index c499172ad..4f5ea6840 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -375,6 +375,8 @@
登錄 %s
成功
當前源沒有配置登陸地址
+ 沒有上一頁
+ 沒有下一頁
源名稱 (sourceName)
From c7e6ee67697e9c699f605843c6eb8dc9200c97b0 Mon Sep 17 00:00:00 2001
From: david082321 <7046617+david082321@users.noreply.github.com>
Date: Fri, 26 Jun 2020 15:40:35 +0800
Subject: [PATCH 4/4] Update strings.xml
---
app/src/main/res/values-zh-rTW/strings.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 181cdddbd..672ad5e4d 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -376,6 +376,8 @@
登入%s
成功
目前源沒有配置登入地址
+ 沒有上一頁
+ 沒有下一頁
源名稱(sourceName)