Skip to content

Commit c55a59d

Browse files
triniwiztriniwiz
committed
chore: migrate repo
1 parent 7a50ab5 commit c55a59d

File tree

18 files changed

+101
-83
lines changed

18 files changed

+101
-83
lines changed

‎apps/demo-angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@nativescript/mlkit-selfie-segmentation": "file:../../dist/packages/mlkit-selfie-segmentation"
1414
},
1515
"devDependencies": {
16-
"@nativescript/android": "~8.3.0",
17-
"@nativescript/ios": "~8.3.0"
16+
"@nativescript/android": "~8.4.0",
17+
"@nativescript/ios": "~8.4.0"
1818
}
1919
}

‎apps/demo-angular/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "demo-angular",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"sourceRoot": "apps/demo-angular/src",
45
"projectType": "application",

‎apps/demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@nativescript/mlkit-text-recognition": "file:../../packages/mlkit-text-recognition"
1717
},
1818
"devDependencies": {
19-
"@nativescript/android": "~8.3.0",
20-
"@nativescript/ios": "~8.3.0"
19+
"@nativescript/android": "~8.4.0",
20+
"@nativescript/ios": "~8.4.0"
2121
}
2222
}

‎apps/demo/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "demo",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"sourceRoot": "apps/demo/src",
45
"projectType": "application",

‎apps/demo/src/plugin-demos/mlkit-core.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { ImageLabelingResult } from '@nativescript/mlkit-image-labeling';
77
import { ObjectResult } from '@nativescript/mlkit-object-detection';
88
import { PoseResult } from '@nativescript/mlkit-pose-detection';
99
import { TextResult } from '@nativescript/mlkit-text-recognition';
10+
1011
export function navigatingTo(args: EventData) {
1112
const page = <Page>args.object;
1213
page.bindingContext = new DemoModel();
@@ -17,10 +18,11 @@ export class DemoModel extends DemoSharedMlkitCore {
1718
detectorType = DetectionType.Barcode;
1819
isPaused = false;
1920
torchOn = false;
21+
2022
onLoaded(args) {
2123
this.camera = args.object;
2224
this.set('isPaused', this.camera.pause);
23-
this.set('torchOn', this.camera.torchOn);
25+
this.set('torchOn', this.camera.torchOn);
2426
}
2527

2628
onDetection(event: DetectionEvent) {
@@ -36,8 +38,8 @@ export class DemoModel extends DemoSharedMlkitCore {
3638
}
3739

3840
toggleTorch() {
39-
this.camera.torchOn = !this.camera.torchOn
40-
this.set('torchOn', this.camera.torchOn);
41+
this.camera.torchOn = !this.camera.torchOn;
42+
this.set('torchOn', this.camera.torchOn);
4143
}
4244

4345
requestPermission() {

‎apps/demo/src/plugin-demos/mlkit-core.xml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
<Page xmlns="http://schemas.nativescript.org/tns.xsd" xmlns:ui="@nativescript/mlkit-core" navigatingTo="navigatingTo" class="page">
2-
<Page.actionBar>
3-
<ActionBar title="mlkit-core" icon="" class="action-bar">
4-
</ActionBar>
5-
</Page.actionBar>
6-
<GridLayout rows="*,auto,auto,auto,auto,auto,auto,auto,auto,auto" height="100%">
7-
<ui:MLKitView pause="true" height="100%" rowSpan="3" loaded="{{ onLoaded }}" cameraPosition="back" detectionType="{{ detectorType }}" detection="{{ onDetection }}"/>
8-
<Button row="1" height="40" text="Toggle Camera" tap="{{ toggleCamera }}" />
9-
<Label color="red" row="2" text="{{'TorchOn ' + torchOn }}"/>
10-
<Button row="3" height="40" text="Toggle Torch" tap="{{ toggleTorch }}" />
11-
<Button row="4" height="40" text="Request Camera Permission" tap="{{ requestPermission }}" />
12-
<Label row="5" text="{{'Detecting ' + detectorType }}"/>
13-
<Button row="6" height="40" text="Change Detector Type" tap="{{ changeType }}" />
14-
<Label row="7" text="{{'isPaused : ' + isPaused }}"/>
15-
<Button row="8" height="40" text="Toggle Pause" tap="{{ togglePause }}" />
16-
<Button row="9" height="40" text="Process Still imAGE" tap="{{ processStill }}" />
17-
</GridLayout>
18-
</Page>
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd" xmlns:ui="@nativescript/mlkit-core" navigatingTo="navigatingTo"
2+
class="page">
3+
<Page.actionBar>
4+
<ActionBar title="mlkit-core" icon="" class="action-bar">
5+
</ActionBar>
6+
</Page.actionBar>
7+
<GridLayout rows="*,auto,auto,auto,auto,auto,auto,auto,auto,auto" height="100%">
8+
<ui:MLKitView processEveryNthFrame="5" pause="true" height="100%" rowSpan="3" loaded="{{ onLoaded }}"
9+
cameraPosition="back" detectionType="{{ detectorType }}" detection="{{ onDetection }}"/>
10+
<Button row="1" height="40" text="Toggle Camera" tap="{{ toggleCamera }}"/>
11+
<Label color="red" row="2" text="{{'TorchOn ' + torchOn }}"/>
12+
<Button row="3" height="40" text="Toggle Torch" tap="{{ toggleTorch }}"/>
13+
<Button row="4" height="40" text="Request Camera Permission" tap="{{ requestPermission }}"/>
14+
<Label row="5" text="{{'Detecting ' + detectorType }}"/>
15+
<Button row="6" height="40" text="Change Detector Type" tap="{{ changeType }}"/>
16+
<Label row="7" text="{{'isPaused : ' + isPaused }}"/>
17+
<Button row="8" height="40" text="Toggle Pause" tap="{{ togglePause }}"/>
18+
<Button row="9" height="40" text="Process Still imAGE" tap="{{ processStill }}"/>
19+
</GridLayout>
20+
</Page>

‎nx.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@
33
"affected": {
44
"defaultBase": "master"
55
},
6-
"implicitDependencies": {
7-
"workspace.json": "*",
8-
"package.json": {
9-
"dependencies": "*",
10-
"devDependencies": "*"
11-
},
12-
"tsconfig.base.json": "*",
13-
"tslint.json": "*",
14-
"nx.json": "*"
15-
},
166
"workspaceLayout": {
177
"appsDir": "apps",
188
"libsDir": "packages"
@@ -28,5 +18,18 @@
2818
}
2919
}
3020
},
31-
"$schema": "./node_modules/nx/schemas/nx-schema.json"
21+
"$schema": "./node_modules/nx/schemas/nx-schema.json",
22+
"namedInputs": {
23+
"default": ["{projectRoot}/**/*", "sharedGlobals"],
24+
"sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/tslint.json", "{workspaceRoot}/nx.json"],
25+
"production": ["default", "!{projectRoot}/.eslintrc.json"]
26+
},
27+
"targetDefaults": {
28+
"build": {
29+
"inputs": ["production", "^production"]
30+
},
31+
"lint": {
32+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
33+
}
34+
}
3235
}

‎package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@
1616
},
1717
"private": true,
1818
"devDependencies": {
19-
"@angular/animations": "^14.2.0",
20-
"@angular/common": "^14.2.0",
21-
"@angular/compiler": "^14.2.0",
22-
"@angular/compiler-cli": "^14.2.0",
23-
"@angular/core": "^14.2.0",
24-
"@angular/forms": "^14.2.0",
25-
"@angular/platform-browser": "^14.2.0",
26-
"@angular/platform-browser-dynamic": "^14.2.0",
27-
"@angular/router": "^14.2.0",
28-
"@nativescript/angular": "^14.2.0",
29-
"@nativescript/core": "~8.3.0",
30-
"@nativescript/plugin-tools": "4.1.1",
31-
"@nativescript/types": "~8.3.0",
19+
"@angular/animations": "^15.0.0",
20+
"@angular/common": "^15.0.0",
21+
"@angular/compiler": "^15.0.0",
22+
"@angular/compiler-cli": "^15.0.0",
23+
"@angular/core": "^15.0.0",
24+
"@angular/forms": "^15.0.0",
25+
"@angular/platform-browser": "^15.0.0",
26+
"@angular/platform-browser-dynamic": "^15.0.0",
27+
"@angular/router": "^15.0.0",
28+
"@nativescript/angular": "^15.0.0",
29+
"@nativescript/core": "~8.4.0",
30+
"@nativescript/plugin-tools": "5.0.3",
31+
"@nativescript/types": "~8.4.0",
3232
"@nativescript/webpack": "~5.0.5",
33-
"@ngtools/webpack": "^14.2.0",
33+
"@ngtools/webpack": "^15.0.0",
3434
"husky": "^8.0.0",
3535
"nativescript-vue": "~2.9.0",
3636
"nativescript-vue-template-compiler": "~2.9.0",
37-
"ng-packagr": "^14.2.0",
37+
"ng-packagr": "^15.0.0",
3838
"rxjs": "~7.5.0",
39-
"typescript": "~4.7.3",
39+
"typescript": "~4.8.0",
4040
"zone.js": "~0.11.1",
41-
"@angular-devkit/build-angular": "^14.2.0",
41+
"@angular-devkit/build-angular": "^15.0.0",
4242
"nativescript-permissions": "1.3.11"
4343
},
4444
"lint-staged": {

‎packages/mlkit-barcode-scanning/project.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "mlkit-barcode-scanning",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"projectType": "library",
45
"sourceRoot": "packages/mlkit-barcode-scanning",
@@ -28,12 +29,12 @@
2829
]
2930
},
3031
"build.all": {
31-
"executor": "@nrwl/workspace:run-commands",
32+
"executor": "nx:run-commands",
3233
"options": {
3334
"commands": ["node tools/scripts/build-finish.ts mlkit-barcode-scanning"],
3435
"parallel": false
3536
},
36-
"outputs": ["dist/packages/mlkit-barcode-scanning"],
37+
"outputs": ["{workspaceRoot}/dist/packages/mlkit-barcode-scanning"],
3738
"dependsOn": [
3839
{
3940
"target": "build.all",
@@ -46,7 +47,7 @@
4647
]
4748
},
4849
"focus": {
49-
"executor": "@nrwl/workspace:run-commands",
50+
"executor": "nx:run-commands",
5051
"options": {
5152
"commands": ["nx g @nativescript/plugin-tools:focus-packages mlkit-barcode-scanning"],
5253
"parallel": false

‎packages/mlkit-core/project.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "mlkit-core",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"projectType": "library",
45
"sourceRoot": "packages/mlkit-core",
@@ -29,12 +30,12 @@
2930
]
3031
},
3132
"build.all": {
32-
"executor": "@nrwl/workspace:run-commands",
33+
"executor": "nx:run-commands",
3334
"options": {
3435
"commands": ["node tools/scripts/build-finish.ts mlkit-core"],
3536
"parallel": false
3637
},
37-
"outputs": ["dist/packages/mlkit-core"],
38+
"outputs": ["{workspaceRoot}/dist/packages/mlkit-core"],
3839
"dependsOn": [
3940
{
4041
"target": "build.all",
@@ -47,7 +48,7 @@
4748
]
4849
},
4950
"focus": {
50-
"executor": "@nrwl/workspace:run-commands",
51+
"executor": "nx:run-commands",
5152
"options": {
5253
"commands": ["nx g @nativescript/plugin-tools:focus-packages mlkit-core"],
5354
"parallel": false

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy