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

improve final balance position

Browse source
This commit is contained in:
Marty Alcala 2016-11-09 13:37:14 -05:00
commit 6dbc9057cd
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/js/controllers/walletDetails.js
View file

@ -239,6 +239,10 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
if(amountHeight < 80) { if(amountHeight < 80) {
amountHeight = 80; amountHeight = 80;
} }
var contentMargin = amountHeight;
if(contentMargin > 180) {
contentMargin = 180;
}
var amountScale = amountHeight/180; var amountScale = amountHeight/180;
if(amountScale < 0.5) { if(amountScale < 0.5) {
@ -254,6 +258,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
console.log('amountHeight', amountHeight); console.log('amountHeight', amountHeight);
$window.requestAnimationFrame(function() { $window.requestAnimationFrame(function() {
$scope.amountHeight = amountHeight + 'px'; $scope.amountHeight = amountHeight + 'px';
$scope.contentMargin = contentMargin + 'px';
$scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s+ ')'; $scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s+ ')';
console.log('$scope.amountScale', $scope.amountScale); console.log('$scope.amountScale', $scope.amountScale);
console.log('$scope.altAmountOpacity', $scope.altAmountOpacity); console.log('$scope.altAmountOpacity', $scope.altAmountOpacity);

3
www/views/walletDetails.html
View file

@ -36,6 +36,7 @@
ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden" ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden"
on-hold="hideToggle()" on-hold="hideToggle()"
ng-style="{'transform': amountScale}" ng-style="{'transform': amountScale}"
style="margin-top: 5px;"
> >
<strong ng-if="!status.pendingAmount" class="size-36">{{status.totalBalanceStr}}</strong> <strong ng-if="!status.pendingAmount" class="size-36">{{status.totalBalanceStr}}</strong>
<div <div
@ -70,7 +71,7 @@
<span ng-include="'views/includes/walletInfo.html'"></span> <span ng-include="'views/includes/walletInfo.html'"></span>
</div> </div>
</div> <!-- oh --> </div> <!-- oh -->
<ion-content on-scroll="getScrollPosition()" ng-style="{'margin-top': amountHeight}"> <ion-content on-scroll="getScrollPosition()" ng-style="{'margin-top': contentMargin}">
<ion-refresher <ion-refresher
ng-if="isAndroid" ng-if="isAndroid"
pulling-icon="ion-ios-refresh" pulling-icon="ion-ios-refresh"