holm/Unexpected-Keyboard
1
0
Fork 0
forked from extern/Unexpected-Keyboard
Code Pull Requests Activity

Refactor: Make KeyValue final

Browse Source 
The class has a complicated internal logic, it is no longer reasonable
to extend it.
This commit is contained in:
Jules Aguillon 2022-06-05 20:14:16 +02:00
parent 088d46d6e6
commit 9aac7900c0
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
srcs/juloo.keyboard2/Emoji.java
View File

@ -8,19 +8,30 @@ import java.io.BufferedReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
public class Emoji extends KeyValue public class Emoji
{ {
private final KeyValue _kv;
private final String _desc; private final String _desc;
private static HashMap<String, Emoji> emojis_by_name = new HashMap<String, Emoji>(); private static HashMap<String, Emoji> emojis_by_name = new HashMap<String, Emoji>();
protected Emoji(String name, String bytecode, String desc) protected Emoji(String name, String bytecode, String desc)
{ {
super(name, bytecode, KIND_STRING, 0, 0); _kv = new KeyValue(name, bytecode, KeyValue.KIND_STRING, 0, 0);
_desc = desc; _desc = desc;
emojis_by_name.put(name, this); emojis_by_name.put(name, this);
} }
public String name()
{
return _kv.name;
}
public KeyValue kv()
{
return _kv;
}
public String getDescription() public String getDescription()
{ {
return (_desc); return (_desc);

6
srcs/juloo.keyboard2/EmojiGridView.java
View File

@ -55,7 +55,7 @@ public class EmojiGridView extends GridView
Config config = Config.globalConfig(); Config config = Config.globalConfig();
Integer used = _lastUsed.get(_emojiArray[pos]); Integer used = _lastUsed.get(_emojiArray[pos]);
_lastUsed.put(_emojiArray[pos], (used == null) ? 1 : used.intValue() + 1); _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 saveLastUsed(); // TODO: opti
} }
@ -88,7 +88,7 @@ public class EmojiGridView extends GridView
HashSet<String> set = new HashSet<String>(); HashSet<String> set = new HashSet<String>();
for (Emoji emoji : _lastUsed.keySet()) 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.putStringSet(LAST_USE_PREF, set);
edit.apply(); edit.apply();
} }
@ -126,7 +126,7 @@ public class EmojiGridView extends GridView
public void setEmoji(Emoji emoji) public void setEmoji(Emoji emoji)
{ {
setText(emoji.getString()); setText(emoji.kv().getString());
} }
} }

2
srcs/juloo.keyboard2/EmojiGroupButtonsBar.java
View File

@ -15,7 +15,7 @@ public class EmojiGroupButtonsBar extends LinearLayout
for (int i = 0; i < Emoji.num_groups; i++) for (int i = 0; i < Emoji.num_groups; i++)
{ {
Emoji first = Emoji.getEmojisByGroup(i)[0]; Emoji first = Emoji.getEmojisByGroup(i)[0];
add_group(i, first.getString()); add_group(i, first.kv().getString());
} }
} }

2
srcs/juloo.keyboard2/KeyValue.java
View File

@ -4,7 +4,7 @@ import android.view.KeyCharacterMap;
import android.view.KeyEvent; import android.view.KeyEvent;
import java.util.HashMap; import java.util.HashMap;
class KeyValue final class KeyValue
{ {
public static enum Event public static enum Event
{ {