anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Update: Improves send screen layout

Browse source
This commit is contained in:
Sam Cheng Hung 2018-04-05 11:20:49 +09:00
commit 8efff48aeb
8 changed files with 425 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/amount.js
View file

@ -240,6 +240,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
};
$scope.changeUnit = function() {
$scope.amountModel.amount = '';
if ($scope.alternativeAmount == 0) {
$scope.alternativeAmount = null;
@ -294,6 +295,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) {
@ -323,6 +325,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.amountModel.amount = ($scope.amountModel.amount).toString().slice(0, -1);
$scope.processAmount();
checkFontSize();
navigator.vibrate(50);
};
$scope.resetAmount = function() {
@ -464,6 +467,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
$state.transitionTo('tabs.send.confirm', confirmData);
}
$scope.useSendMax = null;
navigator.vibrate(50);
}
if ($scope.showWarningMessage) {

11
src/js/controllers/tab-send.js
View file

@ -5,6 +5,9 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
var originalList;
var CONTACTS_SHOW_LIMIT;
var currentContactsPage;
$scope.sectionDisplay = {
transferToWallet: false
};
$scope.isChromeApp = platformInfo.isChromeApp;
@ -247,4 +250,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);
};
});

240
src/sass/views/amount.scss
View file

@ -233,58 +233,220 @@
}
}
}
.keypad {
text-align: center;
font-size: 24px;
font-weight: lighter;
position: absolute;
bottom: 0;
width: 100%;
color: $v-mid-gray;
.row {
padding: 0 !important;
margin: 0 !important;
}
.scroll-content {
display: flex;
flex-direction: column;
.col {
line-height: 45px;
}
.send-amount {
flex: 1 1 auto;
display: flex;
flex-direction: column;
justify-content: center;
.operator {
background-color: $v-subtle-gray;
font-weight: normal;
cursor: pointer;
.send-amount-tool {
flex: 0 1 auto;
&:active {
background-color: $v-light-gray;
.send-amount-tool-input {
text-align: center;
position: relative;
padding: 10px 30px;
.primary-amount {
input, .unit, .primary-amount-display {
font-size: 1.8em;
@media (min-width: 375px) {
font-size: 2.1em;
}
@media (min-width: 414px) {
font-size: 2.4em;
}
}
&.long {
input, .unit, .primary-amount-display {
font-size: 1.6em;
@media (min-width: 375px) {
font-size: 1.8em;
}
@media (min-width: 414px) {
font-size: 2em;
}
}
}
&.very-long {
input, .unit, .primary-amount-display {
font-size: 0.9em;
@media (min-width: 375px) {
font-size: 1.3em;
}
@media (min-width: 414px) {
font-size: 1.4em;
}
}
}
input {
border:0;
padding:0;
white-space:normal;
background:none;
line-height:1;
box-sizing:content-box;
display: inline-block;
vertical-align: middle;
margin: 0;
height: 1em;
margin-right: 5px;
font-family: 'ProximaNova';
@media (min-width: 375px) {
}
@media (min-width: 414px) {
}
}
.unit,
.primary-amount-display {
display: inline-block;
vertical-align: middle;
line-height: 1em;
}
.unit {
font-weight: bold;
}
.primary-amount-display {
margin-right: 5px;
word-break: break-all;
}
}
.switch-currencies {
position: absolute;
right: 0;
top: 50%;
transform: translate(0, -50%);
padding: 5px;
img {
width: 18px;
}
}
}
.send-amount-actions {
margin-top: 15px;
}
}
}
.operator-send {
font-weight: bolder;
color: #fff;
background-color: $positive;
font-size: 36px;
cursor: pointer;
&:active {
background-color: #eaeaea;
.button {
&.no-margin {
margin: 0;
}
}
.digit{
cursor: pointer;
border-top: 1px solid $v-subtle-gray;
border-left: 1px solid $v-subtle-gray;
&:active {
background-color: $v-subtle-gray;
}
.notification-warning {
display: block;
padding: .75rem 1.25rem;
color: #856404;
background-color: #fff3cd;
border: 1px solid #ffeeba;
line-height: 1.4em;
margin-bottom: 20px;
}
@media(max-height: 480px) {
font-size: 12px;
.keypad-container {
position: relative;
flex: 0 1 196px;
@media (min-height: 667px) {
flex: 0 1 224px;
}
.keypad {
text-align: center;
font-size: 18px;
font-weight: lighter;
position: absolute;
bottom: 0;
width: 100%;
color: $v-mid-gray;
@media (min-height: 667px) {
font-size: 24px;
}
.row {
padding: 0 !important;
margin: 0 !important;
}
.col {
line-height: 38px;
@media (min-height: 667px) {
line-height: 45px;
}
}
.row {
&:last-child {
.col {
padding-bottom: 10px;
}
}
}
.operator {
background-color: $v-subtle-gray;
font-weight: normal;
cursor: pointer;
&:active {
background-color: $v-light-gray;
}
}
.operator-send {
font-weight: bolder;
color: #fff;
background-color: $positive;
font-size: 36px;
cursor: pointer;
&:active {
background-color: #eaeaea;
}
}
.digit{
cursor: pointer;
border-top: 1px solid $v-subtle-gray;
border-left: 1px solid $v-subtle-gray;
transition: all 0.1s ease;
&:active {
background-color: $v-subtle-gray;
}
}
@media(max-height: 480px) {
font-size: 12px;
}
}
}
}
}