Merge branch 'master' into feature/expanded-query

Author: EddyVerbruggen

CHANGELOG.md

@@ -3,6 +3,10 @@
 [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.6.0 (2018, X Y)
+[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/66?closed=1)
+
+
 ## 6.5.0 (2018, August 16)
 [Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/65?closed=1)
 

demo-ng/app/tabs/firestore/firestore.component.html

@@ -3,6 +3,7 @@
     <Button text="login anonymously" (tap)="loginAnonymously()" class="button button-user"></Button>
     <Label text="After pressing these buttons, check the console log" textWrap="true"></Label>
 
+    <Button text="Issue 854" (tap)="issue854()" class="button"></Button>
     <Button text="Add" (tap)="firestoreAdd()" class="button"></Button>
     <Button text="Set" (tap)="firestoreSet()" class="button"></Button>
     <Button text="Set (auto id)" (tap)="firestoreSetByAutoID()" class="button"></Button>

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

@@ -26,9 +26,23 @@ export class FirestoreComponent {
     // AngularFireModule.initializeApp({});
   }
 
+  public issue854(): void {
+    const helloRef: firestore.DocumentReference =
+        firebase.firestore()
+            .collection("users")
+            .doc(firebase.auth().currentUser.uid)
+            .collection("availability")
+            .doc("hello");
+
+    helloRef.get().then(snapshot => console.log(snapshot.data()))
+  }
+
   public loginAnonymously(): void {
     firebase.auth().signInAnonymously()
-        .then(() => console.log("Logged in"))
+        .then(() => {
+          const user = firebase.auth().currentUser;
+          firebase.firestore().collection("users").doc(user.uid).set(user);
+        })
         .catch(err => console.log("Login error: " + JSON.stringify(err)));
   }
 
@@ -119,10 +133,14 @@ export class FirestoreComponent {
   }
 
   public firestoreUpdate(): void {
+    // get a document reference so we can add a city reference to our favourite dog
+    const sfDocRef: firestore.DocumentReference = firebase.firestore().collection("cities").doc("SF");
+
     firebase.firestore().collection("dogs").doc("fave")
         .update({
           name: "Woofieupdate",
           last: "updatedwoofie!",
+          city: sfDocRef,
           updateTs: firestore.FieldValue.serverTimestamp(),
           updateTsAlt: firebase.firestore().FieldValue().serverTimestamp(),
           lastKnownLocation: firebase.firestore().GeoPoint(4.34, 5.67)

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

@@ -13,14 +13,9 @@ export class BarcodeScanningComponent extends AbstractMLKitViewComponent {
     format: string;
   }>;
 
-  constructor() {
-    super();
-    // let's start with the torch on, just for show
-    this.torchOn = true;
-  }
-
   onBarcodeScanResult(event: any): void {
     const result: MLKitScanBarcodesOnDeviceResult = event.value;
     this.barcodes = result.barcodes;
+    console.log("this.barcodes: " + JSON.stringify(this.barcodes));
   }
 }

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

@@ -13,6 +13,12 @@ export class ImageLabelingComponent extends AbstractMLKitViewComponent {
     confidence: number;
   }>;
 
+  constructor() {
+    super();
+    // let's start with the torch on, just for show
+    this.torchOn = true;
+  }
+
   onImageLabelingResult(scanResult: any): void {
     const value: MLKitImageLabelingOnDeviceResult = scanResult.value;
     this.labels = value.labels;

demo-ng/firebase.nativescript.json

@@ -11,5 +11,12 @@
   "facebook_auth": false,
   "google_auth": false,
   "admob": false,
-  "invites": false
+  "invites": false,
+  "dynamic_links": false,
+  "ml_kit": true,
+  "ml_kit_text_recognition": true,
+  "ml_kit_barcode_scanning": true,
+  "ml_kit_face_detection": true,
+  "ml_kit_image_labeling": true,
+  "ml_kit_custom_model": true
 }

demo-ng/package.json

@@ -13,16 +13,16 @@
     }
   },
   "dependencies": {
-    "@angular/animations": "~6.0.0",
-    "@angular/common": "~6.0.0",
-    "@angular/compiler": "~6.0.0",
-    "@angular/core": "~6.0.0",
-    "@angular/forms": "~6.0.0",
-    "@angular/http": "~6.0.0",
-    "@angular/platform-browser": "~6.0.0",
-    "@angular/platform-browser-dynamic": "~6.0.0",
-    "@angular/router": "~6.0.0",
-    "nativescript-angular": "^6.0.0",
+    "@angular/animations": "~6.1.0",
+    "@angular/common": "~6.1.0",
+    "@angular/compiler": "~6.1.0",
+    "@angular/core": "~6.1.0",
+    "@angular/forms": "~6.1.0",
+    "@angular/http": "~6.1.0",
+    "@angular/platform-browser": "~6.1.0",
+    "@angular/platform-browser-dynamic": "~6.1.0",
+    "@angular/router": "~6.1.0",
+    "nativescript-angular": "^6.1.0",
     "nativescript-camera": "^4.0.2",
     "nativescript-imagepicker": "^6.0.1",
     "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-6.5.0.tgz",
@@ -33,27 +33,14 @@
     "zone.js": "~0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/core": "~0.6.3",
-    "@angular/compiler-cli": "~6.0.0",
-    "@ngtools/webpack": "~6.0.3",
+    "@angular/compiler-cli": "~6.1.0",
+    "@ngtools/webpack": "~6.1.0",
     "babel-traverse": "6.26.0",
     "babel-types": "6.26.0",
     "babylon": "6.18.0",
-    "clean-webpack-plugin": "~0.1.19",
-    "copy-webpack-plugin": "~4.5.1",
-    "css-loader": "~0.28.11",
-    "extract-text-webpack-plugin": "~3.0.2",
     "lazy": "1.0.11",
-    "nativescript-dev-typescript": "~0.7.1",
-    "nativescript-dev-webpack": "^0.12.0",
-    "nativescript-worker-loader": "~0.9.0",
-    "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.3.0",
-    "typescript": "~2.7.2",
-    "uglifyjs-webpack-plugin": "~1.2.5",
-    "webpack": "~4.6.0",
-    "webpack-bundle-analyzer": "~2.13.0",
-    "webpack-cli": "~2.1.3",
-    "webpack-sources": "~1.1.0"
+    "nativescript-dev-typescript": "~0.7.0",
+    "nativescript-dev-webpack": "^0.15.1",
+    "typescript": "~2.7.2"
   }
 }

demo-ng/tsconfig.json

@@ -24,6 +24,6 @@
     },
     "exclude": [
         "node_modules",
-        "platforms",
+        "platforms"
     ]
 }

demo/firebase.nativescript.json

@@ -12,5 +12,6 @@
   "google_auth": true,
   "admob": true,
   "invites": true,
+  "dynamic_links": true,
   "ml_kit": false
 }

docs/ML_KIT.md

@@ -245,6 +245,9 @@ registerElement("MLKitBarcodeScanner", () => require("nativescript-plugin-fireba
 </MLKitBarcodeScanner>
 ```
 
+Note that `formats` is optional but recommended for better recognition performance. Supported types:
+`CODE_128`, `CODE_39`, `CODE_93`, `CODABAR`, `DATA_MATRIX`, `EAN_13`, `EAN_8`, `ITF`, `QR_CODE`, `UPC_A`, `UPC_E`, `PDF417`, `AZTEC`.
+
 ### Image labeling
 <img src="https://raw.githubusercontent.com/EddyVerbruggen/nativescript-plugin-firebase/master/docs/images/features/mlkit_text_image_labeling.png" height="153px" alt="ML Kit - Image labeling"/>