aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-04-26 23:12:05 +0200
committerChristian Schneppe <christian@pix-art.de>2019-04-26 23:12:22 +0200
commitf9f07063876ec5f3917ce72385b015e1b5f31d7e (patch)
tree093f9ded3021800b20e1e8dcb22d4d8ac17dc7db /src/main/res/menu
parent35276c6519afa1da6042dd485ddae09b06c68aeb (diff)
implement channel discovery
refactor muc search to use http cache channel search results
Diffstat (limited to 'src/main/res/menu')
-rw-r--r--src/main/res/menu/channel_discovery_activity.xml11
-rw-r--r--src/main/res/menu/start_conversation_fab_submenu.xml4
2 files changed, 15 insertions, 0 deletions
diff --git a/src/main/res/menu/channel_discovery_activity.xml b/src/main/res/menu/channel_discovery_activity.xml
new file mode 100644
index 000000000..93e044f27
--- /dev/null
+++ b/src/main/res/menu/channel_discovery_activity.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <item
+ android:id="@+id/action_search"
+ android:icon="?attr/icon_search"
+ android:title="@string/search"
+ app:actionLayout="@layout/actionview_search"
+ app:showAsAction="collapseActionView|always" />
+</menu> \ No newline at end of file
diff --git a/src/main/res/menu/start_conversation_fab_submenu.xml b/src/main/res/menu/start_conversation_fab_submenu.xml
index 212a94a7e..2cf545d68 100644
--- a/src/main/res/menu/start_conversation_fab_submenu.xml
+++ b/src/main/res/menu/start_conversation_fab_submenu.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
+ android:id="@+id/discover_public_channels"
+ android:icon="@drawable/ic_search_white_24dp"
+ android:title="@string/discover_channels" />
+ <item
android:id="@+id/join_public_channel"
android:icon="@drawable/ic_input_white_24dp"
android:title="@string/join_public_channel" />