Implement Floating ActionButton

Author: kunall17

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

@@ -29,6 +29,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
@@ -61,11 +62,8 @@
 import com.j256.ormlite.android.AndroidDatabaseResults;
 import com.zulip.android.BuildConfig;
 import com.zulip.android.database.DatabaseHelper;
-<<<<<<< 570cc3a5e10b8fa1d614fb8f139261a05897c3a7
 import com.zulip.android.models.Emoji;
-=======
 import com.zulip.android.filters.NarrowFilterToday;
->>>>>>> Filter by today's messages
 import com.zulip.android.models.Message;
 import com.zulip.android.models.MessageType;
 import com.zulip.android.filters.NarrowFilter;
@@ -112,6 +110,8 @@ public class ZulipActivity extends AppCompatActivity implements
     private DrawerLayout drawerLayout;
     private ActionBarDrawerToggle drawerToggle;
     ExpandableListView streamsDrawer;
+    private LinearLayout chatBox;
+    private FloatingActionButton fab;
 
     private HashMap<String, Bitmap> gravatars = new HashMap<>();
 
@@ -390,6 +390,7 @@ public void onClick(View v) {
         streamActv.setAdapter(streamActvAdapter);
         topicActv.setAdapter(subjectActvAdapter);
         checkAndSetupStreamsDrawer();
+<<<<<<< a44f4687bd03950b07becf52be5222d106af8588
         SimpleCursorAdapter combinedAdapter = new SimpleCursorAdapter(
                 that, R.layout.emoji_tile, null,
                 new String[]{Emoji.NAME_FIELD, Emoji.NAME_FIELD},
@@ -487,8 +488,15 @@ private Cursor makePeopleNameCursor(CharSequence name) throws SQLException {
                                 + Person.NAME_FIELD + " COLLATE NOCASE",
                         DatabaseHelper.likeEscape(name.toString()) + "%")
                 .closeableIterator().getRawResults()).getRawCursor();
+=======
+        setupFab();
+>>>>>>> Implement Floating ActionButton
     }
 
+    private void setupFab() {
+        fab = (FloatingActionButton) findViewById(R.id.fab);
+        chatBox = (LinearLayout) findViewById(R.id.messageBoxContainer);
+    }
     public void setupListViewAdapter() {
         ExpandableStreamDrawerAdapter streamsDrawerAdapter = null;
         Callable<Cursor> streamsGenerator = new Callable<Cursor>() {

app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png

@@ -39,6 +39,17 @@
 
             <include layout="@layout/chatbox" />
         </LinearLayout>
+
+        <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"
+            app:backgroundTint="@color/colorPrimary"
+            android:src="@drawable/ic_mode_edit_black_24dp"
+            app:borderWidth="0dp"
+            app:layout_behavior="com.zulip.android.util.RemoveViewsOnScroll" />
     </android.support.design.widget.CoordinatorLayout>
 
     <ExpandableListView