nativescript-barcodescanner
Advanced tools
Comparing version 3.2.0 to 3.2.1
@@ -6,4 +6,10 @@ "use strict"; | ||
var SCANNER_REQUEST_CODE = 444; | ||
var AppPackageName = useAndroidX() ? global.androidx.core.app : android.support.v4.app; | ||
var ContentPackageName = useAndroidX() ? global.androidx.core.content : android.support.v4.content; | ||
var LocalBroadcastManagerPackageName = useAndroidX() ? global.androidx.localbroadcastmanager.content : android.support.v4.content; | ||
var _onScanReceivedCallback = undefined; | ||
var _onContinuousScanResult = undefined; | ||
function useAndroidX() { | ||
return global.androidx && global.androidx.appcompat; | ||
} | ||
var BarcodeScanner = (function () { | ||
@@ -35,3 +41,3 @@ function BarcodeScanner() { | ||
hasPermission = android.content.pm.PackageManager.PERMISSION_GRANTED === | ||
android.support.v4.content.ContextCompat.checkSelfPermission(utils.ad.getApplicationContext(), android.Manifest.permission.CAMERA); | ||
ContentPackageName.ContextCompat.checkSelfPermission(utils.ad.getApplicationContext(), android.Manifest.permission.CAMERA); | ||
} | ||
@@ -43,3 +49,3 @@ return hasPermission; | ||
this.onPermissionRejected = reject; | ||
android.support.v4.app.ActivityCompat.requestPermissions(appModule.android.foregroundActivity, [android.Manifest.permission.CAMERA], 234); | ||
AppPackageName.ActivityCompat.requestPermissions(appModule.android.foregroundActivity, [android.Manifest.permission.CAMERA], 234); | ||
}; | ||
@@ -131,3 +137,3 @@ BarcodeScanner.prototype.available = function () { | ||
if (!_this.broadcastManager) { | ||
_this.broadcastManager = android.support.v4.content.LocalBroadcastManager.getInstance(utils.ad.getApplicationContext()); | ||
_this.broadcastManager = LocalBroadcastManagerPackageName.LocalBroadcastManager.getInstance(utils.ad.getApplicationContext()); | ||
} | ||
@@ -134,0 +140,0 @@ var isContinuous = typeof arg.continuousScanCallback === "function"; |
{ | ||
"name": "nativescript-barcodescanner", | ||
"version": "3.2.0", | ||
"version": "3.2.1", | ||
"description": "Scan QR/barcodes with your NativeScript app.", | ||
@@ -24,8 +24,8 @@ "main": "barcodescanner", | ||
"plugin.tscwatch": "npm run tsc -- -w", | ||
"demo.ios": "npm run build && cd ../demo && tns run ios --syncAllFiles", | ||
"demo.ios": "npm run build && cd ../demo && tns run ios", | ||
"demo.reset": "cd ../demo && rimraf platforms", | ||
"demo-ng.ios": "npm run build && cd ../demo-ng && tns run ios", | ||
"demo.android": "npm run build && cd ../demo && tns run android --syncAllFiles", | ||
"demo-vue.ios": "npm run tsc && cd ../demo-vue && tns run ios --bundle --syncAllFiles", | ||
"demo-vue.android": "npm run tsc && cd ../demo-vue && tns run android --bundle --syncAllFiles", | ||
"demo.android": "npm run build && cd ../demo && tns run android", | ||
"demo-vue.ios": "npm run tsc && cd ../demo-vue && tns run ios --bundle", | ||
"demo-vue.android": "npm run tsc && cd ../demo-vue && tns run android --bundle", | ||
"plugin.prepare": "npm run tsc && cd ../demo && tns plugin remove nativescript-barcodescanner && tns plugin add ../src", | ||
@@ -32,0 +32,0 @@ "clean": "cd ../demo && rimraf hooks node_modules platforms && cd ../src && rimraf node_modules && npm run plugin.link", |
Sorry, the diff of this file is not supported yet
1690515
799