From 9aac7900c0858eb44b81c4ed1dd80f3cb44b85bb Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sun, 5 Jun 2022 20:14:16 +0200 Subject: Refactor: Make KeyValue final The class has a complicated internal logic, it is no longer reasonable to extend it. --- srcs/juloo.keyboard2/EmojiGridView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'srcs/juloo.keyboard2/EmojiGridView.java') diff --git a/srcs/juloo.keyboard2/EmojiGridView.java b/srcs/juloo.keyboard2/EmojiGridView.java index 6216d5b..224099c 100644 --- a/srcs/juloo.keyboard2/EmojiGridView.java +++ b/srcs/juloo.keyboard2/EmojiGridView.java @@ -55,7 +55,7 @@ public class EmojiGridView extends GridView Config config = Config.globalConfig(); Integer used = _lastUsed.get(_emojiArray[pos]); _lastUsed.put(_emojiArray[pos], (used == null) ? 1 : used.intValue() + 1); - config.handler.handleKeyUp(_emojiArray[pos], Pointers.Modifiers.EMPTY); + config.handler.handleKeyUp(_emojiArray[pos].kv(), Pointers.Modifiers.EMPTY); saveLastUsed(); // TODO: opti } @@ -88,7 +88,7 @@ public class EmojiGridView extends GridView HashSet set = new HashSet(); for (Emoji emoji : _lastUsed.keySet()) - set.add(String.valueOf(_lastUsed.get(emoji)) + "-" + emoji.name); + set.add(String.valueOf(_lastUsed.get(emoji)) + "-" + emoji.name()); edit.putStringSet(LAST_USE_PREF, set); edit.apply(); } @@ -126,7 +126,7 @@ public class EmojiGridView extends GridView public void setEmoji(Emoji emoji) { - setText(emoji.getString()); + setText(emoji.kv().getString()); } } -- cgit v1.2.3