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

Merge pull request #5707 from gabrielbazan7/fix/hardwarebutton

Browse source 
disabled hardware backbutton in disclaimer and feedback views
This commit is contained in:
Javier Donadío 2017-03-09 14:50:46 -03:00 • committed by GitHub
commit 83d8f7a17b
2 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/js/routes.js
View file

@ -837,9 +837,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
controller: 'completeController',
templateUrl: 'views/feedback/complete.html'
}
},
customConfig: {
hideStatusBar: true
}
})
.state('tabs.rate.rateApp', {
@ -849,9 +846,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
controller: 'rateAppController',
templateUrl: 'views/feedback/rateApp.html'
}
},
customConfig: {
hideStatusBar: true
}
})
@ -1123,6 +1117,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
var matchScan = $ionicHistory.currentStateName() == 'tabs.scan' ? true : false;
var matchSend = $ionicHistory.currentStateName() == 'tabs.send' ? true : false;
var matchSettings = $ionicHistory.currentStateName() == 'tabs.settings' ? true : false;
var fromTabs = matchHome | matchReceive | matchScan | matchSend | matchSettings;
//onboarding with no back views
@ -1130,10 +1125,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
var matchCollectEmail = $ionicHistory.currentStateName() == 'onboarding.collectEmail' ? true : false;
var matchBackupRequest = $ionicHistory.currentStateName() == 'onboarding.backupRequest' ? 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();
} else
if ($rootScope.backButtonPressedOnceToExit) {
@ -1229,14 +1230,4 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
$log.debug(' toParams:' + JSON.stringify(toParams || {}));
$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-back-button>
</ion-nav-back-button>
@ -9,7 +9,7 @@
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content scroll="false" has-header="fromSettings">
<ion-content scroll="false">
<div class="complete-layout">
<div class="complete-layout__expand" ng-class="{'fade-in': !animate || socialsharing}">
<div ng-show="fromSettings">