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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei 2023-11-23 14:48:26 +08:00
commit 242b5d94bd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/io/legado/app/ui/widget/dialog/CodeDialog.kt
View File

@ -6,6 +6,7 @@ import android.view.ViewGroup
import io.legado.app.R
import io.legado.app.base.BaseDialogFragment
import io.legado.app.databinding.DialogCodeViewBinding
import io.legado.app.help.IntentData
import io.legado.app.lib.theme.primaryColor
import io.legado.app.ui.widget.code.addJsPattern
import io.legado.app.ui.widget.code.addJsonPattern
@ -20,7 +21,7 @@ class CodeDialog() : BaseDialogFragment(R.layout.dialog_code_view) {
constructor(code: String, disableEdit: Boolean = true, requestId: String? = null) : this() {
arguments = Bundle().apply {
putBoolean("disableEdit", disableEdit)
putString("code", code)
putString("code", IntentData.put(code))
putString("requestId", requestId)
}
}
@ -44,7 +45,7 @@ class CodeDialog() : BaseDialogFragment(R.layout.dialog_code_view) {
binding.codeView.addJsonPattern()
binding.codeView.addJsPattern()
arguments?.getString("code")?.let {
binding.codeView.setText(it)
binding.codeView.text = IntentData.get(it)
}
}

5
app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt
View File

@ -7,6 +7,7 @@ import androidx.lifecycle.lifecycleScope
import io.legado.app.R
import io.legado.app.base.BaseDialogFragment
import io.legado.app.databinding.DialogTextViewBinding
import io.legado.app.help.IntentData
import io.legado.app.lib.theme.primaryColor
import io.legado.app.utils.applyTint
import io.legado.app.utils.setHtml
@ -35,7 +36,7 @@ class TextDialog() : BaseDialogFragment(R.layout.dialog_text_view) {
) : this() {
arguments = Bundle().apply {
putString("title", title)
putString("content", content)
putString("content", IntentData.put(content))
putString("mode", mode.name)
putLong("time", time)
}
@ -64,7 +65,7 @@ class TextDialog() : BaseDialogFragment(R.layout.dialog_text_view) {
}
arguments?.let {
binding.toolBar.title = it.getString("title")
val content = it.getString("content") ?: ""
val content = IntentData.get(it.getString("content")) ?: ""
when (it.getString("mode")) {
Mode.MD.name -> binding.textView.post {
Markwon.builder(requireContext())