EmojiRange: Replace start & end with IntRange.

vanniktech · May 11, 2022 · bacdb5a · bacdb5a
1 parent e85dfbf
commit bacdb5a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiManager.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiManager.kt
@@ -52,7 +52,7 @@ object EmojiManager {
           val emoji = findEmoji(it.value)
 
           if (emoji != null) {
-            EmojiRange(it.range.first, it.range.last + 1, emoji)
+            EmojiRange(emoji, IntRange(it.range.first, it.range.last + 1))
           } else {
             null
           }
@@ -87,11 +87,11 @@ object EmojiManager {
       }
       val findAllEmojis = findAllEmojis(text)
       for (i in findAllEmojis.indices) {
-        val (start, end, emoji) = findAllEmojis[i]
-        if (!existingSpanPositions.contains(start)) {
+        val (emoji, range) = findAllEmojis[i]
+        if (!existingSpanPositions.contains(range.first)) {
           text.setSpan(
             EmojiSpan(context, emoji, emojiSize),
-            start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            range.first, range.last, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
           )
         }
       }

diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiRange.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiRange.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji
 
 data class EmojiRange(
-  val start: Int,
-  val end: Int,
   val emoji: Emoji,
+  val range: IntRange,
 )
diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/internal/Theming.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/internal/Theming.kt
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:JvmSynthetic
+
 package com.vanniktech.emoji.internal
 
 import android.annotation.SuppressLint

diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/internal/Themings.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/internal/Themings.kt
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:JvmSynthetic
+
 package com.vanniktech.emoji.internal
 
 import android.content.Context

diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/internal/Utils.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/internal/Utils.kt
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:JvmSynthetic
+
 package com.vanniktech.emoji.internal
 
 import android.app.Activity