From fe5bdc1920433b2bb6c4fe720875556d00a268f1 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 16 Nov 2016 11:24:25 -0500 Subject: [PATCH 1/6] prelim status bar show/hide logic based on ui-router events --- src/js/routes.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/js/routes.js b/src/js/routes.js index e424b5cb6..886d4b57c 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -157,6 +157,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr controller: 'walletDetailsController', templateUrl: 'views/walletDetails.html' } + }, + customConfig: { + hideStatusBar: true } }) .state('tabs.activity', { @@ -1092,5 +1095,19 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr $log.debug('Route change from:', fromState.name || '-', ' to:', toState.name); $log.debug(' toParams:' + JSON.stringify(toParams || {})); $log.debug(' fromParams:' + JSON.stringify(fromParams || {})); + + console.log('toState', toState); + + if(toState.customConfig && toState.customConfig.hideStatusBar) { + console.log('hiding status bar'); + if($window.StatusBar) { + $window.StatusBar.hide(); + } + } else { + console.log('showing status bar'); + if($window.StatusBar) { + $window.StatusBar.show(); + } + } }); }); From 2ef2ce7046628544f01c4f4adbddd1c028eaa045 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 16 Nov 2016 12:44:05 -0500 Subject: [PATCH 2/6] add customConfig hideStatusBar to feedback routes --- src/js/controllers/tab-home.js | 3 ++- src/js/routes.js | 20 ++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 25dd485cf..2ab073901 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -52,7 +52,8 @@ angular.module('copayApp.controllers').controller('tabHomeController', } var now = moment().unix(); var timeExceeded = (now - feedbackInfo.time) >= 24 * 60 * 60; - $scope.showRateCard.value = timeExceeded && !feedbackInfo.sent; + // $scope.showRateCard.value = timeExceeded && !feedbackInfo.sent; + $scope.showRateCard.value = true; $timeout(function() { $scope.$apply(); }); diff --git a/src/js/routes.js b/src/js/routes.js index 886d4b57c..2d42d17e9 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -157,9 +157,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr controller: 'walletDetailsController', templateUrl: 'views/walletDetails.html' } - }, - customConfig: { - hideStatusBar: true } }) .state('tabs.activity', { @@ -753,11 +750,17 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr templateUrl: 'views/feedback/send.html', controller: 'sendController' } + }, + customConfig: { + hideStatusBar: true } }) .state('tabs.rate', { url: '/rate', - abstract: true + abstract: true, + customConfig: { + hideStatusBar: true + } }) .state('tabs.rate.send', { url: '/send/:score', @@ -766,6 +769,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr templateUrl: 'views/feedback/send.html', controller: 'sendController' } + }, + customConfig: { + hideStatusBar: true } }) .state('tabs.rate.complete', { @@ -775,6 +781,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr controller: 'completeController', templateUrl: 'views/feedback/complete.html' } + }, + customConfig: { + hideStatusBar: true } }) .state('tabs.rate.rateApp', { @@ -784,6 +793,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr controller: 'rateAppController', templateUrl: 'views/feedback/rateApp.html' } + }, + customConfig: { + hideStatusBar: true } }) From 46a0303586639c5e7c6d68c205135425b15bf386 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 16 Nov 2016 13:06:02 -0500 Subject: [PATCH 3/6] remove old status bar hiding code --- src/js/controllers/feedback/complete.js | 11 ----------- src/js/controllers/feedback/rateApp.js | 14 -------------- src/js/routes.js | 17 +++-------------- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/src/js/controllers/feedback/complete.js b/src/js/controllers/feedback/complete.js index 2422a22ec..f50c5df13 100644 --- a/src/js/controllers/feedback/complete.js +++ b/src/js/controllers/feedback/complete.js @@ -31,10 +31,6 @@ angular.module('copayApp.controllers').controller('completeController', function }; $scope.$on("$ionicView.beforeEnter", function(event, data) { - if (window.StatusBar) { - $log.debug('Hiding status bar...'); - StatusBar.hide(); - } storageService.getFeedbackInfo(function(error, info) { var feedbackInfo = lodash.isString(info) ? JSON.parse(info) : null; @@ -95,13 +91,6 @@ angular.module('copayApp.controllers').controller('completeController', function }, 100); }); - $scope.$on("$ionicView.afterLeave", function() { - if (window.StatusBar) { - $log.debug('Showing status bar...'); - StatusBar.show(); - } - }); - $scope.close = function() { $ionicHistory.clearHistory(); $ionicHistory.nextViewOptions({ diff --git a/src/js/controllers/feedback/rateApp.js b/src/js/controllers/feedback/rateApp.js index 6d16cfb24..b72b07433 100644 --- a/src/js/controllers/feedback/rateApp.js +++ b/src/js/controllers/feedback/rateApp.js @@ -29,20 +29,6 @@ angular.module('copayApp.controllers').controller('rateAppController', function( }); }; - $scope.$on("$ionicView.beforeEnter", function() { - if(window.StatusBar){ - $log.debug('Hiding status bar...'); - StatusBar.hide(); - } - }); - - $scope.$on("$ionicView.afterLeave", function() { - if(window.StatusBar){ - $log.debug('Showing status bar...'); - StatusBar.show(); - } - }); - $scope.sendFeedback = function() { $state.go('tabs.rate.send', { score: $scope.score diff --git a/src/js/routes.js b/src/js/routes.js index 2d42d17e9..6e5c7fb57 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -750,17 +750,11 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr templateUrl: 'views/feedback/send.html', controller: 'sendController' } - }, - customConfig: { - hideStatusBar: true } }) .state('tabs.rate', { url: '/rate', - abstract: true, - customConfig: { - hideStatusBar: true - } + abstract: true }) .state('tabs.rate.send', { url: '/send/:score', @@ -769,9 +763,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr templateUrl: 'views/feedback/send.html', controller: 'sendController' } - }, - customConfig: { - hideStatusBar: true } }) .state('tabs.rate.complete', { @@ -1107,16 +1098,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr $log.debug('Route change from:', fromState.name || '-', ' to:', toState.name); $log.debug(' toParams:' + JSON.stringify(toParams || {})); $log.debug(' fromParams:' + JSON.stringify(fromParams || {})); + }); - console.log('toState', toState); - + $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) { if(toState.customConfig && toState.customConfig.hideStatusBar) { - console.log('hiding status bar'); if($window.StatusBar) { $window.StatusBar.hide(); } } else { - console.log('showing status bar'); if($window.StatusBar) { $window.StatusBar.show(); } From c8e893f57f2cffe67837423c55a2d68e77ffe789 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 16 Nov 2016 13:06:39 -0500 Subject: [PATCH 4/6] remove helper override --- src/js/controllers/tab-home.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 2ab073901..25dd485cf 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -52,8 +52,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', } var now = moment().unix(); var timeExceeded = (now - feedbackInfo.time) >= 24 * 60 * 60; - // $scope.showRateCard.value = timeExceeded && !feedbackInfo.sent; - $scope.showRateCard.value = true; + $scope.showRateCard.value = timeExceeded && !feedbackInfo.sent; $timeout(function() { $scope.$apply(); }); From 7ba83790ab40cf10e8f8dbefe1954e9f2322ca8a Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 16 Nov 2016 13:09:54 -0500 Subject: [PATCH 5/6] simplify logic --- src/js/routes.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/js/routes.js b/src/js/routes.js index 6e5c7fb57..6bcc9beee 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1101,14 +1101,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }); $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) { - if(toState.customConfig && toState.customConfig.hideStatusBar) { - if($window.StatusBar) { - $window.StatusBar.hide(); - } + if($window.StatusBar && toState.customConfig && toState.customConfig.hideStatusBar) { + $window.StatusBar.hide(); } else { - if($window.StatusBar) { - $window.StatusBar.show(); - } + $window.StatusBar.show(); } }); }); From c24d75e4ebb03dc1cbb02a9b88c60250eb90f513 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 16 Nov 2016 13:31:18 -0500 Subject: [PATCH 6/6] better conditional --- src/js/routes.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/js/routes.js b/src/js/routes.js index 6bcc9beee..b06908972 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1101,10 +1101,12 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }); $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) { - if($window.StatusBar && toState.customConfig && toState.customConfig.hideStatusBar) { - $window.StatusBar.hide(); - } else { - $window.StatusBar.show(); + if($window.StatusBar) { + if(toState.customConfig && toState.customConfig.hideStatusBar) { + $window.StatusBar.hide(); + } else { + $window.StatusBar.show(); + } } }); });