Merge pull request #309 from wordpress-mobile/issue/258-fixing-missing-paragraphs

Issue/258 fixing missing paragraphs

Author: 0nko

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

@@ -83,6 +83,9 @@ class MainActivity : AppCompatActivity(),
         private val CODE = "<code>if (value == 5) printf(value)</code><br>"
         private val IMG = "<img src=\"https://cloud.githubusercontent.com/assets/3827611/21950131/3def4804-d9b5-11e6-88e6-d7d8864392e0.png\" />"
         private val EMOJI = "aaa&#x1F44D;&#x2764;ccc"
+
+        private val LONG_TEXT = "<br><br>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. "
+
         private val EXAMPLE =
                 IMG +
                 HEADING +
@@ -101,7 +104,8 @@ class MainActivity : AppCompatActivity(),
                 COMMENT_PAGE +
                 CODE +
                 UNKNOWN +
-                EMOJI
+                EMOJI +
+                LONG_TEXT
     }
 
     private val MEDIA_CAMERA_PHOTO_PERMISSION_REQUEST_CODE: Int = 1001

aztec/src/main/kotlin/org/wordpress/aztec/AztecParser.kt

@@ -220,7 +220,8 @@ class AztecParser {
             }
 
             if (spanned.getSpans(spanStart, spanStart, AztecSurroundedWithNewlines::class.java).any { before ->
-                        spanned.getSpanEnd(before) == spanStart }) {
+                spanned.getSpanEnd(before) == spanStart
+            }) {
                 // the newline before us is the end of a previous block element so, return
                 return@forEach
             }
@@ -283,14 +284,14 @@ class AztecParser {
     }
 
     private fun withinHtml(out: StringBuilder, text: Spanned, start: Int, end: Int,
-            grandParents: ArrayList<AztecNestable>?, nestingLevel: Int) {
+                           grandParents: ArrayList<AztecNestable>?, nestingLevel: Int) {
         var next: Int
         var i = start
         var parents: ArrayList<AztecNestable>?
 
         do {
             val paragraphs = text.getSpans(i, end, AztecNestable::class.java)
-                    .filter{ it !is AztecFullWidthImageSpan}
+                    .filter { it !is AztecFullWidthImageSpan }
                     .toTypedArray()
 
             paragraphs.sortWith(Comparator { a, b ->
@@ -359,7 +360,7 @@ class AztecParser {
     }
 
     private fun withinContent(out: StringBuilder, text: Spanned, start: Int, end: Int,
-            parents: ArrayList<AztecNestable>?) {
+                              parents: ArrayList<AztecNestable>?) {
         var next: Int
 
         var i = start
@@ -388,7 +389,7 @@ class AztecParser {
     // Copy from https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/text/Html.java,
     // remove some tag because we don't need them in Aztec.
     private fun withinParagraph(out: StringBuilder, text: Spanned, start: Int, end: Int, nl: Int,
-            parents: ArrayList<AztecNestable>?) {
+                                parents: ArrayList<AztecNestable>?) {
         var next: Int
 
         var i = start
@@ -453,14 +454,14 @@ class AztecParser {
             i = next
         }
 
-        for (i in 0..nl - 1) {
-            val parentSharesEnd = parents?.any { text.getSpanEnd(it) == end + 1 + i } ?: false
+        for (z in 0..nl - 1) {
+            val parentSharesEnd = parents?.any {text.getSpanEnd(it) == end + 1 + z } ?: false
             if (parentSharesEnd) {
                 continue
             }
 
             out.append("<br>")
-            consumeCursorIfInInput(out, text, end + i)
+            consumeCursorIfInInput(out, text, end + z)
         }
     }
 

aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt

@@ -28,15 +28,14 @@ import android.text.Spannable
 import android.text.Spanned
 import org.wordpress.aztec.spans.*
 import org.xml.sax.Attributes
-import org.wordpress.aztec.AztecAttributes
 
 class AztecTagHandler : Html.TagHandler {
 
     private var order = 0
 
     override fun handleTag(opening: Boolean, tag: String, output: Editable,
-            onMediaTappedListener: AztecText.OnMediaTappedListener?, context: Context, attributes: Attributes,
-            nestingLevel: Int): Boolean {
+                           onMediaTappedListener: AztecText.OnMediaTappedListener?, context: Context, attributes: Attributes,
+                           nestingLevel: Int): Boolean {
 
         when (tag.toLowerCase()) {
             LIST_LI -> {
@@ -105,7 +104,7 @@ class AztecTagHandler : Html.TagHandler {
     }
 
     private fun createImageSpan(attributes: AztecAttributes, onMediaTappedListener: AztecText.OnMediaTappedListener?,
-            context: Context) : AztecMediaSpan {
+                                context: Context) : AztecMediaSpan {
         val styles = context.obtainStyledAttributes(R.styleable.AztecText)
         val loadingDrawable = ContextCompat.getDrawable(context, styles.getResourceId(R.styleable.AztecText_drawableLoading, R.drawable.ic_image_loading))
         styles.recycle()
@@ -186,10 +185,9 @@ class AztecTagHandler : Html.TagHandler {
             if (spans.isEmpty()) {
                 return null
             } else {
-                return (spans.size downTo 1)
-                        .firstOrNull { text.getSpanFlags(spans[it - 1]) == Spannable.SPAN_MARK_MARK && !(spans[it - 1] as HiddenHtmlSpan).isClosed }
-                        ?.let { spans[it - 1] }
+                spans.sortByDescending { it.startOrder }
+                return spans.firstOrNull { text.getSpanFlags(it) == Spannable.SPAN_MARK_MARK && !(it as HiddenHtmlSpan).isClosed }
             }
         }
     }
-}
+}

aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

@@ -92,6 +92,8 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
     private var isViewInitialized = false
     private var previousCursorPosition = 0
 
+    var isInCalypsoMode = true
+
     private var unknownBlockSpanStart = -1
 
     private var formatToolbar: AztecToolbar? = null
@@ -116,6 +118,8 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
 
     var widthMeasureSpec: Int = 0
 
+    var verticalParagraphMargin: Int = 0
+
     interface OnSelectionChangedListener {
         fun onSelectionChanged(selStart: Int, selEnd: Int)
     }
@@ -140,6 +144,10 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
         init(attrs)
     }
 
+    fun setCalypsoMode(isCompatibleWithCalypso: Boolean) {
+        isInCalypsoMode = isCompatibleWithCalypso
+    }
+
     private fun init(attrs: AttributeSet?) {
         disableTextChangedListener()
 
@@ -164,6 +172,8 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
         historyEnable = styles.getBoolean(R.styleable.AztecText_historyEnable, historyEnable)
         historySize = styles.getInt(R.styleable.AztecText_historySize, historySize)
 
+        verticalParagraphMargin = styles.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0)
+
         inlineFormatter = InlineFormatter(this,
                 InlineFormatter.CodeStyle(
                         styles.getColor(R.styleable.AztecText_codeBackground, 0),
@@ -176,18 +186,18 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
                         styles.getDimensionPixelSize(R.styleable.AztecText_bulletMargin, 0),
                         styles.getDimensionPixelSize(R.styleable.AztecText_bulletPadding, 0),
                         styles.getDimensionPixelSize(R.styleable.AztecText_bulletWidth, 0),
-                        styles.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0)),
+                        verticalParagraphMargin),
                 BlockFormatter.QuoteStyle(
                         styles.getColor(R.styleable.AztecText_quoteBackground, 0),
                         styles.getColor(R.styleable.AztecText_quoteColor, 0),
                         styles.getFraction(R.styleable.AztecText_quoteBackgroundAlpha, 1, 1, 0f),
                         styles.getDimensionPixelSize(R.styleable.AztecText_quoteMargin, 0),
                         styles.getDimensionPixelSize(R.styleable.AztecText_quotePadding, 0),
                         styles.getDimensionPixelSize(R.styleable.AztecText_quoteWidth, 0),
-                       styles.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0)),
+                        verticalParagraphMargin),
                 BlockFormatter.HeaderStyle(
-                        styles.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0))
-                )
+                        verticalParagraphMargin)
+        )
 
         linkFormatter = LinkFormatter(this, LinkFormatter.LinkStyle(styles.getColor(
                 R.styleable.AztecText_linkColor, 0),
@@ -236,6 +246,8 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
         ParagraphCollapseAdjuster.install(this)
         ParagraphCollapseRemover.install(this)
 
+        EndOfParagraphMarkerAdder.install(this, verticalParagraphMargin)
+
         InlineTextWatcher.install(inlineFormatter, this)
 
         // NB: text change handler should not alter text before "afterTextChanged" is called otherwise not all watchers
@@ -625,7 +637,11 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
     fun fromHtml(source: String) {
         val builder = SpannableStringBuilder()
         val parser = AztecParser()
-        builder.append(parser.fromHtml(Format.clearFormatting(source), onMediaTappedListener, this, context))
+        builder.append(parser.fromHtml(
+                Format.removeSourceEditorFormatting(
+                        Format.addSourceEditorFormatting(source, isInCalypsoMode), isInCalypsoMode), onMediaTappedListener, this, context))
+
+        Format.preProcessSpannedText(builder, isInCalypsoMode)
 
         switchToAztecStyle(builder, 0, builder.length)
         disableTextChangedListener()
@@ -679,7 +695,21 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
         }
     }
 
+    //returns regular or "calypso" html depending on the mode
     fun toHtml(withCursorTag: Boolean = false): String {
+        val html = toPlainHtml(withCursorTag)
+
+        if (isInCalypsoMode) {
+            //calypso format is a mix of newline characters and html
+            //paragraphs and line breaks are added on server, from newline characters
+            return Format.addSourceEditorFormatting(html, true)
+        } else {
+            return html
+        }
+    }
+
+    //platform agnostic HTML
+    fun toPlainHtml(withCursorTag: Boolean = false): String {
         val parser = AztecParser()
         val output = SpannableStringBuilder(text)
 
@@ -688,21 +718,24 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
         for (span in output.getSpans(0, output.length, AztecCursorSpan::class.java)) {
             output.removeSpan(span)
         }
-        if (withCursorTag) {
+        if (withCursorTag && !isInCalypsoMode) {
             output.setSpan(AztecCursorSpan(), selectionEnd, selectionEnd, Spanned.SPAN_MARK_MARK)
         }
 
         parser.syncVisualNewlinesOfBlockElements(output)
 
-        return Format.clearFormatting(EndOfBufferMarkerAdder.removeEndOfTextMarker(parser.toHtml(output, withCursorTag)))
+        Format.postProcessSpanedText(output, isInCalypsoMode)
+
+        return EndOfBufferMarkerAdder.removeEndOfTextMarker(parser.toHtml(output, withCursorTag))
     }
 
     fun toFormattedHtml(): String {
-        return Format.addFormatting(toHtml())
+        return Format.addSourceEditorFormatting(toHtml(), isInCalypsoMode)
     }
 
     private fun switchToAztecStyle(editable: Editable, start: Int, end: Int) {
         editable.getSpans(start, end, AztecBlockSpan::class.java).forEach { blockFormatter.setBlockStyle(it) }
+        editable.getSpans(start, end, EndOfParagraphMarker::class.java).forEach { it.verticalPadding = verticalParagraphMargin }
 
         val urlSpans = editable.getSpans(start, end, AztecURLSpan::class.java)
         for (span in urlSpans) {
@@ -791,7 +824,7 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
         output.getSpans(0, output.length, ParagraphStyle::class.java).forEach { output.removeSpan(it) }
         clearMetaSpans(output)
         parser.syncVisualNewlinesOfBlockElements(output)
-        val html = Format.clearFormatting(parser.toHtml(output))
+        val html = Format.removeSourceEditorFormatting(parser.toHtml(output))
 
         val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
         clipboard.primaryClip = ClipData.newPlainText(null, html)
@@ -808,7 +841,7 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
                 val textToPaste = clip.getItemAt(i).coerceToText(context)
 
                 val builder = SpannableStringBuilder()
-                builder.append(parser.fromHtml(Format.clearFormatting(textToPaste.toString()), onMediaTappedListener,
+                builder.append(parser.fromHtml(Format.removeSourceEditorFormatting(textToPaste.toString()), onMediaTappedListener,
                         this, context).trim())
                 Selection.setSelection(editable, max)
 
@@ -977,20 +1010,20 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
 
     fun removeMedia(attributePredicate: AttributePredicate) {
         text.getSpans(0, text.length, AztecMediaSpan::class.java)
-            .filter {
-                attributePredicate.matches(it.attributes)
-            }
-            .forEach {
-                val start = text.getSpanStart(it)
-                val end = text.getSpanEnd(it)
+                .filter {
+                    attributePredicate.matches(it.attributes)
+                }
+                .forEach {
+                    val start = text.getSpanStart(it)
+                    val end = text.getSpanEnd(it)
 
-                val clickableSpan = text.getSpans(start, end, AztecMediaClickableSpan::class.java).firstOrNull()
+                    val clickableSpan = text.getSpans(start, end, AztecMediaClickableSpan::class.java).firstOrNull()
 
-                text.removeSpan(clickableSpan)
-                text.removeSpan(it)
+                    text.removeSpan(clickableSpan)
+                    text.removeSpan(it)
 
-                text.delete(start, end)
-            }
+                    text.delete(start, end)
+                }
     }
 
     interface AttributePredicate {
@@ -1002,45 +1035,45 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
 
     fun updateElementAttributes(attributePredicate: AttributePredicate, attrs: AztecAttributes) {
         text.getSpans(0, text.length, AztecAttributedSpan::class.java)
-            .filter {
-                attributePredicate.matches(it.attributes)
-            }
-            .firstOrNull()?.attributes = attrs
+                .filter {
+                    attributePredicate.matches(it.attributes)
+                }
+                .firstOrNull()?.attributes = attrs
     }
 
     fun setOverlayLevel(attributePredicate: AttributePredicate, index: Int, level: Int) {
         text.getSpans(0, text.length, AztecMediaSpan::class.java)
-            .filter {
-                attributePredicate.matches(it.attributes)
-            }
-            .forEach {
-                it.setOverayLevel(index, level)
-            }
+                .filter {
+                    attributePredicate.matches(it.attributes)
+                }
+                .forEach {
+                    it.setOverayLevel(index, level)
+                }
     }
 
     fun setOverlay(attributePredicate: AttributePredicate, index: Int, overlay: Drawable?, gravity: Int) {
         text.getSpans(0, text.length, AztecMediaSpan::class.java)
-            .filter {
-                attributePredicate.matches(it.attributes)
-            }
-            .forEach {
-                // set the new overlay drawable
-                it.setOverlay(index, overlay, gravity)
+                .filter {
+                    attributePredicate.matches(it.attributes)
+                }
+                .forEach {
+                    // set the new overlay drawable
+                    it.setOverlay(index, overlay, gravity)
 
-                invalidate()
-            }
+                    invalidate()
+                }
     }
 
     fun clearOverlays(attributePredicate: AttributePredicate) {
         text.getSpans(0, text.length, AztecMediaSpan::class.java)
-            .filter {
-                attributePredicate.matches(it.attributes)
-            }
-            .forEach {
-                it.clearOverlays()
+                .filter {
+                    attributePredicate.matches(it.attributes)
+                }
+                .forEach {
+                    it.clearOverlays()
 
-                invalidate()
-            }
+                    invalidate()
+                }
     }
 
     fun getElementAttributes(attributePredicate: AttributePredicate): AztecAttributes {

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

@@ -3,12 +3,12 @@ package org.wordpress.aztec.formatting
 import android.graphics.Typeface
 import android.text.Spanned
 import android.text.style.StyleSpan
+import org.wordpress.aztec.AztecAttributes
 import org.wordpress.aztec.AztecPart
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.TextFormat
 import org.wordpress.aztec.spans.*
 import org.wordpress.aztec.watchers.TextChangedEvent
-import org.wordpress.aztec.AztecAttributes
 import java.util.*
 
 
@@ -405,4 +405,4 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle) : AztecFormat
             }
         }
     }
-}
+}