Use AlignmentApproach with AztecQuoteSpan

Author: mchowning

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

@@ -42,6 +42,7 @@ import org.wordpress.aztec.spans.AztecVideoSpan
 import org.wordpress.aztec.spans.HiddenHtmlSpan
 import org.wordpress.aztec.spans.IAztecAttributedSpan
 import org.wordpress.aztec.spans.IAztecNestable
+import org.wordpress.aztec.spans.createAztecQuoteSpan
 import org.wordpress.aztec.spans.createHeadingSpan
 import org.wordpress.aztec.spans.createHiddenHtmlBlockSpan
 import org.wordpress.aztec.spans.createParagraphSpan
@@ -98,7 +99,8 @@ class AztecTagHandler(val context: Context, val plugins: List<IAztecPlugin> = Ar
                 return true
             }
             BLOCKQUOTE -> {
-                handleElement(output, opening, AztecQuoteSpan(nestingLevel, AztecAttributes(attributes)))
+                val span = createAztecQuoteSpan(nestingLevel, AztecAttributes(attributes), alignmentApproach)
+                handleElement(output, opening, span)
                 return true
             }
             IMAGE -> {

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

@@ -27,6 +27,7 @@ import org.wordpress.aztec.spans.IAztecCompositeBlockSpan
 import org.wordpress.aztec.spans.IAztecLineBlockSpan
 import org.wordpress.aztec.spans.IAztecNestable
 import org.wordpress.aztec.spans.ParagraphSpan
+import org.wordpress.aztec.spans.createAztecQuoteSpan
 import org.wordpress.aztec.spans.createHeadingSpan
 import org.wordpress.aztec.spans.createParagraphSpan
 import org.wordpress.aztec.spans.createPreformatSpan
@@ -295,7 +296,7 @@ class BlockFormatter(editor: AztecText,
         when (textFormat) {
             AztecTextFormat.FORMAT_ORDERED_LIST -> return Arrays.asList(AztecOrderedListSpan(nestingLevel, attrs, listStyle), AztecListItemSpan(nestingLevel + 1))
             AztecTextFormat.FORMAT_UNORDERED_LIST -> return Arrays.asList(AztecUnorderedListSpan(nestingLevel, attrs, listStyle), AztecListItemSpan(nestingLevel + 1))
-            AztecTextFormat.FORMAT_QUOTE -> return Arrays.asList(AztecQuoteSpan(nestingLevel, attrs, quoteStyle))
+            AztecTextFormat.FORMAT_QUOTE -> return Arrays.asList(createAztecQuoteSpan(nestingLevel, attrs, alignmentApproach, quoteStyle))
             AztecTextFormat.FORMAT_HEADING_1,
             AztecTextFormat.FORMAT_HEADING_2,
             AztecTextFormat.FORMAT_HEADING_3,
@@ -341,7 +342,7 @@ class BlockFormatter(editor: AztecText,
             typeIsAssignableTo(AztecOrderedListSpan::class) -> AztecOrderedListSpan(nestingLevel, attrs, listStyle)
             typeIsAssignableTo(AztecUnorderedListSpan::class) -> AztecUnorderedListSpan(nestingLevel, attrs, listStyle)
             typeIsAssignableTo(AztecListItemSpan::class) -> AztecListItemSpan(nestingLevel, attrs)
-            typeIsAssignableTo(AztecQuoteSpan::class) -> AztecQuoteSpan(nestingLevel, attrs, quoteStyle)
+            typeIsAssignableTo(AztecQuoteSpan::class) -> createAztecQuoteSpan(nestingLevel, attrs, alignmentApproach, quoteStyle)
             typeIsAssignableTo(AztecHeadingSpan::class) -> createHeadingSpan(nestingLevel, textFormat, attrs, alignmentApproach, headerStyle)
             typeIsAssignableTo(AztecPreformatSpan::class) -> createPreformatSpan(nestingLevel, alignmentApproach, attrs, preformatStyle)
             else -> createParagraphSpan(nestingLevel, alignmentApproach, attrs)

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

@@ -33,18 +33,42 @@ import android.text.style.LineHeightSpan
 import android.text.style.QuoteSpan
 import android.text.style.UpdateLayout
 import androidx.collection.ArrayMap
+import org.wordpress.aztec.AlignmentApproach
 import org.wordpress.aztec.AztecAttributes
 import org.wordpress.aztec.formatting.BlockFormatter
 import java.util.Locale
 
-class AztecQuoteSpan(
+fun createAztecQuoteSpan(
+        nestingLevel: Int,
+        attributes: AztecAttributes = AztecAttributes(),
+        alignmentApproach: AlignmentApproach,
+        quoteStyle: BlockFormatter.QuoteStyle = BlockFormatter.QuoteStyle(0, 0, 0f, 0, 0, 0, 0)
+) = when (alignmentApproach) {
+    AlignmentApproach.SPAN_LEVEL -> AztecQuoteSpanAligned(nestingLevel, attributes, quoteStyle, null)
+    AlignmentApproach.VIEW_LEVEL -> AztecQuoteSpan(nestingLevel, attributes, quoteStyle)
+}
+
+/**
+ * We need to have two classes for handling alignment at either the Span-level (AztecQuoteSpanAligned)
+ * or the View-level (AztecQuoteSpan). IAztecAlignment implements AlignmentSpan, which has a
+ * getAlignment method that returns a non-null Layout.Alignment. The Android system checks for
+ * AlignmentSpans and, if present, overrides the view's gravity with their value. Having a class
+ * that does not implement AlignmentSpan allows the view's gravity to control. These classes should
+ * be created using the createAztecQuoteSpan(...) methods.
+ */
+class AztecQuoteSpanAligned(
+        nestingLevel: Int,
+        attributes: AztecAttributes,
+        quoteStyle: BlockFormatter.QuoteStyle,
+        override var align: Layout.Alignment?
+) : AztecQuoteSpan(nestingLevel, attributes, quoteStyle), IAztecAlignmentSpan
+
+open class AztecQuoteSpan(
         override var nestingLevel: Int,
-        override var attributes: AztecAttributes = AztecAttributes(),
-        var quoteStyle: BlockFormatter.QuoteStyle = BlockFormatter.QuoteStyle(0, 0, 0f, 0, 0, 0, 0),
-        override var align: Layout.Alignment? = null
+        override var attributes: AztecAttributes,
+        var quoteStyle: BlockFormatter.QuoteStyle
     ) : QuoteSpan(),
         LineBackgroundSpan,
-        IAztecAlignmentSpan,
         IAztecBlockSpan,
         LineHeightSpan,
         UpdateLayout