diff --git a/.gitignore b/.gitignore
index 39b6783..3cba989 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@
*.apk
*.ap_
+# Built libraries
+*.aar
+# *.so
+
# Files for the ART/Dalvik VM
*.dex
@@ -12,6 +16,7 @@
bin/
gen/
out/
+target/
# Gradle files
.gradle/
@@ -19,6 +24,7 @@ build/
# Local configuration file (sdk path, etc)
local.properties
+.DS_Store
# Proguard folder generated by Eclipse
proguard/
@@ -34,17 +40,10 @@ captures/
# IntelliJ
*.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-.idea/caches
+.idea
# Keystore files
-# Uncomment the following line if you do not want to check your keystore files in.
-#*.jks
+*.jks
# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
diff --git a/zcash-android-wallet-app/README.md b/zcash-android-wallet-app/README.md
deleted file mode 100644
index ed9eb2e..0000000
--- a/zcash-android-wallet-app/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Wallet App
-Proof of concept for a zcash wallet. The Android app will leverage the SDK.
diff --git a/zcash-android-wallet-app/app/.gitignore b/zcash-android-wallet-app/app/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/zcash-android-wallet-app/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/zcash-android-wallet-app/app/build.gradle b/zcash-android-wallet-app/app/build.gradle
new file mode 100644
index 0000000..366c031
--- /dev/null
+++ b/zcash-android-wallet-app/app/build.gradle
@@ -0,0 +1,41 @@
+apply plugin: 'com.android.application'
+
+apply plugin: 'kotlin-android'
+
+apply plugin: 'kotlin-android-extensions'
+
+android {
+ compileSdkVersion 28
+ buildToolsVersion "28.0.3"
+ defaultConfig {
+ applicationId "cash.z.wallet.app"
+ minSdkVersion 21
+ targetSdkVersion 28
+ versionCode 1
+ versionName "1.0"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ implementation project(":sdk")
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
+ implementation 'android.arch.navigation:navigation-fragment:1.0.0-alpha06'
+ implementation 'android.arch.navigation:navigation-ui:1.0.0-alpha06'
+ implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha06'
+ implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0-alpha06'
+ implementation 'androidx.core:core-ktx:1.0.0'
+ implementation 'com.google.android.material:material:1.0.0-beta01'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
+}
diff --git a/zcash-android-wallet-app/app/proguard-rules.pro b/zcash-android-wallet-app/app/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/zcash-android-wallet-app/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/zcash-android-wallet-app/app/src/androidTest/java/cash/z/wallet/app/ExampleInstrumentedTest.kt b/zcash-android-wallet-app/app/src/androidTest/java/cash/z/wallet/app/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..d4f36b1
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/androidTest/java/cash/z/wallet/app/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package cash.z.wallet.app
+
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getTargetContext()
+ assertEquals("cash.z.wallet.app", appContext.packageName)
+ }
+}
diff --git a/zcash-android-wallet-app/app/src/main/AndroidManifest.xml b/zcash-android-wallet-app/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..ee73090
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/AndroidManifest.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/wallet/app/MainActivity.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/wallet/app/MainActivity.kt
new file mode 100644
index 0000000..c707770
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/java/cash/z/wallet/app/MainActivity.kt
@@ -0,0 +1,48 @@
+package cash.z.wallet.app
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import cash.z.wallet.sdk.jni.JniConverter
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import kotlinx.android.synthetic.main.activity_main.*
+
+class MainActivity : AppCompatActivity() {
+
+ var converter: JniConverter = JniConverter()
+
+ private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item ->
+ when (item.itemId) {
+ R.id.navigation_send -> {
+ message.setText(R.string.title_send)
+ return@OnNavigationItemSelectedListener true
+ }
+ R.id.navigation_receive -> {
+ message.setText(R.string.title_recieve)
+ return@OnNavigationItemSelectedListener true
+ }
+ R.id.navigation_invoice -> {
+ val homeText = "${getString(R.string.title_invoice)}\n${getString(R.string.sdk_test_message)}\n${checkJni()}"
+ message.setText(homeText)
+ return@OnNavigationItemSelectedListener true
+ }
+ }
+ false
+ }
+
+ private fun checkJni(): String {
+ try {
+ return when(converter.getMagicInt("forty-two")) {
+ 42 -> "Rust lib is connected!"
+ else -> "JNI call returned unexpected value"
+ }
+ } catch (t: Throwable) {}
+ return "Failure reading from JNI"
+ }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_main)
+
+ navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
+ }
+}
diff --git a/zcash-android-wallet-app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/zcash-android-wallet-app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..485bbd3
--- /dev/null
+++ b/zcash-android-wallet-app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+
+
+
+
+