Merge branch 'master' into bubble-into-avatar

6 files changed, 51 insertions, 11 deletions

diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index ff36fe0ae..93da9bac4 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -37,7 +37,8 @@
     <string-array name="quick_actions">
         <item>@string/none</item>
         <item>@string/recently_used</item>
-        <item>@string/attach_take_from_camera</item>
+        <item>@string/action_take_photo</item>
+        <item>@string/action_take_video</item>
         <item>@string/attach_choose_picture</item>
         <item>@string/attach_record_voice</item>
         <item>@string/send_location</item>
@@ -46,7 +47,8 @@
     <string-array name="quick_action_values">
         <item>none</item>
         <item>recent</item>
-        <item>TAKE_FROM_CAMERA</item>
+        <item>TAKE_PHOTO</item>
+        <item>RECORD_VIDEO</item>
         <item>CHOOSE_PICTURE</item>
         <item>RECORD_VOICE</item>
         <item>SEND_LOCATION</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index e89ed2944..672cb00fb 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -42,6 +42,16 @@
 
     <attr name="conversations_overview_background" format="reference|color" />
 
+    <attr name="media_preview_document" 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="media_preview_unknown" format="reference" />
+
     <attr name="icon_add_group" format="reference" />
     <attr name="icon_add_person" format="reference" />
     <attr name="icon_cancel" format="reference" />
@@ -83,6 +93,7 @@
     <attr name="ic_attach_photo" format="reference" />
     <attr name="ic_attach_record" format="reference" />
     <attr name="ic_attach_video" format="reference" />
+    <attr name="ic_attach_videocam" format="reference" />
 
     <attr name="ic_file_apk" format="reference" />
     <attr name="ic_file_pdf" format="reference" />
@@ -90,6 +101,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 7f0f561b1..526eb7d40 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -10,6 +10,9 @@
     <dimen name="audio_player_width">224dp</dimen>
     <dimen name="avatar_item_distance">16dp</dimen>
 
+    <dimen name="media_preview_size">80dp</dimen>
+    <dimen name="media_size">56dp</dimen> <!-- ideally not larger than avatar_on_details_screen -->
+    <dimen name="browser_media_size">96dp</dimen>
     <dimen name="toolbar_elevation">4dp</dimen>
 
     <dimen name="publish_avatar_top_margin">8dp</dimen>
@@ -24,6 +27,5 @@
     <dimen name="scan_dot_size">8dp</dimen>
 
     <dimen name="background_image_opacity">0.12</dimen>
-    
     <dimen name="rounded_image_border">8dp</dimen>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 26a8a7112..62b415cf3 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>
@@ -812,17 +810,20 @@
     <string name="phone_book">Address book</string>
     <string name="unable_to_save_recording">Unable to save recording</string>
     <string name="foreground_service_channel_name">Foreground service</string>
-    <string name="foreground_service_channel_description">This notification category is used to display a permanent notification indicating that Conversations is running.</string>
+    <string name="foreground_service_channel_description">This notification category is used to display a permanent notification indicating that Pix-Art Messenger is running.</string>
     <string name="notification_group_status_information">Status Information</string>
     <string name="error_channel_name">Connectivity Problems</string>
     <string name="error_channel_description">This notification category is used to display a notification in case there is a problem connecting to an account.</string>
     <string name="notification_group_messages">Messages</string>
     <string name="messages_channel_name">Messages</string>
     <string name="silent_messages_channel_name">Silent messages</string>
-    <string name="silent_messages_channel_description">This notification group is used to display notifications that should not trigger any sound. For example when being active on another device (Grace Period).</string>
+    <string name="silent_messages_channel_description">This notification category is used to display notifications that should not trigger any sound. For example when being active on another device (Grace Period).</string>
     <string name="pref_more_notification_settings">Notification Settings</string>
     <string name="pref_more_notification_settings_summary">Importance, Sound, Vibrate</string>
     <string name="video_compression_channel_name">Video compression</string>
     <string name="backup_channel_name">Database backup</string>
     <string name="app_update_channel_name">App update</string>
+    <string name="action_group_details">Group details</string>
+    <string name="view_media">View media</string>
+    <string name="media_browser">Media browser</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index c17bb820f..50cf8e93a 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -65,6 +65,16 @@
         </item>
         <item name="ic_send_voice_offline" type="reference">@drawable/ic_send_voice_offline</item>
 
+        <item name="media_preview_document" 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="media_preview_unknown" type="reference">@drawable/ic_help_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,8 +116,10 @@
         <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 type="reference" name="ic_attach_videocam">@drawable/ic_attach_videocam</item>
         <item name="ic_attach_document" type="reference">@drawable/ic_attach_document</item>
         <item name="ic_attach_location" type="reference">@drawable/ic_attach_location</item>
         <item name="ic_attach_photo" type="reference">@drawable/ic_attach_photo</item>
@@ -150,9 +162,9 @@
         <item name="colorControlActivated">@color/accent</item>
         <item name="text_Color_Main">@color/realwhite</item>
 
-        <item name="color_background_primary">@color/grey800</item>
-        <item name="color_background_secondary">@color/grey900</item>
-        <item name="color_background_tertiary">@color/grey700</item>
+        <item name="color_background_primary">@color/grey700</item>
+        <item name="color_background_secondary">@color/grey800</item>
+        <item name="color_background_tertiary">@color/grey900</item>
         <item name="color_warning">@color/red_a700</item>
         <item name="TextColorOnline">@color/green500</item>
         <item name="TextColorError">@color/red500</item>
@@ -210,6 +222,7 @@
         </item>
 
         <item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera_white</item>
+        <item name="ic_attach_videocam" type="reference">@drawable/ic_attach_videocam_white</item>
         <item name="ic_attach_video" type="reference">@drawable/ic_attach_videocam_white</item>
         <item name="ic_attach_document" type="reference">@drawable/ic_attach_document_white</item>
         <item name="ic_attach_location" type="reference">@drawable/ic_attach_location_white</item>
@@ -219,10 +232,21 @@
         <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_document" 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="media_preview_unknown" type="reference">@drawable/ic_help_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>