From aa4117c935ed98c856242332d23d19a007fcb48b Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 8 Feb 2019 12:16:45 +0100
Subject: hide lock icon in channels; modify muc user context

---
 src/main/res/layout/activity_muc_details.xml |  1 -
 src/main/res/menu/muc_details_context.xml    | 68 +++++++++++++++-------------
 2 files changed, 37 insertions(+), 32 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 355d5c1d0..9b2b3333c 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -173,7 +173,6 @@
                                     android:layout_centerVertical="true"
                                     android:layout_toStartOf="@+id/change_conference_button"
                                     android:layout_toLeftOf="@+id/change_conference_button"
-                                    android:text="@string/private_conference"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                                 <ImageButton
diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index 373397e62..0a8ad87c4 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -21,35 +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/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/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>
-- 
cgit v1.2.3