mirror of https://github.com/BTCPrivate/copay.git
Feat: QR Scanner implemented
This commit is contained in:
parent
438b9472ea
commit
81b3c2930d
|
@ -30,6 +30,7 @@
|
||||||
"@ionic-native/clipboard": "4.1.0",
|
"@ionic-native/clipboard": "4.1.0",
|
||||||
"@ionic-native/core": "3.12.1",
|
"@ionic-native/core": "3.12.1",
|
||||||
"@ionic-native/file": "4.1.0",
|
"@ionic-native/file": "4.1.0",
|
||||||
|
"@ionic-native/qr-scanner": "^4.1.0",
|
||||||
"@ionic-native/social-sharing": "4.1.0",
|
"@ionic-native/social-sharing": "4.1.0",
|
||||||
"@ionic-native/splash-screen": "3.12.1",
|
"@ionic-native/splash-screen": "3.12.1",
|
||||||
"@ionic-native/status-bar": "3.12.1",
|
"@ionic-native/status-bar": "3.12.1",
|
||||||
|
@ -43,6 +44,7 @@
|
||||||
"cordova-ios": "4.4.0",
|
"cordova-ios": "4.4.0",
|
||||||
"cordova-plugin-console": "1.0.5",
|
"cordova-plugin-console": "1.0.5",
|
||||||
"cordova-plugin-device": "1.1.4",
|
"cordova-plugin-device": "1.1.4",
|
||||||
|
"cordova-plugin-qrscanner": "^2.5.0",
|
||||||
"cordova-plugin-splashscreen": "4.0.3",
|
"cordova-plugin-splashscreen": "4.0.3",
|
||||||
"cordova-plugin-statusbar": "2.2.2",
|
"cordova-plugin-statusbar": "2.2.2",
|
||||||
"cordova-plugin-whitelist": "1.3.1",
|
"cordova-plugin-whitelist": "1.3.1",
|
||||||
|
@ -58,7 +60,8 @@
|
||||||
"ngx-qrcode2": "0.0.3",
|
"ngx-qrcode2": "0.0.3",
|
||||||
"rxjs": "5.4.0",
|
"rxjs": "5.4.0",
|
||||||
"sw-toolbox": "3.6.0",
|
"sw-toolbox": "3.6.0",
|
||||||
"zone.js": "0.8.12"
|
"zone.js": "0.8.12",
|
||||||
|
"cordova-android": "^6.2.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular/cli": "1.3.0",
|
"@angular/cli": "1.3.0",
|
||||||
|
@ -102,9 +105,11 @@
|
||||||
"ionic-plugin-keyboard": {},
|
"ionic-plugin-keyboard": {},
|
||||||
"cordova-clipboard": {},
|
"cordova-clipboard": {},
|
||||||
"cordova-plugin-x-toast": {},
|
"cordova-plugin-x-toast": {},
|
||||||
"cordova-plugin-x-socialsharing": {}
|
"cordova-plugin-x-socialsharing": {},
|
||||||
|
"cordova-plugin-qrscanner": {}
|
||||||
},
|
},
|
||||||
"platforms": [
|
"platforms": [
|
||||||
|
"android",
|
||||||
"ios"
|
"ios"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import { SplashScreen } from '@ionic-native/splash-screen';
|
||||||
import { Toast } from '@ionic-native/toast';
|
import { Toast } from '@ionic-native/toast';
|
||||||
import { Clipboard } from '@ionic-native/clipboard';
|
import { Clipboard } from '@ionic-native/clipboard';
|
||||||
import { SocialSharing } from '@ionic-native/social-sharing';
|
import { SocialSharing } from '@ionic-native/social-sharing';
|
||||||
|
import { QRScanner } from '@ionic-native/qr-scanner';
|
||||||
|
|
||||||
/* Modules */
|
/* Modules */
|
||||||
import { NgLoggerModule, Logger, Level } from '@nsalaun/ng-logger';
|
import { NgLoggerModule, Logger, Level } from '@nsalaun/ng-logger';
|
||||||
|
@ -22,6 +23,7 @@ import { CopayApp } from './app.component';
|
||||||
/* Pages */
|
/* Pages */
|
||||||
import { HomePage } from '../pages/home/home';
|
import { HomePage } from '../pages/home/home';
|
||||||
import { ReceivePage } from '../pages/receive/receive';
|
import { ReceivePage } from '../pages/receive/receive';
|
||||||
|
import { ScanPage } from '../pages/scan/scan';
|
||||||
import { SendPage } from '../pages/send/send';
|
import { SendPage } from '../pages/send/send';
|
||||||
import { SettingPage } from '../pages/setting/setting';
|
import { SettingPage } from '../pages/setting/setting';
|
||||||
import { TabsPage } from '../pages/tabs/tabs';
|
import { TabsPage } from '../pages/tabs/tabs';
|
||||||
|
@ -37,6 +39,7 @@ import { PlatformProvider } from '../providers/platform/platform';
|
||||||
import { ConfigProvider } from '../providers/config/config';
|
import { ConfigProvider } from '../providers/config/config';
|
||||||
import { LanguageProvider } from '../providers/language/language';
|
import { LanguageProvider } from '../providers/language/language';
|
||||||
import { UnitProvider } from '../providers/unit/unit';
|
import { UnitProvider } from '../providers/unit/unit';
|
||||||
|
import { ScanProvider } from '../providers/scan/scan';
|
||||||
|
|
||||||
export function createTranslateLoader(http: Http) {
|
export function createTranslateLoader(http: Http) {
|
||||||
return new TranslatePoHttpLoader(http, 'assets/i18n', '.po');
|
return new TranslatePoHttpLoader(http, 'assets/i18n', '.po');
|
||||||
|
@ -48,6 +51,7 @@ export function createTranslateLoader(http: Http) {
|
||||||
HomePage,
|
HomePage,
|
||||||
ReceivePage,
|
ReceivePage,
|
||||||
SendPage,
|
SendPage,
|
||||||
|
ScanPage,
|
||||||
SettingPage,
|
SettingPage,
|
||||||
AboutPage,
|
AboutPage,
|
||||||
TermsOfUsePage,
|
TermsOfUsePage,
|
||||||
|
@ -72,6 +76,7 @@ export function createTranslateLoader(http: Http) {
|
||||||
CopayApp,
|
CopayApp,
|
||||||
HomePage,
|
HomePage,
|
||||||
ReceivePage,
|
ReceivePage,
|
||||||
|
ScanPage,
|
||||||
SendPage,
|
SendPage,
|
||||||
SettingPage,
|
SettingPage,
|
||||||
AboutPage,
|
AboutPage,
|
||||||
|
@ -105,7 +110,9 @@ export function createTranslateLoader(http: Http) {
|
||||||
PlatformProvider,
|
PlatformProvider,
|
||||||
ConfigProvider,
|
ConfigProvider,
|
||||||
LanguageProvider,
|
LanguageProvider,
|
||||||
UnitProvider
|
UnitProvider,
|
||||||
|
QRScanner,
|
||||||
|
ScanProvider
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class AppModule { }
|
export class AppModule { }
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg version="1.1" id="QR-scanner-guides" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
|
||||||
|
y="0px" viewBox="0 0 271 236" style="enable-background:new 0 0 271 236;" xml:space="preserve">
|
||||||
|
<style type="text/css">
|
||||||
|
.st0{filter:url(#filter-2);}
|
||||||
|
.st1{fill:none;stroke:#647CE8;stroke-width:2;}
|
||||||
|
.st2{fill:#FFFFFF;fill-opacity:0.3;}
|
||||||
|
</style>
|
||||||
|
<filter filterUnits="objectBoundingBox" height="200%" id="filter-2" width="200%" x="-50%" y="-50%">
|
||||||
|
<feMorphology in="SourceAlpha" operator="dilate" radius="1" result="shadowSpreadOuter1"></feMorphology>
|
||||||
|
<feOffset dx="0" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
|
||||||
|
<feMorphology in="SourceAlpha" operator="erode" radius="1" result="shadowInner"></feMorphology>
|
||||||
|
<feOffset dx="0" dy="0" in="shadowInner" result="shadowInner"></feOffset>
|
||||||
|
<feComposite in="shadowOffsetOuter1" in2="shadowInner" operator="out" result="shadowOffsetOuter1"></feComposite>
|
||||||
|
<feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="6"></feGaussianBlur>
|
||||||
|
|
||||||
|
<feColorMatrix in="shadowBlurOuter1" type="matrix" values="0 0 0 0 0.392156863 0 0 0 0 0.48627451 0 0 0 0 0.909803922 0 0 0 1 0">
|
||||||
|
</feColorMatrix>
|
||||||
|
</filter>
|
||||||
|
<g id="scan-line">
|
||||||
|
<g class="st0">
|
||||||
|
<line x1="11" y1="111" x2="260" y2="111"/>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
<path id="line" class="st1" d="M11,111h249"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<path id="top-left" class="st2" d="M28,10h53.1c2.8,0,5-2.2,5-5s-2.2-5-5-5H23c-2.8,0-5,2.2-5,5v58c0,2.8,2.2,5,5,5s5-2.2,5-5V10z"
|
||||||
|
/>
|
||||||
|
<path id="bottom-left" class="st2" d="M28,224.7v-53.1c0-2.8-2.2-5-5-5s-5,2.2-5,5v58.1c0,2.8,2.2,5,5,5h58c2.8,0,5-2.2,5-5
|
||||||
|
c0-2.8-2.2-5-5-5H28z"/>
|
||||||
|
<path id="top-right" class="st2" d="M244,10v53.1c0,2.8,2.2,5,5,5s5-2.2,5-5V5c0-2.8-2.2-5-5-5h-58c-2.8,0-5,2.2-5,5s2.2,5,5,5H244z
|
||||||
|
"/>
|
||||||
|
<path id="bottom-right" class="st2" d="M244.1,225.6H191c-2.8,0-5,2.2-5,5c0,2.8,2.2,5,5,5h58.1c2.8,0,5-2.2,5-5v-58
|
||||||
|
c0-2.8-2.2-5-5-5s-5,2.2-5,5V225.6z"/>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 2.0 KiB |
|
@ -0,0 +1,16 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg version="1.1" id="camera-toggle" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
|
||||||
|
y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
|
||||||
|
<style type="text/css">
|
||||||
|
.st0{opacity:0.8;fill:none;stroke:#FFFFFF;}
|
||||||
|
.st1{opacity:0.386;fill:#FFFFFF;enable-background:new ;}
|
||||||
|
</style>
|
||||||
|
<path id="top-arrow-line" class="st0" d="M10.5,18.1c0-4.7,4.3-8.5,9.5-8.5c3.7,0,6.9,1.9,8.5,4.7"/>
|
||||||
|
<path id="bottom-arrow-line" class="st0" d="M29.5,21c0,4.7-4.3,8.5-9.5,8.5c-3.7,0-6.9-1.9-8.5-4.7"/>
|
||||||
|
<polyline id="top-arrow-head" class="st0" points="28.9,11.1 28.4,14.1 25,13.7 "/>
|
||||||
|
<polyline id="bottom-arrow-head" class="st0" points="11,27.8 11.4,24.8 14.8,25.2 "/>
|
||||||
|
<path id="camera" class="st1" d="M24.6,21.9c0,0.8-0.7,1.5-1.5,1.5H17c-0.8,0-1.5-0.7-1.5-1.5v-3.5c0-0.8,0.7-1.5,1.5-1.5h1l0.8-1.1
|
||||||
|
h2.5l0.8,1.1h1c0.8,0,1.5,0.7,1.5,1.5V21.9z M20.1,21.9c1.1,0,2.1-0.8,2.1-1.9s-0.9-1.9-2.1-1.9C18.9,18.1,18,19,18,20
|
||||||
|
S18.9,21.9,20.1,21.9z"/>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.1 KiB |
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg version="1.1" id="Flash_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
|
||||||
|
<style type="text/css">
|
||||||
|
.st0{opacity:0.8;fill:#FFFFFF;enable-background:new ;}
|
||||||
|
</style>
|
||||||
|
<polygon id="bolt" class="st0" points="15,21.4 19.6,21.4 18,30 25,18.6 20.4,18.6 22,10 "/>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 536 B |
|
@ -0,0 +1,33 @@
|
||||||
|
<!--
|
||||||
|
Generated template for the ScanPage page.
|
||||||
|
|
||||||
|
See http://ionicframework.com/docs/components/#navigation for more info on
|
||||||
|
Ionic pages and navigation.
|
||||||
|
-->
|
||||||
|
<ion-header>
|
||||||
|
|
||||||
|
<ion-navbar>
|
||||||
|
<ion-title>Scan</ion-title>
|
||||||
|
</ion-navbar>
|
||||||
|
|
||||||
|
</ion-header>
|
||||||
|
|
||||||
|
|
||||||
|
<ion-content class="back-trasnparent" padding>
|
||||||
|
<p>Scanner text: {{ text }}</p>
|
||||||
|
<p>Scanner visible: {{ scannerVisible }}</p>
|
||||||
|
<div class="ng-hide" id="tab-scan-camera-ready" *ngIf="scannerVisible">
|
||||||
|
<button type="button" (click)="ngOnInit()">Open camera</button>
|
||||||
|
<div class="guides">
|
||||||
|
<img class="svg qr-scan-guides" src="assets/img/bitpay-wallet-qr-scan-guides.svg">
|
||||||
|
</div>
|
||||||
|
<div class="scanner-controls">
|
||||||
|
<span ng-click="toggleLight()">
|
||||||
|
<ion-icon class="icon-flash" [ngClass]="{'active': lightActive}" name="flash"></ion-icon>
|
||||||
|
</span>
|
||||||
|
<span ng-click="toggleCamera()">
|
||||||
|
<ion-icon class="icon-camera-toggle" [ngClass]="{'active': lightActive}" name="reverse-camera"></ion-icon>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</ion-content>
|
|
@ -0,0 +1,86 @@
|
||||||
|
$v-scanner-background-color: #1e3186;
|
||||||
|
$v-scanner-guide-color: #647ce8;
|
||||||
|
|
||||||
|
html , body, .back-trasnparent, ion-app {
|
||||||
|
background: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
page-scan {
|
||||||
|
color: #fff;
|
||||||
|
text-align: center;
|
||||||
|
background: transparent none;
|
||||||
|
.header {
|
||||||
|
opacity: .9;
|
||||||
|
}
|
||||||
|
svg#QR-scanner-guides path.st1 {
|
||||||
|
stroke: $v-scanner-guide-color;
|
||||||
|
}
|
||||||
|
.zero-state-cta {
|
||||||
|
padding-bottom: 6vh;
|
||||||
|
}
|
||||||
|
#page-scan-has-problems,
|
||||||
|
#page-scan-loading-camera {
|
||||||
|
background-color: $v-scanner-background-color;
|
||||||
|
}
|
||||||
|
#page-scan-loading-camera {
|
||||||
|
height: 100%;
|
||||||
|
width: 100%
|
||||||
|
}
|
||||||
|
#page-scan-camera-ready {
|
||||||
|
// view background is transparent to show video preview
|
||||||
|
background: none transparent;
|
||||||
|
.scanner-controls {
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
bottom: 0;
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
}
|
||||||
|
.guides {
|
||||||
|
display: flex;
|
||||||
|
position: absolute;
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
.qr-scan-guides {
|
||||||
|
width: 60%;
|
||||||
|
max-width: 400px;
|
||||||
|
margin-bottom: 8em;
|
||||||
|
max-height: 50%;
|
||||||
|
}
|
||||||
|
.icon-flash, .icon-camera-toggle {
|
||||||
|
border-radius: 50%;
|
||||||
|
width: 4em;
|
||||||
|
height: 4em;
|
||||||
|
background-color: rgba(13, 13, 13, 0.79);
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-clip: padding-box;
|
||||||
|
background-size: 100%;
|
||||||
|
display: inline-block;
|
||||||
|
margin: 2em 1em;
|
||||||
|
cursor: pointer;
|
||||||
|
// hover for desktop only
|
||||||
|
body:not(.platform-cordova) &:hover {
|
||||||
|
background-color: rgba(31, 40, 78, 0.79);
|
||||||
|
}
|
||||||
|
&.active, &:active {
|
||||||
|
background-color: rgba(100, 124, 232, 0.79);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.icon-flash {
|
||||||
|
background-image: url("assets/img/icon-flash.svg");
|
||||||
|
}
|
||||||
|
.icon-camera-toggle {
|
||||||
|
background-image: url("assets/img/icon-camera-toggle.svg");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#cordova-plugin-qrscanner-still, #cordova-plugin-qrscanner-video-preview {
|
||||||
|
background-color: $v-scanner-background-color !important;
|
||||||
|
}
|
|
@ -0,0 +1,44 @@
|
||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { NavController, NavParams } from 'ionic-angular';
|
||||||
|
import { QRScanner, QRScannerStatus } from '@ionic-native/qr-scanner';
|
||||||
|
import { PlatformProvider } from '../../providers/platform/platform';
|
||||||
|
import { ScanProvider } from '../../providers/scan/scan';
|
||||||
|
//import { QRScanner as QRScannerBrowser } from 'cordova-plugin-qrscanner/src/browser/src/library'
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'page-scan',
|
||||||
|
templateUrl: 'scan.html',
|
||||||
|
providers: [ScanProvider]
|
||||||
|
})
|
||||||
|
export class ScanPage implements OnInit {
|
||||||
|
|
||||||
|
public text: string;
|
||||||
|
public scannerVisible: boolean;
|
||||||
|
public canEnableLight: boolean;
|
||||||
|
public canChangeCamera: boolean;
|
||||||
|
|
||||||
|
// private qrScannerBrowser: QRScannerBrowser (inside constructor)
|
||||||
|
constructor(public navCtrl: NavController, public navParams: NavParams, private scanProvider: ScanProvider, private platform: PlatformProvider) {
|
||||||
|
this.text = "Codigo QR";
|
||||||
|
this.canEnableLight = true;
|
||||||
|
this.canChangeCamera = true;
|
||||||
|
this.scannerVisible = this.platform.isCordova ? true : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
ionViewDidLoad() {
|
||||||
|
console.log('ionViewDidLoad ScanPage');
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit () {
|
||||||
|
this.scanProvider.activate()
|
||||||
|
.then(resp => {
|
||||||
|
console.log("resp");
|
||||||
|
console.log(resp);
|
||||||
|
this.text = resp;
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.log("error: " + error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,6 +1,7 @@
|
||||||
<ion-tabs>
|
<ion-tabs>
|
||||||
<ion-tab [root]="homeRoot" tabTitle="{{'Home'|translate}}" tabIcon="home"></ion-tab>
|
<ion-tab [root]="homeRoot" tabTitle="{{'Home'|translate}}" tabIcon="home"></ion-tab>
|
||||||
<ion-tab [root]="receiveRoot" tabTitle="{{'Receive'|translate}}" tabIcon="archive"></ion-tab>
|
<ion-tab [root]="receiveRoot" tabTitle="{{'Receive'|translate}}" tabIcon="archive"></ion-tab>
|
||||||
|
<ion-tab [root]="scanRoot" tabTitle="{{'Scan'|translate}}" tabIcon="md-qr-scanner"></ion-tab>
|
||||||
<ion-tab [root]="sendRoot" tabTitle="{{'Send'|translate}}" tabIcon="send"></ion-tab>
|
<ion-tab [root]="sendRoot" tabTitle="{{'Send'|translate}}" tabIcon="send"></ion-tab>
|
||||||
<ion-tab [root]="settingRoot" tabTitle="{{'Setting'|translate}}" tabIcon="settings"></ion-tab>
|
<ion-tab [root]="settingRoot" tabTitle="{{'Setting'|translate}}" tabIcon="settings"></ion-tab>
|
||||||
</ion-tabs>
|
</ion-tabs>
|
||||||
|
|
|
@ -2,6 +2,7 @@ import { Component } from '@angular/core';
|
||||||
|
|
||||||
import { HomePage } from '../home/home';
|
import { HomePage } from '../home/home';
|
||||||
import { ReceivePage } from '../receive/receive';
|
import { ReceivePage } from '../receive/receive';
|
||||||
|
import { ScanPage } from '../scan/scan';
|
||||||
import { SendPage } from '../send/send';
|
import { SendPage } from '../send/send';
|
||||||
import { SettingPage } from '../setting/setting';
|
import { SettingPage } from '../setting/setting';
|
||||||
|
|
||||||
|
@ -12,6 +13,7 @@ export class TabsPage {
|
||||||
|
|
||||||
homeRoot = HomePage;
|
homeRoot = HomePage;
|
||||||
receiveRoot = ReceivePage;
|
receiveRoot = ReceivePage;
|
||||||
|
scanRoot = ScanPage;
|
||||||
sendRoot = SendPage;
|
sendRoot = SendPage;
|
||||||
settingRoot = SettingPage;
|
settingRoot = SettingPage;
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@ import { IStorage, KeyAlreadyExistsError } from './istorage';
|
||||||
export class ChromeStorage implements IStorage {
|
export class ChromeStorage implements IStorage {
|
||||||
ls: chrome.storage.StorageArea;
|
ls: chrome.storage.StorageArea;
|
||||||
constructor(private log: Logger) {
|
constructor(private log: Logger) {
|
||||||
|
let chrome: any;
|
||||||
if (!chrome.storage || !chrome.storage.local) throw new Error('Chrome storage not supported');
|
if (!chrome.storage || !chrome.storage.local) throw new Error('Chrome storage not supported');
|
||||||
this.ls = chrome.storage.local;
|
this.ls = chrome.storage.local;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@ export class PlatformProvider {
|
||||||
supportsIntelTEE: boolean;
|
supportsIntelTEE: boolean;
|
||||||
|
|
||||||
constructor(private platform: Platform, private log: Logger) {
|
constructor(private platform: Platform, private log: Logger) {
|
||||||
|
let chrome: any;
|
||||||
var ua = navigator ? navigator.userAgent : null;
|
var ua = navigator ? navigator.userAgent : null;
|
||||||
|
|
||||||
if (!ua) {
|
if (!ua) {
|
||||||
|
@ -46,6 +47,7 @@ export class PlatformProvider {
|
||||||
}
|
}
|
||||||
|
|
||||||
getBrowserName(): string {
|
getBrowserName(): string {
|
||||||
|
let chrome: any;
|
||||||
let userAgent = window.navigator.userAgent;
|
let userAgent = window.navigator.userAgent;
|
||||||
let browsers = { chrome: /chrome/i, safari: /safari/i, firefox: /firefox/i, ie: /internet explorer/i };
|
let browsers = { chrome: /chrome/i, safari: /safari/i, firefox: /firefox/i, ie: /internet explorer/i };
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Http } from '@angular/http';
|
||||||
|
import { QRScanner, QRScannerStatus } from '@ionic-native/qr-scanner';
|
||||||
|
import { PlatformProvider } from '../platform/platform';
|
||||||
|
import 'rxjs/add/operator/map';
|
||||||
|
|
||||||
|
/*
|
||||||
|
Generated class for the ScanProvider provider.
|
||||||
|
|
||||||
|
See https://angular.io/docs/ts/latest/guide/dependency-injection.html
|
||||||
|
for more info on providers and Angular DI.
|
||||||
|
*/
|
||||||
|
@Injectable()
|
||||||
|
export class ScanProvider {
|
||||||
|
|
||||||
|
public text: string;
|
||||||
|
public scannerVisible: boolean;
|
||||||
|
|
||||||
|
constructor(public http: Http, private qrScanner: QRScanner, private platform: PlatformProvider) {
|
||||||
|
this.scannerVisible = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
activate(): Promise<any> {
|
||||||
|
return new Promise(resolve => {
|
||||||
|
if (this.platform.isCordova) {
|
||||||
|
console.log("Cordova device");
|
||||||
|
this.qrScanner.show();
|
||||||
|
this.scannerVisible = true;
|
||||||
|
// start scanning
|
||||||
|
let scanSub = this.qrScanner.scan().subscribe((text: string) => {
|
||||||
|
console.log('Scanned something' + text);
|
||||||
|
this.text = text;
|
||||||
|
resolve(this.text);
|
||||||
|
this.scannerVisible = false;
|
||||||
|
this.qrScanner.hide(); // hide camera preview
|
||||||
|
scanSub.unsubscribe(); // stop scanning
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
resolve("ERROR - No Cordova device");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue