whatsapp-like smiley implementation

1 files changed, 10 insertions, 1 deletions

diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index f9aae10a..b343781b 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -33,8 +33,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/primarybackground"
             android:ems="10"
             android:imeOptions="flagNoExtractUi|actionSend"
@@ -58,6 +58,15 @@
             android:layout_centerVertical="true"
             android:background="?android:selectableItemBackground"
             android:src="@drawable/ic_action_send_now_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