Skip to content

Fix FromHtml rendering of ordered lists with Paragraph spans. #4994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 30, 2024
Merged

Fix FromHtml rendering of ordered lists with Paragraph spans. #4994

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3fa9d65
Fix FromHtml rendering of ordered lists with Paragraph spans.
dbrant Sep 27, 2024
888e266
Merge branch 'main' into olParagraphFix
dbrant Sep 27, 2024
75c431c
Merge branch 'main' into olParagraphFix
cooltey Sep 27, 2024
323f0f8
Braces.
dbrant Sep 28, 2024
971c642
Merge branch 'main' into olParagraphFix
cooltey Sep 30, 2024
ff08152
Merge branch 'main' into olParagraphFix
cooltey Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions app/src/main/java/org/wikipedia/richtext/CustomHtmlParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import android.text.Html.TagHandler
import android.text.Spannable
import android.text.Spanned
import android.text.style.LeadingMarginSpan
import android.text.style.ParagraphStyle
import android.text.style.TypefaceSpan
import android.text.style.URLSpan
import android.widget.TextView
Expand Down Expand Up @@ -201,9 +202,19 @@ class CustomHtmlParser(private val handler: TagHandler) : TagHandler, ContentHan
if (listParents.last() == "ol") {
val count = (if (listItemCounts.size > 0) listItemCounts.pop() else 0) + 1
listItemCounts.push(count)
val spans = output.getSpans<LeadingMarginSpan>(output.length)
if (spans.isNotEmpty()) {
val span = spans.last()
// TODO: improve this logic to no longer require explicitly inserting the count
// into the output text. This requires manual and fragile manipulation of any
// existing spans that may be present in the output text.
val paragraphSpans = output.getSpans<ParagraphStyle>(output.length)
var lastLeadingSpan: LeadingMarginSpan? = null
paragraphSpans.forEach {
if (it !is LeadingMarginSpan) {
output.removeSpan(it)
} else {
lastLeadingSpan = it
}
}
lastLeadingSpan?.let { span ->
val spanStart = output.getSpanStart(span)
output.removeSpan(span)
output.insert(spanStart, "$count. ")
Expand Down
Loading