Merge branch 'master' of https://github.com/NativeScript/tests-app-ng

# Conflicts:
#	app/binding/binding-page.html
#	app/binding/binding-page.ts
#	app/main/main-page-router-outlet.ts

Author: SvetoslavTsenov

app/binding/binding-page.html

@@ -0,0 +1,12 @@
+<StackLayout>
+    <TextField hint="oneWayDataBinding" automationText="tfOneWayBinding" keyboardType="email" [text]="oneWayDataBinding" autocorrect="false" autocapitalizationType="none"></TextField>
+    <TextField hint="twoWayDataBindingBanana" automationText="tfTwoWayBinding" keyboardType="email" [(ngModel)]="twoWayDataBinding" autocorrect="false" autocapitalizationType="none"></TextField>
+    <TextField hint="" automationText="tfCurlyBracket" keyboardType="email" text="{{ curlyBracket }}" autocorrect="false" autocapitalizationType="none"></TextField>
+    <Label automationText="lbCurlyBracketBinding" text='Label with curlyBaracket binding: {{ twoWayDataBinding }}'></Label>
+    
+    <StackLayout orientation="horizontal">
+        <Button (tap)="changeValues()" automationText="changeValues" text="update from code" ></Button>
+        <Button (tap)="getValues()" automationText="getValues" text="get" width="80" height="40"></Button>
+    </StackLayout>
+    <TextView [text]="results" automationText="tvResults" textWrap="true"></TextView>
+</StackLayout>

app/modal/modal-dialog.component.ts

@@ -0,0 +1,82 @@
+import {Component, ChangeDetectionStrategy} from '@angular/core';
+import * as dialogs from "ui/dialogs";
+import {ModalDialogService, ModalDialogOptions, ModalDialogHost, ModalDialogParams} from "nativescript-angular/directives/dialogs";
+
+
+@Component({
+    selector: 'modal-content',
+    template: `
+    <StackLayout margin="24" horizontalAlignment="center" verticalAlignment="center">
+        <Label [text]="prompt"></Label>
+        <StackLayout orientation="horizontal" marginTop="12">
+            <Button text="ok" (tap)="close('OK')"></Button>
+            <Button text="cancel" (tap)="close('Cancel')"></Button>
+        </StackLayout>
+    </StackLayout>
+    `
+})
+class ModalContent {
+    public prompt: string;
+    constructor(private params: ModalDialogParams) {
+        this.prompt = params.context.message;
+    }
+
+    public close(res: string) {
+        this.params.closeCallback(res);
+    }
+}
+
+const TEMPLATE = `
+<GridLayout rows="*, auto" modal-dialog-host>
+    <Button text="show component" (tap)="showModal()"></Button>
+    
+    <Label [text]="'RESULT: ' + result" row="1" margin="12"></Label>
+</GridLayout>
+`;
+
+@Component({
+    selector: 'modal-test',
+    directives: [ModalDialogHost],
+    providers: [ModalDialogService],
+    template: TEMPLATE
+})
+export class ModalTest {
+    public result: string = "---";
+
+    constructor(private modal: ModalDialogService) { }
+
+    public showModal() {
+        const options: ModalDialogOptions = {
+            context: { message: "Hello from dialog!" },
+            fullscreen: true
+        };
+
+        this.modal.showModal(ModalContent, options).then((res: string) => {
+            this.result = res || "empty result";
+        })
+    }
+}
+
+@Component({
+    selector: 'modal-test-on-push',
+    directives: [ModalDialogHost],
+    providers: [ModalDialogService],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    template: TEMPLATE
+})
+export class ModalTestWithPushStrategy {
+    public result: string = "---";
+
+    constructor(private modal: ModalDialogService) { }
+
+    public showModal() {
+        const options: ModalDialogOptions = {
+            context: { message: "Hello from dialog (onPush)!" },
+            fullscreen: true
+        };
+
+        this.modal.showModal(ModalContent, options).then((res: string) => {
+            this.result = res || "empty result";
+        })
+    }
+}

package.json

@@ -6,7 +6,7 @@
 	"nativescript": {
 		"id": "org.nativescript.testsappng",
 		"tns-ios": {
-			"version": "2.0.0"
+			"version": "2.0.1"
 		},
 		"tns-android": {
 			"version": "2.1.0-2016-05-20-601"