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

disabled hardware backbutton in disclaimer and feedback views

This commit is contained in:
Gabriel Bazán 2017-03-03 12:59:42 -03:00
parent 9187c72fb9
commit ee6406c7c7
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/js/routes.js
View File

@ -827,9 +827,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
controller: 'completeController', controller: 'completeController',
templateUrl: 'views/feedback/complete.html' templateUrl: 'views/feedback/complete.html'
} }
},
customConfig: {
hideStatusBar: true
} }
}) })
.state('tabs.rate.rateApp', { .state('tabs.rate.rateApp', {
@ -839,9 +836,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
controller: 'rateAppController', controller: 'rateAppController',
templateUrl: 'views/feedback/rateApp.html' templateUrl: 'views/feedback/rateApp.html'
} }
},
customConfig: {
hideStatusBar: true
} }
}) })
@ -1113,6 +1107,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
var matchScan = $ionicHistory.currentStateName() == 'tabs.scan' ? true : false; var matchScan = $ionicHistory.currentStateName() == 'tabs.scan' ? true : false;
var matchSend = $ionicHistory.currentStateName() == 'tabs.send' ? true : false; var matchSend = $ionicHistory.currentStateName() == 'tabs.send' ? true : false;
var matchSettings = $ionicHistory.currentStateName() == 'tabs.settings' ? true : false; var matchSettings = $ionicHistory.currentStateName() == 'tabs.settings' ? true : false;
var fromTabs = matchHome | matchReceive | matchScan | matchSend | matchSettings; var fromTabs = matchHome | matchReceive | matchScan | matchSend | matchSettings;
//onboarding with no back views //onboarding with no back views
@ -1120,10 +1115,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
var matchCollectEmail = $ionicHistory.currentStateName() == 'onboarding.collectEmail' ? true : false; var matchCollectEmail = $ionicHistory.currentStateName() == 'onboarding.collectEmail' ? true : false;
var matchBackupRequest = $ionicHistory.currentStateName() == 'onboarding.backupRequest' ? true : false; var matchBackupRequest = $ionicHistory.currentStateName() == 'onboarding.backupRequest' ? true : false;
var matchNotifications = $ionicHistory.currentStateName() == 'onboarding.notifications' ? true : false; var matchNotifications = $ionicHistory.currentStateName() == 'onboarding.notifications' ? true : false;
var backedUp = $ionicHistory.backView().stateName == 'onboarding.backup' ? true : false;
var noBackView = $ionicHistory.backView().stateName == 'starting' ? true : false;
var matchDisclaimer = $ionicHistory.currentStateName() == 'onboarding.disclaimer' && (backedUp || noBackView) ? true : false;
var fromOnboarding = matchCollectEmail | matchBackupRequest | matchNotifications | matchWelcome; var fromOnboarding = matchCollectEmail | matchBackupRequest | matchNotifications | matchWelcome | matchDisclaimer;
if ($ionicHistory.backView() && !fromTabs && !fromOnboarding) { //views with disable backbutton
var matchComplete = $ionicHistory.currentStateName() == 'tabs.rate.complete' ? true : false;
if ($ionicHistory.backView() && !fromTabs && !fromOnboarding && !matchComplete) {
$ionicHistory.goBack(); $ionicHistory.goBack();
} else } else
if ($rootScope.backButtonPressedOnceToExit) { if ($rootScope.backButtonPressedOnceToExit) {
@ -1219,14 +1220,4 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
$log.debug(' toParams:' + JSON.stringify(toParams || {})); $log.debug(' toParams:' + JSON.stringify(toParams || {}));
$log.debug(' fromParams:' + JSON.stringify(fromParams || {})); $log.debug(' fromParams:' + JSON.stringify(fromParams || {}));
}); });
$rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) {
if ($window.StatusBar) {
if (toState.customConfig && toState.customConfig.hideStatusBar) {
$window.StatusBar.hide();
} else {
$window.StatusBar.show();
}
}
});
}); });

4
www/views/feedback/complete.html
View File

@ -1,4 +1,4 @@
<ion-view id="complete" hide-nav-bar="!fromSettings" hide-tabs> <ion-view id="complete" hide-tabs>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>
@ -9,7 +9,7 @@
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
</ion-nav-bar> </ion-nav-bar>
<ion-content scroll="false" has-header="fromSettings"> <ion-content scroll="false">
<div class="complete-layout"> <div class="complete-layout">
<div class="complete-layout__expand" ng-class="{'fade-in': !animate || socialsharing}"> <div class="complete-layout__expand" ng-class="{'fade-in': !animate || socialsharing}">
<div ng-show="fromSettings"> <div ng-show="fromSettings">