diff --git a/app-template/package-template.json b/app-template/package-template.json index 3c92fdbbd..955e33e7e 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -60,6 +60,7 @@ "bower": "^1.7.9", "cordova-custom-config": "^3.0.5", "cordova-plugin-qrscanner": "^2.5.0", + "cordova-plugin-vibration": "^3.0.1", "coveralls": "^2.11.9", "express": "^4.11.2", "fs": "0.0.2", @@ -126,4 +127,4 @@ "pre-commit": "^1.1.3" }, "pre-commit": "unstage-package" -} +} \ No newline at end of file diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index e3b29a12d..5b67912c6 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -307,6 +307,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.amountModel.amount = ($scope.amountModel.amount + digit).replace('..', '.'); checkFontSize(); $scope.processAmount(); + navigator.vibrate(50); }; $scope.pushOperator = function(operator) { @@ -342,6 +343,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.amountModel.amount = $scope.alternativeAmount = $scope.globalResult = ''; $scope.allowSend = false; checkFontSize(); + navigator.vibrate(50); }; $scope.processAmount = function() { diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index bfda5cfc4..377cb9a49 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -6,7 +6,9 @@ angular.module('copayApp.controllers').controller('tabSendController', function( var CONTACTS_SHOW_LIMIT; var currentContactsPage; $scope.isChromeApp = platformInfo.isChromeApp; - + $scope.sectionDisplay = { + transferToWallet: false + }; var hasWallets = function() { $scope.wallets = profileService.getWallets({ @@ -247,4 +249,12 @@ angular.module('copayApp.controllers').controller('tabSendController', function( updateList(); }); }); + + $scope.toggle = function(section) { + $scope.sectionDisplay[section] = !$scope.sectionDisplay[section]; + $timeout(function() { + $ionicScrollDelegate.resize(); + $scope.$apply(); + }, 10); + }; }); diff --git a/www/img/icon-convert.svg b/www/img/icon-convert.svg new file mode 100644 index 000000000..6890197c1 --- /dev/null +++ b/www/img/icon-convert.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/www/views/amount.html b/www/views/amount.html index 13a795b0d..994c112cf 100644 --- a/www/views/amount.html +++ b/www/views/amount.html @@ -33,7 +33,7 @@ Send max amount -