Merge pull request #775 from wordpress-mobile/issue/774-caption-alignment

Issue/774 caption alignment

Author: hypest

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## [v1.3.15](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.15)
+### Changed
+- Synced the caption span alignment attribute with its the align property
+
 ## [1.3.14](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.14) - 2019-01-11
 ### Fixed
 - Fixed issue where pasting over the whole text emitted a delete char, causing Gutenberg to remove whole block

wordpress-shortcodes/src/main/java/org/wordpress/aztec/plugins/shortcodes/extensions/CaptionExtensions.kt

@@ -1,5 +1,6 @@
 package org.wordpress.aztec.plugins.shortcodes.extensions
 
+import android.text.Layout
 import android.text.Spanned
 import org.wordpress.aztec.AztecAttributes
 import org.wordpress.aztec.AztecText
@@ -44,17 +45,20 @@ fun AztecText.removeImageCaption(attributePredicate: AztecText.AttributePredicat
 
 fun AztecText.hasImageCaption(attributePredicate: AztecText.AttributePredicate): Boolean {
     this.text.getSpans(0, this.text.length, AztecImageSpan::class.java)
-        .firstOrNull {
-            val wrapper = SpanWrapper<AztecImageSpan>(text, it)
-            return text.getSpans(wrapper.start, wrapper.end, CaptionShortcodeSpan::class.java).isNotEmpty()
+            .firstOrNull {
+                attributePredicate.matches(it.attributes)
+            }
+            ?.let {
+                val wrapper = SpanWrapper(text, it)
+                return text.getSpans(wrapper.start, wrapper.end, CaptionShortcodeSpan::class.java).isNotEmpty()
         }
 
     return false
 }
 
 fun AztecImageSpan.getCaption(): String {
     textView?.text?.let {
-        val wrapper = SpanWrapper<AztecImageSpan>(textView!!.text, this)
+        val wrapper = SpanWrapper(textView!!.text, this)
         textView!!.text.getSpans(wrapper.start, wrapper.end, CaptionShortcodeSpan::class.java).firstOrNull()?.let {
             return it.caption
         }
@@ -64,7 +68,7 @@ fun AztecImageSpan.getCaption(): String {
 
 fun AztecImageSpan.getCaptionAttributes(): AztecAttributes {
     textView?.text?.let {
-        val wrapper = SpanWrapper<AztecImageSpan>(textView!!.text, this)
+        val wrapper = SpanWrapper(textView!!.text, this)
         textView!!.text.getSpans(wrapper.start, wrapper.end, CaptionShortcodeSpan::class.java).firstOrNull()?.let {
             return it.attributes
         }
@@ -75,7 +79,7 @@ fun AztecImageSpan.getCaptionAttributes(): AztecAttributes {
 @JvmOverloads
 fun AztecImageSpan.setCaption(value: String, attrs: AztecAttributes? = null) {
     textView?.text?.let {
-        val wrapper = SpanWrapper<AztecImageSpan>(textView!!.text, this)
+        val wrapper = SpanWrapper(textView!!.text, this)
 
         var captionSpan = textView?.text?.getSpans(wrapper.start, wrapper.end, CaptionShortcodeSpan::class.java)?.firstOrNull()
         if (captionSpan == null) {
@@ -86,14 +90,24 @@ fun AztecImageSpan.setCaption(value: String, attrs: AztecAttributes? = null) {
         captionSpan.caption = value
 
         attrs?.let {
-            captionSpan!!.attributes = attrs
+            captionSpan.attributes = attrs
+
+            if (captionSpan.attributes.hasAttribute(CaptionShortcodePlugin.ALIGN_ATTRIBUTE)) {
+                when (captionSpan.attributes.getValue(CaptionShortcodePlugin.ALIGN_ATTRIBUTE)) {
+                    CaptionShortcodePlugin.ALIGN_RIGHT_ATTRIBUTE_VALUE -> captionSpan.align = Layout.Alignment.ALIGN_OPPOSITE
+                    CaptionShortcodePlugin.ALIGN_CENTER_ATTRIBUTE_VALUE -> captionSpan.align = Layout.Alignment.ALIGN_CENTER
+                    CaptionShortcodePlugin.ALIGN_LEFT_ATTRIBUTE_VALUE -> captionSpan.align = Layout.Alignment.ALIGN_NORMAL
+                }
+            } else {
+                captionSpan.align = null
+            }
         }
     }
 }
 
 fun AztecImageSpan.removeCaption() {
     textView?.text?.let {
-        val wrapper = SpanWrapper<AztecImageSpan>(textView!!.text, this)
+        val wrapper = SpanWrapper(textView!!.text, this)
         textView!!.text.getSpans(wrapper.start, wrapper.end, CaptionShortcodeSpan::class.java).firstOrNull()?.remove()
     }
 }