abouttreesummaryrefslogcommitdiff
path: root/res/layout
diff options
context:
space:
mode:
authorjaguillo2015-10-27 14:39:27 +0100
committerjaguillo2015-10-27 14:39:27 +0100
commited53b1a23b25085305dbb5a14a9ec76121d171da (patch)
treeb8dbbb1b90d6907e2a89591f92783436aa032e09 /res/layout
parent2c859f30a64606377c8b9ee5bb7eea3e8389b51f (diff)
downloadunexpected-keyboard-ed53b1a23b25085305dbb5a14a9ec76121d171da.tar.gz
unexpected-keyboard-ed53b1a23b25085305dbb5a14a9ec76121d171da.zip
Fix crash + Fix emoji type buttons
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/emoji_pane.xml51
1 files changed, 11 insertions, 40 deletions
diff --git a/res/layout/emoji_pane.xml b/res/layout/emoji_pane.xml
index 35a415e..e7441f7 100644
--- a/res/layout/emoji_pane.xml
+++ b/res/layout/emoji_pane.xml
@@ -8,82 +8,52 @@
android:layout_height="wrap_content"
>
<juloo.keyboard2.EmojiTypeButton
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:padding="0px"
+ style="@style/emojiTypeButton"
android:text="\uD83D\uDD59"
emoji_type="LAST_USE"
/>
<juloo.keyboard2.EmojiTypeButton
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:padding="0px"
+ style="@style/emojiTypeButton"
android:text="\uD83D\uDE03"
emoji_type="EMOTICONS"
/>
<juloo.keyboard2.EmojiTypeButton
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:padding="0px"
+ style="@style/emojiTypeButton"
android:text="\uD83D\uDE8C"
emoji_type="TRANSPORT"
/>
<juloo.keyboard2.EmojiTypeButton
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:padding="0px"
+ style="@style/emojiTypeButton"
emoji_type="FOOD"
android:text="\uD83C\uDF55"
/>
<juloo.keyboard2.EmojiTypeButton
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:padding="0px"
+ style="@style/emojiTypeButton"
emoji_type="NATURE"
android:text="\uD83C\uDF37"
/>
<juloo.keyboard2.EmojiTypeButton
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:padding="0px"
+ style="@style/emojiTypeButton"
emoji_type="FEST"
android:text="\uD83C\uDF88"
/>
<juloo.keyboard2.EmojiTypeButton
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:padding="0px"
+ style="@style/emojiTypeButton"
emoji_type="ANIMAL"
android:text="\uD83D\uDC31"
/>
<juloo.keyboard2.EmojiTypeButton
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:padding="0px"
+ style="@style/emojiTypeButton"
emoji_type="HUMAN"
android:text="\uD83D\uDC9C"
/>
<juloo.keyboard2.EmojiTypeButton
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:padding="0px"
+ style="@style/emojiTypeButton"
emoji_type="UNCATEGORIZED"
android:text="\uD83D\uDCA5"
/>
<juloo.keyboard2.EmojiTypeButton
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:padding="0px"
+ style="@style/emojiTypeButton"
emoji_type="DINGBATS"
android:text="\u2705"
/>
@@ -91,6 +61,7 @@
<juloo.keyboard2.EmojiGridView
android:id="@+id/emoji_grid"
android:background="@color/bg"
+ android:textColor="@color/emoji_key_text"
android:layout_width="fill_parent"
android:layout_height="@dimen/emoji_grid_height"
/>