use fab in choose contact activity. scan qr not yet working

2 files changed, 25 insertions, 25 deletions

diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml
index c5158510b..5767def46 100644
--- a/src/main/res/layout/activity_choose_contact.xml
+++ b/src/main/res/layout/activity_choose_contact.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/color_background_primary">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <ListView
-        android:id="@+id/choose_contact_list"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:divider="@android:color/transparent"
-        android:dividerHeight="0dp"
-        tools:listitem="@layout/contact" />
+        android:background="?attr/color_background_primary">
 
-</LinearLayout>
\ No newline at end of file
+        <ListView
+            android:id="@+id/choose_contact_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="0dp"/>
+
+        <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:layout_margin="16dp"
+            android:src="@drawable/ic_person_add_white_24dp"/>
+    </FrameLayout>
+</layout>
\ No newline at end of file
diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index b0f907ffd..4602d0e53 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -7,19 +7,11 @@
         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:visible="false" />
-
+        android:title="@string/search"/>
     <item
-        android:id="@+id/action_block_jid"
-        android:icon="?attr/icon_add_person"
+        android:id="@+id/action_scan_qr_code"
+        android:title="@string/scan_qr_code"
+        android:icon="?attr/icon_scan_qr_code"
         app:showAsAction="always"
-        android:title="@string/block_jabber_id"
-        android:visible="false" />
-</menu>
+        android:visible="false"/>
+</menu>
\ No newline at end of file