preview media before sending them and allow sharing and attaching of multiple files

2 files changed, 53 insertions, 1 deletions

diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 3ddcd69c7..acf42aafe 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -14,6 +14,7 @@
             android:layout_height="match_parent"
             android:layout_above="@+id/snackbar"
             android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
             android:background="?attr/color_background_tertiary"
             android:divider="@null"
@@ -53,7 +54,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true">
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true">
 
             <RelativeLayout
                 android:id="@+id/textsend"
@@ -78,13 +80,28 @@
                     android:src="@drawable/ic_send_voice_offline"
                     android:visibility="gone" />
 
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/media_preview"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_toStartOf="@+id/textSendButton"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp"
+                    android:requiresFadingEdge="horizontal"
+                    android:visibility="gone"
+                    app:layoutManager="android.support.v7.widget.LinearLayoutManager"
+                    tools:listitem="@layout/media_preview"></android.support.v7.widget.RecyclerView>
+
                 <de.pixart.messenger.ui.widget.EditMessage
                     android:id="@+id/textinput"
                     style="@style/Widget.Conversations.EditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_toEndOf="@+id/recordVoiceButton"
                     android:layout_toLeftOf="@+id/textSendButton"
                     android:layout_toRightOf="@+id/recordVoiceButton"
+                    android:layout_toStartOf="@+id/textSendButton"
                     android:background="@drawable/message_bubble_sent_blue"
                     android:ems="10"
                     android:imeOptions="flagNoExtractUi|actionSend"
@@ -105,6 +122,7 @@
                     android:id="@+id/textSendButton"
                     android:layout_width="48dp"
                     android:layout_height="48dp"
+                    android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="?attr/color_background_tertiary"
@@ -130,15 +148,19 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/snackbar_action"
+                android:layout_toStartOf="@+id/snackbar_action"
                 android:paddingLeft="24dp"
+                android:paddingStart="24dp"
                 android:textAppearance="@style/TextAppearance.Conversations.Body1.OnDark" />
 
             <TextView
                 android:id="@+id/snackbar_action"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:paddingBottom="16dp"
@@ -166,8 +188,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
                 android:paddingLeft="24dp"
+                android:paddingStart="24dp"
                 android:textColor="@color/realblack"
                 android:textSize="?attr/TextSizeBody" />
         </RelativeLayout>
diff --git a/src/main/res/layout/media_preview.xml b/src/main/res/layout/media_preview.xml
new file mode 100644
index 000000000..8849e7b4a
--- /dev/null
+++ b/src/main/res/layout/media_preview.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/media_preview"
+            android:layout_width="@dimen/media_preview_size"
+            android:layout_height="@dimen/media_preview_size"
+            android:layout_centerInParent="true"
+            android:layout_margin="12dp"
+            android:background="@color/black54"
+            android:scaleType="center" />
+
+        <ImageButton
+            android:id="@+id/delete_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:alpha="?attr/delete_icon_alpha"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="?attr/icon_cancel" />
+    </RelativeLayout>
+</layout>
\ No newline at end of file