From b6a00f4c8320ac8ca9430fcc163a9872f57402ba Mon Sep 17 00:00:00 2001
From: sjaramillo10 <severiano.jaramillo@gmail.com>
Date: Thu, 16 Nov 2017 23:43:10 -0600
Subject: [PATCH] Added bottom buttons to balance, transactions and contacts

---
 .../crystalwallet/activities/BoardActivity.java        |  3 +--
 app/src/main/res/layout/board.xml                      | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
index 6727373..8e7fe0c 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -11,7 +11,6 @@ import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-
 import android.widget.ImageButton;
 
 import butterknife.BindView;
@@ -69,7 +68,7 @@ public class BoardActivity  extends AppCompatActivity {
                         .setAction("Action", null).show();
             }
         });*/
-
+        
         // Hide Add Contact fab, it won't hide until first page changed...
         fabAddContact.hide();
 
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 28eb96c..5e009a2 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -68,14 +68,21 @@
 
     <android.support.design.widget.FloatingActionButton
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Added bottom buttons to balance, transactions and contacts
         android:id="@+id/fabReceive"
         android:layout_width="250dp"
         android:layout_height="250dp"
         android:layout_gravity="start|bottom"
         android:layout_marginBottom="-125dp"
         android:layout_marginStart="-125dp"
+<<<<<<< HEAD
         app:backgroundTint="@color/white"
         app:srcCompat="@drawable/receive_icon" />
+=======
+        app:srcCompat="@android:drawable/ic_dialog_email" />
+>>>>>>> Added bottom buttons to balance, transactions and contacts
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fabSend"
@@ -88,9 +95,12 @@
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fabAddContact"
+<<<<<<< HEAD
 =======
         android:id="@+id/fab"
 >>>>>>> Added custom toolbar and tab labels to board activity
+=======
+>>>>>>> Added bottom buttons to balance, transactions and contacts
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"