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

Fix crash + Fix emoji type buttons

Browse Source
This commit is contained in:
jaguillo 2015-10-27 14:39:27 +01:00
parent 2c859f30a6
commit ed53b1a23b
5 changed files with 25 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
res/layout/emoji_pane.xml
View File

@ -8,82 +8,52 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
> >
<juloo.keyboard2.EmojiTypeButton <juloo.keyboard2.EmojiTypeButton
android:layout_width="0px" style="@style/emojiTypeButton"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="0px"
android:text="\uD83D\uDD59" android:text="\uD83D\uDD59"
emoji_type="LAST_USE" emoji_type="LAST_USE"
/> />
<juloo.keyboard2.EmojiTypeButton <juloo.keyboard2.EmojiTypeButton
android:layout_width="0px" style="@style/emojiTypeButton"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="0px"
android:text="\uD83D\uDE03" android:text="\uD83D\uDE03"
emoji_type="EMOTICONS" emoji_type="EMOTICONS"
/> />
<juloo.keyboard2.EmojiTypeButton <juloo.keyboard2.EmojiTypeButton
android:layout_width="0px" style="@style/emojiTypeButton"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="0px"
android:text="\uD83D\uDE8C" android:text="\uD83D\uDE8C"
emoji_type="TRANSPORT" emoji_type="TRANSPORT"
/> />
<juloo.keyboard2.EmojiTypeButton <juloo.keyboard2.EmojiTypeButton
android:layout_width="0px" style="@style/emojiTypeButton"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="0px"
emoji_type="FOOD" emoji_type="FOOD"
android:text="\uD83C\uDF55" android:text="\uD83C\uDF55"
/> />
<juloo.keyboard2.EmojiTypeButton <juloo.keyboard2.EmojiTypeButton
android:layout_width="0px" style="@style/emojiTypeButton"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="0px"
emoji_type="NATURE" emoji_type="NATURE"
android:text="\uD83C\uDF37" android:text="\uD83C\uDF37"
/> />
<juloo.keyboard2.EmojiTypeButton <juloo.keyboard2.EmojiTypeButton
android:layout_width="0px" style="@style/emojiTypeButton"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="0px"
emoji_type="FEST" emoji_type="FEST"
android:text="\uD83C\uDF88" android:text="\uD83C\uDF88"
/> />
<juloo.keyboard2.EmojiTypeButton <juloo.keyboard2.EmojiTypeButton
android:layout_width="0px" style="@style/emojiTypeButton"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="0px"
emoji_type="ANIMAL" emoji_type="ANIMAL"
android:text="\uD83D\uDC31" android:text="\uD83D\uDC31"
/> />
<juloo.keyboard2.EmojiTypeButton <juloo.keyboard2.EmojiTypeButton
android:layout_width="0px" style="@style/emojiTypeButton"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="0px"
emoji_type="HUMAN" emoji_type="HUMAN"
android:text="\uD83D\uDC9C" android:text="\uD83D\uDC9C"
/> />
<juloo.keyboard2.EmojiTypeButton <juloo.keyboard2.EmojiTypeButton
android:layout_width="0px" style="@style/emojiTypeButton"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="0px"
emoji_type="UNCATEGORIZED" emoji_type="UNCATEGORIZED"
android:text="\uD83D\uDCA5" android:text="\uD83D\uDCA5"
/> />
<juloo.keyboard2.EmojiTypeButton <juloo.keyboard2.EmojiTypeButton
android:layout_width="0px" style="@style/emojiTypeButton"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="0px"
emoji_type="DINGBATS" emoji_type="DINGBATS"
android:text="\u2705" android:text="\u2705"
/> />
@ -91,6 +61,7 @@
<juloo.keyboard2.EmojiGridView <juloo.keyboard2.EmojiGridView
android:id="@+id/emoji_grid" android:id="@+id/emoji_grid"
android:background="@color/bg" android:background="@color/bg"
android:textColor="@color/emoji_key_text"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="@dimen/emoji_grid_height" android:layout_height="@dimen/emoji_grid_height"
/> />

12
res/values/styles.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="emojiTypeButton">
<item name="android:layout_width">0px</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item>
<item name="android:padding">0px</item>
<item name="android:background">@color/emoji_button_bg</item>
<item name="android:textColor">@color/emoji_key_text</item>
<item name="android:textSize">@dimen/label_text_size</item>
</style>
</resources>

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

@ -111,7 +111,7 @@ public class EmojiGridView extends GridView
emoji = Emoji.getEmojiByName(data[1]); emoji = Emoji.getEmojiByName(data[1]);
if (emoji == null) if (emoji == null)
continue ; continue ;
_lastUsed.put(emoji, Integer.getInteger(data[0])); _lastUsed.put(emoji, Integer.valueOf(data[0]));
} }
} }

3
srcs/juloo.keyboard2/EmojiTypeButton.java
View File

@ -15,8 +15,7 @@ public class EmojiTypeButton extends Button
public EmojiTypeButton(Context context, AttributeSet attrs) public EmojiTypeButton(Context context, AttributeSet attrs)
{ {
super(context); super(context, attrs);
setBackgroundColor(getResources().getColor(R.color.emoji_button_bg));
setOnTouchListener(this); setOnTouchListener(this);
_emojiType = getTypeByString(attrs.getAttributeValue(null, "emoji_type")); _emojiType = getTypeByString(attrs.getAttributeValue(null, "emoji_type"));
} }

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

@ -94,11 +94,6 @@ class KeyValue
return (_flags); return (_flags);
} }
public boolean equals(Object o)
{
return (o instanceof KeyValue && ((KeyValue)o).getName().equals(_name));
}
private static HashMap<String, KeyValue> keys = new HashMap<String, KeyValue>(); private static HashMap<String, KeyValue> keys = new HashMap<String, KeyValue>();
protected KeyValue(String name, String symbol, char c, int eventCode, int flags) protected KeyValue(String name, String symbol, char c, int eventCode, int flags)