Added support for text size to preformat.

Author: khaykov

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

@@ -491,7 +491,8 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                                 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)
+                        styles.getDimensionPixelSize(R.styleable.AztecText_preformatBorderThickness, 0),
+                        styles.getDimensionPixelSize(R.styleable.AztecText_preformatTextSize, textSize.toInt())
                 ),
                 alignmentRendering = alignmentRendering,
                 exclusiveBlockStyles = BlockFormatter.ExclusiveBlockStyles(styles.getBoolean(R.styleable.AztecText_exclusiveBlocks, false), verticalParagraphPadding),

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

@@ -61,7 +61,7 @@ class BlockFormatter(editor: AztecText,
     }
 
     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 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, val preformatTextSize: Int)
     data class HeaderStyles(val verticalPadding: Int, val styles: Map<AztecHeadingSpan.Heading, HeadingStyle>) {
         data class HeadingStyle(val fontSize: Int, val fontColor: Int)
     }

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

@@ -7,6 +7,8 @@ import android.graphics.Paint
 import android.graphics.Path
 import android.text.Layout
 import android.text.Spanned
+import android.text.TextPaint
+import android.text.style.AbsoluteSizeSpan
 import android.text.style.LeadingMarginSpan
 import android.text.style.LineBackgroundSpan
 import android.text.style.LineHeightSpan
@@ -21,7 +23,7 @@ fun createPreformatSpan(
         nestingLevel: Int,
         alignmentRendering: AlignmentRendering,
         attributes: AztecAttributes = AztecAttributes(),
-        preformatStyle: BlockFormatter.PreformatStyle = BlockFormatter.PreformatStyle(0, 0f, 0, 0, 0, 0, 0, 0)
+        preformatStyle: BlockFormatter.PreformatStyle = BlockFormatter.PreformatStyle(0, 0f, 0, 0, 0, 0, 0, 0, 0)
 ): AztecPreformatSpan =
         when (alignmentRendering) {
             AlignmentRendering.SPAN_LEVEL -> AztecPreformatSpanAligned(nestingLevel, attributes, preformatStyle)
@@ -74,6 +76,16 @@ open class AztecPreformatSpan(
         }
     }
 
+    override fun updateDrawState(ds: TextPaint) {
+        super.updateDrawState(ds)
+        ds.textSize = preformatStyle.preformatTextSize.toFloat()
+    }
+
+    override fun updateMeasureState(paint: TextPaint) {
+        super.updateMeasureState(paint)
+        paint.textSize = preformatStyle.preformatTextSize.toFloat()
+    }
+
     private val strokePaint = Paint().apply {
         isAntiAlias = true
         style = Paint.Style.STROKE

aztec/src/main/res/values/attrs.xml

@@ -31,6 +31,7 @@
         <attr name="preformatBorderRadius" format="reference|dimension" />
         <attr name="preformatBorderThickness" format="reference|dimension" />
         <attr name="preformatLeadingMargin" format="reference|dimension" />
+        <attr name="preformatTextSize" format="reference|dimension" />
         <attr name="quoteBackground" format="reference|color" />
         <attr name="quoteBackgroundAlpha" format="reference|fraction" />
         <attr name="quoteColor" format="reference|color" />

aztec/src/main/res/values/dimens.xml

@@ -46,6 +46,7 @@
     <dimen name="margin_extra_large">16dp</dimen>
 
     <dimen name="preformat_leading_margin">8dp</dimen>
+    <dimen name="preformat_text_size">16sp</dimen>
 
     <dimen name="text_dialog">14sp</dimen>
 

aztec/src/main/res/values/styles.xml

@@ -45,6 +45,7 @@
         <item name="preformatBorderRadius">2dp</item>
         <item name="preformatBorderThickness">1dp</item>
         <item name="preformatLeadingMargin">@dimen/preformat_leading_margin</item>
+        <item name="preformatTextSize">@dimen/preformat_text_size</item>
         <!-- Quote -->
         <item name="quoteBackground">@color/blue_wordpress</item>
         <item name="quoteBackgroundAlpha">75%</item>