Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EmojiRange: Replace start & end with IntRange. #779

Merged
merged 1 commit into from
May 11, 2022
Merged

EmojiRange: Replace start & end with IntRange. #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions emoji-ios/src/test/kotlin/com/vanniktech/emoji/ios/EmojiUtilsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,12 @@ class EmojiUtilsTest {
assertEquals(true, emojiInformation.isOnlyEmojis)
assertEquals(2, emojiInformation.emojis.size)

assertEquals(0, emojiInformation.emojis[0].start)
assertEquals(5, emojiInformation.emojis[0].end)
assertEquals(mage1, text.substring(emojiInformation.emojis[0].start, emojiInformation.emojis[0].end))
assertEquals(0..5, emojiInformation.emojis[0].range)
assertEquals(mage1, text.substring(emojiInformation.emojis[0].range.first, emojiInformation.emojis[0].range.last))
assertEquals(mage1, emojiInformation.emojis[0].emoji.unicode)

assertEquals(5, emojiInformation.emojis[1].start)
assertEquals(12, emojiInformation.emojis[1].end)
assertEquals(mage2, text.substring(emojiInformation.emojis[1].start, emojiInformation.emojis[1].end))
assertEquals(5..12, emojiInformation.emojis[1].range)
assertEquals(mage2, text.substring(emojiInformation.emojis[1].range.first, emojiInformation.emojis[1].range.last))
assertEquals(mage2, emojiInformation.emojis[1].emoji.unicode)
}

Expand All @@ -47,14 +45,12 @@ class EmojiUtilsTest {
assertEquals(false, emojiInformation.isOnlyEmojis)
assertEquals(2, emojiInformation.emojis.size)

assertEquals(7, emojiInformation.emojis[0].start)
assertEquals(9, emojiInformation.emojis[0].end)
assertEquals(hamburger, text.substring(emojiInformation.emojis[0].start, emojiInformation.emojis[0].end))
assertEquals(7..9, emojiInformation.emojis[0].range)
assertEquals(hamburger, text.substring(emojiInformation.emojis[0].range.first, emojiInformation.emojis[0].range.last))
assertEquals(hamburger, emojiInformation.emojis[0].emoji.unicode)

assertEquals(23, emojiInformation.emojis[1].start)
assertEquals(25, emojiInformation.emojis[1].end)
assertEquals(cheese, text.substring(emojiInformation.emojis[1].start, emojiInformation.emojis[1].end))
assertEquals(23..25, emojiInformation.emojis[1].range)
assertEquals(cheese, text.substring(emojiInformation.emojis[1].range.first, emojiInformation.emojis[1].range.last))
assertEquals(cheese, emojiInformation.emojis[1].emoji.unicode)
}

Expand Down
8 changes: 4 additions & 4 deletions emoji/src/main/kotlin/com/vanniktech/emoji/EmojiManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -86,11 +86,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
)
}
}
Expand Down
3 changes: 1 addition & 2 deletions emoji/src/main/kotlin/com/vanniktech/emoji/EmojiRange.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.vanniktech.emoji

data class EmojiRange(
val start: Int,
val end: Int,
val emoji: Emoji,
val range: IntRange,
)
4 changes: 2 additions & 2 deletions emoji/src/test/kotlin/com/vanniktech/emoji/EmojiInformationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class EmojiInformationTest {
empty = EmojiInformation(false, emptyList)
empty2 = EmojiInformation(false, emptyList)
val emoji = TestEmoji(intArrayOf(0x1234), listOf("test"), false)
one = EmojiInformation(false, listOf(EmojiRange(0, 1, emoji)))
one2 = EmojiInformation(false, listOf(EmojiRange(0, 1, emoji)))
one = EmojiInformation(false, listOf(EmojiRange(emoji, 0..1)))
one2 = EmojiInformation(false, listOf(EmojiRange(emoji, 0..1)))
}

@Test fun equality() {
Expand Down
4 changes: 2 additions & 2 deletions emoji/src/test/kotlin/com/vanniktech/emoji/EmojiManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ class EmojiManagerTest {
"te" + String(intArrayOf(0x5678), 0, 1) +
"st" + String(intArrayOf(0x1234), 0, 1)
)
val firstExpectedRange = EmojiRange(2, 3, TestEmoji(intArrayOf(0x5678), listOf("test"), false))
val secondExpectedRange = EmojiRange(5, 6, TestEmoji(intArrayOf(0x1234), listOf("test"), false))
val firstExpectedRange = EmojiRange(TestEmoji(intArrayOf(0x5678), listOf("test"), false), 2..3)
val secondExpectedRange = EmojiRange(TestEmoji(intArrayOf(0x1234), listOf("test"), false), 5..6)
assertEquals(
listOf(
firstExpectedRange,
Expand Down
20 changes: 10 additions & 10 deletions emoji/src/test/kotlin/com/vanniktech/emoji/EmojiRangeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ class EmojiRangeTest {
}

@Test fun equality() {
assertEquals(EmojiRange(0, 1, emoji), EmojiRange(0, 1, emoji))
assertEquals(EmojiRange(0, 1, emoji2), EmojiRange(0, 1, emoji2))
assertNotEquals(EmojiRange(0, 1, emoji2), EmojiRange(0, 0, emoji2))
assertNotEquals(EmojiRange(10, 1, emoji2), EmojiRange(10, 0, emoji2))
assertNotEquals(EmojiRange(0, 1, emoji2), EmojiRange(0, 1, emoji))
assertEquals(EmojiRange(emoji, 0..1), EmojiRange(emoji, 0..1))
assertEquals(EmojiRange(emoji2, 0..1), EmojiRange(emoji2, 0..1))
assertNotEquals(EmojiRange(emoji2, 0..1), EmojiRange(emoji2, 0..0))
assertNotEquals(EmojiRange(emoji2, 1..10), EmojiRange(emoji2, 0..10))
assertNotEquals(EmojiRange(emoji2, 0..1), EmojiRange(emoji, 0..1))
}

@Test fun hashy() {
assertEquals(EmojiRange(0, 1, emoji).hashCode(), EmojiRange(0, 1, emoji).hashCode())
assertEquals(EmojiRange(0, 1, emoji2).hashCode(), EmojiRange(0, 1, emoji2).hashCode())
assertNotEquals(EmojiRange(0, 1, emoji2).hashCode(), EmojiRange(0, 0, emoji2).hashCode())
assertNotEquals(EmojiRange(10, 1, emoji2).hashCode(), EmojiRange(10, 0, emoji2).hashCode())
assertNotEquals(EmojiRange(0, 1, emoji2).hashCode(), EmojiRange(0, 1, emoji).hashCode())
assertEquals(EmojiRange(emoji, 0..1).hashCode(), EmojiRange(emoji, 0..1).hashCode())
assertEquals(EmojiRange(emoji2, 0..1).hashCode(), EmojiRange(emoji2, 0..1).hashCode())
assertNotEquals(EmojiRange(emoji2, 0..1).hashCode(), EmojiRange(emoji2, 0..0).hashCode())
assertNotEquals(EmojiRange(emoji2, 1..10).hashCode(), EmojiRange(emoji2, 0..10).hashCode())
assertNotEquals(EmojiRange(emoji2, 0..1).hashCode(), EmojiRange(emoji, 0..1).hashCode())
}
}