From 726a4d133a80368e8b29761cdb40076badb74945 Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Fri, 28 Jun 2019 17:58:20 +0300 Subject: [PATCH 01/28] chore: bump widgets to 6.0.0 in core modules (#7421) --- tns-core-modules/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tns-core-modules/package.json b/tns-core-modules/package.json index 76b70b72f..8117eeb7b 100644 --- a/tns-core-modules/package.json +++ b/tns-core-modules/package.json @@ -26,7 +26,7 @@ "license": "Apache-2.0", "typings": "tns-core-modules.d.ts", "dependencies": { - "tns-core-modules-widgets": "next", + "tns-core-modules-widgets": "6.0.0", "tslib": "^1.9.3" }, "devDependencies": { From ad544450830d9ba85ded57b26c65bd3de413f0b0 Mon Sep 17 00:00:00 2001 From: Manol Donev Date: Mon, 1 Jul 2019 16:48:33 +0300 Subject: [PATCH 02/28] chore(e2e): add tabs & bottom nav test scenarios (#7434) --- .../bottom-navigation-page.ts} | 0 .../bottom-navigation-page.xml | 36 +++++++++++++++ .../bottom-navigation-root.ts | 5 ++ .../bottom-navigation-root.xml | 27 +++++++++++ .../app/home/home-page.ts | 35 ++++++++++++-- .../app/home/home-page.xml | 6 +++ .../{tabs-top-page.ts => tab-bottom-page.ts} | 0 ...bs-bottom-page.xml => tab-bottom-page.xml} | 2 +- .../app/tab-page/tab-top-page.ts | 46 +++++++++++++++++++ .../{tabs-top-page.xml => tab-top-page.xml} | 2 +- .../app/tab-root/tab-bottom-root.xml | 2 +- .../app/tab-root/tab-top-root.xml | 2 +- .../app/tabs-page/tabs-bottom-page.ts | 46 +++++++++++++++++++ .../app/tabs-page/tabs-bottom-page.xml | 36 +++++++++++++++ .../app/tabs-page/tabs-top-page.ts | 46 +++++++++++++++++++ .../app/tabs-page/tabs-top-page.xml | 36 +++++++++++++++ .../app/tabs-root/tabs-bottom-root.ts | 5 ++ .../app/tabs-root/tabs-bottom-root.xml | 27 +++++++++++ .../app/tabs-root/tabs-top-root.ts | 5 ++ .../app/tabs-root/tabs-top-root.xml | 27 +++++++++++ e2e/nested-frame-navigation/e2e/screen.ts | 16 +++---- 21 files changed, 391 insertions(+), 16 deletions(-) rename e2e/nested-frame-navigation/app/{tab-page/tabs-bottom-page.ts => bottom-navigation-page/bottom-navigation-page.ts} (100%) create mode 100644 e2e/nested-frame-navigation/app/bottom-navigation-page/bottom-navigation-page.xml create mode 100644 e2e/nested-frame-navigation/app/bottom-navigation-root/bottom-navigation-root.ts create mode 100644 e2e/nested-frame-navigation/app/bottom-navigation-root/bottom-navigation-root.xml rename e2e/nested-frame-navigation/app/tab-page/{tabs-top-page.ts => tab-bottom-page.ts} (100%) rename e2e/nested-frame-navigation/app/tab-page/{tabs-bottom-page.xml => tab-bottom-page.xml} (92%) create mode 100644 e2e/nested-frame-navigation/app/tab-page/tab-top-page.ts rename e2e/nested-frame-navigation/app/tab-page/{tabs-top-page.xml => tab-top-page.xml} (92%) create mode 100644 e2e/nested-frame-navigation/app/tabs-page/tabs-bottom-page.ts create mode 100644 e2e/nested-frame-navigation/app/tabs-page/tabs-bottom-page.xml create mode 100644 e2e/nested-frame-navigation/app/tabs-page/tabs-top-page.ts create mode 100644 e2e/nested-frame-navigation/app/tabs-page/tabs-top-page.xml create mode 100644 e2e/nested-frame-navigation/app/tabs-root/tabs-bottom-root.ts create mode 100644 e2e/nested-frame-navigation/app/tabs-root/tabs-bottom-root.xml create mode 100644 e2e/nested-frame-navigation/app/tabs-root/tabs-top-root.ts create mode 100644 e2e/nested-frame-navigation/app/tabs-root/tabs-top-root.xml diff --git a/e2e/nested-frame-navigation/app/tab-page/tabs-bottom-page.ts b/e2e/nested-frame-navigation/app/bottom-navigation-page/bottom-navigation-page.ts similarity index 100% rename from e2e/nested-frame-navigation/app/tab-page/tabs-bottom-page.ts rename to e2e/nested-frame-navigation/app/bottom-navigation-page/bottom-navigation-page.ts diff --git a/e2e/nested-frame-navigation/app/bottom-navigation-page/bottom-navigation-page.xml b/e2e/nested-frame-navigation/app/bottom-navigation-page/bottom-navigation-page.xml new file mode 100644 index 000000000..407ca4aee --- /dev/null +++ b/e2e/nested-frame-navigation/app/bottom-navigation-page/bottom-navigation-page.xml @@ -0,0 +1,36 @@ + + + + + + + + +