gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-07-04 23:36:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:gedoor/legado

Browse Source
This commit is contained in:
Antecer 2024-04-07 00:01:24 +08:00
commit 147e095635
5 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt
View File

@ -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<RemoteBookViewModel>(),
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

8
app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt
View File

@ -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 {

10
app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt
View File

@ -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))
}
}

7
app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt
View File

@ -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))
}
}

7
app/src/main/java/io/legado/app/utils/ActivityExtensions.kt
View File

@ -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 <reified T : DialogFragment> 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))
}