1 files changed, 34 insertions, 35 deletions

diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 00368194..d75f4bdb 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:emojicon="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="4dp"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    android:paddingTop="4dp" >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:emojicon="http://schemas.android.com/apk/res-auto"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="3dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:paddingTop="3dp">
+
+    <com.makeramen.roundedimageview.RoundedImageView
+        android:id="@+id/message_photo"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:scaleType="fitXY"
+        android:paddingBottom="3dp"
+        android:src="@drawable/ic_profile"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        app:riv_corner_radius="2dp" />
 
     <LinearLayout
         android:id="@+id/message_box"
@@ -16,40 +27,39 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_toLeftOf="@+id/message_photo"
-        android:background="@drawable/message_border"
-        android:minHeight="48dp"
+        android:background="@drawable/message_bubble_sent"
+        android:minHeight="53dp"
+        android:layout_marginLeft="-4dp"
         android:longClickable="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
-            android:background="@color/grey50"
             android:gravity="center_vertical"
             android:orientation="vertical"
-            android:paddingBottom="4dp"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:paddingTop="4dp" >
+            android:padding="2dp">
 
             <ImageView
                 android:id="@+id/message_image"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="4dp"
                 android:adjustViewBounds="true"
                 android:background="@color/primaryText"
-                android:paddingBottom="2dp"
                 android:scaleType="centerCrop" />
 
-            <github.ankushsachdeva.emojicon.EmojiconTextView
+            <TextView
                 android:id="@+id/message_body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web|phone|email"
+                android:textColorLink="@color/primaryText"
                 android:textColor="@color/primaryText"
-                android:textSize="?attr/TextSizeBody"
-                emojicon:emojiconSize="28sp" />
-            
-             <Button
+                android:textColorHighlight="@color/grey500"
+                android:textSize="?attr/TextSizeBody" />
+
+            <Button
                 android:id="@+id/download_button"
                 style="?android:attr/buttonStyleSmall"
                 android:layout_width="wrap_content"
@@ -61,7 +71,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:orientation="horizontal"
-                android:paddingTop="1dp" >
+                android:paddingBottom="2dp">
 
                 <TextView
                     android:id="@+id/message_time"
@@ -96,15 +106,4 @@
         </LinearLayout>
     </LinearLayout>
 
-    <ImageView
-        android:id="@+id/message_photo"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginLeft="-1.5dp"
-        android:padding="0dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_profile" />
-
 </RelativeLayout>
\ No newline at end of file