Skip to content

Commit 11e8f66

Browse files
maniac103maniac103
committed
Replace emoji parser library
emoji-java is unmaintained since 2019, so replace it with a library that receives updates.
1 parent e9188d5 commit 11e8f66

File tree

15 files changed

+37
-37
lines changed

15 files changed

+37
-37
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ Open Source Libraries
8686
* [android-gif-drawable](https://github.com/koral--/android-gif-drawable)
8787
* [AndroidSVG](https://github.com/BigBadaboom/androidsvg)
8888
* [AndroidX](https://github.com/androidx/androidx)
89-
* [emoji-java](https://github.com/vdurmont/emoji-java)
9089
* [GitHubSdk](https://github.com/maniac103/GitHubSdk)
9190
* [HoloColorPicker](https://github.com/LarsWerkman/HoloColorPicker)
91+
* [JEmoji](https://github.com/felldo/JEmoji)
9292
* [MarkdownEdit](https://github.com/Tunous/MarkdownEdit)
9393
* [Material Design Icons](https://github.com/google/material-design-icons)
9494
* [PrettyTime](https://github.com/ocpsoft/prettytime)

‎app/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ dependencies {
9999
implementation 'com.github.castorflex.smoothprogressbar:library:1.3.0'
100100
implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
101101
implementation 'com.github.pluscubed:recycler-fast-scroll:3de76812553a77bfd25d3aea0a0af4d96516c3e3@aar'
102-
implementation('com.vdurmont:emoji-java:5.1.1') {
103-
exclude group: 'org.json', module : 'json'
104-
}
102+
implementation 'net.fellbaum:jemoji:1.7.0'
105103
implementation 'com.github.Tunous:MarkdownEdit:1.0.0'
106104
implementation 'com.github.qoqa:traceur:2.2.12'
107105
testImplementation 'junit:junit:4.13.2'

‎app/src/main/java/com/gh4a/activities/IssueEditActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import com.gh4a.adapter.ItemsWithDescriptionAdapter;
3232
import com.gh4a.utils.ActivityResultHelpers;
33+
import com.gh4a.utils.StringUtils;
3334
import com.google.android.material.appbar.AppBarLayout;
3435

3536
import androidx.appcompat.view.ContextThemeWrapper;
@@ -75,7 +76,6 @@
7576
import com.meisolsson.githubsdk.service.issues.IssueService;
7677
import com.meisolsson.githubsdk.service.repositories.RepositoryCollaboratorService;
7778
import com.meisolsson.githubsdk.service.repositories.RepositoryContentService;
78-
import com.vdurmont.emoji.EmojiParser;
7979

8080
import java.net.HttpURLConnection;
8181
import java.util.ArrayList;
@@ -991,7 +991,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
991991
viewColor.setBackgroundColor(ApiHelpers.colorForLabel(label));
992992

993993
final TextView tvLabel = rowView.findViewById(R.id.tv_title);
994-
tvLabel.setText(EmojiParser.parseToUnicode(label.name()));
994+
tvLabel.setText(StringUtils.replaceEmojiAliases(label.name()));
995995
tvLabel.setOnClickListener(clickListener);
996996
tvLabel.setTag(label);
997997

‎app/src/main/java/com/gh4a/adapter/CommitAdapter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import com.meisolsson.githubsdk.model.Commit;
3535
import com.meisolsson.githubsdk.model.User;
3636
import com.meisolsson.githubsdk.model.git.GitUser;
37-
import com.vdurmont.emoji.EmojiParser;
3837

3938
public class CommitAdapter extends RootAdapter<Commit, CommitAdapter.ViewHolder> {
4039
public CommitAdapter(Context context) {
@@ -67,7 +66,7 @@ public void onBindViewHolder(ViewHolder holder, Commit commit) {
6766
if (pos > 0) {
6867
message = message.substring(0, pos);
6968
}
70-
message = EmojiParser.parseToUnicode(message);
69+
message = StringUtils.replaceEmojiAliases(message);
7170

7271
holder.tvDesc.setText(message);
7372
holder.tvSha.setText(commit.sha().substring(0, 10));

‎app/src/main/java/com/gh4a/adapter/EventAdapter.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
import com.meisolsson.githubsdk.model.payload.PushPayload;
7070
import com.meisolsson.githubsdk.model.payload.ReleasePayload;
7171
import com.meisolsson.githubsdk.model.payload.TeamAddPayload;
72-
import com.vdurmont.emoji.EmojiParser;
7372

7473
import java.util.List;
7574

@@ -138,7 +137,7 @@ private CharSequence formatDescription(GitHubEvent event) {
138137
CommitCommentPayload payload = (CommitCommentPayload) event.payload();
139138
GitComment comment = payload.comment();
140139
if (comment != null) {
141-
return EmojiParser.parseToUnicode(comment.body());
140+
return StringUtils.replaceEmojiAliases(comment.body());
142141
}
143142
break;
144143
}
@@ -186,7 +185,7 @@ private CharSequence formatDescription(GitHubEvent event) {
186185
case IssueCommentEvent: {
187186
IssueCommentPayload payload = (IssueCommentPayload) event.payload();
188187
if (payload != null && payload.comment() != null) {
189-
return EmojiParser.parseToUnicode(payload.comment().body());
188+
return StringUtils.replaceEmojiAliases(payload.comment().body());
190189
}
191190
break;
192191
}
@@ -216,7 +215,7 @@ private CharSequence formatDescription(GitHubEvent event) {
216215
Review review = payload.review();
217216
String body = review.body();
218217
if (body != null) {
219-
return EmojiParser.parseToUnicode(review.body());
218+
return StringUtils.replaceEmojiAliases(review.body());
220219
}
221220
break;
222221
}
@@ -225,7 +224,7 @@ private CharSequence formatDescription(GitHubEvent event) {
225224
(PullRequestReviewCommentPayload) event.payload();
226225
ReviewComment comment = payload.comment();
227226
if (comment != null) {
228-
return EmojiParser.parseToUnicode(comment.body());
227+
return StringUtils.replaceEmojiAliases(comment.body());
229228
}
230229
break;
231230
}
@@ -258,7 +257,8 @@ private CharSequence formatDescription(GitHubEvent event) {
258257
ssb.length() - sha.length(), ssb.length(), 0);
259258

260259
ssb.append(" ");
261-
ssb.append(StringUtils.getFirstLine(EmojiParser.parseToUnicode(commit.message())));
260+
ssb.append(StringUtils.getFirstLine(
261+
StringUtils.replaceEmojiAliases(commit.message())));
262262
ssb.setSpan(new EllipsizeLineSpan(i == (count - 1) ? 0 : bottomMargin),
263263
lastLength, ssb.length(), 0);
264264
}

‎app/src/main/java/com/gh4a/adapter/IssueLabelAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
import com.gh4a.ColorPickerDialog;
1818
import com.gh4a.R;
19+
import com.gh4a.utils.StringUtils;
1920
import com.gh4a.utils.UiUtils;
2021
import com.meisolsson.githubsdk.model.Label;
21-
import com.vdurmont.emoji.EmojiParser;
2222

2323
public class IssueLabelAdapter extends
2424
RootAdapter<IssueLabelAdapter.EditableLabel, IssueLabelAdapter.ViewHolder> {
@@ -149,7 +149,7 @@ public void onBindViewHolder(ViewHolder holder, EditableLabel label) {
149149
}
150150

151151
assignColor(holder, label.editedColor != null ? label.editedColor : label.color());
152-
holder.label.setText(EmojiParser.parseToUnicode(label.name()));
152+
holder.label.setText(StringUtils.replaceEmojiAliases(label.name()));
153153
holder.editor.setText(label.editedName != null ? label.editedName : label.name());
154154
}
155155

‎app/src/main/java/com/gh4a/adapter/RepositoryAdapter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.gh4a.utils.ApiHelpers;
3030
import com.gh4a.utils.StringUtils;
3131
import com.meisolsson.githubsdk.model.Repository;
32-
import com.vdurmont.emoji.EmojiParser;
3332

3433
import java.util.Locale;
3534

@@ -51,7 +50,7 @@ public void onBindViewHolder(ViewHolder holder, Repository repository) {
5150

5251
if (!StringUtils.isBlank(repository.description())) {
5352
holder.tvDesc.setVisibility(View.VISIBLE);
54-
holder.tvDesc.setText(EmojiParser.parseToUnicode(repository.description()));
53+
holder.tvDesc.setText(StringUtils.replaceEmojiAliases(repository.description()));
5554
} else {
5655
holder.tvDesc.setVisibility(View.GONE);
5756
}

‎app/src/main/java/com/gh4a/adapter/TrendAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import com.gh4a.R;
3131
import com.gh4a.model.Trend;
32-
import com.vdurmont.emoji.EmojiParser;
32+
import com.gh4a.utils.StringUtils;
3333

3434
public class TrendAdapter extends RootAdapter<Trend, TrendAdapter.ViewHolder> {
3535
private final @StringRes int mStarsTemplate;
@@ -56,7 +56,7 @@ public void onBindViewHolder(ViewHolder holder, Trend trend) {
5656
holder.tvTitle.setText(title);
5757

5858
String desc = trend.getDescription();
59-
holder.tvDesc.setText(desc != null ? EmojiParser.parseToUnicode(desc) : null);
59+
holder.tvDesc.setText(StringUtils.replaceEmojiAliases(desc));
6060

6161
String lang = trend.getLanguage();
6262
if (TextUtils.isEmpty(lang)) {

‎app/src/main/java/com/gh4a/adapter/timeline/EventViewHolder.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.meisolsson.githubsdk.model.Label;
3131
import com.meisolsson.githubsdk.model.Rename;
3232
import com.meisolsson.githubsdk.model.User;
33-
import com.vdurmont.emoji.EmojiParser;
3433

3534
import java.util.ArrayList;
3635
import java.util.Date;
@@ -336,7 +335,7 @@ private void replaceCommitPlaceholder(SpannableStringBuilder text, String commit
336335
private void replaceLabelPlaceholder(SpannableStringBuilder text, Label label) {
337336
int pos = text.toString().indexOf("[label]");
338337
if (label != null && pos >= 0) {
339-
String labelName = EmojiParser.parseToUnicode(label.name());
338+
String labelName = StringUtils.replaceEmojiAliases(label.name());
340339
int length = labelName.length();
341340
text.replace(pos, pos + 7, labelName);
342341
text.setSpan(new IssueLabelSpan(mContext, label, false), pos, pos + length, 0);

‎app/src/main/java/com/gh4a/fragment/CommitFragment.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import com.meisolsson.githubsdk.model.git.GitComment;
3838
import com.meisolsson.githubsdk.model.git.GitCommit;
3939
import com.meisolsson.githubsdk.model.git.GitUser;
40-
import com.vdurmont.emoji.EmojiParser;
4140

4241
import java.util.ArrayList;
4342
import java.util.List;
@@ -138,16 +137,14 @@ private void fillHeader() {
138137

139138
String message = mCommit.commit().message();
140139
int pos = message.indexOf('\n');
141-
String title = pos > 0 ? message.substring(0, pos) : message;
142-
title = EmojiParser.parseToUnicode(title);
140+
String title = StringUtils.replaceEmojiAliases(
141+
pos > 0 ? message.substring(0, pos) : message);
143142
int length = message.length();
144143
while (pos > 0 && pos < length && Character.isWhitespace(message.charAt(pos))) {
145144
pos++;
146145
}
147-
message = pos > 0 && pos < length ? message.substring(pos) : null;
148-
if (message != null) {
149-
message = EmojiParser.parseToUnicode(message);
150-
}
146+
message = StringUtils.replaceEmojiAliases(
147+
pos > 0 && pos < length ? message.substring(pos) : null);
151148

152149
tvTitle.setText(title);
153150
tvMessage.setText(message);

0 commit comments

Comments
 (0)