lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix use system emoji

This commit is contained in:
NekoInverter 2020-03-08 12:59:43 +08:00
parent 665e35d33c
commit 2eb1ab178a
No known key found for this signature in database
GPG Key ID: 280D6CCCF95715F9
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java
View File

@ -240,21 +240,16 @@ public class Emoji {
@Override
public void draw(Canvas canvas) {
/*if (MessagesController.getInstance().useSystemEmoji) {
//textPaint.setTextSize(getBounds().width());
canvas.drawText(EmojiData.data[info.page][info.emojiIndex], getBounds().left, getBounds().bottom, textPaint);
return;
}*/
Rect b;
if (fullSize) {
b = getDrawRect();
} else {
b = getBounds();
}
if (SharedConfig.useSystemEmoji) {
String emoji = EmojiData.data[info.page][info.emojiIndex];
if (EmojiData.emojiToFE0FMap.containsKey(emoji.charAt(0))) {
emoji = emoji.substring(0, 1) + "\uFE0F" + emoji.substring(1);
}
textPaint.setColor(Theme.getColor(Theme.key_chat_emojiPanelIcon));
textPaint.setTextSize(getBounds().width() * 4.0f);
textPaint.setTextSize(getBounds().width() * 0.7f * 4.0f * Math.min(0.3f, getBounds().width() / textPaint.measureText(emoji)));
textPaint.setTextAlign(Paint.Align.CENTER);
canvas.drawText(emoji, getBounds().left + getBounds().width() / 2.0f, getBounds().bottom - getBounds().height() / 5.0f, textPaint);
String emoji = fixEmoji(EmojiData.data[info.page][info.emojiIndex]);
textPaint.setTextSize(b.height() * 0.8f);
canvas.drawText(emoji, 0, emoji.length(), b.left, b.bottom - b.height() * 0.225f, textPaint);
return;
}
if (emojiBmp[info.page][info.page2] == null) {
@ -270,13 +265,6 @@ public class Emoji {
return;
}
Rect b;
if (fullSize) {
b = getDrawRect();
} else {
b = getBounds();
}
//if (!canvas.quickReject(b.left, b.top, b.right, b.bottom, Canvas.EdgeType.AA)) {
canvas.drawBitmap(emojiBmp[info.page][info.page2], null, b, paint);
//}
@ -455,14 +443,12 @@ public class Emoji {
if (emojiOnly != null) {
emojiOnly[0]++;
}
if (!SharedConfig.useSystemEmoji) {
CharSequence code = emojiCode.subSequence(0, emojiCode.length());
drawable = Emoji.getEmojiDrawable(code);
if (drawable != null) {
span = new EmojiSpan(drawable, DynamicDrawableSpan.ALIGN_BOTTOM, size, fontMetrics);
s.setSpan(span, startIndex, startIndex + startLength, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
emojiCount++;
}
CharSequence code = emojiCode.subSequence(0, emojiCode.length());
drawable = Emoji.getEmojiDrawable(code);
if (drawable != null) {
span = new EmojiSpan(drawable, DynamicDrawableSpan.ALIGN_BOTTOM, size, fontMetrics);
s.setSpan(span, startIndex, startIndex + startLength, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
emojiCount++;
}
startLength = 0;
startIndex = -1;