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

move to tab-settings

Browse source
This commit is contained in:
JDonadio 2017-03-30 12:38:23 -03:00
commit 25a5e44b21
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/advancedSettings.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $log, configService, platformInfo) { angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $log, configService) {
var updateConfig = function() { var updateConfig = function() {
var config = configService.getSync(); var config = configService.getSync();
@ -50,8 +50,6 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
}; };
$scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.isCordova = platformInfo.isCordova;
$scope.isDevel = platformInfo.isDevel;
updateConfig(); updateConfig();
}); });

5
src/js/controllers/tab-settings.js
View file

@ -51,7 +51,12 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.isCordova = platformInfo.isCordova; $scope.isCordova = platformInfo.isCordova;
$scope.isDevel = platformInfo.isDevel;
$scope.appName = appConfigService.nameCase; $scope.appName = appConfigService.nameCase;
configService.whenAvailable(function(config) {
$scope.locked = config.lock.method == 'fingerprint' || config.lock.value || false;
$scope.method = config.lock.method != '' ? config.lock.method.charAt(0).toUpperCase() + config.lock.method.slice(1) : gettextCatalog.getString('Disabled');
});
}); });
$scope.$on("$ionicView.enter", function(event, data) { $scope.$on("$ionicView.enter", function(event, data) {

9
www/views/advancedSettings.html
View file

@ -28,15 +28,6 @@
<ion-toggle ng-model="hideNextSteps.value" toggle-class="toggle-balanced" ng-change="nextStepsChange()"> <ion-toggle ng-model="hideNextSteps.value" toggle-class="toggle-balanced" ng-change="nextStepsChange()">
<span class="toggle-label" translate>Hide Next Steps Card</span> <span class="toggle-label" translate>Hide Next Steps Card</span>
</ion-toggle> </ion-toggle>
<div ng-if="isCordova || isDevel">
<div class="item item-divider"></div>
<a class="item item-icon-right" ui-sref="tabs.lock">
<span translate>Lock App</span>
<i class="icon bp-arrow-right"></i>
</a>
</div>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

10
www/views/tab-settings.html
View file

@ -89,6 +89,16 @@
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lock" ng-if="isCordova || isDevel">
<i class="icon ion-ios-locked-outline" ng-if="locked"></i>
<i class="icon ion-ios-unlocked-outline" ng-if="!locked"></i>
<span class="setting-title">{{'Lock App' | translate}}</span>
<span class="setting-value">
{{method}}
</span>
<i class="icon bp-arrow-right"></i>
</a>
<div class="item item-divider" ng-show="wallets[0]">{{'Wallets & Integrations' | translate}}</div> <div class="item item-divider" ng-show="wallets[0]">{{'Wallets & Integrations' | translate}}</div>
<a class="item item-icon-left item-icon-right" href <a class="item item-icon-left item-icon-right" href