From 01549e2e6da59852f7d0c90f13a1b31f0c7636d1 Mon Sep 17 00:00:00 2001 From: adhu2018 <41824074+adhu2018@users.noreply.github.com> Date: Fri, 1 Sep 2023 10:33:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit app:theme 已弃用 --- app/src/main/res/layout/activity_book_info_edit.xml | 2 +- app/src/main/res/layout/activity_book_source_edit.xml | 2 +- app/src/main/res/layout/dialog_book_group_edit.xml | 2 +- app/src/main/res/layout/dialog_bookshelf_config.xml | 2 +- app/src/main/res/layout/dialog_rule_sub_edit.xml | 2 +- app/src/main/res/layout/dialog_webdav_server.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/activity_book_info_edit.xml b/app/src/main/res/layout/activity_book_info_edit.xml index b5b19596b..1915756ee 100644 --- a/app/src/main/res/layout/activity_book_info_edit.xml +++ b/app/src/main/res/layout/activity_book_info_edit.xml @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:entries="@array/book_type" - app:theme="@style/Spinner" /> + 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" /> From d3681bedf678dcbecb369545d808c5d20a3810a9 Mon Sep 17 00:00:00 2001 From: adhu2018 <41824074+adhu2018@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:02:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复了同时更改书架布局的分组样式和视图后崩溃闪退的问题 --- app/src/main/java/io/legado/app/help/config/AppConfig.kt | 6 ++++++ .../legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt | 2 +- .../app/ui/main/bookshelf/style1/BookshelfFragment1.kt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) 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..38721e60c 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,12 @@ 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 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 Date: Fri, 1 Sep 2023 11:43:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 优化正则表达式检测，避免部分无意义表达式导致正文替换超时 --- app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt | 4 ++++ 1 file changed, 4 insertions(+) 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 } From 75f0739be9451ea6bc8f1695e74c5537b5622517 Mon Sep 17 00:00:00 2001 From: adhu2018 <41824074+adhu2018@users.noreply.github.com> Date: Fri, 1 Sep 2023 15:14:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/help/config/AppConfig.kt | 6 ++++++ .../app/ui/main/bookshelf/style1/BookshelfFragment1.kt | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 38721e60c..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 @@ -143,6 +143,12 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { 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/style1/BookshelfFragment1.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/BookshelfFragment1.kt index f49dc5a82..e24bebd89 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/BookshelfFragment1.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/BookshelfFragment1.kt @@ -16,6 +16,7 @@ import io.legado.app.data.appDb import io.legado.app.data.entities.Book import io.legado.app.data.entities.BookGroup import io.legado.app.databinding.FragmentBookshelf1Binding +import io.legado.app.help.config.AppConfig import io.legado.app.lib.theme.accentColor import io.legado.app.lib.theme.primaryColor import io.legado.app.ui.book.group.GroupEditDialog @@ -109,7 +110,7 @@ class BookshelfFragment1() : BaseBookshelfFragment(R.layout.fragment_bookshelf1) private fun selectLastTab() { tabLayout.post { tabLayout.removeOnTabSelectedListener(this) - tabLayout.getTabAt(0)?.select() + tabLayout.getTabAt(AppConfig.saveTabPosition)?.select() tabLayout.addOnTabSelectedListener(this) } }