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

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

@@ -1,12 +1,12 @@
-package com.renderrichtext.spans
-
-import android.text.TextPaint
-import android.text.style.CharacterStyle
-
-class StrikethroughSpan(
-  private val strikethroughColor: Int,
-) : CharacterStyle() {
-  override fun updateDrawState(tp: TextPaint) {
-    tp.isStrikeThruText = true
-  }
-}
+package com.renderrichtext.spans
+
+import android.text.TextPaint
+import android.text.style.CharacterStyle
+
+class StrikethroughSpan(
+  private val strikethroughColor: Int,
+) : CharacterStyle() {
+  override fun updateDrawState(tp: TextPaint) {
+    tp.isStrikeThruText = true
+  }
+}

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

@@ -1,39 +1,39 @@
-package com.renderrichtext.spans
-
-import android.graphics.Typeface
-import android.text.TextPaint
-import android.text.style.MetricAffectingSpan
-import com.renderrichtext.renderer.BlockStyle
-import com.renderrichtext.renderer.SpanStyleCache
-import com.renderrichtext.utils.text.extensions.applyColorPreserving
-
-class StrongSpan(
-  private val styleCache: SpanStyleCache,
-  private val blockStyle: BlockStyle,
-) : MetricAffectingSpan() {
-  private val strongColor = styleCache.getStrongColorFor(blockStyle.color)
-
-  override fun updateDrawState(tp: TextPaint) {
-    applyStrongStyle(tp)
-    tp.applyColorPreserving(strongColor, *styleCache.colorsToPreserve)
-  }
-
-  override fun updateMeasureState(tp: TextPaint) {
-    applyStrongStyle(tp)
-  }
-
-  private fun applyStrongStyle(tp: TextPaint) {
-    tp.textSize = blockStyle.fontSize
-
-    val currentTypeface = tp.typeface ?: Typeface.DEFAULT
-    val isItalic = (currentTypeface.style) and Typeface.ITALIC != 0
-    val style = if (isItalic) Typeface.BOLD_ITALIC else Typeface.BOLD
-    tp.typeface =
-      if (styleCache.strongFontFamily.isNotEmpty()) {
-        val resolvedStyle = if (styleCache.strongFontWeight == "normal") Typeface.NORMAL else style
-        styleCache.getTypeface(styleCache.strongFontFamily, resolvedStyle)
-      } else {
-        Typeface.create(currentTypeface, style)
-      }
-  }
-}
+package com.renderrichtext.spans
+
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.text.style.MetricAffectingSpan
+import com.renderrichtext.renderer.BlockStyle
+import com.renderrichtext.renderer.SpanStyleCache
+import com.renderrichtext.utils.text.extensions.applyColorPreserving
+
+class StrongSpan(
+  private val styleCache: SpanStyleCache,
+  private val blockStyle: BlockStyle,
+) : MetricAffectingSpan() {
+  private val strongColor = styleCache.getStrongColorFor(blockStyle.color)
+
+  override fun updateDrawState(tp: TextPaint) {
+    applyStrongStyle(tp)
+    tp.applyColorPreserving(strongColor, *styleCache.colorsToPreserve)
+  }
+
+  override fun updateMeasureState(tp: TextPaint) {
+    applyStrongStyle(tp)
+  }
+
+  private fun applyStrongStyle(tp: TextPaint) {
+    tp.textSize = blockStyle.fontSize
+
+    val currentTypeface = tp.typeface ?: Typeface.DEFAULT
+    val isItalic = (currentTypeface.style) and Typeface.ITALIC != 0
+    val style = if (isItalic) Typeface.BOLD_ITALIC else Typeface.BOLD
+    tp.typeface =
+      if (styleCache.strongFontFamily.isNotEmpty()) {
+        val resolvedStyle = if (styleCache.strongFontWeight == "normal") Typeface.NORMAL else style
+        styleCache.getTypeface(styleCache.strongFontFamily, resolvedStyle)
+      } else {
+        Typeface.create(currentTypeface, style)
+      }
+  }
+}

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

@@ -1,143 +1,143 @@
-package com.renderrichtext.spans
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Path
-import android.graphics.RectF
-import android.text.Layout
-import com.renderrichtext.renderer.BlockStyle
-import com.renderrichtext.renderer.SpanStyleCache
-import com.renderrichtext.styles.ListStyle
-import com.renderrichtext.styles.TaskListStyle
-
-class TaskListSpan(
-  private val taskStyle: TaskListStyle,
-  private val listStyle: ListStyle,
-  depth: Int,
-  context: Context,
-  styleCache: SpanStyleCache,
-  val taskIndex: Int,
-  val isChecked: Boolean,
-  drawsMarker: Boolean = true,
-  ancestorMarkerOffset: Float = 0f,
-  override val markerExtraWidth: Float = 0f,
-  parentMarkerWidth: Float? = null,
-) : BaseListSpan(
-    depth = depth,
-    context = context,
-    styleCache = styleCache,
-    blockStyle =
-      BlockStyle(
-        fontSize = listStyle.fontSize,
-        fontFamily = listStyle.fontFamily,
-        fontWeight = listStyle.fontWeight,
-        color = listStyle.color,
-      ),
-    marginLeft = listStyle.marginLeft,
-    gapWidth = listStyle.gapWidth,
-    drawsMarker = drawsMarker,
-    ancestorMarkerOffset = ancestorMarkerOffset,
-    parentMarkerWidth = parentMarkerWidth,
-  ) {
-  private val checkboxSize = taskStyle.checkboxSize
-  private val checkboxColumnWidth = listStyle.effectiveMarkerWidth(checkboxSize)
-  private val markerColumnWidth = checkboxColumnWidth + markerExtraWidth
-  private val cornerRadius = taskStyle.checkboxBorderRadius
-  private val rect = RectF()
-  private val checkPath = Path()
-
-  companion object {
-    private const val CAP_HEIGHT_RATIO = 0.72f
-    private const val HALF_DIVISOR = 2f
-    private const val CHECKMARK_MIN_STROKE_WIDTH = 1.5f
-    private const val CHECKMARK_STROKE_RATIO = 0.12f
-    private const val CHECKMARK_INSET_RATIO = 0.22f
-    private const val CHECKMARK_MID_OFFSET_RATIO = 0.05f
-    private const val BORDER_MIN_STROKE_WIDTH = 1f
-    private const val BORDER_STROKE_RATIO = 0.09f
-  }
-
-  private val boxPaint =
-    Paint(Paint.ANTI_ALIAS_FLAG).apply {
-      strokeCap = Paint.Cap.ROUND
-      strokeJoin = Paint.Join.ROUND
-    }
-
-  override fun getMarkerWidth(): Float = markerColumnWidth
-
-  override val baselineMarkerWidth: Float get() = checkboxColumnWidth
-
-  override fun drawMarker(
-    canvas: Canvas,
-    paint: Paint,
-    x: Int,
-    dir: Int,
-    top: Int,
-    baseline: Int,
-    bottom: Int,
-    layout: Layout?,
-    start: Int,
-  ) {
-    val capHeight = -markerFontMetrics.ascent * CAP_HEIGHT_RATIO
-    val centerY = baseline - capHeight / HALF_DIVISOR
-    // Right-align the checkbox inside the reserved marker column so it hugs
-    // the gap before the text. At the default (markerColumnWidth ==
-    // checkboxSize) this is identical to the previous flush-left layout.
-    val centerX = x + (depth * marginLeft + ancestorMarkerOffset + markerColumnWidth - checkboxSize / HALF_DIVISOR) * dir
-    val half = checkboxSize / HALF_DIVISOR
-    rect.set(centerX - half, centerY - half, centerX + half, centerY + half)
-
-    if (isChecked) {
-      drawChecked(canvas, centerY)
-    } else {
-      drawUnchecked(canvas)
-    }
-  }
-
-  private fun drawChecked(
-    canvas: Canvas,
-    centerY: Float,
-  ) {
-    boxPaint.apply {
-      style = Paint.Style.FILL
-      color = taskStyle.checkedColor
-    }
-    canvas.drawRoundRect(rect, cornerRadius, cornerRadius, boxPaint)
-
-    boxPaint.apply {
-      style = Paint.Style.STROKE
-      color = taskStyle.checkmarkColor
-      strokeWidth = maxOf(CHECKMARK_MIN_STROKE_WIDTH, checkboxSize * CHECKMARK_STROKE_RATIO)
-    }
-
-    val inset = checkboxSize * CHECKMARK_INSET_RATIO
-    val midOffset = checkboxSize * CHECKMARK_MID_OFFSET_RATIO
-
-    checkPath.run {
-      reset()
-      moveTo(rect.left + inset, centerY)
-      lineTo(rect.centerX() - midOffset, rect.bottom - inset)
-      lineTo(rect.right - inset, rect.top + inset)
-    }
-    canvas.drawPath(checkPath, boxPaint)
-  }
-
-  private fun drawUnchecked(canvas: Canvas) {
-    boxPaint.apply {
-      style = Paint.Style.STROKE
-      color = taskStyle.borderColor
-      strokeWidth = maxOf(BORDER_MIN_STROKE_WIDTH, checkboxSize * BORDER_STROKE_RATIO)
-    }
-
-    val halfStroke = boxPaint.strokeWidth / 2f
-    val insetRect =
-      RectF(
-        rect.left + halfStroke,
-        rect.top + halfStroke,
-        rect.right - halfStroke,
-        rect.bottom - halfStroke,
-      )
-    canvas.drawRoundRect(insetRect, cornerRadius, cornerRadius, boxPaint)
-  }
-}
+package com.renderrichtext.spans
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.RectF
+import android.text.Layout
+import com.renderrichtext.renderer.BlockStyle
+import com.renderrichtext.renderer.SpanStyleCache
+import com.renderrichtext.styles.ListStyle
+import com.renderrichtext.styles.TaskListStyle
+
+class TaskListSpan(
+  private val taskStyle: TaskListStyle,
+  private val listStyle: ListStyle,
+  depth: Int,
+  context: Context,
+  styleCache: SpanStyleCache,
+  val taskIndex: Int,
+  val isChecked: Boolean,
+  drawsMarker: Boolean = true,
+  ancestorMarkerOffset: Float = 0f,
+  override val markerExtraWidth: Float = 0f,
+  parentMarkerWidth: Float? = null,
+) : BaseListSpan(
+    depth = depth,
+    context = context,
+    styleCache = styleCache,
+    blockStyle =
+      BlockStyle(
+        fontSize = listStyle.fontSize,
+        fontFamily = listStyle.fontFamily,
+        fontWeight = listStyle.fontWeight,
+        color = listStyle.color,
+      ),
+    marginLeft = listStyle.marginLeft,
+    gapWidth = listStyle.gapWidth,
+    drawsMarker = drawsMarker,
+    ancestorMarkerOffset = ancestorMarkerOffset,
+    parentMarkerWidth = parentMarkerWidth,
+  ) {
+  private val checkboxSize = taskStyle.checkboxSize
+  private val checkboxColumnWidth = listStyle.effectiveMarkerWidth(checkboxSize)
+  private val markerColumnWidth = checkboxColumnWidth + markerExtraWidth
+  private val cornerRadius = taskStyle.checkboxBorderRadius
+  private val rect = RectF()
+  private val checkPath = Path()
+
+  companion object {
+    private const val CAP_HEIGHT_RATIO = 0.72f
+    private const val HALF_DIVISOR = 2f
+    private const val CHECKMARK_MIN_STROKE_WIDTH = 1.5f
+    private const val CHECKMARK_STROKE_RATIO = 0.12f
+    private const val CHECKMARK_INSET_RATIO = 0.22f
+    private const val CHECKMARK_MID_OFFSET_RATIO = 0.05f
+    private const val BORDER_MIN_STROKE_WIDTH = 1f
+    private const val BORDER_STROKE_RATIO = 0.09f
+  }
+
+  private val boxPaint =
+    Paint(Paint.ANTI_ALIAS_FLAG).apply {
+      strokeCap = Paint.Cap.ROUND
+      strokeJoin = Paint.Join.ROUND
+    }
+
+  override fun getMarkerWidth(): Float = markerColumnWidth
+
+  override val baselineMarkerWidth: Float get() = checkboxColumnWidth
+
+  override fun drawMarker(
+    canvas: Canvas,
+    paint: Paint,
+    x: Int,
+    dir: Int,
+    top: Int,
+    baseline: Int,
+    bottom: Int,
+    layout: Layout?,
+    start: Int,
+  ) {
+    val capHeight = -markerFontMetrics.ascent * CAP_HEIGHT_RATIO
+    val centerY = baseline - capHeight / HALF_DIVISOR
+    // Right-align the checkbox inside the reserved marker column so it hugs
+    // the gap before the text. At the default (markerColumnWidth ==
+    // checkboxSize) this is identical to the previous flush-left layout.
+    val centerX = x + (depth * marginLeft + ancestorMarkerOffset + markerColumnWidth - checkboxSize / HALF_DIVISOR) * dir
+    val half = checkboxSize / HALF_DIVISOR
+    rect.set(centerX - half, centerY - half, centerX + half, centerY + half)
+
+    if (isChecked) {
+      drawChecked(canvas, centerY)
+    } else {
+      drawUnchecked(canvas)
+    }
+  }
+
+  private fun drawChecked(
+    canvas: Canvas,
+    centerY: Float,
+  ) {
+    boxPaint.apply {
+      style = Paint.Style.FILL
+      color = taskStyle.checkedColor
+    }
+    canvas.drawRoundRect(rect, cornerRadius, cornerRadius, boxPaint)
+
+    boxPaint.apply {
+      style = Paint.Style.STROKE
+      color = taskStyle.checkmarkColor
+      strokeWidth = maxOf(CHECKMARK_MIN_STROKE_WIDTH, checkboxSize * CHECKMARK_STROKE_RATIO)
+    }
+
+    val inset = checkboxSize * CHECKMARK_INSET_RATIO
+    val midOffset = checkboxSize * CHECKMARK_MID_OFFSET_RATIO
+
+    checkPath.run {
+      reset()
+      moveTo(rect.left + inset, centerY)
+      lineTo(rect.centerX() - midOffset, rect.bottom - inset)
+      lineTo(rect.right - inset, rect.top + inset)
+    }
+    canvas.drawPath(checkPath, boxPaint)
+  }
+
+  private fun drawUnchecked(canvas: Canvas) {
+    boxPaint.apply {
+      style = Paint.Style.STROKE
+      color = taskStyle.borderColor
+      strokeWidth = maxOf(BORDER_MIN_STROKE_WIDTH, checkboxSize * BORDER_STROKE_RATIO)
+    }
+
+    val halfStroke = boxPaint.strokeWidth / 2f
+    val insetRect =
+      RectF(
+        rect.left + halfStroke,
+        rect.top + halfStroke,
+        rect.right - halfStroke,
+        rect.bottom - halfStroke,
+      )
+    canvas.drawRoundRect(insetRect, cornerRadius, cornerRadius, boxPaint)
+  }
+}

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

@@ -1,26 +1,26 @@
-package com.renderrichtext.spans
-
-import android.content.Context
-import android.text.TextPaint
-import android.text.style.MetricAffectingSpan
-import com.renderrichtext.renderer.BlockStyle
-import com.renderrichtext.utils.text.extensions.applyBlockStyleFont
-
-class TextSpan(
-  private val blockStyle: BlockStyle,
-  private val context: Context,
-) : MetricAffectingSpan() {
-  override fun updateDrawState(tp: TextPaint) {
-    applyBlockStyle(tp)
-  }
-
-  override fun updateMeasureState(tp: TextPaint) {
-    applyBlockStyle(tp)
-  }
-
-  private fun applyBlockStyle(tp: TextPaint) {
-    tp.textSize = blockStyle.fontSize
-    tp.color = blockStyle.color
-    tp.applyBlockStyleFont(blockStyle, context)
-  }
-}
+package com.renderrichtext.spans
+
+import android.content.Context
+import android.text.TextPaint
+import android.text.style.MetricAffectingSpan
+import com.renderrichtext.renderer.BlockStyle
+import com.renderrichtext.utils.text.extensions.applyBlockStyleFont
+
+class TextSpan(
+  private val blockStyle: BlockStyle,
+  private val context: Context,
+) : MetricAffectingSpan() {
+  override fun updateDrawState(tp: TextPaint) {
+    applyBlockStyle(tp)
+  }
+
+  override fun updateMeasureState(tp: TextPaint) {
+    applyBlockStyle(tp)
+  }
+
+  private fun applyBlockStyle(tp: TextPaint) {
+    tp.textSize = blockStyle.fontSize
+    tp.color = blockStyle.color
+    tp.applyBlockStyleFont(blockStyle, context)
+  }
+}

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

@@ -1,69 +1,69 @@
-package com.renderrichtext.spans
-
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.text.style.ReplacementSpan
-
-class ThematicBreakSpan(
-  private val lineColor: Int,
-  private val lineHeight: Float,
-  private val marginTop: Float,
-  private val marginBottom: Float,
-) : ReplacementSpan() {
-  override fun getSize(
-    paint: Paint,
-    text: CharSequence?,
-    start: Int,
-    end: Int,
-    fm: Paint.FontMetricsInt?,
-  ): Int {
-    val totalHeight = (marginTop + lineHeight + marginBottom).toInt()
-
-    fm?.apply {
-      ascent = -totalHeight
-      top = -totalHeight
-      descent = 0
-      bottom = 0
-    }
-
-    return 0
-  }
-
-  override fun draw(
-    canvas: Canvas,
-    text: CharSequence?,
-    start: Int,
-    end: Int,
-    x: Float,
-    top: Int,
-    y: Int,
-    bottom: Int,
-    paint: Paint,
-  ) {
-    paint.withStyle(lineColor, lineHeight) {
-      val lineY = top + marginTop + (lineHeight / 2f)
-
-      canvas.drawLine(0f, lineY, canvas.width.toFloat(), lineY, paint)
-    }
-  }
-
-  private inline fun Paint.withStyle(
-    color: Int,
-    width: Float,
-    action: () -> Unit,
-  ) {
-    val oldColor = this.color
-    val oldWidth = this.strokeWidth
-    val oldStyle = this.style
-
-    this.color = color
-    this.strokeWidth = width
-    this.style = Paint.Style.STROKE
-
-    action()
-
-    this.color = oldColor
-    this.strokeWidth = oldWidth
-    this.style = oldStyle
-  }
-}
+package com.renderrichtext.spans
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.text.style.ReplacementSpan
+
+class ThematicBreakSpan(
+  private val lineColor: Int,
+  private val lineHeight: Float,
+  private val marginTop: Float,
+  private val marginBottom: Float,
+) : ReplacementSpan() {
+  override fun getSize(
+    paint: Paint,
+    text: CharSequence?,
+    start: Int,
+    end: Int,
+    fm: Paint.FontMetricsInt?,
+  ): Int {
+    val totalHeight = (marginTop + lineHeight + marginBottom).toInt()
+
+    fm?.apply {
+      ascent = -totalHeight
+      top = -totalHeight
+      descent = 0
+      bottom = 0
+    }
+
+    return 0
+  }
+
+  override fun draw(
+    canvas: Canvas,
+    text: CharSequence?,
+    start: Int,
+    end: Int,
+    x: Float,
+    top: Int,
+    y: Int,
+    bottom: Int,
+    paint: Paint,
+  ) {
+    paint.withStyle(lineColor, lineHeight) {
+      val lineY = top + marginTop + (lineHeight / 2f)
+
+      canvas.drawLine(0f, lineY, canvas.width.toFloat(), lineY, paint)
+    }
+  }
+
+  private inline fun Paint.withStyle(
+    color: Int,
+    width: Float,
+    action: () -> Unit,
+  ) {
+    val oldColor = this.color
+    val oldWidth = this.strokeWidth
+    val oldStyle = this.style
+
+    this.color = color
+    this.strokeWidth = width
+    this.style = Paint.Style.STROKE
+
+    action()
+
+    this.color = oldColor
+    this.strokeWidth = oldWidth
+    this.style = oldStyle
+  }
+}