@mathers101/react-native-render-rich-text 0.1.10 → 0.1.14

package/android/src/main/java/com/renderrichtext/spans/HeadingSpan.kt

@@ -1,38 +1,38 @@
-package com.renderrichtext.spans
-
-import android.annotation.SuppressLint
-import android.graphics.Typeface
-import android.text.TextPaint
-import android.text.style.MetricAffectingSpan
-import com.renderrichtext.styles.StyleConfig
-
-class HeadingSpan(
-  val level: Int,
-  styleConfig: StyleConfig,
-) : MetricAffectingSpan() {
-  private val fontSize: Float = styleConfig.headingStyles[level]!!.fontSize
-  private val color: Int = styleConfig.headingStyles[level]!!.color
-  private val cachedTypeface: Typeface? = styleConfig.headingTypefaces[level]
-
-  override fun updateDrawState(tp: TextPaint) {
-    applyHeadingStyle(tp)
-    tp.color = color
-  }
-
-  override fun updateMeasureState(tp: TextPaint) {
-    applyHeadingStyle(tp)
-  }
-
-  @SuppressLint("WrongConstant") // Result of mask is always valid: 0, 1, 2, or 3
-  private fun applyHeadingStyle(tp: TextPaint) {
-    tp.textSize = fontSize
-    cachedTypeface?.let { base ->
-      val preserved = (tp.typeface?.style ?: 0) and BOLD_ITALIC_MASK
-      tp.typeface = if (preserved != 0) Typeface.create(base, preserved) else base
-    }
-  }
-
-  companion object {
-    private const val BOLD_ITALIC_MASK = Typeface.BOLD or Typeface.ITALIC
-  }
-}
+package com.renderrichtext.spans
+
+import android.annotation.SuppressLint
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.text.style.MetricAffectingSpan
+import com.renderrichtext.styles.StyleConfig
+
+class HeadingSpan(
+  val level: Int,
+  styleConfig: StyleConfig,
+) : MetricAffectingSpan() {
+  private val fontSize: Float = styleConfig.headingStyles[level]!!.fontSize
+  private val color: Int = styleConfig.headingStyles[level]!!.color
+  private val cachedTypeface: Typeface? = styleConfig.headingTypefaces[level]
+
+  override fun updateDrawState(tp: TextPaint) {
+    applyHeadingStyle(tp)
+    tp.color = color
+  }
+
+  override fun updateMeasureState(tp: TextPaint) {
+    applyHeadingStyle(tp)
+  }
+
+  @SuppressLint("WrongConstant") // Result of mask is always valid: 0, 1, 2, or 3
+  private fun applyHeadingStyle(tp: TextPaint) {
+    tp.textSize = fontSize
+    cachedTypeface?.let { base ->
+      val preserved = (tp.typeface?.style ?: 0) and BOLD_ITALIC_MASK
+      tp.typeface = if (preserved != 0) Typeface.create(base, preserved) else base
+    }
+  }
+
+  companion object {
+    private const val BOLD_ITALIC_MASK = Typeface.BOLD or Typeface.ITALIC
+  }
+}

package/android/src/main/java/com/renderrichtext/spans/HighlightSpan.kt

@@ -1,80 +1,80 @@
-package com.renderrichtext.spans
-
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Paint
-import android.text.Spanned
-import android.text.TextPaint
-import android.text.style.CharacterStyle
-import android.text.style.LineBackgroundSpan
-import com.renderrichtext.renderer.BlockStyle
-import com.renderrichtext.renderer.SpanStyleCache
-import kotlin.math.max
-import kotlin.math.min
-
-/**
- * A plain [CharacterStyle], not a `MetricAffectingSpan`, so nested strong/emphasis spans inside
- * ==highlight== keep their typeface and size. The background is a [LineBackgroundSpan] rather
- * than [TextPaint.bgColor], which fills the whole line box and floats above the text once
- * [LineHeightSpan] pads it out to the configured line height.
- */
-class HighlightSpan(
-  private val styleCache: SpanStyleCache,
-  private val blockStyle: BlockStyle,
-) : CharacterStyle(),
-  LineBackgroundSpan {
-  private val foregroundColor = styleCache.getHighlightColorFor(blockStyle.color)
-  private val backgroundPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL }
-
-  override fun updateDrawState(textPaint: TextPaint) {
-    textPaint.color = foregroundColor
-  }
-
-  override fun drawBackground(
-    canvas: Canvas,
-    p: Paint,
-    left: Int,
-    right: Int,
-    top: Int,
-    baseline: Int,
-    bottom: Int,
-    text: CharSequence,
-    start: Int,
-    end: Int,
-    lineNum: Int,
-  ) {
-    val backgroundColor = styleCache.highlightBackgroundColor
-    if (Color.alpha(backgroundColor) == 0) return
-    if (text !is Spanned) return
-
-    val spanStart = text.getSpanStart(this)
-    val spanEnd = text.getSpanEnd(this)
-    if (spanStart !in 0 until spanEnd) return
-
-    val isFirst = spanStart >= start
-    val isLast = spanEnd <= end
-
-    val leadingMargin = InlineBackgroundGeometry.leadingMarginAt(text, start)
-    val startX =
-      if (isFirst) {
-        InlineBackgroundGeometry.horizontalOffset(text, start, end, spanStart, p, leadingMargin) + left
-      } else {
-        left.toFloat() + leadingMargin
-      }
-    val endX =
-      if (isLast) {
-        InlineBackgroundGeometry.horizontalOffset(text, start, end, spanEnd, p, leadingMargin) + left
-      } else {
-        right.toFloat()
-      }
-
-    // Bound by the glyphs' ascent/descent, clamped to the line box so a tall line height never
-    // lets the band bleed into its neighbours.
-    val metrics = p.fontMetricsInt
-    val bandTop = max(top.toFloat(), (baseline + metrics.ascent).toFloat())
-    val bandBottom = min(bottom.toFloat(), (baseline + metrics.descent).toFloat())
-
-    backgroundPaint.color = backgroundColor
-    canvas.drawRect(min(startX, endX), bandTop, max(startX, endX), bandBottom, backgroundPaint)
-  }
-}
+package com.renderrichtext.spans
+
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.text.Spanned
+import android.text.TextPaint
+import android.text.style.CharacterStyle
+import android.text.style.LineBackgroundSpan
+import com.renderrichtext.renderer.BlockStyle
+import com.renderrichtext.renderer.SpanStyleCache
+import kotlin.math.max
+import kotlin.math.min
+
+/**
+ * A plain [CharacterStyle], not a `MetricAffectingSpan`, so nested strong/emphasis spans inside
+ * ==highlight== keep their typeface and size. The background is a [LineBackgroundSpan] rather
+ * than [TextPaint.bgColor], which fills the whole line box and floats above the text once
+ * [LineHeightSpan] pads it out to the configured line height.
+ */
+class HighlightSpan(
+  private val styleCache: SpanStyleCache,
+  private val blockStyle: BlockStyle,
+) : CharacterStyle(),
+  LineBackgroundSpan {
+  private val foregroundColor = styleCache.getHighlightColorFor(blockStyle.color)
+  private val backgroundPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL }
+
+  override fun updateDrawState(textPaint: TextPaint) {
+    textPaint.color = foregroundColor
+  }
+
+  override fun drawBackground(
+    canvas: Canvas,
+    p: Paint,
+    left: Int,
+    right: Int,
+    top: Int,
+    baseline: Int,
+    bottom: Int,
+    text: CharSequence,
+    start: Int,
+    end: Int,
+    lineNum: Int,
+  ) {
+    val backgroundColor = styleCache.highlightBackgroundColor
+    if (Color.alpha(backgroundColor) == 0) return
+    if (text !is Spanned) return
+
+    val spanStart = text.getSpanStart(this)
+    val spanEnd = text.getSpanEnd(this)
+    if (spanStart !in 0 until spanEnd) return
+
+    val isFirst = spanStart >= start
+    val isLast = spanEnd <= end
+
+    val leadingMargin = InlineBackgroundGeometry.leadingMarginAt(text, start)
+    val startX =
+      if (isFirst) {
+        InlineBackgroundGeometry.horizontalOffset(text, start, end, spanStart, p, leadingMargin) + left
+      } else {
+        left.toFloat() + leadingMargin
+      }
+    val endX =
+      if (isLast) {
+        InlineBackgroundGeometry.horizontalOffset(text, start, end, spanEnd, p, leadingMargin) + left
+      } else {
+        right.toFloat()
+      }
+
+    // Bound by the glyphs' ascent/descent, clamped to the line box so a tall line height never
+    // lets the band bleed into its neighbours.
+    val metrics = p.fontMetricsInt
+    val bandTop = max(top.toFloat(), (baseline + metrics.ascent).toFloat())
+    val bandBottom = min(bottom.toFloat(), (baseline + metrics.descent).toFloat())
+
+    backgroundPaint.color = backgroundColor
+    canvas.drawRect(min(startX, endX), bandTop, max(startX, endX), bandBottom, backgroundPaint)
+  }
+}