Merge remote-tracking branch 'refs/remotes/siacs/master' into development

14 files changed, 36 insertions, 14 deletions

diff --git a/src/main/res/drawable-hdpi/ic_action_share.png b/src/main/res/drawable-hdpi/ic_action_share.png
new file mode 100644
index 000000000..a36464b8b
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_share.png
diff --git a/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/src/main/res/drawable-hdpi/ic_share_white_24dp.png
new file mode 100644
index 000000000..93b3c219c
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_share_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_action_share.png b/src/main/res/drawable-mdpi/ic_action_share.png
new file mode 100644
index 000000000..7362f0d7b
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_action_share.png
diff --git a/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/src/main/res/drawable-mdpi/ic_share_white_24dp.png
new file mode 100644
index 000000000..4d0197223
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_share_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_share.png b/src/main/res/drawable-xhdpi/ic_action_share.png
new file mode 100644
index 000000000..40771e480
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_action_share.png
diff --git a/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
new file mode 100644
index 000000000..dd536bca2
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_share.png b/src/main/res/drawable-xxhdpi/ic_action_share.png
new file mode 100644
index 000000000..22ed428fc
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_share.png
diff --git a/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
new file mode 100644
index 000000000..9963c6a05
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
new file mode 100644
index 000000000..bb521c141
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 1ae217709..ad79f5778 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/action_edit_subject"
@@ -8,25 +8,42 @@
         android:showAsAction="always"
         android:title="@string/action_edit_subject"/>
     <item
+        android:id="@+id/action_share"
+        android:icon="?attr/icon_share"
+        android:showAsAction="always"
+        android:orderInCategory="15"
+        android:title="@string/share_uri_with"/>
+
+    <item
         android:id="@+id/action_show_qr_code"
-        android:title="@string/show_qr_code"
-        android:showAsAction="never" />
+        android:showAsAction="never"
+        android:title="@string/show_qr_code"/>
     <item
         android:id="@+id/action_save_as_bookmark"
-        android:title="@string/save_as_bookmark"
         android:orderInCategory="80"
-        android:showAsAction="never" />
+        android:showAsAction="never"
+        android:title="@string/save_as_bookmark"/>
     <item
         android:id="@+id/action_delete_bookmark"
-        android:title="@string/delete_bookmark"
         android:orderInCategory="80"
-        android:showAsAction="never" />
-	<item
-		android:id="@+id/action_advanced_mode"
-		android:title="@string/advanced_mode"
-		android:checkable="true"
-		android:checked="false"
-		android:orderInCategory="85"
-		android:showAsAction="never" />
+        android:showAsAction="never"
+        android:title="@string/delete_bookmark"/>
+    <item
+        android:id="@+id/action_advanced_mode"
+        android:checkable="true"
+        android:checked="false"
+        android:orderInCategory="85"
+        android:showAsAction="never"
+        android:title="@string/advanced_mode"/>
+    <item
+        android:id="@+id/action_accounts"
+        android:orderInCategory="90"
+        android:showAsAction="never"
+        android:title="@string/action_accounts"/>
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 91d43e777..8556c99ae 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -32,6 +32,7 @@
         <item name="attr/icon_secure">@drawable/ic_lock_open_white_24dp</item>
         <item name="attr/icon_settings">@drawable/ic_settings_grey600_24dp</item>
         <item name="attr/icon_import_export">@drawable/ic_import_export_white_24dp</item>
+        <item name="attr/icon_share">@drawable/ic_share_white_24dp</item>
 
     </style>
 
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index d471e54ac..901ea7547 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -24,6 +24,7 @@
     <attr name="icon_search" format="reference"/>
     <attr name="icon_secure" format="reference"/>
     <attr name="icon_settings" format="reference"/>
+    <attr name="icon_share" format="reference"/>
     <attr name="icon_import_export" format="reference"/>
 
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index a11283bd3..b12f8b59d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -640,4 +640,6 @@
 	<string name="pref_plugin_voice_recorder">Voice Recorder</string>
 	<string name="pref_plugin_voice_recorder_summary">Send and receive voice messages</string>
 	<string name="security_error_invalid_file_access">Security error: Invalid file access</string>
+	<string name="no_application_to_share_uri">No application found to share URI</string>
+	<string name="share_uri_with">Share URI with…</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 97342311b..b96c9b15e 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -31,6 +31,7 @@
         <item name="attr/icon_secure">@drawable/ic_action_secure</item>
         <item name="attr/icon_settings">@drawable/ic_action_settings</item>
         <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
+        <item name="attr/icon_share">@drawable/ic_action_share</item>
     </style>
 
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">