Version updates

Author: vakrilov

compile.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 SOURCE_DIR=src;
 PACK_DIR=dist/package/;
@@ -18,5 +19,5 @@ rm -rf $DIST_DIR
 mkdir -p $PACK_DIR
 
 #compile package and copy file required by npm
-node_modules/.bin/tsc -p $SOURCE_DIR --outDir $PACK_DIR
+$SOURCE_DIR/node_modules/.bin/tsc -p $SOURCE_DIR --outDir $PACK_DIR
 copy_package_files

package.json

@@ -19,7 +19,7 @@ export var takePicture = function (options?): Promise<any> {
 
             let types: typeof typesModule = require("utils/types");
             let utils: typeof utilsModule = require("utils/utils");
-            
+
             let saveToGallery;
             let reqWidth;
             let reqHeight;
@@ -39,7 +39,7 @@ export var takePicture = function (options?): Promise<any> {
 
             let takePictureIntent = new android.content.Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
             let dateStamp = createDateTimeStamp();
-            
+
             let picturePath: string;
             let nativeFile;
             let tempPictureUri;
@@ -52,38 +52,38 @@ export var takePicture = function (options?): Promise<any> {
                 picturePath = utils.ad.getApplicationContext().getExternalFilesDir(null).getAbsolutePath() + "/" + "NSIMG_" + dateStamp + ".jpg";
                 nativeFile = new java.io.File(picturePath);
             }
-            
+
             let sdkVersionInt = parseInt(platform.device.sdkVersion);
             if (sdkVersionInt >= 21) {
                 tempPictureUri = (<any>android.support.v4.content).FileProvider.getUriForFile(applicationModule.android.currentContext, applicationModule.android.nativeApp.getPackageName() + ".provider", nativeFile);
             }
             else {
                 tempPictureUri = android.net.Uri.fromFile(nativeFile);
             }
-            
+
             takePictureIntent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, tempPictureUri);
 
             if (takePictureIntent.resolveActivity(utils.ad.getApplicationContext().getPackageManager()) != null) {
 
                 let appModule: typeof applicationModule = require("application");
 
-                let previousResult = appModule.android.onActivityResult;
-                appModule.android.onActivityResult = (requestCode: number, resultCode: number, data: android.content.Intent) => {
-                    appModule.android.onActivityResult = previousResult;
+                appModule.android.on("activityResult", (args) => {
+                    const requestCode = args.requestCode;
+                    const resultCode = args.resultCode;
 
                     if (requestCode === REQUEST_IMAGE_CAPTURE && resultCode === android.app.Activity.RESULT_OK) {
                         if (saveToGallery) {
                             try {
                                 let callback = new android.media.MediaScannerConnection.OnScanCompletedListener({
-                                    onScanCompleted: function(path, uri) {
-                                        if (trace.enabled) {
+                                    onScanCompleted: function (path, uri) {
+                                        if (trace.isEnabled()) {
                                             trace.write(`image from path ${path} has been successfully scanned!`, trace.categories.Debug);
                                         }
                                     }
                                 });
                                 android.media.MediaScannerConnection.scanFile(appModule.android.context, [picturePath], null, callback);
                             } catch (ex) {
-                                if (trace.enabled) {
+                                if (trace.isEnabled()) {
                                     trace.write(`An error occurred while scanning file ${picturePath}: ${ex.message}!`, trace.categories.Debug);
                                 }
                             }
@@ -97,7 +97,7 @@ export var takePicture = function (options?): Promise<any> {
                         };
                         resolve(asset);
                     }
-                };
+                });
 
                 appModule.android.foregroundActivity.startActivityForResult(takePictureIntent, REQUEST_IMAGE_CAPTURE);
 
@@ -112,7 +112,7 @@ export var takePicture = function (options?): Promise<any> {
 
 export var isAvailable = function () {
     var utils: typeof utilsModule = require("utils/utils");
-    
+
     return utils.ad.getApplicationContext().getPackageManager().hasSystemFeature(android.content.pm.PackageManager.FEATURE_CAMERA)
 }
 
@@ -126,11 +126,11 @@ export var requestPermissions = function () {
 var createDateTimeStamp = function () {
     let result = "";
     let date = new Date();
-    result = date.getFullYear().toString() + 
-            ((date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1).toString() : (date.getMonth() + 1).toString()) +
-            (date.getDate() < 10 ? "0" + date.getDate().toString() : date.getDate().toString()) + "_" +
-            date.getHours().toString() +
-            date.getMinutes().toString() +
-            date.getSeconds().toString();
+    result = date.getFullYear().toString() +
+        ((date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1).toString() : (date.getMonth() + 1).toString()) +
+        (date.getDate() < 10 ? "0" + date.getDate().toString() : date.getDate().toString()) + "_" +
+        date.getHours().toString() +
+        date.getMinutes().toString() +
+        date.getSeconds().toString();
     return result;
 }

src/nativescript-camera.android.ts

@@ -178,14 +178,14 @@ export var requestPermissions = function () {
     if (authStatus === PHAuthorizationStatus.NotDetermined) {
         PHPhotoLibrary.requestAuthorization((auth) => {
             if (auth === PHAuthorizationStatus.Authorized) {
-                if (trace.enabled) {
+                if (trace.isEnabled()) {
                     trace.write("Application can access photo library assets.", trace.categories.Debug);
                 }
                 return;
             }
         })
     } else if (authStatus !== PHAuthorizationStatus.Authorized) {
-        if (trace.enabled) {
+        if (trace.isEnabled()) {
             trace.write("Application can not access photo library assets.", trace.categories.Debug);
         }
     }

src/nativescript-camera.ios.ts

@@ -1,6 +1,6 @@
 {
     "name": "nativescript-camera",
-    "version": "0.0.8",
+    "version": "3.0.0",
     "description": "Provides API for using device camera",
     "main": "nativescript-camera",
     "nativescript": {
@@ -10,7 +10,18 @@
         }
     },
     "keywords": [
-        "NativeScript", "camera", "gallery", "images"
+        "NativeScript",
+        "camera",
+        "gallery",
+        "images"
     ],
-    "author": "NativeScript team"
-}
+    "author": "NativeScript team",
+    "devDependencies": {
+        "tns-core-modules": "^3.0.0 || ^3.0.0-rc.1",
+        "tns-platform-declarations": "^3.0.0 || ^3.0.0-rc.1",
+        "typescript": "^2.2.2"
+    },
+    "peerDependencies": {
+        "tns-core-modules": "^3.0.0 || ^3.0.0-rc.1"
+    }
+}

src/package.json

@@ -1,3 +1,2 @@
-/// <reference path="../node_modules/tns-core-modules/tns-core-modules.es2016.d.ts" />
-/// <reference path="../node_modules/tns-platform-declarations/ios.d.ts" />
-/// <reference path="../node_modules/tns-platform-declarations/android.d.ts" />
+/// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
+/// <reference path="./node_modules/tns-platform-declarations/android.d.ts" />

src/references.d.ts

@@ -11,12 +11,19 @@
         "noEmitHelpers": true,
         "experimentalDecorators": true,
         "lib": [
-            "es2016"
-        ]
+            "es6",
+            "dom"
+        ],
+        "baseUrl": ".",
+        "paths": {
+            "*": [
+                "./node_modules/tns-core-modules/*",
+                "./node_modules/*"
+            ]
+        }
     },
-    "filesGlob": [
-        "./**/*.ts",
-        "!./node_modules/**/*.ts"
-    ],
-    "exclude": []
-}
+    "exclude": [
+        "node_modules",
+        "platforms"
+    ]
+}