BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

show top bar on share copay option

This commit is contained in:
Gabriel Bazán 2016-11-16 18:32:12 -03:00
parent 62ec55bf6d
commit 477a94b87d
5 changed files with 23 additions and 11 deletions
Show Stats 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();
@ -32,6 +32,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.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;
@ -97,6 +103,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);
};
});

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/views/feedback/complete.scss
View File

@ -1,9 +1,8 @@
#complete {
background-color: #ffffff;
.close-button {
color: $dark-gray;
color: #fff;
position: absolute;
top: 10px;
right: 15px;
font-size: 36px;
}

8
www/views/feedback/complete.html
View File

@ -1,6 +1,12 @@
<ion-view id="complete" hide-tabs>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-buttons side="secondary">
<a ng-show="!fromSettings" class="close-button" ng-click="close()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content scroll="false">
<a class="close-button" ng-click="close()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
<div ng-show="skipped && isCordova">
<div ng-show="score > 3">
<div class="title" translate>Invite friends to BitPay!</div>

2
www/views/tab-settings.html
View File

@ -36,7 +36,7 @@
<span translate>Send Feedback</span>
<i class="icon bp-arrow-right"></i>
</a>
<a ng-if="isCordova" class="item item-icon-left item-icon-right" ui-sref="tabs.feedback.shareApp({score: 4, skipped: true})">
<a ng-if="isCordova" class="item item-icon-left item-icon-right" ui-sref="tabs.shareApp({score: 4, skipped: true, fromSettings: true})">
<i class="icon big-icon-svg">
<img src="img/icon-send-feedback.svg" class="bg"/>
</i>