Fixed problem with ident elements

Author: marecar3

app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt

@@ -115,6 +115,9 @@ open class MainActivity : AppCompatActivity(),
                 "    <li>Nine</li>\n" +
                 "    <li>Eight</li>\n" +
                 "</ol>"
+        private val ORDERED_REVERSED_WITH_START_IDENT = "<h4>Reversed Start in 4 List:</h4>" +
+                "<ol reversed>" +
+                "<li>dkfdskfdf\\sd\\</li><li>dfds</li><li>fdf</li><li>dfd</li><li>f</li><li>dsfs<ol><li>fdfd</li><li>f</li><li>dsf</li><li>ds</li><li>d</li><li>g</li><li>sdg</li><li>ds</li></ol></li></ol>\n"
         private val LINE = "<hr />"
         private val UNORDERED = "<ul><li style=\"color:darkred\">Unordered</li><li>Should not have color</li></ul>"
         private val QUOTE = "<blockquote>Quote</blockquote>"
@@ -175,6 +178,7 @@ open class MainActivity : AppCompatActivity(),
                         ORDERED_REVERSED +
                         ORDERED_REVERSED_WITH_START +
                         ORDERED_REVERSED_NEGATIVE_WITH_START +
+                        ORDERED_REVERSED_WITH_START_IDENT +
                         LINE +
                         UNORDERED +
                         QUOTE +

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

@@ -34,7 +34,7 @@ abstract class AztecListSpan(override var nestingLevel: Int,
         }
     }
 
-    fun getIndexOfProcessedLine(text: CharSequence, end: Int): Int {
+    fun getIndexOfProcessedLine(text: CharSequence, end: Int): Int? {
         val spanStart = (text as Spanned).getSpanStart(this)
         val spanEnd = text.getSpanEnd(this)
 
@@ -44,7 +44,7 @@ abstract class AztecListSpan(override var nestingLevel: Int,
             val hasSublist = listText.getSpans(end - spanStart - 1, end - spanStart, AztecListSpan::class.java)
                     .any { it.nestingLevel > nestingLevel }
             if (hasSublist) {
-                return -1
+                return null
             }
         }
 
@@ -55,7 +55,7 @@ abstract class AztecListSpan(override var nestingLevel: Int,
                 .any { it.nestingLevel == nestingLevel + 1 && listText.getSpanStart(it) == startOfLine }
 
         if (!isValidListItem) {
-            return -1
+            return null
         }
 
         // count the list item spans up to the current line with the expected nesting level => item number
@@ -71,7 +71,9 @@ abstract class AztecListSpan(override var nestingLevel: Int,
 
         val listText = text.subSequence(spanStart, spanEnd) as Spanned
 
-        return listText.getSpans(0, listText.length, AztecListItemSpan::class.java).size
+        return listText.getSpans(0, listText.length, AztecListItemSpan::class.java)
+                .filter { it.nestingLevel == nestingLevel + 1 }
+                .size
     }
 
     fun nestingDepth(text: Spanned, index: Int, nextIndex: Int): Int {

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

@@ -61,18 +61,21 @@ class AztecOrderedListSpan(
             0
         }
 
-        val isReversed = attributes.hasAttribute("reversed")
-        val lineIndex = if (start > 0) {
-            if (isReversed) start - (getIndexOfProcessedLine(text, end) - 1)
-            else start + (getIndexOfProcessedLine(text, end) - 1)
-        } else {
-            val number = getNumberOfItemsInProcessedLine(text)
-            if (isReversed) number - (getIndexOfProcessedLine(text, end) - 1)
-            else getIndexOfProcessedLine(text, end)
-        }
-
-        val textToDraw = if (dir >= 0) lineIndex.toString() + "."
+        var textToDraw = ""
+        getIndexOfProcessedLine(text, end)?.let {
+            val isReversed = attributes.hasAttribute("reversed")
+            val lineIndex = if (start > 0) {
+                if (isReversed) start - (it - 1)
+                else start + (it - 1)
+            } else {
+                val number = getNumberOfItemsInProcessedLine(text)
+                if (isReversed) number - (it - 1)
+                else it
+            }
+
+            textToDraw = if (dir >= 0) lineIndex.toString() + "."
             else "." + lineIndex.toString()
+        }
 
         val width = p.measureText(textToDraw)
         maxWidth = Math.max(maxWidth, width)

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

@@ -53,7 +53,7 @@ class AztecUnorderedListSpan(
         p.style = Paint.Style.FILL
 
         val lineIndex = getIndexOfProcessedLine(text, end)
-        val textToDraw = if (lineIndex > -1) "\u2022" else ""
+        val textToDraw = if (lineIndex != null) "\u2022" else ""
 
         val width = p.measureText(textToDraw)