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

navigate to backup flow

Browse source
This commit is contained in:
Javier 2016-11-15 11:03:45 -03:00
commit c2ef0bacc7
3 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/js/controllers/walletDetails.js
View file

@ -168,7 +168,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
}; };
$scope.isFirstInGroup = function(index) { $scope.isFirstInGroup = function(index) {
if(index === 0) { if (index === 0) {
return true; return true;
} }
var curTx = $scope.txHistory[index]; var curTx = $scope.txHistory[index];
@ -177,7 +177,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
}; };
$scope.isLastInGroup = function(index) { $scope.isLastInGroup = function(index) {
if(index === $scope.txHistory.length - 1) { if (index === $scope.txHistory.length - 1) {
return true; return true;
} }
return $scope.isFirstInGroup(index + 1); return $scope.isFirstInGroup(index + 1);
@ -234,15 +234,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
}); });
}; };
$scope.backup = function() {
//$state.go('tabs.preferences', {walletId: $scope.walletId});
//$state.transitionTo('tabs.preferences.backupWarning');
};
var prevPos; var prevPos;
function getScrollPosition(){
function getScrollPosition() {
var pos = $ionicScrollDelegate.getScrollPosition().top; var pos = $ionicScrollDelegate.getScrollPosition().top;
if(pos === prevPos) { if (pos === prevPos) {
$window.requestAnimationFrame(function() { $window.requestAnimationFrame(function() {
getScrollPosition(); getScrollPosition();
}); });
@ -250,29 +246,29 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
} }
prevPos = pos; prevPos = pos;
var amountHeight = 180 - pos; var amountHeight = 180 - pos;
if(amountHeight < 80) { if (amountHeight < 80) {
amountHeight = 80; amountHeight = 80;
} }
var contentMargin = amountHeight; var contentMargin = amountHeight;
if(contentMargin > 180) { if (contentMargin > 180) {
contentMargin = 180; contentMargin = 180;
} }
var amountScale = (amountHeight/180); var amountScale = (amountHeight / 180);
if(amountScale < 0.5) { if (amountScale < 0.5) {
amountScale = 0.5; amountScale = 0.5;
} }
if(amountScale > 1.1) { if (amountScale > 1.1) {
amountScale = 1.1; amountScale = 1.1;
} }
var s = amountScale; var s = amountScale;
$scope.altAmountOpacity = (amountHeight - 100)/80; $scope.altAmountOpacity = (amountHeight - 100) / 80;
$window.requestAnimationFrame(function() { $window.requestAnimationFrame(function() {
$scope.amountHeight = amountHeight + 'px'; $scope.amountHeight = amountHeight + 'px';
$scope.contentMargin = contentMargin + 'px'; $scope.contentMargin = contentMargin + 'px';
$scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s+ ')'; $scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s + ')';
$scope.$digest(); $scope.$digest();
getScrollPosition(); getScrollPosition();
}); });
@ -281,7 +277,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
var scrollWatcherInitialized; var scrollWatcherInitialized;
$scope.$on("$ionicView.enter", function(event, data) { $scope.$on("$ionicView.enter", function(event, data) {
if(scrollWatcherInitialized || !$scope.amountIsCollapsible) { if (scrollWatcherInitialized || !$scope.amountIsCollapsible) {
return; return;
} }
scrollWatcherInitialized = true; scrollWatcherInitialized = true;

12
src/js/routes.js
View file

@ -151,7 +151,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*/ */
.state('tabs.wallet', { .state('tabs.wallet', {
url: '/wallet/{walletId}/{fromOnboarding}', url: '/wallet/:walletId/:fromOnboarding',
views: { views: {
'tab-home@tabs': { 'tab-home@tabs': {
controller: 'walletDetailsController', controller: 'walletDetailsController',
@ -186,6 +186,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
} }
}) })
.state('tabs.wallet.backupWarning', {
url: '/backupWarning/:from/:walletId',
views: {
'tab-home@tabs': {
templateUrl: 'views/backupWarning.html'
}
}
})
/* /*
* *
@ -601,7 +609,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
/* /*
* *
* Back flow from receive * Init backup flow
* *
*/ */

2
www/views/walletDetails.html
View file

@ -139,7 +139,7 @@
</div> </div>
</div> <!-- oh --> </div> <!-- oh -->
<a class="wallet-not-backed-up-warning" ng-show="!isBackedUp" ng-click="backup()"> <a class="wallet-not-backed-up-warning" ng-show="!isBackedUp" ui-sref="tabs.wallet.backupWarning({from: 'tabs.wallet', walletId: walletId})">
Wallet not backed up Wallet not backed up
</a> </a>