refactor(android): look up inline spans by type and reuse applyStyleOnRange

Author: woosanggyu

android/src/main/java/com/swmansion/enriched/textinput/EnrichedTextInputConnectionWrapper.kt

@@ -7,7 +7,6 @@ import android.view.inputmethod.InputConnection
 import android.view.inputmethod.InputConnectionWrapper
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
-import com.swmansion.enriched.common.spans.interfaces.EnrichedInlineSpan
 import com.swmansion.enriched.textinput.events.OnInputKeyPressEvent
 import com.swmansion.enriched.textinput.spans.EnrichedSpans
 
@@ -109,14 +108,8 @@ class EnrichedTextInputConnectionWrapper(
     composingStart: Int,
     composingEnd: Int,
   ): List<InlineSpanSnapshot> =
-    editable
-      .getSpans(composingStart, composingEnd, EnrichedInlineSpan::class.java)
-      .mapNotNull { span ->
-        val style =
-          EnrichedSpans.inlineSpans.entries
-            .firstOrNull { (_, config) -> config.clazz.isInstance(span) }
-            ?.key
-            ?: return@mapNotNull null
+    EnrichedSpans.inlineSpans.flatMap { (style, config) ->
+      editable.getSpans(composingStart, composingEnd, config.clazz).mapNotNull { span ->
         val start = editable.getSpanStart(span).coerceAtLeast(composingStart)
         val end = editable.getSpanEnd(span).coerceAtMost(composingEnd)
 
@@ -126,6 +119,7 @@ class EnrichedTextInputConnectionWrapper(
           null
         }
       }
+    }
 
   private fun restoreInlineSpans(snapshot: ComposingTextSnapshot) {
     val editable = editText.text ?: return
@@ -182,7 +176,7 @@ class EnrichedTextInputConnectionWrapper(
 
     val mappedStart = newRangeStart + intersectionStart - oldRangeStart
     val mappedEnd = newRangeStart + intersectionEnd - oldRangeStart
-    editText.inlineStyles?.restoreStyleOnRange(
+    editText.inlineStyles?.applyStyleOnRange(
       snapshot.style,
       composingStart + mappedStart,
       composingStart + mappedEnd,

android/src/main/java/com/swmansion/enriched/textinput/styles/InlineStyles.kt

@@ -161,24 +161,6 @@ class InlineStyles(
     setAndMergeSpans(spannable, type, start, end)
   }
 
-  fun restoreStyleOnRange(
-    name: String,
-    start: Int,
-    end: Int,
-  ) {
-    if (start >= end) return
-
-    val config = EnrichedSpans.inlineSpans[name] ?: return
-    val spannable = view.text as? Spannable ?: return
-    val spans = spannable.getSpans(start, end, config.clazz)
-
-    if (spans.any { spannable.getSpanStart(it) <= start && spannable.getSpanEnd(it) >= end }) {
-      return
-    }
-
-    setSpan(spannable, config.clazz, start, end)
-  }
-
   fun toggleStyle(name: String) {
     if (view.selection == null) return
     val (start, end) = view.selection.getInlineSelection()