implement emojicon library

11 files changed, 17 insertions, 16 deletions

diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml
index 19a9be1e6..d241a40e9 100644
--- a/src/main/res/layout/ab_title.xml
+++ b/src/main/res/layout/ab_title.xml
@@ -3,7 +3,7 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    <io.github.rockerhieu.emojicon.EmojiconTextView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@android:id/text1"
         style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title"
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
         android:clickable="true"
         android:onClick="onClick"
         android:paddingTop="1dp" />
-    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    <io.github.rockerhieu.emojicon.EmojiconTextView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@android:id/text2"
         style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle"
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
         android:ellipsize="end"
         android:layout_below="@android:id/text1"
         android:singleLine="true"
-        android:textSize="12dp"
+        android:textSize="12sp"
         android:textColor="@color/grey50"
         android:gravity="center_vertical"
         android:onClick="onClick"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 1b4d8032e..e2976809f 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -76,7 +76,7 @@
                     android:textSize="?attr/TextSizeBody"
                     android:layout_gravity="center_horizontal" />
 
-                <TextView
+                <io.github.rockerhieu.emojicon.EmojiconTextView
                     android:layout_marginTop="8dp"
                     android:id="@+id/status_message"
                     android:layout_width="wrap_content"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 7a13da48e..98587f950 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -128,7 +128,8 @@
                     android:background="@drawable/message_border"
                     android:padding="1dp"
                     android:src="@drawable/ic_profile"
-                    app:riv_corner_radius="5dp" />
+                    app:riv_corner_radius="5dp"
+                    android:layout_alignParentRight="false"/>
 
                 <LinearLayout
                     android:layout_width="fill_parent"
@@ -138,7 +139,7 @@
                     android:orientation="vertical"
                     android:paddingLeft="8dp">
 
-                    <TextView
+                    <io.github.rockerhieu.emojicon.EmojiconTextView
                         android:id="@+id/muc_your_nick"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml
index a5157a89d..d173d163d 100644
--- a/src/main/res/layout/activity_set_presence.xml
+++ b/src/main/res/layout/activity_set_presence.xml
@@ -20,7 +20,7 @@
             android:background="@drawable/infocard_border"
             android:padding="@dimen/infocard_padding"
             android:orientation="vertical">
-            <EditText
+            <io.github.rockerhieu.emojicon.EmojiconEditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="textMultiLine"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index c1c08f58a..7e96d54e0 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -24,7 +24,7 @@
         android:orientation="vertical"
         android:paddingLeft="8dp" >
 
-        <TextView
+        <io.github.rockerhieu.emojicon.EmojiconTextView
             android:id="@+id/contact_display_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 94d26ff24..d134b43cf 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -41,7 +41,7 @@
                 android:layout_toRightOf="@+id/conversation_image"
                 android:paddingLeft="8dp">
 
-                <TextView
+                <io.github.rockerhieu.emojicon.EmojiconTextView
                     android:id="@+id/conversation_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
                                   android:layout_centerVertical="true"
                                   android:layout_toLeftOf="@+id/notification_status"
                                   android:orientation="vertical">
-                        <TextView
+                        <io.github.rockerhieu.emojicon.EmojiconTextView
                             android:id="@+id/conversation_lastmsg"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml
index 6a298ce9f..1a3ae34cc 100644
--- a/src/main/res/layout/create_conference_dialog.xml
+++ b/src/main/res/layout/create_conference_dialog.xml
@@ -31,7 +31,7 @@
         android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody" />
 
-    <EditText
+    <io.github.rockerhieu.emojicon.EmojiconEditText
         android:id="@+id/subject"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 0cfcc7df0..d7076fffc 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -54,7 +54,7 @@
                 android:maxHeight="400dp"
                 android:maxWidth="400dp" />
 
-            <TextView
+            <io.github.rockerhieu.emojicon.EmojiconTextView
                 android:id="@+id/message_body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 829b790a5..732388c26 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -55,7 +55,7 @@
                 android:maxHeight="400dp"
                 android:maxWidth="400dp" />
 
-            <TextView
+            <io.github.rockerhieu.emojicon.EmojiconTextView
                 android:id="@+id/message_body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml
index aa4ded5a6..f8dd20927 100644
--- a/src/main/res/layout/presence_template.xml
+++ b/src/main/res/layout/presence_template.xml
@@ -17,13 +17,13 @@
         android:layout_toLeftOf="@+id/delete_button"
         android:layout_toStartOf="@+id/delete_button"
         android:layout_marginRight="8dp">
-    <TextView
+    <io.github.rockerhieu.emojicon.EmojiconTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/presence_status_message"
         android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody"/>
-    <TextView
+    <io.github.rockerhieu.emojicon.EmojiconTextView
         android:id="@+id/status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/src/main/res/layout/show_location_infowindow.xml b/src/main/res/layout/show_location_infowindow.xml
index 059fb20a8..a81d0d6f9 100644
--- a/src/main/res/layout/show_location_infowindow.xml
+++ b/src/main/res/layout/show_location_infowindow.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <TextView
+        <io.github.rockerhieu.emojicon.EmojiconTextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"