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 7db621c..527c0c1 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
@@ -1,6 +1,7 @@
package cy.agorise.crystalwallet.activities;
import android.content.Intent;
+import android.content.res.Resources;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.TabLayout;
@@ -12,6 +13,7 @@ import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;
+import android.view.animation.LinearInterpolator;
import android.widget.ImageButton;
import butterknife.BindView;
@@ -71,7 +73,10 @@ public class BoardActivity extends AppCompatActivity {
});*/
// Hide Add Contact fab, it won't hide until first page changed...
- fabAddContact.hide();
+ // Convert 72dp to pixels (fab is 56dp in diameter + 16dp margin)
+ final int fabDistanceToHide = (int) (72 * Resources.getSystem().getDisplayMetrics().density);;
+ fabAddContact.animate().translationY(fabDistanceToHide)
+ .setInterpolator(new LinearInterpolator()).start();
// Hide and show respective fabs when convenient
mPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@@ -86,19 +91,22 @@ public class BoardActivity extends AppCompatActivity {
case 0:
fabReceive.show();
fabSend.show();
- fabAddContact.hide();
+ fabAddContact.animate().translationY(fabDistanceToHide)
+ .setInterpolator(new LinearInterpolator()).start();
break;
case 1:
fabReceive.show();
fabSend.show();
- fabAddContact.hide();
+ fabAddContact.animate().translationY(fabDistanceToHide)
+ .setInterpolator(new LinearInterpolator()).start();
break;
default:
fabReceive.hide();
fabSend.hide();
- fabAddContact.show();
+ fabAddContact.animate().translationY(0)
+ .setInterpolator(new LinearInterpolator()).start();
break;
}
}
diff --git a/app/src/main/res/drawable/add_contact_fab.png b/app/src/main/res/drawable/add_contact_fab.png
new file mode 100644
index 0000000..95b9b88
Binary files /dev/null and b/app/src/main/res/drawable/add_contact_fab.png differ
diff --git a/app/src/main/res/drawable/receive_icon.png b/app/src/main/res/drawable/receive_icon.png
index eb7b0f1..8ccf611 100644
Binary files a/app/src/main/res/drawable/receive_icon.png and b/app/src/main/res/drawable/receive_icon.png differ
diff --git a/app/src/main/res/drawable/roundcorner.xml b/app/src/main/res/drawable/roundcorner.xml
new file mode 100644
index 0000000..41081b5
--- /dev/null
+++ b/app/src/main/res/drawable/roundcorner.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/send_icon.png b/app/src/main/res/drawable/send_icon.png
new file mode 100644
index 0000000..7e6c965
Binary files /dev/null and b/app/src/main/res/drawable/send_icon.png differ
diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml
index 90f8ff8..f0032e1 100644
--- a/app/src/main/res/layout/board.xml
+++ b/app/src/main/res/layout/board.xml
@@ -5,7 +5,6 @@
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:theme="@style/AppTheme.NoActionBar"
android:fitsSystemWindows="true">
+ app:title="Client Logo"
+ app:titleTextColor="@color/white" >
-
+
+
+
+ android:layout_height="wrap_content"
+ android:animateLayoutChanges="true">
+ app:backgroundTint="@color/white"
+ app:srcCompat="@drawable/send_icon" />
+ app:backgroundTint="@color/colorPrimaryDark"
+ app:srcCompat="@drawable/add_contact_fab" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e2f6b22..f25d51a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,6 +7,7 @@
#686767
#ffffff
#f0006b
+ #00ffffff
#147b00
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f7a00e7..45357aa 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,5 @@
-
-
-
-
+
-