Skip to content

Commit 654e461

Browse files
authored
Merge pull request #60 from NativeScript/release/1.0.0-alpha.3
feat: 1.0.0-alpha.3
2 parents cc93f5c + cfbfe6f commit 654e461

File tree

153 files changed

+6011
-2731
lines changed

Some content is hidden

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

153 files changed

+6011
-2731
lines changed

CanvasNative.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
s.name = "CanvasNative"
44

5-
s.version = "1.0.0-alpha.2"
5+
s.version = "1.0.0-alpha.3"
66

77
s.summary = "A Canvas library"
88

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<template>
2+
<Page>
3+
<ActionBar>
4+
<Label text="canvas-babylon"/>
5+
</ActionBar>
6+
7+
<GridLayout>
8+
<Button class="info" :text="message"/>
9+
</GridLayout>
10+
</Page>
11+
</template>
12+
13+
<script lang="ts">
14+
import Vue from "nativescript-vue";
15+
import { DemoSharedCanvasBabylon } from '@demo/shared';
16+
import { } from '@nativescript/canvas-babylon';
17+
18+
export default Vue.extend({
19+
computed: {
20+
message() {
21+
return "Test canvas-babylon";
22+
}
23+
}
24+
});
25+
</script>
26+
27+
<style scoped lang="scss">
28+
29+
.info {
30+
font-size: 20;
31+
horizontal-align: center;
32+
vertical-align: center;
33+
}
34+
</style>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<template>
2+
<Page>
3+
<ActionBar>
4+
<Label text="canvas-media"/>
5+
</ActionBar>
6+
7+
<GridLayout>
8+
<Button class="info" :text="message"/>
9+
</GridLayout>
10+
</Page>
11+
</template>
12+
13+
<script lang="ts">
14+
import Vue from "nativescript-vue";
15+
import { DemoSharedCanvasMedia } from '@demo/shared';
16+
import { } from '@nativescript/canvas-media';
17+
18+
export default Vue.extend({
19+
computed: {
20+
message() {
21+
return "Test canvas-media";
22+
}
23+
}
24+
});
25+
</script>
26+
27+
<style scoped lang="scss">
28+
29+
.info {
30+
font-size: 20;
31+
horizontal-align: center;
32+
vertical-align: center;
33+
}
34+
</style>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<template>
2+
<Page>
3+
<ActionBar>
4+
<Label text="canvas-phaser-ce"/>
5+
</ActionBar>
6+
7+
<GridLayout>
8+
<Button class="info" :text="message"/>
9+
</GridLayout>
10+
</Page>
11+
</template>
12+
13+
<script lang="ts">
14+
import Vue from "nativescript-vue";
15+
import { DemoSharedCanvasPhaserCe } from '@demo/shared';
16+
import { } from '@nativescript/canvas-phaser-ce';
17+
18+
export default Vue.extend({
19+
computed: {
20+
message() {
21+
return "Test canvas-phaser-ce";
22+
}
23+
}
24+
});
25+
</script>
26+
27+
<style scoped lang="scss">
28+
29+
.info {
30+
font-size: 20;
31+
horizontal-align: center;
32+
vertical-align: center;
33+
}
34+
</style>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<template>
2+
<Page>
3+
<ActionBar>
4+
<Label text="canvas-phaser"/>
5+
</ActionBar>
6+
7+
<GridLayout>
8+
<Button class="info" :text="message"/>
9+
</GridLayout>
10+
</Page>
11+
</template>
12+
13+
<script lang="ts">
14+
import Vue from "nativescript-vue";
15+
import { DemoSharedCanvasPhaser } from '@demo/shared';
16+
import { } from '@nativescript/canvas-phaser';
17+
18+
export default Vue.extend({
19+
computed: {
20+
message() {
21+
return "Test canvas-phaser";
22+
}
23+
}
24+
});
25+
</script>
26+
27+
<style scoped lang="scss">
28+
29+
.info {
30+
font-size: 20;
31+
horizontal-align: center;
32+
vertical-align: center;
33+
}
34+
</style>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<template>
2+
<Page>
3+
<ActionBar>
4+
<Label text="canvas-pixi"/>
5+
</ActionBar>
6+
7+
<GridLayout>
8+
<Button class="info" :text="message"/>
9+
</GridLayout>
10+
</Page>
11+
</template>
12+
13+
<script lang="ts">
14+
import Vue from "nativescript-vue";
15+
import { DemoSharedCanvasPixi } from '@demo/shared';
16+
import { } from '@nativescript/canvas-pixi';
17+
18+
export default Vue.extend({
19+
computed: {
20+
message() {
21+
return "Test canvas-pixi";
22+
}
23+
}
24+
});
25+
</script>
26+
27+
<style scoped lang="scss">
28+
29+
.info {
30+
font-size: 20;
31+
horizontal-align: center;
32+
vertical-align: center;
33+
}
34+
</style>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<template>
2+
<Page>
3+
<ActionBar>
4+
<Label text="canvas-polyfill"/>
5+
</ActionBar>
6+
7+
<GridLayout>
8+
<Button class="info" :text="message"/>
9+
</GridLayout>
10+
</Page>
11+
</template>
12+
13+
<script lang="ts">
14+
import Vue from "nativescript-vue";
15+
import { DemoSharedCanvasPolyfill } from '@demo/shared';
16+
import { } from '@nativescript/canvas-polyfill';
17+
18+
export default Vue.extend({
19+
computed: {
20+
message() {
21+
return "Test canvas-polyfill";
22+
}
23+
}
24+
});
25+
</script>
26+
27+
<style scoped lang="scss">
28+
29+
.info {
30+
font-size: 20;
31+
horizontal-align: center;
32+
vertical-align: center;
33+
}
34+
</style>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<template>
2+
<Page>
3+
<ActionBar>
4+
<Label text="canvas-three"/>
5+
</ActionBar>
6+
7+
<GridLayout>
8+
<Button class="info" :text="message"/>
9+
</GridLayout>
10+
</Page>
11+
</template>
12+
13+
<script lang="ts">
14+
import Vue from "nativescript-vue";
15+
import { DemoSharedCanvasThree } from '@demo/shared';
16+
import { } from '@nativescript/canvas-three';
17+
18+
export default Vue.extend({
19+
computed: {
20+
message() {
21+
return "Test canvas-three";
22+
}
23+
}
24+
});
25+
</script>
26+
27+
<style scoped lang="scss">
28+
29+
.info {
30+
font-size: 20;
31+
horizontal-align: center;
32+
vertical-align: center;
33+
}
34+
</style>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<template>
2+
<Page>
3+
<ActionBar>
4+
<Label text="canvas"/>
5+
</ActionBar>
6+
7+
<GridLayout>
8+
<Button class="info" :text="message"/>
9+
</GridLayout>
10+
</Page>
11+
</template>
12+
13+
<script lang="ts">
14+
import Vue from "nativescript-vue";
15+
import { DemoSharedCanvas } from '@demo/shared';
16+
import { } from '@nativescript/canvas';
17+
18+
export default Vue.extend({
19+
computed: {
20+
message() {
21+
return "Test canvas";
22+
}
23+
}
24+
});
25+
</script>
26+
27+
<style scoped lang="scss">
28+
29+
.info {
30+
font-size: 20;
31+
horizontal-align: center;
32+
vertical-align: center;
33+
}
34+
</style>

apps/demo/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"@nativescript/canvas-polyfill": "file:../../packages/canvas-polyfill",
1414
"@nativescript/canvas-three": "file:../../packages/canvas-three",
1515
"@nativescript/core": "file:../../node_modules/@nativescript/core",
16+
"@nativescript/webpack": "^5.0.0",
1617
"babylonjs": "file:../../node_modules/babylonjs",
1718
"babylonjs-materials": "file:../../node_modules/babylonjs-materials",
1819
"chart.js": "file:../../node_modules/chart.js",
@@ -27,7 +28,7 @@
2728
"zen-3d": "file:../../node_modules/zen-3d"
2829
},
2930
"devDependencies": {
30-
"@nativescript/android": "8.0.0",
31+
"@nativescript/android": "8.2.0-alpha.2",
3132
"@nativescript/ios": "8.0.0"
3233
}
3334
}

apps/demo/src/main-page.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo" class="page">
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo">
22
<Page.actionBar>
33
<ActionBar title="Plugin Demos" icon="" class="action-bar"/>
44
</Page.actionBar>

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
"@angular/router": "^12.0.0",
2828
"@nativescript-community/gesturehandler": "^0.1.45",
2929
"@nativescript/angular": "^12.0.0",
30-
"@nativescript/core": "^8.0.0",
30+
"@nativescript/core": "~8.1.0",
3131
"@nativescript/plugin-tools": "2.1.0",
3232
"@nativescript/types": "^8.0.0",
33-
"@nativescript/webpack": "beta",
33+
"@nativescript/webpack": "~5.0.0",
3434
"@ngtools/webpack": "^12.0.0",
3535
"babylonjs": "^4.1.0",
3636
"babylonjs-materials": "^4.1.0",
@@ -57,7 +57,7 @@
5757
"rxjs": "~6.6.0",
5858
"svelte-native": "^0.9.3",
5959
"three": "^0.123.0",
60-
"typescript": "4.3.5",
60+
"typescript": "~4.3.0",
6161
"vexflow": "^3.0.9",
6262
"xmldom": "~0.6.0",
6363
"zen-3d": "0.0.3",
@@ -68,4 +68,4 @@
6868
"npx prettier --write"
6969
]
7070
}
71-
}
71+
}

packages/canvas-media/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-media",
3-
"version": "0.11.0",
3+
"version": "0.12.0",
44
"description": "Canvas media",
55
"main": "index",
66
"typings": "index.d.ts",
Binary file not shown.

packages/canvas-media/platforms/android/include.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ android {
55
}
66
}
77

8+
repositories {
9+
google()
10+
}
11+
812
dependencies {
9-
implementation 'com.google.android.exoplayer:exoplayer:2.13.2'
10-
implementation 'com.google.android.exoplayer:exoplayer-ui:2.13.2'
13+
implementation 'com.google.android.exoplayer:exoplayer:2.13.3'
14+
implementation 'com.google.android.exoplayer:exoplayer-ui:2.13.3'
1115
}

0 commit comments

Comments
 (0)