Merge remote-tracking branch 'upstream/master'

Author: Soarc

CHANGELOG.md

@@ -3,7 +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.5.0 (2018, August ?)
+## 6.6.0 (2018, August 28)
+[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>
@@ -24,6 +25,8 @@
     <Button text="Where" (tap)="firestoreWhere()" class="button"></Button>
     <Button text="Where, Order, Limit" (tap)="firestoreWhereOrderLimit()" class="button"></Button>
     <Button text="Where array_contains" (tap)="firestoreWhereCityHasALake()" class="button"></Button>
+    <Button text="Start at 'LA'" (tap)="firestoreStartAt()" class="button"></Button>
+    <Button text="Start after 'LA'" (tap)="firestoreStartAfter()" class="button"></Button>
     <Button text="Delete" (tap)="firestoreDelete()" class="button"></Button>
     <Button text="Transactional update (iOS)" (tap)="transactionalUpdate()" class="button"></Button>
     <Button text="Write batch" (tap)="writeBatch()" 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)
@@ -326,4 +344,30 @@ export class FirestoreComponent {
         .then(() => console.log(`Transaction successfully committed`))
         .catch(error => console.log("doTransaction error: " + error));
   }
+
+  public firestoreStartAt(): void {
+    firebase.firestore().collection('cities')
+      .doc('LA')
+      .get()
+      .then(doc => {
+        firebase.firestore().collection('cities')
+          .orderBy('name', 'asc')
+          .startAt(doc)
+          .get()
+          .then(snap => snap.forEach(doc => console.log(doc.id, doc.data())));
+      });
+  }
+
+  public firestoreStartAfter(): void {
+    firebase.firestore().collection('cities')
+      .doc('LA')
+      .get()
+      .then(doc => {
+        firebase.firestore().collection('cities')
+          .orderBy('name', 'asc')
+          .startAfter(doc)
+          .get()
+          .then(snap => snap.forEach(doc => console.log(doc.id, doc.data())));
+      });
+  }
 }

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

@@ -0,0 +1,11 @@
+import { PropertyChangeData } from "tns-core-modules/data/observable";
+
+export abstract class AbstractMLKitViewComponent {
+  torchOn: boolean = false;
+
+  toggleTorch(args: PropertyChangeData): void {
+    if (args.value !== null && args.value !== this.torchOn) {
+      this.torchOn = args.value;
+    }
+  }
+}

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

@@ -9,6 +9,7 @@
       formats="QR_CODE, EAN_8, EAN_13"
       android:processEveryNthFrame="5"
       ios:processEveryNthFrame="10"
+      [torchOn]="torchOn"
       (scanResult)="onBarcodeScanResult($event)">
   </MLKitBarcodeScanner>
 
@@ -45,4 +46,10 @@
       </ng-template>
     </ListView>
   </GridLayout>
+
+  <GridLayout rows="auto" columns="auto, auto" horizontalAlignment="right" class="m-t-4 m-r-8">
+    <Label col="0" text="Torch" class="c-white" [class.disabled]="!torchOn"></Label>
+    <Switch col="1" [checked]="torchOn" (checkedChange)="toggleTorch($event)"></Switch>
+  </GridLayout>
+
 </GridLayout>

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

@@ -1,12 +1,13 @@
 import { Component } from "@angular/core";
 import { MLKitScanBarcodesOnDeviceResult } from "nativescript-plugin-firebase/mlkit/barcodescanning";
+import { AbstractMLKitViewComponent } from "~/tabs/mlkit/abstract.mlkitview.component";
 
 @Component({
   selector: "mlkit-barcodescanning",
   moduleId: module.id,
   templateUrl: "./barcodescanning.component.html",
 })
-export class BarcodeScanningComponent {
+export class BarcodeScanningComponent extends AbstractMLKitViewComponent {
   barcodes: Array<{
     value: string;
     format: string;
@@ -15,5 +16,6 @@ export class BarcodeScanningComponent {
   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/facedetection/facedetection.component.html

@@ -11,6 +11,7 @@
         enableFaceTracking="true"
         minimumFaceSize="0.2"
         modeType="accurate"
+        [torchOn]="torchOn"
         (scanResult)="onFaceDetectionResult($event)">
     </MLKitFaceDetection>
 
@@ -59,4 +60,10 @@
       </GridLayout>
     </ng-template>
   </ListView>
+
+  <GridLayout rows="auto" columns="auto, auto" horizontalAlignment="right" class="m-t-4 m-r-8">
+    <Label col="0" text="Torch" class="c-white" [class.disabled]="!torchOn"></Label>
+    <Switch col="1" [checked]="torchOn" (checkedChange)="toggleTorch($event)"></Switch>
+  </GridLayout>
+
 </GridLayout>

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

@@ -1,12 +1,13 @@
 import { Component } from "@angular/core";
 import { MLKitDetectFacesOnDeviceResult, MLKitDetectFacesResultFace } from "nativescript-plugin-firebase/mlkit/facedetection";
+import { AbstractMLKitViewComponent } from "~/tabs/mlkit/abstract.mlkitview.component";
 
 @Component({
   selector: "mlkit-facedetection",
   moduleId: module.id,
   templateUrl: "./facedetection.component.html",
 })
-export class FaceDetectionComponent {
+export class FaceDetectionComponent extends AbstractMLKitViewComponent {
   faces: Array<MLKitDetectFacesResultFace>;
 
   mlKitAllOK: string;

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

@@ -42,4 +42,10 @@
       </ng-template>
     </ListView>
   </GridLayout>
+
+  <GridLayout rows="auto" columns="auto, auto" horizontalAlignment="right" class="m-t-4 m-r-8">
+    <Label col="0" text="Torch" class="c-white" [class.disabled]="!torchOn"></Label>
+    <Switch col="1" [checked]="torchOn" (checkedChange)="toggleTorch($event)"></Switch>
+  </GridLayout>
+
 </GridLayout>

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

@@ -1,17 +1,24 @@
 import { Component } from "@angular/core";
 import { MLKitImageLabelingOnDeviceResult } from "nativescript-plugin-firebase/mlkit/imagelabeling";
+import { AbstractMLKitViewComponent } from "~/tabs/mlkit/abstract.mlkitview.component";
 
 @Component({
   selector: "mlkit-imagelabeling",
   moduleId: module.id,
   templateUrl: "./imagelabeling.component.html",
 })
-export class ImageLabelingComponent {
+export class ImageLabelingComponent extends AbstractMLKitViewComponent {
   labels: Array<{
     text: string;
     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;