2018-01-09 UPSTREAM: merge translation + UTXO update

.gitignore

@@ -38,4 +38,6 @@ plugins
 
 .vscode/
 dist/
-lib/
+lib/
+.idea/
+release.apk

README.md

@@ -2,24 +2,41 @@
 
 ZENCash mobile app built using Onsen UI, Redux, React and Webpack.
 
-Use node v6.11.X
+Use node v6.15.1
 
 ## Setup instructions
 
 ```
-npm install -g yarn cordova
+export ANDROID_HOME=<path to sdk>
+npm install -g yarn cordova@7.1.0
 yarn install
 cordova plugin add cordova-plugin-qrscanner cordova-plugin-file cordova-plugin-http cordova-clipboard cordova-plugin-inappbrowser cordova-plugin-device cordova-plugin-wkwebview-engine cordova-plugin-whitelist
-cordova plugin add cordova-plugin-google-analytics
-cordova platform add [android@6.2.3 | ios]
-cordova run [android | ios]
+cordova platform add android@6.2.3
+cordova run android
+
+# Generate a Signed APK
+cordova build --release android
+zipalign -v 4 <Example-release-unsigned.apk> <Example.apk>
+apksigner sign --ks <keystorename> <Example.apk>
+
+```
+
+## Updating Color Scheme or Logo
+Toolbar color scheme location:
+```
+assets/css/index.css
+```
+
+Logo location:
+```
+assets/img/zencash.png
 ```
 
 ### iOS FAQ
 
 1. Icons
 
-Icons are a bit of a bitch to setup for iOS. Make sure you've added the ios platform to cordova, and copy the folder `./assets/img/ios/AppIcon.appiconset` to `./platforms/ios/ZEN\ Wallet/Images.xcassets`. Remove the folder `AppIcon.appiconset` if it exists in `./platforms/ios/ZEN\ Wallet/Images.xcassets`.
+Icons are a bit of a pain to setup for iOS. Make sure you've added the ios platform to cordova, and copy the folder `./assets/img/ios/AppIcon.appiconset` to `./platforms/ios/ZEN\ Wallet/Images.xcassets`. Remove the folder `AppIcon.appiconset` if it exists in `./platforms/ios/ZEN\ Wallet/Images.xcassets`.
 
 2. `.ipa` files (using it on a real iPhone)
 

assets/css/index.css

@@ -1,3 +1,3 @@
 .toolbar {
-  background-color: #e67e22;
+  background-color: #041742;
 }

config.xml

@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.zensystem.zencashwallet" version="0.0.12" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.zensystem.zencashwallet" version="0.0.16" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>ZEN Wallet</name>
     <description>
         ZEN Wallet
     </description>
-    <author email="kendricktan0814@gmail.com" href="https://kndrck.co">
-        Kendrick Tan
+    <author email="infrastructure@horizen.global" href="https://horizen.global">
+       Horizen Global 
     </author>
     <content src="index.html" />
     <access origin="*" />
@@ -18,6 +18,8 @@
     <platform name="android">
         <allow-intent href="market:*" />
         <preference name="android-minSdkVersion" value="19" />
+        <preference name="android-targetSdkVersion" value="26" />
+        <preference name="android-maxSdkVersion" value="28" />
     </platform>
     <platform name="ios">
         <allow-intent href="itms:*" />
@@ -37,13 +39,12 @@
     <access origin="*" />
     <allow-intent href="*" />
     <engine name="android" spec="^6.2.3" />
-    <plugin name="cordova-plugin-qrscanner" spec="^2.5.0" />
     <plugin name="cordova-plugin-file" spec="^4.3.3" />
+    <plugin name="cordova-plugin-qrscanner" spec="^2.6.1" />
     <plugin name="cordova-plugin-http" spec="^1.2.0" />
-    <plugin name="cordova-clipboard" spec="^1.1.1" />
-    <plugin name="cordova-plugin-inappbrowser" spec="^1.7.2" />
-    <plugin name="cordova-plugin-device" spec="^1.1.7" />
+    <plugin name="cordova-clipboard" spec="^1.2.1" />
+    <plugin name="cordova-plugin-inappbrowser" spec="^3.0.0" />
+    <plugin name="cordova-plugin-device" spec="^2.0.2" />
     <plugin name="cordova-plugin-wkwebview-engine" spec="^1.1.4" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
-    <plugin name="cordova-plugin-google-analytics" spec="^1.8.3" />
 </widget>