Merge pull request #628 from wordpress-mobile/issue/527-quote-issues

daniloercoli · web-flow · commit 23bd4f26d061 · 2018-03-02T13:12:06.000+01:00
Issue/527 quote issues
diff --git a/app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/MixedTextFormattingTests.kt b/app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/MixedTextFormattingTests.kt
@@ -176,7 +176,7 @@ class MixedTextFormattingTests : BaseTest() {
     @Test
     fun testRemoveQuoteFormatting() {
         val text = "some text"
-        val html = "<blockquote>$text</blockquote>\n$text"
+        val html = "$text\n<br>\n$text"
 
         EditorPage()
                 .toggleQuote()
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -27,12 +27,6 @@
 
         </activity>
 
-        <activity
-            android:name=".NonCalypsoActivity"
-            android:windowSoftInputMode="adjustResize|stateHidden"
-            android:theme="@style/MainActivityTheme" >
-        </activity>
-
         <!-- Provider for exposing file URIs on Android 7+ -->
         <provider
             android:name="android.support.v4.content.FileProvider"
diff --git a/aztec/src/main/java/org/wordpress/aztec/Html.java b/aztec/src/main/java/org/wordpress/aztec/Html.java
@@ -33,9 +33,9 @@
 
 import org.ccil.cowan.tagsoup.HTMLSchema;
 import org.ccil.cowan.tagsoup.Parser;
-import org.wordpress.aztec.plugins.html2visual.IHtmlContentHandler;
 import org.wordpress.aztec.plugins.IAztecPlugin;
 import org.wordpress.aztec.plugins.html2visual.IHtmlCommentHandler;
+import org.wordpress.aztec.plugins.html2visual.IHtmlContentHandler;
 import org.wordpress.aztec.plugins.html2visual.IHtmlPreprocessor;
 import org.wordpress.aztec.plugins.html2visual.IHtmlTextHandler;
 import org.wordpress.aztec.spans.AztecCodeSpan;
@@ -52,7 +52,6 @@
 import org.wordpress.aztec.spans.AztecUnderlineSpan;
 import org.wordpress.aztec.spans.CommentSpan;
 import org.wordpress.aztec.spans.FontSpan;
-import org.wordpress.aztec.spans.IAztecBlockSpan;
 import org.wordpress.aztec.spans.IAztecInlineSpan;
 import org.wordpress.aztec.spans.IAztecParagraphStyle;
 import org.wordpress.aztec.spans.UnknownClickableSpan;
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecParser.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecParser.kt
@@ -133,7 +133,11 @@ class AztecParser(val plugins: List<IAztecPlugin> = ArrayList()) {
             val parent = IAztecNestable.getParent(spanned, SpanWrapper(spanned, it))
 
             // a list item "repels" a child list so the list will appear in the next line
-            val repelling = it is AztecListSpan && parent?.span is AztecListItemSpan
+            val parentListItem = spanned.getSpans(spanned.getSpanStart(it), spanned.getSpanEnd(it), AztecListItemSpan::class.java)
+                    .filter { item -> item.nestingLevel < it.nestingLevel }
+                    .sortedBy { item -> item.nestingLevel }
+                    .firstOrNull()
+            val repelling = it is AztecListSpan && parentListItem != null
 
             val spanStart = spanned.getSpanStart(it)
             val spanEnd = spanned.getSpanEnd(it)
@@ -160,6 +164,10 @@ class AztecParser(val plugins: List<IAztecPlugin> = ArrayList()) {
                 return@forEach
             }
 
+            if (repelling && spanStart > 0 && spanned[spanStart - 1] == '\n' && spanStart - 1 >= spanned.getSpanStart(parentListItem)) {
+                return@forEach
+            }
+
             // well, it seems we need a visual newline so, add one and mark it as such
             spanned.insert(spanStart, "\n")
 
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt
@@ -50,8 +50,6 @@ import org.xml.sax.Attributes
 import java.util.ArrayList
 
 class AztecTagHandler(val context: Context, val plugins: List<IAztecPlugin> = ArrayList()) : Html.TagHandler {
-    private var order = 0
-
     private val loadingDrawable: Drawable
 
     init {
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/formatting/BlockFormatter.kt b/aztec/src/main/kotlin/org/wordpress/aztec/formatting/BlockFormatter.kt
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/handlers/BlockHandler.kt b/aztec/src/main/kotlin/org/wordpress/aztec/handlers/BlockHandler.kt
@@ -24,10 +24,11 @@ abstract class BlockHandler<SpanType : IAztecBlockSpan>(val clazz: Class<SpanTyp
     var newlineIndex: Int = -1
     var nestingLevel = 0
     var markerIndex: Int = -1
+    var isReplay = false
 
-    override fun handleTextChanged(text: Spannable, inputStart: Int, count: Int, nestingLevel: Int) {
+    override fun handleTextChanged(text: Spannable, inputStart: Int, count: Int, nestingLevel: Int, isReplay: Boolean) {
         this.text = text
-
+        this.isReplay = isReplay
         this.nestingLevel = nestingLevel
 
         // use charsNew to get the spans at the input point. It appears to be more reliable vs the whole Editable.
@@ -92,9 +93,10 @@ abstract class BlockHandler<SpanType : IAztecBlockSpan>(val clazz: Class<SpanTyp
         }
 
         // prev newline needs to be at the same nesting level to account for "double-enter"
+        val prevNewlineNesting = IAztecNestable.getNestingLevelAt(text, newlineIndex - 1, newlineIndex)
+        val currentNewlineNesting = IAztecNestable.getNestingLevelAt(text, newlineIndex, newlineIndex + 1)
         if (text[newlineIndex - 1] == Constants.NEWLINE
-                && IAztecNestable.getNestingLevelAt(text, newlineIndex - 1, newlineIndex) ==
-                    IAztecNestable.getNestingLevelAt(text, newlineIndex, newlineIndex + 1)
+                && (prevNewlineNesting == currentNewlineNesting || prevNewlineNesting > currentNewlineNesting && !isReplay)
                 && atEndOfBlock) {
             return PositionType.EMPTY_LINE_AT_BLOCK_END
         }
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/source/Format.kt b/aztec/src/main/kotlin/org/wordpress/aztec/source/Format.kt
@@ -52,8 +52,7 @@ object Format {
         if (isCalypsoFormat) {
             val htmlWithoutSourceFormatting = toCalypsoHtml(html)
             val doc = Jsoup.parseBodyFragment(htmlWithoutSourceFormatting.replace("\n", "")).outputSettings(Document.OutputSettings().prettyPrint(false))
-            val modified = doc.body().html()
-            return modified
+            return doc.body().html()
         } else {
             return replaceAll(html, "\\s*<(/?($block)(.*?))>\\s*", "<$1>")
         }
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecHeadingSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecHeadingSpan.kt
@@ -18,15 +18,14 @@ class AztecHeadingSpan @JvmOverloads constructor(
         override var attributes: AztecAttributes,
         var headerStyle: BlockFormatter.HeaderStyle = BlockFormatter.HeaderStyle(0),
         override var align: Layout.Alignment? = null
-    ) : MetricAffectingSpan(), IAztecBlockSpan, LineHeightSpan, UpdateLayout {
+    ) : MetricAffectingSpan(), IAztecLineBlockSpan, LineHeightSpan, UpdateLayout {
     override val TAG: String
         get() = heading.tag
 
     override var endBeforeBleed: Int = -1
     override var startBeforeCollapse: Int = -1
 
     var textFormat: ITextFormat = AztecTextFormat.FORMAT_HEADING_1
-        get() = field
         set(value) {
             field = value
             heading = textFormatToHeading(value)
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecListItemSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecListItemSpan.kt
@@ -5,7 +5,7 @@ import org.wordpress.aztec.AztecAttributes
 
 class AztecListItemSpan(override var nestingLevel: Int,
                         override var attributes: AztecAttributes = AztecAttributes(),
-                        override var align: Layout.Alignment? = null) : IAztecBlockSpan {
+                        override var align: Layout.Alignment? = null) : IAztecCompositeBlockSpan {
     override val TAG = "li"
 
     override var endBeforeBleed: Int = -1
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecListSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecListSpan.kt
@@ -6,12 +6,12 @@ import android.text.Spanned
 import android.text.style.LeadingMarginSpan
 import android.text.style.LineHeightSpan
 import android.text.style.UpdateLayout
-import java.util.ArrayList
+import org.wordpress.aztec.Constants
 
 abstract class AztecListSpan(override var nestingLevel: Int,
                              var verticalPadding: Int = 0,
                              override var align: Layout.Alignment? = null) : LeadingMarginSpan.Standard(0),
-        IAztecBlockSpan, LineHeightSpan, UpdateLayout {
+        LineHeightSpan, UpdateLayout, IAztecBlockSpan {
     override var endBeforeBleed: Int = -1
     override var startBeforeCollapse: Int = -1
 
@@ -36,28 +36,29 @@ abstract class AztecListSpan(override var nestingLevel: Int,
 
         val listText = text.subSequence(spanStart, spanEnd) as Spanned
 
-        if (nestingDepth(listText, end - spanStart, end - spanStart + 1) != nestingLevel + 1) {
-            // this line has nesting deeper than our own (item) nesting level so, don't display bullet/number
-            return -1
+        if (end - spanStart - 1 >= 0 && end - spanStart <= listText.length) {
+            val hasSublist = listText.getSpans(end - spanStart - 1, end - spanStart, AztecListSpan::class.java)
+                    .any { it.nestingLevel > nestingLevel }
+            if (hasSublist) {
+                return -1
+            }
         }
 
+        // only display a line indicator when it's the first line of a list item
         val textBeforeBeforeEnd = listText.subSequence(0, end - spanStart) as Spanned
+        val startOfLine = textBeforeBeforeEnd.lastIndexOf(Constants.NEWLINE) + 1
+        val isValidListItem = listText.getSpans(0, listText.length, AztecListItemSpan::class.java)
+                .any { it.nestingLevel == nestingLevel + 1 && listText.getSpanStart(it) == startOfLine }
 
-        // gather the nesting depth for each line
-        val nestingDepth = ArrayList<Int>()
-        textBeforeBeforeEnd.forEachIndexed {
-            i, c -> if (c == '\n') nestingDepth.add(nestingDepth(textBeforeBeforeEnd, i, i + 1))
-        }
-
-        // count the lines that have the same nesting depth as us
-        var otherLinesAtSameNestingLevel = 0
-        for (maxNestingLevel in nestingDepth) {
-            if (maxNestingLevel - 1 == nestingLevel) { // the -1 is because the list is one level up than the listitem
-                otherLinesAtSameNestingLevel++
-            }
+        if (!isValidListItem) {
+            return -1
         }
 
-        return otherLinesAtSameNestingLevel + 1
+        // count the list item spans up to the current line with the expected nesting level => item number
+        val checkEnd = Math.min(textBeforeBeforeEnd.length + 1, listText.length)
+        return listText.getSpans(0, checkEnd, AztecListItemSpan::class.java)
+                .filter { it.nestingLevel == nestingLevel + 1 }
+                .size
     }
 
     fun nestingDepth(text: Spanned, index: Int, nextIndex: Int): Int {
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecQuoteSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecQuoteSpan.kt
@@ -24,7 +24,9 @@ import android.graphics.Rect
 import android.support.v4.text.TextDirectionHeuristicCompat
 import android.support.v4.text.TextDirectionHeuristicsCompat
 import android.support.v4.text.TextUtilsCompat
+import android.support.v4.util.ArrayMap
 import android.support.v4.view.ViewCompat
+import android.text.Editable
 import android.text.Layout
 import android.text.Spanned
 import android.text.style.LineBackgroundSpan
@@ -46,6 +48,8 @@ class AztecQuoteSpan(
     override var startBeforeCollapse: Int = -1
 
     private val rect = Rect()
+    private var offset: Int = 0
+    private val quoteStart = ArrayMap<Int, Float>()
 
     override val TAG: String = "blockquote"
 
@@ -65,7 +69,7 @@ class AztecQuoteSpan(
     }
 
     override fun getLeadingMargin(first: Boolean): Int {
-        return quoteStyle.quoteMargin + quoteStyle.quoteWidth + quoteStyle.quotePadding
+        return quoteStyle.quoteMargin + quoteStyle.quoteWidth + quoteStyle.quotePadding - offset
     }
 
     override fun drawLeadingMargin(c: Canvas, p: Paint, x: Int, dir: Int,
@@ -78,15 +82,36 @@ class AztecQuoteSpan(
         p.style = Paint.Style.FILL
         p.color = quoteStyle.quoteColor
 
+        val editable = text as Editable
+        val isWithinListItem = isWithinListItem(editable, start, end)
+        val isRtl = isRtlQuote(text, start, end)
+
+        val margin: Int
+        if (isWithinListItem) {
+            margin = x
+            offset = quoteStyle.quoteMargin
+        } else {
+            margin = if (isRtl) {
+                x - quoteStyle.quoteMargin
+            } else {
+                x + quoteStyle.quoteMargin
+            }
+            offset = 0
+        }
+
         val marginStart: Float
         val marginEnd: Float
 
-        if (isRtlQuote(text, start, end)) {
-            marginStart = (x - quoteStyle.quoteMargin + dir * quoteStyle.quoteWidth).toFloat()
-            marginEnd = (x - quoteStyle.quoteMargin).toFloat()
+        if (isRtl) {
+            marginStart = (margin + dir * quoteStyle.quoteWidth).toFloat()
+            marginEnd = margin.toFloat()
+
+            quoteStart[start] = marginStart
         } else {
-            marginStart = (x + quoteStyle.quoteMargin).toFloat()
-            marginEnd = (x + quoteStyle.quoteMargin + dir * quoteStyle.quoteWidth).toFloat()
+            marginStart = margin.toFloat()
+            marginEnd = (margin + dir * quoteStyle.quoteWidth).toFloat()
+
+            quoteStart[start] = marginEnd
         }
 
         c.drawRect(marginStart, top.toFloat(), marginEnd, bottom.toFloat(), p)
@@ -95,6 +120,11 @@ class AztecQuoteSpan(
         p.color = color
     }
 
+    private fun isWithinListItem(editable: Editable, start: Int, end: Int): Boolean {
+        return editable.getSpans(start, end, AztecListItemSpan::class.java)
+                .any { it.nestingLevel == nestingLevel - 1 }
+    }
+
     override fun drawBackground(c: Canvas, p: Paint, left: Int, right: Int,
                                 top: Int, baseline: Int, bottom: Int,
                                 text: CharSequence, start: Int, end: Int,
@@ -111,11 +141,13 @@ class AztecQuoteSpan(
         val quoteBackgroundStart: Int
         val quoteBackgroundEnd: Int
 
-        if (isRtlQuote(text, start, end)) {
+        val isRtl = isRtlQuote(text, start, end)
+
+        if (isRtl) {
             quoteBackgroundStart = left
-            quoteBackgroundEnd = right - quoteStyle.quoteMargin
+            quoteBackgroundEnd = quoteStart[start]?.toInt() ?: 0
         } else {
-            quoteBackgroundStart = left + quoteStyle.quoteMargin
+            quoteBackgroundStart = quoteStart[start]?.toInt() ?: 0
             quoteBackgroundEnd = right
         }
 
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecRelativeSizeSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecRelativeSizeSpan.kt
@@ -3,6 +3,6 @@ package org.wordpress.aztec.spans
 import android.text.style.RelativeSizeSpan
 import org.wordpress.aztec.AztecAttributes
 
-open class AztecRelativeSizeSpan @JvmOverloads constructor(private var tag: String, size: Float, override var attributes: AztecAttributes = AztecAttributes()) : RelativeSizeSpan(size), IAztecInlineSpan {
+open class AztecRelativeSizeSpan @JvmOverloads constructor(tag: String, size: Float, override var attributes: AztecAttributes = AztecAttributes()) : RelativeSizeSpan(size), IAztecInlineSpan {
     override val TAG = tag
 }
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecStrikethroughSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecStrikethroughSpan.kt
@@ -3,7 +3,7 @@ package org.wordpress.aztec.spans
 import android.text.style.StrikethroughSpan
 import org.wordpress.aztec.AztecAttributes
 
-class AztecStrikethroughSpan(private var tag: String = "del",
+class AztecStrikethroughSpan(tag: String = "del",
                              override var attributes: AztecAttributes = AztecAttributes())
     : StrikethroughSpan(), IAztecInlineSpan {
     override val TAG = tag
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/IAztecCompositeBlockSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/IAztecCompositeBlockSpan.kt
@@ -0,0 +1,3 @@
+package org.wordpress.aztec.spans
+
+interface IAztecCompositeBlockSpan : IAztecBlockSpan
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/IAztecLineBlockSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/IAztecLineBlockSpan.kt
@@ -0,0 +1,3 @@
+package org.wordpress.aztec.spans
+
+interface IAztecLineBlockSpan : IAztecBlockSpan
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/IAztecNestable.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/IAztecNestable.kt
@@ -2,14 +2,50 @@ package org.wordpress.aztec.spans
 
 import android.text.Spannable
 import android.text.Spanned
+import org.wordpress.aztec.Constants
 import org.wordpress.aztec.util.SpanWrapper
 
 interface IAztecNestable {
     var nestingLevel: Int
 
     companion object {
         fun getNestingLevelAt(spanned: Spanned, index: Int, nextIndex: Int = index): Int {
-            return spanned.getSpans(index, nextIndex, IAztecNestable::class.java).maxBy { it.nestingLevel }?.nestingLevel ?: 0
+            return spanned.getSpans(index, nextIndex, IAztecNestable::class.java)
+                    .filter { spanned.getSpanEnd(it) != index || index == 0 || spanned[index - 1] != Constants.NEWLINE }
+                    .maxBy { it.nestingLevel }?.nestingLevel ?: 0
+        }
+
+        fun getMinNestingLevelAt(spanned: Spanned, index: Int, nextIndex: Int = index): Int {
+            return spanned.getSpans(index, nextIndex, IAztecNestable::class.java)
+                    .filter { spanned.getSpanEnd(it) != index || index == 0 || spanned[index - 1] != Constants.NEWLINE }
+                    .filter { spanned.getSpanStart(it) <= index && spanned.getSpanEnd(it) >= nextIndex &&
+                            (spanned.getSpanStart(it) != index || spanned.getSpanEnd(it) != nextIndex) }
+                    .filter { index != nextIndex || spanned.getSpanStart(it) != index && spanned.getSpanEnd(it) != index }
+                    .minBy { it.nestingLevel }?.nestingLevel ?: 0
+        }
+
+        fun pushDeeper(spannable: Spannable, start: Int, end: Int, fromLevel: Int = 0, pushBy: Int = 1): List<SpanWrapper<IAztecNestable>> {
+            val spans = SpanWrapper.getSpans(spannable, start, end, IAztecNestable::class.java)
+                    .filter { spannable.getSpanStart(it.span) >= start && spannable.getSpanEnd(it.span) <= end }
+                    .filter { it.span.nestingLevel >= fromLevel }
+
+            spans.forEach {
+                it.span.nestingLevel += pushBy
+            }
+
+            return spans
+        }
+
+        fun pullUp(spannable: Spannable, start: Int, end: Int, fromLevel: Int, pullBy: Int = 1): List<SpanWrapper<IAztecNestable>> {
+            val spans = SpanWrapper.getSpans(spannable, start, end, IAztecNestable::class.java)
+                    .filter { spannable.getSpanStart(it.span) >= start && spannable.getSpanEnd(it.span) <= end }
+                    .filter { it.span.nestingLevel >= fromLevel }
+
+            spans.forEach {
+                it.span.nestingLevel -= pullBy
+            }
+
+            return spans
         }
 
         fun getParent(spannable: Spannable, child: SpanWrapper<out IAztecNestable>): SpanWrapper<out IAztecNestable>? {
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/IAztecSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/IAztecSpan.kt
@@ -6,7 +6,6 @@ import android.annotation.SuppressLint
 interface IAztecSpan : IAztecAttributedSpan {
 
     val TAG: String
-        get
 
     val startTag: String
         get() {
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/util/ColorConverter.kt b/aztec/src/main/kotlin/org/wordpress/aztec/util/ColorConverter.kt
@@ -5,6 +5,7 @@ import android.graphics.Color
 import android.os.Build
 import android.support.annotation.ColorInt
 import android.text.TextUtils
+import org.wordpress.aztec.util.ColorConverter.Companion.COLOR_NOT_FOUND
 
 /**
  * Converts color strings into color integers used by android. This translation process will attempt to
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/util/SpanWrapper.kt b/aztec/src/main/kotlin/org/wordpress/aztec/util/SpanWrapper.kt
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/watchers/BlockElementWatcher.kt b/aztec/src/main/kotlin/org/wordpress/aztec/watchers/BlockElementWatcher.kt
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/BlockElementsTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/BlockElementsTest.kt
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/HeadingTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/HeadingTest.kt
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/ListTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/ListTest.kt
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/QuoteTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/QuoteTest.kt
diff --git a/wordpress-shortcodes/src/main/java/org/wordpress/aztec/plugins/shortcodes/VideoShortcodePlugin.kt b/wordpress-shortcodes/src/main/java/org/wordpress/aztec/plugins/shortcodes/VideoShortcodePlugin.kt
