BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix activity scroll to refresh balance

This commit is contained in:
Gabriel Bazán 2016-05-23 16:30:36 -03:00 committed by Javier
parent ba91319a7a
commit 5413e87f09
4 changed files with 13 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/views/includes/topbar.html
View File

@ -1,5 +1,5 @@
<nav ng-controller="topbarController as topbar"
class="tab-bar" ng-class="{'fade-all': !index.isCordova}" ng-style="{'background-color': noColor ? '#4B6178' : index.backgroundColor}">
class="tab-bar" ng-style="{'background-color': noColor ? '#4B6178' : index.backgroundColor}">
<section class="left-small">
<a id="hamburger" class="p10" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
ng-click="index.toggleLeftMenu()"><i class="fi-list size-24"></i>

20
public/views/walletHome.html
View File

@ -54,28 +54,28 @@
-->
<ion-content id="walletHome" class="walletHome tab-view tab-in" scroll="false">
<ion-scroll delegate-handle="balance" on-scroll="freezeScroll()" scrollbar-y="false">
<ion-content overflow-scroll="false" delegate-handle="transactions" on-scroll="freezeScroll()">
<ion-refresher
pulling-icon="ion-ios-refresh"
spinner="ios-small"
on-refresh="index.updateAll({triggerTxUpdate: true})">
</ion-refresher>
<div class="oh pr">
<div ng-style="{'background-color':index.backgroundColor}" ng-class="{amount: !shouldCollapse, 'amount-collapsed': shouldCollapse, 'fade-all': !index.isCordova}">
<div ng-style="{'background-color':index.backgroundColor}" class="amount">
<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" ng-click='index.updateAll({triggerTxUpdate: true})'>
<span class="size-12 db m10b">{{index.updateError|translate}}</span>
<button class="outline white tiny round" translate>Tap to retry</button>
</div>
<div ng-show="index.walletScanStatus == 'error' && !shouldCollapse" ng-click='index.retryScan()'>
<div ng-show="index.walletScanStatus == 'error'" 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 ng-class="{'size-36': !shouldCollapse, 'size-24': shouldCollapse}">{{index.totalBalanceStr}}</strong>
<div class="size-14" ng-if="index.totalBalanceAlternative && !shouldCollapse">{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}</div>
<strong class="size-36">{{index.totalBalanceStr}}</strong>
<div class="size-14" ng-if="index.totalBalanceAlternative">{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}</div>
<div class="size-14" ng-if="index.pendingAmount">
<span translate>Pending Confirmation</span>:{{index.pendingAmountStr}}
</div>
@ -83,7 +83,7 @@
<div ng-show="!index.updateError && index.walletScanStatus != 'error' && index.shouldHideBalance" on-hold="index.onHold()">
<strong class="size-24" translate>[Balance Hidden]</strong>
<div class="size-14" ng-if="!shouldCollapse" transalate>
<div class="size-14" transalate>
Tap and hold to show
</div>
</div>
@ -96,16 +96,14 @@
</div>
</div> <!-- amount -->
<div ng-class="{'wallet-info': !shouldCollapse, 'wallet-info-collapsed': shouldCollapse}">
<div class="wallet-info">
<span ng-include="'views/includes/walletInfo.html'"></span>
</div>
<div class="camera-icon" ng-show="index.isComplete" ng-if="!shouldCollapse">
<div class="camera-icon" ng-show="index.isComplete">
<qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner>
</div>
</div> <!-- oh -->
</ion-scroll>
<ion-content overflow-scroll="false" class="behind" ng-class="{t150: !shouldCollapse, t50: shouldCollapse, 'fade-t': !index.isCordova}" delegate-handle="transactions" on-scroll="collapseBalanceContent(index.updatingTxHistory && index.txProgress > 5)">
<div class="m50b">
<div class="oh pr m20t" ng-show="index.incorrectDerivation">
<div class="text-center text-warning">

16
src/js/controllers/walletHome.js
View File

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

31
src/sass/main.scss
View File

@ -460,14 +460,6 @@ ul.manage li {
}
}
.fade-t {
transition: top .2s ease;
}
.fade-all {
transition: .4s all ease;
}
.dn {
display: none;
}
@ -636,14 +628,6 @@ ul.manage li {
margin-top: 30%;
}
.t50 {
top: 50px;
}
.t150 {
top: 150px;
}
.m15 {
margin: 15px;
}
@ -1587,13 +1571,6 @@ input.ng-invalid-match {
margin-bottom: 25px;
}
.amount-collapsed {
width: 100%;
text-align: center;
color: #fff;
height: 50px;
}
.alternative-amount {
height: 25px;
text-align: center;
@ -1634,14 +1611,6 @@ input.ng-invalid-match {
font-size: 20px;
color: #fff;
}
.wallet-info-collapsed {
position: absolute;
top: inherit;
left: 10px;
bottom: 0px;
font-size: 20px;
color: #fff;
}
}
.camera-icon a {