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..800fde6a7 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(getReplaceRules()) + "\n" + mContent + } val contents = arrayListOf() mContent.split("\n").forEach { str -> val paragraph = str.trim { @@ -131,4 +131,4 @@ class ContentProcessor private constructor( return mContent } -} \ No newline at end of file +} 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) 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() } } 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 { diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index f72c0c19b..da15cf11a 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 57742602f..ae42ead4a 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 e6aa4e260..94363d657 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 07185c895..4bd59ebd3 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 309645a24..d69c3868a 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 48d98305d..284c5d686 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