From c0634eb5cf1c149612f96f4bd524e1d075b0d148 Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Tue, 11 May 2021 09:13:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/ui/book/cache/CacheActivity.kt  | 10 ++++------
 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 +
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt
index f30512e1a..8b95ed50d 100644
--- a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt
@@ -256,18 +256,16 @@ class CacheActivity : VMBaseActivity<ActivityCacheBookBinding, CacheViewModel>()
                     when (AppConfig.exportType) {
                         1 -> viewModel.exportEPUB(path, book) {
                             exportSize--
+                            toastOnUi(it)
                             if (exportSize <= 0) {
-                                binding.titleBar.snackbar(it)
-                            } else {
-                                toastOnUi(it)
+                                binding.titleBar.snackbar(R.string.complete)
                             }
                         }
                         else -> viewModel.export(path, book) {
                             exportSize--
+                            toastOnUi(it)
                             if (exportSize <= 0) {
-                                binding.titleBar.snackbar(it)
-                            } else {
-                                toastOnUi(it)
+                                binding.titleBar.snackbar(R.string.complete)
                             }
                         }
                     }
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index b2067adb5..a854f5d40 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -823,5 +823,6 @@
     <string name="high_brush_title">高刷</string>
     <string name="high_brush_summary">使用屏幕最高刷新率</string>
     <string name="export_all">导出所有</string>
+    <string name="complete">完成</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 1899df105..604cfcaed 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -827,5 +827,6 @@
     <string name="high_brush_title">高刷</string>
     <string name="high_brush_summary">使用螢幕最高刷新率</string>
     <string name="export_all">导出所有</string>
+    <string name="complete">完成</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 238ed1a32..987c5e6db 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -827,5 +827,6 @@
     <string name="high_brush_title">高刷</string>
     <string name="high_brush_summary">使用屏幕最高刷新率</string>
     <string name="export_all">导出所有</string>
+    <string name="complete">完成</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 73982b13e..bb353c4aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -828,5 +828,6 @@
     <string name="high_brush_title">高刷</string>
     <string name="high_brush_summary">使用屏幕最高刷新率</string>
     <string name="export_all">export_all</string>
+    <string name="complete">complete</string>
 
 </resources>