filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support data-mx-color attribute in <font> tags as well.

Browse Source
This commit is contained in:
ethereal 2020-09-07 14:52:30 -04:00
parent 5fbcf348f5
commit 8291dfc188
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -41,7 +41,7 @@ Build 🧱:
Other changes:
- Use File extension functions to make code more concise (#1996)
- Create a script to import SAS strings (#1909)
- Support `data-mx-bg-color` attribute on `<font>` tags.
- Support `data-mx-[bg-]color` attributes on `<font>` tags.
Changes in Element 1.0.5 (2020-08-21)
===================================================

22
vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt
View File

@ -31,17 +31,21 @@ class FontTagHandler : SimpleTagHandler() {
override fun supportedTags() = listOf("font")
override fun getSpans(configuration: MarkwonConfiguration, renderProps: RenderProps, tag: HtmlTag): Any? {
val colorString = tag.attributes()["color"]?.let { parseColor(it) } ?: Color.BLACK
val bgColor = tag.attributes()["data-mx-bg-color"]
if(bgColor == null) {
return ForegroundColorSpan(colorString)
}
else {
return arrayOf(ForegroundColorSpan(colorString), BackgroundColorSpan(bgColor.let { parseColor(it) }))
val mxColorString = tag.attributes()["data-mx-color"]
val colorString = tag.attributes()["color"]
val mxBgColorString = tag.attributes()["data-mx-bg-color"]
val foregroundColor = mxColorString?.let { parseColor(it, Color.BLACK) } ?: colorString?.let { parseColor(it, Color.BLACK) } ?: Color.BLACK
if (mxBgColorString != null) {
val backgroundColor = parseColor(mxBgColorString, Color.TRANSPARENT)
return arrayOf(ForegroundColorSpan(foregroundColor), BackgroundColorSpan(backgroundColor))
} else {
return ForegroundColorSpan(foregroundColor)
}
}
private fun parseColor(colorName: String): Int {
private fun parseColor(colorName: String, failResult: Int): Int {
try {
return Color.parseColor(colorName)
} catch (e: Exception) {
@ -63,7 +67,7 @@ class FontTagHandler : SimpleTagHandler() {
"blue" -> Color.BLUE
"orange" -> Color.parseColor("#FFA500")
"navy" -> Color.parseColor("#000080")
else -> Color.BLACK
else -> failResult
}
}
}