Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/automated/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
},
"configurations": {}
},
"clean": {
"executor": "@nativescript/nx:clean",
"options": {}
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
Expand Down
4 changes: 2 additions & 2 deletions apps/automated/src/ui/layouts/safe-area-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export class SafeAreaTests extends testModule.UITest<any> {

const view: UIView = layout.page.actionBar.nativeViewProtected;
// use the action bar position and size instead of the status bar and action bar heights as those are unreliable on iOS 16+
const topInset = round(dipToDp(view.frame.origin.y + view.frame.size.height));
const topInset = Math.round(dipToDp(view.frame.origin.y + view.frame.size.height));

const insets = layout.getSafeAreaInsets();
equal(insets.top, topInset, `${layout}.topInset - actual:${insets.top}; expected: ${topInset}`);
Expand All @@ -87,7 +87,7 @@ export class SafeAreaTests extends testModule.UITest<any> {
const keyWindow = Utils.ios.getWindow();
// const statusBarHeight = round(dipToDp(app.statusBarFrame.size.height));
// use window inset instead of status bar frame as that's unreliable on iOS 16+
const topInset = round(dipToDp(keyWindow ? keyWindow.safeAreaInsets.top : UIApplication.sharedApplication.keyWindow.safeAreaInsets.top));
const topInset = Math.round(dipToDp(keyWindow ? keyWindow.safeAreaInsets.top : UIApplication.sharedApplication.keyWindow.safeAreaInsets.top));

const insets = layout.getSafeAreaInsets();
equal(insets.top, topInset, `${layout}.topInset - actual:${insets.top}; expected: ${topInset}`);
Expand Down
10 changes: 5 additions & 5 deletions apps/automated/src/ui/scroll-view/scroll-view-safe-area-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ScrollLayoutSafeAreaTest extends UITest<ScrollView> {
waitUntilTestElementLayoutIsValid(ui.root);
test(ui);
},
pageOptions
pageOptions,
);
}

Expand Down Expand Up @@ -70,7 +70,7 @@ class ScrollLayoutSafeAreaTest extends UITest<ScrollView> {
({ root }) => {
this.scroll_view_in_full_screen(root, pageOptions);
},
pageOptions
pageOptions,
);
}

Expand Down Expand Up @@ -194,11 +194,11 @@ class ScrollLayoutSafeAreaTest extends UITest<ScrollView> {
isBelowWith(root, childFirst, insets.top);
isRightWith(childFirst, root, insets.right);

const scrollViewContentHeight = round(dipToDp(root.nativeViewProtected.contentSize.height));
const scrollViewContentHeight = Math.round(dipToDp(root.nativeViewProtected.contentSize.height));
const sumOfNestedLabelHeightsAndInsets = height(childFirst) * stack.getChildrenCount() + insets.top + insets.bottom;
equal(scrollViewContentHeight, sumOfNestedLabelHeightsAndInsets, `scroll view content height<${scrollViewContentHeight}> sum of nested label height and insets <${sumOfNestedLabelHeightsAndInsets}>`);
},
pageOptions
pageOptions,
);
}

Expand Down Expand Up @@ -426,7 +426,7 @@ class ScrollLayoutSafeAreaTest extends UITest<ScrollView> {
const sumOfNestedScrollViewWidths = width(cells[1][0]) + width(cells[1][1]) + width(cells[1][2]);
equal(width(grid), sumOfNestedScrollViewWidths, `grid width<${width(grid)}> sum of nested scroll views width <${sumOfNestedScrollViewWidths}>`);
},
pageOptions
pageOptions,
);
}

Expand Down
2 changes: 1 addition & 1 deletion apps/toolbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"@nativescript/core": "file:../../packages/core",
"@nativescript/imagepicker": "^3.2.1",
"@nativescript/imagepicker": "^4.1.0",
"nativescript-theme-core": "file:../../node_modules/nativescript-theme-core"
},
"devDependencies": {
Expand Down
4 changes: 4 additions & 0 deletions apps/toolbox/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
},
"configurations": {}
},
"clean": {
"executor": "@nativescript/nx:clean",
"options": {}
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
Expand Down
Loading