agorise/crystal-wallet-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added bottom buttons to balance, transactions and contacts

Browse source
This commit is contained in:
sjaramillo10 2017-11-16 23:43:10 -06:00 committed by Severiano Jaramillo
parent a10017edb0
commit b6a00f4c83
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
View file

@ -11,7 +11,6 @@ import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.widget.ImageButton; import android.widget.ImageButton;
import butterknife.BindView; import butterknife.BindView;

10
app/src/main/res/layout/board.xml
View file

@ -68,14 +68,21 @@
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Added bottom buttons to balance, transactions and contacts
android:id="@+id/fabReceive" android:id="@+id/fabReceive"
android:layout_width="250dp" android:layout_width="250dp"
android:layout_height="250dp" android:layout_height="250dp"
android:layout_gravity="start|bottom" android:layout_gravity="start|bottom"
android:layout_marginBottom="-125dp" android:layout_marginBottom="-125dp"
android:layout_marginStart="-125dp" android:layout_marginStart="-125dp"
<<<<<<< HEAD
app:backgroundTint="@color/white" app:backgroundTint="@color/white"
app:srcCompat="@drawable/receive_icon" /> 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.support.design.widget.FloatingActionButton
android:id="@+id/fabSend" android:id="@+id/fabSend"
@ -88,9 +95,12 @@
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/fabAddContact" android:id="@+id/fabAddContact"
<<<<<<< HEAD
======= =======
android:id="@+id/fab" android:id="@+id/fab"
>>>>>>> Added custom toolbar and tab labels to board activity >>>>>>> Added custom toolbar and tab labels to board activity
=======
>>>>>>> Added bottom buttons to balance, transactions and contacts
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end|bottom" android:layout_gravity="end|bottom"