Skip to content

Commit 3afa2fc

Browse files
MartoYankovMartoYankov
authored
Merge branch 'master' into myankov/more-font-icons
2 parents 0540657 + acc3436 commit 3afa2fc

48 files changed

Lines changed: 686 additions & 258 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
<a name="6.0.6"></a>
2+
## [6.0.6](https://github.com/NativeScript/NativeScript/compare/6.0.5...6.0.6) (2019-08-08)
3+
4+
5+
### Bug Fixes
6+
7+
* **tns-core-modules-widgets:** use correct version (6.0.6).
8+
9+
10+
111
## [6.0.5](https://github.com/NativeScript/NativeScript/compare/6.0.4...6.0.5) (2019-08-02)
212

313

‎e2e/cuteness.io/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"devDependencies": {
1919
"nativescript-dev-webpack": "next",
2020
"tns-platform-declarations": "next",
21-
"typescript": "3.4.1"
21+
"typescript": "~3.4.1"
2222
},
2323
"gitHead": "8c1a4866a66daab09bf5ef8e5a96472687192373",
2424
"readme": "NativeScript Application"

‎e2e/ui-tests-app/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ typings/
3535
# tests
3636
mochawesome-report
3737
e2e/resources/images/uitestsapp/*
38+
testapp

‎e2e/ui-tests-app/app/app.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#app {
2-
background-color: lightblue;
2+
background-color: lightyellow;
33
}
44

55
.ui-tests-app-issue-1639-red {
@@ -20,4 +20,4 @@
2020
.ui-tests-app-issue-1639-yellow {
2121
color: yellow;
2222
margin-left: 30;
23-
}
23+
}

‎e2e/ui-tests-app/app/bottom-navigation/custom-tabstrip-page.css‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
.custom-tabstrip {
2+
height: 100;
3+
vertical-align: bottom;
4+
ios-overflow-safe-area-enabled: false;
5+
}
6+
7+
.custom-tabstripitem {
8+
height: 80;
9+
width: 80;
10+
vertical-align: center;
11+
horizontal-align: center;
12+
clip-path: circle(100% at 50% 50%);
13+
}
14+
15+
.custom-title {
16+
color: white;
17+
vertical-align: center;
18+
horizontal-align: center;
19+
}
20+
21+
.skyblue {
22+
background-color: skyblue;
23+
}
24+
25+
.gold {
26+
background-color: gold;
27+
}
28+
29+
.olive {
30+
background-color: olive;
31+
}

‎e2e/ui-tests-app/app/bottom-navigation/custom-tabstrip-page.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import { EventData } from "tns-core-modules/data/observable";
2+
import { Page } from "tns-core-modules/ui/page";
3+
import { BottomNavigation } from "tns-core-modules/ui/bottom-navigation";
4+
5+
export function goToFirst(args: EventData) {
6+
const page = <Page>(<any>args.object).page;
7+
const bottomNav = <BottomNavigation>page.getViewById("bottomNav");
8+
9+
bottomNav.selectedIndex = 0;
10+
}
11+
12+
export function goToSecond(args: EventData) {
13+
const page = <Page>(<any>args.object).page;
14+
const bottomNav = <BottomNavigation>page.getViewById("bottomNav");
15+
16+
bottomNav.selectedIndex = 1;
17+
}
18+
19+
export function goToThird(args: EventData) {
20+
const page = <Page>(<any>args.object).page;
21+
const bottomNav = <BottomNavigation>page.getViewById("bottomNav");
22+
23+
bottomNav.selectedIndex = 2;
24+
}

‎e2e/ui-tests-app/app/bottom-navigation/custom-tabstrip-page.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<Page>
2+
3+
<ActionBar title="BottomNavigation Custom TabStrip" icon="" class="action-bar">
4+
</ActionBar>
5+
6+
<GridLayout>
7+
<GridLayout>
8+
<BottomNavigation id="bottomNav" automationText="tabNavigation" >
9+
<TabContentItem>
10+
<GridLayout backgroundColor="skyblue">
11+
<Label text="First View"/>
12+
</GridLayout>
13+
</TabContentItem>
14+
<TabContentItem>
15+
<GridLayout backgroundColor="gold">
16+
<Label text="Second View"/>
17+
</GridLayout>
18+
</TabContentItem>
19+
<TabContentItem>
20+
<GridLayout backgroundColor="olive">
21+
<Label text="Third View"/>
22+
</GridLayout>
23+
</TabContentItem>
24+
</BottomNavigation>
25+
</GridLayout>
26+
27+
<GridLayout columns="*, *, *" class="custom-tabstrip">
28+
<GridLayout automationText="first-tab" col="0" class="custom-tabstripitem skyblue" tap="goToFirst">
29+
<Label text="First" class="custom-title"></Label>
30+
</GridLayout>
31+
32+
<GridLayout automationText="second-tab" col="1" class="custom-tabstripitem gold" tap="goToSecond">
33+
<Label text="Second" class="custom-title"></Label>
34+
</GridLayout>
35+
36+
<GridLayout automationText="third-tab" col="2" class="custom-tabstripitem olive" tap="goToThird">
37+
<Label text="Third" class="custom-title"></Label>
38+
</GridLayout>
39+
</GridLayout>
40+
</GridLayout>
41+
</Page>

‎e2e/ui-tests-app/app/bottom-navigation/main-page.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export function loadExamples() {
2323
examples.set("font-icons", "bottom-navigation/font-icons-page");
2424
examples.set("fancy-fonts", "bottom-navigation/fancy-fonts-page");
2525
examples.set("css-text-transform", "bottom-navigation/bottom-navigation-css-page");
26+
examples.set("custom-tabstrip", "bottom-navigation/custom-tabstrip-page");
2627

2728
return examples;
2829
}

‎e2e/ui-tests-app/app/button/main-page.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export function loadExamples() {
1313
const examples = new Map<string, string>();
1414
examples.set("btn-wrap-text-alignment-4266", "button/btn-wrap-text-alignment-4266-page");
1515
examples.set("button-border", "button/button-border-page");
16-
examples.set("styles", "button/styles-page");
1716
examples.set("background", "button/background-page");
1817
examples.set("border-playground", "button/border-playground-page");
1918
examples.set("issue-4287", "button/issue-4287-page");

‎e2e/ui-tests-app/app/button/styles-page.ts‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)