Skip to content

Commit 858ef79

Browse files
manoldonevmanoldonev
authored
Merge branch 'master' into mdonev/child-fragment-manager-fix
2 parents 737f394 + e3d5f0d commit 858ef79

25 files changed

Lines changed: 356 additions & 111 deletions

File tree

‎.github/ISSUE_TEMPLATE.md‎

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

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
name: Bug report
3+
about: 'We really appreciate your effort to provide feedback. Before opening a new
4+
issue, please make sure that this case is not already reported in GitHub as an
5+
issue or in StackOverflow as a question.'
6+
7+
---
8+
9+
**Environment**
10+
Provide version numbers for the following components (information can be retrieved by running `tns info` in your project folder or by inspecting the `package.json` of the project):
11+
- CLI:
12+
- Cross-platform modules:
13+
- Android Runtime:
14+
- iOS Runtime:
15+
- Plugin(s):
16+
17+
**Describe the bug**
18+
<!-- A clear and concise description of what the bug is. Please, explain whether it's a build time error or a runtime error. More detailed logs can be easily obtained by following the instructions in this guide: https://docs.nativescript.org/get-support#how-to-obtain-diagnostic-reports. -->
19+
20+
**To Reproduce**
21+
<!-- Add commands used or steps taken to reproduce the behaviour. -->
22+
23+
**Expected behavior**
24+
25+
**Sample project**
26+
<!-- If possible, provide a link from the [Playground](https://play.nativescript.org) with reproduction of the problem. If not, consider attaching a sample project or link to a repository with such project. -->
27+
28+
**Additional context**
29+
<!-- Add any other context about the problem here. -->

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
7+
**Is your feature request related to a problem? Please describe.**
8+
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]. -->
9+
10+
**Describe the solution you'd like**
11+
<!-- A clear and concise description of what you want to happen. -->
12+
13+
**Describe alternatives you've considered**
14+
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
15+
16+
**Additional context**
17+
<!-- Add any other context or screenshots about the feature request here. -->

‎apps/app/ui-tests-app/dialogs/dialogs.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,9 @@
88
<Button text="promptText" tap="{{ promptText }}" />
99
<Button text="promptPass" tap="{{ promptPass }}" />
1010
<Button text="promptEmail" tap="{{ promptEmail }}" />
11+
<Button text="promptCapitalizationNone" tap="{{ promptCapitalizationNone }}" />
12+
<Button text="promptCapitalizationAll" tap="{{ promptCapitalizationAll }}" />
13+
<Button text="promptCapitalizationSentences" tap="{{ promptCapitalizationSentences }}" />
14+
<Button text="promptCapitalizationWords" tap="{{ promptCapitalizationWords }}" />
1115
</StackLayout>
1216
</Page>

‎apps/app/ui-tests-app/dialogs/view-model.ts‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,5 +137,81 @@ export class SettingsViewModel extends observable.Observable {
137137
}
138138
});
139139
}
140+
141+
public promptCapitalizationNone(args: observable.EventData) {
142+
dialogs.prompt({
143+
title: "Name",
144+
message: "Enter name:",
145+
cancelButtonText: "Cancel",
146+
okButtonText: "OK",
147+
inputType: dialogs.inputType.text,
148+
capitalizationType: dialogs.capitalizationType.none
149+
}).then((promptResult) => {
150+
console.log("### Result: " + promptResult.result + ", Text: " + promptResult.text);
151+
if (promptResult.result) {
152+
this.set("name", promptResult.text);
153+
}
154+
else {
155+
this.set("name", "Harold Finch");
156+
}
157+
});
158+
}
159+
160+
public promptCapitalizationAll(args: observable.EventData) {
161+
dialogs.prompt({
162+
title: "Name",
163+
message: "Enter name:",
164+
cancelButtonText: "Cancel",
165+
okButtonText: "OK",
166+
inputType: dialogs.inputType.text,
167+
capitalizationType: dialogs.capitalizationType.all
168+
}).then((promptResult) => {
169+
console.log("### Result: " + promptResult.result + ", Text: " + promptResult.text);
170+
if (promptResult.result) {
171+
this.set("name", promptResult.text);
172+
}
173+
else {
174+
this.set("name", "Harold Finch");
175+
}
176+
});
177+
}
178+
179+
public promptCapitalizationSentences(args: observable.EventData) {
180+
dialogs.prompt({
181+
title: "Name",
182+
message: "Enter name:",
183+
cancelButtonText: "Cancel",
184+
okButtonText: "OK",
185+
inputType: dialogs.inputType.text,
186+
capitalizationType: dialogs.capitalizationType.sentences
187+
}).then((promptResult) => {
188+
console.log("### Result: " + promptResult.result + ", Text: " + promptResult.text);
189+
if (promptResult.result) {
190+
this.set("name", promptResult.text);
191+
}
192+
else {
193+
this.set("name", "Harold Finch");
194+
}
195+
});
196+
}
197+
198+
public promptCapitalizationWords(args: observable.EventData) {
199+
dialogs.prompt({
200+
title: "Name",
201+
message: "Enter name:",
202+
cancelButtonText: "Cancel",
203+
okButtonText: "OK",
204+
inputType: dialogs.inputType.text,
205+
capitalizationType: dialogs.capitalizationType.words
206+
}).then((promptResult) => {
207+
console.log("### Result: " + promptResult.result + ", Text: " + promptResult.text);
208+
if (promptResult.result) {
209+
this.set("name", promptResult.text);
210+
}
211+
else {
212+
this.set("name", "Harold Finch");
213+
}
214+
});
215+
}
140216
}
141217
export var settingsViewModel = new SettingsViewModel();

‎apps/app/ui-tests-app/tab-view/icon-title-placement.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Page>
2+
<TabView style="color: green;">
3+
<TabView.items>
4+
<TabViewItem title="Title" iconSource="res://add_to_fav">
5+
<TabViewItem.view>
6+
<GridLayout>
7+
<Label text="Title and icon" verticalAlignment="center" horizontalAlignment="center"/>
8+
</GridLayout>
9+
</TabViewItem.view>
10+
</TabViewItem>
11+
<TabViewItem iconSource="res://add_to_fav">
12+
<TabViewItem.view>
13+
<GridLayout>
14+
<Label text="Only icon" verticalAlignment="center" horizontalAlignment="center"/>
15+
</GridLayout>
16+
</TabViewItem.view>
17+
</TabViewItem>
18+
<TabViewItem title="Title">
19+
<TabViewItem.view>
20+
<GridLayout>
21+
<Label text="Only title" verticalAlignment="center" horizontalAlignment="center"/>
22+
</GridLayout>
23+
</TabViewItem.view>
24+
</TabViewItem>
25+
</TabView.items>
26+
</TabView>
27+
</Page>

‎apps/app/ui-tests-app/tab-view/main-page.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ export function loadExamples() {
2424
examples.set("tab-view-bottom-position", "tab-view/tab-view-bottom-position");
2525
examples.set("issue-5470", "tab-view/issue-5470");
2626
examples.set("tab-view-tab-text-font-size", "tab-view/tab-view-tab-text-font-size");
27+
examples.set("tab-view-icon-title-placement", "tab-view/icon-title-placement");
2728
return examples;
2829
}

‎e2e/animation/package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,16 @@
1717
"tns-core-modules": "next"
1818
},
1919
"devDependencies": {
20+
"@types/chai": "~4.1.3",
21+
"@types/mocha": "~5.2.1",
22+
"@types/node": "10.11.4",
2023
"babel-traverse": "6.26.0",
2124
"babel-types": "6.26.0",
2225
"babylon": "6.18.0",
2326
"lazy": "1.0.11",
27+
"mocha": "~5.1.0",
28+
"mocha-junit-reporter": "~1.17.0",
29+
"mocha-multi": "~1.0.0",
2430
"nativescript-dev-appium": "next",
2531
"nativescript-dev-typescript": "next",
2632
"nativescript-dev-webpack": "next"

‎e2e/config/appium.capabilities.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,13 @@
134134
"noReset": true,
135135
"fullReset": false,
136136
"app": ""
137+
},
138+
"sim.iPhoneX.iOS120": {
139+
"platformName": "iOS",
140+
"platformVersion": "12.0",
141+
"deviceName": "iPhone X",
142+
"noReset": true,
143+
"fullReset": false,
144+
"app": ""
137145
}
138-
}
146+
}

‎e2e/modal-navigation/package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@
2020
"@types/chai": "~4.1.3",
2121
"@types/mocha": "~5.2.1",
2222
"@types/node": "^7.0.5",
23+
"mocha": "^5.2.0",
24+
"mocha-junit-reporter": "^1.18.0",
25+
"mocha-multi": "^1.0.1",
2326
"nativescript-dev-appium": "next",
2427
"nativescript-dev-typescript": "next",
2528
"nativescript-dev-webpack": "next",
2629
"rimraf": "^2.6.2",
27-
"typescript": "^3.0.3"
30+
"typescript": "^3.1.1"
2831
},
2932
"scripts": {
3033
"e2e": "npm run clean-e2e && tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

0 commit comments

Comments
 (0)