Merge branch 'master' of github.com:720kb/BitNFC

README.md

@@ -1,8 +1,9 @@
 # BitNFC
 
-[![Join the chat at https://gitter.im/720kb/BitNFC](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/720kb/BitNFC?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 <img src="http://mkvphoto.s3.amazonaws.com/BitNFC/small/logo.png"/>
 
+[![Join the chat at https://gitter.im/720kb/BitNFC](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/720kb/BitNFC?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 [![Code Climate](https://codeclimate.com/github/720kb/BitNFC/badges/gpa.svg)](https://codeclimate.com/github/720kb/BitNFC)
 
 <img src="http://mkvphoto.s3.amazonaws.com/BitNFC/small/screen_home2.png" width="32.8%"/>

config.xml

@@ -1,45 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version='1.0' encoding='utf-8'?>
 <widget id="com.ionicframework.bitnfc898800" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-  <name>BitNFC</name>
-  <description>
+    <name>BitNFC</name>
+    <description>
         Bitcoin + nfc
     </description>
-  <author email="[email protected]" href="720kb.net"></author>
-  <content src="index.html"/>
-  <access origin="*"/>
-  <!-- Allow links to web pages to open in a browser -->
-  <allow-intent href="http://*/*" />
-  <allow-intent href="https://*/*" />
-  <preference name="xwalkVersion" value="14.43.343.4" />
-  <preference name="webviewbounce" value="false"/>
-  <preference name="UIWebViewBounce" value="false"/>
-  <preference name="DisallowOverscroll" value="true"/>
-  <preference name="BackupWebStorage" value="none"/>
-  <preference name="SplashScreen" value="screen"/>
-  <preference name="SplashScreenDelay" value="3000"/>
-  <feature name="StatusBar">
-    <param name="ios-package" value="CDVStatusBar" onload="true"/>
-  </feature>
-  <platform name="android">
-    <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
-    <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
-    <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
-    <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
-    <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
-    <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
-    <splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
-    <splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
-    <splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
-    <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
-    <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
-    <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
-    <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
-    <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
-    <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
-    <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
-    <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
-    <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
-  </platform>
-  <icon src="resources/android/icon/drawable-xhdpi-icon.png"/>
-  <plugin name="com.verso.cordova.clipboard" spec="https://github.com/VersoSolutions/CordovaClipboard" />
-</widget>
+    <author email="[email protected]" href="720kb.net" />
+    <content src="index.html" />
+    <access origin="*" />
+    <allow-intent href="http://*/*" />
+    <allow-intent href="https://*/*" />
+    <preference name="xwalkVersion" value="14+" />
+    <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect" />
+    <preference name="xwalkMode" value="embedded" />
+    <preference name="webviewbounce" value="false" />
+    <preference name="UIWebViewBounce" value="false" />
+    <preference name="DisallowOverscroll" value="true" />
+    <preference name="BackupWebStorage" value="none" />
+    <preference name="SplashScreen" value="screen" />
+    <preference name="SplashScreenDelay" value="3000" />
+    <preference name="orientation" value="portrait" />
+    <feature name="StatusBar">
+        <param name="ios-package" onload="true" value="CDVStatusBar" />
+    </feature>
+    <platform name="android">
+        <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
+        <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
+        <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
+        <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
+        <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
+        <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
+        <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.9.png" />
+        <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.9.png" />
+        <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.9.png" />
+        <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.9.png" />
+        <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.9.png" />
+        <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.9.png" />
+    </platform>
+    <icon src="resources/android/icon/drawable-xhdpi-icon.png" />
+    <plugin name="com.verso.cordova.clipboard" spec="https://github.com/VersoSolutions/CordovaClipboard" />
+</widget>

www/views/home/index.html

@@ -3,9 +3,7 @@
     <div class="text-center">
       <div class="separator10"></div>
       <h3>Phone Wallet</h3>
-      <div class="separator10"></div>
       <h4>Address</h4>
-      <div class="separator10"></div>
       <img class="light-bg qr" ng-click="qrTap = !qrTap" ng-class="{'active': qrTap}" ng-src="http://api.qrserver.com/v1/create-qr-code/?data={{publicAddress.toString()}}&color=000000&bgcolor=FFFFFF&qzone=1&margin=0&size=400x400&ecc=L" width="35%"/>
       <div><small class="dark">Tap to enlarge</small></div>
       <div class="separator40"></div>

www/views/layout/index.html

@@ -8,7 +8,7 @@
 						●
 					</span>
 				</button>
-				<button class="button button-icon button-clear ion-grid" menu-toggle="right">
+				<button class="button button-icon button-clear ion-gear-b button-royal" menu-toggle="right">
 				</button>
 			</ion-nav-buttons>
 		</ion-nav-bar>
@@ -48,7 +48,7 @@ <h1 class="title">
 		</a>
 	</div> -->
 	<!--debug end-->
-	<div class="button-bar">
+	<div class="button-bar no-borders">
 		<a class="button button-royal" ui-sref="app.receive" ui-sref-active="active">
 			<i class="icon ion-arrow-down-a"></i>
 			<p>Receive</p>