refactor(android): enforce non-nullable RichTextStyle and improve error handling

Author: hryhoriiK97

android/src/main/java/com/richtext/RichTextView.kt

@@ -62,7 +62,10 @@ class RichTextView : AppCompatTextView {
     try {
       val document = parser.parseMarkdown(currentMarkdown)
       if (document != null) {
-        renderer.setStyle(richTextStyle)
+        val currentStyle = requireNotNull(richTextStyle) {
+          "richTextStyle should always be provided from JS side with defaults."
+        }
+        renderer.setStyle(currentStyle)
         val styledText = renderer.renderDocument(document, onLinkPressCallback)
         text = styledText
         movementMethod = LinkMovementMethod.getInstance()
@@ -77,7 +80,8 @@ class RichTextView : AppCompatTextView {
   }
 
   fun setRichTextStyle(style: ReadableMap?) {
-    richTextStyle = RichTextStyle(style)
+    // JS always provides defaults via normalizeRichTextStyle, so style should always be present
+    richTextStyle = style?.let { RichTextStyle(it) }
   }
 
 

android/src/main/java/com/richtext/renderer/NodeRenderer.kt

@@ -19,7 +19,7 @@ interface NodeRenderer {
 }
 
 data class RendererConfig(
-    val style: RichTextStyle?
+    val style: RichTextStyle
 )
 
 class DocumentRenderer(
@@ -88,11 +88,11 @@ class HeadingRenderer(
         }
 
         val contentLength = builder.length - start
-        if (contentLength > 0) {
+        if (contentLength > 0 && config != null) {
             builder.setSpan(
                 RichTextHeadingSpan(
                     heading.level,
-                    config?.style
+                    config.style
                 ),
                 start,
                 start + contentLength,

android/src/main/java/com/richtext/renderer/Renderer.kt

@@ -8,13 +8,16 @@ import org.commonmark.node.*
 class Renderer {
     private var style: RichTextStyle? = null
 
-    fun setStyle(style: RichTextStyle?) {
+    fun setStyle(style: RichTextStyle) {
         this.style = style
     }
 
     fun renderDocument(document: Document, onLinkPress: ((String) -> Unit)? = null): SpannableString {
         val builder = SpannableStringBuilder()
-        val config = RendererConfig(style)
+        val currentStyle = requireNotNull(style) {
+            "richTextStyle should always be provided from JS side with defaults."
+        }
+        val config = RendererConfig(currentStyle)
 
         renderNode(document, builder, onLinkPress, config)
 

android/src/main/java/com/richtext/spans/RichTextHeadingSpan.kt

@@ -7,11 +7,11 @@ import com.richtext.styles.RichTextStyle
 
 class RichTextHeadingSpan(
   private val level: Int,
-  private val style: RichTextStyle?
-) : AbsoluteSizeSpan(getFontSize(level, style)) {
+  private val style: RichTextStyle
+) : AbsoluteSizeSpan(style.getHeadingFontSize(level).toInt()) {
 
   private val cachedTypeface: Typeface? by lazy {
-    style?.getHeadingFontFamily(level)?.let { fontFamily ->
+    style.getHeadingFontFamily(level)?.let { fontFamily ->
       Typeface.create(fontFamily, Typeface.NORMAL)
     }
   }
@@ -25,9 +25,4 @@ class RichTextHeadingSpan(
     super.updateMeasureState(tp)
     cachedTypeface?.let { tp.typeface = it }
   }
-
-  companion object {
-    private fun getFontSize(level: Int, style: RichTextStyle?): Int =
-      style?.getHeadingFontSize(level)?.toInt() ?: 32
-  }
 }

android/src/main/java/com/richtext/styles/RichTextStyle.kt

@@ -8,15 +8,16 @@ data class HeadingStyle(
   val fontFamily: String?
 )
 
-class RichTextStyle(style: ReadableMap?) {
-  private val headingStyles = mutableMapOf<Int, HeadingStyle>()
+class RichTextStyle(style: ReadableMap) {
+  private val headingStyles = arrayOfNulls<HeadingStyle>(7)
 
   init {
-    style?.let { parseStyles(it) }
+    parseStyles(style)
   }
 
   fun getHeadingFontSize(level: Int): Float {
-    return headingStyles[level]?.fontSize ?: 32f
+    return headingStyles[level]?.fontSize 
+      ?: error("Heading style for level $level not found. JS should always provide defaults.")
   }
 
   fun getHeadingFontFamily(level: Int): String? {
@@ -27,16 +28,16 @@ class RichTextStyle(style: ReadableMap?) {
     (1..6).forEach { level ->
       val levelKey = "h$level"
       val levelStyle = style.getMap(levelKey)
-      levelStyle?.let { map ->
-        val fontSize = if (map.hasKey("fontSize") && !map.isNull("fontSize")) {
-          PixelUtil.toPixelFromSP(map.getDouble("fontSize").toFloat())
-        } else {
-          32f
-        }
-        val fontFamily = map.getString("fontFamily")
-        
-        headingStyles[level] = HeadingStyle(fontSize, fontFamily)
+      requireNotNull(levelStyle) { "Style for $levelKey not found. JS should always provide defaults." }
+      
+      require(levelStyle.hasKey("fontSize") && !levelStyle.isNull("fontSize")) {
+        "fontSize not found for $levelKey. JS should always provide defaults."
       }
+      
+      val fontSize = PixelUtil.toPixelFromSP(levelStyle.getDouble("fontSize").toFloat())
+      val fontFamily = levelStyle.getString("fontFamily")
+      
+      headingStyles[level] = HeadingStyle(fontSize, fontFamily)
     }
   }
 }