diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9d8e7a75..9f8449330 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+
+## [6.0.4](https://github.com/NativeScript/NativeScript/compare/6.0.3...6.0.4) (2019-07-30)
+
+
+### Bug Fixes
+
+* **ios:** 'ui/tabs' not found for element 'Tabs'
+
+
+
+## [6.0.3](https://github.com/NativeScript/NativeScript/compare/6.0.2...6.0.3) (2019-07-29)
+
+
+### Bug Fixes
+
+* **ios:** move material design dependency to podfile ([#7592](https://github.com/NativeScript/NativeScript/issues/7592)) ([291e3b4](https://github.com/NativeScript/NativeScript/commit/291e3b4))
+
+
+
+
+## [6.0.2](https://github.com/NativeScript/NativeScript/compare/6.0.0...6.0.2) (2019-07-26)
+
+
+### Bug Fixes
+
+* **android:** remove wait for doubletap if no gesture recognizer ([#7584](https://github.com/NativeScript/NativeScript/issues/7584)) ([9fd5ddc](https://github.com/NativeScript/NativeScript/commit/9fd5ddc))
+* **bottom-navigation:** crash when tab selected with no item ([#7527](https://github.com/NativeScript/NativeScript/issues/7527)) ([46c17ca](https://github.com/NativeScript/NativeScript/commit/46c17ca))
+* **tabs:** tab bar not visible when nested in layout ([#7544](https://github.com/NativeScript/NativeScript/issues/7544)) ([f00b370](https://github.com/NativeScript/NativeScript/commit/f00b370))
+* **tabs-android:** wrong tabStripItem selected ([#7522](https://github.com/NativeScript/NativeScript/issues/7522)) ([ca22ba9](https://github.com/NativeScript/NativeScript/commit/ca22ba9))
+* **tabs-ios:** crash when setting tabStripItems through items property ([#7548](https://github.com/NativeScript/NativeScript/issues/7548)) ([4511c76](https://github.com/NativeScript/NativeScript/commit/4511c76))
+* **tabs-ios:** unable to return to tab after tab with nested frame visited ([#7574](https://github.com/NativeScript/NativeScript/issues/7574)) ([490cab0](https://github.com/NativeScript/NativeScript/commit/490cab0))
+
+
+
# [6.0.0](https://github.com/NativeScript/NativeScript/compare/5.4.2...6.0.0) (2019-06-28)
diff --git a/e2e/ui-tests-app/README.md b/e2e/ui-tests-app/README.md
index 3230d0df0..f2c0277b8 100644
--- a/e2e/ui-tests-app/README.md
+++ b/e2e/ui-tests-app/README.md
@@ -1,17 +1,21 @@
***e2e tests execution***
1. Local setup
- - install appium and all requirments related to how to use `nativescript-dev-appium` plugin
+ - install appium and all requirments related to `nativescript-dev-appium` plugin usage
- download images:
- ```npm run load-images Emulator-Api23-Default```
+ ```npm run load-images Emulator-Api23-Default "iPhone X 12"```
or load multiple folders:
- ``` npm run load-images Emulator-Api23-Default Emulator-Google-Api28```
+ ``` npm run load-images Emulator-Api23-Default Emulator-Google-Api28 "iPhone X 12"```
- This command will download https://github.com/NativeScript/functional-tests-images/tree/master/uitestsapp and sparse all passed directories [emulator-name|simulator-name] [emulator-name|simulator-name] [emulator-name|simulator-name]
- - name your device so that it matches folder name, respectively api level and density of emulators.
+ or load all folders:
+
+ ``` npm run load-images all```
+
+ This command will download https://github.com/NativeScript/functional-tests-images/tree/master/uitestsapp and sparse all passed directories [emulator-name|simulator-name]
+ - rename/ create your device so that it matches folder name, respectively api level and density of emulators.
You can also use scripts:
@@ -19,7 +23,7 @@
If you need to download system image and create emulator use:
- `npm run update-emulators -u`
+ `npm run update-emulators -- --update-system-images`
2. Test execution
- Run test compilation in separate terminal and don't kill it.
@@ -31,8 +35,8 @@
3. Debug test.
- Run:
- `npm run test-debug [android|ios]`
-in separate console and don't kill it. This command will start appium server and driver and use the installed app on the device but it will not execute tests.
+ `npm run e2e-debug [android|ios]`
+run in separate console and don't kill it. This command will start appium server and driver and use the installed app on the device but it will not execute tests.
- Go to vs code debugging and use a config like:
```
@@ -48,13 +52,15 @@ in separate console and don't kill it. This command will start appium server and
"--opts",
"../config/mocha.opts",
"--attachToDebug",
+ "--grpe",
+ "button"
],
"internalConsoleOptions": "openOnSessionStart"
}
***mocha options***
-mocha opt file is plased in "../config/mocha.opts".
+mocha opt file is located at "../config/mocha.opts".
--timeout 999999
--recursive e2e
@@ -63,4 +69,8 @@ mocha opt file is plased in "../config/mocha.opts".
--exit
-- grep particular suites: "--grep=tabs-tab(s-\\w+)-suite"
\ No newline at end of file
+***grep particular suit or test***
+
+` npm run e2e ios -- --grep=tabs-tab(s-\\w+)-suite`
+
+
diff --git a/e2e/ui-tests-app/app/action-bar/action-item-position-page.xml b/e2e/ui-tests-app/app/action-bar/action-item-position-page.xml
index 8272a576d..2c3af2caa 100644
--- a/e2e/ui-tests-app/app/action-bar/action-item-position-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/action-item-position-page.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/action-view-page.xml b/e2e/ui-tests-app/app/action-bar/action-view-page.xml
index 1b7bdd152..a48732c58 100644
--- a/e2e/ui-tests-app/app/action-bar/action-view-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/action-view-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/all-page.xml b/e2e/ui-tests-app/app/action-bar/all-page.xml
index c85946305..d9cccc775 100644
--- a/e2e/ui-tests-app/app/action-bar/all-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/all-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/background-css-page.xml b/e2e/ui-tests-app/app/action-bar/background-css-page.xml
index 317736b57..9930234a0 100644
--- a/e2e/ui-tests-app/app/action-bar/background-css-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/background-css-page.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/background-page.xml b/e2e/ui-tests-app/app/action-bar/background-page.xml
index c03793a64..60a17817f 100644
--- a/e2e/ui-tests-app/app/action-bar/background-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/background-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/clean-page.xml b/e2e/ui-tests-app/app/action-bar/clean-page.xml
index 4319ac687..1eb0a61fc 100644
--- a/e2e/ui-tests-app/app/action-bar/clean-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/clean-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/color-page.xml b/e2e/ui-tests-app/app/action-bar/color-page.xml
index 1224561be..0f999e833 100644
--- a/e2e/ui-tests-app/app/action-bar/color-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/color-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/flat-layout-page.xml b/e2e/ui-tests-app/app/action-bar/flat-layout-page.xml
index f7f64f965..95cfa7838 100644
--- a/e2e/ui-tests-app/app/action-bar/flat-layout-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/flat-layout-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/flat-page.xml b/e2e/ui-tests-app/app/action-bar/flat-page.xml
index caefbf7af..73d403de6 100644
--- a/e2e/ui-tests-app/app/action-bar/flat-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/flat-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/flat-scrollview-page.xml b/e2e/ui-tests-app/app/action-bar/flat-scrollview-page.xml
index 7617e5db9..425af1098 100644
--- a/e2e/ui-tests-app/app/action-bar/flat-scrollview-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/flat-scrollview-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/flat-tab-opaque-bar-page.xml b/e2e/ui-tests-app/app/action-bar/flat-tab-opaque-bar-page.xml
index 8314ca617..04030e71e 100644
--- a/e2e/ui-tests-app/app/action-bar/flat-tab-opaque-bar-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/flat-tab-opaque-bar-page.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/flat-tab-page.xml b/e2e/ui-tests-app/app/action-bar/flat-tab-page.xml
index fc177b441..d6f4967ab 100644
--- a/e2e/ui-tests-app/app/action-bar/flat-tab-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/flat-tab-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/font-icons-page.xml b/e2e/ui-tests-app/app/action-bar/font-icons-page.xml
index c9539b0c1..7ba4b9d22 100644
--- a/e2e/ui-tests-app/app/action-bar/font-icons-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/font-icons-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/icons-page.xml b/e2e/ui-tests-app/app/action-bar/icons-page.xml
index cde351035..7c4739b56 100644
--- a/e2e/ui-tests-app/app/action-bar/icons-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/icons-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/local-icons-page.xml b/e2e/ui-tests-app/app/action-bar/local-icons-page.xml
index a0e14c181..5583b4eae 100644
--- a/e2e/ui-tests-app/app/action-bar/local-icons-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/local-icons-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/modal-page-hidden-action-bar-page.xml b/e2e/ui-tests-app/app/action-bar/modal-page-hidden-action-bar-page.xml
index 31268c7c5..ee583a569 100644
--- a/e2e/ui-tests-app/app/action-bar/modal-page-hidden-action-bar-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/modal-page-hidden-action-bar-page.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/modal-test-hidden-action-bar-page.xml b/e2e/ui-tests-app/app/action-bar/modal-test-hidden-action-bar-page.xml
index 868e6fa5f..cf2952521 100644
--- a/e2e/ui-tests-app/app/action-bar/modal-test-hidden-action-bar-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/modal-test-hidden-action-bar-page.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/modal-test-with-action-bar-page.xml b/e2e/ui-tests-app/app/action-bar/modal-test-with-action-bar-page.xml
index 43fc81092..7aee9937a 100644
--- a/e2e/ui-tests-app/app/action-bar/modal-test-with-action-bar-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/modal-test-with-action-bar-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/system-icons-page.xml b/e2e/ui-tests-app/app/action-bar/system-icons-page.xml
index 23a723395..3fdb934f0 100644
--- a/e2e/ui-tests-app/app/action-bar/system-icons-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/system-icons-page.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/e2e/ui-tests-app/app/action-bar/transparent-bg-css-page.xml b/e2e/ui-tests-app/app/action-bar/transparent-bg-css-page.xml
index 42f6c9eb7..d95d8cd73 100644
--- a/e2e/ui-tests-app/app/action-bar/transparent-bg-css-page.xml
+++ b/e2e/ui-tests-app/app/action-bar/transparent-bg-css-page.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/e2e/ui-tests-app/e2e/helpers/image-helper.ts b/e2e/ui-tests-app/e2e/helpers/image-helper.ts
index aeee5e43e..530e9e0dc 100644
--- a/e2e/ui-tests-app/e2e/helpers/image-helper.ts
+++ b/e2e/ui-tests-app/e2e/helpers/image-helper.ts
@@ -1,6 +1,14 @@
export const setImageName = (suite: string, spec: string, testsName: string) => {
- const testName = `${suite}-${spec}-${testsName.replace(suite, "").replace(spec, "")}`.replace(/(\-+)/ig, "-").replace(/(\_+)/ig, "_");
+ let testName = testsName
+ .replace(suite, "")
+ .replace(spec, "");
+ testName = `${suite}-${spec}-${testName}`
+ .replace("should", "-")
+ .replace(/\s+/g, "-")
+ .replace(/\_+/ig, "_")
+ .replace(/[!$%^&*()+|~=`{}\[\]:";'<>?,.\/]/g, "")
+ .replace(/\-+/g, "-");
return testName;
};
\ No newline at end of file
diff --git a/e2e/ui-tests-app/e2e/helpers/navigation-helper.ts b/e2e/ui-tests-app/e2e/helpers/navigation-helper.ts
index ecf6ca396..d93ce7322 100644
--- a/e2e/ui-tests-app/e2e/helpers/navigation-helper.ts
+++ b/e2e/ui-tests-app/e2e/helpers/navigation-helper.ts
@@ -107,9 +107,10 @@ export class NavigationHelper {
const endPoint = {};
if (this._driver.isIOS) {
+ const rect = this._driver.getScreenActualViewPort();
startPoint.x = 5;
- startPoint.y = this._driver.nsCapabilities.device.viewportRect.y / this._driver.nsCapabilities.device.config.density;
- endPoint.x = (this._driver.nsCapabilities.device.viewportRect.width / this._driver.nsCapabilities.device.config.density) - 5;
+ startPoint.y = rect.y;
+ endPoint.x = (rect.width / this._driver.nsCapabilities.device.deviceScreenDensity) - 5;
endPoint.y = startPoint.y;
await this._driver.swipe(startPoint, endPoint);
diff --git a/e2e/ui-tests-app/e2e/suites/action-bar/action-bar-base-page.ts b/e2e/ui-tests-app/e2e/suites/action-bar/action-bar-base-page.ts
new file mode 100644
index 000000000..a84ee85eb
--- /dev/null
+++ b/e2e/ui-tests-app/e2e/suites/action-bar/action-bar-base-page.ts
@@ -0,0 +1,13 @@
+import { AppiumDriver } from "nativescript-dev-appium";
+import { PageObjectBaseModel } from "../../page-object-base-model";
+
+export class ActionBarBasePage extends PageObjectBaseModel {
+ private readonly automationText: string = "actionBar";
+ constructor(_driver: AppiumDriver) {
+ super(_driver, ["action-bar"]);
+ }
+
+ get actionBar() {
+ return this._driver.waitForElement(this.automationText);
+ }
+}
\ No newline at end of file
diff --git a/e2e/ui-tests-app/e2e/suites/action-bar/action-bar-tests.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/action-bar/action-bar-tests.e2e-spec.ts
new file mode 100644
index 000000000..37a399514
--- /dev/null
+++ b/e2e/ui-tests-app/e2e/suites/action-bar/action-bar-tests.e2e-spec.ts
@@ -0,0 +1,307 @@
+import { nsCapabilities, createDriver, AppiumDriver, SearchOptions, logError } from "nativescript-dev-appium";
+import { ActionBarBasePage } from "./action-bar-base-page";
+import { assert } from "chai";
+import { setImageName } from "../../helpers/image-helper";
+// import { unlinkSync, existsSync } from "fs";
+
+const suite = "action-bar";
+const testNamePrefix = `${suite}: `;
+
+describe(`${suite}-suite`, async function () {
+ let driver: AppiumDriver;
+ let actionBarBasePage: ActionBarBasePage;
+
+ before(async function () {
+ nsCapabilities.testReporter.context = this;
+ driver = await createDriver();
+ await driver.restartApp();
+ actionBarBasePage = new ActionBarBasePage(driver);
+ await actionBarBasePage.initSuite();
+ });
+
+ after(async function () {
+ await actionBarBasePage.endSuite();
+ });
+
+ beforeEach(async function () {
+ driver.imageHelper.testName = setImageName(suite, "", this.currentTest.title);
+ driver.imageHelper.options = {
+ donNotAppendActualSuffixOnIntialImageCapture: true
+ };
+ });
+
+ afterEach(async function () {
+ if (this.currentTest.state === "failed") {
+ await driver.logTestArtifacts(this.currentTest.title);
+ // await driver.resetApp();
+ // await actionBarBasePage.initSuite();
+ }
+ });
+
+ const btnGoToClearPageTap = async () => {
+ await clickOnElement("go to cleared page");
+ };
+
+ const btnGoToPrevPageTap = async () => {
+ await clickOnElement("go to previous page");
+ };
+
+ const btnTap = async () => {
+ await clickOnElement("Tap");
+ };
+
+ const clickOnElement = async (automationText: string) => {
+ const el = await driver.waitForElement(automationText);
+ if (el === null) {
+ logError(`Element ${automationText} not found!`);
+ assert.isTrue(false, `Element ${automationText} should be visible`);
+ }
+ await el.click();
+ };
+
+ it(`${testNamePrefix}"actBG", set background color`, async function () {
+ await actionBarBasePage.navigateToSample("actBG");
+ await driver.imageHelper.compareScreen();
+
+ await btnGoToClearPageTap();
+ await driver.imageHelper.compareScreen();
+
+ await btnGoToPrevPageTap();
+ await driver.imageHelper.compareScreen();
+
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix}"actBGCss", issue-516`, async function () {
+ await actionBarBasePage.navigateToSample("actBGCss");
+ const imageNameRed = setImageName(suite, "", `${testNamePrefix} should navigate to "actBGCss" issue-516-red`);
+ const imageNameTrans = setImageName(suite, "", `${testNamePrefix} should navigate to "actBGCss" issue-516-trans`);
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar, { imageName: imageNameRed, keepOriginalImageName: true });
+ await btnGoToClearPageTap();
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar, { imageName: imageNameTrans, keepOriginalImageName: true });
+
+ await btnGoToPrevPageTap();
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar, { imageName: imageNameRed, keepOriginalImageName: true });
+
+ await btnGoToClearPageTap();
+ await (await driver.waitForElement("ITEM")).click();
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar, { imageName: imageNameRed, keepOriginalImageName: true });
+
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix}"actColor", should set text color`, async function () {
+ await actionBarBasePage.navigateToSample("actColor");
+ const result = await driver.compareScreen();
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(result);
+ });
+
+ it(`${testNamePrefix}"actIcons"`, async function () {
+ await actionBarBasePage.navigateToSample("actIcons");
+ const result = await driver.compareElement(await actionBarBasePage.actionBar);
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(result);
+ });
+
+ it(`${testNamePrefix}"actLocalIcons"`, async function () {
+ await actionBarBasePage.navigateToSample("actLocalIcons");
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
+
+ await clickOnElement("undefined");
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
+
+ await clickOnElement("alwaysTemplate");
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
+
+ await clickOnElement("undefined");
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
+
+ await clickOnElement("automatic");
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix}"actResIcons"`, async function () {
+ await actionBarBasePage.navigateToSample("actResIcons");
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
+
+ await clickOnElement("undefined");
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
+
+ await clickOnElement("alwaysTemplate");
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
+
+ await clickOnElement("undefined");
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
+
+ await clickOnElement("automatic");
+ await driver.imageHelper.compareElement(await actionBarBasePage.actionBar);
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix} should navigate to actStyle`, async function () {
+ await actionBarBasePage.navigateToSample("actStyle");
+ const result = await driver.compareElement(await actionBarBasePage.actionBar);
+ assert.isTrue(result);
+ });
+
+ it(`${testNamePrefix} should "go to cleared page"`, async function () {
+ await btnGoToClearPageTap();
+ const result = await driver.compareElement(await actionBarBasePage.actionBar);
+ assert.isTrue(result);
+ });
+
+ it(`${testNamePrefix} should "go to previous page"`, async function () {
+ await btnGoToPrevPageTap();
+ const result = await driver.compareElement(await actionBarBasePage.actionBar);
+ assert.isTrue(result);
+ });
+
+ it(`${testNamePrefix} click on "ITEM" and navigate to clean page`, async function () {
+ await (await driver.waitForElement("ITEM")).click();
+ const result = await driver.compareElement(await actionBarBasePage.actionBar);
+ assert.isTrue(result);
+ });
+
+ it(`${testNamePrefix} click on "ITEM" and navigate to action bar style initial page`, async function () {
+ await (await driver.waitForElement("ITEM")).click();
+ const result = await driver.compareElement(await actionBarBasePage.actionBar, `${suite}-navigate-to-actStyle`);
+
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(result);
+ });
+
+ it(`${testNamePrefix} should navigate to "actView"`, async function () {
+ await actionBarBasePage.navigateToSample("actView");
+ const result = await driver.compareElement(await actionBarBasePage.actionBar);
+ assert.isTrue(result);
+ });
+
+ it(`${testNamePrefix} should navigate with "Green" button`, async function () {
+ await (await driver.waitForElement("Green")).click();
+ const result = await driver.compareElement(await actionBarBasePage.actionBar, setImageName(suite, ``, `${testNamePrefix} should "go to cleared page"`));
+ assert.isTrue(result);
+ });
+
+ it(`${testNamePrefix} should navigate back with "BACK"`, async function () {
+ await driver.navBack();
+ const result = await driver.compareElement(await actionBarBasePage.actionBar, setImageName(suite, "", `${testNamePrefix} should navigate to "actView"`));
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(result);
+ });
+
+ it(`${testNamePrefix}"actionItemPosition",should change item position`, async function () {
+ await actionBarBasePage.navigateToSample("actionItemPosition");
+ await driver.imageHelper.compareScreen();
+
+ await btnTap();
+ await driver.imageHelper.compareScreen();
+
+ await btnTap();
+ await driver.imageHelper.compareScreen();
+
+ await btnTap();
+ await driver.imageHelper.compareScreen();
+
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix}"actTransparentBgCss", page background color as actBackground color`, async function () {
+ await actionBarBasePage.navigateToSample("actTransparentBgCss");
+ await driver.imageHelper.compareScreen();
+
+ await (await driver.waitForElement("go to cleared page")).click();
+ await driver.imageHelper.compareScreen();
+
+ await (await driver.waitForElement("ITEM")).click();
+ await driver.imageHelper.compareScreen();
+
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix} should navigate to "modalShownActBar" nav back with "Go Back"`, async function () {
+ await actionBarBasePage.navigateToSample("modalShownActBar");
+ await driver.imageHelper.compareScreen();
+
+ await (await driver.waitForElement("Open Modal")).click();
+ await driver.imageHelper.compareScreen();
+
+ await (await driver.waitForElement("Close")).click();
+ await driver.imageHelper.compareScreen();
+
+ await (await driver.waitForElement("Go Back")).click();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix} should navigate to "modalHiddenActBar" nav back with "Go Back"`, async function () {
+ await actionBarBasePage.navigateToSample("modalHiddenActBar");
+ await driver.imageHelper.compareScreen();
+
+ await (await driver.waitForElement("Open Modal")).click();
+ await driver.imageHelper.compareScreen();
+
+ await (await driver.waitForElement("Change text")).click();
+ await driver.imageHelper.compareScreen();
+
+ await (await driver.waitForElement("Close")).click();
+ await driver.imageHelper.compareScreen();
+
+ await (await driver.waitForElement("Go Back")).click();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix}"flat", change`, async function () {
+ await actionBarBasePage.navigateToSample("flat");
+ await driver.imageHelper.compareScreen();
+
+ await (await driver.waitForElement("change flat property")).click();
+ await driver.imageHelper.compareScreen();
+
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix}flat-layout"`, async function () {
+ await actionBarBasePage.navigateToSample("flat-layout");
+ await driver.imageHelper.compareScreen();
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix}flat-scrollview`, async function () {
+ await actionBarBasePage.navigateToSample("flat-scrollview");
+ await driver.imageHelper.compareScreen();
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix}"flat-tab"`, async function () {
+ await actionBarBasePage.navigateToSample("flat-tab");
+ await driver.imageHelper.compareScreen();
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ // BUG
+ it(`${testNamePrefix}flat-opaque-bar`, async function () {
+ this.skip();
+ await actionBarBasePage.navigateToSample("flat-tab-opaque-bar");
+ await driver.imageHelper.compareScreen();
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+
+ it(`${testNamePrefix}font-icons`, async function () {
+ await actionBarBasePage.navigateToSample("font-icons");
+ await driver.imageHelper.compareScreen();
+ await actionBarBasePage.navigateBackToSuitMainPage();
+ assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+ });
+});
\ No newline at end of file
diff --git a/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts b/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts
index ede3d634f..b93b6d45a 100644
--- a/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts
+++ b/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts
@@ -8,7 +8,6 @@ export class ButtonBackgroundPage extends PageObjectBaseModel {
constructor(_driver: AppiumDriver) {
super(_driver, ["button", "background"], ElementCacheStrategy.none);
- this._driver.imageHelper.options.toleranceType = ImageOptions.percent;
}
public viewGroupLocator() {
diff --git a/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts
index 1938ede8a..eecb234cd 100644
--- a/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts
+++ b/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts
@@ -17,7 +17,6 @@ describe(`${imagePrefix}-suite`, () => {
await driver.restartApp();
backgroundPage = new ButtonBackgroundPage(driver);
await backgroundPage.initSuite();
- driver.imageHelper.options.donNotAppendActualSuffixOnIntialImageCapture = true;
});
after(async function () {
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts
index e863057fd..1bcd4fd0e 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts
@@ -1,7 +1,6 @@
import { nsCapabilities, createDriver, AppiumDriver, Direction } from "nativescript-dev-appium";
import { BottomNavigationBasePage } from "./bottom-navigation-base-page";
import { Platform } from "mobile-devices-controller";
-import { ElementCacheStrategy } from "../../../helpers/navigation-helper";
import { setImageName } from "../../../helpers/image-helper";
import { assert } from "chai";
@@ -22,6 +21,7 @@ describe(`${imagePrefix}-suite`, async function () {
];
before(async function () {
+ this.skip();
nsCapabilities.testReporter.context = this;
driver = await createDriver();
await driver.restartApp();
@@ -30,10 +30,12 @@ describe(`${imagePrefix}-suite`, async function () {
});
after(async function () {
+ this.skip();
await bottomNavigationBasePage.endSuite();
});
afterEach(async function () {
+ this.skip();
if (this.currentTest.state === "failed") {
await driver.logTestArtifacts(this.currentTest.title);
await driver.restartApp();
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-navigation-base-page.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-navigation-base-page.ts
index 1e798c28f..ab8c76102 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-navigation-base-page.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-navigation-base-page.ts
@@ -1,7 +1,6 @@
import { AppiumDriver, Point, IRectangle, UIElement, logInfo, logWarn } from "nativescript-dev-appium";
import { PageObjectBaseModel } from "../../page-object-base-model";
import { ElementCacheStrategy } from "../../helpers/navigation-helper";
-import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
export abstract class TabNavigationBasePage extends PageObjectBaseModel {
protected bottomNavigatioinTabRect: IRectangle;
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/issues-from-git.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/issues-from-git.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/tabs/tabs-tests.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/tabs/tabs-tests.e2e-spec.ts
index aa3aafc86..a889586b3 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/tabs/tabs-tests.e2e-spec.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/tabs/tabs-tests.e2e-spec.ts
@@ -25,9 +25,6 @@ describe(`${imagePrefix}-suite`, async function () {
beforeEach(async function () {
driver.imageHelper.testName = setImageName(suite, spec, this.currentTest.title);
- driver.imageHelper.options = {
- donNotAppendActualSuffixOnIntialImageCapture: true
- };
});
afterEach(async function () {
diff --git a/gruntfile.js b/gruntfile.js
index 9411b6f8a..a436548aa 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -237,7 +237,7 @@ module.exports = function (grunt) {
},
platformsFiles: {
expand: true,
- src: "tns-core-modules/platforms/**/*.*",
+ src: "tns-core-modules/platforms/**/*",
dest: localCfg.outDir + "/"
},
apps: {
diff --git a/tns-core-modules-widgets/.gitignore b/tns-core-modules-widgets/.gitignore
index 4fbddfeda..f29a91f50 100644
--- a/tns-core-modules-widgets/.gitignore
+++ b/tns-core-modules-widgets/.gitignore
@@ -46,7 +46,6 @@ local.properties
ios/TNSWidgets/TNSWidgets.xcodeproj/project.xcworkspace/xcuserdata/
ios/TNSWidgets/TNSWidgets.xcodeproj/xcuserdata/
ios/TNSWidgets/DerivedData/
-ios/TNSWidgets/Pods/
xcuserdata/
android/widgets/bin
diff --git a/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabStrip.java b/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabStrip.java
index 113ac9d5f..be7970d42 100644
--- a/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabStrip.java
+++ b/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabStrip.java
@@ -170,7 +170,9 @@ class TabStrip extends LinearLayout {
}
@Override
- protected void onDraw(Canvas canvas) {
+ protected void dispatchDraw(Canvas canvas) {
+ super.dispatchDraw(canvas);
+
final int height = getHeight();
final int childCount = getChildCount();
final TabLayout.TabColorizer tabColorizer = mCustomTabColorizer != null
diff --git a/tns-core-modules-widgets/build.ios.sh b/tns-core-modules-widgets/build.ios.sh
index 66342487b..79736026c 100755
--- a/tns-core-modules-widgets/build.ios.sh
+++ b/tns-core-modules-widgets/build.ios.sh
@@ -16,9 +16,6 @@ cd ios
cd ..
echo "Copy ios/TNSWidgets/build/*.framework dist/package/platforms/ios"
-cp -R ios/TNSWidgets/build/MaterialComponents.framework dist/package/platforms/ios
-cp -R ios/TNSWidgets/build/MDFInternationalization.framework dist/package/platforms/ios
-cp -R ios/TNSWidgets/build/Pods_TNSWidgets.framework dist/package/platforms/ios
cp -R ios/TNSWidgets/build/TNSWidgets.framework dist/package/platforms/ios
cp ios/TNSWidgets/build/*.framework.dSYM.zip dist/package/platforms/ios
diff --git a/tns-core-modules-widgets/ios/TNSWidgets/Podfile b/tns-core-modules-widgets/ios/TNSWidgets/Podfile
deleted file mode 100644
index 01b809d3e..000000000
--- a/tns-core-modules-widgets/ios/TNSWidgets/Podfile
+++ /dev/null
@@ -1,6 +0,0 @@
-platform :ios, '10.0'
-use_frameworks!
-
-target 'TNSWidgets' do
- pod 'MaterialComponents/Tabs', '84.4.0'
-end
\ No newline at end of file
diff --git a/tns-core-modules-widgets/ios/TNSWidgets/Podfile.lock b/tns-core-modules-widgets/ios/TNSWidgets/Podfile.lock
deleted file mode 100644
index 80f479d86..000000000
--- a/tns-core-modules-widgets/ios/TNSWidgets/Podfile.lock
+++ /dev/null
@@ -1,39 +0,0 @@
-PODS:
- - MaterialComponents/AnimationTiming (84.4.0)
- - MaterialComponents/Ink (84.4.0):
- - MaterialComponents/private/Math
- - MaterialComponents/Palettes (84.4.0)
- - MaterialComponents/private/Application (84.4.0)
- - MaterialComponents/private/Math (84.4.0)
- - MaterialComponents/ShadowElevations (84.4.0)
- - MaterialComponents/ShadowLayer (84.4.0):
- - MaterialComponents/ShadowElevations
- - MaterialComponents/Tabs (84.4.0):
- - MaterialComponents/AnimationTiming
- - MaterialComponents/Ink
- - MaterialComponents/Palettes
- - MaterialComponents/private/Math
- - MaterialComponents/ShadowElevations
- - MaterialComponents/ShadowLayer
- - MaterialComponents/Typography
- - MDFInternationalization
- - MaterialComponents/Typography (84.4.0):
- - MaterialComponents/private/Application
- - MaterialComponents/private/Math
- - MDFInternationalization (2.0.0)
-
-DEPENDENCIES:
- - MaterialComponents/Tabs (= 84.4.0)
-
-SPEC REPOS:
- https://github.com/cocoapods/specs.git:
- - MaterialComponents
- - MDFInternationalization
-
-SPEC CHECKSUMS:
- MaterialComponents: e31f67324695bb1b537e5eccaee62db07ac3d06b
- MDFInternationalization: 010097556d6b09d2c4ea38e0820ea6d37be6a314
-
-PODFILE CHECKSUM: cf8c5f11be5a664a1b63632768c1ac024bf37a30
-
-COCOAPODS: 1.5.3
diff --git a/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcodeproj/project.pbxproj b/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcodeproj/project.pbxproj
index d23fc8ecc..05f34d003 100644
--- a/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcodeproj/project.pbxproj
+++ b/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
- 3E944C4C61C317F04FCA72D5 /* Pods_TNSWidgets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */; };
8B7321CF1D097ECD00884AC6 /* TNSLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B7321CD1D097ECD00884AC6 /* TNSLabel.h */; settings = {ATTRIBUTES = (Public, ); }; };
8B7321D01D097ECD00884AC6 /* TNSLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B7321CE1D097ECD00884AC6 /* TNSLabel.m */; };
B8E76F52212C2DA2009CFCE2 /* NSObject+Swizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = B8E76F50212C2DA2009CFCE2 /* NSObject+Swizzling.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -36,7 +35,6 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
- 0CA2D2E3500594F250B7E5AD /* Pods-TNSWidgets.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TNSWidgets.release.xcconfig"; path = "Pods/Target Support Files/Pods-TNSWidgets/Pods-TNSWidgets.release.xcconfig"; sourceTree = ""; };
8B7321CD1D097ECD00884AC6 /* TNSLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TNSLabel.h; sourceTree = ""; };
8B7321CE1D097ECD00884AC6 /* TNSLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TNSLabel.m; sourceTree = ""; };
B8E76F50212C2DA2009CFCE2 /* NSObject+Swizzling.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+Swizzling.h"; sourceTree = ""; };
@@ -45,8 +43,6 @@
B8E76F59212C2F4E009CFCE2 /* UIView+PropertyBag.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+PropertyBag.m"; sourceTree = ""; };
B8E76F5C212C3134009CFCE2 /* UIView+PassThroughParent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+PassThroughParent.h"; sourceTree = ""; };
B8E76F5D212C3134009CFCE2 /* UIView+PassThroughParent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+PassThroughParent.m"; sourceTree = ""; };
- BA714249C33720A4C73F2D73 /* Pods-TNSWidgets.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TNSWidgets.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TNSWidgets/Pods-TNSWidgets.debug.xcconfig"; sourceTree = ""; };
- C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TNSWidgets.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F915D3531EC9EF5E00071914 /* TNSProcess.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TNSProcess.m; path = ../TNSProcess.m; sourceTree = ""; };
F915D3541EC9EF5E00071914 /* TNSProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TNSProcess.h; path = ../TNSProcess.h; sourceTree = ""; };
F98F5CAF1CD0EFEA00978308 /* TNSWidgets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TNSWidgets.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -64,7 +60,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 3E944C4C61C317F04FCA72D5 /* Pods_TNSWidgets.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -79,31 +74,12 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
- 23F4E40A96EF6D33AE4654D3 /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- C9DA784D6AE838F6BE65AB7D /* Pods_TNSWidgets.framework */,
- );
- name = Frameworks;
- sourceTree = "";
- };
- 50D824CFC5BFEB60164D83B1 /* Pods */ = {
- isa = PBXGroup;
- children = (
- BA714249C33720A4C73F2D73 /* Pods-TNSWidgets.debug.xcconfig */,
- 0CA2D2E3500594F250B7E5AD /* Pods-TNSWidgets.release.xcconfig */,
- );
- name = Pods;
- sourceTree = "";
- };
F98F5CA51CD0EFEA00978308 = {
isa = PBXGroup;
children = (
F98F5CB11CD0EFEA00978308 /* TNSWidgets */,
F98F5CBD1CD0EFEA00978308 /* TNSWidgetsTests */,
F98F5CB01CD0EFEA00978308 /* Products */,
- 50D824CFC5BFEB60164D83B1 /* Pods */,
- 23F4E40A96EF6D33AE4654D3 /* Frameworks */,
);
sourceTree = "";
};
@@ -170,7 +146,6 @@
isa = PBXNativeTarget;
buildConfigurationList = F98F5CC31CD0EFEA00978308 /* Build configuration list for PBXNativeTarget "TNSWidgets" */;
buildPhases = (
- A19DC6B35DC47BC836BB21AE /* [CP] Check Pods Manifest.lock */,
F98F5CAA1CD0EFEA00978308 /* Sources */,
F98F5CAB1CD0EFEA00978308 /* Frameworks */,
F98F5CAC1CD0EFEA00978308 /* Headers */,
@@ -255,31 +230,6 @@
};
/* End PBXResourcesBuildPhase section */
-/* Begin PBXShellScriptBuildPhase section */
- A19DC6B35DC47BC836BB21AE /* [CP] Check Pods Manifest.lock */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- );
- inputPaths = (
- "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
- "${PODS_ROOT}/Manifest.lock",
- );
- name = "[CP] Check Pods Manifest.lock";
- outputFileListPaths = (
- );
- outputPaths = (
- "$(DERIVED_FILE_DIR)/Pods-TNSWidgets-checkManifestLockResult.txt",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
- showEnvVarsInLog = 0;
- };
-/* End PBXShellScriptBuildPhase section */
-
/* Begin PBXSourcesBuildPhase section */
F98F5CAA1CD0EFEA00978308 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -403,7 +353,6 @@
};
F98F5CC41CD0EFEA00978308 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = BA714249C33720A4C73F2D73 /* Pods-TNSWidgets.debug.xcconfig */;
buildSettings = {
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -420,7 +369,6 @@
};
F98F5CC51CD0EFEA00978308 /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 0CA2D2E3500594F250B7E5AD /* Pods-TNSWidgets.release.xcconfig */;
buildSettings = {
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/contents.xcworkspacedata b/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 219395415..000000000
--- a/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
diff --git a/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003..000000000
--- a/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- IDEDidComputeMac32BitWarning
-
-
-
diff --git a/tns-core-modules-widgets/ios/build.sh b/tns-core-modules-widgets/ios/build.sh
index 6273ea297..af6a21e49 100755
--- a/tns-core-modules-widgets/ios/build.sh
+++ b/tns-core-modules-widgets/ios/build.sh
@@ -3,17 +3,11 @@
echo "Set exit on simple errors"
set -e
-(
- echo "update pods"
- cd TNSWidgets
- pod install
-)
-
echo "Build for iphonesimulator"
-xcodebuild -workspace TNSWidgets/TNSWidgets.xcworkspace -scheme TNSWidgets -sdk iphonesimulator -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build -quiet
+xcodebuild -project TNSWidgets/TNSWidgets.xcodeproj -scheme TNSWidgets -sdk iphonesimulator -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build -quiet
echo "Build for iphoneos"
-xcodebuild -workspace TNSWidgets/TNSWidgets.xcworkspace -scheme TNSWidgets -sdk iphoneos -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -quiet
+xcodebuild -project TNSWidgets/TNSWidgets.xcodeproj -scheme TNSWidgets -sdk iphoneos -configuration Release clean build BUILD_DIR=$(PWD)/TNSWidgets/build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -quiet
function buildFatFramework() {
FRAMEWORK_NAME=$1
@@ -50,6 +44,3 @@ function buildFatFramework() {
}
buildFatFramework TNSWidgets .
-buildFatFramework Pods_TNSWidgets .
-buildFatFramework MDFInternationalization MDFInternationalization
-buildFatFramework MaterialComponents MaterialComponents
diff --git a/tns-core-modules/package.json b/tns-core-modules/package.json
index 078302d0f..91325f896 100644
--- a/tns-core-modules/package.json
+++ b/tns-core-modules/package.json
@@ -26,7 +26,7 @@
"license": "Apache-2.0",
"typings": "tns-core-modules.d.ts",
"dependencies": {
- "tns-core-modules-widgets": "6.0.1",
+ "tns-core-modules-widgets": "next",
"tslib": "^1.9.3"
},
"devDependencies": {
diff --git a/tns-core-modules/platforms/ios/Podfile b/tns-core-modules/platforms/ios/Podfile
new file mode 100644
index 000000000..c1b2f02b7
--- /dev/null
+++ b/tns-core-modules/platforms/ios/Podfile
@@ -0,0 +1 @@
+pod 'MaterialComponents/Tabs', '~> 84.4'
\ No newline at end of file