From cddbe9b01d56237eda4c06159257bae2dbefd29c Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 31 Jan 2022 14:36:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?SelectActionBar:=E6=B2=A1=E6=9C=89=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E9=A1=B9=E7=9B=AE=E6=97=B6=E6=9B=B4=E5=A4=9A=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt b/app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt index c381b391f..620778399 100644 --- a/app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt +++ b/app/src/main/java/io/legado/app/ui/widget/SelectActionBar.kt @@ -100,6 +100,8 @@ class SelectActionBar @JvmOverloads constructor( btnRevertSelection.isClickable = isClickable btnSelectActionMain.isEnabled = isClickable btnSelectActionMain.isClickable = isClickable + ivMenuMore.isEnabled = isClickable + ivMenuMore.isClickable = isClickable } interface CallBack { From 2a00fca542bed29814a9e030ee5511b9ddbdcaf8 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 31 Jan 2022 14:49:41 +0800 Subject: [PATCH 2/6] =?UTF-8?q?CheckSource.kt=E7=A7=BB=E9=99=A4=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=80=89=E6=8B=A9=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/model/CheckSource.kt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/CheckSource.kt b/app/src/main/java/io/legado/app/model/CheckSource.kt index dadc16f8f..9e144c8ad 100644 --- a/app/src/main/java/io/legado/app/model/CheckSource.kt +++ b/app/src/main/java/io/legado/app/model/CheckSource.kt @@ -6,7 +6,6 @@ import io.legado.app.constant.IntentAction import io.legado.app.data.entities.BookSource import io.legado.app.service.CheckSourceService import io.legado.app.utils.startService -import io.legado.app.utils.toastOnUi import io.legado.app.help.CacheManager import splitties.init.appCtx @@ -26,10 +25,6 @@ object CheckSource { } fun start(context: Context, sources: List) { - if (sources.isEmpty()) { - context.toastOnUi(R.string.non_select) - return - } val selectedIds: ArrayList = arrayListOf() sources.map { selectedIds.add(it.bookSourceUrl) From 33eb3aa1c38d1d878372fd8d528496507b4e90bf Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Mon, 31 Jan 2022 14:54:48 +0800 Subject: [PATCH 3/6] =?UTF-8?q?string.xml=E7=A7=BB=E9=99=A4non=5Fselect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values-es-rES/strings.xml | 1 - app/src/main/res/values-ja-rJP/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-zh-rHK/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values-zh/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 7 files changed, 7 deletions(-) diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index a34f56fe3..891e24550 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -259,7 +259,6 @@ Color de fondo (mantén pulsado para personalizar) Barra de estado inmersiva %d capítulo(s) restante(s) - Ninguno seleccionado Mantén pulsado para introducir el valor de color Cargando… Preparando diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 699720d6a..c43ccf0d8 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -263,7 +263,6 @@ Color and background (long tap to customize) Immersive status bar %d chapter(s) left - No selected Long tap to input color value Loading… Awaiting diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 590791e87..54b31225d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -263,7 +263,6 @@ Cor e fundo (toque longo para personalizar) Barra de status imersiva %d capítulo(s) restante(s) - Nenhum selecionado Clique longo, para introduzir o valor da cor Carregando… Aguardando diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d9c3fbf60..d377d36d8 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -260,7 +260,6 @@ 文字顏色和背景(長按自定義) 沉浸式狀態欄 還剩 %d 章未下載 - 仲未揀 長按輸入顏色值 加載中… 追更區 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index fa42f2292..8590a3d98 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -262,7 +262,6 @@ 文字顏色和背景(長按自訂) 沉浸式狀態欄 還剩%d章未下載 - 沒有選擇 長按輸入顏色值 載入中… 追更區 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index d8d741d7b..e31eabb4f 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -262,7 +262,6 @@ 文字颜色和背景(长按自定义) 沉浸式状态栏 还剩%d章未下载 - 没有选择 长按输入颜色值 加载中… 追更区 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e2af867cb..d489fbcae 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -263,7 +263,6 @@ Color and background (long tap to customize) Immersive status bar %d chapter(s) left - No selected Long tap to input color value Loading… Awaiting From c515f0cf58a92e573f10316c289919a677060e23 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Tue, 1 Feb 2022 17:19:10 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=97=B6=E5=8F=AF=E6=9B=B4=E6=94=B9=E6=A0=A1=E9=AA=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../legado/app/ui/book/source/manage/BookSourceActivity.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt index 670b9d0f9..a04b12d92 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt @@ -27,6 +27,7 @@ import io.legado.app.lib.theme.primaryTextColor import io.legado.app.model.CheckSource import io.legado.app.model.Debug import io.legado.app.ui.association.ImportBookSourceDialog +import io.legado.app.ui.config.CheckSourceConfig import io.legado.app.ui.book.local.rule.TxtTocRuleActivity import io.legado.app.ui.book.source.debug.BookSourceDebugActivity import io.legado.app.ui.book.source.edit.BookSourceEditActivity @@ -361,7 +362,11 @@ class BookSourceActivity : VMBaseActivity() + } + cancelButton() } } From 86f6adba066edf2d07240b1c51a75b55d9723e0b Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Tue, 1 Feb 2022 19:04:54 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=E9=94=99=E8=AF=AF=E5=87=80=E5=8C=96?= =?UTF-8?q?=E7=AB=A0=E8=8A=82=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/data/entities/BookChapter.kt | 2 ++ app/src/main/java/io/legado/app/help/ContentProcessor.kt | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt index 5c80fc034..b6581689e 100644 --- a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt +++ b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt @@ -80,6 +80,7 @@ data class BookChapter( chineseConvert: Boolean = true, ): String { var displayTitle = title.replace(AppPattern.rnRegex, "") + val mDisplayTitle = displayTitle if (useReplace && replaceRules != null) { replaceRules.forEach { item -> if (item.pattern.isNotEmpty()) { @@ -95,6 +96,7 @@ data class BookChapter( } } } + if (displayTitle.isBlank()) displayTitle = mDisplayTitle if (chineseConvert) { when (AppConfig.chineseConverterType) { 1 -> displayTitle = ChineseUtils.t2s(displayTitle) diff --git a/app/src/main/java/io/legado/app/help/ContentProcessor.kt b/app/src/main/java/io/legado/app/help/ContentProcessor.kt index 32f36c09d..7ed17f880 100644 --- a/app/src/main/java/io/legado/app/help/ContentProcessor.kt +++ b/app/src/main/java/io/legado/app/help/ContentProcessor.kt @@ -77,10 +77,6 @@ class ContentProcessor private constructor( //重新分段 mContent = ContentHelp.reSegment(mContent, chapter.title) } - if (includeTitle) { - //重新添加标题 - mContent = chapter.getDisplayTitle() + "\n" + mContent - } if (useReplace && book.getUseReplaceRule()) { //替换 mContent = replaceContent(mContent) @@ -96,6 +92,10 @@ class ContentProcessor private constructor( appCtx.toastOnUi("简繁转换出错") } } + if (includeTitle) { + //重新添加标题 + mContent = chapter.getDisplayTitle() + "\n" + mContent + } val contents = arrayListOf() mContent.split("\n").forEach { str -> val paragraph = str.trim { From 0b9f58d1b58b034307b6746824fa1a50e4c0d7d7 Mon Sep 17 00:00:00 2001 From: kunfei Date: Tue, 1 Feb 2022 22:57:53 +0800 Subject: [PATCH 6/6] Update ContentProcessor.kt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 标题也需要替换 --- app/src/main/java/io/legado/app/help/ContentProcessor.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/ContentProcessor.kt b/app/src/main/java/io/legado/app/help/ContentProcessor.kt index 7ed17f880..800fde6a7 100644 --- a/app/src/main/java/io/legado/app/help/ContentProcessor.kt +++ b/app/src/main/java/io/legado/app/help/ContentProcessor.kt @@ -94,7 +94,7 @@ class ContentProcessor private constructor( } if (includeTitle) { //重新添加标题 - mContent = chapter.getDisplayTitle() + "\n" + mContent + mContent = chapter.getDisplayTitle(getReplaceRules()) + "\n" + mContent } val contents = arrayListOf() mContent.split("\n").forEach { str -> @@ -131,4 +131,4 @@ class ContentProcessor private constructor( return mContent } -} \ No newline at end of file +}