Move code from MediaFormatter to LineBlockFormatter

Author: planarvoid

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

@@ -68,7 +68,6 @@ import org.wordpress.aztec.formatting.BlockFormatter
 import org.wordpress.aztec.formatting.InlineFormatter
 import org.wordpress.aztec.formatting.LineBlockFormatter
 import org.wordpress.aztec.formatting.LinkFormatter
-import org.wordpress.aztec.formatting.MediaFormatter
 import org.wordpress.aztec.handlers.HeadingHandler
 import org.wordpress.aztec.handlers.ListHandler
 import org.wordpress.aztec.handlers.ListItemHandler
@@ -280,7 +279,6 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     lateinit var blockFormatter: BlockFormatter
     lateinit var lineBlockFormatter: LineBlockFormatter
     lateinit var linkFormatter: LinkFormatter
-    lateinit var mediaFormatter: MediaFormatter
 
     var imageGetter: Html.ImageGetter? = null
     var videoThumbnailGetter: Html.VideoThumbnailGetter? = null
@@ -457,7 +455,6 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                 styles.getBoolean(R.styleable.AztecText_linkUnderline, true)))
 
         lineBlockFormatter = LineBlockFormatter(this)
-        mediaFormatter = MediaFormatter(this)
 
         styles.recycle()
 
@@ -1170,7 +1167,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
             AztecTextFormat.FORMAT_PREFORMAT -> blockFormatter.togglePreformat()
             AztecTextFormat.FORMAT_QUOTE -> blockFormatter.toggleQuote()
             AztecTextFormat.FORMAT_HORIZONTAL_RULE -> {
-                mediaFormatter.applyHorizontalRule(shouldAddMediaInline)
+                lineBlockFormatter.applyHorizontalRule(shouldAddMediaInline)
             }
             else -> {
                 plugins.filter { it is IToolbarButton && it.action.textFormats.contains(textFormat) }
@@ -1960,11 +1957,11 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     }
 
     fun insertImage(drawable: Drawable?, attributes: Attributes) {
-        mediaFormatter.insertImage(shouldAddMediaInline, drawable, attributes, onImageTappedListener, onMediaDeletedListener)
+        lineBlockFormatter.insertImage(shouldAddMediaInline, drawable, attributes, onImageTappedListener, onMediaDeletedListener)
     }
 
     fun insertVideo(drawable: Drawable?, attributes: Attributes) {
-        mediaFormatter.insertVideo(shouldAddMediaInline, drawable, attributes, onVideoTappedListener, onMediaDeletedListener)
+        lineBlockFormatter.insertVideo(shouldAddMediaInline, drawable, attributes, onVideoTappedListener, onMediaDeletedListener)
     }
 
     fun removeMedia(attributePredicate: AttributePredicate) {

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

@@ -1,10 +1,26 @@
 package org.wordpress.aztec.formatting
 
+import android.graphics.drawable.Drawable
+import android.text.SpannableStringBuilder
+import android.text.Spanned
 import android.text.TextUtils
+import androidx.appcompat.content.res.AppCompatResources
+import org.wordpress.aztec.AztecAttributes
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.AztecTextFormat
+import org.wordpress.aztec.Constants
 import org.wordpress.aztec.ITextFormat
+import org.wordpress.aztec.R
 import org.wordpress.aztec.spans.AztecHeadingSpan
+import org.wordpress.aztec.spans.AztecHorizontalRuleSpan
+import org.wordpress.aztec.spans.AztecImageSpan
+import org.wordpress.aztec.spans.AztecMediaClickableSpan
+import org.wordpress.aztec.spans.AztecMediaSpan
+import org.wordpress.aztec.spans.AztecVideoSpan
+import org.wordpress.aztec.spans.IAztecBlockSpan
+import org.wordpress.aztec.spans.IAztecNestable
+import org.wordpress.aztec.watchers.EndOfBufferMarkerAdder
+import org.xml.sax.Attributes
 
 class LineBlockFormatter(editor: AztecText) : AztecFormatter(editor) {
 
@@ -76,4 +92,138 @@ class LineBlockFormatter(editor: AztecText) : AztecFormatter(editor) {
 
         return false
     }
+    fun applyHorizontalRule(inline: Boolean) {
+        val nestingLevel = if (inline) {
+            editor.removeInlineStylesFromRange(selectionStart, selectionEnd)
+            editor.removeBlockStylesFromRange(selectionStart, selectionEnd, true)
+            IAztecNestable.getNestingLevelAt(editableText, selectionStart)
+        } else {
+            0
+        }
+
+        val span = AztecHorizontalRuleSpan(
+                editor.context,
+                AppCompatResources.getDrawable(editor.context, R.drawable.img_hr)!!,
+                nestingLevel,
+                AztecAttributes(),
+                editor
+        )
+
+        val builder = SpannableStringBuilder(Constants.MAGIC_STRING)
+        builder.setSpan(span, 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+
+        if (inline) {
+            editableText.replace(selectionStart, selectionEnd, builder)
+            val newSelectionPosition = editableText.indexOf(Constants.MAGIC_CHAR, selectionStart) + 1
+            editor.setSelection(newSelectionPosition)
+        } else {
+            builder.append("\n")
+            insertSpanAfterBlock(builder)
+        }
+    }
+
+    fun insertVideo(inline: Boolean, drawable: Drawable?, attributes: Attributes, onVideoTappedListener: AztecText.OnVideoTappedListener?,
+                    onMediaDeletedListener: AztecText.OnMediaDeletedListener?) {
+        val nestingLevel = if (inline) IAztecNestable.getNestingLevelAt(editableText, selectionStart) else 0
+        val span = AztecVideoSpan(editor.context, drawable, nestingLevel, AztecAttributes(attributes), onVideoTappedListener,
+                onMediaDeletedListener, editor)
+        if (inline) {
+            insertMediaInline(span)
+        } else {
+            insertMediaAfterBlock(span)
+        }
+    }
+
+    fun insertImage(inline: Boolean, drawable: Drawable?, attributes: Attributes, onImageTappedListener: AztecText.OnImageTappedListener?,
+                    onMediaDeletedListener: AztecText.OnMediaDeletedListener?) {
+        val nestingLevel = if (inline) IAztecNestable.getNestingLevelAt(editableText, selectionStart) else 0
+        val span = AztecImageSpan(editor.context, drawable, nestingLevel, AztecAttributes(attributes), onImageTappedListener,
+                onMediaDeletedListener, editor)
+        if (inline) {
+            insertMediaInline(span)
+        } else {
+            insertMediaAfterBlock(span)
+        }
+    }
+
+    private fun insertMediaInline(span: AztecMediaSpan) {
+        editor.removeInlineStylesFromRange(selectionStart, selectionEnd)
+
+        val ssb = SpannableStringBuilder(Constants.IMG_STRING)
+
+        buildClickableMediaSpan(ssb, span)
+
+        // We need to be sure the cursor is placed correctly after media insertion
+        // Note that media has '\n' around them when needed
+        val isLastItem = selectionEnd == EndOfBufferMarkerAdder.safeLength(editor)
+        editableText.replace(selectionStart, selectionEnd, ssb)
+
+        setSelection(isLastItem, selectionEnd)
+    }
+
+    private fun insertMediaAfterBlock(span: AztecMediaSpan) {
+        val ssb = SpannableStringBuilder(Constants.IMG_STRING)
+        ssb.append("\n")
+        buildClickableMediaSpan(ssb, span)
+        insertSpanAfterBlock(ssb)
+    }
+
+    private fun insertSpanAfterBlock(ssb: SpannableStringBuilder) {
+        val position = getEndOfBlock()
+        // We need to be sure the cursor is placed correctly after media insertion
+        // Note that media has '\n' around them when needed
+        val isLastItem = position == EndOfBufferMarkerAdder.safeLength(editor)
+        val insertedLength = ssb.length
+        editableText.insert(position, ssb)
+        val spans = editableText.getSpans(position, position + insertedLength, IAztecBlockSpan::class.java).filter {
+            it !is AztecMediaSpan && editableText.getSpanStart(it) == position
+        }
+        spans.forEach {
+            val spanStart = editableText.getSpanStart(it)
+            val spanEnd = editableText.getSpanEnd(it)
+            val spanFlags = editableText.getSpanFlags(it)
+            editableText.removeSpan(it)
+            if (spanStart + insertedLength < spanEnd) {
+                editableText.setSpan(it, spanStart + insertedLength, spanEnd, spanFlags)
+            }
+        }
+        setSelection(isLastItem, position)
+    }
+
+    private fun setSelection(isLastItem: Boolean, position: Int) {
+        val newSelection = if (isLastItem) {
+            EndOfBufferMarkerAdder.safeLength(editor)
+        } else {
+            if (position < EndOfBufferMarkerAdder.safeLength(editor)) position + 1 else position
+        }
+        editor.setSelection(newSelection)
+        editor.isMediaAdded = true
+    }
+
+    private fun buildClickableMediaSpan(ssb: SpannableStringBuilder, span: AztecMediaSpan) {
+        ssb.setSpan(
+                span,
+                0,
+                1,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+
+        ssb.setSpan(
+                AztecMediaClickableSpan(span),
+                0,
+                1,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+    }
+
+    private fun getEndOfBlock(): Int {
+        var position = 0
+        editableText.getSpans(selectionStart, selectionEnd, IAztecBlockSpan::class.java).forEach {
+            val spanEnd = editableText.getSpanEnd(it)
+            if (spanEnd > position) {
+                position = spanEnd
+            }
+        }
+        return position
+    }
 }