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

Merge branch 'master' of github.com:bitpay/copay

Browse source
This commit is contained in:
Jason Dreyzehner 2016-11-16 18:21:25 -05:00
commit 8b7ab38f2b
10 changed files with 58 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/js/controllers/feedback/complete.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('completeController', function($scope, $stateParams, $timeout, $log, $ionicHistory, $state, platformInfo, configService, storageService, lodash) {
angular.module('copayApp.controllers').controller('completeController', function($scope, $stateParams, $timeout, $log, $ionicHistory, $state, $ionicNavBarDelegate, $ionicConfig, platformInfo, configService, storageService, lodash) {
$scope.isCordova = platformInfo.isCordova;
var config = configService.getSync();
@ -33,6 +33,12 @@ angular.module('copayApp.controllers').controller('completeController', function
$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;
@ -99,6 +105,7 @@ angular.module('copayApp.controllers').controller('completeController', function
disableAnimate: false,
historyRoot: true
});
$ionicHistory.goBack(-2);
if ($scope.score == 5) $ionicHistory.goBack(-3);
else $ionicHistory.goBack(-2);
};
});

7
src/js/controllers/feedback/rateApp.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('rateAppController', function($scope, $state, $stateParams, lodash, externalLinkService, configService, gettextCatalog, platformInfo, feedbackService, ongoingProcess, popupService) {
angular.module('copayApp.controllers').controller('rateAppController', function($scope, $state, $stateParams, $window, lodash, externalLinkService, configService, gettextCatalog, platformInfo, feedbackService, ongoingProcess, popupService) {
$scope.score = parseInt($stateParams.score);
var isAndroid = platformInfo.isAndroid;
var isIOS = platformInfo.isIOS;
@ -11,7 +11,10 @@ angular.module('copayApp.controllers').controller('rateAppController', function(
var dataSrc = {
"Email": lodash.values(config.emailFor)[0] || ' ',
"Feedback": ' ',
"Score": $stateParams.score
"Score": $stateParams.score,
"AppVersion": $window.version,
"Platform": ionic.Platform.platform(),
"DeviceVersion": ionic.Platform.version()
};
feedbackService.send(dataSrc, function(err) {
if (err) {

10
src/js/routes.js
View file

@ -743,7 +743,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*
*/
.state('tabs.feedback', {
.state('tabs.feedback', {
url: '/feedback',
views: {
'tab-settings@tabs': {
@ -752,8 +752,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
.state('tabs.feedback.shareApp', {
url: '/shareApp/:score/:skipped',
.state('tabs.shareApp', {
url: '/shareApp/:score/:skipped/:fromSettings',
views: {
'tab-settings@tabs': {
controller: 'completeController',
@ -1113,8 +1113,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
});
$rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) {
if($window.StatusBar) {
if(toState.customConfig && toState.customConfig.hideStatusBar) {
if ($window.StatusBar) {
if (toState.customConfig && toState.customConfig.hideStatusBar) {
$window.StatusBar.hide();
} else {
$window.StatusBar.show();

3
src/sass/buttons.scss
View file

@ -19,8 +19,7 @@ $button-secondary-border: transparent;
$button-secondary-active-bg: darken($subtle-gray, 5%);
$button-secondary-active-border: transparent;
%button-standard,
click-to-accept {
%button-standard {
width: 85%;
max-width: 300px;
margin-left: auto;

14
src/sass/views/includes/clickToAccept.scss
View file

@ -1,7 +1,18 @@
click-to-accept {
position: fixed;
bottom: 0;
height: 92px;
width: 100%;
.click-to-accept {
&__button.button.button-primary.button-standard {
height: 100%;
max-width: 9999px;
width: 100%;
}
&__button.disable {
pointer-events: none;
}
@ -18,6 +29,9 @@ click-to-accept {
transform: translateY(2rem);
opacity: 0;
pointer-events: none;
display: flex;
align-items: center;
justify-content: center;
&.enter {
transition: transform 250ms ease, opacity 250ms ease;

2
src/sass/views/includes/txp-details.scss
View file

@ -8,7 +8,7 @@
.list {
background: #f5f5f5;
}
.slide-to-pay {
.add-bottom-for-cta {
bottom: 92px;
}
.head {