-
Notifications
You must be signed in to change notification settings - Fork 125
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feat/scan-qr-permission' into 'master'
Feat/scan qr permission See merge request papers/airgap/airgap-wallet!27
- Loading branch information
Showing
3 changed files
with
89 additions
and
11 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,32 @@ | ||
<ion-header> | ||
<ion-navbar color="primary"> | ||
<ion-title>Scanner</ion-title> | ||
</ion-navbar> | ||
<ion-navbar color="primary"> <ion-title>Scan QR</ion-title> </ion-navbar> | ||
</ion-header> | ||
|
||
<ion-content no-bounce [class.transparent]="hasCameraPermission"> | ||
<p ion-text color="white" padding no-margin text-center *ngIf="isWebScan || hasCameraPermission">Scan a sync QR | ||
to add a wallet or scan a transaction QR to confirm and send it.</p> | ||
<p ion-text color="white" padding no-margin text-center *ngIf="isWebScan || hasCameraPermission"> | ||
Scan a sync QR to add a wallet or scan a transaction QR to confirm and send it. | ||
</p> | ||
|
||
<ion-row *ngIf="!isWebScan && !hasCameraPermission" (click)="checkPermission(false)" justify-content-center | ||
align-items-center class="row--height__100"> | ||
<ion-row | ||
*ngIf="!isWebScan && !hasCameraPermission" | ||
(click)="checkPermission(false)" | ||
justify-content-center | ||
align-items-center | ||
class="row--height__100" | ||
> | ||
<ion-col text-center> | ||
<ion-icon name="eye-off"></ion-icon> | ||
<h3 padding-horizontal>Click to allow camera access to scan a QR.</h3> | ||
<img src="../assets/img/permission_onboarding_camera.svg" /> | ||
<h3 padding-horizontal> | ||
In order to scan QR codes, AirGap Wallet needs the <span ion-text color="primary">camera permission</span>. | ||
</h3> | ||
</ion-col> | ||
</ion-row> | ||
|
||
<zxing-scanner [hidden]="!isWebScan" #scanner [device]="selectedDevice" [scannerEnabled]="webScannerEnabled" (scanSuccess)="handleQrCodeResult($event)"></zxing-scanner> | ||
</ion-content> | ||
<zxing-scanner | ||
[hidden]="!isWebScan" | ||
#scanner | ||
[device]="selectedDevice" | ||
[scannerEnabled]="webScannerEnabled" | ||
(scanSuccess)="handleQrCodeResult($event)" | ||
></zxing-scanner> | ||
</ion-content> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,9 @@ page-scan { | |
} | ||
.row--height__100 { | ||
height: 100%; | ||
img { | ||
height: 45vh; | ||
} | ||
} | ||
|
||
ion-icon { | ||
|