Merge remote-tracking branch 'origin/master'

app/src/main/assets/updateLog.md

@@ -15,7 +15,8 @@
 
 * 紧急修复在线tts朗读bug
 * 紧急修复登录问题
-* 添加isVolume规则，支持二级目录，页眉标题、正文标题显示优化 by Xwite
+* 添加isVolume规则，支持二级目录，正文标题显示优化 by Xwite
+* 书源编辑界面显示payAction规则
 
 **2022/01/10**
 

app/src/main/assets/web/bookSource/index.html

@@ -311,6 +311,12 @@
                           title="imageStyle"
                           placeholder="FULL:铺满 不填:默认样式"></textarea>
             </div>
+            <div>
+                <div>购买操作:</div>
+                <textarea rows="1" id="ruleContent_payAction" class="ruleContent"
+                          title="payAction"
+                          placeholder="购买章节 返回链接或js"></textarea>
+            </div>
             <p></p>
             <div><b>其它规则</b></div>
             <div>

app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt

@@ -281,6 +281,7 @@ class BookSourceEditActivity :
             add(EditEntity("sourceRegex", cr?.sourceRegex, R.string.rule_source_regex))
             add(EditEntity("replaceRegex", cr?.replaceRegex, R.string.rule_replace_regex))
             add(EditEntity("imageStyle", cr?.imageStyle, R.string.rule_image_style))
+            add(EditEntity("payAction", cr?.payAction, R.string.rule_pay_action))
         }
         binding.tabLayout.selectTab(binding.tabLayout.getTabAt(0))
         setEditEntities(0)
@@ -376,6 +377,7 @@ class BookSourceEditActivity :
                 "sourceRegex" -> contentRule.sourceRegex = it.value
                 "replaceRegex" -> contentRule.replaceRegex = it.value
                 "imageStyle" -> contentRule.imageStyle = it.value
+                "payAction" -> contentRule.payAction = it.value
             }
         }
         source.ruleSearch = searchRule

app/src/main/res/values-es-rES/strings.xml

@@ -423,6 +423,7 @@
     <string name="rule_source_regex">资源正则(sourceRegex)</string>
     <string name="rule_replace_regex">替换规则(replaceRegex)</string>
     <string name="rule_image_style">图片样式(imageStyle)</string>
+    <string name="rule_pay_action">pay action(payAction)</string>
 
     <string name="source_icon">图标(sourceIcon)</string>
     <string name="r_articles">列表规则(ruleArticles)</string>

app/src/main/res/values-ja-rJP/strings.xml

@@ -427,6 +427,7 @@
     <string name="rule_source_regex">资源正则(sourceRegex)</string>
     <string name="rule_replace_regex">替换规则(replaceRegex)</string>
     <string name="rule_image_style">图片样式(imageStyle)</string>
+    <string name="rule_pay_action">pay action(payAction)</string>
 
     <string name="source_icon">图标(sourceIcon)</string>
     <string name="r_articles">列表规则(ruleArticles)</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -420,6 +420,7 @@
     <string name="rule_next_content">正文下一頁 URL 規則 (nextContentUrl)</string>
     <string name="rule_web_js">WebViewJs (webJs)</string>
     <string name="rule_source_regex">資源正則 (sourceRegex)</string>
+    <string name="rule_pay_action">购买操作(payAction)</string>
     <string name="source_icon">圖標 (sourceIcon)</string>
     <string name="r_articles">列表規則 (ruleArticles)</string>
     <string name="r_next">列表下一頁規則 (ruleArticles)</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -426,6 +426,7 @@
     <string name="rule_image_style">圖片樣式(imageStyle)</string>
     <string name="rule_replace_regex">取代規則(replaceRegex)</string>
     <string name="rule_source_regex">資源正則(sourceRegex)</string>
+    <string name="rule_pay_action">购买操作(payAction)</string>
 
     <string name="source_icon">圖示(sourceIcon)</string>
     <string name="r_articles">列表規則(ruleArticles)</string>

app/src/main/res/values-zh/strings.xml

@@ -426,6 +426,7 @@
     <string name="rule_image_style">图片样式(imageStyle)</string>
     <string name="rule_replace_regex">替换规则(replaceRegex)</string>
     <string name="rule_source_regex">资源正则(sourceRegex)</string>
+    <string name="rule_pay_action">购买操作(payAction)</string>
 
     <string name="source_icon">图标(sourceIcon)</string>
     <string name="r_articles">列表规则(ruleArticles)</string>

app/src/main/res/values/strings.xml

@@ -427,6 +427,7 @@
     <string name="rule_source_regex">资源正则(sourceRegex)</string>
     <string name="rule_replace_regex">替换规则(replaceRegex)</string>
     <string name="rule_image_style">图片样式(imageStyle)</string>
+    <string name="rule_pay_action">购买操作(payAction)</string>
 
     <string name="source_icon">图标(sourceIcon)</string>
     <string name="r_articles">列表规则(ruleArticles)</string>