From 5f8218d117b5f338676344689838f766415d2f01 Mon Sep 17 00:00:00 2001 From: adhu2018 <41824074+adhu2018@users.noreply.github.com> Date: Sat, 6 Apr 2024 21:22:36 +0800 Subject: [PATCH] refactor: move method showHelp to package utils --- .../app/ui/book/import/remote/RemoteBookActivity.kt | 9 +-------- .../app/ui/book/source/edit/BookSourceEditActivity.kt | 8 +------- .../legado/app/ui/replace/edit/ReplaceEditActivity.kt | 10 +--------- .../app/ui/rss/source/edit/RssSourceEditActivity.kt | 7 +------ .../java/io/legado/app/utils/ActivityExtensions.kt | 7 +++++++ 5 files changed, 11 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt index b18310818..752061ef7 100644 --- a/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt @@ -21,11 +21,11 @@ import io.legado.app.model.remote.RemoteBook import io.legado.app.ui.about.AppLogDialog import io.legado.app.ui.book.import.BaseImportBookActivity import io.legado.app.ui.widget.SelectActionBar -import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.utils.ArchiveUtils import io.legado.app.utils.FileDoc import io.legado.app.utils.find import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp import kotlinx.coroutines.delay import kotlinx.coroutines.flow.conflate import kotlinx.coroutines.launch @@ -203,13 +203,6 @@ class RemoteBookActivity : BaseImportBookActivity(), viewModel.updateCallBackFlow(newText) } - @Suppress("SameParameterValue") - private fun showHelp(fileName: String) { - //显示目录help下的帮助文档 - val mdText = String(assets.open("web/help/md/${fileName}.md").readBytes()) - showDialogFragment(TextDialog(getString(R.string.help), mdText, TextDialog.Mode.MD)) - } - private fun showRemoteBookDownloadAlert( remoteBook: RemoteBook, onDownloadFinish: (() -> Unit)? = null 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 dabe9a803..091c7cc55 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 @@ -35,7 +35,6 @@ import io.legado.app.ui.book.source.debug.BookSourceDebugActivity import io.legado.app.ui.file.HandleFileContract import io.legado.app.ui.login.SourceLoginActivity import io.legado.app.ui.qrcode.QrCodeResult -import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.ui.widget.dialog.UrlOptionDialog import io.legado.app.ui.widget.dialog.VariableDialog import io.legado.app.ui.widget.keyboard.KeyboardToolPop @@ -48,6 +47,7 @@ import io.legado.app.utils.setEdgeEffectColor import io.legado.app.utils.share import io.legado.app.utils.shareWithQr 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 import kotlinx.coroutines.Dispatchers.IO @@ -621,12 +621,6 @@ class BookSourceEditActivity : } } - private fun showHelp(fileName: String) { - //显示目录help下的帮助文档 - val mdText = String(assets.open("web/help/md/${fileName}.md").readBytes()) - showDialogFragment(TextDialog(getString(R.string.help), mdText, TextDialog.Mode.MD)) - } - private fun setSourceVariable() { viewModel.save(getSource()) { source -> lifecycleScope.launch { 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 b85404db3..5058159e1 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 @@ -13,11 +13,10 @@ import io.legado.app.base.VMBaseActivity import io.legado.app.data.entities.ReplaceRule import io.legado.app.databinding.ActivityReplaceEditBinding import io.legado.app.lib.dialogs.SelectItem -import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.ui.widget.keyboard.KeyboardToolPop import io.legado.app.utils.GSON import io.legado.app.utils.sendToClip -import io.legado.app.utils.showDialogFragment +import io.legado.app.utils.showHelp import io.legado.app.utils.viewbindingdelegate.viewBinding /** @@ -144,11 +143,4 @@ class ReplaceEditActivity : } } - @Suppress("SameParameterValue") - private fun showHelp(fileName: String) { - //显示目录help下的帮助文档 - val mdText = String(assets.open("web/help/md/${fileName}.md").readBytes()) - showDialogFragment(TextDialog(getString(R.string.help), mdText, TextDialog.Mode.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 3a83f54ac..4e3c9cce7 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 @@ -37,6 +37,7 @@ import io.legado.app.utils.setEdgeEffectColor import io.legado.app.utils.share import io.legado.app.utils.shareWithQr 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 import kotlinx.coroutines.Dispatchers @@ -389,10 +390,4 @@ class RssSourceEditActivity : } } - private fun showHelp(fileName: String) { - //显示目录help下的帮助文档 - val mdText = String(assets.open("web/help/md/${fileName}.md").readBytes()) - showDialogFragment(TextDialog(getString(R.string.help), mdText, TextDialog.Mode.MD)) - } - } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/utils/ActivityExtensions.kt b/app/src/main/java/io/legado/app/utils/ActivityExtensions.kt index b0bf24be9..795e0fea6 100644 --- a/app/src/main/java/io/legado/app/utils/ActivityExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/ActivityExtensions.kt @@ -12,6 +12,7 @@ import androidx.annotation.ColorInt import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.DialogFragment import io.legado.app.R +import io.legado.app.ui.widget.dialog.TextDialog inline fun AppCompatActivity.showDialogFragment( arguments: Bundle.() -> Unit = {} @@ -201,3 +202,9 @@ val Activity.navigationBarGravity: Int val gravity = (navigationBar?.layoutParams as? FrameLayout.LayoutParams)?.gravity return gravity ?: Gravity.BOTTOM } + +fun AppCompatActivity.showHelp(fileName: String) { + //显示目录help下的帮助文档 + val mdText = String(assets.open("web/help/md/${fileName}.md").readBytes()) + showDialogFragment(TextDialog(getString(R.string.help), mdText, TextDialog.Mode.MD)) +} \ No newline at end of file