From 8bd0214e2695c2a621624967a595a069902e6fdd Mon Sep 17 00:00:00 2001
From: jaguillo
Date: Sat, 24 Oct 2015 16:32:49 +0200
Subject: Emoji pane

---
 res/layout/emoji_pane.xml  | 105 ++++++++++++++++++++++++++++++++++++++++++++-
 res/values-land/dimens.xml |   1 +
 res/values/colors.xml      |   3 ++
 res/values/dimens.xml      |   2 +
 res/xml/qwerty.xml         |   2 +-
 5 files changed, 110 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/layout/emoji_pane.xml b/res/layout/emoji_pane.xml
index 8fe9fe4..6890e87 100644
--- a/res/layout/emoji_pane.xml
+++ b/res/layout/emoji_pane.xml
@@ -1,7 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VerticalLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
 	android:hardwareAccelerated="false">
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+	>
+		<juloo.keyboard2.EmojiTypeButton
+			android:layout_width="0px"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:background="@color/emoji_button_bg"
+			android:padding="0px"
+			android:text="\uD83D\uDE03"
+			emoji_type="EMOTICONS"
+		/>
+		<juloo.keyboard2.EmojiTypeButton
+			android:layout_width="0px"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:background="@color/emoji_button_bg"
+			android:padding="0px"
+			android:text="\u2708"
+			emoji_type="DINGBATS"
+		/>
+		<juloo.keyboard2.EmojiTypeButton
+			android:layout_width="0px"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:background="@color/emoji_button_bg"
+			android:padding="0px"
+			android:text="\uD83D\uDE8C"
+			emoji_type="TRANSPORT"
+		/>
+		<juloo.keyboard2.EmojiTypeButton
+			android:layout_width="0px"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:background="@color/emoji_button_bg"
+			android:padding="0px"
+			android:text="\uD83C\uDF4C"
+			emoji_type="UNCATEGORIZED"
+		/>
+		<juloo.keyboard2.EmojiTypeButton
+			android:layout_width="0px"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:background="@color/emoji_button_bg"
+			android:padding="0px"
+			android:text="\uD83C\uDD92"
+			emoji_type="ENCLOSED_CHARACTERS"
+		/>
+	</LinearLayout>
 	<juloo.keyboard2.EmojiGridView
+		android:id="@+id/emoji_grid"
 		android:background="@color/bg"
+		android:layout_width="fill_parent"
+		android:layout_height="@dimen/emoji_grid_height"
 	/>
-</VerticalLayout>
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+	>
+		<juloo.keyboard2.EmojiKeyButton
+			android:layout_width="0px"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:background="@color/emoji_key_bg"
+			android:textColor="@color/emoji_key_text"
+			android:textSize="@dimen/label_text_size"
+			android:padding="0px"
+			key="switch_back_emoji"
+		/>
+		<juloo.keyboard2.EmojiKeyButton
+			android:layout_width="0px"
+			android:layout_height="wrap_content"
+			android:layout_weight="4"
+			android:background="@color/emoji_key_bg"
+			android:textColor="@color/emoji_key_text"
+			android:textSize="@dimen/label_text_size"
+			android:padding="0px"
+			key="space"
+		/>
+		<juloo.keyboard2.EmojiKeyButton
+			android:layout_width="0px"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:background="@color/emoji_key_bg"
+			android:textColor="@color/emoji_key_text"
+			android:textSize="@dimen/label_text_size"
+			android:padding="0px"
+			key="backspace"
+		/>
+		<juloo.keyboard2.EmojiKeyButton
+			android:layout_width="0px"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:background="@color/emoji_key_bg"
+			android:textColor="@color/emoji_key_text"
+			android:textSize="@dimen/label_text_size"
+			android:padding="0px"
+			key="enter"
+		/>
+	</LinearLayout>
+</LinearLayout>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 617237a..dcc4e54 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -6,4 +6,5 @@
 	<dimen name="key_height">36dp</dimen>
 	<dimen name="label_text_size">18dp</dimen>
 	<dimen name="sublabel_text_size">11dp</dimen>
+	<dimen name="emoji_type_button_height">48dp</dimen>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 32a2a4b..0264056 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -6,4 +6,7 @@
 	<item name="key_label" type="color">#DDDDDD</item>
 	<item name="key_label_locked" type="color">#229933</item>
 	<item name="key_sub_label" type="color">#BDBDBD</item>
+	<item name="emoji_button_bg" type="color">#202020</item>
+	<item name="emoji_key_bg" type="color">@color/emoji_button_bg</item>
+	<item name="emoji_key_text" type="color">@color/key_label</item>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5849548..7ba33e7 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -9,4 +9,6 @@
 	<dimen name="key_round">4dp</dimen>
 	<dimen name="label_text_size">16dp</dimen>
 	<dimen name="sublabel_text_size">10dp</dimen>
+	<dimen name="emoji_type_button_height">56dp</dimen>
+	<dimen name="emoji_grid_height">250dp</dimen>
 </resources>
diff --git a/res/xml/qwerty.xml b/res/xml/qwerty.xml
index 4c5f366..af9bb3b 100644
--- a/res/xml/qwerty.xml
+++ b/res/xml/qwerty.xml
@@ -39,6 +39,6 @@
 		<key key0="alt" key1="page_up" key2="end" key3="home" key4="page_down" />
 		<key width="4.4" key0="space" />
 		<key key1="up" key2="right" key3="left" key4="down" />
-		<key width="1.8" key0="enter" key1="config" />
+		<key width="1.8" key0="enter" key1="config" key2="switch_emoji" />
 	</row>
 </keyboard>
-- 
cgit v1.2.3