Added object for pre and quote style values.

Author: khaykov

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

@@ -449,6 +449,8 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                 quoteStyle = BlockFormatter.QuoteStyle(
                         styles.getColor(R.styleable.AztecText_quoteBackground, 0),
                         styles.getColor(R.styleable.AztecText_quoteColor, 0),
+                        styles.getColor(R.styleable.AztecText_quoteTextColor,
+                                ContextCompat.getColor(context, R.color.text)),
                         styles.getFraction(R.styleable.AztecText_quoteBackgroundAlpha, 1, 1, 0f),
                         styles.getDimensionPixelSize(R.styleable.AztecText_quoteMargin, 0),
                         styles.getDimensionPixelSize(R.styleable.AztecText_quotePadding, 0),
@@ -484,7 +486,13 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                         styles.getColor(R.styleable.AztecText_preformatBackground, 0),
                         getPreformatBackgroundAlpha(styles),
                         styles.getColor(R.styleable.AztecText_preformatColor, 0),
-                        verticalParagraphPadding),
+                        verticalParagraphPadding,
+                        styles.getDimensionPixelSize(R.styleable.AztecText_preformatLeadingMargin,
+                                resources.getDimensionPixelSize(R.dimen.preformat_leading_margin)),
+                        styles.getColor(R.styleable.AztecText_preformatBorderColor, 0),
+                        styles.getDimensionPixelSize(R.styleable.AztecText_preformatBorderRadius, 0),
+                        styles.getDimensionPixelSize(R.styleable.AztecText_preformatBorderThickness, 0),
+                ),
                 alignmentRendering = alignmentRendering,
                 exclusiveBlockStyles = BlockFormatter.ExclusiveBlockStyles(styles.getBoolean(R.styleable.AztecText_exclusiveBlocks, false), verticalParagraphPadding),
                 paragraphStyle = BlockFormatter.ParagraphStyle(verticalParagraphMargin)

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

@@ -60,8 +60,8 @@ class BlockFormatter(editor: AztecText,
         }
     }
 
-    data class QuoteStyle(val quoteBackground: Int, val quoteColor: Int, val quoteBackgroundAlpha: Float, val quoteMargin: Int, val quotePadding: Int, val quoteWidth: Int, val verticalPadding: Int)
-    data class PreformatStyle(val preformatBackground: Int, val preformatBackgroundAlpha: Float, val preformatColor: Int, val verticalPadding: Int)
+    data class QuoteStyle(val quoteBackground: Int, val quoteColor: Int, val quoteTextColor: Int, val quoteBackgroundAlpha: Float, val quoteMargin: Int, val quotePadding: Int, val quoteWidth: Int, val verticalPadding: Int)
+    data class PreformatStyle(val preformatBackground: Int, val preformatBackgroundAlpha: Float, val preformatColor: Int, val verticalPadding: Int, val leadingMargin: Int, val preformatBorderColor: Int, val preformatBorderRadius: Int, val preformatBorderThickness: Int )
     data class HeaderStyles(val verticalPadding: Int, val styles: Map<AztecHeadingSpan.Heading, HeadingStyle>) {
         data class HeadingStyle(val fontSize: Int, val fontColor: Int)
     }