1 files changed, 22 insertions, 2 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index db92c05f..dd102177 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/grey200" >
 
+    <com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/snackbar"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:id="@+id/swipe_refresh_container"
+        app:direction="both">
     <ListView
         android:id="@+id/messages_view"
         android:layout_width="fill_parent"
@@ -20,6 +29,7 @@
         android:transcriptMode="normal"
         tools:listitem="@layout/message_sent">
     </ListView>
+    </com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayout>
 
     <RelativeLayout
         android:id="@+id/textsend"
@@ -33,8 +43,8 @@
             android:id="@+id/textinput"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/textSendButton"
+            android:layout_toRightOf="@+id/emoji_btn"
             android:background="@color/grey50"
             android:ems="10"
             android:imeOptions="flagNoExtractUi|actionSend"
@@ -45,7 +55,8 @@
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
             android:paddingTop="12dp"
-            android:textColor="@color/black87" >
+            android:textColor="@color/primaryText"
+            app:emojiconSize="?attr/EmojiconSizeInput" >
 
             <requestFocus />
         </eu.siacs.conversations.ui.EditMessage>
@@ -58,6 +69,15 @@
             android:layout_centerVertical="true"
             android:background="?android:selectableItemBackground"
             android:src="@drawable/ic_send_text_offline" />
+
+        <ImageView
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:id="@+id/emoji_btn"
+            android:layout_centerVertical="true"
+            android:layout_alignParentLeft="true"
+            android:padding="4dp"
+            android:src="@drawable/smiley" />
     </RelativeLayout>
 
     <RelativeLayout