From ae00564eca8c93f660d19898a867614e44bc39fd Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Mon, 15 Jul 2019 18:05:45 +0300 Subject: [PATCH 1/3] chore: update apps structure for 6.0 --- .../Android/{ => src/main}/AndroidManifest.xml | 0 .../main/res}/drawable-hdpi/background.png | Bin .../{ => src/main/res}/drawable-hdpi/icon.png | Bin .../{ => src/main/res}/drawable-hdpi/logo.png | Bin .../main/res}/drawable-ldpi/background.png | Bin .../{ => src/main/res}/drawable-ldpi/icon.png | Bin .../{ => src/main/res}/drawable-ldpi/logo.png | Bin .../main/res}/drawable-mdpi/background.png | Bin .../{ => src/main/res}/drawable-mdpi/icon.png | Bin .../{ => src/main/res}/drawable-mdpi/logo.png | Bin .../main/res}/drawable-nodpi/splash_screen.xml | 0 .../main/res}/drawable-xhdpi/background.png | Bin .../{ => src/main/res}/drawable-xhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xhdpi/logo.png | Bin .../main/res}/drawable-xxhdpi/background.png | Bin .../{ => src/main/res}/drawable-xxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxhdpi/logo.png | Bin .../main/res}/drawable-xxxhdpi/background.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/logo.png | Bin .../{ => src/main/res}/values-v21/colors.xml | 0 .../{ => src/main/res}/values-v21/styles.xml | 0 .../Android/{ => src/main/res}/values/colors.xml | 0 .../Android/{ => src/main/res}/values/styles.xml | 0 e2e/animation-examples/package.json | 1 - .../Android/{ => src/main}/AndroidManifest.xml | 0 .../main/res}/drawable-hdpi/background.png | Bin .../{ => src/main/res}/drawable-hdpi/icon.png | Bin .../{ => src/main/res}/drawable-hdpi/logo.png | Bin .../main/res}/drawable-ldpi/background.png | Bin .../{ => src/main/res}/drawable-ldpi/icon.png | Bin .../{ => src/main/res}/drawable-ldpi/logo.png | Bin .../main/res}/drawable-mdpi/background.png | Bin .../{ => src/main/res}/drawable-mdpi/icon.png | Bin .../{ => src/main/res}/drawable-mdpi/logo.png | Bin .../main/res}/drawable-nodpi/splash_screen.xml | 0 .../main/res}/drawable-xhdpi/background.png | Bin .../{ => src/main/res}/drawable-xhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xhdpi/logo.png | Bin .../main/res}/drawable-xxhdpi/background.png | Bin .../{ => src/main/res}/drawable-xxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxhdpi/logo.png | Bin .../main/res}/drawable-xxxhdpi/background.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/logo.png | Bin .../{ => src/main/res}/values-v21/colors.xml | 0 .../{ => src/main/res}/values-v21/styles.xml | 0 .../Android/{ => src/main/res}/values/colors.xml | 0 .../Android/{ => src/main/res}/values/styles.xml | 0 e2e/modal-navigation-ng/package.json | 10 +--------- .../Android/{ => src/main}/AndroidManifest.xml | 0 .../main/res}/drawable-hdpi/background.png | Bin .../{ => src/main/res}/drawable-hdpi/icon.png | Bin .../{ => src/main/res}/drawable-hdpi/logo.png | Bin .../main/res}/drawable-ldpi/background.png | Bin .../{ => src/main/res}/drawable-ldpi/icon.png | Bin .../{ => src/main/res}/drawable-ldpi/logo.png | Bin .../main/res}/drawable-mdpi/background.png | Bin .../{ => src/main/res}/drawable-mdpi/icon.png | Bin .../{ => src/main/res}/drawable-mdpi/logo.png | Bin .../main/res}/drawable-nodpi/splash_screen.xml | 0 .../main/res}/drawable-xhdpi/background.png | Bin .../{ => src/main/res}/drawable-xhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xhdpi/logo.png | Bin .../main/res}/drawable-xxhdpi/background.png | Bin .../{ => src/main/res}/drawable-xxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxhdpi/logo.png | Bin .../main/res}/drawable-xxxhdpi/background.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/logo.png | Bin .../{ => src/main/res}/values-v21/colors.xml | 0 .../{ => src/main/res}/values-v21/styles.xml | 0 .../Android/{ => src/main/res}/values/colors.xml | 0 .../Android/{ => src/main/res}/values/styles.xml | 0 e2e/nested-router-tab-view/package.json | 10 +--------- .../Android/{ => src/main}/AndroidManifest.xml | 0 .../main/res}/drawable-hdpi/background.png | Bin .../{ => src/main/res}/drawable-hdpi/icon.png | Bin .../{ => src/main/res}/drawable-hdpi/logo.png | Bin .../main/res}/drawable-ldpi/background.png | Bin .../{ => src/main/res}/drawable-ldpi/icon.png | Bin .../{ => src/main/res}/drawable-ldpi/logo.png | Bin .../main/res}/drawable-mdpi/background.png | Bin .../{ => src/main/res}/drawable-mdpi/icon.png | Bin .../{ => src/main/res}/drawable-mdpi/logo.png | Bin .../main/res}/drawable-nodpi/splash_screen.xml | 0 .../main/res}/drawable-xhdpi/background.png | Bin .../{ => src/main/res}/drawable-xhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xhdpi/logo.png | Bin .../main/res}/drawable-xxhdpi/background.png | Bin .../{ => src/main/res}/drawable-xxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxhdpi/logo.png | Bin .../main/res}/drawable-xxxhdpi/background.png | Bin .../main/res}/drawable-xxxhdpi/browse.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/home.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/logo.png | Bin .../{ => src/main/res}/values-v21/colors.xml | 0 .../{ => src/main/res}/values-v21/styles.xml | 0 .../Android/{ => src/main/res}/values/colors.xml | 0 .../Android/{ => src/main/res}/values/styles.xml | 0 e2e/renderer/package.json | 1 - .../Android/{ => src/main}/AndroidManifest.xml | 0 .../main/res}/drawable-hdpi/background.png | Bin .../{ => src/main/res}/drawable-hdpi/icon.png | Bin .../{ => src/main/res}/drawable-hdpi/logo.png | Bin .../main/res}/drawable-ldpi/background.png | Bin .../{ => src/main/res}/drawable-ldpi/icon.png | Bin .../{ => src/main/res}/drawable-ldpi/logo.png | Bin .../main/res}/drawable-mdpi/background.png | Bin .../{ => src/main/res}/drawable-mdpi/icon.png | Bin .../{ => src/main/res}/drawable-mdpi/logo.png | Bin .../main/res}/drawable-nodpi/splash_screen.xml | 0 .../main/res}/drawable-xhdpi/background.png | Bin .../{ => src/main/res}/drawable-xhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xhdpi/logo.png | Bin .../main/res}/drawable-xxhdpi/background.png | Bin .../{ => src/main/res}/drawable-xxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxhdpi/logo.png | Bin .../main/res}/drawable-xxxhdpi/background.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/logo.png | Bin .../{ => src/main/res}/values-v21/colors.xml | 0 .../{ => src/main/res}/values-v21/styles.xml | 0 .../Android/{ => src/main/res}/values/colors.xml | 0 .../Android/{ => src/main/res}/values/styles.xml | 0 e2e/routable-animations/package.json | 3 +-- .../Android/{ => src/main}/AndroidManifest.xml | 0 .../main/res}/drawable-hdpi/background.png | Bin .../{ => src/main/res}/drawable-hdpi/icon.png | Bin .../{ => src/main/res}/drawable-hdpi/logo.png | Bin .../main/res}/drawable-ldpi/background.png | Bin .../{ => src/main/res}/drawable-ldpi/icon.png | Bin .../{ => src/main/res}/drawable-ldpi/logo.png | Bin .../main/res}/drawable-mdpi/background.png | Bin .../{ => src/main/res}/drawable-mdpi/icon.png | Bin .../{ => src/main/res}/drawable-mdpi/logo.png | Bin .../main/res}/drawable-nodpi/splash_screen.xml | 0 .../main/res}/drawable-xhdpi/background.png | Bin .../{ => src/main/res}/drawable-xhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xhdpi/logo.png | Bin .../main/res}/drawable-xxhdpi/background.png | Bin .../{ => src/main/res}/drawable-xxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxhdpi/logo.png | Bin .../main/res}/drawable-xxxhdpi/background.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/icon.png | Bin .../{ => src/main/res}/drawable-xxxhdpi/logo.png | Bin .../{ => src/main/res}/values-v21/colors.xml | 0 .../{ => src/main/res}/values-v21/styles.xml | 0 .../Android/{ => src/main/res}/values/colors.xml | 0 .../Android/{ => src/main/res}/values/styles.xml | 0 e2e/router-tab-view/package.json | 9 +-------- .../Android/{ => src/main}/AndroidManifest.xml | 0 .../main/res}/drawable-nodpi/background.png | Bin .../{ => src/main/res}/drawable-nodpi/icon.png | Bin .../{ => src/main/res}/drawable-nodpi/logo.png | Bin .../main/res}/drawable-nodpi/splash_screen.xml | 0 .../{ => src/main/res}/values-v21/colors.xml | 0 .../{ => src/main/res}/values-v21/styles.xml | 0 .../Android/{ => src/main/res}/values/colors.xml | 0 .../Android/{ => src/main/res}/values/styles.xml | 0 e2e/router/package.json | 6 +----- .../Android/{ => src/main}/AndroidManifest.xml | 0 .../main/res}/drawable-nodpi/background.png | Bin .../{ => src/main/res}/drawable-nodpi/icon.png | Bin .../{ => src/main/res}/drawable-nodpi/logo.png | Bin .../main/res}/drawable-nodpi/splash_screen.xml | 0 .../{ => src/main/res}/values-v21/colors.xml | 0 .../{ => src/main/res}/values-v21/styles.xml | 0 .../Android/{ => src/main/res}/values/colors.xml | 0 .../Android/{ => src/main/res}/values/styles.xml | 0 e2e/single-page/package.json | 9 +-------- .../Android/{ => src/main}/AndroidManifest.xml | 0 .../{ => src/main/res}/drawable-hdpi/icon.png | Bin .../{ => src/main/res}/drawable-ldpi/icon.png | Bin .../{ => src/main/res}/drawable-mdpi/icon.png | Bin .../main/res}/drawable-nodpi/splashscreen.9.png | Bin e2e/tests-app-ng/package.json | 14 +++++--------- ng-sample/package.json | 8 +------- .../Android/{ => src/main}/AndroidManifest.xml | 0 .../{ => src/main/res}/drawable-hdpi/icon.png | Bin .../{ => src/main/res}/drawable-ldpi/icon.png | Bin .../{ => src/main/res}/drawable-mdpi/icon.png | Bin .../main/res}/drawable-nodpi/checkbox_checked.png | Bin .../res}/drawable-nodpi/checkbox_unchecked.png | Bin .../main/res}/drawable-nodpi/splashscreen.9.png | Bin tests/nsconfig.json | 1 - tests/package.json | 9 +-------- tests/webpack.config.js | 14 ++++++++------ 189 files changed, 21 insertions(+), 74 deletions(-) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main}/AndroidManifest.xml (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/background.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/icon.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/logo.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/background.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/icon.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/logo.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/background.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/icon.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/logo.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/splash_screen.xml (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/background.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/icon.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/logo.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/background.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/icon.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/logo.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/background.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/icon.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/logo.png (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/values-v21/colors.xml (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/values-v21/styles.xml (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/values/colors.xml (100%) rename e2e/animation-examples/app/App_Resources/Android/{ => src/main/res}/values/styles.xml (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main}/AndroidManifest.xml (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/background.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/icon.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/logo.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/background.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/icon.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/logo.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/background.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/icon.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/logo.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/splash_screen.xml (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/background.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/icon.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/logo.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/background.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/icon.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/logo.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/background.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/icon.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/logo.png (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/values-v21/colors.xml (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/values-v21/styles.xml (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/values/colors.xml (100%) rename e2e/modal-navigation-ng/app/App_Resources/Android/{ => src/main/res}/values/styles.xml (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main}/AndroidManifest.xml (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/background.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/icon.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/logo.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/background.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/icon.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/logo.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/background.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/icon.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/logo.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/splash_screen.xml (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/background.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/icon.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/logo.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/background.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/icon.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/logo.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/background.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/icon.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/logo.png (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/values-v21/colors.xml (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/values-v21/styles.xml (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/values/colors.xml (100%) rename e2e/nested-router-tab-view/app/App_Resources/Android/{ => src/main/res}/values/styles.xml (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main}/AndroidManifest.xml (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/background.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/icon.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/logo.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/background.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/icon.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/logo.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/background.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/icon.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/logo.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/splash_screen.xml (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/background.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/icon.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/logo.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/background.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/icon.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/logo.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/background.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/browse.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/home.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/icon.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/logo.png (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/values-v21/colors.xml (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/values-v21/styles.xml (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/values/colors.xml (100%) rename e2e/renderer/app/App_Resources/Android/{ => src/main/res}/values/styles.xml (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main}/AndroidManifest.xml (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/background.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/icon.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/logo.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/background.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/icon.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/logo.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/background.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/icon.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/logo.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/splash_screen.xml (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/background.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/icon.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/logo.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/background.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/icon.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/logo.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/background.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/icon.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/logo.png (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/values-v21/colors.xml (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/values-v21/styles.xml (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/values/colors.xml (100%) rename e2e/routable-animations/app/App_Resources/Android/{ => src/main/res}/values/styles.xml (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main}/AndroidManifest.xml (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/background.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/icon.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/logo.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/background.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/icon.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/logo.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/background.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/icon.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/logo.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/splash_screen.xml (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/background.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/icon.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/logo.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/background.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/icon.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/logo.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/background.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/icon.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/logo.png (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/values-v21/colors.xml (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/values-v21/styles.xml (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/values/colors.xml (100%) rename e2e/router-tab-view/app/App_Resources/Android/{ => src/main/res}/values/styles.xml (100%) rename e2e/router/app/App_Resources/Android/{ => src/main}/AndroidManifest.xml (100%) rename e2e/router/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/background.png (100%) rename e2e/router/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/icon.png (100%) rename e2e/router/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/logo.png (100%) rename e2e/router/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/splash_screen.xml (100%) rename e2e/router/app/App_Resources/Android/{ => src/main/res}/values-v21/colors.xml (100%) rename e2e/router/app/App_Resources/Android/{ => src/main/res}/values-v21/styles.xml (100%) rename e2e/router/app/App_Resources/Android/{ => src/main/res}/values/colors.xml (100%) rename e2e/router/app/App_Resources/Android/{ => src/main/res}/values/styles.xml (100%) rename e2e/single-page/app/App_Resources/Android/{ => src/main}/AndroidManifest.xml (100%) rename e2e/single-page/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/background.png (100%) rename e2e/single-page/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/icon.png (100%) rename e2e/single-page/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/logo.png (100%) rename e2e/single-page/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/splash_screen.xml (100%) rename e2e/single-page/app/App_Resources/Android/{ => src/main/res}/values-v21/colors.xml (100%) rename e2e/single-page/app/App_Resources/Android/{ => src/main/res}/values-v21/styles.xml (100%) rename e2e/single-page/app/App_Resources/Android/{ => src/main/res}/values/colors.xml (100%) rename e2e/single-page/app/App_Resources/Android/{ => src/main/res}/values/styles.xml (100%) rename e2e/tests-app-ng/app/App_Resources/Android/{ => src/main}/AndroidManifest.xml (100%) rename e2e/tests-app-ng/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/icon.png (100%) rename e2e/tests-app-ng/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/icon.png (100%) rename e2e/tests-app-ng/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/icon.png (100%) rename e2e/tests-app-ng/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/splashscreen.9.png (100%) rename tests/app/App_Resources/Android/{ => src/main}/AndroidManifest.xml (100%) rename tests/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/icon.png (100%) rename tests/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/icon.png (100%) rename tests/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/icon.png (100%) rename tests/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/checkbox_checked.png (100%) rename tests/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/checkbox_unchecked.png (100%) rename tests/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/splashscreen.9.png (100%) diff --git a/e2e/animation-examples/app/App_Resources/Android/AndroidManifest.xml b/e2e/animation-examples/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/AndroidManifest.xml rename to e2e/animation-examples/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-hdpi/background.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-hdpi/background.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-hdpi/icon.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-hdpi/icon.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-hdpi/logo.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-hdpi/logo.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-ldpi/background.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-ldpi/background.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-ldpi/icon.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-ldpi/icon.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-ldpi/logo.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-ldpi/logo.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-mdpi/background.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-mdpi/background.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-mdpi/icon.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-mdpi/icon.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-mdpi/logo.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-mdpi/logo.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-nodpi/splash_screen.xml b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-nodpi/splash_screen.xml rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-xhdpi/background.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-xhdpi/background.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-xhdpi/icon.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-xhdpi/icon.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-xhdpi/logo.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-xhdpi/logo.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-xxhdpi/background.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-xxhdpi/background.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-xxhdpi/icon.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-xxhdpi/icon.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-xxhdpi/logo.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-xxhdpi/logo.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-xxxhdpi/background.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-xxxhdpi/background.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-xxxhdpi/icon.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-xxxhdpi/icon.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png diff --git a/e2e/animation-examples/app/App_Resources/Android/drawable-xxxhdpi/logo.png b/e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/drawable-xxxhdpi/logo.png rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png diff --git a/e2e/animation-examples/app/App_Resources/Android/values-v21/colors.xml b/e2e/animation-examples/app/App_Resources/Android/src/main/res/values-v21/colors.xml similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/values-v21/colors.xml rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/values-v21/colors.xml diff --git a/e2e/animation-examples/app/App_Resources/Android/values-v21/styles.xml b/e2e/animation-examples/app/App_Resources/Android/src/main/res/values-v21/styles.xml similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/values-v21/styles.xml rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/values-v21/styles.xml diff --git a/e2e/animation-examples/app/App_Resources/Android/values/colors.xml b/e2e/animation-examples/app/App_Resources/Android/src/main/res/values/colors.xml similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/values/colors.xml rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/values/colors.xml diff --git a/e2e/animation-examples/app/App_Resources/Android/values/styles.xml b/e2e/animation-examples/app/App_Resources/Android/src/main/res/values/styles.xml similarity index 100% rename from e2e/animation-examples/app/App_Resources/Android/values/styles.xml rename to e2e/animation-examples/app/App_Resources/Android/src/main/res/values/styles.xml diff --git a/e2e/animation-examples/package.json b/e2e/animation-examples/package.json index fbcb1370d..01bdfe69d 100644 --- a/e2e/animation-examples/package.json +++ b/e2e/animation-examples/package.json @@ -43,7 +43,6 @@ "mochawesome": "~3.1.2", "nativescript-css-loader": "~0.26.0", "nativescript-dev-appium": "next", - "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "typescript": "~3.4.5" }, diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/AndroidManifest.xml b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/AndroidManifest.xml rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-hdpi/background.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-hdpi/background.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-hdpi/icon.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-hdpi/icon.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-hdpi/logo.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-hdpi/logo.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-ldpi/background.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-ldpi/background.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-ldpi/icon.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-ldpi/icon.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-ldpi/logo.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-ldpi/logo.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-mdpi/background.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-mdpi/background.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-mdpi/icon.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-mdpi/icon.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-mdpi/logo.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-mdpi/logo.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-nodpi/splash_screen.xml b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-nodpi/splash_screen.xml rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xhdpi/background.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xhdpi/background.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xhdpi/icon.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xhdpi/icon.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xhdpi/logo.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xhdpi/logo.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxhdpi/background.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxhdpi/background.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxhdpi/icon.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxhdpi/icon.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxhdpi/logo.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxhdpi/logo.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxxhdpi/background.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxxhdpi/background.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxxhdpi/icon.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxxhdpi/icon.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxxhdpi/logo.png b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/drawable-xxxhdpi/logo.png rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/values-v21/colors.xml b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/values-v21/colors.xml similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/values-v21/colors.xml rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/values-v21/colors.xml diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/values-v21/styles.xml b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/values-v21/styles.xml similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/values-v21/styles.xml rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/values-v21/styles.xml diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/values/colors.xml b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/values/colors.xml similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/values/colors.xml rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/values/colors.xml diff --git a/e2e/modal-navigation-ng/app/App_Resources/Android/values/styles.xml b/e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/values/styles.xml similarity index 100% rename from e2e/modal-navigation-ng/app/App_Resources/Android/values/styles.xml rename to e2e/modal-navigation-ng/app/App_Resources/Android/src/main/res/values/styles.xml diff --git a/e2e/modal-navigation-ng/package.json b/e2e/modal-navigation-ng/package.json index e3d559af2..6f4856c02 100644 --- a/e2e/modal-navigation-ng/package.json +++ b/e2e/modal-navigation-ng/package.json @@ -4,13 +4,7 @@ "readme": "NativeScript Application", "repository": "", "nativescript": { - "id": "org.nativescript.modalnavigationng", - "tns-android": { - "version": "next" - }, - "tns-ios": { - "version": "next" - } + "id": "org.nativescript.modalnavigationng" }, "dependencies": { "@angular/animations": "~8.0.0", @@ -23,7 +17,6 @@ "@angular/platform-browser-dynamic": "~8.0.0", "@angular/router": "~8.0.0", "nativescript-angular": "file:../../nativescript-angular", - "nativescript-dev-webpack": "next", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", "rxjs": "~6.3.3", @@ -43,7 +36,6 @@ "mocha": "~5.2.0", "mochawesome": "~3.1.2", "nativescript-dev-appium": "next", - "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "tns-platform-declarations": "next", "typescript": "~3.4.5" diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/AndroidManifest.xml b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/AndroidManifest.xml rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-hdpi/background.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-hdpi/background.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-hdpi/icon.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-hdpi/icon.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-hdpi/logo.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-hdpi/logo.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-ldpi/background.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-ldpi/background.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-ldpi/icon.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-ldpi/icon.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-ldpi/logo.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-ldpi/logo.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-mdpi/background.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-mdpi/background.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-mdpi/icon.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-mdpi/icon.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-mdpi/logo.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-mdpi/logo.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-nodpi/splash_screen.xml b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-nodpi/splash_screen.xml rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xhdpi/background.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xhdpi/background.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xhdpi/icon.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xhdpi/icon.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xhdpi/logo.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xhdpi/logo.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxhdpi/background.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxhdpi/background.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxhdpi/icon.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxhdpi/icon.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxhdpi/logo.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxhdpi/logo.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/background.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/background.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/icon.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/icon.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/logo.png b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/logo.png rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/values-v21/colors.xml b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/values-v21/colors.xml similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/values-v21/colors.xml rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/values-v21/colors.xml diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/values-v21/styles.xml b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/values-v21/styles.xml similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/values-v21/styles.xml rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/values-v21/styles.xml diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/values/colors.xml b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/values/colors.xml similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/values/colors.xml rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/values/colors.xml diff --git a/e2e/nested-router-tab-view/app/App_Resources/Android/values/styles.xml b/e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/values/styles.xml similarity index 100% rename from e2e/nested-router-tab-view/app/App_Resources/Android/values/styles.xml rename to e2e/nested-router-tab-view/app/App_Resources/Android/src/main/res/values/styles.xml diff --git a/e2e/nested-router-tab-view/package.json b/e2e/nested-router-tab-view/package.json index ea1c576b2..ff3399f65 100644 --- a/e2e/nested-router-tab-view/package.json +++ b/e2e/nested-router-tab-view/package.json @@ -4,13 +4,7 @@ "readme": "NativeScript Application", "repository": "", "nativescript": { - "id": "org.nativescript.nestedroutertabview", - "tns-ios": { - "version": "next" - }, - "tns-android": { - "version": "next" - } + "id": "org.nativescript.nestedroutertabview" }, "dependencies": { "@angular/animations": "~8.0.0", @@ -23,7 +17,6 @@ "@angular/platform-browser-dynamic": "~8.0.0", "@angular/router": "~8.0.0", "nativescript-angular": "file:../../nativescript-angular", - "nativescript-dev-webpack": "next", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.8", "rxjs": "~6.3.3", @@ -43,7 +36,6 @@ "mocha": "~5.2.0", "mochawesome": "~3.1.2", "nativescript-dev-appium": "next", - "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "typescript": "3.4.5" }, diff --git a/e2e/renderer/app/App_Resources/Android/AndroidManifest.xml b/e2e/renderer/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from e2e/renderer/app/App_Resources/Android/AndroidManifest.xml rename to e2e/renderer/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/e2e/renderer/app/App_Resources/Android/drawable-hdpi/background.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-hdpi/background.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-hdpi/icon.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-hdpi/icon.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-hdpi/logo.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-hdpi/logo.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-ldpi/background.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-ldpi/background.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-ldpi/icon.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-ldpi/icon.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-ldpi/logo.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-ldpi/logo.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-mdpi/background.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-mdpi/background.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-mdpi/icon.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-mdpi/icon.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-mdpi/logo.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-mdpi/logo.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-nodpi/splash_screen.xml b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-nodpi/splash_screen.xml rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml diff --git a/e2e/renderer/app/App_Resources/Android/drawable-xhdpi/background.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-xhdpi/background.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-xhdpi/icon.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-xhdpi/icon.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-xhdpi/logo.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-xhdpi/logo.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-xxhdpi/background.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-xxhdpi/background.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-xxhdpi/icon.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-xxhdpi/icon.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-xxhdpi/logo.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-xxhdpi/logo.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-xxxhdpi/background.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-xxxhdpi/background.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-xxxhdpi/browse.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/browse.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-xxxhdpi/browse.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/browse.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-xxxhdpi/home.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/home.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-xxxhdpi/home.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/home.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-xxxhdpi/icon.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-xxxhdpi/icon.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png diff --git a/e2e/renderer/app/App_Resources/Android/drawable-xxxhdpi/logo.png b/e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png similarity index 100% rename from e2e/renderer/app/App_Resources/Android/drawable-xxxhdpi/logo.png rename to e2e/renderer/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png diff --git a/e2e/renderer/app/App_Resources/Android/values-v21/colors.xml b/e2e/renderer/app/App_Resources/Android/src/main/res/values-v21/colors.xml similarity index 100% rename from e2e/renderer/app/App_Resources/Android/values-v21/colors.xml rename to e2e/renderer/app/App_Resources/Android/src/main/res/values-v21/colors.xml diff --git a/e2e/renderer/app/App_Resources/Android/values-v21/styles.xml b/e2e/renderer/app/App_Resources/Android/src/main/res/values-v21/styles.xml similarity index 100% rename from e2e/renderer/app/App_Resources/Android/values-v21/styles.xml rename to e2e/renderer/app/App_Resources/Android/src/main/res/values-v21/styles.xml diff --git a/e2e/renderer/app/App_Resources/Android/values/colors.xml b/e2e/renderer/app/App_Resources/Android/src/main/res/values/colors.xml similarity index 100% rename from e2e/renderer/app/App_Resources/Android/values/colors.xml rename to e2e/renderer/app/App_Resources/Android/src/main/res/values/colors.xml diff --git a/e2e/renderer/app/App_Resources/Android/values/styles.xml b/e2e/renderer/app/App_Resources/Android/src/main/res/values/styles.xml similarity index 100% rename from e2e/renderer/app/App_Resources/Android/values/styles.xml rename to e2e/renderer/app/App_Resources/Android/src/main/res/values/styles.xml diff --git a/e2e/renderer/package.json b/e2e/renderer/package.json index ccb61a320..f754d4d2e 100644 --- a/e2e/renderer/package.json +++ b/e2e/renderer/package.json @@ -37,7 +37,6 @@ "mocha": "~5.2.0", "mochawesome": "~3.1.2", "nativescript-dev-appium": "next", - "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", "typescript": "~3.4.5" diff --git a/e2e/routable-animations/app/App_Resources/Android/AndroidManifest.xml b/e2e/routable-animations/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/AndroidManifest.xml rename to e2e/routable-animations/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-hdpi/background.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-hdpi/background.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-hdpi/icon.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-hdpi/icon.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-hdpi/logo.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-hdpi/logo.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-ldpi/background.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-ldpi/background.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-ldpi/icon.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-ldpi/icon.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-ldpi/logo.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-ldpi/logo.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-mdpi/background.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-mdpi/background.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-mdpi/icon.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-mdpi/icon.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-mdpi/logo.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-mdpi/logo.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-nodpi/splash_screen.xml b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-nodpi/splash_screen.xml rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-xhdpi/background.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-xhdpi/background.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-xhdpi/icon.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-xhdpi/icon.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-xhdpi/logo.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-xhdpi/logo.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-xxhdpi/background.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-xxhdpi/background.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-xxhdpi/icon.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-xxhdpi/icon.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-xxhdpi/logo.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-xxhdpi/logo.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-xxxhdpi/background.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-xxxhdpi/background.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-xxxhdpi/icon.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-xxxhdpi/icon.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png diff --git a/e2e/routable-animations/app/App_Resources/Android/drawable-xxxhdpi/logo.png b/e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/drawable-xxxhdpi/logo.png rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png diff --git a/e2e/routable-animations/app/App_Resources/Android/values-v21/colors.xml b/e2e/routable-animations/app/App_Resources/Android/src/main/res/values-v21/colors.xml similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/values-v21/colors.xml rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/values-v21/colors.xml diff --git a/e2e/routable-animations/app/App_Resources/Android/values-v21/styles.xml b/e2e/routable-animations/app/App_Resources/Android/src/main/res/values-v21/styles.xml similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/values-v21/styles.xml rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/values-v21/styles.xml diff --git a/e2e/routable-animations/app/App_Resources/Android/values/colors.xml b/e2e/routable-animations/app/App_Resources/Android/src/main/res/values/colors.xml similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/values/colors.xml rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/values/colors.xml diff --git a/e2e/routable-animations/app/App_Resources/Android/values/styles.xml b/e2e/routable-animations/app/App_Resources/Android/src/main/res/values/styles.xml similarity index 100% rename from e2e/routable-animations/app/App_Resources/Android/values/styles.xml rename to e2e/routable-animations/app/App_Resources/Android/src/main/res/values/styles.xml diff --git a/e2e/routable-animations/package.json b/e2e/routable-animations/package.json index e7d9fae01..ba8f14221 100644 --- a/e2e/routable-animations/package.json +++ b/e2e/routable-animations/package.json @@ -20,7 +20,7 @@ "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", "rxjs": "~6.0.0 || >=6.1.0", - "tns-core-modules": "^4.0.0", + "tns-core-modules": "6.0.1", "zone.js": "^0.9.1" }, "devDependencies": { @@ -36,7 +36,6 @@ "lazy": "1.0.11", "nativescript-css-loader": "~0.26.0", "nativescript-dev-appium": "^4.0.0", - "nativescript-dev-typescript": "~0.7.1", "nativescript-dev-webpack": "next", "typescript": "~3.4.5" }, diff --git a/e2e/router-tab-view/app/App_Resources/Android/AndroidManifest.xml b/e2e/router-tab-view/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/AndroidManifest.xml rename to e2e/router-tab-view/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-hdpi/background.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-hdpi/background.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-hdpi/icon.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-hdpi/icon.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-hdpi/logo.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-hdpi/logo.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-ldpi/background.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-ldpi/background.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-ldpi/icon.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-ldpi/icon.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-ldpi/logo.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-ldpi/logo.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-mdpi/background.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-mdpi/background.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-mdpi/icon.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-mdpi/icon.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-mdpi/logo.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-mdpi/logo.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-nodpi/splash_screen.xml b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-nodpi/splash_screen.xml rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-xhdpi/background.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-xhdpi/background.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-xhdpi/icon.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-xhdpi/icon.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-xhdpi/logo.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-xhdpi/logo.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-xxhdpi/background.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-xxhdpi/background.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-xxhdpi/icon.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-xxhdpi/icon.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-xxhdpi/logo.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-xxhdpi/logo.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/background.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/background.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/icon.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/icon.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/logo.png b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/drawable-xxxhdpi/logo.png rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png diff --git a/e2e/router-tab-view/app/App_Resources/Android/values-v21/colors.xml b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/values-v21/colors.xml similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/values-v21/colors.xml rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/values-v21/colors.xml diff --git a/e2e/router-tab-view/app/App_Resources/Android/values-v21/styles.xml b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/values-v21/styles.xml similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/values-v21/styles.xml rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/values-v21/styles.xml diff --git a/e2e/router-tab-view/app/App_Resources/Android/values/colors.xml b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/values/colors.xml similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/values/colors.xml rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/values/colors.xml diff --git a/e2e/router-tab-view/app/App_Resources/Android/values/styles.xml b/e2e/router-tab-view/app/App_Resources/Android/src/main/res/values/styles.xml similarity index 100% rename from e2e/router-tab-view/app/App_Resources/Android/values/styles.xml rename to e2e/router-tab-view/app/App_Resources/Android/src/main/res/values/styles.xml diff --git a/e2e/router-tab-view/package.json b/e2e/router-tab-view/package.json index d1758be19..95e2f79d7 100644 --- a/e2e/router-tab-view/package.json +++ b/e2e/router-tab-view/package.json @@ -4,13 +4,7 @@ "readme": "NativeScript Application", "repository": "", "nativescript": { - "id": "org.nativescript.routertabview", - "tns-android": { - "version": "next" - }, - "tns-ios": { - "version": "next" - } + "id": "org.nativescript.routertabview" }, "dependencies": { "@angular/animations": "~8.0.0", @@ -41,7 +35,6 @@ "mocha": "~5.2.0", "mochawesome": "~3.1.2", "nativescript-dev-appium": "next", - "nativescript-dev-typescript": "next", "typescript": "~3.4.5", "@angular/compiler-cli": "8.0.0", "@ngtools/webpack": "8.0.0" diff --git a/e2e/router/app/App_Resources/Android/AndroidManifest.xml b/e2e/router/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from e2e/router/app/App_Resources/Android/AndroidManifest.xml rename to e2e/router/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/e2e/router/app/App_Resources/Android/drawable-nodpi/background.png b/e2e/router/app/App_Resources/Android/src/main/res/drawable-nodpi/background.png similarity index 100% rename from e2e/router/app/App_Resources/Android/drawable-nodpi/background.png rename to e2e/router/app/App_Resources/Android/src/main/res/drawable-nodpi/background.png diff --git a/e2e/router/app/App_Resources/Android/drawable-nodpi/icon.png b/e2e/router/app/App_Resources/Android/src/main/res/drawable-nodpi/icon.png similarity index 100% rename from e2e/router/app/App_Resources/Android/drawable-nodpi/icon.png rename to e2e/router/app/App_Resources/Android/src/main/res/drawable-nodpi/icon.png diff --git a/e2e/router/app/App_Resources/Android/drawable-nodpi/logo.png b/e2e/router/app/App_Resources/Android/src/main/res/drawable-nodpi/logo.png similarity index 100% rename from e2e/router/app/App_Resources/Android/drawable-nodpi/logo.png rename to e2e/router/app/App_Resources/Android/src/main/res/drawable-nodpi/logo.png diff --git a/e2e/router/app/App_Resources/Android/drawable-nodpi/splash_screen.xml b/e2e/router/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml similarity index 100% rename from e2e/router/app/App_Resources/Android/drawable-nodpi/splash_screen.xml rename to e2e/router/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml diff --git a/e2e/router/app/App_Resources/Android/values-v21/colors.xml b/e2e/router/app/App_Resources/Android/src/main/res/values-v21/colors.xml similarity index 100% rename from e2e/router/app/App_Resources/Android/values-v21/colors.xml rename to e2e/router/app/App_Resources/Android/src/main/res/values-v21/colors.xml diff --git a/e2e/router/app/App_Resources/Android/values-v21/styles.xml b/e2e/router/app/App_Resources/Android/src/main/res/values-v21/styles.xml similarity index 100% rename from e2e/router/app/App_Resources/Android/values-v21/styles.xml rename to e2e/router/app/App_Resources/Android/src/main/res/values-v21/styles.xml diff --git a/e2e/router/app/App_Resources/Android/values/colors.xml b/e2e/router/app/App_Resources/Android/src/main/res/values/colors.xml similarity index 100% rename from e2e/router/app/App_Resources/Android/values/colors.xml rename to e2e/router/app/App_Resources/Android/src/main/res/values/colors.xml diff --git a/e2e/router/app/App_Resources/Android/values/styles.xml b/e2e/router/app/App_Resources/Android/src/main/res/values/styles.xml similarity index 100% rename from e2e/router/app/App_Resources/Android/values/styles.xml rename to e2e/router/app/App_Resources/Android/src/main/res/values/styles.xml diff --git a/e2e/router/package.json b/e2e/router/package.json index 06f280221..9f2ad996c 100644 --- a/e2e/router/package.json +++ b/e2e/router/package.json @@ -4,10 +4,7 @@ "readme": "NativeScript Application", "repository": "", "nativescript": { - "id": "org.nativescript.router", - "tns-android": { - "version": "next" - } + "id": "org.nativescript.router" }, "dependencies": { "@angular/animations": "~8.0.0", @@ -41,7 +38,6 @@ "mocha": "~5.2.0", "mochawesome": "~3.1.2", "nativescript-dev-appium": "next", - "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", "typescript": "~3.4.5" diff --git a/e2e/single-page/app/App_Resources/Android/AndroidManifest.xml b/e2e/single-page/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from e2e/single-page/app/App_Resources/Android/AndroidManifest.xml rename to e2e/single-page/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/e2e/single-page/app/App_Resources/Android/drawable-nodpi/background.png b/e2e/single-page/app/App_Resources/Android/src/main/res/drawable-nodpi/background.png similarity index 100% rename from e2e/single-page/app/App_Resources/Android/drawable-nodpi/background.png rename to e2e/single-page/app/App_Resources/Android/src/main/res/drawable-nodpi/background.png diff --git a/e2e/single-page/app/App_Resources/Android/drawable-nodpi/icon.png b/e2e/single-page/app/App_Resources/Android/src/main/res/drawable-nodpi/icon.png similarity index 100% rename from e2e/single-page/app/App_Resources/Android/drawable-nodpi/icon.png rename to e2e/single-page/app/App_Resources/Android/src/main/res/drawable-nodpi/icon.png diff --git a/e2e/single-page/app/App_Resources/Android/drawable-nodpi/logo.png b/e2e/single-page/app/App_Resources/Android/src/main/res/drawable-nodpi/logo.png similarity index 100% rename from e2e/single-page/app/App_Resources/Android/drawable-nodpi/logo.png rename to e2e/single-page/app/App_Resources/Android/src/main/res/drawable-nodpi/logo.png diff --git a/e2e/single-page/app/App_Resources/Android/drawable-nodpi/splash_screen.xml b/e2e/single-page/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml similarity index 100% rename from e2e/single-page/app/App_Resources/Android/drawable-nodpi/splash_screen.xml rename to e2e/single-page/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml diff --git a/e2e/single-page/app/App_Resources/Android/values-v21/colors.xml b/e2e/single-page/app/App_Resources/Android/src/main/res/values-v21/colors.xml similarity index 100% rename from e2e/single-page/app/App_Resources/Android/values-v21/colors.xml rename to e2e/single-page/app/App_Resources/Android/src/main/res/values-v21/colors.xml diff --git a/e2e/single-page/app/App_Resources/Android/values-v21/styles.xml b/e2e/single-page/app/App_Resources/Android/src/main/res/values-v21/styles.xml similarity index 100% rename from e2e/single-page/app/App_Resources/Android/values-v21/styles.xml rename to e2e/single-page/app/App_Resources/Android/src/main/res/values-v21/styles.xml diff --git a/e2e/single-page/app/App_Resources/Android/values/colors.xml b/e2e/single-page/app/App_Resources/Android/src/main/res/values/colors.xml similarity index 100% rename from e2e/single-page/app/App_Resources/Android/values/colors.xml rename to e2e/single-page/app/App_Resources/Android/src/main/res/values/colors.xml diff --git a/e2e/single-page/app/App_Resources/Android/values/styles.xml b/e2e/single-page/app/App_Resources/Android/src/main/res/values/styles.xml similarity index 100% rename from e2e/single-page/app/App_Resources/Android/values/styles.xml rename to e2e/single-page/app/App_Resources/Android/src/main/res/values/styles.xml diff --git a/e2e/single-page/package.json b/e2e/single-page/package.json index 3d208aea7..cdad3be6c 100644 --- a/e2e/single-page/package.json +++ b/e2e/single-page/package.json @@ -4,13 +4,7 @@ "readme": "NativeScript Application", "repository": "", "nativescript": { - "id": "org.nativescript.singlepage", - "tns-ios": { - "version": "next" - }, - "tns-android": { - "version": "next" - } + "id": "org.nativescript.singlepage" }, "dependencies": { "@angular/animations": "~8.0.0", @@ -44,7 +38,6 @@ "mocha": "~5.2.0", "mochawesome": "~3.1.2", "nativescript-dev-appium": "next", - "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "tslib": "^1.7.1", "typescript": "~3.4.5" diff --git a/e2e/tests-app-ng/app/App_Resources/Android/AndroidManifest.xml b/e2e/tests-app-ng/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from e2e/tests-app-ng/app/App_Resources/Android/AndroidManifest.xml rename to e2e/tests-app-ng/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/e2e/tests-app-ng/app/App_Resources/Android/drawable-hdpi/icon.png b/e2e/tests-app-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from e2e/tests-app-ng/app/App_Resources/Android/drawable-hdpi/icon.png rename to e2e/tests-app-ng/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png diff --git a/e2e/tests-app-ng/app/App_Resources/Android/drawable-ldpi/icon.png b/e2e/tests-app-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from e2e/tests-app-ng/app/App_Resources/Android/drawable-ldpi/icon.png rename to e2e/tests-app-ng/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png diff --git a/e2e/tests-app-ng/app/App_Resources/Android/drawable-mdpi/icon.png b/e2e/tests-app-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from e2e/tests-app-ng/app/App_Resources/Android/drawable-mdpi/icon.png rename to e2e/tests-app-ng/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png diff --git a/e2e/tests-app-ng/app/App_Resources/Android/drawable-nodpi/splashscreen.9.png b/e2e/tests-app-ng/app/App_Resources/Android/src/main/res/drawable-nodpi/splashscreen.9.png similarity index 100% rename from e2e/tests-app-ng/app/App_Resources/Android/drawable-nodpi/splashscreen.9.png rename to e2e/tests-app-ng/app/App_Resources/Android/src/main/res/drawable-nodpi/splashscreen.9.png diff --git a/e2e/tests-app-ng/package.json b/e2e/tests-app-ng/package.json index cbb98810e..34cb98e5e 100644 --- a/e2e/tests-app-ng/package.json +++ b/e2e/tests-app-ng/package.json @@ -4,13 +4,7 @@ "readme": "NativeScript Application", "repository": "", "nativescript": { - "id": "org.nativescript.testsappng", - "tns-ios": { - "version": "next" - }, - "tns-android": { - "version": "next" - } + "id": "org.nativescript.testsappng" }, "dependencies": { "@angular/common": "~8.0.0", @@ -35,9 +29,11 @@ "codelyzer": "^4.0.0", "filewalker": "^0.1.3", "lazy": "1.0.11", - "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", - "tslint": "^5.4.3" + "tslint": "^5.4.3", + "typescript": "~3.4.5", + "@angular/compiler-cli": "~8.0.0", + "@ngtools/webpack": "~8.0.0" }, "scripts": { "tslint": "tslint --config tslint.json 'app/**/*.ts'", diff --git a/ng-sample/package.json b/ng-sample/package.json index 019f35337..15ae184ed 100644 --- a/ng-sample/package.json +++ b/ng-sample/package.json @@ -1,12 +1,6 @@ { "nativescript": { - "id": "org.nativescript.ngsample", - "tns-android": { - "version": "next" - }, - "tns-ios": { - "version": "next" - } + "id": "org.nativescript.ngsample" }, "name": "tns-template-hello-world", "main": "app.js", diff --git a/tests/app/App_Resources/Android/AndroidManifest.xml b/tests/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from tests/app/App_Resources/Android/AndroidManifest.xml rename to tests/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/tests/app/App_Resources/Android/drawable-hdpi/icon.png b/tests/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from tests/app/App_Resources/Android/drawable-hdpi/icon.png rename to tests/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png diff --git a/tests/app/App_Resources/Android/drawable-ldpi/icon.png b/tests/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from tests/app/App_Resources/Android/drawable-ldpi/icon.png rename to tests/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png diff --git a/tests/app/App_Resources/Android/drawable-mdpi/icon.png b/tests/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from tests/app/App_Resources/Android/drawable-mdpi/icon.png rename to tests/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png diff --git a/tests/app/App_Resources/Android/drawable-nodpi/checkbox_checked.png b/tests/app/App_Resources/Android/src/main/res/drawable-nodpi/checkbox_checked.png similarity index 100% rename from tests/app/App_Resources/Android/drawable-nodpi/checkbox_checked.png rename to tests/app/App_Resources/Android/src/main/res/drawable-nodpi/checkbox_checked.png diff --git a/tests/app/App_Resources/Android/drawable-nodpi/checkbox_unchecked.png b/tests/app/App_Resources/Android/src/main/res/drawable-nodpi/checkbox_unchecked.png similarity index 100% rename from tests/app/App_Resources/Android/drawable-nodpi/checkbox_unchecked.png rename to tests/app/App_Resources/Android/src/main/res/drawable-nodpi/checkbox_unchecked.png diff --git a/tests/app/App_Resources/Android/drawable-nodpi/splashscreen.9.png b/tests/app/App_Resources/Android/src/main/res/drawable-nodpi/splashscreen.9.png similarity index 100% rename from tests/app/App_Resources/Android/drawable-nodpi/splashscreen.9.png rename to tests/app/App_Resources/Android/src/main/res/drawable-nodpi/splashscreen.9.png diff --git a/tests/nsconfig.json b/tests/nsconfig.json index c1ec5f483..dbe83a2c8 100644 --- a/tests/nsconfig.json +++ b/tests/nsconfig.json @@ -1,5 +1,4 @@ { - "useLegacyWorkflow": false, "appPath": "app", "appResourcesPath": "app/App_Resources" } \ No newline at end of file diff --git a/tests/package.json b/tests/package.json index 794743063..3b7f790b3 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,12 +1,6 @@ { "nativescript": { - "id": "org.nativescript.ngtests", - "tns-ios": { - "version": "next" - }, - "tns-android": { - "version": "next" - } + "id": "org.nativescript.ngtests" }, "name": "ngtests", "version": "1.0.0", @@ -60,7 +54,6 @@ "karma-webpack": "3.0.5", "lazy": "1.0.11", "mocha": "6.1.4", - "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "next", "remove-strict-webpack-plugin": "~0.1.2", "sinon": "^7.3.2", diff --git a/tests/webpack.config.js b/tests/webpack.config.js index 0d150698a..d7cd1e782 100644 --- a/tests/webpack.config.js +++ b/tests/webpack.config.js @@ -32,14 +32,13 @@ module.exports = env => { // Default destination inside platforms//... const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot)); - const appResourcesPlatformDir = platform === "android" ? "Android" : "iOS"; const { // The 'appPath' and 'appResourcesPath' values are fetched from // the nsconfig.json configuration file // when bundling with `tns run android|ios --bundle`. - appPath = "app", - appResourcesPath = "app/App_Resources", + appPath = "src", + appResourcesPath = "App_Resources", // You can provide the following flags when running 'tns run android|ios' aot, // --env.aot @@ -62,8 +61,9 @@ module.exports = env => { const entryModule = `${nsWebpack.getEntryModule(appFullPath, platform)}.ts`; const entryPath = `.${sep}${entryModule}`; const entries = { bundle: entryPath }; - if (platform === "ios") { - entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules.js"; + const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1); + if (platform === "ios" && !areCoreModulesExternal) { + entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules"; }; const ngCompilerTransformers = []; @@ -108,6 +108,7 @@ module.exports = env => { itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`); } + nsWebpack.processAppComponents(appComponents, platform); const config = { mode: production ? "production" : "development", context: appFullPath, @@ -212,6 +213,7 @@ module.exports = env => { unitTesting, appFullPath, projectRoot, + ignoredFiles: nsWebpack.getUserDefinedEntries(entries, platform) } }, ].filter(loader => !!loader) @@ -261,7 +263,7 @@ module.exports = env => { // Define useful constants like TNS_WEBPACK new webpack.DefinePlugin({ "global.TNS_WEBPACK": "true", - "process": undefined, + "process": "global.process", }), // Remove all files from the out dir. new CleanWebpackPlugin(itemsToClean, { verbose: !!verbose }), From 902a0d7bdaff5b9c3b0fe66289883750992ced8d Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Mon, 15 Jul 2019 18:07:13 +0300 Subject: [PATCH 2/3] chorE: update core-modules version --- e2e/routable-animations/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/routable-animations/package.json b/e2e/routable-animations/package.json index ba8f14221..bd6e516c7 100644 --- a/e2e/routable-animations/package.json +++ b/e2e/routable-animations/package.json @@ -20,7 +20,7 @@ "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", "rxjs": "~6.0.0 || >=6.1.0", - "tns-core-modules": "6.0.1", + "tns-core-modules": "next", "zone.js": "^0.9.1" }, "devDependencies": { From e5d08474eb80fafbadd1202544ab2a8dc1582dd0 Mon Sep 17 00:00:00 2001 From: SvetoslavTsenov Date: Mon, 15 Jul 2019 19:24:07 +0300 Subject: [PATCH 3/3] chore: revert src folder for ng tests app --- tests/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/webpack.config.js b/tests/webpack.config.js index d7cd1e782..86bb5c83a 100644 --- a/tests/webpack.config.js +++ b/tests/webpack.config.js @@ -37,7 +37,7 @@ module.exports = env => { // The 'appPath' and 'appResourcesPath' values are fetched from // the nsconfig.json configuration file // when bundling with `tns run android|ios --bundle`. - appPath = "src", + appPath = "app", appResourcesPath = "App_Resources", // You can provide the following flags when running 'tns run android|ios'