Merge pull request #242 from wordpress-mobile/issue/fix-visual-glicthes-with-block-elements

Issue/fix visual glicthes with block elements

Author: 0nko

aztec/src/main/kotlin/org/wordpress/aztec/formatting/BlockFormatter.kt

@@ -123,14 +123,22 @@ class BlockFormatter(editor: AztecText, listStyle: ListStyle, quoteStyle: QuoteS
                         spanEnd,
                         Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
             } else if (textChangedEvent.isAddingCharacters) {
+
+                val spanEndsWithNewline = editableText.indexOf('\n', textChangedEvent.inputStart, true) == spanEnd - textChangedEvent.numberOfAddedCharacters
+
+                //if span we are inserting text into is ending with newline we don't need to extend it
+                if (spanEndsWithNewline) {
+                    return@forEach
+                }
+
                 val indexOfLineEnd = text.indexOf('\n', spanEnd - 1, true)
 
                 if (indexOfLineEnd == spanEnd) {
                     spanEnd += textChangedEvent.count
                 } else if (indexOfLineEnd == -1) {
                     spanEnd = text.length
                 } else {
-                    spanEnd = indexOfLineEnd
+                    spanEnd = indexOfLineEnd + if (textChangedEvent.isAfterZeroWidthJoiner()) 1 else 0
                 }
 
                 if (spanEnd <= textLength) {
@@ -224,6 +232,9 @@ class BlockFormatter(editor: AztecText, listStyle: ListStyle, quoteStyle: QuoteS
                 }
             }
         } else if (!textChangedEvent.isAddingCharacters && !textChangedEvent.isNewLineButNotAtTheBeginning()) {
+            val deletedCharacterIsNewline = textChangedEvent.textBefore[textChangedEvent.inputEnd] == '\n'
+            if (!deletedCharacterIsNewline) return
+
             // backspace on a line right after a list attaches the line to the last item
             val blockSpan = editableText.getSpans(inputEnd, inputEnd, AztecBlockSpan::class.java).firstOrNull()
             val before = Math.min(inputStart, inputEnd)

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

@@ -37,26 +37,4 @@ abstract class AztecListSpan(val verticalPadding: Int) : LeadingMarginSpan.Stand
         return lineIndex + 1
     }
 
-    fun getTotalNumberOfLines(text: CharSequence): Int {
-        val spanStart = (text as Spanned).getSpanStart(this)
-        val spanEnd = text.getSpanEnd(this)
-
-        return text.substring(spanStart..spanEnd - 2).split("\n").count()
-    }
-
-    fun getIndicatorAdjustment(text: CharSequence, end: Int): Int {
-        var adjustment = 0
-
-        val totalNumberOfLinesInList = getTotalNumberOfLines(text)
-        val currentLineNumber = getIndexOfProcessedLine(text, end)
-
-        if (totalNumberOfLinesInList > 1 && currentLineNumber == 1) {
-            adjustment = 0
-        } else if ((totalNumberOfLinesInList > 1 && totalNumberOfLinesInList == currentLineNumber) || totalNumberOfLinesInList == 1) {
-            adjustment = -verticalPadding
-        }
-
-        return adjustment
-    }
-
 }

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

@@ -86,7 +86,7 @@ class AztecOrderedListSpan : AztecListSpan {
         val textToDraw = getIndexOfProcessedLine(text, end).toString() + "."
 
         val width = p.measureText(textToDraw)
-        c.drawText(textToDraw, (textMargin + x + dir - width) * dir, (bottom - p.descent()) + getIndicatorAdjustment(text, end), p)
+        c.drawText(textToDraw, (textMargin + x + dir - width) * dir, baseline.toFloat(), p)
 
         p.color = oldColor
         p.style = style

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

@@ -87,7 +87,7 @@ class AztecUnorderedListSpan : AztecListSpan {
         val textToDraw = "\u2022"
 
         val width = p.measureText(textToDraw)
-        c.drawText(textToDraw, (bulletMargin + x + dir - width) * dir, (bottom - p.descent()) - width / 2 + getIndicatorAdjustment(text, end), p)
+        c.drawText(textToDraw, (bulletMargin + x + dir - width) * dir, (baseline + (width - p.descent())), p)
 
         p.color = oldColor
         p.style = style