Skip to content

Commit 603c901

Browse files
MartoYankovSvetoslavTsenov
MartoYankov
authored and
SvetoslavTsenov
committed
feat(action-bar): flat mode breaks ios safe area (#6862)
1 parent 8c80044 commit 603c901

15 files changed

Lines changed: 164 additions & 3 deletions

‎apps/app/ui-tests-app/action-bar/flat-scrollview.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
2+
3+
<ActionBar flat="true" backgroundColor="blue">
4+
<Label text="flat action bar"></Label>
5+
</ActionBar>
6+
7+
<ScrollView backgroundColor="green">
8+
<Label text="lorem ipsum" backgroundColor="red"></Label>
9+
</ScrollView>
10+
</Page>

‎apps/app/ui-tests-app/action-bar/flat-tab.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
2+
3+
<ActionBar flat="true">
4+
<Label text="flat action bar"></Label>
5+
</ActionBar>
6+
7+
<TabView selectedTabTextColor="green">
8+
<TabViewItem title="First">
9+
<GridLayout backgroundColor="red">
10+
<Button text="test" backgroundColor="yellow"></Button>
11+
</GridLayout>
12+
</TabViewItem>
13+
</TabView>
14+
</Page>

‎apps/app/ui-tests-app/action-bar/main-page.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ export function loadExamples() {
2222
examples.set("modalHiddenActBar", "action-bar/modal-test-hidden-action-bar");
2323
examples.set("modalShownActBar", "action-bar/modal-test-with-action-bar");
2424
examples.set("flat", "action-bar/flat");
25+
examples.set("flat-tab", "action-bar/flat-tab");
26+
examples.set("flat-scrollview", "action-bar/flat-scrollview");
2527

2628
return examples;
2729
}

‎apps/app/ui-tests-app/nested-frames/full-screen-n-y-flat.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd" actionBarHidden="true">
2+
3+
<ActionBar>
4+
<Label text="Parent page"></Label>
5+
</ActionBar>
6+
7+
<GridLayout backgroundColor="blue">
8+
<Frame id="nestedFrame" defaultPage="ui-tests-app/nested-frames/nested-page-flat" actionBarVisibility="always"></Frame>
9+
</GridLayout>
10+
</Page>

‎apps/app/ui-tests-app/nested-frames/full-screen-y-n-flat.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
2+
3+
<ActionBar flat="true">
4+
<Label text="Parent page flat action bar"></Label>
5+
</ActionBar>
6+
7+
<GridLayout backgroundColor="blue">
8+
<Frame id="nestedFrame" defaultPage="ui-tests-app/nested-frames/nested-page" actionBarVisibility="never"></Frame>
9+
</GridLayout>
10+
</Page>

‎apps/app/ui-tests-app/nested-frames/full-screen-y-y-flat.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
2+
3+
<ActionBar flat="true">
4+
<Label text="Parent page flat action bar"></Label>
5+
</ActionBar>
6+
7+
<GridLayout backgroundColor="blue">
8+
<Frame id="nestedFrame" defaultPage="ui-tests-app/nested-frames/nested-page-flat" actionBarVisibility="always"></Frame>
9+
</GridLayout>
10+
</Page>

‎apps/app/ui-tests-app/nested-frames/main-page.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,24 @@ export function loadExamples() {
1313
const examples = new Map<string, string>();
1414
examples.set("full-screen-n-n", "nested-frames/full-screen-n-n");
1515
examples.set("full-screen-n-y", "nested-frames/full-screen-n-y");
16+
examples.set("full-screen-n-y-flat", "nested-frames/full-screen-n-y-flat");
1617
examples.set("full-screen-y-n", "nested-frames/full-screen-y-n");
18+
examples.set("full-screen-y-n-flat", "nested-frames/full-screen-y-n-flat");
1719
examples.set("full-screen-y-y", "nested-frames/full-screen-y-y");
20+
examples.set("full-screen-y-y-flat", "nested-frames/full-screen-y-y-flat");
1821
examples.set("mid-screen-n-n", "nested-frames/mid-screen-n-n");
1922
examples.set("mid-screen-n-y", "nested-frames/mid-screen-n-y");
23+
examples.set("mid-screen-n-y-flat", "nested-frames/mid-screen-n-y-flat");
2024
examples.set("mid-screen-y-n", "nested-frames/mid-screen-y-n");
25+
examples.set("mid-screen-y-n-flat", "nested-frames/mid-screen-y-n-flat");
2126
examples.set("mid-screen-y-y", "nested-frames/mid-screen-y-y");
27+
examples.set("mid-screen-y-y-flat", "nested-frames/mid-screen-y-y-flat");
2228
examples.set("tab-y-y", "nested-frames/tab-y-y");
29+
examples.set("tab-y-y-flat", "nested-frames/tab-y-y-flat");
2330
examples.set("tab-n-y", "nested-frames/tab-n-y");
31+
examples.set("tab-n-y-flat", "nested-frames/tab-n-y-flat");
2432
examples.set("tab-y-n", "nested-frames/tab-y-n");
33+
examples.set("tab-y-n-flat", "nested-frames/tab-y-n-flat");
2534
examples.set("tab-n-n", "nested-frames/tab-n-n");
2635

2736
return examples;

‎apps/app/ui-tests-app/nested-frames/mid-screen-n-y-flat.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd" actionBarHidden="true">
2+
3+
<ActionBar>
4+
<Label text="Parent page"></Label>
5+
</ActionBar>
6+
7+
<GridLayout rows="200, *" backgroundColor="blue">
8+
<GridLayout row="1">
9+
<Frame id="nestedFrame" defaultPage="ui-tests-app/nested-frames/nested-page-flat" actionBarVisibility="always"></Frame>
10+
</GridLayout>>
11+
</GridLayout>
12+
</Page>

‎apps/app/ui-tests-app/nested-frames/mid-screen-y-n-flat.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
2+
3+
<ActionBar flat="true">
4+
<Label text="Parent page flat action bar"></Label>
5+
</ActionBar>
6+
7+
<GridLayout rows="200, *" backgroundColor="blue">
8+
<GridLayout row="1">
9+
<Frame id="nestedFrame" defaultPage="ui-tests-app/nested-frames/nested-page" actionBarVisibility="never"></Frame>
10+
</GridLayout>>
11+
</GridLayout>
12+
</Page>

‎apps/app/ui-tests-app/nested-frames/mid-screen-y-y-flat.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
2+
3+
<ActionBar flat="true">
4+
<Label text="Parent page flat action bar"></Label>
5+
</ActionBar>
6+
7+
<GridLayout rows="200, *" backgroundColor="blue">
8+
<GridLayout row="1">
9+
<Frame id="nestedFrame" defaultPage="ui-tests-app/nested-frames/nested-page-flat" actionBarVisibility="always"></Frame>
10+
</GridLayout>>
11+
</GridLayout>
12+
</Page>

0 commit comments

Comments
 (0)