From cb328de5c75e0b2181607c2533b4cfa2f35cf35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 14 Oct 2016 10:24:20 -0300 Subject: [PATCH 1/2] enable pull to refresh only in android devices --- src/js/controllers/tab-home.js | 1 + src/js/controllers/walletDetails.js | 1 + www/views/tab-home.html | 2 +- www/views/walletDetails.html | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 441817fcb..53ccb892e 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -12,6 +12,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', $scope.name = $window.appConfig.nameCase; $scope.homeTip = $stateParams.fromOnboarding; $scope.isCordova = platformInfo.isCordova; + $scope.isAndroid = platformInfo.isAndroid; $scope.$on("$ionicView.afterEnter", function() { startupService.ready(); diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index ef9f409c1..6a6e20de0 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.completeTxHistory = []; $scope.openTxpModal = txpModalService.open; $scope.isCordova = platformInfo.isCordova; + $scope.isAndroid = platformInfo.isAndroid; $scope.openExternalLink = function(url, target) { externalLinkService.open(url, target); diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 9b9cbdb14..b728c0b5b 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -5,7 +5,7 @@ diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index b0d2e784c..b73bd0501 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -12,7 +12,7 @@ From 1d82c50f14fcf26a69b41c85cc0bf205857f8388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 14 Oct 2016 10:25:52 -0300 Subject: [PATCH 2/2] increase loading animation time --- src/js/controllers/tab-home.js | 4 +++- src/js/controllers/walletDetails.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 53ccb892e..3eae9232a 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -211,7 +211,9 @@ angular.module('copayApp.controllers').controller('tabHomeController', }; $scope.onRefresh = function() { - $scope.$broadcast('scroll.refreshComplete'); + $timeout(function() { + $scope.$broadcast('scroll.refreshComplete'); + }, 300); updateAllWallets(); }; diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 6a6e20de0..ecbf9651e 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -162,7 +162,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }; $scope.onRefresh = function() { - $scope.$broadcast('scroll.refreshComplete'); + $timeout(function() { + $scope.$broadcast('scroll.refreshComplete'); + }, 300); $scope.updateAll(true); };