Merge pull request #6669 from NativeScript/release-5.1.0

Release 5.1.0

CHANGELOG.md

@@ -1,3 +1,26 @@
+<a name="5.1.0"></a>
+# [5.1.0](https://github.com/NativeScript/NativeScript/compare/5.0.5...5.1.0) (2018-12-05)
+
+
+### Bug Fixes
+
+* **android-styling:** correctly detect if drawable uses ColorFilter ([#6342](https://github.com/NativeScript/NativeScript/issues/6342)) ([11d3884](https://github.com/NativeScript/NativeScript/commit/11d3884)), closes [#6341](https://github.com/NativeScript/NativeScript/issues/6341)
+* **listview:** incorrect layout when scroll ([#6656](https://github.com/NativeScript/NativeScript/issues/6656)) ([63be78a](https://github.com/NativeScript/NativeScript/commit/63be78a))
+* **modals:** regression with modals in angular ([#6655](https://github.com/NativeScript/NativeScript/issues/6655)) ([30df4d9](https://github.com/NativeScript/NativeScript/commit/30df4d9))
+* **searchbar:** isEnabled and isUserInteractionEnabled ([#6636](https://github.com/NativeScript/NativeScript/issues/6636)) ([25c99d8](https://github.com/NativeScript/NativeScript/commit/25c99d8))
+* **tests:** Sporadic failures after upgrade to WebKit 12.0 ([#6635](https://github.com/NativeScript/NativeScript/issues/6635)) ([65e3a19](https://github.com/NativeScript/NativeScript/commit/65e3a19))
+
+
+### Features
+
+* add hints options for username and password fields ([#6416](https://github.com/NativeScript/NativeScript/issues/6416)) ([c834181](https://github.com/NativeScript/NativeScript/commit/c834181))
+* **ActionBar:** apply text color when largeTitletextAttribute is set on iOS ([#6631](https://github.com/NativeScript/NativeScript/issues/6631)) ([b58dff0](https://github.com/NativeScript/NativeScript/commit/b58dff0))
+* **modals:** Enable modal dialog chaining in IOS ([#6637](https://github.com/NativeScript/NativeScript/issues/6637)) ([64bccb9](https://github.com/NativeScript/NativeScript/commit/64bccb9))
+* **scrollbar:** add isScrollEnabled property ([#6640](https://github.com/NativeScript/NativeScript/issues/6640)) ([ae0fa90](https://github.com/NativeScript/NativeScript/commit/ae0fa90))
+* **tabview:** add androidSwipeEnabled property ([#6652](https://github.com/NativeScript/NativeScript/issues/6652)) ([0b239d7](https://github.com/NativeScript/NativeScript/commit/0b239d7))
+
+
+
 <a name="5.0.5"></a>
 ## [5.0.5](https://github.com/NativeScript/NativeScript/compare/5.0.4...5.0.5) (2018-11-26)
 

CONTRIBUTING.md

@@ -177,7 +177,7 @@ module (usually named AppModule).
 ApplicationModule.
 All other NgModules in the app (both feature and lazy-loaded ones)
 should import the NativeScriptCommonModule instead.
-The behaviour is alligned with BrowserModule and CommonModule in web
+The behavior is aligned with BrowserModule and CommonModule in web
 Angular apps. angular.io/guide/ngmodule-faq#q-browser-vs-common-module
 Migration steps:
 In all NgModules, instead of the root one, replace:
@@ -211,43 +211,98 @@ If you want to contribute, but you are not sure where to start - look for [issue
 
 [commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
 
-## <a name="release"></a> Releasing new versions
 
+## <a name="release"></a> Releasing new versions
 Instructions how to release a new version for **NativeScript Core Team Members**.
 
-1. Execute `npm install` to install dependencies:
-```bash
-npm install
-```
+![](./release-contribution-guide-schema.png?raw=true)
 
-2. Add the following to your `.npmrc`:
-```
-tag-version-prefix=""
-message="release: cut the %s release"
-```
+### Here are the steps described in the diagram above.
 
-3. Create new branch based on `master`:
-```bash
-git checkout -b username/release-version
+1. Checkout release branch
+```
+git checkout release
+```
+2. Create a PR to cut the release:
+```
+git checkout -b release-version
+git push --set-upstream origin release-version
+```
+#### Merge master in release branch or cherry-pick commits. If the commits are in release branch **skip this step**.
+```
+git merge --ff-only origin/master or git cherry-pick commit-sha
+git push --set-upstream origin prep-release-version
+```
+3. Execute `npm i` to install dependencies:
+```
+npm i
 ```
-
 4. Execute [`npm version`](https://docs.npmjs.com/cli/version) to bump the version of `tns-platform-declarations`:
-```bash
+```
 cd tns-platform-declarations
-npm --no-git-tag-version version [patch|minor|major]
+npm --no-git-tag-version version [major|minor|patch] -m "release: cut the %s release"
 cd ..
 ```
 
-5. Execute [`npm version`](https://docs.npmjs.com/cli/version) to bump the version of `tns-core-modules`, tag the release and update the CHANGELOG.md:
-```bash
+5. Execute [`npm version`](https://docs.npmjs.com/cli/version) to bump the version of `tns-core-modules`, 
+tag the release and update the CHANGELOG.md.
+In case we need to publish release version we need simply to use npm version x.x.x-rc
+```
 cd tns-core-modules
-npm version [patch|minor|major]
+npm --no-git-tag-version version [major|minor|patch] -m "release: cut the %s release"
 cd ..
 ```
+6. Set correct version of **tns-core-modules-widgets** in tns-core-modules/package.json.
+Usually tns-core-modules-widgets should already have been released and we need to set the official version.
 
-6. Push all the changes to your branch and open a pull request:
-```bash
-git push --set-upstream origin username/release-version --tags
+7. Add changes
+```
+git add changed-files
+git commit -m "release: cut the %s release"
+git push
+```
+8. Create git tag
+```
+git tag release-version
+git push --tags
+```
+9. Merge PR into release branch.
+
+10. If all checks has passed publish package.
+
+## Merge changes from release into master
+
+![](./merge-guidance-schema.png)
+
+### Here are steps described in the diagram above.
+
+1. Make sure you are in release branch:
+```
+git checkout release
+git pull
+```
+2. Create PR to merge changes back in master and preserve history:
+```
+git checkout -b merge-release-in-master
+git push --set-upstream origin merge-release-in-master
+git merge origin/master
+```
+3. Resolve conflicts. Choose to keep the version of master branch. If it is needed to revert versions of modules, see at the bottom.
+
+4. Add conflicts:
+```
+git add resolved files
+```
+5. Commit changes with default merge message:
+```
+git commit
+git push
 ```
 
-7. Create `release` branch after the pull request is merged to `master` and publish the packages built on CI to `npm`.
+**If needed, revert version of modules and platform declarations to take the one from master:**
+```
+git checkout origin/master tns-platform-declarations/package.json tns-core-modules/package.json
+git commit --amend
+git push --force-with-lease
+```
+This will require to repeat steps from 1 to 4, since we need to keep the branches with the same history

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2015-2018 Telerik EAD
+   Copyright (c) 2015-2018 Progress Software Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

apps/app/ui-tests-app/issues/issue-ng-repo-1626.ts

@@ -0,0 +1,31 @@
+import { fromObject } from "tns-core-modules/data/observable";
+
+export function onLoaded(args) {
+    const page = args.object;
+    page.bindingContext = fromObject({
+        items: [
+            { id: 1, name: "Ter Stegen", role: "Goalkeeper" },
+            { id: 3, name: "Piqué", role: "Defender" },
+            { id: 4, name: "I. Rakitic", role: "Midfielder" },
+            { id: 5, name: "Sergio", role: "Midfielder" },
+            { id: 6, name: "Denis Suárez", role: "Midfielder\nSecond line for the sake of testing" },
+            { id: 7, name: "Arda", role: "Midfielder" },
+            { id: 8, name: "A. Iniesta", role: "Midfielder" },
+            { id: 9, name: "Suárez", role: "Forward" },
+            { id: 10, name: "Messi", role: "Forward" },
+            { id: 11, name: "Neymar", role: "Forward\nSecond line for the sake of testing" },
+            { id: 12, name: "Rafinha", role: "Midfielder\nSecond line for the sake of testing" },
+            { id: 13, name: "Cillessen", role: "Goalkeeper\nSecond line for the sake of testing" },
+            { id: 14, name: "Mascherano", role: "Defender" },
+            { id: 17, name: "Paco Alcácer", role: "Forward" },
+            { id: 18, name: "Jordi Alba", role: "Defender\nSecond line for the sake of testing" },
+            { id: 19, name: "Digne", role: "Defender" },
+            { id: 20, name: "Sergi Roberto", role: "Midfielder\nSecond line for the sake of testing" },
+            { id: 21, name: "André Gomes", role: "Midfielder\nSecond line for the sake of testing" },
+            { id: 22, name: "Aleix Vidal", role: "Midfielder" },
+            { id: 23, name: "Umtiti", role: "Defender" },
+            { id: 24, name: "Mathieu", role: "Defender" },
+            { id: 25, name: "Masip", role: "Goalkeeper" },
+        ]
+    });
+}

apps/app/ui-tests-app/issues/issue-ng-repo-1626.xml

@@ -0,0 +1,28 @@
+<Page loaded="onLoaded">
+    <ActionBar title="issue-ng-repo-1626"></ActionBar>
+
+    <StackLayout backgroundColor="red">
+        <ListView items="{{ items }}" class="list-group">
+            <ListView.itemTemplate>
+                <StackLayout>
+                    <StackLayout backgroundColor="gray">
+                        <Label text="{{ name }}" class="list-group-item"></Label>
+                        <Label text="{{ id }}" class="list-group-item"></Label>
+                    </StackLayout>
+                    <StackLayout backgroundColor="darkgray">
+                        <StackLayout backgroundColor="darkblue">
+                            <Label text="{{ role }}"></Label>
+                            <Label text="id is odd" visibility="{{ id%2 == 1 ? 'visible' : 'collapsed' }}"></Label>
+                        </StackLayout>
+                        <StackLayout backgroundColor="darkred">
+                            <Label text="{{ role }}"></Label>
+                            <Label text="id is odd" visibility="{{ id%2 == 1 ? 'visible' : 'collapsed' }}"></Label>
+                        </StackLayout>
+                        <Label text="{{ role }}"></Label>
+                        <Label text="id is odd" visibility="{{ id%2 == 1 ? 'visible' : 'collapsed' }}"></Label>
+                    </StackLayout>
+                </StackLayout>
+            </ListView.itemTemplate>
+        </ListView>
+    </StackLayout>
+</Page>

apps/app/ui-tests-app/issues/main-page.ts

@@ -28,6 +28,7 @@ export function loadExamples() {
     examples.set("4450", "issues/issue-4450");
     examples.set("5274", "issues/issue-5274");
     examples.set("ng-repo-1599", "issues/issue-ng-repo-1599");
+    examples.set("ng-repo-1626", "issues/issue-ng-repo-1626");
     examples.set("6439", "issues/issue-6439");
 
     return examples;

apps/app/ui-tests-app/modal-view/login-page.ts

@@ -1,32 +1,29 @@
-import * as pages from "tns-core-modules/ui/page";
-import * as textField from "tns-core-modules/ui/text-field";
-import * as observable from "tns-core-modules/data/observable";
+import { Page, ShownModallyData } from "tns-core-modules/ui/page";
+import { EventData, fromObject } from "tns-core-modules/data/observable";
 
-var context: any;
-var closeCallback: Function;
+export function onShowingModally(args: ShownModallyData) {
+    console.log("login-page.onShowingModally, context: " + args.context);
+    const page = <Page>args.object;
 
-var page: pages.Page;
-var usernameTextField: textField.TextField;
-var passwordTextField: textField.TextField;
-
-export function onShownModally(args: pages.ShownModallyData) {
-    console.log("login-page.onShownModally, context: " + args.context);
-    context = args.context;
-    closeCallback = args.closeCallback;
+    page.bindingContext = fromObject({
+        username: "username",
+        password: "password",
+        context: args.context,
+        onLoginButtonTap: function() {
+            console.log("login-page.onLoginButtonTap");
+            args.closeCallback(this.username, this.password);
+        }
+    })
 }
 
-export function onLoaded(args: observable.EventData) {
+export function onShownModally(args: ShownModallyData) {
+    console.log("login-page.onShownModally, context: " + args.context);
+}
+
+export function onLoaded(args: EventData) {
     console.log("login-page.onLoaded");
-    page = <pages.Page>args.object;
-    usernameTextField = page.getViewById<textField.TextField>("username");
-    passwordTextField = page.getViewById<textField.TextField>("password");
 }
 
 export function onUnloaded() {
     console.log("login-page.onUnloaded");
 }
-
-export function onLoginButtonTap() {
-    console.log("login-page.onLoginButtonTap");
-    closeCallback(usernameTextField.text, passwordTextField.text);
-}

apps/app/ui-tests-app/modal-view/login-page.xml

@@ -1,8 +1,11 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" shownModally="onShownModally" 
+<Page xmlns="http://schemas.nativescript.org/tns.xsd"  
+  showingModally="onShowingModally"
+  shownModally="onShownModally" 
   loaded="onLoaded" unloaded="onUnloaded" backgroundColor="Red">
   <StackLayout backgroundColor="PaleGreen" margin="10">
-    <TextField hint="username" id="username" text="username"/>
-    <TextField hint="password" id="password" text="password" secure="true"/>
-    <Button text="Login" tap="onLoginButtonTap"/>
+    <Label text="{{ context }}"/>
+    <TextField hint="username" text="{{ username }}"/>
+    <TextField hint="password" text="{{ password }}" secure="true"/>
+    <Button text="Login" tap="{{ onLoginButtonTap }}"/>
   </StackLayout>
 </Page>

apps/app/ui-tests-app/modal-view/modal-view.ts

@@ -16,9 +16,39 @@ export function onTapStretched(args) {
     const label = page.getViewById<Label>("label");
     var fullscreen = false;
     var stretched = true;
-    
+
     page.showModal("ui-tests-app/modal-view/login-page", "context", function (username: string, password: string) {
         console.log(username + "/" + password);
         label.text = username + "/" + password;
     }, fullscreen, false, stretched);
 }
+
+function openModal(page: Page, label: Label, context: string) {
+    page.showModal("ui-tests-app/modal-view/login-page", context, function (username: string, password: string) {
+        const result = context + "/" + username + "/" + password;
+        console.log(result);
+        label.text = result;
+    }, false);
+}
+
+export function onTapSecondModalInCB(args) {
+    const page = <Page>args.object.page;
+    const label = page.getViewById<Label>("label");
+    page.showModal("ui-tests-app/modal-view/login-page", "First", function (username: string, password: string) {
+        const result = "First/" + username + "/" + password;
+        console.log(result);
+        label.text = result;
+
+        // Open second modal in the close callback of the first one.
+        openModal(page, label, "Second");
+    });
+}
+
+export function onTapSecondModalInTimer(args) {
+    const page = <Page>args.object.page;
+    const label = page.getViewById<Label>("label");
+    openModal(page, label, "First");
+
+    // Open second modal 1s after the first one.
+    setTimeout(() => openModal(page, label, "Second"), 1000);
+}

apps/app/ui-tests-app/modal-view/modal-view.xml

@@ -3,6 +3,10 @@
     <Button text="Login (pop-up)" tap="onTap" />
     <Button text="Login (full-screen)" tap="onTap" />
     <Button text="Login (pop-up-stretched)" tap="onTapStretched" />
+
+    <Button text="Login (second modal in cb)" tap="onTapSecondModalInCB" />
+    <Button text="Login (second modal in timer)" tap="onTapSecondModalInTimer" />
+
     <Label id="label" text="Anonymous"/>
   </StackLayout>
 </Page>

apps/app/ui-tests-app/tab-view/main-page.ts

@@ -24,6 +24,7 @@ export function loadExamples() {
     examples.set("tab-view-bottom-position", "tab-view/tab-view-bottom-position");
     examples.set("issue-5470", "tab-view/issue-5470");
     examples.set("tab-view-tab-text-font-size", "tab-view/tab-view-tab-text-font-size");
+    examples.set("tab-view-android-swipe", "tab-view/tab-view-android-swipe");
     examples.set("tab-view-icon-title-placement", "tab-view/icon-title-placement");
     return examples;
 }

apps/app/ui-tests-app/tab-view/tab-view-android-swipe.xml

@@ -0,0 +1,24 @@
+<Page cssFile="~/ui-tests-app/css/test.css" loaded="onLoaded">
+  <TabView androidSwipeEnabled="false">
+    <TabView.items>
+
+      <TabViewItem title="Tab 1">
+        <TabViewItem.view>
+          <Label text="Label 1" />
+        </TabViewItem.view>
+      </TabViewItem>
+
+      <TabViewItem title="Tab 2">
+        <TabViewItem.view>
+          <Label text="Label 2" />
+        </TabViewItem.view>
+      </TabViewItem>
+
+      <TabViewItem title="Tab 3">
+        <TabViewItem.view>
+          <Label text="Label 3" />
+        </TabViewItem.view>
+      </TabViewItem>
+    </TabView.items>
+  </TabView>
+</Page>

e2e/nested-frame-navigation/.gitignore

@@ -0,0 +1 @@
+.vscode/settings.json

e2e/nested-frame-navigation/.vscode/launch.json

@@ -0,0 +1,100 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Tests on Android",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "args": [
+                "-u",
+                "tdd",
+                "--timeout",
+                "999999",
+                "--colors",
+                // "${workspaceFolder}/test",
+                "--opts",
+                "./e2e/config/mocha.opts",
+                "--runType",
+                "android23",
+                "--reuseDevice",
+                "--verbose"
+            ],
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Tests on iOS",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "args": [
+                "-u",
+                "tdd",
+                "--timeout",
+                "999999",
+                "--colors",
+                // "${workspaceFolder}/test",
+                "--opts",
+                "./e2e/config/mocha.opts",
+                "--runType",
+                "sim.iPhoneX.iOS112",
+                "--reuseDevice",
+                "--verbose"
+            ],
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": "Launch on iOS",
+            "type": "nativescript",
+            "request": "launch",
+            "platform": "ios",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "stopOnEntry": false,
+            "tnsArgs": [
+                "--syncAllFiles"
+            ],
+            "watch": true
+        },
+        {
+            "name": "Attach on iOS",
+            "type": "nativescript",
+            "request": "attach",
+            "platform": "ios",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "tnsArgs": [
+                "--syncAllFiles"
+            ],
+            "watch": false
+        },
+        {
+            "name": "Launch on Android",
+            "type": "nativescript",
+            "request": "launch",
+            "platform": "android",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "stopOnEntry": false,
+            "tnsArgs": [
+                "--syncAllFiles"
+            ],
+            "watch": true
+        },
+        {
+            "name": "Attach on Android",
+            "type": "nativescript",
+            "request": "attach",
+            "platform": "android",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "tnsArgs": [
+                "--syncAllFiles"
+            ],
+            "watch": false
+        }
+    ]
+}

e2e/nested-frame-navigation/README.md

@@ -0,0 +1,14 @@
+Execute Tests
+=============
+
+Android:
+
+```
+npm run e2e -- --runType android23 # --devMode
+```
+
+iOS:
+
+```
+npm run e2e -- --runType sim.iPhoneX.iOS112 # --devMode
+```

e2e/nested-frame-navigation/app/App_Resources/Android/AndroidManifest.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="__PACKAGE__"
+	android:versionCode="1"
+	android:versionName="1.0">
+
+	<supports-screens
+		android:smallScreens="true"
+		android:normalScreens="true"
+		android:largeScreens="true"
+		android:xlargeScreens="true"/>
+
+	<uses-sdk
+		android:minSdkVersion="17"
+		android:targetSdkVersion="__APILEVEL__"/>
+
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.INTERNET"/>
+
+	<application
+		android:name="com.tns.NativeScriptApplication"
+		android:allowBackup="true"
+		android:icon="@drawable/icon"
+		android:label="@string/app_name"
+		android:theme="@style/AppTheme">
+
+		<activity
+			android:name="com.tns.NativeScriptActivity"
+			android:label="@string/title_activity_kimera"
+			android:configChanges="keyboardHidden|orientation|screenSize"
+			android:theme="@style/LaunchScreenTheme">
+
+			<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
+
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+		</activity>
+		<activity android:name="com.tns.ErrorReportActivity"/>
+	</application>
+</manifest>

e2e/nested-frame-navigation/app/App_Resources/Android/app.gradle

@@ -0,0 +1,16 @@
+// Add your native dependencies here:
+
+// Uncomment to add recyclerview-v7 dependency
+//dependencies {
+//	compile 'com.android.support:recyclerview-v7:+'
+//}
+
+android {  
+  defaultConfig {  
+    generatedDensities = []
+    applicationId = "org.nativescript.nestedframenavigation"
+  }  
+  aaptOptions {  
+    additionalParameters "--no-version-vectors"  
+  }  
+} 

e2e/nested-frame-navigation/app/App_Resources/Android/drawable-nodpi/splash_screen.xml

@@ -0,0 +1,8 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="fill">
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background" />
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/logo" />
+    </item>
+</layer-list>

e2e/nested-frame-navigation/app/App_Resources/Android/values-v21/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<color name="ns_accent">#3d5afe</color>
+</resources>

e2e/nested-frame-navigation/app/App_Resources/Android/values-v21/styles.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Application theme -->
+    <style name="AppTheme" parent="AppThemeBase">
+        <item name="android:datePickerStyle">@style/SpinnerDatePicker</item>
+        <item name="android:timePickerStyle">@style/SpinnerTimePicker</item>
+    </style>
+
+    <!-- Default style for DatePicker - in spinner mode -->
+    <style name="SpinnerDatePicker" parent="android:Widget.Material.Light.DatePicker">
+        <item name="android:datePickerMode">spinner</item>
+    </style>
+
+    <!-- Default style for TimePicker - in spinner mode -->
+    <style name="SpinnerTimePicker" parent="android:Widget.Material.Light.TimePicker">
+        <item name="android:timePickerMode">spinner</item>
+    </style>
+
+    <style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
+        <item name="android:elevation">4dp</item>
+    </style>    
+</resources>

e2e/nested-frame-navigation/app/App_Resources/Android/values/colors.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ns_primary">#F5F5F5</color>
+	<color name="ns_primaryDark">#757575</color>
+	<color name="ns_accent">#33B5E5</color>
+    <color name="ns_blue">#272734</color>
+</resources>

e2e/nested-frame-navigation/app/App_Resources/Android/values/styles.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- theme to use FOR launch screen-->
+    <style name="LaunchScreenThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
+
+        <item name="colorPrimary">@color/ns_primary</item>
+        <item name="colorPrimaryDark">@color/ns_primaryDark</item>
+        <item name="colorAccent">@color/ns_accent</item>
+
+        <item name="android:windowBackground">@drawable/splash_screen</item>
+        
+        <item name="android:windowActionBarOverlay">true</item>  
+        <item name="android:windowTranslucentStatus">true</item>
+
+    </style>
+
+    <style name="LaunchScreenTheme" parent="LaunchScreenThemeBase">
+    </style>
+
+    <!-- theme to use AFTER launch screen is loaded-->
+    <style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
+
+        <item name="colorPrimary">@color/ns_primary</item>
+        <item name="colorPrimaryDark">@color/ns_primaryDark</item>
+        <item name="colorAccent">@color/ns_accent</item>
+
+    </style>
+
+    <style name="AppTheme" parent="AppThemeBase">
+    </style>
+
+    <!-- theme for action-bar -->
+    <style name="NativeScriptToolbarStyleBase" parent="Widget.AppCompat.Toolbar">
+        <item name="android:background">@color/ns_primary</item>
+        <item name="theme">@style/ThemeOverlay.AppCompat.ActionBar</item>
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat</item>
+
+    </style>
+
+    <style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
+    </style>
+</resources> 

e2e/nested-frame-navigation/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "icon-29.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "icon-29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "icon-29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "icon-40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "icon-40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "icon-60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "icon-60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "icon-29.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "icon-29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "icon-40.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "icon-40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "icon-76.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "icon-76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "icon-83.5@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "icon-1024.png",
+      "scale" : "1x"
+    } 
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

e2e/nested-frame-navigation/app/App_Resources/iOS/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

e2e/nested-frame-navigation/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json

@@ -0,0 +1,176 @@
+{
+  "images" : [
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "2436h",
+      "filename" : "Default-1125h.png",
+      "minimum-system-version" : "11.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "iphone",
+      "extent" : "full-screen",
+      "filename" : "Default-Landscape-X.png",
+      "minimum-system-version" : "11.0",
+      "subtype" : "2436h",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "736h",
+      "filename" : "Default-736h@3x.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "736h",
+      "filename" : "Default-Landscape@3x.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "landscape",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "667h",
+      "filename" : "Default-667h@2x.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default@2x.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "filename" : "Default-568h@2x.png",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "filename" : "Default-Portrait.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "filename" : "Default-Landscape.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "filename" : "Default-Portrait@2x.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "filename" : "Default-Landscape@2x.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default.png",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default@2x.png",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "Default-568h@2x.png",
+      "extent" : "full-screen",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "filename" : "Default-Portrait.png",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "filename" : "Default-Landscape.png",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "filename" : "Default-Portrait@2x.png",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "to-status-bar",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "filename" : "Default-Landscape@2x.png",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

e2e/nested-frame-navigation/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchScreen-AspectFill.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchScreen-AspectFill@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

e2e/nested-frame-navigation/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchScreen-Center.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchScreen-Center@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

e2e/nested-frame-navigation/app/App_Resources/iOS/Info.plist

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiresFullScreen</key>
+	<true/>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

e2e/nested-frame-navigation/app/App_Resources/iOS/LaunchScreen.storyboard

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina5_9" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
+                        <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchScreen.AspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="wtH-rr-YfP">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                            </imageView>
+                            <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchScreen.Center" translatesAutoresizingMaskIntoConstraints="NO" id="s1z-aa-wYv">
+                                <rect key="frame" x="0.0" y="150" width="375" height="512"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="s1z-aa-wYv" secondAttribute="trailing" id="4Rf-kf-vql"/>
+                            <constraint firstAttribute="bottom" secondItem="wtH-rr-YfP" secondAttribute="bottom" id="5CS-At-4ka"/>
+                            <constraint firstItem="wtH-rr-YfP" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="Awn-b8-xf1"/>
+                            <constraint firstItem="s1z-aa-wYv" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="BpJ-vb-eKA"/>
+                            <constraint firstItem="s1z-aa-wYv" firstAttribute="trailing" secondItem="wtH-rr-YfP" secondAttribute="trailing" id="QIM-7J-OZz"/>
+                            <constraint firstAttribute="trailing" secondItem="wtH-rr-YfP" secondAttribute="trailing" id="RXg-rW-UK8"/>
+                            <constraint firstItem="s1z-aa-wYv" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="Rcp-LG-48z"/>
+                            <constraint firstItem="wtH-rr-YfP" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="cch-8E-tYu"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="509.60000000000002" y="237.93103448275863"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="LaunchScreen.AspectFill" width="768" height="1024"/>
+        <image name="LaunchScreen.Center" width="384" height="512"/>
+    </resources>
+</document>

e2e/nested-frame-navigation/app/App_Resources/iOS/build.xcconfig

@@ -0,0 +1,7 @@
+// You can add custom settings here
+// for example you can uncomment the following line to force distribution code signing
+// CODE_SIGN_IDENTITY = iPhone Distribution 
+// To build for device with XCode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
+// DEVELOPMENT_TEAM = YOUR_TEAM_ID;
+ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;

e2e/nested-frame-navigation/app/app-root.xml

@@ -0,0 +1 @@
+<Frame defaultPage="home/home-page" />

e2e/nested-frame-navigation/app/app.android.css

@@ -0,0 +1,35 @@
+Button {
+    font-size: 8;
+    padding-left: 5;
+    padding-right: 5;
+    padding-top: 0;
+    padding-bottom: 0;
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-right: 0;
+    height: 50px;
+    color: blue;
+}
+
+TextView {
+    font-size: 10;
+    margin: 0;
+    padding: 0;
+    color: green;
+}
+
+Label {
+    font-size: 10;
+    margin: 0;
+    padding: 0;
+}
+
+GridLayout {
+    margin: 0;
+    padding: 0;
+}
+
+ActionBar {
+    height: 30;
+    margin: 0;
+}

e2e/nested-frame-navigation/app/app.ios.css

@@ -0,0 +1,7 @@
+Button{
+    color: blue;
+}
+
+TextView{
+    color: green;
+}

e2e/nested-frame-navigation/app/app.ts

@@ -0,0 +1,5 @@
+import * as application from "tns-core-modules/application";
+
+application.run({ moduleName: "app-root" });
+// application.run({ moduleName: "tab-root" });
+// application.run({ moduleName: "layout-root" });

e2e/nested-frame-navigation/app/frame-root/frame-home-page.ts

@@ -0,0 +1,46 @@
+import { EventData } from "tns-core-modules/ui/page";
+import { Button } from "tns-core-modules/ui/button";
+
+export function onNavigate(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate("some-page/some-page");
+}
+
+export function onNavigateNone(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate({
+        moduleName: "some-page/some-page",
+        animated: false
+    });
+}
+
+export function onNavigateSlide(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate({
+        moduleName: "some-page/some-page",
+        animated: true,
+        transition: {
+            name: "slide",
+            duration: 380,
+            curve: "easeIn"
+        }
+    });
+}
+
+export function onNavigateFlip(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate({
+        moduleName: "some-page/some-page",
+        animated: true,
+        transition: {
+            name: "flip",
+            duration: 380,
+            curve: "easeIn"
+        }
+    });
+}
+
+export function onBackButtonTap(args: EventData): void {
+    const button = <Button>args.object;
+    button.page.frame.goBack();
+}

e2e/nested-frame-navigation/app/frame-root/frame-home-page.xml

@@ -0,0 +1,21 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
+
+    <ActionBar class="action-bar">
+        <NavigationButton text="frameHomeBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
+        <Label class="action-bar-title" text="frame home page" horizontalAlignment="center" />
+    </ActionBar>
+
+    <GridLayout rows="auto, *">
+        <StackLayout>
+            <Button text="navigate to some page (default transition)" tap="onNavigate" />
+            <Button text="navigate to some page (no transition)" tap="onNavigateNone" />
+            <Button text="navigate to some page (slide transition)" tap="onNavigateSlide" />
+            <Button text="navigate to some page (flip transition)" tap="onNavigateFlip" />
+        </StackLayout>
+
+        <GridLayout row="1">
+            <Frame defaultPage="players/players-items-page" />
+        </GridLayout>
+    </GridLayout>
+
+</Page>

e2e/nested-frame-navigation/app/frame-root/frame-multi-home-page.xml

@@ -0,0 +1,24 @@
+<Page codeFile="~/frame-root/frame-home-page" xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
+
+    <ActionBar class="action-bar">
+        <NavigationButton text="frameHomeBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
+        <Label class="action-bar-title" text="multi frame home page" horizontalAlignment="center" />
+    </ActionBar>
+
+    <GridLayout rows="auto, *, *">
+        <StackLayout>
+            <Button text="navigate to some page (default transition)" tap="onNavigate" />
+            <Button text="navigate to some page (no transition)" tap="onNavigateNone" />
+            <Button text="navigate to some page (slide transition)" tap="onNavigateSlide" />
+            <Button text="navigate to some page (flip transition)" tap="onNavigateFlip" />
+        </StackLayout>
+
+        <GridLayout row="1">
+            <Frame defaultPage="players/players-items-page" />
+        </GridLayout>
+        <GridLayout row="2">
+            <Frame defaultPage="teams/teams-items-page" />
+        </GridLayout>
+    </GridLayout>
+
+</Page>

e2e/nested-frame-navigation/app/home/home-page.ts

@@ -0,0 +1,39 @@
+import * as application from "tns-core-modules/application";
+import { EventData } from "tns-core-modules/ui/core/view";
+import { Button } from "tns-core-modules/ui/button";
+
+export function onNavigateToLayoutFrame(args: EventData) {
+    application._resetRootView({ moduleName: "layout-root/layout-root-frame" });
+}
+
+export function onNavigateToLayoutMultiFrame(args: EventData) {
+    application._resetRootView({ moduleName: "layout-root/layout-root-multi-frame" });
+}
+
+export function onNavigateToPageFrame(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate("frame-root/frame-home-page");
+}
+
+export function onNavigateToPageMultiFrame(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate("frame-root/frame-multi-home-page");
+}
+
+export function onNavigateToTabsTopPage(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate("tab-page/tabs-top-page");
+}
+
+export function onNavigateToTabsBottomPage(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate("tab-page/tabs-bottom-page");
+}
+
+export function onNavigateToTabsTopRoot(args: EventData) {
+    application._resetRootView({ moduleName: "tab-root/tab-root-top" });
+}
+
+export function onNavigateToTabsBottomRoot(args: EventData) {
+    application._resetRootView({ moduleName: "tab-root/tab-root-bottom" });
+}

e2e/nested-frame-navigation/app/home/home-page.xml

@@ -0,0 +1,19 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
+
+    <ActionBar class="action-bar" height="5%">
+        <Label class="action-bar-title" text="Home" />
+    </ActionBar>
+
+    <GridLayout rows="auto">
+        <StackLayout id="home-page" borderColor="yellowgreen" borderWidth="1" borderRadius="5" padding="2">
+            <Button text="Layout w/ frame" tap="onNavigateToLayoutFrame" />
+            <Button text="Layout w/ multi frame" tap="onNavigateToLayoutMultiFrame" />
+            <Button text="Page w/ frame" tap="onNavigateToPageFrame" />
+            <Button text="Page w/ multi frame" tap="onNavigateToPageMultiFrame" />
+            <Button ios:visibility="collapsed" text="Page w/ tabs (top)" tap="onNavigateToTabsTopPage" />
+            <Button text="Page w/ tabs (bottom)" tap="onNavigateToTabsBottomPage" />
+            <Button ios:visibility="collapsed" text="Root tabs (top)" tap="onNavigateToTabsTopRoot" />
+            <Button text="Root tabs (bottom)" tap="onNavigateToTabsBottomRoot" />
+        </StackLayout>
+    </GridLayout>
+</Page>

e2e/nested-frame-navigation/app/layout-root/layout-home-page.ts

@@ -0,0 +1,41 @@
+import { EventData } from "tns-core-modules/ui/page";
+import { Button } from "tns-core-modules/ui/button";
+
+export function onNavigate(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate("some-page/some-page");
+}
+
+export function onNavigateNone(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate({
+        moduleName: "some-page/some-page",
+        animated: false
+    });
+}
+
+export function onNavigateSlide(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate({
+        moduleName: "some-page/some-page",
+        animated: true,
+        transition: {
+            name: "slide",
+            duration: 380,
+            curve: "easeIn"
+        }
+    });
+}
+
+export function onNavigateFlip(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate({
+        moduleName: "some-page/some-page",
+        animated: true,
+        transition: {
+            name: "flip",
+            duration: 380,
+            curve: "easeIn"
+        }
+    });
+}

e2e/nested-frame-navigation/app/layout-root/layout-home-page.xml

@@ -0,0 +1,20 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
+
+    <ActionBar class="action-bar">
+        <Label class="action-bar-title" text="layout home page" horizontalAlignment="center" />
+    </ActionBar>
+
+    <GridLayout rows="auto, *">
+        <StackLayout>
+            <Button text="navigate to some page (default transition)" tap="onNavigate" />
+            <Button text="navigate to some page (no transition)" tap="onNavigateNone" />
+            <Button text="navigate to some page (slide transition)" tap="onNavigateSlide" />
+            <Button text="navigate to some page (flip transition)" tap="onNavigateFlip" />
+        </StackLayout>
+        
+        <GridLayout row="1">
+            <Frame defaultPage="players/players-items-page" />
+        </GridLayout>
+    </GridLayout>
+
+</Page>

e2e/nested-frame-navigation/app/layout-root/layout-home-secondary-page.ts

@@ -0,0 +1,41 @@
+import { EventData } from "tns-core-modules/ui/page";
+import { Button } from "tns-core-modules/ui/button";
+
+export function onNavigate(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate("other-page/other-page");
+}
+
+export function onNavigateNone(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate({
+        moduleName: "other-page/other-page",
+        animated: false
+    });
+}
+
+export function onNavigateSlide(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate({
+        moduleName: "other-page/other-page",
+        animated: true,
+        transition: {
+            name: "slide",
+            duration: 380,
+            curve: "easeIn"
+        }
+    });
+}
+
+export function onNavigateFlip(args: EventData) {
+    const button = <Button>args.object;
+    button.page.frame.navigate({
+        moduleName: "other-page/other-page",
+        animated: true,
+        transition: {
+            name: "flip",
+            duration: 380,
+            curve: "easeIn"
+        }
+    });
+}

e2e/nested-frame-navigation/app/layout-root/layout-home-secondary-page.xml

@@ -0,0 +1,20 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
+
+    <ActionBar class="action-bar">
+        <Label class="action-bar-title" text="layout home secondary page" horizontalAlignment="center" />
+    </ActionBar>
+
+    <GridLayout rows="auto, *">
+        <StackLayout>
+            <Button text="navigate to other page (default transition)" tap="onNavigate" />
+            <Button text="navigate to other page (no transition)" tap="onNavigateNone" />
+            <Button text="navigate to other page (slide transition)" tap="onNavigateSlide" />
+            <Button text="navigate to other page (flip transition)" tap="onNavigateFlip" />
+        </StackLayout>
+
+        <GridLayout row="1">
+            <Frame defaultPage="teams/teams-items-page" />
+        </GridLayout>
+    </GridLayout>
+
+</Page>

e2e/nested-frame-navigation/app/layout-root/layout-root-frame.ts

@@ -0,0 +1,5 @@
+import * as application from "tns-core-modules/application";
+
+export function onReset() {
+    application._resetRootView({ moduleName: "app-root" });
+}

e2e/nested-frame-navigation/app/layout-root/layout-root-frame.xml

@@ -0,0 +1,6 @@
+<GridLayout rows="auto, *">
+    <Button text="reset app" tap="onReset" />
+    <GridLayout row="1">
+        <Frame defaultPage="layout-root/layout-home-page" />
+    </GridLayout>
+</GridLayout>

e2e/nested-frame-navigation/app/layout-root/layout-root-multi-frame.xml

@@ -0,0 +1,9 @@
+<GridLayout codeFile="~/layout-root/layout-root-frame" rows="auto, *, *">
+    <Button text="reset app" tap="onReset" />
+    <GridLayout row="1">
+        <Frame defaultPage="layout-root/layout-home-page" />
+    </GridLayout>
+    <GridLayout row="2">
+        <Frame defaultPage="layout-root/layout-home-secondary-page" />
+    </GridLayout>
+</GridLayout>

e2e/nested-frame-navigation/app/other-page/other-page.ts

@@ -0,0 +1,7 @@
+import { EventData } from "tns-core-modules/ui/page";
+import { Button } from "tns-core-modules/ui/button";
+
+export function onBackButtonTap(args: EventData): void {
+    const button = <Button>args.object;
+    button.page.frame.goBack();
+}

e2e/nested-frame-navigation/app/other-page/other-page.xml

@@ -0,0 +1,12 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
+
+    <ActionBar class="action-bar">
+        <NavigationButton text="otherPageBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
+        <Label class="action-bar-title" text="other page" />
+    </ActionBar>
+
+    <GridLayout>
+
+    </GridLayout>
+
+</Page>

e2e/nested-frame-navigation/app/package.json

@@ -0,0 +1,8 @@
+{
+  "android": {
+    "v8Flags": "--expose_gc"
+  },
+  "main": "app.js",
+  "name": "tns-template-hello-world-ts",
+  "version": "3.4.0"
+}

e2e/nested-frame-navigation/app/players/player-item-detail/player-item-detail-page.ts

@@ -0,0 +1,14 @@
+import { EventData, View } from "tns-core-modules/ui/core/view";
+import { NavigatedData, Page } from "tns-core-modules/ui/page";
+import { Item } from "../../shared/item";
+
+export function onNavigatingTo(args: NavigatedData) {
+    const page = args.object as Page;
+    const item = args.context as Item;
+    page.bindingContext = item;
+}
+
+export function onBackButtonTap(args: EventData) {
+    const view = args.object as View;
+    view.page.frame.goBack();
+}

e2e/nested-frame-navigation/app/players/player-item-detail/player-item-detail-page.xml

@@ -0,0 +1,12 @@
+<Page class="page" navigatingTo="onNavigatingTo" xmlns="http://schemas.nativescript.org/tns.xsd">
+
+    <ActionBar class="action-bar">
+        <NavigationButton text="playerBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back"/>
+        <Label class="action-bar-title" text="{{ name }}"></Label>
+    </ActionBar>
+
+    <GridLayout>
+        <Label class="m-10 h3" verticalAlignment="top" text="{{ description }}"></Label>
+    </GridLayout>
+
+</Page>

e2e/nested-frame-navigation/app/players/players-items-page.ts

@@ -0,0 +1,55 @@
+
+import { View } from "tns-core-modules/ui/core/view";
+import { ItemEventData } from "tns-core-modules/ui/list-view";
+import { NavigatedData, Page } from "tns-core-modules/ui/page";
+import { NavigationEntry } from "tns-core-modules/ui/frame";
+
+import { ItemsViewModel } from "../shared/items-view-model";
+import { Item } from "../shared/item";
+
+export function onNavigatingTo(args: NavigatedData) {
+    const page = <Page>args.object;
+    page.bindingContext = new ItemsViewModel(new Array<Item>(
+        { id: 1, name: "Player One (default transition)", description: "Goalkeeper", transition: "default" },
+        { id: 2, name: "Player Two (default transition)", description: "Defender", transition: "default" },
+        { id: 3, name: "Player One (no transition)", description: "Goalkeeper", transition: "none" },
+        { id: 4, name: "Player Two (no transition)", description: "Defender", transition: "none" },
+        { id: 5, name: "Player One (slide transition)", description: "Goalkeeper", transition: "slide" },
+        { id: 6, name: "Player Two (slide transition)", description: "Defender", transition: "slide" },
+        { id: 7, name: "Player One (flip transition)", description: "Goalkeeper", transition: "flip" },
+        { id: 8, name: "Player Two (flip transition)", description: "Defender", transition: "flip" }
+    ));
+}
+
+export function onItemTap(args: ItemEventData) {
+    const view = <View>args.view;
+    const page = <Page>view.page;
+    const tappedItem = <Item>view.bindingContext;
+
+    const entry: NavigationEntry = {
+        moduleName: "players/player-item-detail/player-item-detail-page",
+        context: tappedItem
+    };
+
+    switch (tappedItem.transition) {
+        case "none":
+            entry.animated = false;
+            break;
+        case "slide":
+            entry.transition = {
+                name: "slide",
+                duration: 380,
+                curve: "easeIn"
+            };
+            break;
+        case "flip":
+            entry.transition = {
+                name: "flip",
+                duration: 380,
+                curve: "easeIn"
+            };
+            break;
+    }
+
+    page.frame.navigate(entry);
+}

e2e/nested-frame-navigation/app/players/players-items-page.xml

@@ -0,0 +1,14 @@
+<Page class="page" navigatingTo="onNavigatingTo" xmlns="http://schemas.nativescript.org/tns.xsd">
+
+    <ActionBar class="action-bar">
+        <Label class="action-bar-title" text="Players"></Label>
+    </ActionBar>
+
+    <ListView items="{{ items }}" itemTap="onItemTap" class="list-group">
+        <ListView.itemTemplate>
+            <StackLayout orientation="horizontal" class="list-group-item">
+                <Label text="{{ name }}" textWrap="true"></Label>
+            </StackLayout>
+        </ListView.itemTemplate>
+    </ListView>
+</Page>