new emoji drawer

// FREEBIE
Closes #1746

res/drawable/emoji_category_bell.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:enterFadeDuration="200"
+	android:exitFadeDuration="300"
+	>
+	<item
+		android:state_selected="true"
+		android:drawable="@drawable/ic_smiles_bell_active"
+		>
+	</item>
+	<item
+		android:drawable="@drawable/ic_smiles_bell"
+		>
+	</item>
+</selector>

res/drawable/emoji_category_car.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:enterFadeDuration="200"
+	android:exitFadeDuration="300"
+	>
+	<item
+		android:state_selected="true"
+		android:drawable="@drawable/ic_smiles_car_active"
+		>
+	</item>
+	<item
+		android:drawable="@drawable/ic_smiles_car"
+		>
+	</item>
+</selector>

res/drawable/emoji_category_flower.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:enterFadeDuration="200"
+	android:exitFadeDuration="300"
+	>
+	<item
+		android:state_selected="true"
+		android:drawable="@drawable/ic_smiles_flower_active"
+		>
+	</item>
+	<item
+		android:drawable="@drawable/ic_smiles_flower"
+		>
+	</item>
+</selector>

res/drawable/emoji_category_recent.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:enterFadeDuration="200"
+	android:exitFadeDuration="300">
+	<item android:state_selected="true" android:drawable="@drawable/ic_smiles_recent_active"/>
+	<item android:drawable="@drawable/ic_smiles_recent"/>
+</selector>

res/drawable/emoji_category_smile.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:enterFadeDuration="200"
+	android:exitFadeDuration="300"
+	>
+	<item
+		android:state_selected="true"
+		android:drawable="@drawable/ic_smiles_smile_active"
+		>
+	</item>
+	<item
+		android:drawable="@drawable/ic_smiles_smile"
+		>
+	</item>
+</selector>

res/drawable/emoji_category_symbol.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:enterFadeDuration="200"
+	android:exitFadeDuration="300">
+	<item android:state_selected="true" android:drawable="@drawable/ic_smiles_grid_active"/>
+	<item android:drawable="@drawable/ic_smiles_grid"/>
+</selector>

res/drawable/ic_emoji_backspace.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="300">
+	<item
+		android:state_pressed="true"
+		android:drawable="@drawable/ic_smiles_backspace_active">
+	</item>
+	<item
+		android:drawable="@drawable/ic_smiles_backspace">
+	</item>
+</selector>

res/drawable/ic_emoji_recent.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:enterFadeDuration="200"
+	android:exitFadeDuration="300"
+	>
+	<item
+		android:state_selected="true"
+		android:drawable="@drawable/ic_smiles_recent_active"
+		>
+	</item>
+	<item
+		android:drawable="@drawable/ic_smiles_recent"
+		>
+	</item>
+</selector>

res/layout/conversation_activity.xml

@@ -30,7 +30,7 @@
                 android:orientation="vertical">
 
             <ScrollView android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1">
                 <LinearLayout
                         android:id="@+id/attachment_editor"
@@ -41,7 +41,7 @@
 
                     <ImageView
                             android:id="@+id/attachment_thumbnail"
-                            android:layout_width="fill_parent"
+                            android:layout_width="0dp"
                             android:layout_height="150dip"
                             android:layout_weight="1"
                             android:contentDescription="Attachment Thumbnail"/>
@@ -80,7 +80,7 @@
 
                 <EditText
                         android:id="@+id/embedded_text_editor"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1.0"
                         android:autoText="true"

res/layout/emoji_drawer.xml

@@ -1,31 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:orientation="vertical"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
+<org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                                 android:id="@+id/container"
+                                                                 android:orientation="vertical"
+                                                                 android:layout_width="match_parent"
+                                                                 android:layout_height="match_parent">
 
-    <android.support.v4.view.ViewPager
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/emoji_pager"
-            android:visibility="visible"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#ff333333"
-            android:minHeight="100dip">
+    <com.astuetz.PagerSlidingTabStrip android:id="@+id/tabs"
+                                      android:background="#ff333333"
+                                      android:layout_width="match_parent"
+                                      android:layout_height="45dp" />
 
-        <android.support.v4.view.PagerTabStrip
-                android:id="@+id/emoji_tab_strip"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="top"
-                android:background="#ff333333"
-                android:textColor="#fff"
-                android:paddingTop="3dp"
-                android:paddingBottom="3dp"
-                android:paddingLeft="32dip"
-                android:paddingRight="32dip"/>
+    <android.support.v4.view.ViewPager android:id="@+id/emoji_pager"
+                                       android:visibility="visible"
+                                       android:layout_width="match_parent"
+                                       android:layout_height="match_parent"
+                                       android:background="#ff333333" />
 
-    </android.support.v4.view.ViewPager>
-
-</FrameLayout>
+</org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout>

res/layout/emoji_grid_layout.xml

@@ -5,16 +5,16 @@
              android:layout_height="match_parent">
 
     <GridView android:id="@+id/emoji"
+              android:paddingLeft="10dp"
+              android:paddingRight="10dp"
               android:visibility="visible"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
               android:stretchMode="columnWidth"
-              android:columnWidth="40dp"
+              android:columnWidth="@dimen/emoji_drawer_size"
+              android:horizontalSpacing="0dp"
+              android:verticalSpacing="0dp"
               android:numColumns="auto_fit"
-              android:verticalSpacing="10dp"
-              android:horizontalSpacing="10dp"
-              android:scrollbarFadeDuration="0"
-              android:fadeScrollbars="false"
               android:gravity="center"/>
 
 </FrameLayout>

res/values/colors.xml

@@ -30,4 +30,7 @@
     <color name="conversation_item_received_background_dark">#ff333333</color>
     <color name="conversation_item_received_shadow_light">#ffd5d5d5</color>
     <color name="conversation_item_received_shadow_dark">#ff222222</color>
+
+    <color name="emoji_tab_indicator">#66ffffff</color>
+    <color name="emoji_tab_underline">#11ffffff</color>
 </resources>

res/values/dimens.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="emoji_drawer_size">40dip</dimen>
+    <dimen name="emoji_drawer_size">36sp</dimen>
+    <dimen name="min_emoji_drawer_height">200dp</dimen>
+    <dimen name="emoji_drawer_item_padding">8dp</dimen>
+    <dimen name="emoji_drawer_indicator_height">2dp</dimen>
+    <dimen name="emoji_drawer_left_right_padding">15dp</dimen>
     <dimen name="conversation_item_corner_radius">3dp</dimen>
     <dimen name="conversation_item_drop_shadow_dist">2dp</dimen>
     <dimen name="contact_selection_photo_size">50dp</dimen>