Skip to content

Commit c90fc92

Browse files
committed
Fixed problem with reversed ordered numbers
1 parent efe5189 commit c90fc92

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecListSpan.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,7 @@ abstract class AztecListSpan(override var nestingLevel: Int,
7171

7272
val listText = text.subSequence(spanStart, spanEnd) as Spanned
7373

74-
return if (listText.length == 0) {
75-
0
76-
} else {
77-
listText.split("\n").size
78-
}
74+
return listText.getSpans(0, listText.length, AztecListItemSpan::class.java).size
7975
}
8076

8177
fun nestingDepth(text: Spanned, index: Int, nextIndex: Int): Int {

aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecOrderedListSpan.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ class AztecOrderedListSpan(
6767
else start + (getIndexOfProcessedLine(text, end) - 1)
6868
} else {
6969
val number = getNumberOfItemsInProcessedLine(text)
70-
if (isReversed) number - (getIndexOfProcessedLine(text, end))
70+
if (isReversed) number - (getIndexOfProcessedLine(text, end) - 1)
7171
else getIndexOfProcessedLine(text, end)
7272
}
7373

7474
val textToDraw = if (dir >= 0) lineIndex.toString() + "."
7575
else "." + lineIndex.toString()
76-
76+
7777
val width = p.measureText(textToDraw)
7878
maxWidth = Math.max(maxWidth, width)
7979

0 commit comments

Comments
 (0)