Merge pull request #879 from wordpress-mobile/issue/implement_list_reverse_start

Implement start and reversed in lists

Author: maxme

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

@@ -91,6 +91,46 @@ open class MainActivity : AppCompatActivity(),
         private val UNDERLINE = "<u style=\"color:lime\">Underline</u><br>"
         private val STRIKETHROUGH = "<s style=\"color:#ff666666\" class=\"test\">Strikethrough</s><br>" // <s> or <strike> or <del>
         private val ORDERED = "<ol style=\"color:green\"><li>Ordered</li><li>should have color</li></ol>"
+        private val ORDERED_WITH_START = "<h4>Start in 10 List:</h4>" +
+                "<ol start=\"10\">\n" +
+                "    <li>Ten</li>\n" +
+                "    <li>Eleven</li>\n" +
+                "    <li>Twelve</li>\n" +
+                "</ol>"
+        private val ORDERED_REVERSED = "<h4>Reversed List:</h4>" +
+                "<ol reversed>\n" +
+                "    <li>Three</li>\n" +
+                "    <li>Two</li>\n" +
+                "    <li>One</li>\n" +
+                "</ol>"
+        private val ORDERED_REVERSED_WITH_START = "<h4>Reversed Start in 10 List:</h4>" +
+                "<ol reversed start=\"10\">\n" +
+                "    <li>Ten</li>\n" +
+                "    <li>Nine</li>\n" +
+                "    <li>Eight</li>\n" +
+                "</ol>"
+        private val ORDERED_REVERSED_NEGATIVE_WITH_START = "<h4>Reversed Start in 1 List:</h4>" +
+                "<ol reversed start=\"1\">\n" +
+                "    <li>One</li>\n" +
+                "    <li>Zero</li>\n" +
+                "    <li>Minus One</li>\n" +
+                "</ol>"
+        private val ORDERED_REVERSED_WITH_START_IDENT = "<h4>Reversed Start in 6 List:</h4>" +
+                "<ol reversed>" +
+                "   <li>Six</li>" +
+                "   <li>Five</li>" +
+                "   <li>Four</li>" +
+                "   <li>Three</li>" +
+                "   <li>Two</li>" +
+                "   <li>One<ol>" +
+                "   <li>One</li>" +
+                "   <li>Two</li>" +
+                "   <li>Three</li>" +
+                "   <li>Four</li>" +
+                "   <li>Five</li>" +
+                "   <li>Six</li>" +
+                "   <li>Seven</li> " +
+                "   </ol></li></ol>"
         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>"
@@ -147,6 +187,11 @@ open class MainActivity : AppCompatActivity(),
                         UNDERLINE +
                         STRIKETHROUGH +
                         ORDERED +
+                        ORDERED_WITH_START +
+                        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
@@ -65,6 +65,17 @@ abstract class AztecListSpan(override var nestingLevel: Int,
                 .size
     }
 
+    fun getNumberOfItemsInProcessedLine(text: CharSequence): Int {
+        val spanStart = (text as Spanned).getSpanStart(this)
+        val spanEnd = text.getSpanEnd(this)
+
+        val listText = text.subSequence(spanStart, spanEnd) as Spanned
+
+        return listText.getSpans(0, listText.length, AztecListItemSpan::class.java)
+                .filter { it.nestingLevel == nestingLevel + 1 }
+                .size
+    }
+
     fun nestingDepth(text: Spanned, index: Int, nextIndex: Int): Int {
         val finalNextIndex = if (nextIndex > text.length) index else nextIndex
         return IAztecNestable.getNestingLevelAt(text, index, finalNextIndex)

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

@@ -55,12 +55,26 @@ class AztecOrderedListSpan(
         p.color = listStyle.indicatorColor
         p.style = Paint.Style.FILL
 
-        val lineIndex = getIndexOfProcessedLine(text, end)
-        val textToDraw = if (lineIndex > -1) {
-            if (dir >= 0) lineIndex.toString() + "."
-            else "." + lineIndex.toString()
+        val start = if (attributes.hasAttribute("start") == true) {
+            attributes.getValue("start").toInt()
         } else {
-            ""
+            0
+        }
+
+        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)

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)