From 16642aa7ee470e254932edb84ed7d9be0716e4c7 Mon Sep 17 00:00:00 2001
From: Osei Fortune <fortune.osei@yahoo.com>
Date: Tue, 23 Nov 2021 18:19:57 -0400
Subject: [PATCH] fix: detection event

fixes #5
---
 apps/demo/src/plugin-demos/mlkit-core.ts      |  6 +-
 apps/demo/src/plugin-demos/mlkit-core.xml     |  2 +-
 .../{index.d.ts => index.ts}                  | 21 ++++-
 packages/mlkit-barcode-scanning/package.json  |  2 +-
 packages/mlkit-core/README.md                 | 44 ++++-----
 packages/mlkit-core/common.ts                 |  9 +-
 packages/mlkit-core/index.android.ts          | 90 ++++++++++++++++---
 packages/mlkit-core/index.d.ts                | 10 ++-
 packages/mlkit-core/index.ios.ts              | 53 ++++++-----
 packages/mlkit-core/package.json              |  2 +-
 .../{index.d.ts => index.ts}                  |  0
 .../{index.d.ts => index.ts}                  |  0
 packages/mlkit-face-detection/package.json    |  2 +-
 .../{index.d.ts => index.ts}                  |  0
 packages/mlkit-image-labeling/package.json    |  2 +-
 .../{index.d.ts => index.ts}                  |  0
 packages/mlkit-object-detection/package.json  |  2 +-
 .../{index.d.ts => index.ts}                  |  0
 packages/mlkit-pose-detection/package.json    |  2 +-
 .../{index.d.ts => index.ts}                  |  0
 packages/mlkit-text-recognition/package.json  |  2 +-
 workspace.json                                | 21 ++---
 22 files changed, 180 insertions(+), 90 deletions(-)
 rename packages/mlkit-barcode-scanning/{index.d.ts => index.ts} (86%)
 rename packages/mlkit-digital-ink-recognition/{index.d.ts => index.ts} (100%)
 rename packages/mlkit-face-detection/{index.d.ts => index.ts} (100%)
 rename packages/mlkit-image-labeling/{index.d.ts => index.ts} (100%)
 rename packages/mlkit-object-detection/{index.d.ts => index.ts} (100%)
 rename packages/mlkit-pose-detection/{index.d.ts => index.ts} (100%)
 rename packages/mlkit-text-recognition/{index.d.ts => index.ts} (100%)

diff --git a/apps/demo/src/plugin-demos/mlkit-core.ts b/apps/demo/src/plugin-demos/mlkit-core.ts
index 7d9f272..9e20c43 100644
--- a/apps/demo/src/plugin-demos/mlkit-core.ts
+++ b/apps/demo/src/plugin-demos/mlkit-core.ts
@@ -1,6 +1,6 @@
 import { Observable, EventData, Page, Dialogs } from '@nativescript/core';
 import { DemoSharedMlkitCore } from '@demo/shared';
-import { DetectionType, MLKitView } from '@nativescript/mlkit-core';
+import { DetectionType, MLKitView, DetectionEvent } from '@nativescript/mlkit-core';
 import { BarcodeResult } from '@nativescript/mlkit-barcode-scanning';
 import { FaceResult } from '@nativescript/mlkit-face-detection';
 import { ImageLabelingResult } from '@nativescript/mlkit-image-labeling';
@@ -20,8 +20,8 @@ export class DemoModel extends DemoSharedMlkitCore {
 		this.camera = args.object;
 	}
 
-	onDetection(data, type: DetectionType) {
-		console.log('onDetection', data, type);
+	onDetection(event: DetectionEvent) {
+		console.log('onDetection', event.data, event.type);
 	}
 
 	toggleCamera() {
diff --git a/apps/demo/src/plugin-demos/mlkit-core.xml b/apps/demo/src/plugin-demos/mlkit-core.xml
index 7dd59a9..bd63e52 100644
--- a/apps/demo/src/plugin-demos/mlkit-core.xml
+++ b/apps/demo/src/plugin-demos/mlkit-core.xml
@@ -4,7 +4,7 @@
         </ActionBar>
     </Page.actionBar>
     <GridLayout rows="*,auto,auto,auto,auto" height="100%">
-       <ui:MLKitView height="100%" rowSpan="3"  loaded="{{ onLoaded }}" cameraPosition="back" detectionType="{{ detectorType }}" onDetection="{{ onDetection }}"/>
+       <ui:MLKitView height="100%" rowSpan="3"  loaded="{{ onLoaded }}" cameraPosition="back" detectionType="{{ detectorType }}" detection="{{ onDetection }}"/>
        <Button row="1" height="40" text="Toggle Camera" tap="{{ toggleCamera }}" />
        <Button row="2" height="40" text="Request Camera Permission" tap="{{ requestPermission }}" />
        <Label row="3" text="{{'Detecting ' + detectorType }}"/>
diff --git a/packages/mlkit-barcode-scanning/index.d.ts b/packages/mlkit-barcode-scanning/index.ts
similarity index 86%
rename from packages/mlkit-barcode-scanning/index.d.ts
rename to packages/mlkit-barcode-scanning/index.ts
index 0ba9589..1e28ae8 100644
--- a/packages/mlkit-barcode-scanning/index.d.ts
+++ b/packages/mlkit-barcode-scanning/index.ts
@@ -134,6 +134,25 @@ export enum ValueType {
     Unknown = "unknown"
 }
 
+export enum BarcodeFormats {
+    ALL = 'all',
+    CODE_128 = 'code_128',
+    CODE_39 = 'code_39',
+    CODE_93 = 'code_93',
+    CODABAR = 'codabar',
+    DATA_MATRIX = 'data_matrix',
+    EAN_13 = 'ean_13',
+    EAN_8 = 'ean_8',
+    ITF = 'itf',
+    QR_CODE = 'qr_code',
+    UPC_A = 'upc_a',
+    UPC_E = 'upc_e',
+    PDF417 = 'pdf417',
+    AZTEC = 'aztec',
+    UNKOWN = 'unknown'
+}
+
+
 
 export interface BarcodeResult {
     calendarEvent?: CalenderEvent
@@ -143,7 +162,7 @@ export interface BarcodeResult {
     displayValue?: string
     driverLicense?: DriverLicense
     email?: Email
-    format: BarcodeScanner.BarcodeFormat
+    format: BarcodeFormats
     geoPoint?: GeoPoint
     phone?: Phone
     rawBytes?: any[]
diff --git a/packages/mlkit-barcode-scanning/package.json b/packages/mlkit-barcode-scanning/package.json
index 0a6b8da..32f2fcf 100644
--- a/packages/mlkit-barcode-scanning/package.json
+++ b/packages/mlkit-barcode-scanning/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript/mlkit-barcode-scanning",
-    "version": "1.0.0-alpha.0",
+    "version": "1.0.0-alpha.1",
     "description": "NativeScript MLKit Barcode Scanner module",
     "main": "index",
     "typings": "index.d.ts",
diff --git a/packages/mlkit-core/README.md b/packages/mlkit-core/README.md
index 77a71e4..cd6b75c 100644
--- a/packages/mlkit-core/README.md
+++ b/packages/mlkit-core/README.md
@@ -15,7 +15,7 @@ ns plugin add @nativescript/mlkit-core
 <ui:MLKitView
   cameraPosition="back"
    detectionType="all" 
-   onDetection="onDetection"
+   detection="onDetection"
 />
 ```
 
@@ -37,11 +37,11 @@ import { MLKitModule } from '@nativescript/mlkit-core/angular';
 ```
 
 
-```xml
+```html
 <MLKitView
 cameraPosition="back"
 detectionType="all" 
-onDetection="onDetection"
+(detection)="onDetection"
 ></MLKitView>
 ```
 
@@ -58,7 +58,7 @@ Vue.use(MLKit)
 <MLKitView
 cameraPosition="back"
 detectionType="all" 
-onDetection="onDetection"
+@detection="onDetection"
 ></MLKitView>
 ```
 
@@ -73,10 +73,10 @@ ns plugin add @nativescript/mlkit-barcode-scanning
 ```
 
 ```ts
-import { DetectionType } from '@nativescript/mlkit-core';
+import { DetectionType, DetectionEvent } from '@nativescript/mlkit-core';
 import { BarcodeResult } from '@nativescript/mlkit-barcode-scanning';
-onDetection(data, type){
-    if(type === DetectionType.Barcode){
+onDetection(event: DetectionEvent){
+    if(event.type === DetectionType.Barcode){
         const barcode: BarcodeResult = data;
     }
 }
@@ -89,10 +89,10 @@ ns plugin add @nativescript/mlkit-face-detection
 ```
 
 ```ts
-import { DetectionType } from '@nativescript/mlkit-core';
+import { DetectionType, DetectionEvent } from '@nativescript/mlkit-core';
 import { FaceResult } from '@nativescript/mlkit-face-detection';
-onDetection(data, type){
-    if(type === DetectionType.Face){
+onDetection(event: DetectionEvent){
+    if(event.type === DetectionType.Face){
         const faces: FaceResult[] = data;
     }
 }
@@ -106,10 +106,10 @@ ns plugin add @nativescript/mlkit-image-labeling
 ```
 
 ```ts
-import { DetectionType } from '@nativescript/mlkit-core';
+import { DetectionType, DetectionEvent } from '@nativescript/mlkit-core';
 import { ImageLabelingResult } from '@nativescript/mlkit-image-labeling';
-onDetection(data, type){
-    if(type === DetectionType.Image){
+onDetection(event: DetectionEvent){
+    if(event.type === DetectionType.Image){
         const labels: ImageLabelingResult[] = data;
     }
 }
@@ -123,10 +123,10 @@ ns plugin add @nativescript/mlkit-object-detection
 ```
 
 ```ts
-import { DetectionType } from '@nativescript/mlkit-core';
+import { DetectionType, DetectionEvent } from '@nativescript/mlkit-core';
 import { ObjectResult } from '@nativescript/mlkit-object-detection'
-onDetection(data, type){
-    if(type === DetectionType.Object){
+onDetection(event: DetectionEvent){
+    if(event.type === DetectionType.Object){
         const objects: ObjectResult[] = data;
     }
 }
@@ -139,10 +139,10 @@ ns plugin add @nativescript/mlkit-pose-detection
 ```
 
 ```ts
-import { DetectionType } from '@nativescript/mlkit-core';
+import { DetectionType, DetectionEvent } from '@nativescript/mlkit-core';
 import { PoseResult } from '@nativescript/mlkit-pose-detection';
-onDetection(data, type){
-    if(type === DetectionType.Pose){
+onDetection(event: DetectionEvent){
+    if(event.type === DetectionType.Pose){
         const poses: PoseResult[] = data;
     }
 }
@@ -156,10 +156,10 @@ ns plugin add @nativescript/mlkit-text-recognition
 ```
 
 ```ts
-import { DetectionType } from '@nativescript/mlkit-core';
+import { DetectionType, DetectionEvent } from '@nativescript/mlkit-core';
 import { TextResult } from '@nativescript/mlkit-text-recognition';
-onDetection(data, type){
-    if(type === DetectionType.Text){
+onDetection(event: DetectionEvent){
+    if(event.type === DetectionType.Text){
         const text: TextResult[] = data;
     }
 }
diff --git a/packages/mlkit-core/common.ts b/packages/mlkit-core/common.ts
index 017d401..37b7f88 100644
--- a/packages/mlkit-core/common.ts
+++ b/packages/mlkit-core/common.ts
@@ -44,6 +44,7 @@ export enum FaceDetectionPerformanceMode {
 
 @CSSType('MLKitView')
 export class MLKitViewBase extends ContainerView {
+    public static detectionEvent = 'detection';
     cameraPosition: CameraPosition;
     detectionType: DetectionType;
     barcodeFormats: BarcodeFormats[];
@@ -53,16 +54,8 @@ export class MLKitViewBase extends ContainerView {
     imageLabelerConfidenceThreshold: number;
     objectDetectionMultiple: boolean;
     objectDetectionClassify: boolean;
-    onDetection: (data: {
-        [key: string]: any;
-    }, type: DetectionType) => void;
 }
 
-export const onDetectionProperty = new Property<MLKitViewBase, (data: { [key: string]: any }) => void>({
-    name: 'onDetection'
-});
-onDetectionProperty.register(MLKitViewBase);
-
 export const cameraPositionProperty = new Property<MLKitViewBase, CameraPosition>({
     name: 'cameraPosition',
     defaultValue: CameraPosition.BACK
diff --git a/packages/mlkit-core/index.android.ts b/packages/mlkit-core/index.android.ts
index a445286..d48e4a2 100644
--- a/packages/mlkit-core/index.android.ts
+++ b/packages/mlkit-core/index.android.ts
@@ -1,4 +1,4 @@
-import { BarcodeFormats, barcodeFormatsProperty, CameraPosition, cameraPositionProperty, DetectionType, detectionTypeProperty, faceDetectionMinFaceSizeProperty, faceDetectionPerformanceModeProperty, faceDetectionTrackingEnabledProperty, imageLabelerConfidenceThresholdProperty, MLKitViewBase, objectDetectionClassifyProperty, objectDetectionMultipleProperty, onDetectionProperty } from "./common";
+import { BarcodeFormats, barcodeFormatsProperty, CameraPosition, cameraPositionProperty, DetectionType, detectionTypeProperty, faceDetectionMinFaceSizeProperty, faceDetectionPerformanceModeProperty, faceDetectionTrackingEnabledProperty, imageLabelerConfidenceThresholdProperty, MLKitViewBase, objectDetectionClassifyProperty, objectDetectionMultipleProperty } from "./common";
 import { Application, Device, Utils, AndroidActivityRequestPermissionsEventData } from '@nativescript/core';
 import lazy from '@nativescript/core/utils/lazy';
 
@@ -117,17 +117,31 @@ export class MLKitView extends MLKitViewBase {
                 type = DetectorType_None();
                 break;
         }
-
         this.#camera.setDetectorType(type);
+        this.#setListeners();
+    }
+
+    initNativeView() {
+        super.initNativeView();
+        this.#setListeners();
     }
 
-    [onDetectionProperty.setNative](value) {
+    #setListeners() {
         const ref = new WeakRef(this);
         if (!this.#onTextListener && (this.detectionType === DetectionType.Text || this.detectionType === DetectionType.All)) {
             this.#onTextListener = new io.github.triniwiz.fancycamera.ImageAnalysisCallback({
                 onSuccess(param0: string) {
+                    const hasListener = ref?.get?.().hasListeners?.(MLKitView.detectionEvent);
+                    if (!hasListener) {
+                        return;
+                    }
                     try {
-                        ref?.get?.().onDetection?.(JSON.parse(param0), DetectionType.Text);
+                        ref?.get?.().notify?.({
+                            eventName: MLKitView.detectionEvent,
+                            object: ref?.get?.(),
+                            data: JSON.parse(param0),
+                            type: DetectionType.Text
+                        });
                     } catch (e) { }
                 },
                 onError(param0: string, param1: java.lang.Exception) {
@@ -140,8 +154,17 @@ export class MLKitView extends MLKitViewBase {
         if (!this.#onBarcodeListener && (this.detectionType.includes(DetectionType.Barcode) || this.detectionType.includes(DetectionType.All))) {
             this.#onBarcodeListener = new io.github.triniwiz.fancycamera.ImageAnalysisCallback({
                 onSuccess(param0: string) {
+                    const hasListener = ref?.get?.().hasListeners?.(MLKitView.detectionEvent);
+                    if (!hasListener) {
+                        return;
+                    }
                     try {
-                        ref?.get?.().onDetection?.(JSON.parse(param0), DetectionType.Barcode);
+                        ref?.get?.().notify?.({
+                            eventName: MLKitView.detectionEvent,
+                            object: ref?.get?.(),
+                            data: JSON.parse(param0),
+                            type: DetectionType.Barcode
+                        });
                     } catch (e) { }
                 },
                 onError(param0: string, param1: java.lang.Exception) {
@@ -155,8 +178,17 @@ export class MLKitView extends MLKitViewBase {
         if (!this.#onDigitalInkListener && (this.detectionType === DetectionType.DigitalInk || this.detectionType === DetectionType.All)) {
             /* this.#onDigitalInkListener = new io.github.triniwiz.fancycamera.ImageAnalysisCallback({
                  onSuccess(param0: string) {
+                       const hasListener = ref?.get?.().hasListeners?.(MLKitView.detectionEvent);
+                    if(!hasListener){
+                        return;
+                    }
                      try {
-                         ref?.get?.().onDetection?.(JSON.parse(param0));
+                         ref?.get?.().notify?.({
+                            eventName: MLKitView.detectionEvent,
+                            object: ref?.get?.(),
+                            data: JSON.parse(param0),
+                            type: DetectionType.DigitalInk
+                        });
                      } catch (e) { }
                   },
                  onError(param0: string, param1: java.lang.Exception) {
@@ -169,8 +201,17 @@ export class MLKitView extends MLKitViewBase {
             this.#faceDetectionOptions = new io.github.triniwiz.fancycamera.facedetection.FaceDetection.Options();
             this.#onFaceListener = new io.github.triniwiz.fancycamera.ImageAnalysisCallback({
                 onSuccess(param0: string) {
+                    const hasListener = ref?.get?.().hasListeners?.(MLKitView.detectionEvent);
+                    if (!hasListener) {
+                        return;
+                    }
                     try {
-                        ref?.get?.().onDetection?.(JSON.parse(param0), DetectionType.Face);
+                        ref?.get?.().notify?.({
+                            eventName: MLKitView.detectionEvent,
+                            object: ref?.get?.(),
+                            data: JSON.parse(param0),
+                            type: DetectionType.Face
+                        });
                     } catch (e) { }
                 },
                 onError(param0: string, param1: java.lang.Exception) {
@@ -183,8 +224,17 @@ export class MLKitView extends MLKitViewBase {
         if (!this.#onImageListener && (this.detectionType === DetectionType.Image || this.detectionType === DetectionType.All)) {
             this.#onImageListener = new io.github.triniwiz.fancycamera.ImageAnalysisCallback({
                 onSuccess(param0: string) {
+                    const hasListener = ref?.get?.().hasListeners?.(MLKitView.detectionEvent);
+                    if (!hasListener) {
+                        return;
+                    }
                     try {
-                        ref?.get?.().onDetection?.(JSON.parse(param0), DetectionType.Image);
+                        ref?.get?.().notify?.({
+                            eventName: MLKitView.detectionEvent,
+                            object: ref?.get?.(),
+                            data: JSON.parse(param0),
+                            type: DetectionType.Image
+                        });
                     } catch (e) { }
                 },
                 onError(param0: string, param1: java.lang.Exception) {
@@ -197,8 +247,17 @@ export class MLKitView extends MLKitViewBase {
         if (!this.#onObjectListener && (this.detectionType === DetectionType.Object || this.detectionType === DetectionType.All)) {
             this.#onObjectListener = new io.github.triniwiz.fancycamera.ImageAnalysisCallback({
                 onSuccess(param0: string) {
+                    const hasListener = ref?.get?.().hasListeners?.(MLKitView.detectionEvent);
+                    if (!hasListener) {
+                        return;
+                    }
                     try {
-                        ref?.get?.().onDetection?.(JSON.parse(param0), DetectionType.Object);
+                        ref?.get?.().notify?.({
+                            eventName: MLKitView.detectionEvent,
+                            object: ref?.get?.(),
+                            data: JSON.parse(param0),
+                            type: DetectionType.Object
+                        });
                     } catch (e) { }
                 },
                 onError(param0: string, param1: java.lang.Exception) {
@@ -211,8 +270,17 @@ export class MLKitView extends MLKitViewBase {
         if (!this.#onPoseListener && (this.detectionType === DetectionType.Pose || this.detectionType === DetectionType.All)) {
             this.#onPoseListener = new io.github.triniwiz.fancycamera.ImageAnalysisCallback({
                 onSuccess(param0: string) {
+                    const hasListener = ref?.get?.().hasListeners?.(MLKitView.detectionEvent);
+                    if (!hasListener) {
+                        return;
+                    }
                     try {
-                        ref?.get?.().onDetection?.(JSON.parse(param0), DetectionType.Pose);
+                        ref?.get?.().notify?.({
+                            eventName: MLKitView.detectionEvent,
+                            object: ref?.get?.(),
+                            data: JSON.parse(param0),
+                            type: DetectionType.Pose
+                        });
                     } catch (e) { }
                 },
                 onError(param0: string, param1: java.lang.Exception) {
@@ -233,7 +301,7 @@ export class MLKitView extends MLKitViewBase {
         let formats;
         if (Array.isArray(value)) {
             if (value.indexOf(BarcodeFormats.ALL)) {
-                formats = Array.create('io.github.triniwiz.fancycamera.barcodescanning.BarcodeScanner.BarcodeFormat', 1);
+                formats = Array.create('io.github.triniwiz.fancycamera.barcodescanning.BarcodeScanner$BarcodeFormat', 1);
                 formats[0] = io.github.triniwiz.fancycamera.barcodescanning.BarcodeScanner.BarcodeFormat.ALL;
             } else {
                 formats = value.map(format => {
diff --git a/packages/mlkit-core/index.d.ts b/packages/mlkit-core/index.d.ts
index 67997c8..9d44c5b 100644
--- a/packages/mlkit-core/index.d.ts
+++ b/packages/mlkit-core/index.d.ts
@@ -1,13 +1,17 @@
 import { MLKitViewBase, DetectionType } from "./common";
+import { EventData } from '@nativescript/core';
+export interface DetectionEvent extends EventData {
+    data: { [key: string]: any };
+    type: DetectionType
+}
 export { BarcodeFormats, barcodeFormatsProperty, CameraPosition, cameraPositionProperty, DetectionType, faceDetectionMinFaceSizeProperty, faceDetectionPerformanceModeProperty, faceDetectionTrackingEnabledProperty, imageLabelerConfidenceThresholdProperty as imageLablerConfidenceThresholdProperty, objectDetectionClassifyProperty, objectDetectionMultipleProperty } from './common';
 export declare class MLKitView extends MLKitViewBase {
     static isAvailable(): boolean;
-    onDetection: (data: {
-        [key: string]: any;
-    }, type: DetectionType) => void;
+    static detectionEvent: string;
     stopPreview(): void;
     toggleCamera(): void;
     startPreview(): void;
     requestCameraPermission(): Promise<void>;
     hasCameraPermission(): boolean;
+    on(event: 'detection', callback: (args: DetectionEvent) => void, thisArg?: any);
 }
diff --git a/packages/mlkit-core/index.ios.ts b/packages/mlkit-core/index.ios.ts
index 5194b33..00ad23d 100644
--- a/packages/mlkit-core/index.ios.ts
+++ b/packages/mlkit-core/index.ios.ts
@@ -1,7 +1,8 @@
 import { Utils } from "@nativescript/core";
-import { BarcodeFormats, barcodeFormatsProperty, CameraPosition, cameraPositionProperty, DetectionType, detectionTypeProperty, faceDetectionMinFaceSizeProperty, faceDetectionPerformanceModeProperty, faceDetectionTrackingEnabledProperty, imageLabelerConfidenceThresholdProperty, MLKitViewBase, objectDetectionClassifyProperty, objectDetectionMultipleProperty, onDetectionProperty } from "./common";
+import { BarcodeFormats, barcodeFormatsProperty, CameraPosition, cameraPositionProperty, DetectionType, detectionTypeProperty, faceDetectionMinFaceSizeProperty, faceDetectionPerformanceModeProperty, faceDetectionTrackingEnabledProperty, imageLabelerConfidenceThresholdProperty, MLKitViewBase, objectDetectionClassifyProperty, objectDetectionMultipleProperty } from "./common";
 import '@nativescript/core';
 import lazy from "@nativescript/core/utils/lazy";
+import { DetectionEvent } from ".";
 
 
 const BARCODE_SCANNER_SUPPORTED = lazy(() => typeof MLKBarcodeScanner);
@@ -10,7 +11,7 @@ const FACE_DETECTION_SUPPORTED = lazy(() => typeof MLKFaceDetector);
 const IMAGE_LABELING_SUPPORTED = lazy(() => typeof MLKImageLabeler);
 const OBJECT_DETECTION_SUPPORTED = lazy(() => typeof MLKObjectDetector);
 const POSE_DETECTION_SUPPORTED = lazy(() => typeof MLKPoseDetector);
-
+const DIGITALINK_RECOGNITION_SUPPORTED = lazy(() => typeof MLKDigitalInkRecognizer);
 
 export { BarcodeFormats, barcodeFormatsProperty, CameraPosition, cameraPositionProperty, DetectionType, faceDetectionMinFaceSizeProperty, faceDetectionPerformanceModeProperty, faceDetectionTrackingEnabledProperty, imageLabelerConfidenceThresholdProperty as imageLablerConfidenceThresholdProperty, objectDetectionClassifyProperty, objectDetectionMultipleProperty } from './common';
 
@@ -132,54 +133,66 @@ export class MLKitView extends MLKitViewBase {
                 break;
         }
 
+        this.#setupDetectors();
         this.#mlkitHelper.detectorType = type;
     }
 
 
-    _onScanCallback(result: string, type) {
-        if (this.detectionType === DetectionType.None || !this.onDetection) {
-            return;
-        }
-        try {
-            const data = JSON.parse(result);
-            this?.onDetection(data, type);
-        } catch (e) { }
-    }
-
-
-    [onDetectionProperty.setNative](value) {
+    #setupDetectors() {
         if (TEXT_RECOGNITION_SUPPORTED() && !this.#textRecognizer && (this.detectionType === DetectionType.Text || this.detectionType === DetectionType.All)) {
             this.#textRecognizer = MLKTextRecognizer.textRecognizer();
             this.#mlkitHelper.textRecognizer = this.#textRecognizer;
         }
 
-        if (typeof MLKBarcodeScanner && !this.#barcodeScanner && (this.detectionType === DetectionType.Barcode || this.detectionType === DetectionType.All)) {
+        if (BARCODE_SCANNER_SUPPORTED() && !this.#barcodeScanner && (this.detectionType === DetectionType.Barcode || this.detectionType === DetectionType.All)) {
             this.#setupBarcodeScanner(this.barcodeFormats);
         }
 
         // TODO
-        if (typeof MLKDigitalInkRecognizer && !this.#digitalInkRecognizer && (this.detectionType === DetectionType.DigitalInk || this.detectionType === DetectionType.All)) {
+        if (DIGITALINK_RECOGNITION_SUPPORTED() && !this.#digitalInkRecognizer && (this.detectionType === DetectionType.DigitalInk || this.detectionType === DetectionType.All)) {
             // MLKDigitalInkRecognizer.digitalInkRecognizerWithOptions()
         }
 
 
-        if (typeof MLKFaceDetector && !this.#faceDetector && (this.detectionType === DetectionType.Face || this.detectionType === DetectionType.All)) {
+        if (FACE_DETECTION_SUPPORTED() && !this.#faceDetector && (this.detectionType === DetectionType.Face || this.detectionType === DetectionType.All)) {
             this.#setupFaceDetector();
         }
 
-        if (typeof MLKImageLabeler && !this.#imageLabeler && (this.detectionType === DetectionType.Image || this.detectionType === DetectionType.All)) {
+        if (IMAGE_LABELING_SUPPORTED() && !this.#imageLabeler && (this.detectionType === DetectionType.Image || this.detectionType === DetectionType.All)) {
             this.#setImageLabeler()
         }
 
-        if (typeof MLKObjectDetector && !this.#objectDetector && (this.detectionType === DetectionType.Object || this.detectionType === DetectionType.All)) {
+        if (OBJECT_DETECTION_SUPPORTED() && !this.#objectDetector && (this.detectionType === DetectionType.Object || this.detectionType === DetectionType.All)) {
             this.#setupObjectDetection();
         }
 
-        if (typeof MLKPoseDetector && !this.#poseDetector && (this.detectionType === DetectionType.Pose || this.detectionType === DetectionType.All)) {
+        if (POSE_DETECTION_SUPPORTED() && !this.#poseDetector && (this.detectionType === DetectionType.Pose || this.detectionType === DetectionType.All)) {
             this.#setPoseDetection();
         }
     }
 
+
+    initNativeView() {
+        super.initNativeView();
+        this.#setupDetectors();
+    }
+
+    _onScanCallback(result: string, type) {
+        if (this.detectionType === DetectionType.None || !this.hasListeners(MLKitView.detectionEvent)) {
+            return;
+        }
+        try {
+            const data = JSON.parse(result);
+            this.notify(<DetectionEvent>{
+                eventName: MLKitView.detectionEvent,
+                object: this,
+                data,
+                type
+            })
+        } catch (e) { }
+    }
+
+
     [barcodeFormatsProperty.setNative](value: BarcodeFormats[]) {
         this.#setupBarcodeScanner(value);
     }
diff --git a/packages/mlkit-core/package.json b/packages/mlkit-core/package.json
index 3d03c51..5ddf6ed 100644
--- a/packages/mlkit-core/package.json
+++ b/packages/mlkit-core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript/mlkit-core",
-    "version": "1.0.0-alpha.0",
+    "version": "1.0.0-alpha.1",
     "description": "NativeScript MLKit Core",
     "main": "index",
     "typings": "index.d.ts",
diff --git a/packages/mlkit-digital-ink-recognition/index.d.ts b/packages/mlkit-digital-ink-recognition/index.ts
similarity index 100%
rename from packages/mlkit-digital-ink-recognition/index.d.ts
rename to packages/mlkit-digital-ink-recognition/index.ts
diff --git a/packages/mlkit-face-detection/index.d.ts b/packages/mlkit-face-detection/index.ts
similarity index 100%
rename from packages/mlkit-face-detection/index.d.ts
rename to packages/mlkit-face-detection/index.ts
diff --git a/packages/mlkit-face-detection/package.json b/packages/mlkit-face-detection/package.json
index 028e7e1..25229d7 100644
--- a/packages/mlkit-face-detection/package.json
+++ b/packages/mlkit-face-detection/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript/mlkit-face-detection",
-    "version": "1.0.0-alpha.0",
+    "version": "1.0.0-alpha.1",
     "description": "NativeScript MLKit Face Detection module",
     "main": "index",
     "typings": "index.d.ts",
diff --git a/packages/mlkit-image-labeling/index.d.ts b/packages/mlkit-image-labeling/index.ts
similarity index 100%
rename from packages/mlkit-image-labeling/index.d.ts
rename to packages/mlkit-image-labeling/index.ts
diff --git a/packages/mlkit-image-labeling/package.json b/packages/mlkit-image-labeling/package.json
index ce35e0d..12d8599 100644
--- a/packages/mlkit-image-labeling/package.json
+++ b/packages/mlkit-image-labeling/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript/mlkit-image-labeling",
-    "version": "1.0.0-alpha.0",
+    "version": "1.0.0-alpha.1",
     "description": "NativeScript MLKit Image Labeling module",
     "main": "index",
     "typings": "index.d.ts",
diff --git a/packages/mlkit-object-detection/index.d.ts b/packages/mlkit-object-detection/index.ts
similarity index 100%
rename from packages/mlkit-object-detection/index.d.ts
rename to packages/mlkit-object-detection/index.ts
diff --git a/packages/mlkit-object-detection/package.json b/packages/mlkit-object-detection/package.json
index b869ddc..f2bef46 100644
--- a/packages/mlkit-object-detection/package.json
+++ b/packages/mlkit-object-detection/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript/mlkit-object-detection",
-    "version": "1.0.0-alpha.0",
+    "version": "1.0.0-alpha.1",
     "description": "NativeScript MLKit Object Detection module",
     "main": "index",
     "typings": "index.d.ts",
diff --git a/packages/mlkit-pose-detection/index.d.ts b/packages/mlkit-pose-detection/index.ts
similarity index 100%
rename from packages/mlkit-pose-detection/index.d.ts
rename to packages/mlkit-pose-detection/index.ts
diff --git a/packages/mlkit-pose-detection/package.json b/packages/mlkit-pose-detection/package.json
index e45c4c1..1e08ec1 100644
--- a/packages/mlkit-pose-detection/package.json
+++ b/packages/mlkit-pose-detection/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript/mlkit-pose-detection",
-    "version": "1.0.0-alpha.0",
+    "version": "1.0.0-alpha.1",
     "description": "NativeScript MLKit Pose Detection module",
     "main": "index",
     "typings": "index.d.ts",
diff --git a/packages/mlkit-text-recognition/index.d.ts b/packages/mlkit-text-recognition/index.ts
similarity index 100%
rename from packages/mlkit-text-recognition/index.d.ts
rename to packages/mlkit-text-recognition/index.ts
diff --git a/packages/mlkit-text-recognition/package.json b/packages/mlkit-text-recognition/package.json
index 43fd9c1..048f0b2 100644
--- a/packages/mlkit-text-recognition/package.json
+++ b/packages/mlkit-text-recognition/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript/mlkit-text-recognition",
-    "version": "1.0.0-alpha.0",
+    "version": "1.0.0-alpha.1",
     "description": "NativeScript MLKit Text Recognition module",
     "main": "index",
     "typings": "index.d.ts",
diff --git a/workspace.json b/workspace.json
index 973a783..9590ea6 100644
--- a/workspace.json
+++ b/workspace.json
@@ -124,10 +124,9 @@
             "outputPath": "dist/packages/mlkit-text-recognition",
             "tsConfig": "packages/mlkit-text-recognition/tsconfig.json",
             "packageJson": "packages/mlkit-text-recognition/package.json",
-            "main": "packages/mlkit-text-recognition/index.d.ts",
+            "main": "packages/mlkit-text-recognition/index.ts",
             "assets": [
               "packages/mlkit-text-recognition/*.md",
-              "packages/mlkit-text-recognition/index.d.ts",
               "LICENSE",
               {
                 "glob": "**/*",
@@ -214,10 +213,9 @@
             "outputPath": "dist/packages/mlkit-barcode-scanning",
             "tsConfig": "packages/mlkit-barcode-scanning/tsconfig.json",
             "packageJson": "packages/mlkit-barcode-scanning/package.json",
-            "main": "packages/mlkit-barcode-scanning/index.d.ts",
+            "main": "packages/mlkit-barcode-scanning/index.ts",
             "assets": [
               "packages/mlkit-barcode-scanning/*.md",
-              "packages/mlkit-barcode-scanning/index.d.ts",
               "LICENSE",
               {
                 "glob": "**/*",
@@ -259,10 +257,9 @@
             "outputPath": "dist/packages/mlkit-face-detection",
             "tsConfig": "packages/mlkit-face-detection/tsconfig.json",
             "packageJson": "packages/mlkit-face-detection/package.json",
-            "main": "packages/mlkit-face-detection/index.d.ts",
+            "main": "packages/mlkit-face-detection/index.ts",
             "assets": [
               "packages/mlkit-face-detection/*.md",
-              "packages/mlkit-face-detection/index.d.ts",
               "LICENSE",
               {
                 "glob": "**/*",
@@ -304,10 +301,9 @@
             "outputPath": "dist/packages/mlkit-image-labeling",
             "tsConfig": "packages/mlkit-image-labeling/tsconfig.json",
             "packageJson": "packages/mlkit-image-labeling/package.json",
-            "main": "packages/mlkit-image-labeling/index.d.ts",
+            "main": "packages/mlkit-image-labeling/index.ts",
             "assets": [
               "packages/mlkit-image-labeling/*.md",
-              "packages/mlkit-image-labeling/index.d.ts",
               "LICENSE",
               {
                 "glob": "**/*",
@@ -349,10 +345,9 @@
             "outputPath": "dist/packages/mlkit-object-detection",
             "tsConfig": "packages/mlkit-object-detection/tsconfig.json",
             "packageJson": "packages/mlkit-object-detection/package.json",
-            "main": "packages/mlkit-object-detection/index.d.ts",
+            "main": "packages/mlkit-object-detection/index.ts",
             "assets": [
               "packages/mlkit-object-detection/*.md",
-              "packages/mlkit-object-detection/index.d.ts",
               "LICENSE",
               {
                 "glob": "**/*",
@@ -394,10 +389,9 @@
             "outputPath": "dist/packages/mlkit-digital-ink-recognition",
             "tsConfig": "packages/mlkit-digital-ink-recognition/tsconfig.json",
             "packageJson": "packages/mlkit-digital-ink-recognition/package.json",
-            "main": "packages/mlkit-digital-ink-recognition/index.d.ts",
+            "main": "packages/mlkit-digital-ink-recognition/index.ts",
             "assets": [
               "packages/mlkit-digital-ink-recognition/*.md",
-              "packages/mlkit-digital-ink-recognition/index.d.ts",
               "LICENSE",
               {
                 "glob": "**/*",
@@ -439,10 +433,9 @@
             "outputPath": "dist/packages/mlkit-pose-detection",
             "tsConfig": "packages/mlkit-pose-detection/tsconfig.json",
             "packageJson": "packages/mlkit-pose-detection/package.json",
-            "main": "packages/mlkit-pose-detection/index.d.ts",
+            "main": "packages/mlkit-pose-detection/index.ts",
             "assets": [
               "packages/mlkit-pose-detection/*.md",
-              "packages/mlkit-pose-detection/index.d.ts",
               "LICENSE",
               {
                 "glob": "**/*",