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

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

@@ -1,96 +1,96 @@
-package com.renderrichtext.spans
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.text.Layout
-import com.renderrichtext.renderer.BlockStyle
-import com.renderrichtext.renderer.SpanStyleCache
-import com.renderrichtext.styles.ListStyle
-
-class UnorderedListSpan(
-  private val listStyle: ListStyle,
-  depth: Int,
-  context: Context,
-  styleCache: SpanStyleCache,
-  drawsMarker: Boolean = true,
-  ancestorMarkerOffset: 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,
-  ) {
-  companion object {
-    private val sharedBulletPaint =
-      Paint(Paint.ANTI_ALIAS_FLAG).apply {
-        style = Paint.Style.FILL
-      }
-  }
-
-  private val radius: Float = listStyle.bulletSize / 2f
-  private val ringStrokeWidth: Float = radius * 0.3f
-  // Same column an ordered list reserves for `99.`, so both lists indent equally.
-  private val markerColumnWidth: Float = OrderedListSpan.defaultMarkerColumnWidth(listStyle, context)
-
-  private fun configureBulletPaint(): Paint =
-    sharedBulletPaint.apply {
-      color = listStyle.bulletColor
-      style = Paint.Style.FILL
-      strokeWidth = 0f
-    }
-
-  override fun getMarkerWidth(): Float = markerColumnWidth
-
-  override fun drawMarker(
-    canvas: Canvas,
-    paint: Paint,
-    x: Int,
-    dir: Int,
-    top: Int,
-    baseline: Int,
-    bottom: Int,
-    layout: Layout?,
-    start: Int,
-  ) {
-    val bulletPaint = configureBulletPaint()
-    // Right-align the bullet in the same column as a number, so its right edge
-    // meets the gap instead of sitting halfway into it.
-    val bulletX = x + (depth * marginLeft + ancestorMarkerOffset + markerColumnWidth - radius) * dir
-    val bulletY = baseline + (markerFontMetrics.ascent + markerFontMetrics.descent) / 2f
-
-    when (depth) {
-      0 -> {
-        canvas.drawCircle(bulletX, bulletY, radius, bulletPaint)
-      }
-
-      1 -> {
-        bulletPaint.style = Paint.Style.STROKE
-        bulletPaint.strokeWidth = ringStrokeWidth
-        canvas.drawCircle(bulletX, bulletY, radius - ringStrokeWidth / 2f, bulletPaint)
-      }
-
-      else -> {
-        canvas.drawRect(
-          bulletX - radius,
-          bulletY - radius,
-          bulletX + radius,
-          bulletY + radius,
-          bulletPaint,
-        )
-      }
-    }
-  }
-}
+package com.renderrichtext.spans
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.text.Layout
+import com.renderrichtext.renderer.BlockStyle
+import com.renderrichtext.renderer.SpanStyleCache
+import com.renderrichtext.styles.ListStyle
+
+class UnorderedListSpan(
+  private val listStyle: ListStyle,
+  depth: Int,
+  context: Context,
+  styleCache: SpanStyleCache,
+  drawsMarker: Boolean = true,
+  ancestorMarkerOffset: 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,
+  ) {
+  companion object {
+    private val sharedBulletPaint =
+      Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.FILL
+      }
+  }
+
+  private val radius: Float = listStyle.bulletSize / 2f
+  private val ringStrokeWidth: Float = radius * 0.3f
+  // Same column an ordered list reserves for `99.`, so both lists indent equally.
+  private val markerColumnWidth: Float = OrderedListSpan.defaultMarkerColumnWidth(listStyle, context)
+
+  private fun configureBulletPaint(): Paint =
+    sharedBulletPaint.apply {
+      color = listStyle.bulletColor
+      style = Paint.Style.FILL
+      strokeWidth = 0f
+    }
+
+  override fun getMarkerWidth(): Float = markerColumnWidth
+
+  override fun drawMarker(
+    canvas: Canvas,
+    paint: Paint,
+    x: Int,
+    dir: Int,
+    top: Int,
+    baseline: Int,
+    bottom: Int,
+    layout: Layout?,
+    start: Int,
+  ) {
+    val bulletPaint = configureBulletPaint()
+    // Right-align the bullet in the same column as a number, so its right edge
+    // meets the gap instead of sitting halfway into it.
+    val bulletX = x + (depth * marginLeft + ancestorMarkerOffset + markerColumnWidth - radius) * dir
+    val bulletY = baseline + (markerFontMetrics.ascent + markerFontMetrics.descent) / 2f
+
+    when (depth) {
+      0 -> {
+        canvas.drawCircle(bulletX, bulletY, radius, bulletPaint)
+      }
+
+      1 -> {
+        bulletPaint.style = Paint.Style.STROKE
+        bulletPaint.strokeWidth = ringStrokeWidth
+        canvas.drawCircle(bulletX, bulletY, radius - ringStrokeWidth / 2f, bulletPaint)
+      }
+
+      else -> {
+        canvas.drawRect(
+          bulletX - radius,
+          bulletY - radius,
+          bulletX + radius,
+          bulletY + radius,
+          bulletPaint,
+        )
+      }
+    }
+  }
+}

package/android/src/main/java/com/renderrichtext/spoiler/SpoilerStubs.kt

@@ -1,46 +1,46 @@
-package com.renderrichtext.spoiler
-
-import android.graphics.Canvas
-import android.text.Spanned
-import android.view.View
-import com.renderrichtext.spans.SpoilerSpan
-
-enum class SpoilerOverlay {
-  NONE,
-  PARTICLES,
-  ;
-
-  companion object {
-    fun fromString(value: String?): SpoilerOverlay = NONE
-  }
-}
-
-class SpoilerOverlayDrawer {
-  fun draw(canvas: Canvas) {}
-
-  fun stop() {}
-
-  fun revealSpan(
-    span: SpoilerSpan,
-    onDone: () -> Unit,
-  ) {
-  }
-
-  companion object {
-    fun setupIfNeeded(
-      view: View,
-      text: CharSequence?,
-      current: SpoilerOverlayDrawer?,
-      overlay: SpoilerOverlay,
-    ): SpoilerOverlayDrawer? = null
-  }
-}
-
-interface SpoilerCapable {
-  val spoilerOverlayDrawer: SpoilerOverlayDrawer?
-}
-
-fun Spanned.isConcealedBySpoiler(
-  start: Int,
-  end: Int,
-): Boolean = false
+package com.renderrichtext.spoiler
+
+import android.graphics.Canvas
+import android.text.Spanned
+import android.view.View
+import com.renderrichtext.spans.SpoilerSpan
+
+enum class SpoilerOverlay {
+  NONE,
+  PARTICLES,
+  ;
+
+  companion object {
+    fun fromString(value: String?): SpoilerOverlay = NONE
+  }
+}
+
+class SpoilerOverlayDrawer {
+  fun draw(canvas: Canvas) {}
+
+  fun stop() {}
+
+  fun revealSpan(
+    span: SpoilerSpan,
+    onDone: () -> Unit,
+  ) {
+  }
+
+  companion object {
+    fun setupIfNeeded(
+      view: View,
+      text: CharSequence?,
+      current: SpoilerOverlayDrawer?,
+      overlay: SpoilerOverlay,
+    ): SpoilerOverlayDrawer? = null
+  }
+}
+
+interface SpoilerCapable {
+  val spoilerOverlayDrawer: SpoilerOverlayDrawer?
+}
+
+fun Spanned.isConcealedBySpoiler(
+  start: Int,
+  end: Int,
+): Boolean = false

package/android/src/main/java/com/renderrichtext/styles/BaseBlockStyle.kt

@@ -1,11 +1,11 @@
-package com.renderrichtext.styles
-
-interface BaseBlockStyle {
-  val fontSize: Float
-  val fontFamily: String
-  val fontWeight: String
-  val color: Int
-  val marginTop: Float
-  val marginBottom: Float
-  val lineHeight: Float
-}
+package com.renderrichtext.styles
+
+interface BaseBlockStyle {
+  val fontSize: Float
+  val fontFamily: String
+  val fontWeight: String
+  val color: Int
+  val marginTop: Float
+  val marginBottom: Float
+  val lineHeight: Float
+}

package/android/src/main/java/com/renderrichtext/styles/BlockquoteStyle.kt

@@ -1,83 +1,83 @@
-package com.renderrichtext.styles
-
-import com.facebook.react.bridge.ReadableMap
-
-/** Per-admonition-type colors. [color] tints border/title/icon; [backgroundColor] null = transparent. */
-data class AdmonitionColors(
-  val color: Int,
-  val backgroundColor: Int?,
-)
-
-data class BlockquoteStyle(
-  override val fontSize: Float,
-  override val fontFamily: String,
-  override val fontWeight: String,
-  override val color: Int,
-  override val marginTop: Float,
-  override val marginBottom: Float,
-  override val lineHeight: Float,
-  val borderColor: Int,
-  val borderWidth: Float,
-  val gapWidth: Float,
-  val backgroundColor: Int?,
-  val borderRadius: Float,
-  val padding: Float,
-  val admonitions: Map<String, AdmonitionColors>,
-) : BaseBlockStyle {
-  companion object {
-    private fun parseAdmonitions(
-      map: ReadableMap,
-      parser: StyleParser,
-    ): Map<String, AdmonitionColors> {
-      val admonitionsMap = map.getMap("admonitions") ?: return emptyMap()
-      val result = mutableMapOf<String, AdmonitionColors>()
-      for (type in listOf("note", "tip", "important", "warning", "caution")) {
-        val typeMap = admonitionsMap.getMap(type) ?: continue
-        result[type] =
-          AdmonitionColors(
-            parser.parseColor(typeMap, "color"),
-            parser.parseOptionalColor(typeMap, "backgroundColor"),
-          )
-      }
-      return result
-    }
-
-    fun fromReadableMap(
-      map: ReadableMap,
-      parser: StyleParser,
-    ): BlockquoteStyle {
-      val fontSize = parser.toPixelFromSP(map.getDouble("fontSize").toFloat())
-      val fontFamily = parser.parseString(map, "fontFamily")
-      val fontWeight = parser.parseString(map, "fontWeight", "normal")
-      val color = parser.parseColor(map, "color")
-      val marginTop = parser.toPixelFromDIP(map.getDouble("marginTop").toFloat())
-      val marginBottom = parser.toPixelFromDIP(map.getDouble("marginBottom").toFloat())
-      val lineHeightRaw = map.getDouble("lineHeight").toFloat()
-      val lineHeight = parser.toPixelFromSP(lineHeightRaw)
-      val borderColor = parser.parseColor(map, "borderColor")
-      val borderWidth = parser.toPixelFromDIP(map.getDouble("borderWidth").toFloat())
-      val gapWidth = parser.toPixelFromDIP(map.getDouble("gapWidth").toFloat())
-      val backgroundColor = parser.parseOptionalColor(map, "backgroundColor")
-      val borderRadius = parser.toPixelFromDIP(map.getDouble("borderRadius").toFloat())
-      val padding = parser.toPixelFromDIP(map.getDouble("padding").toFloat())
-      val admonitions = parseAdmonitions(map, parser)
-
-      return BlockquoteStyle(
-        fontSize,
-        fontFamily,
-        fontWeight,
-        color,
-        marginTop,
-        marginBottom,
-        lineHeight,
-        borderColor,
-        borderWidth,
-        gapWidth,
-        backgroundColor,
-        borderRadius,
-        padding,
-        admonitions,
-      )
-    }
-  }
-}
+package com.renderrichtext.styles
+
+import com.facebook.react.bridge.ReadableMap
+
+/** Per-admonition-type colors. [color] tints border/title/icon; [backgroundColor] null = transparent. */
+data class AdmonitionColors(
+  val color: Int,
+  val backgroundColor: Int?,
+)
+
+data class BlockquoteStyle(
+  override val fontSize: Float,
+  override val fontFamily: String,
+  override val fontWeight: String,
+  override val color: Int,
+  override val marginTop: Float,
+  override val marginBottom: Float,
+  override val lineHeight: Float,
+  val borderColor: Int,
+  val borderWidth: Float,
+  val gapWidth: Float,
+  val backgroundColor: Int?,
+  val borderRadius: Float,
+  val padding: Float,
+  val admonitions: Map<String, AdmonitionColors>,
+) : BaseBlockStyle {
+  companion object {
+    private fun parseAdmonitions(
+      map: ReadableMap,
+      parser: StyleParser,
+    ): Map<String, AdmonitionColors> {
+      val admonitionsMap = map.getMap("admonitions") ?: return emptyMap()
+      val result = mutableMapOf<String, AdmonitionColors>()
+      for (type in listOf("note", "tip", "important", "warning", "caution")) {
+        val typeMap = admonitionsMap.getMap(type) ?: continue
+        result[type] =
+          AdmonitionColors(
+            parser.parseColor(typeMap, "color"),
+            parser.parseOptionalColor(typeMap, "backgroundColor"),
+          )
+      }
+      return result
+    }
+
+    fun fromReadableMap(
+      map: ReadableMap,
+      parser: StyleParser,
+    ): BlockquoteStyle {
+      val fontSize = parser.toPixelFromSP(map.getDouble("fontSize").toFloat())
+      val fontFamily = parser.parseString(map, "fontFamily")
+      val fontWeight = parser.parseString(map, "fontWeight", "normal")
+      val color = parser.parseColor(map, "color")
+      val marginTop = parser.toPixelFromDIP(map.getDouble("marginTop").toFloat())
+      val marginBottom = parser.toPixelFromDIP(map.getDouble("marginBottom").toFloat())
+      val lineHeightRaw = map.getDouble("lineHeight").toFloat()
+      val lineHeight = parser.toPixelFromSP(lineHeightRaw)
+      val borderColor = parser.parseColor(map, "borderColor")
+      val borderWidth = parser.toPixelFromDIP(map.getDouble("borderWidth").toFloat())
+      val gapWidth = parser.toPixelFromDIP(map.getDouble("gapWidth").toFloat())
+      val backgroundColor = parser.parseOptionalColor(map, "backgroundColor")
+      val borderRadius = parser.toPixelFromDIP(map.getDouble("borderRadius").toFloat())
+      val padding = parser.toPixelFromDIP(map.getDouble("padding").toFloat())
+      val admonitions = parseAdmonitions(map, parser)
+
+      return BlockquoteStyle(
+        fontSize,
+        fontFamily,
+        fontWeight,
+        color,
+        marginTop,
+        marginBottom,
+        lineHeight,
+        borderColor,
+        borderWidth,
+        gapWidth,
+        backgroundColor,
+        borderRadius,
+        padding,
+        admonitions,
+      )
+    }
+  }
+}

package/android/src/main/java/com/renderrichtext/styles/CodeBlockStyle.kt

@@ -1,80 +1,80 @@
-package com.renderrichtext.styles
-
-import com.facebook.react.bridge.ReadableMap
-
-data class CodeBlockStyle(
-  override val fontSize: Float,
-  override val fontFamily: String,
-  override val fontWeight: String,
-  override val color: Int,
-  override val marginTop: Float,
-  override val marginBottom: Float,
-  override val lineHeight: Float,
-  val backgroundColor: Int,
-  val borderColor: Int,
-  val borderRadius: Float,
-  val borderWidth: Float,
-  val padding: Float,
-  val syntaxColors: List<Int>,
-) : BaseBlockStyle {
-  companion object {
-    private val SYNTAX_COLOR_KEYS =
-      listOf(
-        "keyword",
-        "operatorColor",
-        "punctuation",
-        "string",
-        "number",
-        "constant",
-        "comment",
-        "function",
-        "type",
-        "variable",
-        "property",
-        "tag",
-        "attribute",
-        "embedded",
-      )
-
-    fun fromReadableMap(
-      map: ReadableMap,
-      parser: StyleParser,
-    ): CodeBlockStyle {
-      val fontSize = parser.toPixelFromSP(map.getDouble("fontSize").toFloat())
-      val fontFamily = parser.parseString(map, "fontFamily")
-      val fontWeight = parser.parseString(map, "fontWeight", "normal")
-      val color = parser.parseColor(map, "color")
-      val marginTop = parser.toPixelFromDIP(map.getDouble("marginTop").toFloat())
-      val marginBottom = parser.toPixelFromDIP(map.getDouble("marginBottom").toFloat())
-      val lineHeightRaw = map.getDouble("lineHeight").toFloat()
-      val lineHeight = parser.toPixelFromSP(lineHeightRaw)
-      val backgroundColor = parser.parseColor(map, "backgroundColor")
-      val borderColor = parser.parseColor(map, "borderColor")
-      val borderRadius = parser.toPixelFromDIP(map.getDouble("borderRadius").toFloat())
-      val borderWidth = parser.toPixelFromDIP(map.getDouble("borderWidth").toFloat())
-      val padding = parser.toPixelFromDIP(map.getDouble("padding").toFloat())
-
-      val syntaxMap = map.getMap("syntaxColors")
-      val syntaxColors =
-        SYNTAX_COLOR_KEYS.map { key ->
-          syntaxMap?.let { parser.parseOptionalColor(it, key) } ?: color
-        }
-
-      return CodeBlockStyle(
-        fontSize,
-        fontFamily,
-        fontWeight,
-        color,
-        marginTop,
-        marginBottom,
-        lineHeight,
-        backgroundColor,
-        borderColor,
-        borderRadius,
-        borderWidth,
-        padding,
-        syntaxColors,
-      )
-    }
-  }
-}
+package com.renderrichtext.styles
+
+import com.facebook.react.bridge.ReadableMap
+
+data class CodeBlockStyle(
+  override val fontSize: Float,
+  override val fontFamily: String,
+  override val fontWeight: String,
+  override val color: Int,
+  override val marginTop: Float,
+  override val marginBottom: Float,
+  override val lineHeight: Float,
+  val backgroundColor: Int,
+  val borderColor: Int,
+  val borderRadius: Float,
+  val borderWidth: Float,
+  val padding: Float,
+  val syntaxColors: List<Int>,
+) : BaseBlockStyle {
+  companion object {
+    private val SYNTAX_COLOR_KEYS =
+      listOf(
+        "keyword",
+        "operatorColor",
+        "punctuation",
+        "string",
+        "number",
+        "constant",
+        "comment",
+        "function",
+        "type",
+        "variable",
+        "property",
+        "tag",
+        "attribute",
+        "embedded",
+      )
+
+    fun fromReadableMap(
+      map: ReadableMap,
+      parser: StyleParser,
+    ): CodeBlockStyle {
+      val fontSize = parser.toPixelFromSP(map.getDouble("fontSize").toFloat())
+      val fontFamily = parser.parseString(map, "fontFamily")
+      val fontWeight = parser.parseString(map, "fontWeight", "normal")
+      val color = parser.parseColor(map, "color")
+      val marginTop = parser.toPixelFromDIP(map.getDouble("marginTop").toFloat())
+      val marginBottom = parser.toPixelFromDIP(map.getDouble("marginBottom").toFloat())
+      val lineHeightRaw = map.getDouble("lineHeight").toFloat()
+      val lineHeight = parser.toPixelFromSP(lineHeightRaw)
+      val backgroundColor = parser.parseColor(map, "backgroundColor")
+      val borderColor = parser.parseColor(map, "borderColor")
+      val borderRadius = parser.toPixelFromDIP(map.getDouble("borderRadius").toFloat())
+      val borderWidth = parser.toPixelFromDIP(map.getDouble("borderWidth").toFloat())
+      val padding = parser.toPixelFromDIP(map.getDouble("padding").toFloat())
+
+      val syntaxMap = map.getMap("syntaxColors")
+      val syntaxColors =
+        SYNTAX_COLOR_KEYS.map { key ->
+          syntaxMap?.let { parser.parseOptionalColor(it, key) } ?: color
+        }
+
+      return CodeBlockStyle(
+        fontSize,
+        fontFamily,
+        fontWeight,
+        color,
+        marginTop,
+        marginBottom,
+        lineHeight,
+        backgroundColor,
+        borderColor,
+        borderRadius,
+        borderWidth,
+        padding,
+        syntaxColors,
+      )
+    }
+  }
+}