reworked shortcut for QR-Code scanning in profile

fixes #190

1 files changed, 26 insertions, 22 deletions

diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index cbdde1fce..09919b9fe 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -5,11 +5,12 @@
         android:id="@+id/action_change_presence"
         android:icon="@drawable/ic_new_releases_white_24dp"
         android:title="@string/edit_status_message"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
 
-    <item android:id="@+id/action_share"
-        android:title="@string/share_uri_with"
+    <item
+        android:id="@+id/action_share"
         android:icon="@drawable/ic_share_white_24dp"
+        android:title="@string/share_uri_with"
         app:showAsAction="always">
         <menu>
             <item
@@ -21,57 +22,60 @@
             <item
                 android:id="@+id/action_share_barcode"
                 android:title="@string/share_as_barcode" />
-            <item
-                android:id="@+id/action_show_qr_code"
-                android:title="@string/show_qr_code" />
         </menu>
     </item>
 
     <item
+        android:id="@+id/action_show_qr_code"
+        android:icon="@drawable/ic_qrcode_white_24dp"
+        android:title="@string/show_qr_code"
+        app:showAsAction="always" />
+
+    <item
         android:id="@+id/action_show_block_list"
-        app:showAsAction="always"
         android:icon="@drawable/ic_speaker_notes_off_white_24dp"
-        android:title="@string/show_block_list" />
+        android:title="@string/show_block_list"
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_renew_certificate"
-        app:showAsAction="never"
         android:title="@string/action_renew_certificate"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_server_info_show_more"
         android:checkable="true"
         android:checked="false"
-        app:showAsAction="never"
-        android:title="@string/server_info_show_more" />
+        android:title="@string/server_info_show_more"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_mam_prefs"
         android:icon="@drawable/ic_cloud_white_24dp"
-        app:showAsAction="always"
-        android:title="@string/mam_prefs" />
+        android:title="@string/mam_prefs"
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_show_password"
-        app:showAsAction="never"
-        android:title="@string/show_password" />
+        android:title="@string/show_password"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_change_password_on_server"
-        app:showAsAction="always"
         android:icon="@drawable/ic_vpn_key_white_24dp"
-        android:title="@string/change_password" />
+        android:title="@string/change_password"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/mgmt_account_reconnect"
-        app:showAsAction="never"
-        android:title="@string/mgmt_account_reconnect" />
+        android:title="@string/mgmt_account_reconnect"
+        app:showAsAction="never" />
     <item
         android:id="@+id/mgmt_account_announce_pgp"
         android:title="@string/mgmt_account_publish_pgp" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        app:showAsAction="never"
-        android:title="@string/action_settings" />
+        android:title="@string/action_settings"
+        app:showAsAction="never" />
 </menu>
\ No newline at end of file