Merge pull request #5986 from gabrielbazan7/fix/lockedApp

Fix/locked app
This commit is contained in:
Matias Alejo Garcia 2017-05-10 01:13:12 +02:00 committed by GitHub
commit 38f8d1151e
14 changed files with 145 additions and 230 deletions

View file

@ -1,21 +0,0 @@
<ion-view id="locked-view">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{title}}</ion-nav-title>
</ion-nav-bar>
<ion-content>
<div ng-if="appName == 'copay'" class="img-container-copay">
<i class="icon big-icon-svg"><div class="bg"></div></i>
</div>
<div ng-if="appName == 'bitpay'" class="img-container-bitpay">
<i class="icon big-icon-svg"><div class="bg"></div></i>
</div>
<div class="comments">
<div class="header" translate>One-touch Sign In</div>
<div class="text-content" translate>Please place your fingertip on the scanner to verify your identity</div>
</div>
<button type="submit" style="margin-top: 15%"
class="button button-standard button-primary" ng-click="requestFingerprint()" translate>Scan again
</button>
</ion-content>
</ion-view>

View file

@ -0,0 +1,10 @@
<ion-modal-view id="pin">
<div class="content">
<div class="block-text row"></div>
<div class="app-icon">
<i class="icon big-icon-svg">
<div class="bg"></div>
</i>
</div>
</div>
</ion-modal-view>

View file

@ -1,8 +1,9 @@
<ion-view id="pin" hide-tabs hide-back-button="action == 'check'">
<ion-nav-bar class="bar-clear">
<ion-nav-back-button>
</ion-nav-back-button>
</ion-nav-bar>
<ion-modal-view id="pin" ng-controller="pinController">
<ion-header-bar align-title="center" class="bar-royal">
<button ng-if="action != 'check'" class="button button-back button-clear" ng-click="hideModal()">
Close
</button>
</ion-header-bar>
<div class="content">
<div class="block-text row">
<div class="message" ng-if="!confirmPin && !error" translate>Please enter your PIN</div>
@ -70,4 +71,4 @@
</div>
</div>
</div>
</ion-view>
</ion-modal-view>

View file

@ -89,7 +89,7 @@
<i class="icon bp-arrow-right"></i>
</a>
<a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lockSetup" ng-if="isCordova || isDevel">
<a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lockSetup" ng-if="isCordova">
<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>