Skip to content

Commit 8201b44

Browse files
naderionaderio
committed
mergefix
2 parents 5f56c79 + fa521e3 commit 8201b44

File tree

15 files changed

+1243
-13
lines changed

15 files changed

+1243
-13
lines changed

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@ node_modules
33
!demo/app/*.js
44
*.map
55
*.d.ts
6+
!references.d.ts
67
!index.d.ts
8+
!typings/*
9+
typings-*
10+
out
711
demo/platforms
812
demo/node_modules
913
.DS_Store
1014
*.log
11-
lib
15+
lib
16+
.tmp

‎.npmignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
demo/
2+
demo.server
23
*.ts
34
!index.d.ts
45
*.map
56
*.json
6-
*.log
7+
*.log
8+
.tmp

‎.npmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
save-prefix=''

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Add your native dependencies here:
2+
3+
// Uncomment to add recyclerview-v7 dependency
4+
//dependencies {
5+
// compile 'com.android.support:recyclerview-v7:+'
6+
//}
7+
8+
android {
9+
defaultConfig {
10+
generatedDensities = []
11+
}
12+
aaptOptions {
13+
additionalParameters "--no-version-vectors"
14+
}
15+
}

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>${PRODUCT_NAME}</string>
9+
<key>CFBundleExecutable</key>
10+
<string>${EXECUTABLE_NAME}</string>
11+
<key>CFBundleIconFile</key>
12+
<string>icon.png</string>
13+
<key>CFBundleIcons</key>
14+
<dict>
15+
<key>CFBundlePrimaryIcon</key>
16+
<dict>
17+
<key>CFBundleIconFiles</key>
18+
<array>
19+
<string>icon-40</string>
20+
<string>icon-60</string>
21+
<string>icon-72</string>
22+
<string>icon-76</string>
23+
<string>Icon-Small</string>
24+
<string>Icon-Small-50</string>
25+
</array>
26+
<key>UIPrerenderedIcon</key>
27+
<false/>
28+
</dict>
29+
</dict>
30+
<key>CFBundleInfoDictionaryVersion</key>
31+
<string>6.0</string>
32+
<key>CFBundleName</key>
33+
<string>${PRODUCT_NAME}</string>
34+
<key>CFBundlePackageType</key>
35+
<string>APPL</string>
36+
<key>CFBundleShortVersionString</key>
37+
<string>1.0</string>
38+
<key>CFBundleSignature</key>
39+
<string>????</string>
40+
<key>CFBundleVersion</key>
41+
<string>1.0</string>
42+
<key>LSRequiresIPhoneOS</key>
43+
<true/>
44+
<key>UILaunchStoryboardName</key>
45+
<string>LaunchScreen</string>
46+
<key>UIRequiresFullScreen</key>
47+
<true/>
48+
<key>UIRequiredDeviceCapabilities</key>
49+
<array>
50+
<string>armv7</string>
51+
</array>
52+
<key>UISupportedInterfaceOrientations</key>
53+
<array>
54+
<string>UIInterfaceOrientationPortrait</string>
55+
<string>UIInterfaceOrientationLandscapeLeft</string>
56+
<string>UIInterfaceOrientationLandscapeRight</string>
57+
</array>
58+
<key>UISupportedInterfaceOrientations~ipad</key>
59+
<array>
60+
<string>UIInterfaceOrientationPortrait</string>
61+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
62+
<string>UIInterfaceOrientationLandscapeLeft</string>
63+
<string>UIInterfaceOrientationLandscapeRight</string>
64+
</array>
65+
66+
<key>NSAppTransportSecurity</key>
67+
<dict>
68+
<key>NSAllowsArbitraryLoads</key>
69+
<true/>
70+
</dict>
71+
</dict>
72+
</plist>

‎demo/app/App_Resources/iOS/build.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES

‎demo/app/references.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/// <reference path="../node_modules/tns-core-modules/tns-core-modules.d.ts" /> Enable smart suggestions and completions in Visual Studio Code JavaScript projects.

‎index.android.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11

2-
declare var java;
3-
declare var com;
4-
52
import * as utils from "tns-core-modules/utils/utils";
63

74
import { MapView, Marker, Position } from "nativescript-google-maps-sdk"

‎package.json‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
11
{
22
"name": "nativescript-google-maps-utils",
3-
"version": "0.1.3",
3+
"version": "0.1.4",
44
"description": "NativeScript Google Maps SDK utility library to support features such as marker clustering, heatmap, ...",
55
"main": "index",
6+
"typings": "index.d.ts",
67
"nativescript": {
78
"platforms": {
89
"ios": "2.0.0",
910
"android": "2.0.0"
1011
}
1112
},
1213
"scripts": {
14+
"build": "tsc",
1315
"test": "echo \"Error: no test specified\" && exit 1",
14-
"dev": "rsync -avz --delete ./*.js demo/dev/"
16+
"dev": "rsync -avz --delete ./*.js demo/app/dev/",
17+
"android-native-type-definition": "cd demo ; tns build android ; java -jar platforms/android/build-tools/dts-generator.jar -input platforms/android/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/11.0.0/jars/classes.jar -input platforms/android/build/intermediates/exploded-aar/com.google.maps.android/android-maps-utils/0.5/jars/classes.jar ; cp -f ./out/android.d.ts ../typings/android.d.ts ; xxxrm -fr ./out ; cd ..",
18+
"ios-native-type-definition": "cd demo ; TNS_TYPESCRIPT_DECLARATIONS_PATH=$(pwd)/typings tns build ios ; cp -f './typings/x86_64/objc!GoogleMaps'*'.d.ts' ../typings/ ; cp -f './typings/x86_64/objc!GoogleMaps.d.ts' ../typings/ios.d.ts ; xxxrm -fr ./typings* ; cd .."
1519
},
1620
"repository": {
1721
"type": "git",
1822
"url": "git+https://github.com/naderio/nativescript-google-maps-utils.git"
1923
},
2024
"keywords": [
2125
"nativescript",
26+
"google-maps",
2227
"google maps",
2328
"marker cluster",
24-
"heatmap"
29+
"heatmap",
30+
"android",
31+
"ios"
2532
],
2633
"author": "Nader Toukabri <[email protected]>",
2734
"license": "Unlicense",
@@ -30,9 +37,9 @@
3037
},
3138
"homepage": "https://github.com/naderio/nativescript-google-maps-utils#readme",
3239
"devDependencies": {
33-
"tns-core-modules": "^3.0.1",
34-
"tns-platform-declarations": "^3.0.1",
35-
"typescript": "^2.3.4"
40+
"tns-core-modules": "3.0.1",
41+
"tns-platform-declarations": "3.0.1",
42+
"typescript": "2.3.4"
3643
},
3744
"dependencies": {
3845
"nativescript-google-maps-sdk": "*"

‎references.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
2+
/// <reference path="./node_modules/nativescript-google-maps-sdk/map-view.d.ts" /> Needed for autocompletion and compilation.

0 commit comments

Comments
 (0)