Skip to content

Commit c4c461d

Browse files
authored
Merge pull request #4 from EddyVerbruggen/add-scroll-view
Added ScrollView
2 parents 8853d11 + 57c2bf6 commit c4c461d

File tree

9 files changed

+60
-2
lines changed

9 files changed

+60
-2
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.idea/
2+
npm-debug.log
23
package-lock.json
34
node_modules
45
platforms/

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ component screenshots at [nativescript-vue.org](https://nativescript-vue.org/).
77
* The [Appium](http://appium.io/) client. Just download and install the latest [from GitHub](https://github.com/appium/appium-desktop/releases/latest).
88

99
## Running the tests locally
10-
Start Appium, or you'll receive an error `127.0.0.1` can't be reached.
10+
Start Appium and press 'Start the server', or you'll receive an error `127.0.0.1:4723` can't be reached.
1111

1212
### Android
1313
```bash

Diff for: app/app.css

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
margin: 5;
33
}
44

5+
.m-10 {
6+
margin: 10;
7+
}
8+
59
.m-15 {
610
margin: 15;
711
}

Diff for: app/app.js

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ new Vue({
3939
name: 'Progress',
4040
component: () => require('./elements/components/Progress')
4141
},
42+
{
43+
name: 'ScrollView',
44+
component: () => require('./elements/components/ScrollView')
45+
},
4246
{
4347
name: 'SearchBar',
4448
component: () => require('./elements/components/SearchBar')

Diff for: app/elements/components/ScrollView.js

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
module.exports = {
2+
template: `
3+
<GridLayout rows="auto, *">
4+
<ScrollView row="0" orientation="horizontal">
5+
<StackLayout orientation="horizontal">
6+
<Label text="h1" class="m-10" />
7+
<Label text="h2" class="m-10" />
8+
<Label text="h3" class="m-10" />
9+
<Label text="h4" class="m-10" />
10+
<Label text="h5" class="m-10" />
11+
<Label text="h6" class="m-10" />
12+
<Label text="h7" class="m-10" />
13+
<Label text="h8" class="m-10" />
14+
<Label text="h9" class="m-10" />
15+
<Label text="h10" class="m-10" />
16+
<Label text="h11" class="m-10" />
17+
<Label text="h12" class="m-10" />
18+
</StackLayout>
19+
</ScrollView>
20+
<ScrollView row="1" horizontalAlignment="center">
21+
<StackLayout>
22+
<Label text="v1" class="m-10" />
23+
<Label text="v2" class="m-10" />
24+
<Label text="v3" class="m-10" />
25+
<Label text="v4" class="m-10" />
26+
<Label text="v5" class="m-10" />
27+
<Label text="v6" class="m-10" />
28+
<Label text="v7" class="m-10" />
29+
<Label text="v8" class="m-10" />
30+
<Label text="v9" class="m-10" />
31+
<Label text="v10" class="m-10" />
32+
<Label text="v11" class="m-10" />
33+
<Label text="v12" class="m-10" />
34+
<Label text="v13" class="m-10" />
35+
<Label text="v14" class="m-10" />
36+
<Label text="v15" class="m-10" />
37+
<Label text="v16" class="m-10" />
38+
<Label text="v17" class="m-10" />
39+
<Label text="v18" class="m-10" />
40+
<Label text="v19" class="m-10" />
41+
<Label text="v20" class="m-10" />
42+
<Label text="v21" class="m-10" />
43+
<Label text="v22" class="m-10" />
44+
</StackLayout>
45+
</ScrollView>
46+
</GridLayout>
47+
`
48+
};

Diff for: generate-screenshots.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const components = [
1212
'ListPicker',
1313
'ListView',
1414
'Progress',
15+
'ScrollView',
1516
'SearchBar',
1617
'SegmentedBar',
1718
'Slider',

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"deploy": "bash deploy.sh",
2929
"e2e": "mocha --opts ./e2e/config/mocha.opts",
3030
"ios.build": "tns build ios",
31-
"ios.screenshots": "npm run appium -- --runType=ios-simulator103iPhone6 --sauceLab=true"
31+
"ios.screenshots": "npm run appium -- --runType=ios-simulator103iPhone6"
3232
},
3333
"devDependencies": {
3434
"babel-traverse": "6.26.0",

Diff for: screenshots/android23/ScrollView.png

44.6 KB
Loading

Diff for: screenshots/ios-simulator103iPhone6/ScrollView.png

84.5 KB
Loading

0 commit comments

Comments
 (0)