From 1b3406cdbb6c620cca975b0bc32b43b60fa246cb Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 7 Feb 2019 21:11:50 +0100
Subject: provide the same fab submenu for both tabs. rename tab to bookmark

---
 src/main/res/menu/conference_context.xml             |  3 ---
 src/main/res/menu/start_conversation_fab_submenu.xml | 19 +++++++++++++++++++
 src/main/res/menu/start_conversation_group_fab.xml   | 11 -----------
 3 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 src/main/res/menu/start_conversation_fab_submenu.xml
 delete mode 100644 src/main/res/menu/start_conversation_group_fab.xml

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

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
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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" />
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
diff --git a/src/main/res/menu/start_conversation_group_fab.xml b/src/main/res/menu/start_conversation_group_fab.xml
deleted file mode 100644
index 9eb95bc03..000000000
--- a/src/main/res/menu/start_conversation_group_fab.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/enter"
-        android:icon="@drawable/ic_input_white_24dp"
-        android:title="@string/join_group_chat" />
-    <item
-        android:id="@+id/create"
-        android:icon="@drawable/ic_edit_white_24dp"
-        android:title="@string/create_group_chat" />
-</menu>
\ No newline at end of file
-- 
cgit v1.2.3