From e67737a5b14e642b151976cd23e353ccf0d0932e Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 18 Apr 2017 11:26:15 -0300 Subject: [PATCH] Removes notification screen from onboarding. Also removes unused/old notification plugin --- src/js/controllers/backController.js | 9 +--- src/js/controllers/onboarding/collectEmail.js | 24 ++------- .../controllers/onboarding/notifications.js | 53 ------------------- src/js/controllers/onboarding/tour.js | 18 ++----- src/js/routes.js | 12 +---- src/sass/variables.scss | 1 - .../onboard-push-notifications.scss | 9 ---- src/sass/views/onboarding/onboarding.scss | 5 -- 8 files changed, 11 insertions(+), 120 deletions(-) delete mode 100644 src/js/controllers/onboarding/notifications.js delete mode 100644 src/sass/views/onboarding/onboard-push-notifications.scss diff --git a/src/js/controllers/backController.js b/src/js/controllers/backController.js index f1fa38b68..510354649 100644 --- a/src/js/controllers/backController.js +++ b/src/js/controllers/backController.js @@ -1,10 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('backController', function($scope, $state, $stateParams, platformInfo) { - - var isCordova = platformInfo.isCordova; - var isWP = platformInfo.isWP; - var usePushNotifications = isCordova && !isWP; +angular.module('copayApp.controllers').controller('backController', function($scope, $state, $stateParams) { $scope.importGoBack = function() { if ($stateParams.fromOnboarding) $state.go('onboarding.welcome'); @@ -12,8 +8,7 @@ angular.module('copayApp.controllers').controller('backController', function($sc }; $scope.onboardingMailSkip = function() { - if (!usePushNotifications) $state.go('onboarding.backupRequest'); - else $state.go('onboarding.notifications'); + $state.go('onboarding.backupRequest'); } }); diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js index 7a23da915..6e3d230bd 100644 --- a/src/js/controllers/onboarding/collectEmail.js +++ b/src/js/controllers/onboarding/collectEmail.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $timeout, $stateParams, $ionicConfig, profileService, configService, walletService, platformInfo, pushNotificationsService) { +angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $timeout, $stateParams, $ionicConfig, profileService, configService, walletService) { $scope.$on("$ionicView.beforeLeave", function() { $ionicConfig.views.swipeBackEnabled(true); @@ -10,11 +10,6 @@ angular.module('copayApp.controllers').controller('collectEmailController', func $ionicConfig.views.swipeBackEnabled(false); }); - var isCordova = platformInfo.isCordova; - var isWP = platformInfo.isWP; - var usePushNotifications = isCordova && !isWP; - var requiresOptIn = platformInfo.isIOS; - var wallet = profileService.getWallet($stateParams.walletId); var walletId = wallet.credentials.walletId; $scope.data = {}; @@ -37,20 +32,9 @@ angular.module('copayApp.controllers').controller('collectEmailController', func }; $scope.goNextView = function() { - if (!usePushNotifications) { - $state.go('onboarding.backupRequest', { - walletId: walletId - }); - } else if (requiresOptIn) { - $state.go('onboarding.notifications', { - walletId: walletId - }); - } else { - pushNotificationsService.init(); - $state.go('onboarding.backupRequest', { - walletId: walletId - }); - } + $state.go('onboarding.backupRequest', { + walletId: walletId + }); }; $scope.confirm = function(emailForm) { diff --git a/src/js/controllers/onboarding/notifications.js b/src/js/controllers/onboarding/notifications.js deleted file mode 100644 index c4554c84b..000000000 --- a/src/js/controllers/onboarding/notifications.js +++ /dev/null @@ -1,53 +0,0 @@ -'use strict'; - -angular.module('copayApp.controllers').controller('notificationsController', function($scope, $state, $timeout, $stateParams, $ionicConfig, profileService, configService, $interval, pushNotificationsService) { - - $scope.$on("$ionicView.enter", function() { - $ionicConfig.views.swipeBackEnabled(false); - }); - - $scope.$on("$ionicView.beforeLeave", function() { - $ionicConfig.views.swipeBackEnabled(true); - }); - - $scope.walletId = $stateParams.walletId; - - $scope.allowNotif = function() { - $scope.notificationDialogOpen = true; - $timeout(function() { - pushNotificationsService.init(); - }); - $scope.notificationPromise = $interval(function() { - PushNotification.hasPermission(function(data) { - if (data.isEnabled) { - $interval.cancel($scope.notificationPromise); - $state.go('onboarding.backupRequest', { - walletId: $scope.walletId - }); - } - }); - }, 100); - } - - $scope.continue = function() { - $interval.cancel($scope.notificationPromise); - $state.go('onboarding.backupRequest', { - walletId: $scope.walletId - }); - } - - $scope.disableNotif = function() { - var opts = { - pushNotifications: { - enabled: false - } - }; - configService.set(opts, function(err) { - if (err) $log.warn(err); - $state.go('onboarding.backupRequest', { - walletId: $scope.walletId - }); - }); - }; - -}); diff --git a/src/js/controllers/onboarding/tour.js b/src/js/controllers/onboarding/tour.js index 7652366f6..0135e97fb 100644 --- a/src/js/controllers/onboarding/tour.js +++ b/src/js/controllers/onboarding/tour.js @@ -1,10 +1,6 @@ 'use strict'; angular.module('copayApp.controllers').controller('tourController', - function($scope, $state, $log, $timeout, $filter, ongoingProcess, platformInfo, profileService, rateService, popupService, gettextCatalog) { - - var isCordova = platformInfo.isCordova; - var isWP = platformInfo.isWP; - var usePushNotifications = isCordova && !isWP; + function($scope, $state, $log, $timeout, $filter, ongoingProcess, profileService, rateService, popupService, gettextCatalog) { $scope.data = { index: 0 @@ -66,15 +62,9 @@ angular.module('copayApp.controllers').controller('tourController', ongoingProcess.set('creatingWallet', false); var wallet = walletClient; var walletId = wallet.credentials.walletId; - if (!usePushNotifications) { - $state.go('onboarding.backupRequest', { - walletId: walletId - }); - } else { - $state.go('onboarding.notifications', { - walletId: walletId - }); - } + $state.go('onboarding.backupRequest', { + walletId: walletId + }); }); }, 300); }; diff --git a/src/js/routes.js b/src/js/routes.js index 7a4d400c2..0709e011d 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -777,15 +777,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) - .state('onboarding.notifications', { - url: '/notifications/:walletId', - views: { - 'onboarding': { - templateUrl: 'views/onboarding/notifications.html', - controller: 'notificationsController' - } - } - }) .state('onboarding.backupRequest', { url: '/backupRequest/:walletId', views: { @@ -1176,12 +1167,11 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr var matchWelcome = $ionicHistory.currentStateName() == 'onboarding.welcome' ? true : false; 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 | matchDisclaimer; + var fromOnboarding = matchCollectEmail | matchBackupRequest | matchWelcome | matchDisclaimer; //views with disable backbutton var matchComplete = $ionicHistory.currentStateName() == 'tabs.rate.complete' ? true : false; diff --git a/src/sass/variables.scss b/src/sass/variables.scss index 7b1b4e882..d91baa647 100644 --- a/src/sass/variables.scss +++ b/src/sass/variables.scss @@ -116,7 +116,6 @@ $v-onboarding-checkbox-on-border: $v-success-color !default; $v-onboarding-tour-phone-bg: url(../img/onboarding-tour-phone.svg) !default; $v-onboarding-tour-currency-bg: url(../img/onboarding-tour-currency-bg.svg) !default; $v-onboarding-tour-control-bg: url(../img/onboarding-tour-control.svg) !default; -$v-onboarding-push-notification-bg: url(../img/onboarding-push-notifications.svg) !default; $v-onboarding-backup-warning-bg: url(../img/backup-warning.svg) !default; $v-onboarding-button-back-color: #ffffff !default; diff --git a/src/sass/views/onboarding/onboard-push-notifications.scss b/src/sass/views/onboarding/onboard-push-notifications.scss deleted file mode 100644 index 09f939953..000000000 --- a/src/sass/views/onboarding/onboard-push-notifications.scss +++ /dev/null @@ -1,9 +0,0 @@ -#onboarding-push-notifications { - #notifications-topic { - margin-top: 3rem; - } - #cta-buttons { - @extend %cta-buttons; - padding-bottom: 1rem; - } -} diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss index c7129a68a..60bf824f7 100644 --- a/src/sass/views/onboarding/onboarding.scss +++ b/src/sass/views/onboarding/onboarding.scss @@ -82,7 +82,6 @@ @import "onboard-backup-request"; @import "../backup-warning"; @import "onboard-disclaimer"; -@import "onboard-push-notifications"; %onboarding-illustration { width: 100%; @@ -124,10 +123,6 @@ @extend %onboarding-illustration; background-image: $v-onboarding-tour-control-bg; } - &-notifications { - @extend %onboarding-illustration; - background-image: $v-onboarding-push-notification-bg; - } &-backup-warning { @extend %onboarding-illustration; background-image: $v-onboarding-backup-warning-bg;