Skip to content

Commit

Permalink
Pull out EmojiRange to package level.
Browse files Browse the repository at this point in the history
  • Loading branch information
vanniktech committed Jun 27, 2017
1 parent b8672b0 commit cfc99c8
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 37 deletions.
35 changes: 0 additions & 35 deletions emoji/src/main/java/com/vanniktech/emoji/EmojiManager.java
Expand Up @@ -175,39 +175,4 @@ void verifyInstalled() {
throw new IllegalStateException("Please install an EmojiProvider through the EmojiManager.install() method first.");
}
}

static class EmojiRange {
final int start;
final int end;
final Emoji emoji;

EmojiRange(final int start, final int end, @NonNull final Emoji emoji) {
this.start = start;
this.end = end;
this.emoji = emoji;
}

@Override public boolean equals(final Object o) {
if (this == o) {
return true;
}

if (o == null || getClass() != o.getClass()) {
return false;
}

final EmojiRange that = (EmojiRange) o;

return start == that.start
&& end == that.end
&& emoji.equals(that.emoji);
}

@Override public int hashCode() {
int result = start;
result = 31 * result + end;
result = 31 * result + emoji.hashCode();
return result;
}
}
}
37 changes: 37 additions & 0 deletions emoji/src/main/java/com/vanniktech/emoji/EmojiRange.java
@@ -0,0 +1,37 @@
package com.vanniktech.emoji;

import android.support.annotation.NonNull;
import com.vanniktech.emoji.emoji.Emoji;

final class EmojiRange {
final int start;
final int end;
final Emoji emoji;

EmojiRange(final int start, final int end, @NonNull final Emoji emoji) {
this.start = start;
this.end = end;
this.emoji = emoji;
}

@Override public boolean equals(final Object o) {
if (this == o) {
return true;
}

if (o == null || getClass() != o.getClass()) {
return false;
}

final EmojiRange that = (EmojiRange) o;

return start == that.start && end == that.end && emoji.equals(that.emoji);
}

@Override public int hashCode() {
int result = start;
result = 31 * result + end;
result = 31 * result + emoji.hashCode();
return result;
}
}
Expand Up @@ -3,7 +3,6 @@
import android.support.annotation.NonNull;
import android.text.Spannable;
import android.text.SpannableString;
import com.vanniktech.emoji.EmojiManager.EmojiRange;
import com.vanniktech.emoji.emoji.Emoji;
import com.vanniktech.emoji.emoji.EmojiCategory;
import org.assertj.core.api.ThrowableAssert;
Expand Down
@@ -1,6 +1,5 @@
package com.vanniktech.emoji;

import com.vanniktech.emoji.EmojiManager.EmojiRange;
import com.vanniktech.emoji.emoji.Emoji;
import org.junit.Before;
import org.junit.Test;
Expand Down

0 comments on commit cfc99c8

Please sign in to comment.