@idpass/smartscanner-capacitor 0.4.0-beta.1 → 0.4.0

package/android/build.gradle

@@ -96,8 +96,8 @@ dependencies {
     implementation 'androidx.preference:preference-ktx:1.1.1'
 
     // ML Kit dependencies
-    implementation 'com.google.android.gms:play-services-mlkit-text-recognition:16.1.3'
-    implementation 'com.google.mlkit:barcode-scanning:16.0.3'
+    implementation 'com.google.mlkit:text-recognition:16.0.0-beta4'
+    implementation 'com.google.mlkit:barcode-scanning:17.0.2'
 
     // Glide
     implementation 'com.github.bumptech.glide:glide:4.12.0'
@@ -112,31 +112,37 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.1'
 
     // CameraX
-    def camerax_version = "1.0.0-beta06"
+    def camerax_version = "1.0.0-beta07"
+    implementation "androidx.camera:camera-core:$camerax_version"
     // CameraX core library using camera2 implementation
     implementation "androidx.camera:camera-camera2:$camerax_version"
     // CameraX Lifecycle Library
     implementation "androidx.camera:camera-lifecycle:$camerax_version"
     // CameraX View class
-    implementation "androidx.camera:camera-view:1.0.0-alpha12"
+    implementation "androidx.camera:camera-view:1.0.0-alpha14"
 
     // MRZ
     implementation 'org.slf4j:slf4j-android:1.7.30'
 
     // gson
     implementation 'com.google.code.gson:gson:2.8.6'
+
     // NFC
     implementation 'org.jmrtd:jmrtd:0.7.18'
     implementation 'com.madgag.spongycastle:prov:1.58.0.0'
     implementation 'net.sf.scuba:scuba-sc-android:0.0.23'
     implementation group: 'org.ejbca.cvc', name: 'cert-cvc', version: '1.4.6'
+
     //WSQ
     implementation 'com.github.mhshams:jnbis:2.0.2'
+
     //DatatypeConverter
     implementation 'commons-codec:commons-codec:1.12'
+
     //RX
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
+    
     //Sentry
     implementation 'io.sentry:sentry-android:5.0.1'
 }

package/android/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Jan 12 23:41:32 PST 2021
+#Wed May 18 12:59:31 PST 2022
 sdk.dir=/Users/reubenjamesmangubat/Library/Android/sdk

package/android/src/main/java/org/idpass/smartscanner/capacitor/SmartScannerPlugin.kt

@@ -2,13 +2,7 @@ package org.idpass.smartscanner.capacitor
 
 import android.app.Activity
 import android.content.Intent
-import androidx.activity.result.ActivityResult
-import com.getcapacitor.JSObject
-import com.getcapacitor.Plugin
-import com.getcapacitor.PluginCall
-import com.getcapacitor.PluginMethod
-import com.getcapacitor.annotation.ActivityCallback
-import com.getcapacitor.annotation.CapacitorPlugin
+import com.getcapacitor.*
 import com.google.gson.Gson
 import org.idpass.smartscanner.lib.SmartScannerActivity
 import org.idpass.smartscanner.lib.scanner.config.ScannerOptions
@@ -16,59 +10,62 @@ import org.json.JSONException
 import org.json.JSONObject
 import timber.log.Timber
 
-@CapacitorPlugin
+@NativePlugin(requestCodes = [SmartScannerPlugin.REQUEST_OP_SCANNER])
 class SmartScannerPlugin : Plugin() {
 
     companion object {
-        const val handleSmartScannerResult = "handleSmartScannerResult"
+        const val REQUEST_OP_SCANNER = 1001
     }
 
     @PluginMethod
     fun executeScanner(call: PluginCall) {
         val action = call.getString("action")
         val options: JSONObject = call.getObject("options")
-        call.setKeepAlive(true)
+        saveCall(call)
         if (action == "START_SCANNER") {
-            Timber.d("SmartScannerPlugin -- executeScanner $action")
+            Timber.d("executeScanner %s", action)
             val intent = Intent(context, SmartScannerActivity::class.java)
             val scannerOptions = Gson().fromJson(options.toString(), ScannerOptions::class.java)
             intent.putExtra(SmartScannerActivity.SCANNER_OPTIONS, scannerOptions)
-            startActivityForResult(call, intent, handleSmartScannerResult)
+            startActivityForResult(call, intent, REQUEST_OP_SCANNER)
         } else {
-            call.reject("\"$action\" is not a recognized action.")
+            call.error("\"$action\" is not a recognized action.")
         }
     }
 
-    @ActivityCallback
-    fun handleSmartScannerResult(call: PluginCall, result: ActivityResult) {
-        if (result.resultCode == Activity.RESULT_CANCELED) {
-            Timber.d("SmartScannerPlugin -- RESULT CANCELLED")
-            call.reject("Scanning Cancelled.")
-        } else {
+    override fun handleOnActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.handleOnActivityResult(requestCode, resultCode, data)
+        val savedCall = savedCall ?: return
+        if (requestCode == REQUEST_OP_SCANNER) {
             try {
-                Timber.d("SmartScannerPlugin -- resultCode ${result.resultCode}")
-                if (result.resultCode == Activity.RESULT_OK) {
-                    val returnedResult = result.data?.getStringExtra(SmartScannerActivity.SCANNER_RESULT)
+                Timber.d("Plugin post SmartScannerActivity resultCode %d", resultCode)
+                if (resultCode == Activity.RESULT_OK) {
+                    val returnedResult = data?.getStringExtra(SmartScannerActivity.SCANNER_RESULT)
+                    Timber.d("Plugin post SmartScannerActivity result %s", returnedResult)
                     try {
-                        Timber.d("SmartScannerPlugin -- result $returnedResult")
                         if (returnedResult != null) {
-                            val ret = JSONObject(returnedResult)
-                            val scannedResult = JSObject()
-                            scannedResult.put(SmartScannerActivity.SCANNER_RESULT, ret)
-                            call.resolve(scannedResult)
+                            val result = JSONObject(returnedResult)
+                            val ret = JSObject()
+                            ret.put(SmartScannerActivity.SCANNER_RESULT, result)
+                            savedCall.success(ret)
                         } else {
-                            call.reject("Scanning result is null.")
+                            savedCall.error("Scanning result is null.")
                         }
                     } catch (e: JSONException) {
                         e.printStackTrace()
                     }
+                } else if (resultCode == Activity.RESULT_CANCELED) {
+                    Timber.d("Plugin post SmartScannerActivity RESULT CANCELLED")
+                    savedCall.error("Scanning Cancelled.")
                 } else {
-                    call.reject("Scanning Failed.")
+                    savedCall.error("Scanning Failed.")
                 }
             } catch (exception: Exception) {
                 Timber.e(exception)
                 exception.printStackTrace()
             }
+        } else {
+            savedCall.error("Unknown Request Code!")
         }
     }
 }

package/dist/esm/definitions.d.ts

@@ -1,3 +1,8 @@
+declare module '@capacitor/core' {
+    interface PluginRegistry {
+        SmartScannerPluginInterface: SmartScannerPluginInterface;
+    }
+}
 export interface SmartScannerPluginInterface {
     echo(options: {
         value: string;

package/dist/esm/definitions.js

@@ -1,3 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=definitions.js.map

package/dist/esm/index.d.ts

@@ -1,4 +1,2 @@
-import type { SmartScannerPluginInterface } from './definitions';
-declare const MySmartScannerPlugin: SmartScannerPluginInterface;
 export * from './definitions';
-export { MySmartScannerPlugin };
+export * from './web';

package/dist/esm/index.js

@@ -1,15 +1,2 @@
-"use strict";
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@capacitor/core");
-const MySmartScannerPlugin = core_1.registerPlugin('MyCoolPlugin', {
-    web: () => Promise.resolve().then(() => __importStar(require('./web'))).then(m => new m.SmartScannerPluginWeb()),
-});
-exports.MySmartScannerPlugin = MySmartScannerPlugin;
+export * from './web';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,0CAAiD;AAGjD,MAAM,oBAAoB,GAAG,qBAAc,CAA8B,cAAc,EAAE;IACvF,GAAG,EAAE,GAAG,EAAE,CAAC,kDAAO,OAAO,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,qBAAqB,EAAE,CAAC;CACpE,CAAC,CAAC;AAGM,oDAAoB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,cAAc,OAAO,CAAC"}

package/dist/esm/web.d.ts

@@ -1,5 +1,6 @@
 import { WebPlugin } from '@capacitor/core';
-import type { SmartScannerPluginInterface } from './definitions';
+import { SmartScannerPluginInterface } from './definitions';
+export * from './web';
 export declare class SmartScannerPluginWeb extends WebPlugin implements SmartScannerPluginInterface {
     constructor();
     echo(options: {
@@ -12,3 +13,4 @@ export declare class SmartScannerPluginWeb extends WebPlugin implements SmartSca
         action: string;
     }): Promise<void>;
 }
+export { SmartScannerPluginInterface };

package/dist/esm/web.js

@@ -1,20 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@capacitor/core");
-class SmartScannerPluginWeb extends core_1.WebPlugin {
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { WebPlugin } from '@capacitor/core';
+export * from './web';
+export class SmartScannerPluginWeb extends WebPlugin {
     constructor() {
         super({
             name: 'SmartScannerPlugin',
             platforms: ['web'],
         });
     }
-    async echo(options) {
-        console.log('ECHO', options);
-        return options;
+    echo(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log('ECHO', options);
+            return options;
+        });
     }
-    async executeScanner(options) {
-        console.log('executeScanner', options);
+    executeScanner(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log('executeScanner', options);
+        });
     }
 }
-exports.SmartScannerPluginWeb = SmartScannerPluginWeb;
+const SmartScannerPlugin = new SmartScannerPluginWeb();
+import { registerWebPlugin } from '@capacitor/core';
+registerWebPlugin(SmartScannerPlugin);
 //# sourceMappingURL=web.js.map

package/dist/esm/web.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":";;AAAA,0CAA4C;AAG5C,MAAa,qBAAsB,SAAQ,gBAAS;IAClD;QACE,KAAK,CAAC;YACJ,IAAI,EAAE,oBAAoB;YAC1B,SAAS,EAAE,CAAC,KAAK,CAAC;SACnB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAA0B;QACnC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAyC;QAC5D,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;CACF;AAhBD,sDAgBC"}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,cAAc,OAAO,CAAC;AAEtB,MAAM,OAAO,qBAAsB,SAAQ,SAAS;IAClD;QACE,KAAK,CAAC;YACJ,IAAI,EAAE,oBAAoB;YAC1B,SAAS,EAAE,CAAC,KAAK,CAAC;SACnB,CAAC,CAAC;IACL,CAAC;IAEK,IAAI,CAAC,OAA0B;;YACnC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC7B,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;IAEK,cAAc,CAAC,OAAyC;;YAC5D,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QACzC,CAAC;KAAA;CACF;AAED,MAAM,kBAAkB,GAAG,IAAI,qBAAqB,EAAE,CAAC;AAIvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,iBAAiB,CAAC,kBAAkB,CAAC,CAAC"}

package/dist/plugin.js

@@ -1,19 +1,40 @@
-(function () {
+var capacitorPlugin = (function (exports, core) {
     'use strict';
 
-    var __importStar = (undefined && undefined.__importStar) || function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-        result["default"] = mod;
-        return result;
+    var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+        return new (P || (P = Promise))(function (resolve, reject) {
+            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+            step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
     };
-    Object.defineProperty(exports, "__esModule", { value: true });
-    const core_1 = require("@capacitor/core");
-    const MySmartScannerPlugin = core_1.registerPlugin('MyCoolPlugin', {
-        web: () => Promise.resolve().then(() => __importStar(require('./web'))).then(m => new m.SmartScannerPluginWeb()),
-    });
-    exports.MySmartScannerPlugin = MySmartScannerPlugin;
+    class SmartScannerPluginWeb extends core.WebPlugin {
+        constructor() {
+            super({
+                name: 'SmartScannerPlugin',
+                platforms: ['web'],
+            });
+        }
+        echo(options) {
+            return __awaiter(this, void 0, void 0, function* () {
+                console.log('ECHO', options);
+                return options;
+            });
+        }
+        executeScanner(options) {
+            return __awaiter(this, void 0, void 0, function* () {
+                console.log('executeScanner', options);
+            });
+        }
+    }
+    const SmartScannerPlugin = new SmartScannerPluginWeb();
+    core.registerWebPlugin(SmartScannerPlugin);
 
-}());
+    exports.SmartScannerPluginWeb = SmartScannerPluginWeb;
+
+    return exports;
+
+}({}, capacitorExports));
 //# sourceMappingURL=plugin.js.map

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["esm/index.js"],"sourcesContent":["\"use strict\";\nvar __importStar = (this && this.__importStar) || function (mod) {\n    if (mod && mod.__esModule) return mod;\n    var result = {};\n    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];\n    result[\"default\"] = mod;\n    return result;\n};\nObject.defineProperty(exports, \"__esModule\", { value: true });\nconst core_1 = require(\"@capacitor/core\");\nconst MySmartScannerPlugin = core_1.registerPlugin('MyCoolPlugin', {\n    web: () => Promise.resolve().then(() => __importStar(require('./web'))).then(m => new m.SmartScannerPluginWeb()),\n});\nexports.MySmartScannerPlugin = MySmartScannerPlugin;\n//# sourceMappingURL=index.js.map"],"names":["this"],"mappings":";;;IACA,IAAI,YAAY,GAAG,CAACA,SAAI,IAAIA,SAAI,CAAC,YAAY,KAAK,UAAU,GAAG,EAAE;IACjE,IAAI,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,GAAG,CAAC;IAC1C,IAAI,IAAI,MAAM,GAAG,EAAE,CAAC;IACpB,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,KAAK,IAAI,CAAC,IAAI,GAAG,EAAE,IAAI,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACnG,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC;IAC5B,IAAI,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC;IACF,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC1C,MAAM,oBAAoB,GAAG,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE;IACnE,IAAI,GAAG,EAAE,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,qBAAqB,EAAE,CAAC;IACpH,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,oBAAoB,GAAG,oBAAoB;;;;;;"}
+{"version":3,"file":"plugin.js","sources":["esm/web.js"],"sourcesContent":["var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n    return new (P || (P = Promise))(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n        step((generator = generator.apply(thisArg, _arguments || [])).next());\n    });\n};\nimport { WebPlugin } from '@capacitor/core';\nexport * from './web';\nexport class SmartScannerPluginWeb extends WebPlugin {\n    constructor() {\n        super({\n            name: 'SmartScannerPlugin',\n            platforms: ['web'],\n        });\n    }\n    echo(options) {\n        return __awaiter(this, void 0, void 0, function* () {\n            console.log('ECHO', options);\n            return options;\n        });\n    }\n    executeScanner(options) {\n        return __awaiter(this, void 0, void 0, function* () {\n            console.log('executeScanner', options);\n        });\n    }\n}\nconst SmartScannerPlugin = new SmartScannerPluginWeb();\nimport { registerWebPlugin } from '@capacitor/core';\nregisterWebPlugin(SmartScannerPlugin);\n//# sourceMappingURL=web.js.map"],"names":["this","WebPlugin","registerWebPlugin"],"mappings":";;;IAAA,IAAI,SAAS,GAAG,CAACA,SAAI,IAAIA,SAAI,CAAC,SAAS,KAAK,UAAU,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,SAAS,EAAE;IACzF,IAAI,SAAS,KAAK,CAAC,KAAK,EAAE,EAAE,OAAO,KAAK,YAAY,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,OAAO,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;IAChH,IAAI,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,EAAE,UAAU,OAAO,EAAE,MAAM,EAAE;IAC/D,QAAQ,SAAS,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;IACnG,QAAQ,SAAS,QAAQ,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;IACtG,QAAQ,SAAS,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,EAAE;IACtH,QAAQ,IAAI,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,KAAK,CAAC,CAAC;IACP,CAAC,CAAC;IAGK,MAAM,qBAAqB,SAASC,cAAS,CAAC;IACrD,IAAI,WAAW,GAAG;IAClB,QAAQ,KAAK,CAAC;IACd,YAAY,IAAI,EAAE,oBAAoB;IACtC,YAAY,SAAS,EAAE,CAAC,KAAK,CAAC;IAC9B,SAAS,CAAC,CAAC;IACX,KAAK;IACL,IAAI,IAAI,CAAC,OAAO,EAAE;IAClB,QAAQ,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,aAAa;IAC5D,YAAY,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,YAAY,OAAO,OAAO,CAAC;IAC3B,SAAS,CAAC,CAAC;IACX,KAAK;IACL,IAAI,cAAc,CAAC,OAAO,EAAE;IAC5B,QAAQ,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,aAAa;IAC5D,YAAY,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACnD,SAAS,CAAC,CAAC;IACX,KAAK;IACL,CAAC;IACD,MAAM,kBAAkB,GAAG,IAAI,qBAAqB,EAAE,CAAC;AAEvDC,0BAAiB,CAAC,kBAAkB,CAAC;;;;;;;;;;"}

package/ios/.npmignore

@@ -0,0 +1,4 @@
+Pods/
+Podfile.lock
+contents.xcworkspacedata
+xcuserdata/

package/ios/Plugin/Plugin.m

@@ -3,6 +3,6 @@
 
 // Define the plugin using the CAP_PLUGIN Macro, and
 // each method the plugin supports using the CAP_PLUGIN_METHOD macro.
-CAP_PLUGIN(MLKitPlugin, "MLKitPlugin",
+CAP_PLUGIN(SmartScannerPlugin, "SmartScannerPlugin",
            CAP_PLUGIN_METHOD(echo, CAPPluginReturnPromise);
 )

package/ios/Plugin/Plugin.swift

@@ -5,8 +5,8 @@ import Capacitor
  * Please read the Capacitor iOS Plugin Development Guide
  * here: https://capacitorjs.com/docs/plugins/ios
  */
-@objc(MLKitPlugin)
-public class MLKitPlugin: CAPPlugin {
+@objc(SmartScannerPlugin)
+public class SmartScannerPlugin: CAPPlugin {
 
     @objc func echo(_ call: CAPPluginCall) {
         let value = call.getString("value") ?? ""

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@idpass/smartscanner-capacitor",
-  "version": "0.4.0-beta.1",
-  "description": "Capacitor plugin for the SmartScanner Core library to scan MRZ, NFC and barcodes",
+  "version": "0.4.0",
+  "description": "Capacitor plugin for the SmartScanner Core library to scan MRZ and barcodes",
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
@@ -17,9 +17,9 @@
   "author": "NewLogic",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@capacitor/android": "^3.2.2",
-    "@capacitor/core": "^3.2.2",
-    "@capacitor/ios": "^3.2.2",
+    "@capacitor/android": "^2.4.2",
+    "@capacitor/core": "^2.4.1",
+    "@capacitor/ios": "^2.4.1",
     "@ionic/prettier-config": "^1.0.0",
     "@ionic/swiftlint-config": "^1.0.0",
     "@rollup/plugin-node-resolve": "^8.1.0",
@@ -31,13 +31,14 @@
     "typescript": "~3.8.3"
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.2.2"
+    "@capacitor/core": "^2.4.1"
   },
   "files": [
     "dist/",
-    "ios/",
     "android/",
-    "SmartScannerCapacitorPlugin.podspec"
+    "ios/",
+    "ios/Plugin",
+    "IdpassSmartscannerCapacitor.podspec"
   ],
   "keywords": [
     "capacitor",
@@ -54,7 +55,10 @@
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",
-  "repository": "idpass/smartscanner-capacitor",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/idpass/smartscanner-capacitor.git"
+  },
   "bugs": {
     "url": "https://github.com/idpass/smartscanner-capacitor/issues"
   },

package/android/.idea/codeStyles/Project.xml

@@ -1,123 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/android/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>