add fab to start conversations activity

2 files changed, 32 insertions, 37 deletions

diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index 28e954b99..c95dc3678 100644
--- a/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/start_conversation_view_pager"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/grey50">
-
-</android.support.v4.view.ViewPager>
\ No newline at end of file
+<layout xmlns:android="http://schemas.android.com/apk/res/android" >
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <android.support.v4.view.ViewPager
+            android:id="@+id/start_conversation_view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?attr/color_background_primary"/>
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
+            android:src="?attr/icon_add_person"
+            android:layout_margin="16dp" />
+    </FrameLayout>
+</layout>
\ No newline at end of file
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index b7e1f2822..12cb941bb 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -4,51 +4,35 @@
 
     <item
         android:id="@+id/action_search"
-        app:actionLayout="@layout/actionview_search"
         android:icon="?attr/icon_search"
-        app:showAsAction="collapseActionView|always"
-        android:title="@string/search" />
-    <item
-        android:id="@+id/action_create_contact"
-        android:icon="?attr/icon_add_person"
-        app:showAsAction="always"
-        android:title="@string/create_contact" />
+        android:title="@string/search"
+        app:actionLayout="@layout/actionview_search"
+        app:showAsAction="collapseActionView|always" />
     <item
-        android:id="@+id/action_conference"
-        android:icon="?attr/icon_add_group"
-        app:showAsAction="always"
-        android:title="@string/join_or_create_conference">
-        <menu>
-            <item
-                android:id="@+id/action_join_conference"
-                android:title="@string/join_conference" />
-            <item
-                android:id="@+id/action_create_conference"
-                android:title="@string/create_conference" />
-
-        </menu>
-    </item>
+        android:id="@+id/action_join_conference"
+        android:title="@string/join_conference"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_scan_qr_code"
-        app:showAsAction="never"
-        android:title="@string/scan_qr_code" />
+        android:title="@string/scan_qr_code"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_hide_offline"
         android:checkable="true"
         android:checked="false"
         android:orderInCategory="85"
-        app:showAsAction="never"
-        android:title="@string/hide_offline" />
+        android:title="@string/hide_offline"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-        app:showAsAction="never"
-        android:title="@string/mgmt_account_edit" />
+        android:title="@string/mgmt_account_edit"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        app:showAsAction="never"
-        android:title="@string/action_settings" />
+        android:title="@string/action_settings"
+        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file