Wired text modifier to text and heading sizes.

Author: khaykov

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

@@ -44,6 +44,7 @@ import android.text.TextWatcher
 import android.text.style.SuggestionSpan
 import android.util.AttributeSet
 import android.util.DisplayMetrics
+import android.util.TypedValue
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.MotionEvent
@@ -479,6 +480,8 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                 styles.getBoolean(R.styleable.AztecText_taskListStrikethroughChecked, false),
                 styles.getColor(R.styleable.AztecText_taskListCheckedTextColor, 0))
 
+        val textSizeModifier = styles.getDimensionPixelSize(R.styleable.AztecText_textSizeModifier, 0)
+
         blockFormatter = BlockFormatter(editor = this,
                 listStyle = listStyle,
                 listItemStyle = listItemStyle,
@@ -495,26 +498,32 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                 headerStyle = BlockFormatter.HeaderStyles(verticalHeadingMargin, mapOf(
                         AztecHeadingSpan.Heading.H1 to BlockFormatter.HeaderStyles.HeadingStyle(
                                 styles.getDimensionPixelSize(R.styleable.AztecText_headingOneFontSize, 0),
+                                textSizeModifier,
                                 styles.getColor(R.styleable.AztecText_headingOneFontColor, 0)
                         ),
                         AztecHeadingSpan.Heading.H2 to BlockFormatter.HeaderStyles.HeadingStyle(
                                 styles.getDimensionPixelSize(R.styleable.AztecText_headingTwoFontSize, 0),
+                                textSizeModifier,
                                 styles.getColor(R.styleable.AztecText_headingTwoFontColor, 0)
                         ),
                         AztecHeadingSpan.Heading.H3 to BlockFormatter.HeaderStyles.HeadingStyle(
                                 styles.getDimensionPixelSize(R.styleable.AztecText_headingThreeFontSize, 0),
+                                textSizeModifier,
                                 styles.getColor(R.styleable.AztecText_headingThreeFontColor, 0)
                         ),
                         AztecHeadingSpan.Heading.H4 to BlockFormatter.HeaderStyles.HeadingStyle(
                                 styles.getDimensionPixelSize(R.styleable.AztecText_headingFourFontSize, 0),
+                                textSizeModifier,
                                 styles.getColor(R.styleable.AztecText_headingFourFontColor, 0)
                         ),
                         AztecHeadingSpan.Heading.H5 to BlockFormatter.HeaderStyles.HeadingStyle(
                                 styles.getDimensionPixelSize(R.styleable.AztecText_headingFiveFontSize, 0),
+                                textSizeModifier,
                                 styles.getColor(R.styleable.AztecText_headingFiveFontColor, 0)
                         ),
                         AztecHeadingSpan.Heading.H6 to BlockFormatter.HeaderStyles.HeadingStyle(
                                 styles.getDimensionPixelSize(R.styleable.AztecText_headingSixFontSize, 0),
+                                textSizeModifier,
                                 styles.getColor(R.styleable.AztecText_headingSixFontColor, 0)
                         )
                 )),
@@ -528,7 +537,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                         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_preformatTextSize, textSize.toInt())
+                        styles.getDimensionPixelSize(R.styleable.AztecText_preformatTextSize, textSize.toInt()) + textSizeModifier
                 ),
                 alignmentRendering = alignmentRendering,
                 exclusiveBlockStyles = BlockFormatter.ExclusiveBlockStyles(styles.getBoolean(R.styleable.AztecText_exclusiveBlocks, false), verticalParagraphPadding),
@@ -614,6 +623,12 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
 
         enableTextChangedListener()
 
+        if (textSize + textSizeModifier >= 0) {
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize + textSizeModifier)
+        } else {
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, 0f)
+        }
+
         isViewInitialized = true
     }
 

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

@@ -65,7 +65,7 @@ class BlockFormatter(editor: AztecText,
     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 ListItemStyle(val strikeThroughCheckedItems: Boolean, val checkedItemsTextColor: Int)
     data class HeaderStyles(val verticalPadding: Int, val styles: Map<AztecHeadingSpan.Heading, HeadingStyle>) {
-        data class HeadingStyle(val fontSize: Int, val fontColor: Int)
+        data class HeadingStyle(val fontSize: Int, val fontSizeModifier: Int, val fontColor: Int)
     }
     data class ExclusiveBlockStyles(val enabled: Boolean = false, val verticalParagraphMargin: Int)
     data class ParagraphStyle(val verticalMargin: Int)

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

@@ -165,9 +165,14 @@ open class AztecHeadingSpan(
         when (val headingSize = getHeadingSize()) {
             is HeadingSize.Scale -> {
                 textPaint.textSize *= heading.scale
+                if (textPaint.textSize + getSizeModifier() >= 0) {
+                    textPaint.textSize += getSizeModifier()
+                } else {
+                    textPaint.textSize = 0f
+                }
             }
             is HeadingSize.Size -> {
-                textPaint.textSize = headingSize.value.toFloat()
+                textPaint.textSize = headingSize.value.toFloat() + getSizeModifier()
             }
         }
         textPaint.isFakeBoldText = true
@@ -202,6 +207,10 @@ open class AztecHeadingSpan(
                 ?: HeadingSize.Scale(heading.scale)
     }
 
+    private fun getSizeModifier(): Int {
+        return headerStyle.styles[heading]?.fontSizeModifier ?: 0
+    }
+
     private fun getHeadingColor(): Int? {
         return headerStyle.styles[heading]?.fontColor?.takeIf { it != 0 }
     }