From 85575111da1a72f379b60f9f5a47c11a2c24719a Mon Sep 17 00:00:00 2001 From: adhu2018 <41824074+adhu2018@users.noreply.github.com> Date: Sun, 28 Apr 2024 00:58:23 +0800 Subject: [PATCH 1/6] other --- app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt | 1 - app/src/main/java/io/legado/app/model/analyzeRule/QueryTTF.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt b/app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt index eb38c7e78..fe4e2e16f 100644 --- a/app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt @@ -11,7 +11,6 @@ import io.legado.app.constant.PageAnim import io.legado.app.constant.PreferKey import io.legado.app.help.DefaultData import io.legado.app.help.coroutine.Coroutine -import io.legado.app.ui.book.read.page.provider.ChapterProvider import io.legado.app.utils.BitmapUtils import io.legado.app.utils.FileUtils import io.legado.app.utils.GSON diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/QueryTTF.java b/app/src/main/java/io/legado/app/model/analyzeRule/QueryTTF.java index c87249cdc..aedbc3d28 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/QueryTTF.java +++ b/app/src/main/java/io/legado/app/model/analyzeRule/QueryTTF.java @@ -133,7 +133,7 @@ public class QueryTTF { } private static class GlyfLayout { - public short numberOfContours; // 非负值为简单字型,负值为符合字型 + public short numberOfContours; // 非负值为简单字型,负值为复合字型 public short xMin; public short yMin; public short xMax; From 59d4bb6c8ef55acd229adbc1c71689058ebd1a46 Mon Sep 17 00:00:00 2001 From: adhu2018 <41824074+adhu2018@users.noreply.github.com> Date: Sun, 28 Apr 2024 01:01:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?pref:=20=E5=87=8F=E5=B0=91=E9=81=8D?= =?UTF-8?q?=E5=8E=86=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/utils/ChineseUtils.kt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/io/legado/app/utils/ChineseUtils.kt b/app/src/main/java/io/legado/app/utils/ChineseUtils.kt index 3d3bda324..2e733b1dd 100644 --- a/app/src/main/java/io/legado/app/utils/ChineseUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ChineseUtils.kt @@ -32,14 +32,16 @@ object ChineseUtils { fun fixT2sDict() { val dict = DictionaryContainer.getInstance().getDictionary(TransType.TRADITIONAL_TO_SIMPLE) dict.run { - remove("劈", "脊", "槃") - remove("支援", "沈默", "類比", "模擬", "划槳", "列根", "先進", "雪梨", "雪糕") - remove("零錢", "零钱", "離線", "碟片", "模組", "桌球", "案頭", "機車", "電漿") - remove("鳳梨", "魔戒", "載入") - remove("路易斯", "非同步", "出租车", "周杰倫", "马铃薯", "馬鈴薯", "機械人", "電單車") - remove("電扶梯", "音效卡", "飆車族", "點陣圖", "個入球", "顆進球") - remove("魔獸紀元", "高空彈跳", "铁达尼号") - remove("魔鬼終結者", "純文字檔案") + remove( + "劈", "脊", "槃", + "支援", "沈默", "類比", "模擬", "划槳", "列根", "先進", "雪梨", "雪糕", + "零錢", "零钱", "離線", "碟片", "模組", "桌球", "案頭", "機車", "電漿", + "鳳梨", "魔戒", "載入", + "路易斯", "非同步", "出租车", "周杰倫", "马铃薯", "馬鈴薯", "機械人", "電單車", + "電扶梯", "音效卡", "飆車族", "點陣圖", "個入球", "顆進球", + "魔獸紀元", "高空彈跳", "铁达尼号", + "魔鬼終結者", "純文字檔案" + ) } } From 5b86fb8dd8cc7ac5e8e32bc29ccf71548dc53cb4 Mon Sep 17 00:00:00 2001 From: adhu2018 <41824074+adhu2018@users.noreply.github.com> Date: Sun, 28 Apr 2024 01:01:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E7=BB=BC=E5=90=88=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/main/bookshelf/style2/BookshelfFragment2.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt index a3bdf239b..6df5eab71 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt @@ -148,6 +148,11 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2) 3 -> list.sortedBy { it.order } + + 4 -> list.sortedByDescending { + max(it.latestChapterTime, it.durChapterTime) + } + else -> list.sortedByDescending { it.durChapterTime } From 10d2764c6175f01702a7946c26536d3fbebf77b5 Mon Sep 17 00:00:00 2001 From: adhu2018 <41824074+adhu2018@users.noreply.github.com> Date: Sun, 28 Apr 2024 01:03:26 +0800 Subject: [PATCH 4/6] other --- .../java/io/legado/app/ui/book/toc/rule/TxtTocRuleAdapter.kt | 2 +- .../java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleAdapter.kt b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleAdapter.kt index 3cfc4e719..6a934e2a9 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleAdapter.kt @@ -88,7 +88,7 @@ class TxtTocRuleAdapter(context: Context, private val callBack: CallBack) : bundle.keySet().map { when (it) { "selected" -> cbSource.isChecked = selected.contains(item) - "upNmae" -> cbSource.text = item.name + "upName" -> cbSource.text = item.name "upExample" -> titleExample.text = item.example "enabled" -> swtEnabled.isChecked = item.enable } diff --git a/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt index cf57c041c..7519155e3 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt @@ -264,7 +264,7 @@ class TxtTocRuleDialog() : BaseDialogFragment(R.layout.dialog_toc_regex), } else { bundle.keySet().map { when (it) { - "upNmae" -> rbRegexName.text = item.name + "upName" -> rbRegexName.text = item.name "upExample" -> titleExample.text = item.example "enabled" -> swtEnabled.isChecked = item.enable "upSelect" -> rbRegexName.isChecked = item.name == selectedName From 025dbcc3d4a4f8a3a07dd1ded774351a6412274c Mon Sep 17 00:00:00 2001 From: adhu2018 <41824074+adhu2018@users.noreply.github.com> Date: Sun, 28 Apr 2024 01:04:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20=E6=98=BE=E7=A4=BA=E5=B8=AE?= =?UTF-8?q?=E5=8A=A9=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/ui/book/read/ReadBookActivity.kt | 13 ++++++------- .../java/io/legado/app/ui/book/read/ReadMenu.kt | 4 ++-- .../ui/book/source/debug/BookSourceDebugActivity.kt | 8 ++------ .../app/ui/book/source/manage/BookSourceActivity.kt | 11 +++-------- .../app/ui/book/toc/rule/TxtTocRuleActivity.kt | 9 ++------- .../io/legado/app/ui/dict/rule/DictRuleActivity.kt | 9 ++------- .../io/legado/app/ui/replace/ReplaceRuleActivity.kt | 9 ++------- .../app/ui/rss/source/manage/RssSourceActivity.kt | 9 ++------- .../java/io/legado/app/utils/ActivityExtensions.kt | 4 +++- 9 files changed, 24 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt index 14a9bdc3d..b116c77fa 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt @@ -93,7 +93,6 @@ import io.legado.app.ui.replace.ReplaceRuleActivity import io.legado.app.ui.replace.edit.ReplaceEditActivity import io.legado.app.ui.widget.PopupAction import io.legado.app.ui.widget.dialog.PhotoDialog -import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.utils.ACache import io.legado.app.utils.Debounce import io.legado.app.utils.LogUtils @@ -114,6 +113,7 @@ import io.legado.app.utils.observeEvent import io.legado.app.utils.observeEventSticky import io.legado.app.utils.postEvent import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp import io.legado.app.utils.startActivity import io.legado.app.utils.sysScreenOffTime import io.legado.app.utils.throttle @@ -553,7 +553,7 @@ class ReadBookActivity : BaseReadBookActivity(), R.id.menu_effective_replaces -> showDialogFragment() - R.id.menu_help -> showReadMenuHelp() + R.id.menu_help -> showHelp() } return super.onCompatOptionsItemSelected(item) } @@ -1022,11 +1022,6 @@ class ReadBookActivity : BaseReadBookActivity(), } } - override fun showReadMenuHelp() { - val text = String(assets.open("web/help/md/readMenuHelp.md").readBytes()) - showDialogFragment(TextDialog(getString(R.string.help), text, TextDialog.Mode.MD)) - } - /** * 显示朗读菜单 */ @@ -1255,6 +1250,10 @@ class ReadBookActivity : BaseReadBookActivity(), } } + override fun showHelp() { + showHelp("readMenuHelp") + } + /** * 长按图片 */ diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt index 5e163456c..e111cacaf 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt @@ -150,7 +150,7 @@ class ReadMenu @JvmOverloads constructor( } callBack.upSystemUiVisibility() if (!LocalConfig.readMenuHelpVersionIsLast) { - callBack.showReadMenuHelp() + callBack.showHelp() } } @@ -580,7 +580,7 @@ class ReadMenu @JvmOverloads constructor( fun showReadAloudDialog() fun upSystemUiVisibility() fun onClickReadAloud() - fun showReadMenuHelp() + fun showHelp() fun showLogin() fun payAction() fun disableSource() diff --git a/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt index b47fbe09c..f2cdf3b95 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt @@ -20,6 +20,7 @@ import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.utils.launch import io.legado.app.utils.setEdgeEffectColor import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp import io.legado.app.utils.toastOnUi import io.legado.app.utils.viewbindingdelegate.viewBinding import kotlinx.coroutines.launch @@ -184,14 +185,9 @@ class BookSourceDebugActivity : VMBaseActivity showDialogFragment(TextDialog("html", viewModel.bookSrc)) R.id.menu_toc_src -> showDialogFragment(TextDialog("html", viewModel.tocSrc)) R.id.menu_content_src -> showDialogFragment(TextDialog("html", viewModel.contentSrc)) - R.id.menu_help -> showHelp() + R.id.menu_help -> showHelp("debugHelp") } return super.onCompatOptionsItemSelected(item) } - private fun showHelp() { - val text = String(assets.open("web/help/md/debugHelp.md").readBytes()) - showDialogFragment(TextDialog(getString(R.string.help), text, TextDialog.Mode.MD)) - } - } \ No newline at end of file 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 a4e7bf479..ef168fc86 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 @@ -43,7 +43,6 @@ import io.legado.app.ui.config.CheckSourceConfig import io.legado.app.ui.file.HandleFileContract import io.legado.app.ui.qrcode.QrCodeResult import io.legado.app.ui.widget.SelectActionBar -import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.ui.widget.recycler.DragSelectTouchHelper import io.legado.app.ui.widget.recycler.ItemTouchCallback import io.legado.app.ui.widget.recycler.VerticalDivider @@ -59,6 +58,7 @@ import io.legado.app.utils.sendToClip import io.legado.app.utils.setEdgeEffectColor import io.legado.app.utils.share import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp import io.legado.app.utils.splitNotBlank import io.legado.app.utils.startActivity import io.legado.app.utils.toastOnUi @@ -134,7 +134,7 @@ class BookSourceActivity : VMBaseActivity showHelp() + R.id.menu_help -> showHelp("SourceMBookHelp") } if (item.groupId == R.id.source_group) { searchView.setQuery("group:${item.title}", true) @@ -370,11 +370,6 @@ class BookSourceActivity : VMBaseActivity showImportDialog() R.id.menu_import_qr -> qrCodeResult.launch() R.id.menu_import_default -> viewModel.importDefault() - R.id.menu_help -> showTxtTocRuleHelp() + R.id.menu_help -> showHelp("txtTocRuleHelp") } return super.onCompatOptionsItemSelected(item) @@ -244,11 +244,6 @@ class TxtTocRuleActivity : VMBaseActivity viewModel.enableSelection(*adapter.selection.toTypedArray()) diff --git a/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt index dc194951e..67489a24c 100644 --- a/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt +++ b/app/src/main/java/io/legado/app/ui/dict/rule/DictRuleActivity.kt @@ -23,7 +23,6 @@ import io.legado.app.ui.association.ImportDictRuleDialog import io.legado.app.ui.file.HandleFileContract import io.legado.app.ui.qrcode.QrCodeResult import io.legado.app.ui.widget.SelectActionBar -import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.ui.widget.recycler.DragSelectTouchHelper import io.legado.app.ui.widget.recycler.ItemTouchCallback import io.legado.app.ui.widget.recycler.VerticalDivider @@ -35,6 +34,7 @@ import io.legado.app.utils.readText import io.legado.app.utils.sendToClip import io.legado.app.utils.setEdgeEffectColor import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp import io.legado.app.utils.splitNotBlank import io.legado.app.utils.toastOnUi import io.legado.app.utils.viewbindingdelegate.viewBinding @@ -143,7 +143,7 @@ class DictRuleActivity : VMBaseActivity showImportDialog() R.id.menu_import_qr -> qrCodeResult.launch() R.id.menu_import_default -> viewModel.importDefault() - R.id.menu_help -> showDictRuleHelp() + R.id.menu_help -> showHelp("dictRuleHelp") } return super.onCompatOptionsItemSelected(item) } @@ -235,9 +235,4 @@ class DictRuleActivity : VMBaseActivity qrCodeResult.launch() - R.id.menu_help -> showHelp() + R.id.menu_help -> showHelp("replaceRuleHelp") R.id.menu_group_null -> { searchView.setQuery(getString(R.string.no_group), true) } @@ -324,11 +324,6 @@ class ReplaceRuleActivity : VMBaseActivity { searchView.setQuery(getString(R.string.no_group), true) } - R.id.menu_help -> showHelp() + R.id.menu_help -> showHelp("SourceMRssHelp") else -> if (item.groupId == R.id.source_group) { searchView.setQuery("group:${item.title}", true) } @@ -354,11 +354,6 @@ class RssSourceActivity : VMBaseActivity Date: Sun, 28 Apr 2024 01:04:51 +0800 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20=E6=98=BE=E7=A4=BA=E5=B8=AE?= =?UTF-8?q?=E5=8A=A9=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/book/read/config/HttpTtsEditDialog.kt | 19 ++++++++--------- .../app/ui/book/toc/rule/TxtTocRuleDialog.kt | 9 ++------ .../app/ui/config/BackupConfigFragment.kt | 21 +++++++++++-------- .../io/legado/app/ui/main/my/MyFragment.kt | 8 ++----- .../io/legado/app/utils/FragmentExtensions.kt | 7 +++++++ 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditDialog.kt index ba075ffc8..3be519462 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditDialog.kt @@ -17,8 +17,14 @@ import io.legado.app.ui.login.SourceLoginActivity import io.legado.app.ui.widget.code.addJsPattern import io.legado.app.ui.widget.code.addJsonPattern import io.legado.app.ui.widget.code.addLegadoPattern -import io.legado.app.ui.widget.dialog.TextDialog -import io.legado.app.utils.* +import io.legado.app.utils.GSON +import io.legado.app.utils.applyTint +import io.legado.app.utils.sendToClip +import io.legado.app.utils.setLayout +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.startActivity +import io.legado.app.utils.toastOnUi import io.legado.app.utils.viewbindingdelegate.viewBinding class HttpTtsEditDialog() : BaseDialogFragment(R.layout.dialog_http_tts_edit, true), @@ -111,7 +117,7 @@ class HttpTtsEditDialog() : BaseDialogFragment(R.layout.dialog_http_tts_edit, tr initView(it) } R.id.menu_log -> showDialogFragment() - R.id.menu_help -> help() + R.id.menu_help -> showHelp("httpTTSHelp") } return true } @@ -130,11 +136,4 @@ class HttpTtsEditDialog() : BaseDialogFragment(R.layout.dialog_http_tts_edit, tr ) } - private fun help() { - val helpStr = String( - requireContext().assets.open("web/help/md/httpTTSHelp.md").readBytes() - ) - showDialogFragment(TextDialog(getString(R.string.help), helpStr, TextDialog.Mode.MD)) - } - } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt index 7519155e3..28d087f0f 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleDialog.kt @@ -29,7 +29,6 @@ import io.legado.app.lib.theme.primaryColor import io.legado.app.ui.association.ImportTxtTocRuleDialog import io.legado.app.ui.file.HandleFileContract import io.legado.app.ui.qrcode.QrCodeResult -import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.ui.widget.recycler.ItemTouchCallback import io.legado.app.ui.widget.recycler.VerticalDivider import io.legado.app.utils.ACache @@ -38,6 +37,7 @@ import io.legado.app.utils.launch import io.legado.app.utils.readText import io.legado.app.utils.setLayout import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp import io.legado.app.utils.splitNotBlank import io.legado.app.utils.toastOnUi import io.legado.app.utils.viewbindingdelegate.viewBinding @@ -152,7 +152,7 @@ class TxtTocRuleDialog() : BaseDialogFragment(R.layout.dialog_toc_regex), R.id.menu_import_onLine -> showImportDialog() R.id.menu_import_qr -> qrCodeResult.launch() R.id.menu_import_default -> viewModel.importDefault() - R.id.menu_help -> showTxtTocRuleHelp() + R.id.menu_help -> showHelp("txtTocRuleHelp") } return false } @@ -197,11 +197,6 @@ class TxtTocRuleDialog() : BaseDialogFragment(R.layout.dialog_toc_regex), } } - private fun showTxtTocRuleHelp() { - val text = String(requireContext().assets.open("web/help/md/txtTocRuleHelp.md").readBytes()) - showDialogFragment(TextDialog(getString(R.string.help), text, TextDialog.Mode.MD)) - } - inner class TocRegexAdapter(context: Context) : RecyclerAdapter(context), ItemTouchCallback.Callback { diff --git a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt index 6e3b868f7..9f291543d 100644 --- a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt @@ -35,9 +35,17 @@ import io.legado.app.lib.prefs.fragment.PreferenceFragment import io.legado.app.lib.theme.primaryColor import io.legado.app.ui.about.AppLogDialog import io.legado.app.ui.file.HandleFileContract -import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.ui.widget.dialog.WaitDialog -import io.legado.app.utils.* +import io.legado.app.utils.applyTint +import io.legado.app.utils.checkWrite +import io.legado.app.utils.getPrefString +import io.legado.app.utils.isContentScheme +import io.legado.app.utils.launch +import io.legado.app.utils.setEdgeEffectColor +import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp +import io.legado.app.utils.toEditable +import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Job @@ -150,7 +158,7 @@ class BackupConfigFragment : PreferenceFragment(), listView.setEdgeEffectColor(primaryColor) activity?.addMenuProvider(this, viewLifecycleOwner) if (!LocalConfig.backupHelpVersionIsLast) { - showHelp() + showHelp("webDavHelp") } } @@ -162,7 +170,7 @@ class BackupConfigFragment : PreferenceFragment(), override fun onMenuItemSelected(menuItem: MenuItem): Boolean { when (menuItem.itemId) { R.id.menu_help -> { - showHelp() + showHelp("webDavHelp") return true } @@ -171,11 +179,6 @@ class BackupConfigFragment : PreferenceFragment(), return false } - private fun showHelp() { - val text = String(requireContext().assets.open("web/help/md/webDavHelp.md").readBytes()) - showDialogFragment(TextDialog(getString(R.string.help), text, TextDialog.Mode.MD)) - } - override fun onDestroy() { super.onDestroy() preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this) diff --git a/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt b/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt index b9b439b6b..e60e77441 100644 --- a/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt @@ -29,7 +29,6 @@ import io.legado.app.ui.dict.rule.DictRuleActivity import io.legado.app.ui.file.FileManageActivity import io.legado.app.ui.main.MainFragmentInterface import io.legado.app.ui.replace.ReplaceRuleActivity -import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.utils.LogUtils import io.legado.app.utils.getPrefBoolean import io.legado.app.utils.observeEventSticky @@ -37,7 +36,7 @@ import io.legado.app.utils.openUrl import io.legado.app.utils.putPrefBoolean import io.legado.app.utils.sendToClip import io.legado.app.utils.setEdgeEffectColor -import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp import io.legado.app.utils.startActivity import io.legado.app.utils.viewbindingdelegate.viewBinding @@ -68,10 +67,7 @@ class MyFragment() : BaseFragment(R.layout.fragment_my_config), MainFragmentInte override fun onCompatOptionsItemSelected(item: MenuItem) { when (item.itemId) { - R.id.menu_help -> { - val text = String(requireContext().assets.open("web/help/md/appHelp.md").readBytes()) - showDialogFragment(TextDialog(getString(R.string.help), text, TextDialog.Mode.MD)) - } + R.id.menu_help -> showHelp("appHelp") } } diff --git a/app/src/main/java/io/legado/app/utils/FragmentExtensions.kt b/app/src/main/java/io/legado/app/utils/FragmentExtensions.kt index 994a80c40..ed76e3469 100644 --- a/app/src/main/java/io/legado/app/utils/FragmentExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/FragmentExtensions.kt @@ -12,6 +12,8 @@ import androidx.annotation.DrawableRes import androidx.core.content.edit import androidx.fragment.app.DialogFragment import androidx.fragment.app.Fragment +import io.legado.app.R +import io.legado.app.ui.widget.dialog.TextDialog inline fun Fragment.showDialogFragment( arguments: Bundle.() -> Unit = {} @@ -76,4 +78,9 @@ inline fun Fragment.startActivity( configIntent: Intent.() -> Unit = {} ) { startActivity(Intent(requireContext(), T::class.java).apply(configIntent)) +} + +fun Fragment.showHelp(fileName: String) { + val mdText = String(requireContext().assets.open("web/help/md/${fileName}.md").readBytes()) + showDialogFragment(TextDialog(getString(R.string.help), mdText, TextDialog.Mode.MD)) } \ No newline at end of file