From f8efc8f52961b16bc5bd228424355f2578ce91a0 Mon Sep 17 00:00:00 2001 From: kunfei Date: Thu, 10 Feb 2022 16:38:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=95=8C=E9=9D=A2=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=9B=BF=E6=8D=A2=E5=BC=80=E5=85=B3?= =?UTF-8?q?,=E5=BC=80=E5=90=AF=E6=9B=BF=E6=8D=A2=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BC=9A=E9=95=BF=E4=B8=80=E4=BA=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/updateLog.md | 1 + app/src/main/java/io/legado/app/constant/PreferKey.kt | 1 + app/src/main/java/io/legado/app/help/AppConfig.kt | 6 ++++++ .../io/legado/app/ui/book/toc/ChapterListFragment.kt | 4 +++- .../main/java/io/legado/app/ui/book/toc/TocActivity.kt | 7 +++++++ app/src/main/res/menu/book_toc.xml | 10 ++++++++-- 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 | 7 ++++--- 13 files changed, 36 insertions(+), 6 deletions(-) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index ad1ec886e..3ada71306 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -14,6 +14,7 @@ **2022/02/10** * 可以单独给书籍设置朗读tts +* 目录界面菜单添加替换开关,开启替换加载时间会长一些 **2022/02/09** diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt index c0951a129..93f9d9d18 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -93,6 +93,7 @@ object PreferKey { const val defaultBookTreeUri = "defaultBookTreeUri" const val checkSource = "checkSource" const val uploadRule = "uploadRule" + const val tocUiUseReplace = "tocUiUseReplace" const val cPrimary = "colorPrimary" const val cAccent = "colorAccent" diff --git a/app/src/main/java/io/legado/app/help/AppConfig.kt b/app/src/main/java/io/legado/app/help/AppConfig.kt index 8375e07d6..83a889fa6 100644 --- a/app/src/main/java/io/legado/app/help/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/AppConfig.kt @@ -250,6 +250,12 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { appCtx.putPrefInt(PreferKey.webPort, value) } + var tocUiUseReplace: Boolean + get() = appCtx.getPrefBoolean(PreferKey.tocUiUseReplace) + set(value) { + appCtx.putPrefBoolean(PreferKey.tocUiUseReplace, value) + } + val autoChangeSource: Boolean get() = appCtx.getPrefBoolean(PreferKey.autoChangeSource, true) diff --git a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt index ab0bc4dbe..3fd41aec9 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt @@ -13,6 +13,7 @@ import io.legado.app.data.appDb import io.legado.app.data.entities.Book import io.legado.app.data.entities.BookChapter import io.legado.app.databinding.FragmentChapterListBinding +import io.legado.app.help.AppConfig import io.legado.app.help.BookHelp import io.legado.app.help.ContentProcessor import io.legado.app.lib.theme.bottomBackground @@ -115,7 +116,8 @@ class ChapterListFragment : VMBaseFragment(R.layout.fragment_chapt val replaces = viewModel.bookData.value?.let { book -> ContentProcessor.get(book.name, book.origin).getReplaceRules() } - val useReplace = viewModel.bookData.value?.getUseReplaceRule() == true + val useReplace = + AppConfig.tocUiUseReplace && viewModel.bookData.value?.getUseReplaceRule() == true it.map { chapter -> Pair( chapter, diff --git a/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt b/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt index 46310a27e..535c22103 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt @@ -15,6 +15,7 @@ import com.google.android.material.tabs.TabLayout import io.legado.app.R import io.legado.app.base.VMBaseActivity import io.legado.app.databinding.ActivityChapterListBinding +import io.legado.app.help.AppConfig import io.legado.app.lib.theme.accentColor import io.legado.app.lib.theme.primaryTextColor import io.legado.app.ui.about.AppLogDialog @@ -74,6 +75,11 @@ class TocActivity : VMBaseActivity() { return super.onCompatCreateOptionsMenu(menu) } + override fun onMenuOpened(featureId: Int, menu: Menu): Boolean { + menu.findItem(R.id.menu_use_replace)?.isChecked = AppConfig.tocUiUseReplace + return super.onMenuOpened(featureId, menu) + } + override fun onCompatOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.menu_reverse_toc -> viewModel.reverseToc { @@ -82,6 +88,7 @@ class TocActivity : VMBaseActivity() { putExtra("chapterPos", it.durChapterPos) }) } + R.id.menu_use_replace -> AppConfig.tocUiUseReplace = !item.isChecked R.id.menu_log -> showDialogFragment() } return super.onCompatOptionsItemSelected(item) diff --git a/app/src/main/res/menu/book_toc.xml b/app/src/main/res/menu/book_toc.xml index d5c6dadf0..7bb1c39a6 100644 --- a/app/src/main/res/menu/book_toc.xml +++ b/app/src/main/res/menu/book_toc.xml @@ -1,7 +1,7 @@ - + + 记录调试日志 子文件夹 全局 + 使用替换 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 6d04aa906..b60570614 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -932,5 +932,6 @@ 记录调试日志 子文件夹 全局 + 使用替换 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8854912c2..387d3c92d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -932,5 +932,6 @@ 记录调试日志 子文件夹 全局 + 使用替换 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 87aaf6199..1dd5bb76a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -929,5 +929,6 @@ 记录调试日志 子文件夹 全局 + 使用替换 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5c24f16ba..8d2d569bd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -931,5 +931,6 @@ 记录调试日志 子文件夹 全局 + 使用替换 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 701d5337f..c65bc03e8 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -931,5 +931,6 @@ 记录调试日志 子文件夹 全局 + 使用替换 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aa0aa6ad8..16b0eb388 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -918,8 +918,8 @@ 书籍保存位置 从其它应用打开的书籍保存位置 选择保存书籍的文件夹 - 用户代理 - 背景透明度 + User agent + Background alpha 校验设置 @@ -931,6 +931,7 @@ 校验超时: %1$s秒\n校验项目:%2$s 记录调试日志 Sub dir - 全局 + General + Use replace