From 702697a9dcb74e197949af65f0fdeb6dcd7de28d Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 11:45:11 -0400 Subject: [PATCH 01/35] prelim send screen styling --- src/js/controllers/confirm.js | 11 ++++ src/js/routes.js | 2 +- src/sass/buttons.scss | 3 +- src/sass/views/confirm.scss | 60 +++++++++---------- src/sass/views/includes/txp-details.scss | 5 +- www/views/confirm.html | 74 +++++++++++++++++++++++- 6 files changed, 119 insertions(+), 36 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index d8dc250c0..7c1289967 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -40,6 +40,8 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.toAmount = parseInt($scope.toAmount); $scope.amountStr = txFormatService.formatAmountStr($scope.toAmount); + $scope.displayAmount = getDisplayAmount($scope.amountStr); + $scope.displayUnit = getDisplayUnit($scope.amountStr); var networkName = (new bitcore.Address($scope.toAddress)).network.name; $scope.network = networkName; @@ -75,6 +77,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( if (++index == wallets.length) { if (!lodash.isEmpty(filteredWallets)) { $scope.wallets = lodash.clone(filteredWallets); + setWallet($scope.wallets[0]); } else { if (!enoughFunds) @@ -123,6 +126,14 @@ angular.module('copayApp.controllers').controller('confirmController', function( }); }; + function getDisplayAmount(amountStr) { + return amountStr.split(' ')[0]; + } + + function getDisplayUnit(amountStr) { + return amountStr.split(' ')[1]; + } + var setFromPayPro = function(uri, cb) { if (!cb) cb = function() {}; diff --git a/src/js/routes.js b/src/js/routes.js index ed29cd0a0..d04fcfef1 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -986,7 +986,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); - $state.go('tabs.home'); + //$state.go('tabs.home'); } }); }); diff --git a/src/sass/buttons.scss b/src/sass/buttons.scss index 5c0c05713..0978eb2bd 100644 --- a/src/sass/buttons.scss +++ b/src/sass/buttons.scss @@ -19,7 +19,8 @@ $button-secondary-border: transparent; $button-secondary-active-bg: darken($subtle-gray, 5%); $button-secondary-active-border: transparent; -%button-standard { +%button-standard, +click-to-accept { width: 85%; max-width: 300px; margin-left: auto; diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index 667184165..00f4f0f20 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -1,30 +1,30 @@ -#view-confirm { - .icon-bitpay-card { - background-image: url("../img/icon-bitpay.svg"); - } - .slide-to-pay{ - bottom: 149px; - } - .send-gravatar { - left: 11px; - position: absolute; - top: 10px; - } - .accept-slide { - position: fixed; - bottom: 0; - width: 100%; - height: 100px; - background-color: #647CE8; - color: #ffffff; - font-size: 25px; - text-align: center; - padding-top: 34px; - line-height: 32px; - } - .accept-slide i { - float: right; - font-size: 32px; - margin-right: 20px; - } -} +// #view-confirm { +// .icon-bitpay-card { +// background-image: url("../img/icon-bitpay.svg"); +// } +// .slide-to-pay{ +// bottom: 92px; +// } +// .send-gravatar { +// left: 11px; +// position: absolute; +// top: 10px; +// } +// .accept-slide { +// position: fixed; +// bottom: 0; +// width: 100%; +// height: 100px; +// background-color: #647CE8; +// color: #ffffff; +// font-size: 25px; +// text-align: center; +// padding-top: 34px; +// line-height: 32px; +// } +// .accept-slide i { +// float: right; +// font-size: 32px; +// margin-right: 20px; +// } +// } diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 76f48336d..4cce40298 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -1,4 +1,5 @@ -#txp-details { +#txp-details, +#view-confirm { $item-lateral-padding: 20px; $item-vertical-padding: 10px; $item-border-color: #EFEFEF; @@ -8,7 +9,7 @@ background: #f5f5f5; } .slide-to-pay { - bottom: 100px; + bottom: 92px; } .head { padding: 30px $item-lateral-padding 4rem; diff --git a/www/views/confirm.html b/www/views/confirm.html index cb2a3063b..d772c9164 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -7,7 +7,77 @@ - + +
+
+
+ + Sending +
+
+
{{displayAmount}} {{displayUnit}}
+
{{alternativeAmountStr}}
+
+
+
+
+ To + + + {{toAddress}} + + +
+
+ From +
+ + + +
{{wallet.name}}
+
+
+
+ {{'Memo'|translate}} + + {{description}} + +
+
+ Fee + + {{fee}} + +
+
+
+ + + Slide to pay + + + Payment Sent + Proposal Created + + + From d10e0bfcc9254fbd2120246209c371ee8b29f65a Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 12:15:24 -0400 Subject: [PATCH 02/35] make send screen items clickable --- src/sass/views/includes/txp-details.scss | 31 ++++++++++++++++-------- www/views/confirm.html | 17 +++++++------ 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 4cce40298..498665c31 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -51,7 +51,13 @@ } .item { color: #4A4A4A; - padding: $item-vertical-padding $item-lateral-padding; + padding-top: $item-vertical-padding; + padding-bottom: $item-vertical-padding; + padding-left: $item-lateral-padding; + + &:not(.item-icon-right) { + padding-right: $item-lateral-padding; + } .label { font-size: 14px; @@ -62,7 +68,8 @@ &.single-line { display: flex; align-items: center; - padding: 17px $item-lateral-padding; + padding-top: 17px; + padding-bottom: 17px; .label { margin: 0; @@ -113,15 +120,19 @@ display: flex; align-items: center; padding: .2rem 0; - i { + margin-bottom: 5px; + + > i { padding: 0; - } - img { - height: 24px; - width: 24px; - padding: 2px; - margin-right: .7rem; - box-shadow: none; + position: static; + + > img { + height: 24px; + width: 24px; + padding: 2px; + margin-right: .7rem; + box-shadow: none; + } } } diff --git a/www/views/confirm.html b/www/views/confirm.html index d772c9164..411fe4b63 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -29,7 +29,7 @@ Multiple recipients --> -
+ From
@@ -37,19 +37,22 @@
{{wallet.name}}
-
-
- {{'Memo'|translate}} + + + + {{'Add Memo'|translate}} {{description}} -
-
+ + + Fee {{fee}} -
+ + From 7f180d1335924d38114dcd674e75f54480daa3d9 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 12:31:38 -0400 Subject: [PATCH 03/35] lighten arrows --- src/sass/icons.scss | 1 + src/sass/views/includes/txp-details.scss | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/sass/icons.scss b/src/sass/icons.scss index fd352e9ca..2cb69734f 100644 --- a/src/sass/icons.scss +++ b/src/sass/icons.scss @@ -1,5 +1,6 @@ .icon.bp-arrow-right { @extend .ion-ios-arrow-right; + color: #bfbfbf; } .icon.bp-arrow-down { diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 498665c31..f03cc201c 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -122,6 +122,10 @@ padding: .2rem 0; margin-bottom: 5px; + ~ .bp-arrow-right { + top: 14px; + } + > i { padding: 0; position: static; From d56504b2537e3f6664e1d46e9dee5624c2dd9e9d Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 13:48:32 -0400 Subject: [PATCH 04/35] add click to accept component to send screen --- www/views/confirm.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/www/views/confirm.html b/www/views/confirm.html index 411fe4b63..a17a8d3b9 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -55,6 +55,12 @@ + + Click to pay + Date: Wed, 12 Oct 2016 14:04:23 -0400 Subject: [PATCH 05/35] handle insufficient funds case --- src/sass/views/includes/txp-details.scss | 4 ++++ www/views/confirm.html | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index f03cc201c..c5d216e8f 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -49,6 +49,10 @@ span { display: block; } + .badge { + border-radius: 0; + padding: .5rem; + } .item { color: #4A4A4A; padding-top: $item-vertical-padding; diff --git a/www/views/confirm.html b/www/views/confirm.html index a17a8d3b9..0fbffddb9 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -29,7 +29,10 @@ Multiple recipients --> - +
+ Insufficient funds +
+ From
@@ -39,14 +42,14 @@
- + {{'Add Memo'|translate}} {{description}} - + Fee {{fee}} From ce298fdfb69588faf87702a4c3de051283b02a5e Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 12 Oct 2016 15:01:48 -0400 Subject: [PATCH 06/35] prelim action sheet directive --- src/js/controllers/confirm.js | 5 ++++ src/js/directives/actionSheet.js | 23 +++++++++++++++ src/sass/views/includes/actionSheet.scss | 37 ++++++++++++++++++++++++ src/sass/views/views.scss | 1 + www/views/confirm.html | 5 +++- www/views/includes/actionSheet.html | 8 +++++ 6 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 src/js/directives/actionSheet.js create mode 100644 src/sass/views/includes/actionSheet.scss create mode 100644 www/views/includes/actionSheet.html diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 7c1289967..7eeab75be 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -111,6 +111,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( setWallet(wallet, true); }); + $scope.showWalletSelector = function() { + console.log('showWalletSelector called'); + $scope.showWallets = true; + }; + $scope.showDescriptionPopup = function() { var message = gettextCatalog.getString('Add description'); diff --git a/src/js/directives/actionSheet.js b/src/js/directives/actionSheet.js new file mode 100644 index 000000000..d2697e930 --- /dev/null +++ b/src/js/directives/actionSheet.js @@ -0,0 +1,23 @@ +'use strict'; + +angular.module('copayApp.directives') + .directive('actionSheet', function() { + return { + restrict: 'E', + templateUrl: 'views/includes/actionSheet.html', + transclude: true, + scope: { + show: '=actionSheetShow', + }, + link: function(scope, element, attrs) { + console.log('action sheet instantiated'); + scope.$watch('show', function() { + console.log('show called', scope.show); + }); + + scope.hide = function() { + scope.show = false; + }; + } + }; + }); diff --git a/src/sass/views/includes/actionSheet.scss b/src/sass/views/includes/actionSheet.scss new file mode 100644 index 000000000..9d2b1e173 --- /dev/null +++ b/src/sass/views/includes/actionSheet.scss @@ -0,0 +1,37 @@ +action-sheet { + .bp-action-sheet { + + &__sheet { + background: #fff; + height: 300px; + width: 100%; + position: fixed; + bottom: 0; + left: 0; + transform: translateY(100%); + transition: transform 250ms ease; + z-index: 100; + + &.slide-up { + transform: translateY(0); + } + } + + &__backdrop { + height: 100%; + width: 100%; + position: fixed; + top: 0; + left: 0; + background: rgba(0, 0, 0, 0); + transition: background 250ms ease; + pointer-events: none; + z-index: 99; + + &.fade-in { + background: rgba(0, 0, 0, .5); + pointer-events: all; + } + } + } +} diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index 8b1319ac0..8bf09e6df 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -17,6 +17,7 @@ @import "address-book"; @import "zero-state"; @import "onboarding/onboarding"; +@import "includes/actionSheet"; @import "includes/walletActivity"; @import "includes/wallets"; @import "includes/modals/modals"; diff --git a/www/views/confirm.html b/www/views/confirm.html index 0fbffddb9..dcbf0ce33 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -32,7 +32,7 @@
Insufficient funds
- + From
@@ -79,6 +79,9 @@ Payment Sent Proposal Created + + + + controls-ico-back + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/views/includes/actionSheet.html b/www/views/includes/actionSheet.html index 41cd68a57..b4abfffae 100644 --- a/www/views/includes/actionSheet.html +++ b/www/views/includes/actionSheet.html @@ -4,5 +4,5 @@ ng-click="hide()">
- +
From 47a0a1f83db235d69cb85b49851c19b7f2ea370f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 12 Oct 2016 17:43:23 -0300 Subject: [PATCH 08/35] remove ion toogle --- src/js/controllers/import.js | 14 +++++++++++++- www/views/import.html | 6 +++--- www/views/tab-import-file.html | 6 ++++-- www/views/tab-import-hardware.html | 6 ++++-- www/views/tab-import-phrase.html | 6 ++++-- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index bdc97e984..056d55ed5 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('importController', - function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog) { + function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog) { var isChromeApp = platformInfo.isChromeApp; var isDevel = platformInfo.isDevel; @@ -350,4 +350,16 @@ angular.module('copayApp.controllers').controller('importController', fromOnboarding: $stateParams.fromOnboarding }); }; + + $scope.showAdvChange = function() { + $scope.showAdv = !$scope.showAdv; + $scope.resizeView(); + }; + + $scope.resizeView = function() { + $timeout(function() { + $ionicScrollDelegate.resize(); + }); + }; + }); diff --git a/www/views/import.html b/www/views/import.html index 81c80f651..7a9940c83 100644 --- a/www/views/import.html +++ b/www/views/import.html @@ -7,13 +7,13 @@
-
+
Recovery phrase
-
+
File/Text
-
+
Hardware wallet
diff --git a/www/views/tab-import-file.html b/www/views/tab-import-file.html index 31d439c4f..8cfa4fa7f 100644 --- a/www/views/tab-import-file.html +++ b/www/views/tab-import-file.html @@ -21,10 +21,12 @@ ng-model="formData.password"> - +
+ + Show advanced options Hide advanced options - +
- +
+ + Show advanced options Hide advanced options - +