aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-01-03 23:19:05 +0100
committerlookshe <github@lookshe.org>2015-01-03 23:19:05 +0100
commit95e2a539517c27b3235acd582f17968c8e301e81 (patch)
tree213bbeed798751e949376d85f4d7d0bd30c5fbfa /src/main/res/menu
parent48717dd7d37c066ab626fc626a2ced626ef21d42 (diff)
parent4f4eff2353f4e359b5582c8e808a4e88631c3e74 (diff)
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts: src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to '')
-rw-r--r--src/main/res/menu/attachment_choices.xml5
-rw-r--r--src/main/res/menu/contact_context.xml3
-rw-r--r--src/main/res/menu/conversations.xml12
-rw-r--r--src/main/res/menu/editaccount.xml15
-rw-r--r--src/main/res/menu/manageaccounts.xml28
-rw-r--r--src/main/res/menu/verification_choices.xml15
-rw-r--r--src/main/res/menu/verify_otr.xml9
7 files changed, 70 insertions, 17 deletions
diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml
index 12b37c08..5139272c 100644
--- a/src/main/res/menu/attachment_choices.xml
+++ b/src/main/res/menu/attachment_choices.xml
@@ -7,8 +7,11 @@
<item
android:id="@+id/attach_take_picture"
android:title="@string/attach_take_picture"/>
+ <item
+ android:id="@+id/attach_record_voice"
+ android:title="@string/attach_record_voice"/>
<item
- android:id="@+id/attach_record_voice"
+ android:id="@+id/attach_choose_file"
android:title="@string/choose_file"/>
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml
index 11ac7d7c..223c7ece 100644
--- a/src/main/res/menu/contact_context.xml
+++ b/src/main/res/menu/contact_context.xml
@@ -8,6 +8,9 @@
android:id="@+id/context_contact_details"
android:title="@string/view_contact_details"/>
<item
+ android:id="@+id/context_contact_block_unblock"
+ android:title="@string/block_contact"/>
+ <item
android:id="@+id/context_delete_contact"
android:title="@string/delete_contact"/>
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index d68c1436..6c22ed18 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -57,6 +57,18 @@
android:title="@string/enable_notifications"/>
<item
+ android:id="@+id/action_block"
+ android:orderInCategory="72"
+ android:showAsAction="never"
+ android:title="@string/action_block_contact"/>
+
+ <item
+ android:id="@+id/action_unblock"
+ android:orderInCategory="73"
+ android:showAsAction="never"
+ android:title="@string/action_unblock_contact"/>
+
+ <item
android:id="@+id/action_accounts"
android:orderInCategory="90"
android:showAsAction="never"
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 2301caf0..4ce9e1f3 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -5,4 +5,19 @@
android:title="@string/show_qr_code"
android:showAsAction="never" />
+ <item
+ android:id="@+id/action_show_block_list"
+ android:title="@string/show_block_list"
+ android:showAsAction="never" />
+
+ <item
+ android:id="@+id/action_server_info_show_more"
+ android:title="@string/server_info_show_more"
+ android:checkable="true"
+ android:checked="false"
+ android:showAsAction="never" />
+
+ <item android:id="@+id/action_change_password_on_server"
+ android:title="@string/change_password"
+ android:showAsAction="never" />
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index b5cd9b50..5b04484f 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -1,15 +1,21 @@
<?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_add_account"
- android:icon="@drawable/ic_action_add_person"
- android:showAsAction="always"
- android:title="@string/action_add_account"/>
- <item
- android:id="@+id/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never"
- android:title="@string/action_settings"/>
+ <item
+ android:id="@+id/action_add_account"
+ android:icon="@drawable/ic_action_add_person"
+ android:showAsAction="always"
+ android:title="@string/action_add_account"/>
+ <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"
+ android:title="@string/action_settings"/>
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/verification_choices.xml b/src/main/res/menu/verification_choices.xml
new file mode 100644
index 00000000..e833ba79
--- /dev/null
+++ b/src/main/res/menu/verification_choices.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item
+ android:id="@+id/scan_fingerprint"
+ android:title="@string/scan_qr_code"/>
+ <item
+ android:id="@+id/ask_question"
+ android:title="@string/ask_question"/>
+
+ <item
+ android:id="@+id/manual_verification"
+ android:title="@string/manually_verify" />
+
+</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 1d4a11b6..42b66ad5 100644
--- a/src/main/res/menu/verify_otr.xml
+++ b/src/main/res/menu/verify_otr.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/manually_verify"
- android:orderInCategory="10"
- android:showAsAction="never"
- android:title="@string/manually_verify" />
+ <item
+ android:id="@+id/action_show_qr_code"
+ android:title="@string/show_qr_code"
+ android:showAsAction="never" />
<item
android:id="@+id/action_accounts"