Update the list of emojis

Take the list from https://unicode.org/Public/emoji/13.1/emoji-test.txt
Also change the list of groups, from the same source.

1 files changed, 10 insertions, 48 deletions

diff --git a/srcs/juloo.keyboard2/EmojiTypeButton.java b/srcs/juloo.keyboard2/EmojiTypeButton.java
index 20cb994..a36af8e 100644
--- a/srcs/juloo.keyboard2/EmojiTypeButton.java
+++ b/srcs/juloo.keyboard2/EmojiTypeButton.java
@@ -1,26 +1,26 @@
 package juloo.keyboard2;
 
 import android.content.Context;
-import android.util.AttributeSet;
+import android.view.ContextThemeWrapper;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.LinearLayout;
-import java.util.HashMap;
+
+/* Emoji "types" are groups. This class is misnamed. */
 
 public class EmojiTypeButton extends Button
 	implements View.OnTouchListener
 {
 	private int		_emojiType;
 
-	public EmojiTypeButton(Context context, AttributeSet attrs)
-	{
-		super(context, attrs);
-		EmojiTypeDef		def = _types.get(attrs.getAttributeValue(null, "emoji_type"));
+  static private final int DEFAULT_GROUP = 0;
 
-		_emojiType = def.getTypeId();
-		setText(def.getButtonText());
+	public EmojiTypeButton(Context context, int group_id, String symbol)
+	{
+		super(new ContextThemeWrapper(context, R.style.emojiTypeButton), null, 0);
+    _emojiType = group_id;
+		setText(symbol);
 		setOnTouchListener(this);
 	}
 
@@ -31,45 +31,7 @@ public class EmojiTypeButton extends Button
 		if (event.getAction() != MotionEvent.ACTION_DOWN)
 			return (false);
 		emojiGrid = (EmojiGridView)((ViewGroup)(getParent().getParent())).findViewById(R.id.emoji_grid);
-		emojiGrid.setEmojiType(_emojiType);
+		emojiGrid.setEmojiGroup(_emojiType);
 		return (true);
 	}
-
-	private static HashMap<String, EmojiTypeDef>	_types = new HashMap<String, EmojiTypeDef>();
-
-	static
-	{
-		_types.put("LAST_USE",	new EmojiTypeDef(EmojiGridView.TYPE_LAST_USE,	"\uD83D\uDD59"));
-		_types.put("EMOTICONS",	new EmojiTypeDef(Emoji.TYPE_EMOTICONS,			"\uD83D\uDE03"));
-		_types.put("TRANSPORT",	new EmojiTypeDef(Emoji.TYPE_TRANSPORT,			"\uD83D\uDE8C"));
-		_types.put("FOOD",		new EmojiTypeDef(Emoji.TYPE_FOOD,				"\uD83C\uDF55"));
-		_types.put("NATURE",	new EmojiTypeDef(Emoji.TYPE_NATURE,				"\uD83C\uDF37"));
-		_types.put("FEST",		new EmojiTypeDef(Emoji.TYPE_FEST,				"\uD83C\uDF88"));
-		_types.put("ANIMAL",	new EmojiTypeDef(Emoji.TYPE_ANIMAL,				"\uD83D\uDC31"));
-		_types.put("HUMAN",		new EmojiTypeDef(Emoji.TYPE_HUMAN,				"\uD83D\uDC9C"));
-		_types.put("UNCATEGORIZED", new EmojiTypeDef(Emoji.TYPE_UNCATEGORIZED,	"\uD83D\uDCA5"));
-		_types.put("DINGBATS",	new EmojiTypeDef(Emoji.TYPE_DINGBATS,			"\u2705"));
-	}
-
-	private static class EmojiTypeDef
-	{
-		private int		_typeId;
-		private String	_buttonText;
-
-		public EmojiTypeDef(int typeId, String buttonText)
-		{
-			_typeId = typeId;
-			_buttonText = buttonText;
-		}
-
-		public int		getTypeId()
-		{
-			return (_typeId);
-		}
-
-		public String	getButtonText()
-		{
-			return (_buttonText);
-		}
-	}
 }