Merge remote-tracking branch 'origin/develop' into publish-to-s3

wordpress-mobile · Oct 14, 2021 · df3a814 · df3a814
2 parents 46da719 + 3c76c2d
commit df3a814
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt b/app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt
@@ -178,6 +178,7 @@ open class MainActivity : AppCompatActivity(),
         private val VIDEOPRESS = "[wpvideo OcobLTqC]"
         private val VIDEOPRESS_2 = "[wpvideo OcobLTqC w=640 h=400 autoplay=true html5only=true3]"
         private val QUOTE_RTL = "<blockquote>לְצַטֵט<br>same quote but LTR</blockquote>"
+        private val MARK = "<p>Donec ipsum dolor, <mark style=\"color:#ff0000\">tempor sed</mark> bibendum <mark style=\"color:#1100ff\">vita</mark>.</p>"
 
         private val EXAMPLE =
                 IMG +
@@ -211,7 +212,8 @@ open class MainActivity : AppCompatActivity(),
                         VIDEOPRESS_2 +
                         AUDIO +
                         GUTENBERG_CODE_BLOCK +
-                        QUOTE_RTL
+                        QUOTE_RTL +
+                        MARK
 
         private val isRunningTest: Boolean by lazy {
             try {

diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt
@@ -144,6 +144,11 @@ 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))
@@ -245,5 +250,6 @@ class AztecTagHandler(val context: Context, val plugins: List<IAztecPlugin> = Ar
         private val VIDEO = "video"
         private val AUDIO = "audio"
         private val LINE = "hr"
+        private val MARK = "mark"
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -55,7 +55,7 @@ ext {
     jSoupVersion = '1.11.3'
     wordpressUtilsVersion = '1.21'
     espressoVersion = '3.0.1'
-    commonTargetSdkVersion = 29
+    commonTargetSdkVersion = 30
 
     aztecProjectDependency = project.hasProperty("aztecVersion") ? "org.wordpress:aztec:${project.getProperty("aztecVersion")}" : project(":aztec")
 }