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

5 files changed, 31 insertions, 3 deletions

diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index e89ed2944..b10a13815 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -42,6 +42,15 @@
 
     <attr name="conversations_overview_background" format="reference|color" />
 
+    <attr name="media_preview_file" format="reference" />
+    <attr name="media_preview_recording" format="reference" />
+    <attr name="media_preview_audio" format="reference" />
+    <attr name="media_preview_location" format="reference" />
+    <attr name="media_preview_contact" format="reference" />
+    <attr name="media_preview_app" format="reference" />
+    <attr name="media_preview_calendar" format="reference" />
+    <attr name="media_preview_archive" format="reference" />
+
     <attr name="icon_add_group" format="reference" />
     <attr name="icon_add_person" format="reference" />
     <attr name="icon_cancel" format="reference" />
@@ -90,6 +99,7 @@
     <attr name="ic_file_calendar" format="reference" />
 
     <attr name="icon_alpha" format="float" />
+    <attr name="delete_icon_alpha" format="float" />
 
     <attr name="popupOverlayStyle" format="reference" />
 
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 4867a8e95..e213ea773 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -86,7 +86,6 @@
     <bool name="btbv">true</bool>
     <bool name="send_button_status">true</bool>
     <string name="quick_action">recent</string>
-    <bool name="return_to_previous">false</bool>
     <bool name="display_enter_key">false</bool>
     <bool name="show_dynamic_tags">false</bool>
     <integer name="grace_period">144</integer>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 50f955c89..c420781ea 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -10,6 +10,7 @@
     <dimen name="audio_player_width">224dp</dimen>
     <dimen name="avatar_item_distance">16dp</dimen>
 
+    <dimen name="media_preview_size">80dp</dimen>
     <dimen name="toolbar_elevation">4dp</dimen>
 
     <dimen name="publish_avatar_top_margin">8dp</dimen>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index aefe978c0..e5261bb44 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -712,8 +712,6 @@
     <string name="contacts_have_read_up_to_this_point">%s have read up to this point</string>
     <string name="contact_has_read_up_to_this_point">%s has read up to this point</string>
     <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s and %2$d more have read up to this point</string>
-    <string name="pref_return_to_previous">Quick Sharing</string>
-    <string name="pref_return_to_previous_summary">Immediately return to previous activity instead of opening the conversation after sharing something</string>
     <string name="conversation_unencrypted_hint">This chat is unencrypted, for security reasons you should activate message encryption by using the lock icon. The preferable encryption is OMEMO.</string>
     <string name="pref_warn_unencrypted_chat">Warn if chat is unencrypted</string>
     <string name="pref_warn_unencrypted_chat_summary">If message encryption is available, you should use it. If you don\'t use message encryption, show a warning message inside the chat.</string>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 0e58f26a6..628963db2 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -65,6 +65,15 @@
         </item>
         <item name="ic_send_voice_offline" type="reference">@drawable/ic_send_voice_offline</item>
 
+        <item name="media_preview_file" type="reference">@drawable/ic_description_black_48dp</item>
+        <item name="media_preview_recording" type="reference">@drawable/ic_mic_black_48dp</item>
+        <item name="media_preview_audio" type="reference">@drawable/ic_headset_black_48dp</item>
+        <item name="media_preview_location" type="reference">@drawable/ic_room_black_48dp</item>
+        <item name="media_preview_contact" type="reference">@drawable/ic_person_black_48dp</item>
+        <item name="media_preview_app" type="reference">@drawable/ic_android_black_48dp</item>
+        <item name="media_preview_calendar" type="reference">@drawable/ic_event_black_48dp</item>
+        <item name="media_preview_archive" type="reference">@drawable/ic_archive_black_48dp</item>
+
         <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
         <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
         <item name="icon_cancel" type="reference">@drawable/ic_cancel_black_24dp</item>
@@ -106,6 +115,7 @@
         <item name="dialog_horizontal_padding">16dp</item>
         <item name="dialog_vertical_padding">16dp</item>
         <item name="icon_alpha" type="float">0.54</item>
+        <item name="delete_icon_alpha" type="float">0.70</item>
 
         <item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera</item>
         <item name="ic_attach_document" type="reference">@drawable/ic_attach_document</item>
@@ -219,10 +229,20 @@
         <item name="conversations_overview_background">@color/primary_dark</item>
 
         <item name="icon_alpha" type="float">0.7</item>
+        <item name="delete_icon_alpha" type="float">0.7</item>
 
         <item name="dialog_horizontal_padding">24dp</item>
         <item name="dialog_vertical_padding">16dp</item>
 
+        <item name="media_preview_file" type="reference">@drawable/ic_description_white_48dp</item>
+        <item name="media_preview_recording" type="reference">@drawable/ic_mic_white_48dp</item>
+        <item name="media_preview_audio" type="reference">@drawable/ic_headset_white_48dp</item>
+        <item name="media_preview_location" type="reference">@drawable/ic_room_white_48dp</item>
+        <item name="media_preview_contact" type="reference">@drawable/ic_person_white_48dp</item>
+        <item name="media_preview_app" type="reference">@drawable/ic_android_white_48dp</item>
+        <item name="media_preview_calendar" type="reference">@drawable/ic_event_white_48dp</item>
+        <item name="media_preview_archive" type="reference">@drawable/ic_archive_white_48dp</item>
+
         <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
         <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
         <item name="icon_cancel" type="reference">@drawable/ic_cancel_white_24dp</item>