Migrate keyboard from Sam and some fixes
This commit is contained in:
parent
f4c0cc2bad
commit
2f73ffd61c
6 changed files with 35 additions and 5 deletions
|
|
@ -60,6 +60,7 @@
|
||||||
"bower": "^1.7.9",
|
"bower": "^1.7.9",
|
||||||
"cordova-custom-config": "^3.0.5",
|
"cordova-custom-config": "^3.0.5",
|
||||||
"cordova-plugin-qrscanner": "^2.5.0",
|
"cordova-plugin-qrscanner": "^2.5.0",
|
||||||
|
"cordova-plugin-vibration": "^3.0.1",
|
||||||
"coveralls": "^2.11.9",
|
"coveralls": "^2.11.9",
|
||||||
"express": "^4.11.2",
|
"express": "^4.11.2",
|
||||||
"fs": "0.0.2",
|
"fs": "0.0.2",
|
||||||
|
|
@ -126,4 +127,4 @@
|
||||||
"pre-commit": "^1.1.3"
|
"pre-commit": "^1.1.3"
|
||||||
},
|
},
|
||||||
"pre-commit": "unstage-package"
|
"pre-commit": "unstage-package"
|
||||||
}
|
}
|
||||||
|
|
@ -307,6 +307,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
$scope.amountModel.amount = ($scope.amountModel.amount + digit).replace('..', '.');
|
$scope.amountModel.amount = ($scope.amountModel.amount + digit).replace('..', '.');
|
||||||
checkFontSize();
|
checkFontSize();
|
||||||
$scope.processAmount();
|
$scope.processAmount();
|
||||||
|
navigator.vibrate(50);
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.pushOperator = function(operator) {
|
$scope.pushOperator = function(operator) {
|
||||||
|
|
@ -342,6 +343,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
$scope.amountModel.amount = $scope.alternativeAmount = $scope.globalResult = '';
|
$scope.amountModel.amount = $scope.alternativeAmount = $scope.globalResult = '';
|
||||||
$scope.allowSend = false;
|
$scope.allowSend = false;
|
||||||
checkFontSize();
|
checkFontSize();
|
||||||
|
navigator.vibrate(50);
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.processAmount = function() {
|
$scope.processAmount = function() {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,9 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
|
||||||
var CONTACTS_SHOW_LIMIT;
|
var CONTACTS_SHOW_LIMIT;
|
||||||
var currentContactsPage;
|
var currentContactsPage;
|
||||||
$scope.isChromeApp = platformInfo.isChromeApp;
|
$scope.isChromeApp = platformInfo.isChromeApp;
|
||||||
|
$scope.sectionDisplay = {
|
||||||
|
transferToWallet: false
|
||||||
|
};
|
||||||
|
|
||||||
var hasWallets = function() {
|
var hasWallets = function() {
|
||||||
$scope.wallets = profileService.getWallets({
|
$scope.wallets = profileService.getWallets({
|
||||||
|
|
@ -247,4 +249,12 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
|
||||||
updateList();
|
updateList();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$scope.toggle = function(section) {
|
||||||
|
$scope.sectionDisplay[section] = !$scope.sectionDisplay[section];
|
||||||
|
$timeout(function() {
|
||||||
|
$ionicScrollDelegate.resize();
|
||||||
|
$scope.$apply();
|
||||||
|
}, 10);
|
||||||
|
};
|
||||||
});
|
});
|
||||||
|
|
|
||||||
15
www/img/icon-convert.svg
Normal file
15
www/img/icon-convert.svg
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
||||||
|
<g>
|
||||||
|
<g>
|
||||||
|
<g>
|
||||||
|
<path d="M304.1,32c44.8,0,48,26.9,48,32v393.4l-84.6-84.6l-22.7,22.6l112,112c6.2,6.2,16.3,6.2,22.6,0l112-112l-22.6-22.6
|
||||||
|
l-84.6,84.6V64c0-22.1-16-64-80-64l-48,0v32H304.1z"/>
|
||||||
|
<path d="M208.1,480c-44.8,0-48-26.9-48-32V54.6l84.6,84.6l22.6-22.6l-112-112c-6.2-6.2-16.3-6.2-22.6,0l-112,112l22.7,22.7
|
||||||
|
l84.6-84.8V448c0,22.1,16,64,80,64h48v-32H208.1z"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 744 B |
|
|
@ -33,7 +33,7 @@
|
||||||
<span translate>Send max amount</span>
|
<span translate>Send max amount</span>
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
<button class="button button-sendmax" modal-select ng-model="someModel" options="selectables" modal-title="Select a number">
|
<button class="button button-sendmax" ng-click="changeUnit()" modal-select ng-model="someModel" options="selectables" modal-title="Select a number">
|
||||||
<span>
|
<span>
|
||||||
<i class="icon ion-social-usd"></i> 
|
<i class="icon ion-social-usd"></i> 
|
||||||
<span translate>Change currency</span>
|
<span translate>Change currency</span>
|
||||||
|
|
|
||||||
|
|
@ -66,10 +66,12 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card" ng-if="showTransferCard && hasFunds">
|
<div class="card" ng-if="showTransferCard && hasFunds">
|
||||||
<div class="item item-heading">
|
<div class="item item-icon-right item-heading" ng-click="toggle('transferToWallet')">
|
||||||
<span translate>Transfer to Wallet</span>
|
<span translate>Transfer to Wallet</span>
|
||||||
|
<i class="icon bp-arrow-up" ng-show="sectionDisplay.transferToWallet"></i>
|
||||||
|
<i class="icon bp-arrow-down" ng-show="!sectionDisplay.transferToWallet"></i>
|
||||||
</div>
|
</div>
|
||||||
<div class="list">
|
<div class="list" ng-show="sectionDisplay.transferToWallet">
|
||||||
<a class="item item-icon-left item-icon-right"
|
<a class="item item-icon-left item-icon-right"
|
||||||
ng-repeat="item in list"
|
ng-repeat="item in list"
|
||||||
ng-if="hasWallets && item.recipientType == 'wallet'"
|
ng-if="hasWallets && item.recipientType == 'wallet'"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue