Expose more configuration options for ML Kit features #704

Author: EddyVerbruggen

CHANGELOG.md

@@ -3,6 +3,11 @@
 [Firebase iOS SDK Changelog](https://firebase.google.com/support/release-notes/ios)
 [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
 
+## 6.1.0 (PENDING)
+
+### Fixes
+- [#711](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/711) Crashlytics: "Configure Crashlytics" build step phase added multiple times 
+
 
 ## 6.0.2 (2018, May 16)
 

demo-ng/app/App_Resources/Android/app.gradle

@@ -5,8 +5,8 @@
 //	compile 'com.android.support:recyclerview-v7:+'
 //}
 
-android {  
-  defaultConfig {  
+android {
+  defaultConfig {
     generatedDensities = []
     multiDexEnabled true
     applicationId "org.nativescript.firebasedemo.firestore"
@@ -18,6 +18,7 @@ android {
   }
 
   aaptOptions {
-    additionalParameters "--no-version-vectors"  
-  }  
-} 
+    additionalParameters "--no-version-vectors"
+    noCompress "tflite"
+  }
+}

demo-ng/app/tabs/mlkit/mlkit.component.ts

@@ -167,6 +167,8 @@ export class MLKitComponent {
         this.labelImageCloud(imageSource);
       } else if (pickedItem === "Landmark recognition (cloud)") {
         this.recognizeLandmarkCloud(imageSource);
+      // } else if (pickedItem === "Custom model (on device)") {
+      //   this.customModelOnDevice(imageSource);
       }
     });
   }
@@ -259,6 +261,23 @@ export class MLKitComponent {
         .catch(errorMessage => console.log("ML Kit error: " + errorMessage));
   }
 
+  /*
+  private customModelOnDevice(imageSource: ImageSource): void {
+    console.log("customModelOnDevice");
+    firebase.mlkit.custommodel.useCustomModel({
+      image: imageSource
+    }).then(
+        (result: MLKitCustomModelResult) => {
+          alert({
+            title: `Result`,
+            message: JSON.stringify(result.result),
+            okButtonText: "OK"
+          });
+        })
+        .catch(errorMessage => console.log("ML Kit error: " + errorMessage));
+  }
+  */
+
   private labelImageCloud(imageSource: ImageSource): void {
     firebase.mlkit.imagelabeling.labelImageCloud({
       image: imageSource,

src/mlkit/barcodescanning/index.d.ts

@@ -4,13 +4,16 @@ import { MLKitResult, MLKitCameraView } from "../index";
 
 export { BarcodeFormat };
 
+export interface MLKitScanBarcodesResultBarcode {
+  value: string;
+  format: string;
+  ios?: any;
+  android?: any;
+  // TODO details
+}
+
 export interface MLKitScanBarcodesOnDeviceResult extends MLKitResult {
-  barcodes: Array<{
-    value: string;
-    format: string;
-    ios?: any;
-    android?: any;
-  }>;
+  barcodes: Array<MLKitScanBarcodesResultBarcode>;
 }
 
 export interface MLKitScanBarcodesOnDeviceOptions extends MLKitOptions {

src/mlkit/facedetection/index.d.ts

@@ -6,6 +6,8 @@ export interface MLKitDetectFacesResultFace {
   smilingProbability?: number;
   leftEyeOpenProbability?: number;
   rightEyeOpenProbability?: number;
+  ios?: any;
+  android?: any;
 }
 
 export interface MLKitDetectFacesOnDeviceResult extends MLKitResult {

src/mlkit/imagelabeling/imagelabeling-common.ts

@@ -10,7 +10,6 @@ export abstract class MLKitImageLabeling extends MLKitCameraView {
   static scanResultEvent: string = "scanResult";
 
   protected confidenceThreshold: number;
-  protected maxResults: number;
 
   [confidenceThresholdProperty.setNative](value: number) {
     this.confidenceThreshold = value;

src/mlkit/imagelabeling/index.d.ts

@@ -1,11 +1,15 @@
 import { MLKitOptions } from "../";
 import { MLKitCameraView, MLKitCloudOptions, MLKitResult } from "../index";
 
+export interface MLKitImageLabelingResultLabel {
+  text: string;
+  confidence: number;
+  ios?: any;
+  android?: any;
+}
+
 export interface MLKitImageLabelingCloudResult extends MLKitResult {
-  labels: Array<{
-    text: string;
-    confidence: number;
-  }>;
+  labels: Array<MLKitImageLabelingResultLabel>;
 }
 
 export interface MLKitImageLabelingOnDeviceResult extends MLKitImageLabelingCloudResult {

src/mlkit/index.ts

@@ -35,9 +35,6 @@ export interface MLKitResult {
 export declare class MLKitCameraView {
 }
 
-// export declare class MLKitBarcodeScanner {
-// }
-
 export {
   textrecognition,
   barcodescanning,

src/mlkit/landmarkrecognition/index.d.ts

@@ -4,6 +4,8 @@ export interface MLKitLandmarkRecognitionResultLandmark {
   // TODO add location (see #704)
   name: string;
   confidence: number;
+  ios?: any;
+  android?: any;
 }
 
 export interface MLKitLandmarkRecognitionCloudResult extends MLKitResult {

src/mlkit/textrecognition/index.d.ts

@@ -30,6 +30,8 @@ export interface MLKitRecognizeTextResultBlock {
 
 export interface MLKitRecognizeTextOnDeviceResult extends MLKitResult {
 	blocks: Array<MLKitRecognizeTextResultBlock>;
+  ios?: any;
+  android?: any;
 }
 
 export interface MLKitRecognizeTextCloudResult extends MLKitResult {