sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[Messages] Fix HTML line break decoding and encoding.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2021-10-29 16:46:32 +02:00
parent 49a093201b
commit 27413a9745
No known key found for this signature in database
GPG Key ID: 70CB8A85BA1633CB
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/pl/szczodrzynski/edziennik/utils/html/BetterHtml.kt
View File

@ -47,7 +47,11 @@ object BetterHtml {
var text = html var text = html
.replace("\\[META:[A-z0-9]+;[0-9-]+]".toRegex(), "") .replace("\\[META:[A-z0-9]+;[0-9-]+]".toRegex(), "")
.replace("background-color: ?$hexPattern;".toRegex(), "") .replace("background-color: ?$hexPattern;".toRegex(), "")
// treat paragraphs as if they had no margin
.replace("<p", "<span")
.replace("</p>", "</span><br>")
// this is used only in Notes and Events
if (nl2br) { if (nl2br) {
text = text.replace("\n", "<br>") text = text.replace("\n", "<br>")
} }

5
app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/TextStylingManager.kt
View File

@ -200,13 +200,16 @@ class TextStylingManager(private val app: App) {
if (htmlMode == COMPATIBLE) { if (htmlMode == COMPATIBLE) {
textHtml = textHtml textHtml = textHtml
.replace("<br>", "<p>&nbsp;</p>") .substringBeforeLast("</p>")
.replace("<p>", "")
.replace("</p>", "<br>")
.replace("<b>", "<strong>") .replace("<b>", "<strong>")
.replace("</b>", "</strong>") .replace("</b>", "</strong>")
.replace("<i>", "<em>") .replace("<i>", "<em>")
.replace("</i>", "</em>") .replace("</i>", "</em>")
.replace("<u>", "<span style=\"text-decoration: underline;\">") .replace("<u>", "<span style=\"text-decoration: underline;\">")
.replace("</u>", "</span>") .replace("</u>", "</span>")
textHtml = "<p>$textHtml</p>"
} }
return textHtml return textHtml