Merge pull request #5886 from gabrielbazan7/feat/placeholder

adding loading placeholders to avoid the screen resize in tab-home view
This commit is contained in:
Matias Alejo Garcia 2017-04-20 20:13:08 +02:00 committed by GitHub
commit 4fa427f2ab
6 changed files with 149 additions and 78 deletions

View File

@ -194,6 +194,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
if (err) $log.error(err);
$scope.txps = txps;
$scope.txpsN = n;
$scope.txpsFinished = true;
$timeout(function() {
$ionicScrollDelegate.resize();
$scope.$apply();
@ -225,6 +226,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
}
if (++j == i) {
updateTxps();
$scope.walletsFinished = true;
}
});
});
@ -252,6 +254,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
}
$scope.notifications = notifications;
$scope.notificationsN = total;
$scope.notificationsFinished = true;
$timeout(function() {
$ionicScrollDelegate.resize();
$scope.$apply();

View File

@ -53,6 +53,44 @@
}
}
}
.loading-block-title {
height: 20px;
width: 150px;
background:-webkit-radial-gradient(#fff, #f7f7f7);
background-size: 20px 100px;
-webkit-animation: m .6s linear infinite;
}
.loading-block-body {
width: 100%;
height: 160px;
background: -webkit-radial-gradient(#fff, #f7f7f7);
background-size: 25px 100%;
-webkit-animation: m .6s linear infinite;
}
@keyframes m {
0% {
background-position: 20px 0;
}
100% {
}
}
}
.card-loading-placeholder {
width: 100%;
margin-bottom: 0;
}
.loading-placeholder {
height: 100%;
.row {
height: 50%;
}
}
.animate-show-hide.ng-hide {
opacity: 0;
}
.animate-show-hide.ng-hide-add,
.animate-show-hide.ng-hide-remove {
transition: all linear 0.2s;
}
.wallet-details__item.item {
padding-top: 0;

View File

@ -8,7 +8,7 @@
</i>
<span class="wallet-name">{{wallet.name || wallet.id}}</span>
<span class="item-note m10l" ng-if="!wallet.balanceHidden">
{{wallet.status.availableBalanceStr}}
{{wallet.status.availableBalanceStr || '...'}}
</span>
<span class="item-note m10l" ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
</div>

View File

@ -39,7 +39,31 @@
On this screen you can see all your wallets, accounts, and assets.
</div>
</div>
<div class="loading-placeholder" ng-show="!txpsFinished || !notificationsFinished || !walletsFinished">
<div class="row">
<div class="list card card-loading-placeholder">
<a class="item item-icon-right item-heading">
<div class="loading-block-title"></div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item">
<div class="loading-block-body"></div>
</a>
</div>
</div>
<div class="row">
<div class="list card card-loading-placeholder">
<a class="item item-icon-right item-heading">
<div class="loading-block-title"></div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item">
<div class="loading-block-body"></div>
</a>
</div>
</div>
</div>
<div class="animate-show-hide" ng-show="txpsFinished && notificationsFinished && walletsFinished">
<div class="list card" ng-hide="!txps[0]">
<a class="item item-icon-right item-heading" ui-sref="tabs.proposals">
{{'Payment Proposals'|translate}}
@ -109,6 +133,6 @@
<div class="ng-hide" ng-show="wallets[0] && buyAndSellItems.length>0" ng-include="'views/includes/buyAndSellCard.html'"></div>
<div class="ng-hide" ng-show="homeIntegrations.length>0" ng-include="'views/includes/homeIntegrations.html'"></div>
<div class="ng-hide" ng-show="nextStepsItems.length>0" ng-include="'views/includes/nextSteps.html'"></div>
</div>
</ion-content>
</ion-view>

View File

@ -90,7 +90,7 @@
</i>
<span class="wallet-name">{{wallet.name || wallet.id}}</span>
<span class="item-note m10l">
{{wallet.status.availableBalanceStr}}
{{wallet.status.availableBalanceStr || '...'}}
</span>
</div>
</div>

View File

@ -52,7 +52,10 @@
</i>
<span class="setting-title">{{'Language' | translate}}</span>
<span class="setting-value">
{{currentLanguageName|translate}}
{{currentLanguageName | translate}}
</span>
<span ng-if="!currentLanguageName" class="setting-value">
...
</span>
<i class="icon bp-arrow-right"></i>
</a>
@ -62,7 +65,7 @@
</i>
<span class="setting-title">{{'Bitcoin Unit' | translate}}</span>
<span class="setting-value">
{{unitName}}
{{unitName || '...'}}
</span>
<i class="icon bp-arrow-right"></i>
</a>
@ -73,7 +76,7 @@
</i>
<span class="setting-title">{{'Alternative Currency' | translate}}</span>
<span class="setting-value">
{{selectedAlternative.name}}
{{selectedAlternative.name || '...'}}
</span>
<i class="icon bp-arrow-right"></i>
</a>
@ -84,7 +87,10 @@
</i>
<span class="setting-title">{{'Bitcoin Network Fee Policy' | translate}}</span>
<span class="setting-value">
{{feeOpts[currentFeeLevel]|translate}}
{{feeOpts[currentFeeLevel] | translate}}
</span>
<span ng-if="!feeOpts[currentFeeLevel]" class="setting-value">
...
</span>
<i class="icon bp-arrow-right"></i>
</a>