From f455f3fe63519a0c894624b58d5a78da4a3cd3bd Mon Sep 17 00:00:00 2001
From: Jason Yao <h11129@gmail.com>
Date: Tue, 8 Sep 2020 00:15:22 -0400
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B9=A6=E6=BA=90=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E5=B1=9E=E6=80=A7=EF=BC=8C=E4=BE=BF=E4=BA=8E=E6=A0=87?=
 =?UTF-8?q?=E6=B3=A8=E4=B9=A6=E6=BA=90=E4=BD=9C=E8=80=85=E5=92=8C=E4=B9=A6?=
 =?UTF-8?q?=E6=BA=90=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加书源注释属性，便于标注书源作者和书源详细信息
---
 app/src/main/java/io/legado/app/data/entities/BookSource.kt | 3 ++-
 app/src/main/res/values-zh-rHK/strings.xml                  | 2 ++
 app/src/main/res/values-zh-rTW/strings.xml                  | 4 ++--
 app/src/main/res/values-zh/strings.xml                      | 2 ++
 app/src/main/res/values/strings.xml                         | 2 ++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/legado/app/data/entities/BookSource.kt b/app/src/main/java/io/legado/app/data/entities/BookSource.kt
index 48e436262..9248a0a71 100644
--- a/app/src/main/java/io/legado/app/data/entities/BookSource.kt
+++ b/app/src/main/java/io/legado/app/data/entities/BookSource.kt
@@ -32,6 +32,7 @@ data class BookSource(
     var enabledExplore: Boolean = true,             // 启用发现
     var header: String? = null,                     // 请求头
     var loginUrl: String? = null,                   // 登录地址
+    var bookSourceComment: String? = "",            // 注释
     var lastUpdateTime: Long = 0,                   // 最后更新时间，用于排序
     var weight: Int = 0,                            // 智能排序的权重
     var exploreUrl: String? = null,                 // 发现url
@@ -104,7 +105,7 @@ data class BookSource(
     }
 
     fun removeGroup(group: String) {
-        bookSourceGroup?.splitNotBlank("[,;]".toRegex())?.toHashSet()?.let {
+        bookSourceGroup?.splitNotBlank("[,;，；]".toRegex())?.toHashSet()?.let {
             it.remove(group)
             bookSourceGroup = TextUtils.join(",", it)
         }
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index ba63066b7..394ac471f 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -288,6 +288,7 @@
     <string name="padding_right">右邊距</string>
     <string name="check_book_source">校驗書源</string>
     <string name="check_select_source">校驗所選</string>
+    <string name="debug_select_source">debug所選</string>
     <string name="progress_show">進度 %1$d/%2$d</string>
     <string name="tts_fix">請安裝並選擇中文 TTS!</string>
     <string name="tts_init_failed">TTS 初始化失敗!</string>
@@ -758,4 +759,5 @@
     <string name="theme_list">主题列表</string>
     <string name="theme_list_summary">使用保存主题,导入,分享主题</string>
     <string name="select_theme">切換默認主題</string>
+    <string name="comment">書源注釋</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 8a977be9e..c9b0991c7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -288,6 +288,7 @@
     <string name="padding_right">右邊距</string>
     <string name="check_book_source">校驗書源</string>
     <string name="check_select_source">校驗所選</string>
+    <string name="debug_select_source">debug所選</string>
     <string name="progress_show">進度 %1$d/%2$d</string>
     <string name="tts_fix">請安裝並選擇中文TTS!</string>
     <string name="tts_init_failed">TTS初始化失敗!</string>
@@ -731,9 +732,7 @@
     <string name="replace_enable_default_s">新加入書架的書是否啟用取代淨化</string>
     <string name="select_restore_file">選擇復原文件</string>
     <string name="day_background_too_dark">白天背景不能太暗</string>
-    <string name="day_bottom_bar_too_dark">白天底欄不能太暗</string>
     <string name="night_background_too_light">夜間背景不能太亮</string>
-    <string name="night_bottom_bar_too_light">夜間底欄不能太亮</string>
     <string name="accent_background_diff">強調色不能和背景顏色相似</string>
     <string name="accent_text_diff">強調色不能和文字顏色相似</string>
     <string name="wrong_format">格式不對</string>
@@ -758,5 +757,6 @@
     <string name="theme_list">主题列表</string>
     <string name="theme_list_summary">使用保存主题,导入,分享主题</string>
     <string name="select_theme">切換默認主題</string>
+    <string name="comment">書源注釋</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index c8d1709d3..5dc5ef611 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -290,6 +290,7 @@
     <string name="padding_right">右边距</string>
     <string name="check_book_source">校验书源</string>
     <string name="check_select_source">校验所选</string>
+    <string name="debug_select_source">Debug所选</string>
     <string name="progress_show">进度 %1$d/%2$d</string>
     <string name="tts_fix">请安装并选择中文TTS!</string>
     <string name="tts_init_failed">TTS初始化失败!</string>
@@ -758,4 +759,5 @@
     <string name="theme_list">主题列表</string>
     <string name="theme_list_summary">使用保存主题,导入,分享主题</string>
     <string name="select_theme">切换默认主题</string>
+    <string name="comment">书源注释</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d152a9ca..eca92dd65 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -290,6 +290,7 @@
     <string name="padding_right">Padding right</string>
     <string name="check_book_source">Check book sources</string>
     <string name="check_select_source">Check the selected source</string>
+    <string name="debug_select_source">Debug the selected source</string>
     <string name="progress_show">Progress %1$d/%2$d</string>
     <string name="tts_fix">Please install and select Chinese TTS!</string>
     <string name="tts_init_failed">TTS initialization failed!</string>
@@ -759,4 +760,5 @@
     <string name="save_night_theme_summary">Save night theme config</string>
     <string name="theme_list">Theme list</string>
     <string name="theme_list_summary">Save, Import, Share theme</string>
+    <string name="comment">Book source comment</string>
 </resources>
\ No newline at end of file