diff options
| author | Christian Schneppe <christian@pix-art.de> | 2019-02-07 21:11:50 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2019-02-07 21:11:50 +0100 |
| commit | 1b3406cdbb6c620cca975b0bc32b43b60fa246cb (patch) | |
| tree | 159b4be35bfcc995ba5a8dc2638335bdc998ca9a /src/main/res/menu | |
| parent | ba4acfd2c11b55373cc856ee48ffb9a56030e6f4 (diff) | |
provide the same fab submenu for both tabs. rename tab to bookmark
Diffstat (limited to 'src/main/res/menu')
| -rw-r--r-- | src/main/res/menu/conference_context.xml | 3 | ||||
| -rw-r--r-- | src/main/res/menu/start_conversation_fab_submenu.xml | 19 | ||||
| -rw-r--r-- | src/main/res/menu/start_conversation_group_fab.xml | 11 |
3 files changed, 19 insertions, 14 deletions
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/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 |