From c1106d98dd425160767698ae782cbc2a79b297fe Mon Sep 17 00:00:00 2001 From: Brad Erickson Date: Mon, 8 Feb 2016 16:38:59 -0800 Subject: [PATCH] Add 48 text-only emoji/emoticons/kaomoji Grouped by western and eastern styles, then sorted roughly by emotion. Happy->Joking->Flirting->Surprise->Worry->Sadness->Anger->Misc Fixes #5191 Closes #5200 // FREEBIE --- .../components/emoji/EmojiPages.java | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java index 8634c7ef3a..d00ea19836 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java @@ -157,8 +157,28 @@ public class EmojiPages { "\ud83d\udd09", "\ud83d\udd0a", }, "emoji-symbol.png"), new StaticEmojiPageModel(R.attr.emoji_category_emoticons, new String[] { - "=-O", ":-P", ";-)", ":-(", ":-)", ":-!", - ":-$", "B-)", ":O", ":-*", ":-D", ":'(", - ":-\\", "O:-)", ":-[", + ":-)", ";-)", "(-:", ":->", ":-D", "\\o/", + ":-P", "B-)", ":-$", ":-*", "O:-)", "=-O", + "O_O", "O_o", "o_O", ":O", ":-!", ":-x", + ":-|", ":-\\", ":-(", ":'(", ":-[", ">:-(", + "(\u0361\u2022 \u035c\u0296 \u0361\u2022)", "(\u0361\u00b0 \u035c\u0296 \u0361\u00b0)", + "^.^", "^_^", "\u2022\u1d17\u2022", + "\u01aa(\u02d8\u2323\u02d8)\u0283", "\\(\u02c6\u02da\u02c6)/", + "\\(\u2022\u25e1\u2022)/", "(\u273f\u25e0\u203f\u25e0)", + "(\u3063\u2312\u203f\u2312)\u3063", "(\u3063'\u0437')\u3063", + "(\u10e6\u02d8\u2323\u02d8\u10e6)", "~(\u02d8\u25be\u02d8~)", + "\u1555( \u141b )\u1557", "\u00af\\(\u00b0_o)/\u00af", + "\u00af\\_(\u30c4)_/\u00af", "(\u2500\u203f\u203f\u2500)", + "(\u00ac_\u00ac)", "(>_<)", + "(\u0360\u25c9_\u25c9\u1dc5 )", "(\u2565\ufe4f\u2565)", + "\u0ca5_\u0ca5", "\u0ca0_\u0ca0", + "\u1566(\u00f2_\u00f3\u02c7)\u1564", "(\u0e07\ufe21'-'\ufe20)\u0e07", + "(\u261e\uff9f\u30ee\uff9f)\u261e", "\u261c(\uff9f\u30ee\uff9f\u261c)", + "\u261c(\u2312\u25bd\u2312)\u261e", "(\u256f\u00b0\u25a1\u00b0)\u256f\ufe35", + "\u253b\u2501\u253b", "\u252c\u2500\u252c", + "\u25e1\u30ce(\u00b0\u2013\u00b0\u30ce)", "\u30fd(\u00b0\u25c7\u00b0 )\u30ce", + "(\u2609\u0303\u2092\u2609)", "(^._.^)\uff89", + "\u0e05^\u2022\ufecc\u2022^\u0e05", "(\u2022_\u2022) ", + "(\u2022_\u2022)>\u2310\u25a0-\u25a0", " (\u2310\u25a0_\u25a0)", }, null)); }