From fe793e5a8876a708c856b5ea5e9e407fbdecd53d Mon Sep 17 00:00:00 2001
From: GKF <gekunfei@live.com>
Date: Fri, 24 May 2019 17:20:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Rule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/data/entities/rule/ChapterRule.kt     | 2 +-
 .../java/io/legado/app/data/entities/rule/ContentRule.kt     | 3 ++-
 .../main/java/io/legado/app/data/entities/rule/PutRule.kt    | 3 +--
 app/src/main/java/io/legado/app/data/entities/rule/Rule.kt   | 5 -----
 app/src/main/java/io/legado/app/lib/theme/README.md          | 1 +
 5 files changed, 5 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/io/legado/app/lib/theme/README.md

diff --git a/app/src/main/java/io/legado/app/data/entities/rule/ChapterRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/ChapterRule.kt
index d4417ca92..72df9ac22 100644
--- a/app/src/main/java/io/legado/app/data/entities/rule/ChapterRule.kt
+++ b/app/src/main/java/io/legado/app/data/entities/rule/ChapterRule.kt
@@ -5,5 +5,5 @@ data class ChapterRule (
     var title: Rule,
     var contentUrl: Rule,
     var resourceUrl: Rule,
-    var isAllInOne: Boolean = false
+    var nextUrl: Rule
 )
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt
index 18e17eed0..9b809c9a2 100644
--- a/app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt
+++ b/app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt
@@ -2,5 +2,6 @@ package io.legado.app.data.entities.rule
 
 data class ContentRule (
     var fulltext: Rule,
-    var resourceUrl: Rule
+    var resourceUrl: Rule,
+    var nextUrl: Rule
 )
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/data/entities/rule/PutRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/PutRule.kt
index 1f59fad33..f5e1824ba 100644
--- a/app/src/main/java/io/legado/app/data/entities/rule/PutRule.kt
+++ b/app/src/main/java/io/legado/app/data/entities/rule/PutRule.kt
@@ -1,7 +1,6 @@
 package io.legado.app.data.entities.rule
 
 data class PutRule (
-    var selector: BaseRule,
-    var type: RuleType,
+    var selector: Rule,
     var key: String
 )
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/data/entities/rule/Rule.kt b/app/src/main/java/io/legado/app/data/entities/rule/Rule.kt
index 864be7509..421fed660 100644
--- a/app/src/main/java/io/legado/app/data/entities/rule/Rule.kt
+++ b/app/src/main/java/io/legado/app/data/entities/rule/Rule.kt
@@ -2,7 +2,6 @@ package io.legado.app.data.entities.rule
 
 data class Rule (
     var selectors: List<BaseRule>,
-    var mode: RuleMode,
     var type: RuleType,
     var regex: String?,
     var replacement: String?,
@@ -10,10 +9,6 @@ data class Rule (
     var extra: String?
 )
 
-enum class RuleMode {
-    FIRST, ALL, CROSS
-}
-
 enum class RuleType {
     CSS, XPATH, JSON, REGEX, CONST, JS, HYBRID
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/lib/theme/README.md b/app/src/main/java/io/legado/app/lib/theme/README.md
new file mode 100644
index 000000000..cfba14d6d
--- /dev/null
+++ b/app/src/main/java/io/legado/app/lib/theme/README.md
@@ -0,0 +1 @@
+## 主题引擎
\ No newline at end of file