From 83969cb550b953799750e4a906ff9cc8ed327c72 Mon Sep 17 00:00:00 2001 From: gedoor Date: Wed, 11 Nov 2020 10:08:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/help/{help.md => appHelp.md} | 0 app/src/main/assets/help/{httpTts.md => httpTTSHelp.md} | 0 app/src/main/assets/help/readHelp.md | 1 + app/src/main/assets/help/{regex.md => regexHelp.md} | 2 +- app/src/main/assets/help/webDavHelp.md | 1 + .../io/legado/app/ui/book/read/config/SpeakEngineDialog.kt | 3 +-- .../legado/app/ui/book/source/edit/BookSourceEditActivity.kt | 2 +- app/src/main/java/io/legado/app/ui/main/MainActivity.kt | 2 +- app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt | 2 +- .../java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt | 2 +- .../io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt | 2 +- 11 files changed, 9 insertions(+), 8 deletions(-) rename app/src/main/assets/help/{help.md => appHelp.md} (100%) rename app/src/main/assets/help/{httpTts.md => httpTTSHelp.md} (100%) create mode 100644 app/src/main/assets/help/readHelp.md rename app/src/main/assets/help/{regex.md => regexHelp.md} (99%) create mode 100644 app/src/main/assets/help/webDavHelp.md diff --git a/app/src/main/assets/help/help.md b/app/src/main/assets/help/appHelp.md similarity index 100% rename from app/src/main/assets/help/help.md rename to app/src/main/assets/help/appHelp.md diff --git a/app/src/main/assets/help/httpTts.md b/app/src/main/assets/help/httpTTSHelp.md similarity index 100% rename from app/src/main/assets/help/httpTts.md rename to app/src/main/assets/help/httpTTSHelp.md diff --git a/app/src/main/assets/help/readHelp.md b/app/src/main/assets/help/readHelp.md new file mode 100644 index 000000000..813afecb0 --- /dev/null +++ b/app/src/main/assets/help/readHelp.md @@ -0,0 +1 @@ +# 阅读界面帮助文档 \ No newline at end of file diff --git a/app/src/main/assets/help/regex.md b/app/src/main/assets/help/regexHelp.md similarity index 99% rename from app/src/main/assets/help/regex.md rename to app/src/main/assets/help/regexHelp.md index 93888dcf2..f69a6cdc2 100644 --- a/app/src/main/assets/help/regex.md +++ b/app/src/main/assets/help/regexHelp.md @@ -1,4 +1,4 @@ -## 正则表达式学习 +# 正则表达式学习 - [基本匹配](#1-基本匹配) - [元字符](#2-元字符) diff --git a/app/src/main/assets/help/webDavHelp.md b/app/src/main/assets/help/webDavHelp.md new file mode 100644 index 000000000..94e0a9c3d --- /dev/null +++ b/app/src/main/assets/help/webDavHelp.md @@ -0,0 +1 @@ +# WebDav备份教程 \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt index 3649c0bbd..a0fc51d4e 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt @@ -29,7 +29,6 @@ import kotlinx.android.synthetic.main.dialog_http_tts_edit.view.* import kotlinx.android.synthetic.main.dialog_recycler_view.* import kotlinx.android.synthetic.main.item_http_tts.view.* import org.jetbrains.anko.sdk27.listeners.onClick -import java.io.File class SpeakEngineDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener { @@ -128,7 +127,7 @@ class SpeakEngineDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener } neutralButton(R.string.help) { val helpStr = String( - requireContext().assets.open("help${File.separator}httpTts.md").readBytes() + requireContext().assets.open("help/httpTTSHelp.md").readBytes() ) TextDialog.show(childFragmentManager, helpStr, TextDialog.MD) } diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt index 5ff78d0b7..62f902e2f 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt @@ -389,7 +389,7 @@ class BookSourceEditActivity : } private fun showRegexHelp() { - val mdText = String(assets.open("help/regex.md").readBytes()) + val mdText = String(assets.open("help/regexHelp.md").readBytes()) TextDialog.show(supportFragmentManager, mdText, TextDialog.MD) } diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt index b5d9eb333..a2149895d 100644 --- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -104,7 +104,7 @@ class MainActivity : VMBaseActivity(R.layout.activity_main), if (getPrefInt(PreferKey.versionCode) != App.versionCode) { putPrefInt(PreferKey.versionCode, App.versionCode) if (LocalConfig.isFirstOpen) { - val text = String(assets.open("help/help.md").readBytes()) + val text = String(assets.open("help/appHelp.md").readBytes()) TextDialog.show(supportFragmentManager, text, TextDialog.MD) LocalConfig.isFirstOpen = false } else if (!BuildConfig.DEBUG) { 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 967490d6a..8a7fb2016 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 @@ -50,7 +50,7 @@ class MyFragment : BaseFragment(R.layout.fragment_my_config), FilePickerDialog.C override fun onCompatOptionsItemSelected(item: MenuItem) { when (item.itemId) { R.id.menu_help -> { - val text = String(requireContext().assets.open("help/help.md").readBytes()) + val text = String(requireContext().assets.open("help/appHelp.md").readBytes()) TextDialog.show(childFragmentManager, text, TextDialog.MD) } } diff --git a/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt index aac892a26..ee07a9244 100644 --- a/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt @@ -144,7 +144,7 @@ class ReplaceEditActivity : } private fun showRegexHelp() { - val mdText = String(assets.open("help/regex.md").readBytes()) + val mdText = String(assets.open("help/regexHelp.md").readBytes()) TextDialog.show(supportFragmentManager, mdText, TextDialog.MD) } diff --git a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt index a1f2119d2..a7cff6603 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt @@ -206,7 +206,7 @@ class RssSourceEditActivity : } private fun showRegexHelp() { - val mdText = String(assets.open("help/regex.md").readBytes()) + val mdText = String(assets.open("help/regexHelp.md").readBytes()) TextDialog.show(supportFragmentManager, mdText, TextDialog.MD) }