diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/activity/MainActivity.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/activity/MainActivity.kt
index 758a6fd..6037f0b 100644
--- a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/activity/MainActivity.kt
+++ b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/activity/MainActivity.kt
@@ -71,10 +71,6 @@ class MainActivity : DaggerAppCompatActivity() {
}
}
- private fun fabVisibilityListener() {
-
- }
-
private fun onFabClicked(view: View) {
Snackbar.make(view, if (sanity.stillSane) "Your imaginary ZEC is in flight." else "You've lost your marbles.", Snackbar.LENGTH_LONG)
.setAction("Action", null).show()
diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HomeFragment.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HomeFragment.kt
index aada9b5..35afb57 100644
--- a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HomeFragment.kt
+++ b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HomeFragment.kt
@@ -8,6 +8,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import cash.z.android.wallet.R
+import cash.z.android.wallet.ui.activity.MainActivity
// TODO: Rename parameter arguments, choose names that match
@@ -53,13 +54,9 @@ class HomeFragment : Fragment() {
override fun onAttach(context: Context) {
super.onAttach(context)
- if (context is OnFragmentInteractionListener) {
- listener = context
- } else {
-// throw RuntimeException(context.toString() + " must implement OnFragmentInteractionListener")
- }
}
+
override fun onDetach() {
super.onDetach()
listener = null
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_chat_24dp.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_chat_24dp.xml
new file mode 100644
index 0000000..e3489bd
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_chat_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_history_24dp.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_history_24dp.xml
new file mode 100644
index 0000000..a61de1b
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_history_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_home_black_24dp.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_home_24dp.xml
similarity index 100%
rename from zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_home_black_24dp.xml
rename to zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_home_24dp.xml
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_import.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_import.xml
new file mode 100644
index 0000000..25b07b5
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_import.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_qrcode_black_24dp.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_qrcode_24dp.xml
similarity index 100%
rename from zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_qrcode_black_24dp.xml
rename to zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_qrcode_24dp.xml
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_receipt_black_24dp.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_receipt_24dp.xml
similarity index 100%
rename from zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_receipt_black_24dp.xml
rename to zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_receipt_24dp.xml
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_settings_24dp.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_settings_24dp.xml
new file mode 100644
index 0000000..ace746c
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v21/ic_settings_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable/empty_wallet.png b/zcash-android-wallet-app/app/src/main/res/drawable/empty_wallet.png
new file mode 100755
index 0000000..6f0090e
Binary files /dev/null and b/zcash-android-wallet-app/app/src/main/res/drawable/empty_wallet.png differ
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable/zcash_logo_with_shadow.png b/zcash-android-wallet-app/app/src/main/res/drawable/zcash_logo_with_shadow.png
new file mode 100755
index 0000000..5962e26
Binary files /dev/null and b/zcash-android-wallet-app/app/src/main/res/drawable/zcash_logo_with_shadow.png differ
diff --git a/zcash-android-wallet-app/app/src/main/res/layout/fragment_home.xml b/zcash-android-wallet-app/app/src/main/res/layout/fragment_home.xml
index 1810d97..0d4fac5 100644
--- a/zcash-android-wallet-app/app/src/main/res/layout/fragment_home.xml
+++ b/zcash-android-wallet-app/app/src/main/res/layout/fragment_home.xml
@@ -1,5 +1,5 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ android:layout_gravity="bottom|end"
+ android:layout_margin="@dimen/fab_margin"
+ android:backgroundTint="@color/colorPrimary"
+ android:tint="@color/fab_icon_color"
+ app:srcCompat="@drawable/ic_add_black_24dp" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/zcash-android-wallet-app/app/src/main/res/layout/nav_header_main.xml b/zcash-android-wallet-app/app/src/main/res/layout/nav_header_main.xml
index bc5a839..019230d 100644
--- a/zcash-android-wallet-app/app/src/main/res/layout/nav_header_main.xml
+++ b/zcash-android-wallet-app/app/src/main/res/layout/nav_header_main.xml
@@ -23,16 +23,15 @@
diff --git a/zcash-android-wallet-app/app/src/main/res/values/drawables.xml b/zcash-android-wallet-app/app/src/main/res/values/drawables.xml
deleted file mode 100644
index 52c6a6c..0000000
--- a/zcash-android-wallet-app/app/src/main/res/values/drawables.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
- - @android:drawable/ic_menu_camera
- - @android:drawable/ic_menu_gallery
- - @android:drawable/ic_menu_slideshow
- - @android:drawable/ic_menu_manage
- - @android:drawable/ic_menu_share
- - @android:drawable/ic_menu_send
-
diff --git a/zcash-android-wallet-app/app/src/main/res/values/strings.xml b/zcash-android-wallet-app/app/src/main/res/values/strings.xml
index 4f89da9..6245ad7 100644
--- a/zcash-android-wallet-app/app/src/main/res/values/strings.xml
+++ b/zcash-android-wallet-app/app/src/main/res/values/strings.xml
@@ -12,11 +12,13 @@
Send Zcash
Receive Zcash
Request Zcash
-
Home
Send
Receive
Request
-
+ About
+ History
+ Import
+ Settings
diff --git a/zcash-android-wallet-app/screen.png b/zcash-android-wallet-app/screen.png
new file mode 100644
index 0000000..c1b5929
Binary files /dev/null and b/zcash-android-wallet-app/screen.png differ