Merge remote-tracking branch 'origin/master'

app/src/main/assets/txtTocRule.json

@@ -1,56 +1,62 @@
 [
   {
-    "enable": true,
-    "name": "数字 分隔符 标题名称",
-    "rule": "^[ \\t]{0,4}\\d{1,5}[\\,\\.， 、\\-].{1,30}$",
-    "serialNumber": 0
+      "enable": true,
+      "name": "数字 分隔符 标题名称",
+      "rule": "^[ \\t]{0,4}\\d{1,5}[\\,\\.， 、\\-].{1,30}$",
+      "serialNumber": 0
   },
   {
-    "enable": true,
-    "name": "特殊符号 序号 标题",
-    "rule": "^[ \\t]{0,4}[\\[〈「『〖〔《（【\\(]?[第卷][\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,10}[\\.:： \f\t].{0,30}$",
-    "serialNumber": 1
+      "enable": true,
+      "name": "目录",
+      "rule": "^[ \\t]{0,4}(?:(?:内容|文章)?简介|前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
+      "serialNumber": 1
   },
   {
-    "enable": true,
-    "name": "特殊符号 标题",
-    "rule": "^[ \\t]{0,4}[\\[〈「『〖〔《（【\\(☆★].{1,30}[\\)】）》〕〗』」〉\\]]?\\s{0,4}$",
-    "serialNumber": 2
+      "enable": false,
+      "name": "目录(不匹配行前空白)",
+      "rule": "^(?<=\\s)(?:(?:内容|文章)?简介|前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
+      "serialNumber": 2
   },
   {
-    "enable": false,
-    "name": "特殊符号 标题(不匹配空白字符)",
-    "rule": "(?<=\\s)[\\[〈「『〖〔《（【\\(☆★].{1,30}[\\)】）》〕〗』」〉\\]]?\\s{0,4}$",
-    "serialNumber": 3
+      "enable": false,
+      "name": "目录(去简介)",
+      "rule": "^(?<=\\s)(?:前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
+      "serialNumber": 3
   },
   {
-    "enable": true,
-    "name": "Chapter/Section/Part 序号 标题",
-    "rule": "^[ \\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art)\\s{0,4}\\d{1,4}.{0,30}$",
-    "serialNumber": 4
+      "enable": false,
+      "name": "目录(古典小说备用)",
+      "rule": "^[ \\t]{0,4}(?:前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|场(?![和合比电是])|篇(?!张))).{0,30}$",
+      "serialNumber": 4
   },
   {
-    "enable": true,
-    "name": "正文 标题/序号",
-    "rule": "^[ \\t]{0,4}正文\\s{1,4}.{0,20}$",
-    "serialNumber": 5
+      "enable": true,
+      "name": "Chapter/Section/Part 序号 标题",
+      "rule": "^[ \\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art)\\s{0,4}\\d{1,4}.{0,30}$",
+      "serialNumber": 5
   },
   {
-    "enable": true,
-    "name": "目录",
-    "rule": "^[ \\t]{0,4}(?:(?:内容|文章)?简介|前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
-    "serialNumber": 6
+      "enable": true,
+      "name": "正文 标题/序号",
+      "rule": "^[ \\t]{0,4}正文\\s{1,4}.{0,20}$",
+      "serialNumber": 6
   },
   {
-    "enable": false,
-    "name": "目录(不匹配行前空白，正文不出现双标题)",
-    "rule": "^(?<=\\s)(?:(?:内容|文章)?简介|前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
-    "serialNumber": 7
+      "enable": true,
+      "name": "特殊符号 序号 标题",
+      "rule": "^[ \\t]{0,4}[〈〖〔【][第卷][\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,10}[章节][\\.:： \f\t].{0,30}$",
+      "serialNumber": 7
   },
   {
-    "enable": false,
-    "name": "目录(古典小说备用)",
-    "rule": "^[ \\t]{0,4}(?:(?:内容|文章)?简介|前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|场(?![和合比电是])|篇(?!张))).{0,30}$",
-    "serialNumber": 8
+      "enable": true,
+      "name": "特殊符号 标题",
+      "rule": "^[ \\t]{0,4}[〈〖〔【☆★].{1,30}[】〕〗〉]?\\s{0,4}$",
+      "serialNumber": 8
+  },
+  {
+      "enable":false,
+      "name": "特殊符号 标题(不匹配空白字符)",
+      "rule": "(?<=\\s)[〈〖〔【☆★].{1,30}[】〕〗〉]?\\s{0,4}$",
+      "serialNumber": 9
   }
 ]

app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt

@@ -141,6 +141,7 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
                             AppConfig.isNightTheme = true
                         }
                     }
+                    putPrefInt("defaultTheme", which)
                     App.INSTANCE.applyDayNight()
                     recreateActivities()
                 }