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

add animations - fix UI

Browse source
This commit is contained in:
Javier 2016-05-19 13:27:17 -03:00
commit 4964a3d7c3
3 changed files with 54 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

81
public/views/walletHome.html
View file

@ -56,57 +56,58 @@
<ion-content id="walletHome" class="walletHome tab-view tab-in" scroll="false"> <ion-content id="walletHome" class="walletHome tab-view tab-in" scroll="false">
<ion-content delegate-handle="balance" on-scroll="freezeScroll()"> <ion-content delegate-handle="balance" on-scroll="freezeScroll()">
<ion-refresher <ion-refresher
pulling-icon="ion-ios-refresh" pulling-icon="ion-ios-refresh"
on-refresh="index.updateAll({triggerTxUpdate: true})"> on-refresh="index.updateAll({triggerTxUpdate: true})">
</ion-refresher> </ion-refresher>
<div class="oh pr"> <div class="oh pr">
<div ng-style="{'background-color':index.backgroundColor}" ng-class="{amount: !shouldCollapse, amountcollapsed: shouldCollapse}"> <div ng-style="{'background-color':index.backgroundColor}" ng-class="{amount: !shouldCollapse, amountcollapsed: shouldCollapse}">
<div ng-if="!index.anyOnGoingProcess && !index.notAuthorized"> <div ng-if="!index.anyOnGoingProcess && !index.notAuthorized">
<div class="m15t" ng-show="index.updateError && !shouldCollapse" ng-click='index.updateAll({triggerTxUpdate: true})'> <div class="m15t" ng-show="index.updateError && !shouldCollapse" ng-click='index.updateAll({triggerTxUpdate: true})'>
<span class="size-12 db m10b">{{index.updateError|translate}}</span> <span class="size-12 db m10b">{{index.updateError|translate}}</span>
<button class="outline white tiny round" translate>Tap to retry</button> <button class="outline white tiny round" translate>Tap to retry</button>
</div>
<div ng-show="index.walletScanStatus == 'error' && !shouldCollapse" ng-click='index.retryScan()'>
<span translate>Scan status finished with error</span>
<br><span translate>Tap to retry</span>
</div>
<div ng-click='index.updateAll({triggerTxUpdate: true})' ng-show="!index.updateError && index.walletScanStatus != 'error' && !index.shouldHideBalance" on-hold="index.onHold()">
<strong class="size-36" ng-if="!shouldCollapse">{{index.totalBalanceStr}}</strong>
<strong class="size-24" ng-if="shouldCollapse">{{index.totalBalanceStr}}</strong>
<div class="size-14" ng-if="index.totalBalanceAlternative && !shouldCollapse">{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}</div>
<div class="size-14"
ng-if="index.pendingAmount">
<span translate>Pending Confirmation</span>:
{{index.pendingAmountStr}}
</div> </div>
</div> <div ng-show="index.walletScanStatus == 'error' && !shouldCollapse" ng-click='index.retryScan()'>
<div ng-show="!index.updateError && index.walletScanStatus != 'error' && index.shouldHideBalance" on-hold="index.onHold()"> <span translate>Scan status finished with error</span>
<br><span translate>Tap to retry</span>
</div>
<div ng-click='index.updateAll({triggerTxUpdate: true})' ng-show="!index.updateError && index.walletScanStatus != 'error' && !index.shouldHideBalance" on-hold="index.onHold()">
<strong class="size-36" ng-if="!shouldCollapse">{{index.totalBalanceStr}}</strong>
<strong class="size-24" ng-if="shouldCollapse">{{index.totalBalanceStr}}</strong>
<div class="size-14" ng-if="index.totalBalanceAlternative && !shouldCollapse">{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}</div>
<div class="size-14"
ng-if="index.pendingAmount">
<span translate>Pending Confirmation</span>:
{{index.pendingAmountStr}}
</div>
</div>
<div ng-show="!index.updateError && index.walletScanStatus != 'error' && index.shouldHideBalance" on-hold="index.onHold()">
<strong class="size-24" translate>[Balance Hidden]</strong> <strong class="size-24" translate>[Balance Hidden]</strong>
<div class="size-14" ng-if="!shouldCollapse" transalate> <div class="size-14" ng-if="!shouldCollapse" transalate>
Tap and hold to show Tap and hold to show
</div> </div>
</div>
</div> </div>
</div>
<div ng-if="index.anyOnGoingProcess"> <div ng-if="index.anyOnGoingProcess">
<div class="size-36"> <div class="size-36">
<strong>...</strong> <strong>...</strong>
</div>
</div> </div>
</div> </div> <!-- amount -->
</div> <!-- amount -->
<div ng-class="{walletinfo: !shouldCollapse, walletinfocollapsed: shouldCollapse}"> <div ng-class="{walletinfo: !shouldCollapse, walletinfocollapsed: shouldCollapse}">
<span ng-include="'views/includes/walletInfo.html'"></span> <span ng-include="'views/includes/walletInfo.html'"></span>
</div> </div>
<div class="camera-icon" ng-show="index.isComplete" ng-if="!shouldCollapse"> <div class="camera-icon" ng-show="index.isComplete" ng-if="!shouldCollapse">
<qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner> <qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner>
</div> </div>
</div> <!-- oh --> </div> <!-- oh -->
</ion-content> </ion-content>
<ion-content overflow-scroll="true" ng-class="{m150t: !shouldCollapse, m50t: shouldCollapse}" delegate-handle="transactions" on-scroll="collapseBalanceContent(index.updatingTxHistory && index.txProgress > 5)">
<ion-content overflow-scroll="false" class="fade" ng-class="{m150t: !shouldCollapse, m50t: shouldCollapse}" delegate-handle="transactions" on-scroll="collapseBalanceContent(index.updatingTxHistory && index.txProgress > 5)">
<div class="m50b"> <div class="m50b">
<div class="oh pr m20t" ng-show="index.incorrectDerivation"> <div class="oh pr m20t" ng-show="index.incorrectDerivation">
<div class="text-center text-warning"> <div class="text-center text-warning">

17
src/js/controllers/walletHome.js
View file

@ -32,21 +32,22 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
ret.sendMaxInfo = {}; ret.sendMaxInfo = {};
var vanillaScope = ret; var vanillaScope = ret;
$scope.collapseBalanceContent = function(val) { $scope.collapseBalanceContent = function(updating) {
if (val) return; if (updating) return;
$scope.shouldCollapse = $ionicScrollDelegate.$getByHandle('transactions').getScrollPosition().top > 50 ? true : false;
var scrollPosition = $ionicScrollDelegate.$getByHandle('transactions').getScrollPosition().top;
$scope.shouldCollapse = scrollPosition > 50 ? true : false;
$timeout(function() { $timeout(function() {
$scope.$apply(); $scope.$apply();
}); });
}; };
$scope.freezeScroll = function() { $scope.freezeScroll = function() {
var scrollPosition = $ionicScrollDelegate.$getByHandle('balance').getScrollPosition().top;
var openRatio = $ionicSideMenuDelegate.getOpenRatio();
if ($ionicScrollDelegate.$getByHandle('balance').getScrollPosition().top < -75) { if (scrollPosition < -75 || openRatio != 0)
$ionicScrollDelegate.$getByHandle('balance').freezeScroll(true);
return;
}
if ($ionicSideMenuDelegate.getOpenRatio() != 0)
$ionicScrollDelegate.$getByHandle('balance').freezeScroll(true); $ionicScrollDelegate.$getByHandle('balance').freezeScroll(true);
else else
$ionicScrollDelegate.$getByHandle('balance').freezeScroll(false); $ionicScrollDelegate.$getByHandle('balance').freezeScroll(false);

6
src/sass/main.scss
View file

@ -460,6 +460,10 @@ ul.manage li {
} }
} }
.fade {
transition: margin-top .2s ease;
}
.dn { .dn {
display: none; display: none;
} }
@ -1577,6 +1581,7 @@ input.ng-invalid-match {
color: #fff; color: #fff;
height: 150px; height: 150px;
margin-bottom: 25px; margin-bottom: 25px;
transition: .4s all ease;
} }
.amountcollapsed { .amountcollapsed {
@ -1584,6 +1589,7 @@ input.ng-invalid-match {
text-align: center; text-align: center;
color: #fff; color: #fff;
height: 50px; height: 50px;
transition: .4s all ease;
} }
.alternative-amount { .alternative-amount {