From e9aa5d9daac2cc82d893dfdc26e344fb1a9dc8e2 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Sun, 12 Jun 2016 11:44:23 +0200
Subject: Implements FS#217: Rework display of /me messages

---
 src/main/res/layout/message_sent.xml | 75 +++++++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

(limited to 'src/main/res/layout/message_sent.xml')

diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 0edbab51..887ae1b8 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -31,7 +31,8 @@
         android:background="@drawable/message_bubble_sent"
         android:minHeight="53dp"
         android:layout_marginLeft="-4dp"
-        android:longClickable="true">
+        android:longClickable="true"
+        android:visibility="gone">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -106,4 +107,76 @@
         </LinearLayout>
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/mecmd_message_box"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentLeft="true"
+        android:background="@drawable/mecmd_message_border"
+        android:minHeight="53dp"
+        android:longClickable="true"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            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" >
+
+            <github.ankushsachdeva.emojicon.EmojiconTextView
+                android:id="@+id/mecmd_message_body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:autoLink="web|phone|email"
+                android:textColor="@color/black87"
+                android:textSize="?attr/TextSizeBody"
+                app:emojiconSize="?attr/EmojiconSizeBody" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:orientation="horizontal"
+                android:paddingTop="1dp" >
+
+                <TextView
+                    android:id="@+id/mecmd_message_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:text="@string/sending"
+                    android:textColor="@color/black54"
+                    android:textSize="?attr/TextSizeInfo" />
+
+                <ImageView
+                    android:id="@+id/mecmd_security_indicator"
+                    android:layout_width="?attr/TextSizeInfo"
+                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4sp"
+                    android:alpha="0.54"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_lock_black_18dp" />
+
+                <ImageView
+                    android:id="@+id/mecmd_indicator_received"
+                    android:layout_width="?attr/TextSizeInfo"
+                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4sp"
+                    android:alpha="0.54"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_received_indicator" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3