Skip to content

Commit c7d8bba

Browse files
farfromrefugfarfromrefug
committed
Merge branch 'master' of github.com:Akylas/nativescript-canvas
2 parents 392058c + 4164599 commit c7d8bba

File tree

87 files changed

+1267
-11
lines changed

Some content is hidden

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

87 files changed

+1267
-11
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ hooks
66
package-lock.json
77
.DS_Store
88
npm-debug.log.*
9-
demo*/app/**/*.js
109
demo*/typings
1110
*.framework
1211
**/*.js.map

‎demo-vue/app/App_Resources/Android/src/main/res/values/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<resources>
2-
<string name="app_name">OpenCV - Demo</string>
3-
<string name="title_activity_kimera">OpenCV - Demo</string>
4-
</resources>
2+
<string name="app_name">Canvas Demo-Vue</string>
3+
<string name="title_activity_kimera">Canvas Demo-Vue</string>
4+
</resources>

‎demo-vue/app/App_Resources/iOS/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>CFBundleDevelopmentRegion</key>
66
<string>en</string>
77
<key>CFBundleDisplayName</key>
8-
<string>Canvas - Demo</string>
8+
<string>Canvas Demo-Vue</string>
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleInfoDictionaryVersion</key>

‎demo-vue/app/canvastests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export function drawOnImage(scale = 3, canvas?: Canvas) {
6969
bgPaint.setStyle(Style.STROKE);
7070
bgPaint.setShadowLayer(4, 0, 2, 'blue');
7171
bgPaint.setPathEffect(new DashPathEffect([6, 4], 0));
72-
canvas.drawRoundRect(0, hH / 2 + 2 * padding, hW, hH / 2 + hH / 2 + 2 * padding, 30, 30, bgPaint);
72+
canvas.drawRoundRect(createRectF(0, hH / 2 + 2 * padding, hW, hH / 2 + hH / 2 + 2 * padding), 30, 30, bgPaint);
7373
bgPaint.clearShadowLayer();
7474
bgPaint.setPathEffect(null);
7575

‎demo-vue/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
2+
"name": "demovuecanvas",
23
"description": "NativeScript canvas Demo for Vue",
34
"license": "SEE LICENSE IN LICENSE.md",
45
"readme": "README.md",
56
"repository": "http://www.github.com/Akylas/@nativescript-community/ui-canvas.git",
6-
"main": "main.js",
7+
"main": "main",
78
"dependencies": {
89
"@nativescript/core": "7.0.13",
910
"@nativescript-community/perms": "2.1.1",
@@ -25,4 +26,4 @@
2526
"vue-loader": "^15.9.3",
2627
"vue-property-decorator": "^8.5.1"
2728
}
28-
}
29+
}

‎demo/.gitignore

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# NativeScript
2+
hooks/
3+
node_modules/
4+
platforms/
5+
6+
# NativeScript Template
7+
*.js.map
8+
*.js
9+
!webpack.config.js
10+
11+
# Logs
12+
logs
13+
*.log
14+
npm-debug.log*
15+
yarn-debug.log*
16+
yarn-error.log*
17+
18+
# General
19+
.DS_Store
20+
.AppleDouble
21+
.LSOverride
22+
.idea
23+
.cloud
24+
.project
25+
tmp/
26+
typings/
27+
28+
# Visual Studio Code
29+
.vscode/*
30+
!.vscode/settings.json
31+
!.vscode/tasks.json
32+
!.vscode/launch.json
33+
!.vscode/extensions.json

‎demo/app/App_Resources/Android/app.gradle

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Add your native dependencies here:
2+
3+
// Uncomment to add recyclerview-v7 dependency
4+
//dependencies {
5+
// implementation 'com.android.support:recyclerview-v7:+'
6+
//}
7+
8+
// If you want to add something to be applied before applying plugins' include.gradle files
9+
// e.g. project.ext.googlePlayServicesVersion = "15.0.1"
10+
// create a file named before-plugins.gradle in the current directory and place it there
11+
12+
android {
13+
defaultConfig {
14+
minSdkVersion 17
15+
generatedDensities = []
16+
}
17+
aaptOptions {
18+
additionalParameters "--no-version-vectors"
19+
}
20+
}

‎demo/app/App_Resources/Android/src/main/AndroidManifest.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="__PACKAGE__"
4+
android:versionCode="1"
5+
android:versionName="1.0">
6+
7+
<supports-screens
8+
android:smallScreens="true"
9+
android:normalScreens="true"
10+
android:largeScreens="true"
11+
android:xlargeScreens="true"/>
12+
13+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
14+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
15+
<uses-permission android:name="android.permission.INTERNET"/>
16+
17+
<application
18+
android:name="com.tns.NativeScriptApplication"
19+
android:allowBackup="true"
20+
android:icon="@drawable/icon"
21+
android:label="@string/app_name"
22+
android:theme="@style/AppTheme">
23+
24+
<activity
25+
android:name="com.tns.NativeScriptActivity"
26+
android:label="@string/title_activity_kimera"
27+
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
28+
android:theme="@style/LaunchScreenTheme">
29+
30+
<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
31+
32+
<intent-filter>
33+
<action android:name="android.intent.action.MAIN" />
34+
<category android:name="android.intent.category.LAUNCHER" />
35+
</intent-filter>
36+
</activity>
37+
<activity android:name="com.tns.ErrorReportActivity"/>
38+
</application>
39+
</manifest>

‎demo/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png

3.42 KB

‎demo/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png

6.8 KB

0 commit comments

Comments
 (0)