From bdb335e6b08d35a23468ca1d5730330c520a6a90 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Mon, 5 Jan 2015 15:06:39 +0100
Subject: Show affiliation instead of role in MucDetails and offer 'advanced
 mode' to display role

---
 src/main/res/menu/muc_details.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 341d438a..7587e55c 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -21,6 +21,13 @@
         android:title="@string/delete_bookmark"
         android:orderInCategory="80"
         android:showAsAction="never" />
+	<item
+		android:id="@+id/action_advanced_mode"
+		android:title="@string/advanced_mode"
+		android:checkable="true"
+		android:checked="false"
+		android:orderInCategory="85"
+		android:showAsAction="never" />
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-- 
cgit v1.2.3


From ef525fb10e672b23219fdf180d310de9f6ce59d3 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Wed, 7 Jan 2015 15:03:29 +0100
Subject: basic affiliation changes in muc

---
 src/main/res/menu/muc_details_context.xml | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

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

diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index 113934f3..ad9f174a 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -3,5 +3,26 @@
     <item
         android:id="@+id/start_conversation"
         android:title="@string/start_conversation"
-        />
+        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"/>
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 061de5205e198eac51cf54af5fd9b2e4faebe4d2 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Thu, 8 Jan 2015 00:23:26 +0100
Subject: some clean ups for affiliation change context menu

---
 src/main/res/menu/muc_details_context.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index ad9f174a..dc0f5d3e 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -21,6 +21,10 @@
 		android:id="@+id/remove_membership"
 		android:title="@string/remove_membership"
 		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"
-- 
cgit v1.2.3


From 8d3323e384746acfad563d9389529b0802787261 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Mon, 12 Jan 2015 16:42:20 +0100
Subject: context menu for files and offered files. fixed #848 fixed #849

---
 src/main/res/menu/message_context.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 3be52442..21659266 100644
--- a/src/main/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
@@ -5,8 +5,8 @@
         android:id="@+id/copy_text"
         android:title="@string/copy_text"/>
     <item
-        android:id="@+id/share_image"
-        android:title="@string/share_image"/>
+        android:id="@+id/share_with"
+        android:title="@string/share_with"/>
     <item
         android:id="@+id/copy_url"
         android:title="@string/copy_original_url"/>
-- 
cgit v1.2.3


From 764ef3c8cdebe0bd189a7d7c1031bb25dafa5f15 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Thu, 15 Jan 2015 19:08:12 -0500
Subject: Add block/unblock to contact details menu

See #889
---
 src/main/res/menu/contact_details.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index ce9028aa..ba8889d8 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -17,6 +17,19 @@
         android:id="@+id/action_show_qr_code"
         android:title="@string/show_qr_code"
         android:showAsAction="never" />
+
+    <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"
-- 
cgit v1.2.3


From be9af442efeafcbfbb369cc904490703b590a69e Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 21 Jan 2015 15:31:40 +0100
Subject: always allow access to contact details. provide add button in contact
 details

---
 src/main/res/menu/conversations.xml | 12 ------------
 1 file changed, 12 deletions(-)

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

diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 6c22ed18..d68c1436 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -56,18 +56,6 @@
         android:showAsAction="never"
         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"
-- 
cgit v1.2.3


From 4e50098e319b9ccd65801acf1774bc6212b75621 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 21 Jan 2015 17:24:02 +0100
Subject: show checkbox to hide offline contacts

---
 src/main/res/menu/start_conversation.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index 2c23af59..3dd09e90 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -21,6 +21,14 @@
         android:id="@+id/action_scan_qr_code"
         android:showAsAction="never"
         android:title="@string/scan_qr_code" />
+
+    <item
+        android:id="@+id/action_hide_offline"
+        android:checkable="true"
+        android:checked="false"
+        android:orderInCategory="85"
+        android:showAsAction="never"
+        android:title="@string/hide_offline"/>
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-- 
cgit v1.2.3


From 48604a66201e0c0f403ba1576e35833c7407a7d0 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Wed, 21 Jan 2015 23:00:35 -0500
Subject: Use Material Design Icons on API 21+

---
 src/main/res/menu/choose_contact.xml     | 2 +-
 src/main/res/menu/contact_details.xml    | 4 ++--
 src/main/res/menu/conversations.xml      | 8 ++++----
 src/main/res/menu/manageaccounts.xml     | 2 +-
 src/main/res/menu/muc_details.xml        | 2 +-
 src/main/res/menu/share_with.xml         | 2 +-
 src/main/res/menu/start_conversation.xml | 6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index e39091b3..c025d00f 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/action_search"
         android:actionLayout="@layout/actionview_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="?attr/icon_search"
         android:showAsAction="collapseActionView|always"
         android:title="@string/search"/>
 
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index ba8889d8..bd81b6d4 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -3,13 +3,13 @@
 
     <item
         android:id="@+id/action_edit_contact"
-        android:icon="@drawable/ic_action_edit"
+        android:icon="?attr/icon_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_edit_contact"/>
     <item
         android:id="@+id/action_delete_contact"
-        android:icon="@drawable/ic_action_discard"
+        android:icon="?attr/icon_discard"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_delete_contact"/>
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index d68c1436..4c724d27 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -2,19 +2,19 @@
 
     <item
         android:id="@+id/action_add"
-        android:icon="@drawable/ic_action_new"
+        android:icon="?attr/icon_new"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_add"/>
     <item
         android:id="@+id/action_security"
-        android:icon="@drawable/ic_action_not_secure"
+        android:icon="?attr/icon_not_secure"
         android:orderInCategory="20"
         android:showAsAction="always"
         android:title="@string/action_secure"/>
     <item
         android:id="@+id/action_attach_file"
-        android:icon="@drawable/ic_action_new_attachment"
+        android:icon="?attr/icon_new_attachment"
         android:orderInCategory="30"
         android:showAsAction="always"
         android:title="@string/attach_file"/>
@@ -25,7 +25,7 @@
         android:title="@string/action_contact_details"/>
     <item
         android:id="@+id/action_muc_details"
-        android:icon="@drawable/ic_action_group"
+        android:icon="?attr/icon_group"
         android:orderInCategory="40"
         android:showAsAction="ifRoom"
         android:title="@string/action_muc_details"/>
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index 5b04484f..f8a30ff7 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -3,7 +3,7 @@
 
 	<item
 		android:id="@+id/action_add_account"
-		android:icon="@drawable/ic_action_add_person"
+		android:icon="?attr/icon_add_person"
 		android:showAsAction="always"
 		android:title="@string/action_add_account"/>
 	<item
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 7587e55c..51de4e75 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_edit_subject"
-        android:icon="@drawable/ic_action_edit"
+        android:icon="?attr/icon_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_edit_subject"/>
diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
index cbd15c11..bc51f462 100644
--- a/src/main/res/menu/share_with.xml
+++ b/src/main/res/menu/share_with.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_add"
-        android:icon="@drawable/ic_action_new"
+        android:icon="?attr/icon_new"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_add"/>
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index 3dd09e90..a89d71ff 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -4,17 +4,17 @@
     <item
         android:id="@+id/action_search"
         android:actionLayout="@layout/actionview_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="?attr/icon_search"
         android:showAsAction="collapseActionView|always"
         android:title="@string/search" />
     <item
         android:id="@+id/action_create_contact"
-        android:icon="@drawable/ic_action_add_person"
+        android:icon="?attr/icon_add_person"
         android:showAsAction="always"
         android:title="@string/create_contact" />
     <item
         android:id="@+id/action_join_conference"
-        android:icon="@drawable/ic_action_add_group"
+        android:icon="?attr/icon_add_group"
         android:showAsAction="always"
         android:title="@string/join_conference" />
     <item
-- 
cgit v1.2.3