diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-09-01 23:58:00 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-09-01 23:58:00 +0200 |
| commit | 6291ebf1a34bb423a329f7fbfaa8191db3c4e04a (patch) | |
| tree | 20d2db4de42d3efe85cdf0feaa728039b3aa6b4d | |
| parent | a7881754f5869860aac058d58838e5da72d3b40d (diff) | |
| parent | 546082147ae161aa7568277db653655483cd745e (diff) | |
Merge pull request #380 from emdete/unicode_emoticons
add translation from ascii to unicode emoticons
3 files changed, 25 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index fcc57601..ecae6231 100644 --- a/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -59,7 +59,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { || latestMessage.getType() == Message.TYPE_PRIVATE) { if ((latestMessage.getEncryption() != Message.ENCRYPTION_PGP) && (latestMessage.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED)) { - convLastMsg.setText(conv.getLatestMessage().getBody()); + convLastMsg.setText(UIHelper.transformAsciiEmoticons(conv.getLatestMessage().getBody())); } else { convLastMsg.setText(activity .getText(R.string.encrypted_message_received)); diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 637711ab..553584cd 100644 --- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -215,7 +215,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { viewHolder.messageBody.setVisibility(View.VISIBLE); if (message.getBody() != null) { if (message.getType() != Message.TYPE_PRIVATE) { - viewHolder.messageBody.setText(message.getMergedBody()); + viewHolder.messageBody.setText(UIHelper.transformAsciiEmoticons(message.getMergedBody())); } else { String privateMarker; if (message.getStatus() <= Message.STATUS_RECEIVED) { diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java index 1f584fe5..69f833f2 100644 --- a/src/eu/siacs/conversations/utils/UIHelper.java +++ b/src/eu/siacs/conversations/utils/UIHelper.java @@ -545,4 +545,27 @@ public class UIHelper { return getContactPicture(account.getJid(), size, context, false); } } + public static String transformAsciiEmoticons(String body) { + if (body != null) { + for (String[] r: new String[][]{ // see https://de.wikipedia.org/wiki/Unicodeblock_Smileys + {":-?\\)", " 😀 ", }, + {";-?\\)", " 😉 ", }, + {":-?D", " 😃 ", }, + {":-?[Ppb]", " 😋 ", }, + {"8-?\\)", " 😎 ", }, + {":-?\\|", " 😐 ", }, + {":-?[/\\\\]", " 😕 ", }, + {":-?\\*", " 😗 ", }, + {":-?[0Oo]", " 😮 ", }, + {":-?\\(", " 😞 ", }, + {"\\^\\^", " 😁 ", }, + }) { + String p = r[0]; + p = "(^" + p + "$|^" + p + " +| +" + p + " +| +" + p + "$)"; + body = body.replaceAll(p, r[1]); + } + body = body.trim(); + } + return body; + } } |