Add support for ML Kit's Natural Language and Language Identification #1127

EddyVerbruggen · EddyVerbruggen · commit 1cf17cce1574 · 2019-02-06T10:08:07.000+01:00
diff --git a/demo-ng/firebase.nativescript.json b/demo-ng/firebase.nativescript.json
@@ -1,14 +1,18 @@
 {
+  "external_push_client_only": false,
   "using_ios": true,
   "using_android": true,
-  "realtimedb": false,
   "firestore": true,
+  "realtimedb": false,
+  "authentication": true,
   "remote_config": false,
   "performance_monitoring": true,
   "messaging": false,
-  "crash_reporting": false,
+  "in_app_messaging": false,
   "crashlytics": false,
+  "crash_reporting": false,
   "storage": false,
+  "functions": false,
   "facebook_auth": false,
   "google_auth": false,
   "admob": false,
@@ -19,5 +23,6 @@
   "ml_kit_barcode_scanning": true,
   "ml_kit_face_detection": true,
   "ml_kit_image_labeling": true,
-  "ml_kit_custom_model": true
-}
+  "ml_kit_custom_model": true,
+  "ml_kit_natural_language_identification": true
+}
diff --git a/publish/scripts/installer.js b/publish/scripts/installer.js
@@ -250,6 +250,10 @@ function promptQuestions() {
         name: 'ml_kit_custom_model',
         description: 'With Ml Kit, do you want to use a custom TensorFlow Lite model? (y/n)',
         default: 'n'
+      // }, {
+      //   name: 'ml_kit_natural_language_identification',
+      //   description: 'With Ml Kit, do you want to use recognize natural languages? (y/n)',
+      //   default: 'n'
       }], function (mlkitErr, mlkitResult) {
         if (mlkitErr) {
           return console.log(mlkitErr);
@@ -422,6 +426,8 @@ end`) + `
 ` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_face_detection) ? `` : `#`) + `pod 'Firebase/MLVisionFaceModel'
 ` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_image_labeling) ? `` : `#`) + `pod 'Firebase/MLVisionLabelModel'
 ` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_custom_model) ? `` : `#`) + `pod 'Firebase/MLModelInterpreter'
+# Natural Language is commented for now, because of (likely) this issue: https://github.com/firebase/firebase-ios-sdk/issues/2324
+` + (isSelected(result.ml_kit) && isSelected(result.ml_kit_natural_language_identification) ? `#` : `#`) + `pod 'Firebase/MLNLLanguageID'
 
 # Facebook Authentication
 ` + (isSelected(result.facebook_auth) ? `` : `#`) + `pod 'FBSDKCoreKit', '~> 4.38.0'
@@ -775,6 +781,8 @@ dependencies {
     ` + (isSelected(result.ml_kit) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision:18.0.2"
     ` + (isSelected(result.ml_kit_image_labeling) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision-image-label-model:17.0.2"
     ` + (isSelected(result.ml_kit_custom_model) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-model-interpreter:16.2.4"
+    ` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` compile "com.google.firebase:firebase-ml-natural-language:18.1.1"
+    ` + (isSelected(result.ml_kit_natural_language_identification) ? `//` : `//`) + ` compile "com.google.firebase:firebase-ml-natural-language-language-id-model:18.0.2"
 
     // Facebook Authentication
     ` + (isSelected(result.facebook_auth) ? `` : `//`) + ` compile ("com.facebook.android:facebook-android-sdk:4.35.0"){ exclude group: 'com.google.zxing' }
diff --git a/src/mlkit/barcodescanning/index.android.ts b/src/mlkit/barcodescanning/index.android.ts
@@ -1,6 +1,6 @@
 import { ImageSource } from "tns-core-modules/image-source";
 import { MLKitScanBarcodesOnDeviceOptions, MLKitScanBarcodesOnDeviceResult } from "./";
-import { MLKitOptions } from "../index";
+import { MLKitVisionOptions } from "../index";
 import { BarcodeFormat, MLKitBarcodeScanner as MLKitBarcodeScannerBase } from "./barcodescanning-common";
 
 export { BarcodeFormat };
@@ -105,7 +105,7 @@ export function scanBarcodesOnDevice(options: MLKitScanBarcodesOnDeviceOptions):
   });
 }
 
-function getImage(options: MLKitOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {
+function getImage(options: MLKitVisionOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {
   const image: android.graphics.Bitmap = options.image instanceof ImageSource ? options.image.android : options.image.imageSource.android;
   return com.google.firebase.ml.vision.common.FirebaseVisionImage.fromBitmap(image);
 }
diff --git a/src/mlkit/barcodescanning/index.d.ts b/src/mlkit/barcodescanning/index.d.ts
@@ -1,6 +1,5 @@
-import { MLKitOptions } from "../";
+import { MLKitCameraView, MLKitVisionOptions, MLKitVisionResult } from "../";
 import { BarcodeFormat } from "./barcodescanning-common";
-import { MLKitResult, MLKitCameraView } from "../index";
 
 export { BarcodeFormat };
 
@@ -12,11 +11,11 @@ export interface MLKitScanBarcodesResultBarcode {
   // TODO details
 }
 
-export interface MLKitScanBarcodesOnDeviceResult extends MLKitResult {
+export interface MLKitScanBarcodesOnDeviceResult extends MLKitVisionResult {
   barcodes: Array<MLKitScanBarcodesResultBarcode>;
 }
 
-export interface MLKitScanBarcodesOnDeviceOptions extends MLKitOptions {
+export interface MLKitScanBarcodesOnDeviceOptions extends MLKitVisionOptions {
   /**
    * Limit to only what you need to speed up processing.
    * If not set, we'll detect all supported formats.
@@ -26,4 +25,5 @@ export interface MLKitScanBarcodesOnDeviceOptions extends MLKitOptions {
 
 export declare function scanBarcodesOnDevice(options: MLKitScanBarcodesOnDeviceOptions): Promise<MLKitScanBarcodesOnDeviceResult>;
 
-export declare class MLKitBarcodeScanner extends MLKitCameraView {}
+export declare class MLKitBarcodeScanner extends MLKitCameraView {
+}
diff --git a/src/mlkit/barcodescanning/index.ios.ts b/src/mlkit/barcodescanning/index.ios.ts
@@ -1,6 +1,6 @@
 import { ImageSource } from "tns-core-modules/image-source";
 import { MLKitScanBarcodesOnDeviceOptions, MLKitScanBarcodesOnDeviceResult } from "./index";
-import { MLKitOptions } from "../index";
+import { MLKitVisionOptions } from "../index";
 import { BarcodeFormat, MLKitBarcodeScanner as MLKitBarcodeScannerBase } from "./barcodescanning-common";
 
 export { BarcodeFormat };
@@ -92,7 +92,7 @@ export function scanBarcodesOnDevice(options: MLKitScanBarcodesOnDeviceOptions):
   });
 }
 
-function getImage(options: MLKitOptions): FIRVisionImage {
+function getImage(options: MLKitVisionOptions): FIRVisionImage {
   const image: UIImage = options.image instanceof ImageSource ? options.image.ios : options.image.imageSource.ios;
   return FIRVisionImage.alloc().initWithImage(image);
 }
diff --git a/src/mlkit/custommodel/index.d.ts b/src/mlkit/custommodel/index.d.ts
@@ -1,11 +1,11 @@
-import { MLKitCameraView, MLKitOptions, MLKitResult } from "../index";
+import { MLKitCameraView, MLKitVisionOptions, MLKitVisionResult } from "../index";
 
 export interface MLKitCustomModelResultValue {
   text: string;
   confidence: number;
 }
 
-export interface MLKitCustomModelResult extends MLKitResult {
+export interface MLKitCustomModelResult extends MLKitVisionResult {
   result: Array<MLKitCustomModelResultValue>;
 }
 
@@ -17,7 +17,7 @@ export interface TNSCustomModelInput {
 }
 
 // see https://firebase.google.com/docs/ml-kit/ios/use-custom-models
-export interface MLKitCustomModelOptions extends MLKitOptions {
+export interface MLKitCustomModelOptions extends MLKitVisionOptions {
   localModelFile?: string;
   labelsFile: string;
   /**
diff --git a/src/mlkit/facedetection/index.android.ts b/src/mlkit/facedetection/index.android.ts
@@ -1,6 +1,6 @@
 import { ImageSource } from "tns-core-modules/image-source";
+import { MLKitVisionOptions } from "../";
 import { MLKitDetectFacesOnDeviceOptions, MLKitDetectFacesOnDeviceResult } from "./";
-import { MLKitOptions } from "../index";
 import { MLKitFaceDetection as MLKitFaceDetectionBase } from "./facedetection-common";
 
 const gmsTasks = (<any>com.google.android.gms).tasks;
@@ -110,7 +110,7 @@ export function detectFacesOnDevice(options: MLKitDetectFacesOnDeviceOptions): P
   });
 }
 
-function getImage(options: MLKitOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {
+function getImage(options: MLKitVisionOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {
   const image: android.graphics.Bitmap = options.image instanceof ImageSource ? options.image.android : options.image.imageSource.android;
   return com.google.firebase.ml.vision.common.FirebaseVisionImage.fromBitmap(image);
 }
diff --git a/src/mlkit/facedetection/index.d.ts b/src/mlkit/facedetection/index.d.ts
@@ -1,5 +1,4 @@
-import { MLKitOptions } from "../";
-import { MLKitCameraView, MLKitResult } from "../index";
+import { MLKitCameraView, MLKitVisionOptions, MLKitVisionResult } from "../";
 
 export interface MLKitDetectFacesResultFace {
   smilingProbability?: number;
@@ -10,13 +9,13 @@ export interface MLKitDetectFacesResultFace {
   android?: any;
 }
 
-export interface MLKitDetectFacesOnDeviceResult extends MLKitResult {
+export interface MLKitDetectFacesOnDeviceResult extends MLKitVisionResult {
   faces: Array<MLKitDetectFacesResultFace>;
 }
 
 export type MLKitFaceDetectionMode = "fast" | "accurate";
 
-export interface MLKitDetectFacesOnDeviceOptions extends MLKitOptions {
+export interface MLKitDetectFacesOnDeviceOptions extends MLKitVisionOptions {
   /**
    * Favor speed or accuracy when detecting faces.
    * Default "fast".
@@ -27,8 +26,8 @@ export interface MLKitDetectFacesOnDeviceOptions extends MLKitOptions {
    * Whether or not to attempt to identify facial "landmarks": eyes, ears, nose, cheeks, mouth.
    * Default "none".
    *
-  // detectLandmarks?: "none" | "all";
-  */
+   // detectLandmarks?: "none" | "all";
+   */
 
   /**
    * The minimum size, relative to the image, of faces to detect.
@@ -45,4 +44,5 @@ export interface MLKitDetectFacesOnDeviceOptions extends MLKitOptions {
 
 export declare function detectFacesOnDevice(options: MLKitDetectFacesOnDeviceOptions): Promise<MLKitDetectFacesOnDeviceResult>;
 
-export declare class MLKitFaceDetection extends MLKitCameraView {}
+export declare class MLKitFaceDetection extends MLKitCameraView {
+}
diff --git a/src/mlkit/facedetection/index.ios.ts b/src/mlkit/facedetection/index.ios.ts
@@ -1,8 +1,8 @@
 import { ImageSource } from "tns-core-modules/image-source";
+import { ios as iosUtils } from "tns-core-modules/utils/utils";
+import { MLKitVisionOptions } from "../";
 import { MLKitDetectFacesOnDeviceOptions, MLKitDetectFacesOnDeviceResult } from "./";
-import { MLKitOptions } from "../index";
 import { MLKitFaceDetection as MLKitFaceDetectionBase } from "./facedetection-common";
-import { ios as iosUtils } from "tns-core-modules/utils/utils";
 
 export class MLKitFaceDetection extends MLKitFaceDetectionBase {
 
@@ -99,7 +99,7 @@ export function detectFacesOnDevice(options: MLKitDetectFacesOnDeviceOptions): P
   });
 }
 
-function getImage(options: MLKitOptions): FIRVisionImage {
+function getImage(options: MLKitVisionOptions): FIRVisionImage {
   const image = options.image instanceof ImageSource ? options.image.ios : options.image.imageSource.ios;
   const newImage = UIImage.alloc().initWithCGImageScaleOrientation(image.CGImage, 1, UIImageOrientation.Up);
   return FIRVisionImage.alloc().initWithImage(newImage);
diff --git a/src/mlkit/imagelabeling/index.android.ts b/src/mlkit/imagelabeling/index.android.ts
@@ -1,5 +1,5 @@
 import { ImageSource } from "tns-core-modules/image-source";
-import { MLKitOptions, } from "../";
+import { MLKitVisionOptions, } from "../";
 import { MLKitImageLabelingOptions, MLKitImageLabelingCloudResult, MLKitImageLabelingOnDeviceResult } from "./";
 import { MLKitImageLabeling as MLKitImageLabelingBase } from "./imagelabeling-common";
 
@@ -144,7 +144,7 @@ export function labelImageCloud(options: MLKitImageLabelingOptions): Promise<MLK
   });
 }
 
-function getImage(options: MLKitOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {
+function getImage(options: MLKitVisionOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {
   const image: android.graphics.Bitmap = options.image instanceof ImageSource ? options.image.android : options.image.imageSource.android;
   return com.google.firebase.ml.vision.common.FirebaseVisionImage.fromBitmap(image);
 }
diff --git a/src/mlkit/imagelabeling/index.d.ts b/src/mlkit/imagelabeling/index.d.ts
@@ -1,5 +1,5 @@
-import { MLKitOptions } from "../";
-import { MLKitCameraView, MLKitCloudOptions, MLKitResult } from "../index";
+import { MLKitVisionOptions } from "../";
+import { MLKitCameraView, MLKitVisionResult } from "../index";
 
 export interface MLKitImageLabelingResultLabel {
   text: string;
@@ -8,22 +8,22 @@ export interface MLKitImageLabelingResultLabel {
   android?: any;
 }
 
-export interface MLKitImageLabelingCloudResult extends MLKitResult {
+export interface MLKitImageLabelingCloudResult extends MLKitVisionResult {
   labels: Array<MLKitImageLabelingResultLabel>;
 }
 
 export interface MLKitImageLabelingOnDeviceResult extends MLKitImageLabelingCloudResult {
 }
 
-export interface MLKitImageLabelingOptions extends MLKitOptions {
+export interface MLKitImageLabelingOptions extends MLKitVisionOptions {
   /**
    * 0.5 by default
    */
   confidenceThreshold?: number;
 }
 
-export declare function labelImageOnDevice(options: MLKitImageLabelingOnDeviceOptions): Promise<MLKitImageLabelingOnDeviceResult>;
+export declare function labelImageOnDevice(options: MLKitImageLabelingOptions): Promise<MLKitImageLabelingOnDeviceResult>;
 
-export declare function labelImageCloud(options: MLKitImageLabelingCloudOptions): Promise<MLKitImageLabelingCloudResult>;
+export declare function labelImageCloud(options: MLKitImageLabelingOptions): Promise<MLKitImageLabelingCloudResult>;
 
 export declare class MLKitImageLabeling extends MLKitCameraView {}
diff --git a/src/mlkit/imagelabeling/index.ios.ts b/src/mlkit/imagelabeling/index.ios.ts
@@ -1,8 +1,7 @@
 import { ImageSource } from "tns-core-modules/image-source";
-import { MLKitOptions } from "../";
-import { MLKitImageLabelingOnDeviceResult, MLKitImageLabelingOptions } from "./";
+import { MLKitVisionOptions } from "../";
+import { MLKitImageLabelingCloudResult, MLKitImageLabelingOnDeviceResult, MLKitImageLabelingOptions } from "./";
 import { MLKitImageLabeling as MLKitImageLabelingBase } from "./imagelabeling-common";
-import { MLKitImageLabelingCloudResult } from "./index";
 
 export class MLKitImageLabeling extends MLKitImageLabelingBase {
 
@@ -116,7 +115,7 @@ export function labelImageCloud(options: MLKitImageLabelingOptions): Promise<MLK
   });
 }
 
-function getImage(options: MLKitOptions): FIRVisionImage {
+function getImage(options: MLKitVisionOptions): FIRVisionImage {
   const image: UIImage = options.image instanceof ImageSource ? options.image.ios : options.image.imageSource.ios;
   return FIRVisionImage.alloc().initWithImage(image);
 }
diff --git a/src/mlkit/index.ts b/src/mlkit/index.ts
@@ -4,17 +4,18 @@ import * as facedetection from "./facedetection";
 import * as imagelabeling from "./imagelabeling";
 import * as landmarkrecognition from "./landmarkrecognition";
 import * as custommodel from "./custommodel";
+import * as naturallanguageidentification from "./naturallanguageidentification";
 
 import { ImageSource } from "tns-core-modules/image-source";
 import { Image } from "tns-core-modules/ui/image";
 
-export interface MLKitOptions {
+export interface MLKitVisionOptions {
   image?: Image | ImageSource;
 }
 
 export type MLKitCloudModelType = "stable" | "latest";
 
-export interface MLKitCloudOptions extends MLKitOptions {
+export interface MLKitVisionCloudOptions extends MLKitVisionOptions {
   /**
    * Defaults to "stable".
    */
@@ -25,9 +26,9 @@ export interface MLKitCloudOptions extends MLKitOptions {
   maxResults?: number
 }
 
-export interface MLKitResult {
+export interface MLKitVisionResult {
   /**
-   * Only set when using a camera stream,
+   * Only set when using a camera stream (update: DISABLED),
    * because when detecting from static images... you already have the image, right? :)
    */
   // imageSource?: ImageSource;
@@ -42,6 +43,7 @@ export {
   facedetection,
   imagelabeling,
   landmarkrecognition,
-  custommodel
+  custommodel,
+  naturallanguageidentification
 };
 
diff --git a/src/mlkit/landmarkrecognition/index.android.ts b/src/mlkit/landmarkrecognition/index.android.ts
@@ -1,5 +1,5 @@
 import { ImageSource } from "tns-core-modules/image-source";
-import { MLKitOptions, } from "../";
+import { MLKitVisionOptions, } from "../";
 import { MLKitLandmarkRecognitionCloudOptions, MLKitLandmarkRecognitionCloudResult } from "./index";
 import { MLKitCloudModelType } from "../index";
 
@@ -57,7 +57,7 @@ export function recognizeLandmarksCloud(options: MLKitLandmarkRecognitionCloudOp
   });
 }
 
-function getImage(options: MLKitOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {
+function getImage(options: MLKitVisionOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {
   const image: android.graphics.Bitmap = options.image instanceof ImageSource ? options.image.android : options.image.imageSource.android;
   return com.google.firebase.ml.vision.common.FirebaseVisionImage.fromBitmap(image);
 }
diff --git a/src/mlkit/landmarkrecognition/index.d.ts b/src/mlkit/landmarkrecognition/index.d.ts
@@ -1,4 +1,4 @@
-import { MLKitCloudOptions, MLKitResult } from "../index";
+import { MLKitVisionCloudOptions, MLKitVisionResult } from "../index";
 
 export interface MLKitLandmarkRecognitionResultLandmark {
   // TODO add location (see #704)
@@ -8,11 +8,11 @@ export interface MLKitLandmarkRecognitionResultLandmark {
   android?: any;
 }
 
-export interface MLKitLandmarkRecognitionCloudResult extends MLKitResult {
+export interface MLKitLandmarkRecognitionCloudResult extends MLKitVisionResult {
   landmarks: Array<MLKitLandmarkRecognitionResultLandmark>;
 }
 
-export interface MLKitLandmarkRecognitionCloudOptions extends MLKitCloudOptions {
+export interface MLKitLandmarkRecognitionCloudOptions extends MLKitVisionCloudOptions {
 }
 
 export declare function recognizeLandmarksCloud(options: MLKitLandmarkRecognitionCloudOptions): Promise<MLKitLandmarkRecognitionCloudResult>;
diff --git a/src/mlkit/landmarkrecognition/index.ios.ts b/src/mlkit/landmarkrecognition/index.ios.ts
@@ -1,5 +1,5 @@
 import { ImageSource } from "tns-core-modules/image-source";
-import { MLKitOptions } from "../";
+import { MLKitVisionOptions } from "../";
 import { MLKitLandmarkRecognitionCloudOptions, MLKitLandmarkRecognitionCloudResult } from "./";
 import { MLKitCloudModelType } from "../index";
 
@@ -44,7 +44,7 @@ export function recognizeLandmarksCloud(options: MLKitLandmarkRecognitionCloudOp
   });
 }
 
-function getImage(options: MLKitOptions): FIRVisionImage {
+function getImage(options: MLKitVisionOptions): FIRVisionImage {
   const image: UIImage = options.image instanceof ImageSource ? options.image.ios : options.image.imageSource.ios;
   return FIRVisionImage.alloc().initWithImage(image);
 }
diff --git a/src/mlkit/naturallanguageidentification/index.android.ts b/src/mlkit/naturallanguageidentification/index.android.ts
diff --git a/src/mlkit/naturallanguageidentification/index.d.ts b/src/mlkit/naturallanguageidentification/index.d.ts
diff --git a/src/mlkit/naturallanguageidentification/index.ios.ts b/src/mlkit/naturallanguageidentification/index.ios.ts
diff --git a/src/mlkit/textrecognition/index.android.ts b/src/mlkit/textrecognition/index.android.ts
diff --git a/src/mlkit/textrecognition/index.d.ts b/src/mlkit/textrecognition/index.d.ts
diff --git a/src/mlkit/textrecognition/index.ios.ts b/src/mlkit/textrecognition/index.ios.ts
diff --git a/src/scripts/postinstall.js b/src/scripts/postinstall.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { ImageSource } from "tns-core-modules/image-source";`
`2`	`2`	`import { MLKitScanBarcodesOnDeviceOptions, MLKitScanBarcodesOnDeviceResult } from "./";`
`3`		`-import { MLKitOptions } from "../index";`
	`3`	`+import { MLKitVisionOptions } from "../index";`
`4`	`4`	`import { BarcodeFormat, MLKitBarcodeScanner as MLKitBarcodeScannerBase } from "./barcodescanning-common";`
`5`	`5`
`6`	`6`	`export { BarcodeFormat };`
`@@ -105,7 +105,7 @@ export function scanBarcodesOnDevice(options: MLKitScanBarcodesOnDeviceOptions):`
`105`	`105`	`});`
`106`	`106`	`}`
`107`	`107`
`108`		`-function getImage(options: MLKitOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {`
	`108`	`+function getImage(options: MLKitVisionOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {`
`109`	`109`	`const image: android.graphics.Bitmap = options.image instanceof ImageSource ? options.image.android : options.image.imageSource.android;`
`110`	`110`	`return com.google.firebase.ml.vision.common.FirebaseVisionImage.fromBitmap(image);`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`		`-import { MLKitCameraView, MLKitOptions, MLKitResult } from "../index";`
	`1`	`+import { MLKitCameraView, MLKitVisionOptions, MLKitVisionResult } from "../index";`
`2`	`2`
`3`	`3`	`export interface MLKitCustomModelResultValue {`
`4`	`4`	`text: string;`
`5`	`5`	`confidence: number;`
`6`	`6`	`}`
`7`	`7`
`8`		`-export interface MLKitCustomModelResult extends MLKitResult {`
	`8`	`+export interface MLKitCustomModelResult extends MLKitVisionResult {`
`9`	`9`	`result: Array<MLKitCustomModelResultValue>;`
`10`	`10`	`}`
`11`	`11`
`@@ -17,7 +17,7 @@ export interface TNSCustomModelInput {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`// see https://firebase.google.com/docs/ml-kit/ios/use-custom-models`
`20`		`-export interface MLKitCustomModelOptions extends MLKitOptions {`
	`20`	`+export interface MLKitCustomModelOptions extends MLKitVisionOptions {`
`21`	`21`	`localModelFile?: string;`
`22`	`22`	`labelsFile: string;`
`23`	`23`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { ImageSource } from "tns-core-modules/image-source";`
`2`		`-import { MLKitOptions, } from "../";`
	`2`	`+import { MLKitVisionOptions, } from "../";`
`3`	`3`	`import { MLKitImageLabelingOptions, MLKitImageLabelingCloudResult, MLKitImageLabelingOnDeviceResult } from "./";`
`4`	`4`	`import { MLKitImageLabeling as MLKitImageLabelingBase } from "./imagelabeling-common";`
`5`	`5`
`@@ -144,7 +144,7 @@ export function labelImageCloud(options: MLKitImageLabelingOptions): Promise<MLK`
`144`	`144`	`});`
`145`	`145`	`}`
`146`	`146`
`147`		`-function getImage(options: MLKitOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {`
	`147`	`+function getImage(options: MLKitVisionOptions): any /* com.google.firebase.ml.vision.common.FirebaseVisionImage */ {`
`148`	`148`	`const image: android.graphics.Bitmap = options.image instanceof ImageSource ? options.image.android : options.image.imageSource.android;`
`149`	`149`	`return com.google.firebase.ml.vision.common.FirebaseVisionImage.fromBitmap(image);`
`150`	`150`	`}`