Revert "Add leading margin option to headers."

This reverts commit a9df670

Author: khaykov

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

@@ -467,33 +467,27 @@ 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),
-                                styles.getColor(R.styleable.AztecText_headingOneFontColor, 0),
-                                styles.getDimensionPixelSize(R.styleable.AztecText_headingOneLeadingMargin, 0)
+                                styles.getColor(R.styleable.AztecText_headingOneFontColor, 0)
                         ),
                         AztecHeadingSpan.Heading.H2 to BlockFormatter.HeaderStyles.HeadingStyle(
                                 styles.getDimensionPixelSize(R.styleable.AztecText_headingTwoFontSize, 0),
-                                styles.getColor(R.styleable.AztecText_headingTwoFontColor, 0),
-                                styles.getDimensionPixelSize(R.styleable.AztecText_headingTwoLeadingMargin, 0)
+                                styles.getColor(R.styleable.AztecText_headingTwoFontColor, 0)
                         ),
                         AztecHeadingSpan.Heading.H3 to BlockFormatter.HeaderStyles.HeadingStyle(
                                 styles.getDimensionPixelSize(R.styleable.AztecText_headingThreeFontSize, 0),
-                                styles.getColor(R.styleable.AztecText_headingThreeFontColor, 0),
-                                styles.getDimensionPixelSize(R.styleable.AztecText_headingThreeLeadingMargin, 0)
+                                styles.getColor(R.styleable.AztecText_headingThreeFontColor, 0)
                         ),
                         AztecHeadingSpan.Heading.H4 to BlockFormatter.HeaderStyles.HeadingStyle(
                                 styles.getDimensionPixelSize(R.styleable.AztecText_headingFourFontSize, 0),
-                                styles.getColor(R.styleable.AztecText_headingFourFontColor, 0),
-                                styles.getDimensionPixelSize(R.styleable.AztecText_headingFourLeadingMargin, 0)
+                                styles.getColor(R.styleable.AztecText_headingFourFontColor, 0)
                         ),
                         AztecHeadingSpan.Heading.H5 to BlockFormatter.HeaderStyles.HeadingStyle(
                                 styles.getDimensionPixelSize(R.styleable.AztecText_headingFiveFontSize, 0),
-                                styles.getColor(R.styleable.AztecText_headingFiveFontColor, 0),
-                                styles.getDimensionPixelSize(R.styleable.AztecText_headingFiveLeadingMargin, 0)
+                                styles.getColor(R.styleable.AztecText_headingFiveFontColor, 0)
                         ),
                         AztecHeadingSpan.Heading.H6 to BlockFormatter.HeaderStyles.HeadingStyle(
                                 styles.getDimensionPixelSize(R.styleable.AztecText_headingSixFontSize, 0),
-                                styles.getColor(R.styleable.AztecText_headingSixFontColor, 0),
-                                styles.getDimensionPixelSize(R.styleable.AztecText_headingSixLeadingMargin, 0)
+                                styles.getColor(R.styleable.AztecText_headingSixFontColor, 0)
                         )
                 )),
                 preformatStyle = BlockFormatter.PreformatStyle(

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

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

@@ -1,11 +1,9 @@
 package org.wordpress.aztec.spans
 
-import android.graphics.Canvas
 import android.graphics.Paint
 import android.text.Layout
 import android.text.Spanned
 import android.text.TextPaint
-import android.text.style.LeadingMarginSpan
 import android.text.style.LineHeightSpan
 import android.text.style.MetricAffectingSpan
 import android.text.style.UpdateLayout
@@ -66,7 +64,7 @@ open class AztecHeadingSpan(
         textFormat: ITextFormat,
         override var attributes: AztecAttributes,
         open var headerStyle: BlockFormatter.HeaderStyles
-) : MetricAffectingSpan(), IAztecLineBlockSpan, LineHeightSpan, LeadingMarginSpan, UpdateLayout {
+) : MetricAffectingSpan(), IAztecLineBlockSpan, LineHeightSpan, UpdateLayout {
     override val TAG: String
         get() = heading.tag
 
@@ -186,7 +184,6 @@ open class AztecHeadingSpan(
         }
         previousHeadingSize = headingSize
         previousSpacing = paint.fontSpacing
-        paint.fontFeatureSettings
         when (headingSize) {
             is HeadingSize.Scale -> {
                 paint.textSize *= heading.scale
@@ -200,13 +197,6 @@ open class AztecHeadingSpan(
         }
     }
 
-    override fun getLeadingMargin(first: Boolean): Int {
-        return headerStyle.styles[heading]?.leadingMargin?.takeIf { it != 0 } ?: 0
-    }
-
-    override fun drawLeadingMargin(c: Canvas?, p: Paint?, x: Int, dir: Int, top: Int, baseline: Int, bottom: Int,
-                                   text: CharSequence?, start: Int, end: Int, first: Boolean, layout: Layout?) = Unit
-
     private fun getHeadingSize(): HeadingSize {
         return headerStyle.styles[heading]?.fontSize?.takeIf { it > 0 }?.let { HeadingSize.Size(it) }
                 ?: HeadingSize.Scale(heading.scale)

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

@@ -45,17 +45,11 @@
         <attr name="textColorHint" format="reference|color" />
         <attr name="exclusiveBlocks" format="reference|boolean" />
         <attr name="headingOneFontSize" format="reference|dimension" />
-        <attr name="headingOneLeadingMargin" format="reference|dimension" />
         <attr name="headingTwoFontSize" format="reference|dimension" />
-        <attr name="headingTwoLeadingMargin" format="reference|dimension" />
         <attr name="headingThreeFontSize" format="reference|dimension" />
-        <attr name="headingThreeLeadingMargin" format="reference|dimension" />
         <attr name="headingFourFontSize" format="reference|dimension" />
-        <attr name="headingFourLeadingMargin" format="reference|dimension" />
         <attr name="headingFiveFontSize" format="reference|dimension" />
-        <attr name="headingFiveLeadingMargin" format="reference|dimension" />
         <attr name="headingSixFontSize" format="reference|dimension" />
-        <attr name="headingSixLeadingMargin" format="reference|dimension" />
         <attr name="headingOneFontColor" format="reference|color" />
         <attr name="headingTwoFontColor" format="reference|color" />
         <attr name="headingThreeFontColor" format="reference|color" />