From 6fb4eb97510b6e980c95daa35664c46c45f5234d Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 9 Mar 2018 20:27:18 +0100
Subject: started work on migrating to appcompat

---
 src/main/res/menu/change_presence.xml        |  7 ++++---
 src/main/res/menu/choose_contact.xml         |  9 +++++----
 src/main/res/menu/contact_details.xml        | 11 ++++++-----
 src/main/res/menu/conversations.xml          | 29 ++++++++++++++--------------
 src/main/res/menu/editaccount.xml            | 23 +++++++++++-----------
 src/main/res/menu/manageaccounts.xml         |  9 +++++----
 src/main/res/menu/manageaccounts_context.xml |  5 +++--
 src/main/res/menu/muc_details.xml            | 13 +++++++------
 src/main/res/menu/publish_avatar.xml         |  5 +++--
 src/main/res/menu/select_multiple.xml        |  5 +++--
 src/main/res/menu/share_with.xml             |  5 +++--
 src/main/res/menu/showlocation.xml           |  5 +++--
 src/main/res/menu/start_conversation.xml     | 17 ++++++++--------
 src/main/res/menu/trust_keys.xml             |  5 +++--
 src/main/res/menu/verify_otr.xml             |  7 ++++---
 15 files changed, 85 insertions(+), 70 deletions(-)

(limited to 'src/main/res/menu')

diff --git a/src/main/res/menu/change_presence.xml b/src/main/res/menu/change_presence.xml
index 34af0a679..5417076b6 100644
--- a/src/main/res/menu/change_presence.xml
+++ b/src/main/res/menu/change_presence.xml
@@ -1,12 +1,13 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_account_details"
         android:title="@string/account_details"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:icon="@drawable/ic_account_box_white_24dp" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_settings" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index 382e96017..fb52a3a1a 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -1,24 +1,25 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_search"
         android:actionLayout="@layout/actionview_search"
         android:icon="?attr/icon_search"
-        android:showAsAction="collapseActionView|always"
+        app:showAsAction="collapseActionView|always"
         android:title="@string/search" />
 
     <item
         android:id="@+id/action_create_contact"
         android:icon="?attr/icon_add_person"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/create_contact"
         android:visible="false" />
 
     <item
         android:id="@+id/action_block_jid"
         android:icon="?attr/icon_add_person"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/block_jabber_id"
         android:visible="false" />
 </menu>
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index 29ef166e5..50243150b 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -1,18 +1,19 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_edit_contact"
         android:icon="?attr/icon_edit"
         android:orderInCategory="10"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/action_edit_contact" />
 
     <item
         android:id="@+id/action_share"
         android:icon="?attr/icon_share"
         android:orderInCategory="15"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/share_uri_with">
         <menu>
             <item
@@ -30,14 +31,14 @@
     <item
         android:id="@+id/action_block"
         android:orderInCategory="72"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:icon="@drawable/ic_speaker_notes_off_white_24dp"
         android:title="@string/action_block_contact" />
 
     <item
         android:id="@+id/action_unblock"
         android:orderInCategory="73"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:icon="@drawable/ic_speaker_notes_white_24dp"
         android:title="@string/action_unblock_contact" />
 
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 992371fc7..b748a065e 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -1,71 +1,72 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_add"
         android:icon="?attr/icon_new"
         android:orderInCategory="10"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/action_add" />
     <item
         android:id="@+id/action_security"
         android:icon="?attr/icon_not_secure"
         android:orderInCategory="20"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/action_secure" />
     <item
         android:id="@+id/action_attach_file"
         android:icon="?attr/icon_new_attachment"
         android:orderInCategory="30"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/attach_file" />
     <item
         android:id="@+id/action_invite"
         android:orderInCategory="45"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/invite_contact" />
     <item
         android:id="@+id/action_clear_history"
         android:orderInCategory="50"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_clear_history" />
     <item
         android:id="@+id/action_archive_chat"
         android:orderInCategory="60"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_end_conversation" />
     <item
         android:id="@+id/action_archive_muc"
         android:orderInCategory="60"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_end_conversation_muc" />
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/mgmt_account_edit" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_settings" />
     <item
         android:id="@+id/action_invite_user"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/invite_user" />
     <item
         android:id="@+id/action_create_issue"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/create_issue" />
     <item
         android:id="@+id/action_check_updates"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_check_update" />
     <item
         android:id="@+id/action_search_history"
         android:icon="?attr/icon_search"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
         android:title="@string/search" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 698c648ee..13e8db4a6 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -1,9 +1,10 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/action_share"
         android:title="@string/share_uri_with"
         android:icon="?attr/icon_share"
-        android:showAsAction="always">
+        app:showAsAction="always">
         <menu>
             <item
                 android:id="@+id/action_share_uri"
@@ -22,19 +23,19 @@
 
     <item
         android:id="@+id/action_change_presence"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/change_presence"
         android:icon="@drawable/ic_new_releases_white_24dp" />
 
     <item
         android:id="@+id/action_show_block_list"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:icon="@drawable/ic_speaker_notes_off_white_24dp"
         android:title="@string/show_block_list" />
 
     <item
         android:id="@+id/action_renew_certificate"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_renew_certificate"
         android:visible="false" />
 
@@ -42,28 +43,28 @@
         android:id="@+id/action_server_info_show_more"
         android:checkable="true"
         android:checked="false"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/server_info_show_more" />
 
     <item
         android:id="@+id/action_mam_prefs"
         android:icon="@drawable/ic_cloud_white_24dp"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/mam_prefs" />
 
     <item
         android:id="@+id/action_show_password"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/show_password" />
 
     <item
         android:id="@+id/action_change_password_on_server"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:icon="@drawable/ic_vpn_key_white_24dp"
         android:title="@string/change_password" />
     <item
         android:id="@+id/mgmt_account_reconnect"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/mgmt_account_reconnect" />
     <item
         android:id="@+id/mgmt_account_announce_pgp"
@@ -71,6 +72,6 @@
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_settings" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index 38b82010b..044c715c5 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -1,21 +1,22 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_add_account"
         android:icon="?attr/icon_add_person"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/action_add_account" />
     <item
         android:id="@+id/action_add_account_with_cert"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:icon="?attr/icon_add_person"
         android:title="@string/action_add_account_with_certificate"
         android:visible="true" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_settings" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml
index beca7b8ec..a49b770df 100644
--- a/src/main/res/menu/manageaccounts_context.xml
+++ b/src/main/res/menu/manageaccounts_context.xml
@@ -1,5 +1,6 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/mgmt_account_change_presence"
@@ -12,7 +13,7 @@
         android:title="@string/mgmt_account_publish_pgp" />
     <item
         android:id="@+id/mgmt_account_reconnect"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/mgmt_account_reconnect" />
     <item
         android:id="@+id/mgmt_account_delete"
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 585bd1def..910c986ec 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -1,16 +1,17 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_edit_subject"
         android:icon="?attr/icon_edit"
         android:orderInCategory="10"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/action_edit_subject" />
     <item
         android:id="@+id/action_share"
         android:icon="?attr/icon_share"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:orderInCategory="15"
         android:title="@string/share_uri_with" >
         <menu>
@@ -29,19 +30,19 @@
     <item
         android:id="@+id/action_save_as_bookmark"
         android:orderInCategory="80"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/save_as_bookmark" />
     <item
         android:id="@+id/action_delete_bookmark"
         android:orderInCategory="80"
-        android:showAsAction="never"
+        app: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"
+        app:showAsAction="never"
         android:title="@string/advanced_mode" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/publish_avatar.xml b/src/main/res/menu/publish_avatar.xml
index 39478c0a4..72ceb2d17 100644
--- a/src/main/res/menu/publish_avatar.xml
+++ b/src/main/res/menu/publish_avatar.xml
@@ -1,8 +1,9 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_crop_image"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:icon="@drawable/ic_crop_white_24dp"
         android:title="@string/select_image_and_crop" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/select_multiple.xml b/src/main/res/menu/select_multiple.xml
index efd6e4d0a..51f05e21a 100644
--- a/src/main/res/menu/select_multiple.xml
+++ b/src/main/res/menu/select_multiple.xml
@@ -1,9 +1,10 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/selection_submit"
         android:title="@string/invite_contact"
-        android:showAsAction="always" />
+        app:showAsAction="always" />
 
 </menu>
diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
index ff87edc1a..5c57eedd8 100644
--- a/src/main/res/menu/share_with.xml
+++ b/src/main/res/menu/share_with.xml
@@ -1,11 +1,12 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_add"
         android:icon="?attr/icon_new"
         android:orderInCategory="10"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/action_add" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/showlocation.xml b/src/main/res/menu/showlocation.xml
index 3eb0647c9..c7049a5b0 100644
--- a/src/main/res/menu/showlocation.xml
+++ b/src/main/res/menu/showlocation.xml
@@ -1,8 +1,9 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_navigate"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/navigate"
         android:icon="@drawable/ic_navigation_white_24dp" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index ea7572b41..79cce252c 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -1,21 +1,22 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_search"
         android:actionLayout="@layout/actionview_search"
         android:icon="?attr/icon_search"
-        android:showAsAction="collapseActionView|always"
+        app:showAsAction="collapseActionView|always"
         android:title="@string/search" />
     <item
         android:id="@+id/action_create_contact"
         android:icon="?attr/icon_add_person"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/create_contact" />
     <item
         android:id="@+id/action_conference"
         android:icon="?attr/icon_add_group"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/join_or_create_conference">
         <menu>
             <item
@@ -29,7 +30,7 @@
     </item>
     <item
         android:id="@+id/action_scan_qr_code"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/scan_qr_code" />
 
     <item
@@ -37,17 +38,17 @@
         android:checkable="true"
         android:checked="false"
         android:orderInCategory="85"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/hide_offline" />
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/mgmt_account_edit" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_settings" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/trust_keys.xml b/src/main/res/menu/trust_keys.xml
index 7c63bd7fe..e40295eea 100644
--- a/src/main/res/menu/trust_keys.xml
+++ b/src/main/res/menu/trust_keys.xml
@@ -1,9 +1,10 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_scan_qr_code"
         android:title="@string/scan_qr_code"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:icon="?attr/icon_scan_qr_code"/>
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml
index 7dadffce8..b6dd79610 100644
--- a/src/main/res/menu/verify_otr.xml
+++ b/src/main/res/menu/verify_otr.xml
@@ -1,14 +1,15 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_show_qr_code"
         android:title="@string/show_qr_code"
-        android:showAsAction="never" />
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_settings" />
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3