aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res/menu')
-rw-r--r--src/main/res/menu/contact_details.xml27
-rw-r--r--src/main/res/menu/conversations.xml20
-rw-r--r--src/main/res/menu/editaccount.xml15
-rw-r--r--src/main/res/menu/manageaccounts.xml6
-rw-r--r--src/main/res/menu/manageaccounts_context.xml9
-rw-r--r--src/main/res/menu/muc_details.xml10
-rw-r--r--src/main/res/menu/muc_details_context.xml2
-rw-r--r--src/main/res/menu/start_conversation.xml10
8 files changed, 44 insertions, 55 deletions
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index bd81b6d49..7879eaea1 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -7,11 +7,19 @@
android:orderInCategory="10"
android:showAsAction="always"
android:title="@string/action_edit_contact"/>
+
+ <item
+ android:id="@+id/action_share"
+ android:icon="?attr/icon_share"
+ android:showAsAction="always"
+ android:orderInCategory="10"
+ android:title="@string/share_uri_with"/>
+
<item
android:id="@+id/action_delete_contact"
android:icon="?attr/icon_discard"
android:orderInCategory="10"
- android:showAsAction="always"
+ android:showAsAction="never"
android:title="@string/action_delete_contact"/>
<item
android:id="@+id/action_show_qr_code"
@@ -21,24 +29,15 @@
<item
android:id="@+id/action_block"
android:orderInCategory="72"
- android:showAsAction="never"
+ android: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="never"
+ android:showAsAction="always"
+ android:icon="@drawable/ic_speaker_notes_white_24dp"
android:title="@string/action_unblock_contact"/>
- <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/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 4c724d27d..de13d9a42 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -18,8 +18,9 @@
android:orderInCategory="30"
android:showAsAction="always"
android:title="@string/attach_file"/>
- <item
+<!-- <item
android:id="@+id/action_contact_details"
+ android:icon="?attr/icon_group"
android:orderInCategory="40"
android:showAsAction="never"
android:title="@string/action_contact_details"/>
@@ -27,8 +28,9 @@
android:id="@+id/action_muc_details"
android:icon="?attr/icon_group"
android:orderInCategory="40"
- android:showAsAction="ifRoom"
+ android:showAsAction="never"
android:title="@string/action_muc_details"/>
+-->
<item
android:id="@+id/action_invite"
android:orderInCategory="45"
@@ -40,11 +42,16 @@
android:showAsAction="never"
android:title="@string/action_clear_history"/>
<item
- android:id="@+id/action_archive"
+ android:id="@+id/action_archive_chat"
android:orderInCategory="60"
android:showAsAction="never"
android:title="@string/action_end_conversation"/>
<item
+ android:id="@+id/action_archive_muc"
+ android:orderInCategory="60"
+ android:showAsAction="never"
+ android:title="@string/action_end_conversation_muc"/>
+ <item
android:id="@+id/action_mute"
android:orderInCategory="70"
android:showAsAction="never"
@@ -60,11 +67,16 @@
android:id="@+id/action_accounts"
android:orderInCategory="90"
android:showAsAction="never"
- android:title="@string/action_accounts"/>
+ android:title="@string/mgmt_account_edit"/>
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"
android:title="@string/action_settings"/>
+ <item
+ android:id="@+id/action_check_updates"
+ android:orderInCategory="100"
+ android:showAsAction="never"
+ android:title="@string/action_check_update"/>
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 9ab1788b3..4ff3752f7 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -4,7 +4,7 @@
android:id="@+id/action_change_presence"
android:showAsAction="always"
android:title="@string/change_presence"
- android:icon="@drawable/ic_announcement_white_24dp"/>
+ android:icon="@drawable/ic_new_releases_white_24dp"/>
<item
android:id="@+id/action_show_qr_code"
@@ -13,7 +13,8 @@
<item
android:id="@+id/action_show_block_list"
- android:showAsAction="never"
+ android:showAsAction="always"
+ android:icon="@drawable/ic_speaker_notes_off_white_24dp"
android:title="@string/show_block_list"/>
<item
@@ -31,6 +32,8 @@
<item
android:id="@+id/action_mam_prefs"
+ android:icon="@drawable/ic_backup_white_24dp"
+ android:showAsAction="always"
android:title="@string/mam_prefs"/>
<item
@@ -40,9 +43,13 @@
<item
android:id="@+id/action_change_password_on_server"
- android:showAsAction="never"
+ android: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"
+ android:title="@string/mgmt_account_reconnect"/>
<item
android:id="@+id/action_clear_devices"
android:showAsAction="never"
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index ffa692a0b..2ce422a7b 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -13,12 +13,6 @@
android:title="@string/action_add_account_with_certificate"
android:visible="true"/>
<item
- android:id="@+id/action_enable_all"
- android:title="@string/enable_all_accounts"/>
- <item
- android:id="@+id/action_disable_all"
- android:title="@string/disable_all_accounts"/>
- <item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"
diff --git a/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml
index d8b0093e6..1205b3291 100644
--- a/src/main/res/menu/manageaccounts_context.xml
+++ b/src/main/res/menu/manageaccounts_context.xml
@@ -2,9 +2,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
- android:id="@+id/mgmt_account_enable"
- android:title="@string/mgmt_account_enable"/>
- <item
android:id="@+id/mgmt_account_change_presence"
android:title="@string/change_presence"/>
<item
@@ -14,9 +11,9 @@
android:id="@+id/mgmt_account_announce_pgp"
android:title="@string/mgmt_account_publish_pgp"/>
<item
- android:id="@+id/mgmt_account_disable"
- android:showAsAction="never"
- android:title="@string/mgmt_account_disable"/>
+ android:id="@+id/mgmt_account_reconnect"
+ android:showAsAction="always"
+ android:title="@string/mgmt_account_reconnect"/>
<item
android:id="@+id/mgmt_account_delete"
android:title="@string/mgmt_account_delete"/>
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index ad79f5778..bd809a9f4 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -35,15 +35,5 @@
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/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index af5e691b7..4a8b13d16 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
+ <item
android:id="@+id/start_conversation"
android:title="@string/start_conversation"
android:visible="false"/>
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index 327709fa1..305ffd223 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -39,15 +39,5 @@
android:orderInCategory="85"
android:showAsAction="never"
android:title="@string/hide_offline"/>
- <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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 12:23:52 +0000