From 10986850d0704d5dc665e884eb50fc46aa8afcf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 14 Apr 2017 18:26:56 -0300 Subject: [PATCH 1/6] adding loading placeholders to avoid the screen resize --- src/js/controllers/tab-home.js | 3 + src/sass/views/tab-home.scss | 38 +++++++++ www/views/tab-home.html | 152 +++++++++++++++++++-------------- 3 files changed, 129 insertions(+), 64 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 7a3fd83f8..020716608 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -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(); diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index 3886ba7ee..e0620cbd6 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -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 1s; } .wallet-details__item.item { padding-top: 0; diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 6d2ec9247..0bbcba945 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -39,76 +39,100 @@ On this screen you can see all your wallets, accounts, and assets. - -
- - {{'Payment Proposals'|translate}} - - {{txpsN}} - - -
- +
+
+
+ +
+ + + +
+ +
+
+
+
+ +
+ + + +
+ +
- -
- - Recent Transactions - - {{notificationsN}} - - - - -
- -
-
- Wallets - -
-
- - - - - Create bitcoin wallet +
+
+ + {{'Payment Proposals'|translate}} + {{txpsN}} - - - - - - {{wallet.name || wallet.id}} - -

- - Incomplete - - - {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' · ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }} - [Balance Hidden] - - {{wallet.m}}-of-{{wallet.n}} +

+ +
+
+ +
+ + Recent Transactions + + {{notificationsN}} + + + + +
+ +
+
+ Wallets + +
+ -
-
-
-
-
+

+ + Incomplete + + + {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' · ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }} + [Balance Hidden] + + {{wallet.m}}-of-{{wallet.n}} + + + {{wallet.error}} + +   +

+ + +
+
+
+
+
+
+
From c9b7cf8f68963314ed739a31bd865e33ca25b25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 14 Apr 2017 18:30:12 -0300 Subject: [PATCH 2/6] fixes --- src/sass/views/tab-home.scss | 2 +- www/views/tab-home.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index e0620cbd6..bf56ed1a7 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -90,7 +90,7 @@ } .animate-show-hide.ng-hide-add, .animate-show-hide.ng-hide-remove { - transition: all linear 1s; + transition: all linear 2s; } .wallet-details__item.item { padding-top: 0; diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 0bbcba945..8022dc529 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -39,7 +39,7 @@ On this screen you can see all your wallets, accounts, and assets.
-
+
@@ -63,7 +63,7 @@
-
+
{{'Payment Proposals'|translate}} From c2495f578ad3838032daee7fe3d35da27f6fad02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 14 Apr 2017 18:34:11 -0300 Subject: [PATCH 3/6] reduce transition time --- src/sass/views/tab-home.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index bf56ed1a7..a35975664 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -90,7 +90,7 @@ } .animate-show-hide.ng-hide-add, .animate-show-hide.ng-hide-remove { - transition: all linear 2s; + transition: all linear 0.2s; } .wallet-details__item.item { padding-top: 0; From a104ad34121661d4e53740f1558c1443e2405e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 20 Apr 2017 11:36:44 -0300 Subject: [PATCH 4/6] avoid items resize --- www/views/includes/wallets.html | 2 +- www/views/tab-receive.html | 2 +- www/views/tab-settings.html | 26 +++++++++++++------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/www/views/includes/wallets.html b/www/views/includes/wallets.html index 4fa2cc894..bca92b8f0 100644 --- a/www/views/includes/wallets.html +++ b/www/views/includes/wallets.html @@ -8,7 +8,7 @@ {{wallet.name || wallet.id}} - {{wallet.status.availableBalanceStr}} + {{wallet.status.availableBalanceStr || '...'}} [Balance Hidden]
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 644af8e0f..56c390bf8 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -90,7 +90,7 @@ {{wallet.name || wallet.id}} - {{wallet.status.availableBalanceStr}} + {{wallet.status.availableBalanceStr || '...'}}
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index cfc054614..5acc51123 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -47,22 +47,22 @@ - - - - {{'Language' | translate}} - - {{currentLanguageName|translate}} - - - + + + + {{'Language' | translate}} + + {{currentLanguageName || '...'}} + + + {{'Bitcoin Unit' | translate}} - {{unitName}} + {{unitName || '...'}} @@ -73,7 +73,7 @@ {{'Alternative Currency' | translate}} - {{selectedAlternative.name}} + {{selectedAlternative.name || '...'}} @@ -83,8 +83,8 @@ {{'Bitcoin Network Fee Policy' | translate}} - - {{feeOpts[currentFeeLevel]|translate}} + + {{feeOpts[currentFeeLevel] || '...'}} From de0add96cceeceb3bdf7b1c279b75e07ae1bba0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 20 Apr 2017 11:59:04 -0300 Subject: [PATCH 5/6] fix to not add new translations --- www/views/tab-settings.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 5acc51123..6f4854819 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -51,8 +51,11 @@ {{'Language' | translate}} - - {{currentLanguageName || '...'}} + + {{currentLanguageName | translate}} + + + ... @@ -83,8 +86,11 @@ {{'Bitcoin Network Fee Policy' | translate}} - - {{feeOpts[currentFeeLevel] || '...'}} + + {{feeOpts[currentFeeLevel] | translate}} + + + ... From 0033efcd9582dd5e2cf6b84966ec2d55108cf95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 20 Apr 2017 12:04:23 -0300 Subject: [PATCH 6/6] fixes --- www/views/tab-settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 6f4854819..76c76ec7b 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -89,7 +89,7 @@ {{feeOpts[currentFeeLevel] | translate}} - + ...