Merge pull request #943 from wordpress-mobile/feature/mark-formatting

Gerardo Pacheco · web-flow · commit 2878796461e8 · 2021-12-03T10:35:43.000+01:00
Add Mark inline formatting
diff --git a/aztec/src/main/java/org/wordpress/aztec/Html.java b/aztec/src/main/java/org/wordpress/aztec/Html.java
@@ -59,6 +59,7 @@
 import org.wordpress.aztec.spans.IAztecParagraphStyle;
 import org.wordpress.aztec.spans.UnknownClickableSpan;
 import org.wordpress.aztec.spans.UnknownHtmlSpan;
+import org.wordpress.aztec.spans.MarkSpan;
 import org.wordpress.aztec.util.CleaningUtils;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -355,6 +356,8 @@ private void handleStartTag(String tag, Attributes attributes, int nestingLevel)
         } else if (tag.equalsIgnoreCase("code")) {
             insideCodeTag = true;
             start(spannableStringBuilder, AztecTextFormat.FORMAT_CODE, attributes);
+        } else if (tag.equalsIgnoreCase("mark")) {
+            start(spannableStringBuilder, AztecTextFormat.FORMAT_MARK, attributes);
         } else if (!UnknownHtmlSpan.Companion.getKNOWN_TAGS().contains(tag.toLowerCase())) {
             // Initialize a new "Unknown" node
             if (contentHandlerLevel == 0) {
@@ -448,6 +451,8 @@ private void handleEndTag(String tag, int nestingLevel) {
         } else if (tag.equalsIgnoreCase("code")) {
             insideCodeTag = false;
             end(spannableStringBuilder, AztecTextFormat.FORMAT_CODE);
+        } else if (tag.equalsIgnoreCase("mark")) {
+            end(spannableStringBuilder, AztecTextFormat.FORMAT_MARK);
         }
     }
 
@@ -543,6 +548,9 @@ private static void start(SpannableStringBuilder text, AztecTextFormat textForma
             case FORMAT_CODE:
                 newSpan = new AztecCodeSpan(attributes);
                 break;
+            case FORMAT_MARK:
+                newSpan = new MarkSpan(attributes);
+                break;
             default:
                 throw new IllegalArgumentException("Style not supported");
         }
@@ -597,6 +605,9 @@ private static void end(SpannableStringBuilder text, AztecTextFormat textFormat)
             case FORMAT_CODE:
                 span = (AztecCodeSpan) getLast(text, AztecCodeSpan.class);
                 break;
+            case FORMAT_MARK:
+                span = (MarkSpan) getLast(text, MarkSpan.class);
+                break;
             default:
                 throw new IllegalArgumentException("Style not supported");
         }
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt
@@ -144,11 +144,6 @@ class AztecTagHandler(val context: Context, val plugins: List<IAztecPlugin> = Ar
                 handleElement(output, opening, preformatSpan)
                 return true
             }
-            MARK -> {
-                val span = createHiddenHtmlSpan(tag, AztecAttributes(attributes), nestingLevel, alignmentRendering)
-                handleElement(output, opening, span)
-                return true
-            }
             else -> {
                 if (tag.length == 2 && Character.toLowerCase(tag[0]) == 'h' && tag[1] >= '1' && tag[1] <= '6') {
                     handleElement(output, opening, createHeadingSpan(nestingLevel, tag, AztecAttributes(attributes), alignmentRendering))
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
@@ -1178,6 +1178,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
             AztecTextFormat.FORMAT_CITE,
             AztecTextFormat.FORMAT_UNDERLINE,
             AztecTextFormat.FORMAT_STRIKETHROUGH,
+            AztecTextFormat.FORMAT_MARK,
             AztecTextFormat.FORMAT_CODE -> return inlineFormatter.containsInlineStyle(format, selStart, selEnd)
             AztecTextFormat.FORMAT_UNORDERED_LIST,
             AztecTextFormat.FORMAT_ORDERED_LIST -> return blockFormatter.containsList(format, selStart, selEnd)
@@ -1619,6 +1620,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         inlineFormatter.removeInlineStyle(AztecTextFormat.FORMAT_STRIKETHROUGH, start, end)
         inlineFormatter.removeInlineStyle(AztecTextFormat.FORMAT_UNDERLINE, start, end)
         inlineFormatter.removeInlineStyle(AztecTextFormat.FORMAT_CODE, start, end)
+        inlineFormatter.removeInlineStyle(AztecTextFormat.FORMAT_MARK, start, end)
     }
 
     fun removeBlockStylesFromRange(start: Int, end: Int, ignoreLineBounds: Boolean = false) {
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecTextFormat.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecTextFormat.kt
@@ -35,4 +35,5 @@ enum class AztecTextFormat : ITextFormat {
     FORMAT_FONT,
     FORMAT_MONOSPACE,
     FORMAT_CODE,
+    FORMAT_MARK,
 }
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/formatting/InlineFormatter.kt b/aztec/src/main/kotlin/org/wordpress/aztec/formatting/InlineFormatter.kt
@@ -21,6 +21,7 @@ import org.wordpress.aztec.spans.AztecStyleStrongSpan
 import org.wordpress.aztec.spans.AztecStyleSpan
 import org.wordpress.aztec.spans.AztecUnderlineSpan
 import org.wordpress.aztec.spans.IAztecInlineSpan
+import org.wordpress.aztec.spans.MarkSpan
 import org.wordpress.aztec.watchers.TextChangedEvent
 import java.util.ArrayList
 
@@ -73,6 +74,14 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle) : AztecFormat
                     AztecTextFormat.FORMAT_CODE -> {
                         applyInlineStyle(item, textChangedEvent.inputStart, textChangedEvent.inputEnd)
                     }
+                    AztecTextFormat.FORMAT_MARK -> {
+                        // For cases of an empty mark tag, either at the beginning of the text or in between
+                        if (textChangedEvent.inputStart == 0 && textChangedEvent.inputEnd == 1) {
+                            applyMarkInlineStyle(textChangedEvent.inputStart, textChangedEvent.inputEnd)
+                        } else {
+                            applyInlineStyle(item, textChangedEvent.inputStart, textChangedEvent.inputEnd)
+                        }
+                    }
                     else -> {
                         // do nothing
                     }
@@ -176,6 +185,13 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle) : AztecFormat
         joinStyleSpans(start, end)
     }
 
+    private fun applyMarkInlineStyle(start: Int = selectionStart, end: Int = selectionEnd, attrs: AztecAttributes = AztecAttributes()) {
+        val previousSpans = editableText.getSpans(start, end, MarkSpan::class.java)
+        previousSpans.forEach {
+            it.applyInlineStyleAttributes(editableText, start, end)
+        }
+    }
+
     private fun applySpan(span: IAztecInlineSpan, start: Int, end: Int, type: Int) {
         if (start > end || start < 0 || end > editableText.length) {
             // If an external logger is available log the error there.
@@ -205,6 +221,7 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle) : AztecFormat
             AztecStrikethroughSpan::class.java -> return AztecTextFormat.FORMAT_STRIKETHROUGH
             AztecUnderlineSpan::class.java -> return AztecTextFormat.FORMAT_UNDERLINE
             AztecCodeSpan::class.java -> return AztecTextFormat.FORMAT_CODE
+            MarkSpan::class.java -> return AztecTextFormat.FORMAT_MARK
             else -> return null
         }
     }
@@ -349,6 +366,7 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle) : AztecFormat
             AztecTextFormat.FORMAT_STRIKETHROUGH -> return AztecStrikethroughSpan()
             AztecTextFormat.FORMAT_UNDERLINE -> return AztecUnderlineSpan()
             AztecTextFormat.FORMAT_CODE -> return AztecCodeSpan(codeStyle)
+            AztecTextFormat.FORMAT_MARK -> return MarkSpan()
             else -> return AztecStyleSpan(Typeface.NORMAL)
         }
     }
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/spans/MarkSpan.kt b/aztec/src/main/kotlin/org/wordpress/aztec/spans/MarkSpan.kt
@@ -0,0 +1,12 @@
+package org.wordpress.aztec.spans
+
+import android.text.TextPaint
+import android.text.style.CharacterStyle
+import org.wordpress.aztec.AztecAttributes
+
+class MarkSpan(override var attributes: AztecAttributes = AztecAttributes()) : CharacterStyle(), IAztecInlineSpan {
+    override var TAG = "mark"
+
+    override fun updateDrawState(tp: TextPaint?) {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,5 @@ enum class AztecTextFormat : ITextFormat {`
`35`	`35`	`FORMAT_FONT,`
`36`	`36`	`FORMAT_MONOSPACE,`
`37`	`37`	`FORMAT_CODE,`
	`38`	`+ FORMAT_MARK,`
`38`	`39`	`}`