Skip to content

Commit 3632256

Browse files
SvetoslavTsenovSvetoslavTsenov
authored
Merge pull request #7653 from NativeScript/tsenov/merge-release-in-master
chore: merge release in master
2 parents 5fd7913 + 121a0b5 commit 3632256

13 files changed

Lines changed: 549 additions & 56 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## [6.0.5](https://github.com/NativeScript/NativeScript/compare/6.0.4...6.0.5) (2019-08-02)
2+
3+
4+
### Bug Fixes
5+
6+
* **bottom-navigation:** codebehind creation ([#7624](https://github.com/NativeScript/NativeScript/issues/7624)) ([056d0bf](https://github.com/NativeScript/NativeScript/commit/056d0bf))
7+
* **tabs-android:** tabStripItem color not applied ([#7617](https://github.com/NativeScript/NativeScript/issues/7617)) ([2518655](https://github.com/NativeScript/NativeScript/commit/2518655))
8+
* prevent plugin podfile platform version clash ([#7626](https://github.com/NativeScript/NativeScript/issues/7626)) ([49b3571](https://github.com/NativeScript/NativeScript/commit/49b3571))
9+
10+
11+
112
<a name="6.0.4"></a>
213
## [6.0.4](https://github.com/NativeScript/NativeScript/compare/6.0.3...6.0.4) (2019-07-30)
314

‎e2e/ui-tests-app/e2e/page-object-base-model.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ export abstract class PageObjectBaseModel {
66

77
public navigationHelper: NavigationHelper;
88

9-
constructor(protected _driver: AppiumDriver, protected _naviagtionLinks: Array<string>, elementCacheStrategy: ElementCacheStrategy = ElementCacheStrategy.none) {
10-
this.navigationHelper = new NavigationHelper(this._driver, this._naviagtionLinks, elementCacheStrategy);
11-
this._driver.imageHelper.options.overwriteActualImage = process.env["OVERWRITE_ACTUALIMAGE"] === "true";
9+
constructor(protected _driver: AppiumDriver, protected _navigationLinks: Array<string>, elementCacheStrategy: ElementCacheStrategy = ElementCacheStrategy.none) {
10+
this.navigationHelper = new NavigationHelper(this._driver, this._navigationLinks, elementCacheStrategy);
11+
this._driver.imageHelper.options.overwriteActualImage = process.env["OVERWRITE_ACTUAL_IMAGE"] === "true";
1212
this._driver.imageHelper.options.waitBeforeCreatingInitialImageCapture = +process.env["WAIT_BEFORE_CREATING_INITIAL_IMAGE_CAPTURE"] || 9000;
1313
this._driver.imageHelper.options.keepOriginalImageSize = false;
1414
this._driver.imageHelper.options.tolerance = 0;
@@ -20,7 +20,7 @@ export abstract class PageObjectBaseModel {
2020
}
2121

2222
async endSuite() {
23-
const suiteName = this._naviagtionLinks.join("-");
23+
const suiteName = this._navigationLinks.join("-");
2424
logInfo(`End of suit ${suiteName} tests!`);
2525
}
2626

‎e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ describe(`${imagePrefix}-suite`, async function () {
6161
await tabTwo.click();
6262
await driver.imageHelper.compareScreen({ imageName: imageName });
6363

64-
const imageComparissonresult = driver.imageHelper.hasImageComparisonPassed();
65-
assert.isTrue(imageComparissonresult);
64+
const imageComparisonResult = driver.imageHelper.hasImageComparisonPassed();
65+
assert.isTrue(imageComparisonResult);
6666

67-
if (imageComparissonresult) {
67+
if (imageComparisonResult) {
6868
const tabOne = await driver.waitForElement(sample.tab1);
6969
await tabOne.click();
7070
}

‎e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { nsCapabilities, createDriver, AppiumDriver, DeviceOrientaion, logInfo } from "nativescript-dev-appium";
1+
import { nsCapabilities, createDriver, AppiumDriver, DeviceOrientation, logInfo } from "nativescript-dev-appium";
22
import { BottomNavigationBasePage } from "./bottom-navigation-base-page";
33
import { assert } from "chai";
44
import { setImageName } from "../../../helpers/image-helper";
@@ -28,8 +28,8 @@ describe(`${suite}-${spec}-suite`, async function () {
2828

2929
afterEach(async function () {
3030
const orientation = await driver.getOrientation();
31-
if (orientation === DeviceOrientaion.LANDSCAPE) {
32-
await driver.setOrientation(DeviceOrientaion.PORTRAIT);
31+
if (orientation === DeviceOrientation.LANDSCAPE) {
32+
await driver.setOrientation(DeviceOrientation.PORTRAIT);
3333
}
3434
if (this.currentTest.state === "failed") {
3535
await driver.logTestArtifacts(this.currentTest.title);
@@ -186,13 +186,13 @@ describe(`${suite}-${spec}-suite`, async function () {
186186

187187
it(`${spec}-fancy-fonts-change-orientation`, async function () {
188188
await bottomNavigationBasePage.navigateToSample("fancy-fonts");
189-
await driver.setOrientation(DeviceOrientaion.LANDSCAPE);
189+
await driver.setOrientation(DeviceOrientation.LANDSCAPE);
190190
await driver.imageHelper.compareScreen();
191191

192192
await driver.backgroundApp(1);
193193
await driver.imageHelper.compareScreen();
194194

195-
// await driver.setOrientation(DeviceOrientaion.PORTRAIT);
195+
// await driver.setOrientation(DeviceOrientation.PORTRAIT);
196196
await driver.imageHelper.compareScreen();
197197

198198
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());

‎e2e/ui-tests-app/e2e/suites/tab-navigation/tab-navigation-base-page.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export abstract class TabNavigationBasePage extends PageObjectBaseModel {
1515
abstract async getItems();
1616

1717
async init(subSuiteName: string) {
18-
this._naviagtionLinks.push(subSuiteName);
18+
this._navigationLinks.push(subSuiteName);
1919
await super.initSuite();
2020
}
2121

‎e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class TabViewBasePage extends PageObjectBaseModel {
1010
}
1111

1212
async init(subSuiteName: string) {
13-
this._naviagtionLinks.push(subSuiteName);
13+
this._navigationLinks.push(subSuiteName);
1414
await super.initSuite();
1515
}
1616
}

‎tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabStrip.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,21 @@ private void updateTabsTextFontSize(){
152152
}
153153
}
154154

155+
// Used by TabLayout (the 'old' tab-view control)
155156
void onViewPagerPageChanged(int position, float positionOffset) {
156157
mSelectedPosition = position;
157158
mSelectionOffset = positionOffset;
158159
invalidate();
159160
updateTabsTextColor();
160161
}
161162

163+
// Used by TabsBar
164+
void onTabsViewPagerPageChanged(int position, float positionOffset) {
165+
mSelectedPosition = position;
166+
mSelectionOffset = positionOffset;
167+
invalidate();
168+
}
169+
162170
int getSelectedPosition(){
163171
return mSelectedPosition;
164172
}

0 commit comments

Comments
 (0)