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