Merge pull request #661 from wordpress-mobile/issue/660-attr-lost

Changes to <hr> tag handling

Author: 0nko

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/HistoryMixedTests.kt

@@ -24,7 +24,7 @@ class HistoryMixedTests : BaseHistoryTest() {
             "\t<li></li>\n" +
             "</ol>\n" +
             "\n" +
-            "<hr>\n" +
+            "<hr />\n" +
             "\n" +
             "<ul>\n" +
             "\t<li>Unordered</li>\n" +

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

@@ -91,7 +91,7 @@ open class MainActivity : AppCompatActivity(),
         private val UNDERLINE = "<u style=\"color:lime\">Underline</u><br>"
         private val STRIKETHROUGH = "<s style=\"color:#ff666666\" class=\"test\">Strikethrough</s><br>" // <s> or <strike> or <del>
         private val ORDERED = "<ol style=\"color:green\"><li>Ordered</li><li>should have color</li></ol>"
-        private val LINE = "<hr>"
+        private val LINE = "<hr />"
         private val UNORDERED = "<ul><li style=\"color:darkred\">Unordered</li><li>Should not have color</li></ul>"
         private val QUOTE = "<blockquote>Quote</blockquote>"
         private val LINK = "<a href=\"https://github.com/wordpress-mobile/WordPress-Aztec-Android\">Link</a><br>"

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

@@ -473,7 +473,7 @@ class AztecParser(val plugins: List<IAztecPlugin> = ArrayList()) {
                         }
 
                 if (span is AztecHorizontalRuleSpan) {
-                    out.append("<${span.startTag}>")
+                    out.append("<${span.startTag} />")
                     i = next
                 }
 

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

@@ -116,7 +116,8 @@ class AztecTagHandler(val context: Context, val plugins: List<IAztecPlugin> = Ar
             LINE -> {
                 if (opening) {
                     // Add an extra newline above the line to prevent weird typing on the line above
-                    start(output, AztecHorizontalRuleSpan(context, ContextCompat.getDrawable(context, R.drawable.img_hr), nestingLevel))
+                    start(output, AztecHorizontalRuleSpan(context, ContextCompat.getDrawable(context, R.drawable.img_hr),
+                            nestingLevel, AztecAttributes(attributes)))
                     output.append(Constants.MAGIC_CHAR)
                 } else {
                     end(output, AztecHorizontalRuleSpan::class.java)

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

@@ -106,6 +106,7 @@ class LineBlockFormatter(editor: AztecText) : AztecFormatter(editor) {
                 editor.context,
                 ContextCompat.getDrawable(editor.context, R.drawable.img_hr),
                 nestingLevel,
+                AztecAttributes(),
                 editor
         )
 

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

@@ -6,7 +6,7 @@ import org.wordpress.aztec.AztecAttributes
 import org.wordpress.aztec.AztecText
 
 class AztecHorizontalRuleSpan(context: Context, drawable: Drawable, override var nestingLevel: Int,
-                              editor: AztecText? = null, override var attributes: AztecAttributes = AztecAttributes()) :
+                              override var attributes: AztecAttributes = AztecAttributes(), editor: AztecText? = null) :
         AztecDynamicImageSpan(context, drawable), IAztecFullWidthImageSpan, IAztecSpan {
     init {
         textView = editor

aztec/src/test/kotlin/org/wordpress/aztec/AttributeTest.kt

@@ -52,6 +52,7 @@ class AttributeTest {
         private val BIG = "<big b=\"B\">Big</big>"
         private val SMALL = "<small s=\"S\">Small</small>"
         private val P = "<p p=\"P\">Paragraph</p>"
+        private val LINE = "<hr h=\"H\" />"
         private val MIXED = HEADING + BOLD + ITALIC + UNDERLINE + STRIKETHROUGH + ORDERED +
                 UNORDERED + QUOTE + LINK + COMMENT + COMMENT_MORE + COMMENT_PAGE +
                 UNKNOWN + LIST + SUB + SUP + FONT + TT + BIG + SMALL + P
@@ -240,6 +241,15 @@ class AttributeTest {
         Assert.assertEquals(input, output)
     }
 
+    @Test
+    @Throws(Exception::class)
+    fun rulerAttributes() {
+        val input = LINE
+        editText.fromHtml(input)
+        val output = editText.toHtml()
+        Assert.assertEquals(input, output)
+    }
+
     @Test
     @Throws(Exception::class)
     fun paragraphAttributes() {

aztec/src/test/kotlin/org/wordpress/aztec/AztecToolbarTest.kt

@@ -960,11 +960,11 @@ class AztecToolbarTest {
     @Throws(Exception::class)
     fun orderedListMultiselectAlignment() {
         editText.fromHtml("<ol><li>item 1</li><li style=\"text-align: center;\">item 2</li></ol>" +
-                "<hr><ol><li>item 3</li><li>item 4</li></ol>")
+                "<hr /><ol><li>item 3</li><li>item 4</li></ol>")
 
         editText.setSelection(editText.text.indexOf("2"), editText.text.indexOf("3"))
         alignRightButton.performClick()
-        Assert.assertEquals("<ol><li>item 1</li><li style=\"text-align: right;\">item 2</li></ol><hr>" +
+        Assert.assertEquals("<ol><li>item 1</li><li style=\"text-align: right;\">item 2</li></ol><hr />" +
                 "<ol><li style=\"text-align: right;\">item 3</li><li>item 4</li></ol>",
                 editText.toHtml())
     }

aztec/src/test/kotlin/org/wordpress/aztec/ClipboardTest.kt

@@ -26,7 +26,7 @@ class ClipboardTest {
     private val UNDERLINE = "<u>Underline</u><br>"
     private val STRIKETHROUGH = "<s class=\"test\">Strikethrough</s>" // <s> or <strike> or <del>
     private val ORDERED = "<ol><li>Ordered</li><li></li></ol>"
-    private val LINE = "<hr>"
+    private val LINE = "<hr />"
     private val UNORDERED = "<ul><li>Unordered</li><li></li></ul>"
     private val QUOTE = "<blockquote>Quote</blockquote>"
     private val LINK = "<a href=\"https://github.com/wordpress-mobile/WordPress-Aztec-Android\">Link</a><br>"