react-native-enriched 0.3.0 → 0.4.1

package/android/src/main/java/com/swmansion/enriched/common/spans/EnrichedCheckboxListSpan.kt

@@ -0,0 +1,91 @@
+package com.swmansion.enriched.common.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 androidx.core.graphics.withTranslation
+import com.swmansion.enriched.common.CheckboxDrawable
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedParagraphSpan
+import com.swmansion.enriched.textinput.styles.HtmlStyle
+
+open class EnrichedCheckboxListSpan(
+  open var isChecked: Boolean,
+  private val enrichedStyle: EnrichedStyle,
+) : MetricAffectingSpan(),
+  LineHeightSpan,
+  LeadingMarginSpan,
+  EnrichedParagraphSpan {
+  private val checkboxDrawable =
+    CheckboxDrawable(enrichedStyle.ulCheckboxBoxSize, enrichedStyle.ulCheckboxBoxColor, isChecked).apply {
+      setBounds(0, 0, enrichedStyle.ulCheckboxBoxSize, enrichedStyle.ulCheckboxBoxSize)
+    }
+
+  override fun updateMeasureState(tp: TextPaint) {
+    // Do nothing, but inform layout that this span affects text metrics
+  }
+
+  override fun updateDrawState(tp: TextPaint) {
+    // Do nothing, but inform layout that this span affects text metrics
+  }
+
+  // Include checkbox size in text measurements to avoid clipping
+  override fun chooseHeight(
+    text: CharSequence,
+    start: Int,
+    end: Int,
+    spanstartv: Int,
+    v: Int,
+    fm: Paint.FontMetricsInt,
+  ) {
+    val checkboxSize = enrichedStyle.ulCheckboxBoxSize
+    val currentLineHeight = fm.descent - fm.ascent
+
+    if (checkboxSize > currentLineHeight) {
+      val extraSpace = checkboxSize - currentLineHeight
+      val halfExtra = extraSpace / 2
+
+      fm.ascent -= halfExtra
+      fm.descent += (extraSpace - halfExtra)
+
+      fm.top -= halfExtra
+      fm.bottom += (extraSpace - halfExtra)
+    }
+  }
+
+  override fun getLeadingMargin(first: Boolean): Int =
+    enrichedStyle.ulCheckboxBoxSize + enrichedStyle.ulCheckboxMarginLeft + enrichedStyle.ulCheckboxGapWidth
+
+  override fun drawLeadingMargin(
+    canvas: Canvas,
+    paint: Paint,
+    x: Int,
+    dir: Int,
+    top: Int,
+    baseline: Int,
+    bottom: Int,
+    text: CharSequence,
+    start: Int,
+    end: Int,
+    first: Boolean,
+    layout: Layout?,
+  ) {
+    val spannedText = text as Spanned
+
+    if (spannedText.getSpanStart(this) == start) {
+      checkboxDrawable.update(isChecked)
+
+      val lineCenter = (top + bottom) / 2f
+      val drawableTop = lineCenter - (enrichedStyle.ulCheckboxBoxSize / 2f)
+
+      canvas.withTranslation(x.toFloat() + enrichedStyle.ulCheckboxMarginLeft, drawableTop) {
+        checkboxDrawable.draw(this)
+      }
+    }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/{spans → common/spans}/EnrichedCodeBlockSpan.kt

@@ -1,4 +1,4 @@
-package com.swmansion.enriched.spans
+package com.swmansion.enriched.common.spans
 
 import android.graphics.Canvas
 import android.graphics.Paint
@@ -9,19 +9,17 @@ import android.text.Spanned
 import android.text.TextPaint
 import android.text.style.LineBackgroundSpan
 import android.text.style.MetricAffectingSpan
-import com.swmansion.enriched.spans.interfaces.EnrichedBlockSpan
-import com.swmansion.enriched.styles.HtmlStyle
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedBlockSpan
 
-class EnrichedCodeBlockSpan(
-  private val htmlStyle: HtmlStyle,
+open class EnrichedCodeBlockSpan(
+  private val enrichedStyle: EnrichedStyle,
 ) : MetricAffectingSpan(),
   LineBackgroundSpan,
   EnrichedBlockSpan {
-  override val dependsOnHtmlStyle: Boolean = true
-
   override fun updateDrawState(paint: TextPaint) {
     paint.typeface = Typeface.MONOSPACE
-    paint.color = htmlStyle.codeBlockColor
+    paint.color = enrichedStyle.codeBlockColor
   }
 
   override fun updateMeasureState(paint: TextPaint) {
@@ -46,9 +44,9 @@ class EnrichedCodeBlockSpan(
     }
 
     val previousColor = p.color
-    p.color = htmlStyle.codeBlockBackgroundColor
+    p.color = enrichedStyle.codeBlockBackgroundColor
 
-    val radius = htmlStyle.codeBlockRadius
+    val radius = enrichedStyle.codeBlockRadius
 
     val spanStart = text.getSpanStart(this)
     val spanEnd = text.getSpanEnd(this)
@@ -80,6 +78,4 @@ class EnrichedCodeBlockSpan(
     canvas.drawPath(path, p)
     p.color = previousColor
   }
-
-  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedCodeBlockSpan = EnrichedCodeBlockSpan(htmlStyle)
 }

package/android/src/main/java/com/swmansion/enriched/common/spans/EnrichedH1Span.kt

@@ -0,0 +1,20 @@
+package com.swmansion.enriched.common.spans
+
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.text.style.AbsoluteSizeSpan
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedHeadingSpan
+
+open class EnrichedH1Span(
+  private val enrichedStyle: EnrichedStyle,
+) : AbsoluteSizeSpan(enrichedStyle.h1FontSize),
+  EnrichedHeadingSpan {
+  override fun updateDrawState(tp: TextPaint) {
+    super.updateDrawState(tp)
+    val bold = enrichedStyle.h1Bold
+    if (bold) {
+      tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
+    }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/common/spans/EnrichedH2Span.kt

@@ -0,0 +1,20 @@
+package com.swmansion.enriched.common.spans
+
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.text.style.AbsoluteSizeSpan
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedHeadingSpan
+
+open class EnrichedH2Span(
+  private val enrichedStyle: EnrichedStyle,
+) : AbsoluteSizeSpan(enrichedStyle.h2FontSize),
+  EnrichedHeadingSpan {
+  override fun updateDrawState(tp: TextPaint) {
+    super.updateDrawState(tp)
+    val bold = enrichedStyle.h2Bold
+    if (bold) {
+      tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
+    }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/common/spans/EnrichedH3Span.kt

@@ -0,0 +1,20 @@
+package com.swmansion.enriched.common.spans
+
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.text.style.AbsoluteSizeSpan
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedHeadingSpan
+
+open class EnrichedH3Span(
+  private val enrichedStyle: EnrichedStyle,
+) : AbsoluteSizeSpan(enrichedStyle.h3FontSize),
+  EnrichedHeadingSpan {
+  override fun updateDrawState(tp: TextPaint) {
+    super.updateDrawState(tp)
+    val bold = enrichedStyle.h3Bold
+    if (bold) {
+      tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
+    }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/common/spans/EnrichedH4Span.kt

@@ -0,0 +1,21 @@
+package com.swmansion.enriched.common.spans
+
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.text.style.AbsoluteSizeSpan
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedHeadingSpan
+import com.swmansion.enriched.textinput.styles.HtmlStyle
+
+open class EnrichedH4Span(
+  private val enrichedStyle: EnrichedStyle,
+) : AbsoluteSizeSpan(enrichedStyle.h4FontSize),
+  EnrichedHeadingSpan {
+  override fun updateDrawState(tp: TextPaint) {
+    super.updateDrawState(tp)
+    val bold = enrichedStyle.h4Bold
+    if (bold) {
+      tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
+    }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/common/spans/EnrichedH5Span.kt

@@ -0,0 +1,20 @@
+package com.swmansion.enriched.common.spans
+
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.text.style.AbsoluteSizeSpan
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedHeadingSpan
+
+open class EnrichedH5Span(
+  private val enrichedStyle: EnrichedStyle,
+) : AbsoluteSizeSpan(enrichedStyle.h5FontSize),
+  EnrichedHeadingSpan {
+  override fun updateDrawState(tp: TextPaint) {
+    super.updateDrawState(tp)
+    val bold = enrichedStyle.h5Bold
+    if (bold) {
+      tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
+    }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/common/spans/EnrichedH6Span.kt

@@ -0,0 +1,20 @@
+package com.swmansion.enriched.common.spans
+
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.text.style.AbsoluteSizeSpan
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedHeadingSpan
+
+open class EnrichedH6Span(
+  private val enrichedStyle: EnrichedStyle,
+) : AbsoluteSizeSpan(enrichedStyle.h6FontSize),
+  EnrichedHeadingSpan {
+  override fun updateDrawState(tp: TextPaint) {
+    super.updateDrawState(tp)
+    val bold = enrichedStyle.h6Bold
+    if (bold) {
+      tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
+    }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/{spans → common/spans}/EnrichedImageSpan.kt

@@ -1,31 +1,29 @@
-package com.swmansion.enriched.spans
+package com.swmansion.enriched.common.spans
 
-import android.annotation.SuppressLint
 import android.content.res.Resources
 import android.graphics.BitmapFactory
 import android.graphics.Canvas
+import android.graphics.ImageDecoder
 import android.graphics.Paint
-import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.AnimatedImageDrawable
 import android.graphics.drawable.Drawable
+import android.os.Build
 import android.text.Editable
 import android.text.Spannable
 import android.text.style.ImageSpan
 import android.util.Log
-import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.graphics.drawable.toDrawable
 import androidx.core.graphics.withSave
 import com.swmansion.enriched.R
-import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
-import com.swmansion.enriched.spans.utils.ForceRedrawSpan
-import com.swmansion.enriched.styles.HtmlStyle
-import com.swmansion.enriched.utils.AsyncDrawable
-import com.swmansion.enriched.utils.ResourceManager
+import com.swmansion.enriched.common.AsyncDrawable
+import com.swmansion.enriched.common.ForceRedrawSpan
+import com.swmansion.enriched.common.ResourceManager
+import com.swmansion.enriched.common.spans.interfaces.EnrichedInlineSpan
+import java.io.File
 
-class EnrichedImageSpan :
+open class EnrichedImageSpan :
   ImageSpan,
   EnrichedInlineSpan {
-  override val dependsOnHtmlStyle: Boolean = false
-
   private var width: Int = 0
   private var height: Int = 0
 
@@ -130,24 +128,12 @@ class EnrichedImageSpan :
 
   fun getHeight(): Int = height
 
-  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedImageSpan = this
-
   companion object {
-    fun createEnrichedImageSpan(
+    fun prepareDrawableForImage(
       src: String,
       width: Int,
       height: Int,
-    ): EnrichedImageSpan {
-      var imgDrawable = prepareDrawableForImage(src)
-
-      if (imgDrawable == null) {
-        imgDrawable = ResourceManager.getDrawableResource(R.drawable.broken_image)
-      }
-
-      return EnrichedImageSpan(imgDrawable, src, width, height)
-    }
-
-    private fun prepareDrawableForImage(src: String): Drawable? {
+    ): Drawable? {
       var cleanPath = src
 
       if (cleanPath.startsWith("http://") || cleanPath.startsWith("https://")) {
@@ -158,22 +144,41 @@ class EnrichedImageSpan :
         cleanPath = cleanPath.substring(7)
       }
 
-      var drawable: BitmapDrawable? = null
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+        return try {
+          val bitmap = BitmapFactory.decodeFile(cleanPath) ?: return null
+          val drawable = bitmap.toDrawable(Resources.getSystem())
+          drawable.setBounds(0, 0, bitmap.width, bitmap.height)
+          return drawable
+        } catch (e: Exception) {
+          Log.e("EnrichedImageSpan", "Failed to load legacy image: $cleanPath", e)
+          null
+        }
+      }
+
+      return try {
+        val file = File(cleanPath)
+        val source = ImageDecoder.createSource(file)
 
-      try {
-        val bitmap = BitmapFactory.decodeFile(cleanPath)
-        if (bitmap != null) {
-          drawable = bitmap.toDrawable(Resources.getSystem())
-          // set bounds so it knows how big it is naturally,
-          // though EnrichedImageSpan will override this with the HTML width/height later.
-          drawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight())
+        val density = Resources.getSystem().displayMetrics.density
+        val targetWidthPx = (width * density).toInt()
+        val targetHeightPx = (height * density).toInt()
+
+        val drawable =
+          ImageDecoder.decodeDrawable(source) { decoder, info, source ->
+            decoder.setTargetSize(targetWidthPx, targetHeightPx)
+          }
+
+        if (drawable is AnimatedImageDrawable) {
+          drawable.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
+          drawable.repeatCount = AnimatedImageDrawable.REPEAT_INFINITE
+          drawable.start()
         }
+        drawable
       } catch (e: Exception) {
-        // Failed to load file
-        Log.e("EnrichedImageSpan", "Failed to load image from path: $cleanPath", e)
+        Log.e("EnrichedImageSpan", "Failed to load image: $cleanPath", e)
+        null
       }
-
-      return drawable
     }
   }
 }

package/android/src/main/java/com/swmansion/enriched/{spans → common/spans}/EnrichedInlineCodeSpan.kt

@@ -1,28 +1,24 @@
-package com.swmansion.enriched.spans
+package com.swmansion.enriched.common.spans
 
 import android.graphics.Typeface
 import android.text.TextPaint
 import android.text.style.MetricAffectingSpan
-import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
-import com.swmansion.enriched.styles.HtmlStyle
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedInlineSpan
 
-class EnrichedInlineCodeSpan(
-  private val htmlStyle: HtmlStyle,
+open class EnrichedInlineCodeSpan(
+  private val enrichedStyle: EnrichedStyle,
 ) : MetricAffectingSpan(),
   EnrichedInlineSpan {
-  override val dependsOnHtmlStyle: Boolean = true
-
   override fun updateDrawState(textPaint: TextPaint) {
     val typeface = Typeface.create(Typeface.MONOSPACE, Typeface.NORMAL)
     textPaint.typeface = typeface
-    textPaint.color = htmlStyle.inlineCodeColor
-    textPaint.bgColor = htmlStyle.inlineCodeBackgroundColor
+    textPaint.color = enrichedStyle.inlineCodeColor
+    textPaint.bgColor = enrichedStyle.inlineCodeBackgroundColor
   }
 
   override fun updateMeasureState(textPaint: TextPaint) {
     val typeface = Typeface.create(Typeface.MONOSPACE, Typeface.NORMAL)
     textPaint.typeface = typeface
   }
-
-  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedInlineCodeSpan = EnrichedInlineCodeSpan(htmlStyle)
 }

package/android/src/main/java/com/swmansion/enriched/common/spans/EnrichedItalicSpan.kt

@@ -0,0 +1,12 @@
+package com.swmansion.enriched.common.spans
+
+import android.graphics.Typeface
+import android.text.style.StyleSpan
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedInlineSpan
+
+@Suppress("UNUSED_PARAMETER")
+open class EnrichedItalicSpan(
+  private val enrichedStyle: EnrichedStyle,
+) : StyleSpan(Typeface.ITALIC),
+  EnrichedInlineSpan

package/android/src/main/java/com/swmansion/enriched/{spans → common/spans}/EnrichedLinkSpan.kt

@@ -1,18 +1,16 @@
-package com.swmansion.enriched.spans
+package com.swmansion.enriched.common.spans
 
 import android.text.TextPaint
 import android.text.style.ClickableSpan
 import android.view.View
-import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
-import com.swmansion.enriched.styles.HtmlStyle
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedInlineSpan
 
-class EnrichedLinkSpan(
+open class EnrichedLinkSpan(
   private val url: String,
-  private val htmlStyle: HtmlStyle,
+  private val enrichedStyle: EnrichedStyle,
 ) : ClickableSpan(),
   EnrichedInlineSpan {
-  override val dependsOnHtmlStyle: Boolean = true
-
   override fun onClick(view: View) {
     // Do nothing, links inside the input are not clickable.
     // We are using `ClickableSpan` to allow the text to be styled as a link.
@@ -20,11 +18,9 @@ class EnrichedLinkSpan(
 
   override fun updateDrawState(textPaint: TextPaint) {
     super.updateDrawState(textPaint)
-    textPaint.color = htmlStyle.aColor
-    textPaint.isUnderlineText = htmlStyle.aUnderline
+    textPaint.color = enrichedStyle.aColor
+    textPaint.isUnderlineText = enrichedStyle.aUnderline
   }
 
   fun getUrl(): String = url
-
-  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedLinkSpan = EnrichedLinkSpan(url, htmlStyle)
 }

package/android/src/main/java/com/swmansion/enriched/{spans → common/spans}/EnrichedMentionSpan.kt

@@ -1,20 +1,18 @@
-package com.swmansion.enriched.spans
+package com.swmansion.enriched.common.spans
 
 import android.text.TextPaint
 import android.text.style.ClickableSpan
 import android.view.View
-import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
-import com.swmansion.enriched.styles.HtmlStyle
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedInlineSpan
 
-class EnrichedMentionSpan(
+open class EnrichedMentionSpan(
   private val text: String,
   private val indicator: String,
   private val attributes: Map<String, String>,
-  private val htmlStyle: HtmlStyle,
+  private val enrichedStyle: EnrichedStyle,
 ) : ClickableSpan(),
   EnrichedInlineSpan {
-  override val dependsOnHtmlStyle: Boolean = true
-
   override fun onClick(view: View) {
     // Do nothing. Mentions inside the input are not clickable.
     // We are using `ClickableSpan` to allow the text to be styled as a clickable element.
@@ -23,7 +21,7 @@ class EnrichedMentionSpan(
   override fun updateDrawState(textPaint: TextPaint) {
     super.updateDrawState(textPaint)
 
-    val mentionsStyle = htmlStyle.mentionsStyle[indicator] ?: return
+    val mentionsStyle = enrichedStyle.mentionsStyle[indicator] ?: return
     textPaint.color = mentionsStyle.color
     textPaint.bgColor = mentionsStyle.backgroundColor
     textPaint.isUnderlineText = mentionsStyle.underline
@@ -34,6 +32,4 @@ class EnrichedMentionSpan(
   fun getText(): String = text
 
   fun getIndicator(): String = indicator
-
-  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedMentionSpan = EnrichedMentionSpan(text, indicator, attributes, htmlStyle)
 }

package/android/src/main/java/com/swmansion/enriched/{spans → common/spans}/EnrichedOrderedListSpan.kt

@@ -1,23 +1,22 @@
-package com.swmansion.enriched.spans
+package com.swmansion.enriched.common.spans
 
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Typeface
+import android.os.Build
 import android.text.Layout
 import android.text.TextPaint
 import android.text.style.LeadingMarginSpan
 import android.text.style.MetricAffectingSpan
-import com.swmansion.enriched.spans.interfaces.EnrichedParagraphSpan
-import com.swmansion.enriched.styles.HtmlStyle
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedParagraphSpan
 
-class EnrichedOrderedListSpan(
-  private var index: Int,
-  private val htmlStyle: HtmlStyle,
+open class EnrichedOrderedListSpan(
+  var index: Int,
+  private val enrichedStyle: EnrichedStyle,
 ) : MetricAffectingSpan(),
   LeadingMarginSpan,
   EnrichedParagraphSpan {
-  override val dependsOnHtmlStyle: Boolean = true
-
   override fun updateMeasureState(p0: TextPaint) {
     // Do nothing, but inform layout that this span affects text metrics
   }
@@ -26,7 +25,7 @@ class EnrichedOrderedListSpan(
     // Do nothing, but inform layout that this span affects text metrics
   }
 
-  override fun getLeadingMargin(first: Boolean): Int = htmlStyle.olMarginLeft + htmlStyle.olGapWidth
+  override fun getLeadingMargin(first: Boolean): Int = enrichedStyle.olMarginLeft + enrichedStyle.olGapWidth
 
   override fun drawLeadingMargin(
     canvas: Canvas,
@@ -47,13 +46,13 @@ class EnrichedOrderedListSpan(
       val width = paint.measureText(text)
 
       val yPosition = baseline.toFloat()
-      val xPosition = (htmlStyle.olMarginLeft + x - width / 2) * dir
+      val xPosition = (enrichedStyle.olMarginLeft + x - width / 2) * dir
 
       val originalColor = paint.color
       val originalTypeface = paint.typeface
 
-      paint.color = htmlStyle.olMarkerColor ?: originalColor
-      paint.typeface = getTypeface(htmlStyle.olMarkerFontWeight, originalTypeface)
+      paint.color = enrichedStyle.olMarkerColor ?: originalColor
+      paint.typeface = getTypeface(enrichedStyle.olMarkerFontWeight, originalTypeface)
       canvas.drawText(text, xPosition, yPosition, paint)
 
       paint.color = originalColor
@@ -67,7 +66,7 @@ class EnrichedOrderedListSpan(
   ): Typeface =
     if (fontWeight == null) {
       originalTypeface
-    } else if (android.os.Build.VERSION.SDK_INT >= 28) {
+    } else if (Build.VERSION.SDK_INT >= 28) {
       Typeface.create(originalTypeface, fontWeight, false)
     } else {
       // Fallback for API < 28: only bold/normal supported
@@ -77,12 +76,4 @@ class EnrichedOrderedListSpan(
         Typeface.create(originalTypeface, Typeface.NORMAL)
       }
     }
-
-  fun getIndex(): Int = index
-
-  fun setIndex(i: Int) {
-    index = i
-  }
-
-  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedOrderedListSpan = EnrichedOrderedListSpan(index, htmlStyle)
 }

package/android/src/main/java/com/swmansion/enriched/common/spans/EnrichedStrikeThroughSpan.kt

@@ -0,0 +1,11 @@
+package com.swmansion.enriched.common.spans
+
+import android.text.style.StrikethroughSpan
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedInlineSpan
+
+@Suppress("UNUSED_PARAMETER")
+open class EnrichedStrikeThroughSpan(
+  private val enrichedStyle: EnrichedStyle,
+) : StrikethroughSpan(),
+  EnrichedInlineSpan

package/android/src/main/java/com/swmansion/enriched/common/spans/EnrichedUnderlineSpan.kt

@@ -0,0 +1,11 @@
+package com.swmansion.enriched.common.spans
+
+import android.text.style.UnderlineSpan
+import com.swmansion.enriched.common.EnrichedStyle
+import com.swmansion.enriched.common.spans.interfaces.EnrichedInlineSpan
+
+@Suppress("UNUSED_PARAMETER")
+open class EnrichedUnderlineSpan(
+  private val enrichedStyle: EnrichedStyle,
+) : UnderlineSpan(),
+  EnrichedInlineSpan