diff options
Diffstat (limited to 'src/main/res/menu')
| -rw-r--r-- | src/main/res/menu/account_context.xml | 9 | ||||
| -rw-r--r-- | src/main/res/menu/conference_context.xml | 3 | ||||
| -rw-r--r-- | src/main/res/menu/editaccount.xml | 5 | ||||
| -rw-r--r-- | src/main/res/menu/manageaccounts.xml | 16 | ||||
| -rw-r--r-- | src/main/res/menu/media_viewer.xml | 8 | ||||
| -rw-r--r-- | src/main/res/menu/message_context.xml | 6 | ||||
| -rw-r--r-- | src/main/res/menu/muc_details_context.xml | 61 | ||||
| -rw-r--r-- | src/main/res/menu/start_conversation.xml | 5 | ||||
| -rw-r--r-- | src/main/res/menu/start_conversation_fab_submenu.xml | 19 |
9 files changed, 88 insertions, 44 deletions
diff --git a/src/main/res/menu/account_context.xml b/src/main/res/menu/account_context.xml new file mode 100644 index 000000000..4e591f1eb --- /dev/null +++ b/src/main/res/menu/account_context.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<item + android:id="@+id/action_account_details" + android:title="@string/account_details" /> +<item + android:id="@+id/action_show_qr_code" + android:title="@string/show_qr_code" /> +</menu>
\ No newline at end of file diff --git a/src/main/res/menu/conference_context.xml b/src/main/res/menu/conference_context.xml index 051a468d4..dbc6ebfa6 100644 --- a/src/main/res/menu/conference_context.xml +++ b/src/main/res/menu/conference_context.xml @@ -2,9 +2,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/context_join_conference" - android:title="@string/join_conference" /> - <item android:id="@+id/context_delete_conference" android:title="@string/delete_bookmark" /> <item diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 09919b9fe..59667c1c7 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -26,6 +26,11 @@ </item> <item + android:id="@+id/action_import_backup" + android:title="@string/restore_backup" + app:showAsAction="never" /> + + <item android:id="@+id/action_show_qr_code" android:icon="@drawable/ic_qrcode_white_24dp" android:title="@string/show_qr_code" diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index 044c715c5..3199fc2be 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -5,18 +5,22 @@ <item android:id="@+id/action_add_account" android:icon="?attr/icon_add_person" - app:showAsAction="always" - android:title="@string/action_add_account" /> + android:title="@string/action_add_account" + app:showAsAction="always" /> + <item + android:id="@+id/action_import_backup" + android:title="@string/restore_backup" + app:showAsAction="never" /> <item android:id="@+id/action_add_account_with_cert" - app:showAsAction="never" android:icon="?attr/icon_add_person" android:title="@string/action_add_account_with_certificate" - android:visible="true" /> + android:visible="true" + app:showAsAction="never" /> <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 diff --git a/src/main/res/menu/media_viewer.xml b/src/main/res/menu/media_viewer.xml index c3898c79b..36a89214c 100644 --- a/src/main/res/menu/media_viewer.xml +++ b/src/main/res/menu/media_viewer.xml @@ -2,16 +2,12 @@ <item android:id="@+id/action_share" - android:icon="?attr/icon_share" + android:icon="@drawable/ic_share_white_24dp" android:orderInCategory="10" android:title="@string/share" /> <item android:id="@+id/action_open" + android:icon="@drawable/ic_open_in_new_white_24dp" android:orderInCategory="20" android:title="@string/action_open" /> - <item - android:id="@+id/action_delete" - android:icon="?attr/icon_delete" - android:orderInCategory="30" - android:title="@string/action_delete" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 4112dfb8c..d92f85af4 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -2,9 +2,13 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/open_with" + android:title="@string/open_with" + android:visible="false" /> + <item android:id="@+id/share_with" android:title="@string/share_with" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/copy_message" android:title="@string/copy_to_clipboard" diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml index 94693c0a5..0a8ad87c4 100644 --- a/src/main/res/menu/muc_details_context.xml +++ b/src/main/res/menu/muc_details_context.xml @@ -21,28 +21,41 @@ android:title="@string/send_private_message" android:visible="false" /> <item - android:id="@+id/give_membership" - android:title="@string/grant_membership" - android:visible="false" /> - <item - android:id="@+id/give_admin_privileges" - android:title="@string/grant_admin_privileges" - android:visible="false" /> - <item - android:id="@+id/remove_admin_privileges" - android:title="@string/remove_admin_privileges" - android:visible="false" /> - - <item - android:id="@+id/remove_membership" - android:title="@string/remove_membership" - android:visible="false" /> - <item - android:id="@+id/remove_from_room" - android:title="@string/remove_from_room" - android:visible="false" /> - <item - android:id="@+id/ban_from_conference" - android:title="@string/ban_from_conference" - android:visible="false" /> + android:id="@+id/manage_permissions" + android:title="@string/manage_permission"> + <menu> + <item + android:id="@+id/give_membership" + android:title="@string/grant_membership" + android:visible="false" /> + <item + android:id="@+id/remove_membership" + android:title="@string/remove_membership" + android:visible="false" /> + <item + android:id="@+id/give_admin_privileges" + android:title="@string/grant_admin_privileges" + android:visible="false" /> + <item + android:id="@+id/remove_admin_privileges" + android:title="@string/remove_admin_privileges" + android:visible="false" /> + <item + android:id="@+id/give_owner_privileges" + android:title="@string/grant_owner_privileges" + android:visible="false" /> + <item + android:id="@+id/revoke_owner_privileges" + android:title="@string/remove_owner_privileges" + android:visible="false" /> + <item + android:id="@+id/ban_from_conference" + android:title="@string/ban_from_conference" + android:visible="false" /> + <item + android:id="@+id/remove_from_room" + android:title="@string/remove_from_room" + android:visible="false" /> + </menu> + </item> </menu> diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml index 554131c8d..86ebe732a 100644 --- a/src/main/res/menu/start_conversation.xml +++ b/src/main/res/menu/start_conversation.xml @@ -8,10 +8,7 @@ android:title="@string/search" app:actionLayout="@layout/actionview_search" app:showAsAction="collapseActionView|always" /> - <item - android:id="@+id/action_join_conference" - android:title="@string/join_conference" - app:showAsAction="never" /> + <item android:id="@+id/action_scan_qr_code" android:icon="?attr/icon_scan_qr_code" diff --git a/src/main/res/menu/start_conversation_fab_submenu.xml b/src/main/res/menu/start_conversation_fab_submenu.xml new file mode 100644 index 000000000..212a94a7e --- /dev/null +++ b/src/main/res/menu/start_conversation_fab_submenu.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/join_public_channel" + android:icon="@drawable/ic_input_white_24dp" + android:title="@string/join_public_channel" /> + <item + android:id="@+id/create_public_channel" + android:icon="@drawable/ic_public_white_24dp" + android:title="@string/create_public_channel" /> + <item + android:id="@+id/create_private_group_chat" + android:icon="@drawable/ic_group_white_24dp" + android:title="@string/create_private_group_chat" /> + <item + android:id="@+id/create_contact" + android:icon="@drawable/ic_person_white_48dp" + android:title="@string/add_contact" /> +</menu>
\ No newline at end of file |