Merge branch 'master' into v5

This commit is contained in:
Daniel
2018-04-06 23:06:59 +02:00
8 changed files with 157 additions and 55 deletions
@@ -1,5 +1,6 @@
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Injectable } from '@angular/core';
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs';
export interface QRScannerStatus {
@@ -86,11 +87,6 @@ export interface QRScannerStatus {
* scanSub.unsubscribe(); // stop scanning
* });
*
* // show camera preview
* this.qrScanner.show();
*
* // wait for user to scan something, then the observable callback will be called
*
* } else if (status.denied) {
* // camera permission was permanently denied
* // you must use QRScanner.openSettings() method to guide the user to the settings page