diff --git a/app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt b/app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt
index c194a4882..62586271a 100644
--- a/app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt
+++ b/app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt
@@ -87,6 +87,10 @@ data class ReplaceRule(
return false
}
}
+ // Pattern.compile测试通过,但是部分情况下会替换超时,报错,一般发生在修改表达式时漏删了
+ if (pattern.endsWith('|') and !pattern.endsWith("\\|")) {
+ return false
+ }
return true
}
diff --git a/app/src/main/java/io/legado/app/help/config/AppConfig.kt b/app/src/main/java/io/legado/app/help/config/AppConfig.kt
index ad3b596dd..3a754924c 100644
--- a/app/src/main/java/io/legado/app/help/config/AppConfig.kt
+++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt
@@ -137,6 +137,18 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener {
appCtx.putPrefInt(PreferKey.bookGroupStyle, value)
}
+ var bookshelfLayout: Int
+ get() = appCtx.getPrefInt(PreferKey.bookshelfLayout, 0)
+ set(value) {
+ appCtx.putPrefInt(PreferKey.bookshelfLayout, value)
+ }
+
+ var saveTabPosition: Int
+ get() = appCtx.getPrefInt(PreferKey.saveTabPosition, 0)
+ set(value) {
+ appCtx.putPrefInt(PreferKey.saveTabPosition, value)
+ }
+
var bookExportFileName: String?
get() = appCtx.getPrefString(PreferKey.bookExportFileName)
set(value) {
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
index 051d8613c..9fe85cf18 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
@@ -173,7 +173,7 @@ abstract class BaseBookshelfFragment(layoutId: Int) : VMBaseFragment
+ android:theme="@style/Spinner" />
diff --git a/app/src/main/res/layout/activity_book_source_edit.xml b/app/src/main/res/layout/activity_book_source_edit.xml
index 2fadcb544..3f310efaf 100644
--- a/app/src/main/res/layout/activity_book_source_edit.xml
+++ b/app/src/main/res/layout/activity_book_source_edit.xml
@@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/book_type"
- app:theme="@style/Spinner"
+ android:theme="@style/Spinner"
tools:ignore="TouchTargetSizeCheck" />
diff --git a/app/src/main/res/layout/dialog_rule_sub_edit.xml b/app/src/main/res/layout/dialog_rule_sub_edit.xml
index fe67f3046..fa3dc4b10 100644
--- a/app/src/main/res/layout/dialog_rule_sub_edit.xml
+++ b/app/src/main/res/layout/dialog_rule_sub_edit.xml
@@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/rule_type"
- app:theme="@style/Spinner" />
+ android:theme="@style/Spinner" />
diff --git a/app/src/main/res/layout/dialog_webdav_server.xml b/app/src/main/res/layout/dialog_webdav_server.xml
index fac35ed2f..ab4edf876 100644
--- a/app/src/main/res/layout/dialog_webdav_server.xml
+++ b/app/src/main/res/layout/dialog_webdav_server.xml
@@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/server_type"
- app:theme="@style/Spinner"
+ android:theme="@style/Spinner"
tools:ignore="TouchTargetSizeCheck" />