From 8d846cc1519df9828f26b1a5ea359aa73c07c226 Mon Sep 17 00:00:00 2001 From: tgpetrov Date: Fri, 5 Apr 2019 09:35:21 +0300 Subject: [PATCH 1/3] feat(androidx): migrate to androidx --- demo-angular/package.json | 4 ++-- demo-vue/package.json | 4 ++-- demo/package.json | 4 ++-- src/camera.android.ts | 18 +++++++++--------- src/package.json | 6 +++--- src/platforms/android/AndroidManifest.xml | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/demo-angular/package.json b/demo-angular/package.json index d2c5a2d..ab1dfd8 100644 --- a/demo-angular/package.json +++ b/demo-angular/package.json @@ -6,7 +6,7 @@ "nativescript": { "id": "org.nativescript.demo.angular", "tns-android": { - "version": "5.3.0" + "version": "5.3.0-2019-03-19-143503-02" }, "tns-ios": { "version": "5.3.0" @@ -32,7 +32,7 @@ "nativescript-camera": "../src", "nativescript-theme-core": "^1.0.4", "rxjs": "^6.3.3", - "tns-core-modules": "^5.0.0", + "tns-core-modules": "androidx", "zone.js": "^0.8.4" }, "devDependencies": { diff --git a/demo-vue/package.json b/demo-vue/package.json index 1df0445..ce8fb99 100644 --- a/demo-vue/package.json +++ b/demo-vue/package.json @@ -2,7 +2,7 @@ "nativescript": { "id": "org.nativescript.demovue", "tns-android": { - "version": "5.3.0" + "version": "5.3.0-2019-03-19-143503-02" }, "tns-ios": { "version": "5.3.0" @@ -16,7 +16,7 @@ "nativescript-camera": "../src", "nativescript-theme-core": "~1.0.4", "nativescript-vue": "^2.0.0", - "tns-core-modules": "^5.0.0" + "tns-core-modules": "androidx" }, "devDependencies": { "@babel/core": "~7.1.0", diff --git a/demo/package.json b/demo/package.json index e9d2f0c..5684aac 100644 --- a/demo/package.json +++ b/demo/package.json @@ -6,7 +6,7 @@ "nativescript": { "id": "org.nativescript.demo", "tns-android": { - "version": "5.3.0" + "version": "5.3.0-2019-03-19-143503-02" }, "tns-ios": { "version": "5.3.0" @@ -23,7 +23,7 @@ }, "dependencies": { "nativescript-camera": "../src", - "tns-core-modules": "^5.0.0" + "tns-core-modules": "androidx" }, "devDependencies": { "@types/chai": "~4.1.7", diff --git a/src/camera.android.ts b/src/camera.android.ts index 1a3d4f5..0f864ad 100644 --- a/src/camera.android.ts +++ b/src/camera.android.ts @@ -11,9 +11,9 @@ let REQUEST_IMAGE_CAPTURE = 3453; export let takePicture = function (options?): Promise { return new Promise((resolve, reject) => { try { - if ((android.support.v4.content.ContextCompat).checkSelfPermission( + if (androidx.core.content.ContextCompat.checkSelfPermission( applicationModule.android.currentContext, - (android).Manifest.permission.CAMERA) !== android.content.pm.PackageManager.PERMISSION_GRANTED) { + android.Manifest.permission.CAMERA) !== android.content.pm.PackageManager.PERMISSION_GRANTED) { reject(new Error("Application does not have permissions to use Camera")); @@ -36,9 +36,9 @@ export let takePicture = function (options?): Promise { shouldKeepAspectRatio = types.isNullOrUndefined(options.keepAspectRatio) ? shouldKeepAspectRatio : options.keepAspectRatio; } - if ((android.support.v4.content.ContextCompat).checkSelfPermission( + if (androidx.core.content.ContextCompat.checkSelfPermission( applicationModule.android.currentContext, - (android).Manifest.permission.WRITE_EXTERNAL_STORAGE) !== android.content.pm.PackageManager.PERMISSION_GRANTED) { + android.Manifest.permission.WRITE_EXTERNAL_STORAGE) !== android.content.pm.PackageManager.PERMISSION_GRANTED) { saveToGallery = false; } @@ -62,7 +62,7 @@ export let takePicture = function (options?): Promise { let sdkVersionInt = parseInt(platform.device.sdkVersion); if (sdkVersionInt >= 21) { - tempPictureUri = (android.support.v4.content).FileProvider.getUriForFile( + tempPictureUri = androidx.core.content.FileProvider.getUriForFile( applicationModule.android.currentContext, applicationModule.android.nativeApp.getPackageName() + ".provider", nativeFile); } else { @@ -169,20 +169,20 @@ export let isAvailable = function () { export let requestPermissions = function () { return permissions.requestPermissions([ - (android).Manifest.permission.WRITE_EXTERNAL_STORAGE, - (android).Manifest.permission.CAMERA + android.Manifest.permission.WRITE_EXTERNAL_STORAGE, + android.Manifest.permission.CAMERA ]); }; export let requestPhotosPermissions = function () { return permissions.requestPermissions([ - (android).Manifest.permission.WRITE_EXTERNAL_STORAGE, + android.Manifest.permission.WRITE_EXTERNAL_STORAGE, ]); }; export let requestCameraPermissions = function () { return permissions.requestPermissions([ - (android).Manifest.permission.CAMERA + android.Manifest.permission.CAMERA ]); }; diff --git a/src/package.json b/src/package.json index cad3881..8a833dd 100644 --- a/src/package.json +++ b/src/package.json @@ -43,11 +43,11 @@ ], "author": "NativeScript team", "dependencies": { - "nativescript-permissions": "^1.2.3" + "nativescript-permissions": "androidx" }, "devDependencies": { - "tns-core-modules": "^5.0.0", - "tns-platform-declarations": "^5.0.0", + "tns-core-modules": "androidx", + "tns-platform-declarations": "androidx", "typescript": "~3.1.6", "prompt": "^1.0.0", "rimraf": "^2.6.2", diff --git a/src/platforms/android/AndroidManifest.xml b/src/platforms/android/AndroidManifest.xml index 6e4268e..3555dd7 100644 --- a/src/platforms/android/AndroidManifest.xml +++ b/src/platforms/android/AndroidManifest.xml @@ -2,7 +2,7 @@ From 5ba1b5907080f2eb37392abd2e73d336885be574 Mon Sep 17 00:00:00 2001 From: tgpetrov Date: Mon, 8 Apr 2019 18:56:28 +0300 Subject: [PATCH 2/3] chore: update permissions version --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 8a833dd..32c6f38 100644 --- a/src/package.json +++ b/src/package.json @@ -43,7 +43,7 @@ ], "author": "NativeScript team", "dependencies": { - "nativescript-permissions": "androidx" + "nativescript-permissions": "~1.3.0" }, "devDependencies": { "tns-core-modules": "androidx", From 4e463e8a024436dc64f91b2e935bccec52c03e67 Mon Sep 17 00:00:00 2001 From: Dimitar Todorov Date: Wed, 10 Apr 2019 19:07:42 +0300 Subject: [PATCH 3/3] Chore: change version to androidx --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 32c6f38..9d1bbce 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-camera", - "version": "4.4.0", + "version": "5.0.0-androidx", "description": "Provides API for using device camera", "repository": { "type": "git",