diff --git a/src/js/controllers/feedback/complete.js b/src/js/controllers/feedback/complete.js index 4f13c14f4..0601fb5b0 100644 --- a/src/js/controllers/feedback/complete.js +++ b/src/js/controllers/feedback/complete.js @@ -4,42 +4,63 @@ angular.module('copayApp.controllers').controller('completeController', function $scope.isCordova = platformInfo.isCordova; var config = configService.getSync(); + function quickFeedback(cb){ + window.plugins.spinnerDialog.show(); + $timeout(window.plugins.spinnerDialog.hide, 300); + $timeout(cb, 20); + } + $scope.shareFacebook = function() { - window.plugins.socialsharing.shareVia($scope.shareFacebookVia, null, null, null, config.download.url); + quickFeedback(function(){ + window.plugins.socialsharing.shareVia($scope.shareFacebookVia, null, null, null, config.download.url); + }); }; $scope.shareTwitter = function() { - window.plugins.socialsharing.shareVia($scope.shareTwitterVia, null, null, null, config.download.url); + quickFeedback(function(){ + window.plugins.socialsharing.shareVia($scope.shareTwitterVia, null, null, null, config.download.url); + }); }; $scope.shareGooglePlus = function() { - window.plugins.socialsharing.shareVia($scope.shareGooglePlusVia, config.download.url); + quickFeedback(function(){ + window.plugins.socialsharing.shareVia($scope.shareGooglePlusVia, config.download.url); + }); }; $scope.shareEmail = function() { - window.plugins.socialsharing.shareViaEmail(config.download.url); + quickFeedback(function(){ + window.plugins.socialsharing.shareViaEmail(config.download.url); + }); }; $scope.shareWhatsapp = function() { - window.plugins.socialsharing.shareViaWhatsApp(config.download.url); + quickFeedback(function(){ + window.plugins.socialsharing.shareViaWhatsApp(config.download.url); + }); }; $scope.shareMessage = function() { - window.plugins.socialsharing.shareViaSMS(config.download.url); + quickFeedback(function(){ + window.plugins.socialsharing.shareViaSMS(config.download.url); + }); }; - $scope.$on("$ionicView.beforeEnter", function(event, data) { + $scope.$on("$ionicView.afterEnter", function() { + if (!$scope.fromSettings) { + $ionicConfig.views.swipeBackEnabled(false); + } else { + $ionicNavBarDelegate.showBackButton(true); + $ionicConfig.views.swipeBackEnabled(true); + } + }); + $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.score = (data.stateParams && data.stateParams.score) ? parseInt(data.stateParams.score) : null; $scope.skipped = (data.stateParams && data.stateParams.skipped) ? true : false; $scope.rated = (data.stateParams && data.stateParams.rated) ? true : false; $scope.fromSettings = (data.stateParams && data.stateParams.fromSettings) ? true : false; - if (!$scope.fromSettings) { - $ionicNavBarDelegate.showBackButton(false); - $ionicConfig.views.swipeBackEnabled(false); - } else $ionicNavBarDelegate.showBackButton(true); - storageService.getFeedbackInfo(function(error, info) { var feedbackInfo = lodash.isString(info) ? JSON.parse(info) : null; feedbackInfo.sent = true; diff --git a/src/js/controllers/feedback/rateApp.js b/src/js/controllers/feedback/rateApp.js index 66be9940a..58f4c389f 100644 --- a/src/js/controllers/feedback/rateApp.js +++ b/src/js/controllers/feedback/rateApp.js @@ -43,6 +43,7 @@ angular.module('copayApp.controllers').controller('rateAppController', function( externalLinkService.open(url); $state.go('tabs.rate.complete', { score: $stateParams.score, + skipped: true, rated: true }); }; diff --git a/src/js/controllers/feedback/send.js b/src/js/controllers/feedback/send.js index d36c43c02..7e13ac322 100644 --- a/src/js/controllers/feedback/send.js +++ b/src/js/controllers/feedback/send.js @@ -80,7 +80,7 @@ angular.module('copayApp.controllers').controller('sendController', function($sc $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay.") + ' ' + gettextCatalog.getString("Is there anything we could do better?"); break; default: - $scope.reaction = gettextCatalog.getString("Send Feedback"); + $scope.justFeedback = true; $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay. How could we improve your experience?"); break; } diff --git a/src/js/routes.js b/src/js/routes.js index bdd035fe8..cd935dda2 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -759,9 +759,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr controller: 'completeController', templateUrl: 'views/feedback/complete.html' } - }, - customConfig: { - hideStatusBar: true } }) .state('tabs.rate', { diff --git a/src/sass/views/feedback/complete.scss b/src/sass/views/feedback/complete.scss index 729d0393f..7a9fea4ca 100644 --- a/src/sass/views/feedback/complete.scss +++ b/src/sass/views/feedback/complete.scss @@ -1,5 +1,5 @@ #complete { - background-color: #ffffff; + background-color: #fff; .close-button { color: $dark-gray; position: absolute; @@ -30,7 +30,11 @@ width: 5rem; margin: 1rem; } - .title { + .send-feedback-illustration { + height: 21rem; + margin: 1rem; + } + .feedback-title { font-size: 20px; font-weight: bold; color: $dark-gray; diff --git a/src/sass/views/feedback/rateApp.scss b/src/sass/views/feedback/rateApp.scss index 26b8841be..38153d17d 100644 --- a/src/sass/views/feedback/rateApp.scss +++ b/src/sass/views/feedback/rateApp.scss @@ -1,24 +1,29 @@ #rate-app { background-color: #ffffff; - .skip { - margin-top: 15px; - color: #667; - } + text-align: center; .skip-rating { - margin-right: 15px; + color: $dark-gray; + position: absolute; + top: 5px; + right: 10px; + padding: 15px; } .icon-svg > img { width: 80px; height: 80px; margin-top: 15px; } - .title { + .feedback-title { font-size: 20px; font-weight: bold; color: $dark-gray; margin: 80px 50px 10px; text-align: center; } + .share-the-love-illustration { + width: 5rem; + margin: 1rem; + } .subtitle { padding: 10px 30px 20px 40px; color: #667; diff --git a/src/sass/views/feedback/send.scss b/src/sass/views/feedback/send.scss index 654ad5924..38e18c267 100644 --- a/src/sass/views/feedback/send.scss +++ b/src/sass/views/feedback/send.scss @@ -9,7 +9,7 @@ .feedback-heading { padding-top: 20px } - .title { + .feedback-title { padding-left: 10px; font-size: 20px; font-weight: bold; @@ -38,4 +38,16 @@ height: 1rem; margin-left: 5px; } + .form-fade-in { + opacity: 0; + animation-name: fadeIn; + animation-duration: .5s; + animation-fill-mode: forwards; + animation-timing-function: ease-in; + } +} + +@keyframes fadeIn { + from { opacity: 0; } + to { opacity: 1; } } diff --git a/www/views/feedback/complete.html b/www/views/feedback/complete.html index 2c0fb2b18..ef5fe01d8 100644 --- a/www/views/feedback/complete.html +++ b/www/views/feedback/complete.html @@ -1,33 +1,28 @@ - + - - - + {{'Share BitPay' | translate}} - +
-
-
Thank you!
-
-
Share BitPay
- -
+
+ +
Share the love by inviting your friends.
-
A member of the team will review your feedback as soon as possible.
- -
Share the love by inviting your friends.
-
If you have additional feedback, please let us know by tapping the "Send feedback" option in the Settings tab.
-
- - - +
+ +
A member of the team will review your feedback as soon as possible.
+
+
If you have additional feedback, please let us know by tapping the "Send feedback" option in the Settings tab.
+ +
+
Share the love by inviting your friends.
-