Skip to content

[DO NOT MERGE] Androidx #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[DO NOT MERGE] Androidx #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d846cc
feat(androidx): migrate to androidx
tgpetrov Apr 5, 2019
5ba1b59
chore: update permissions version
tgpetrov Apr 8, 2019
4e463e8
Chore: change version to androidx
Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions demo-angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions demo-vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -23,7 +23,7 @@
},
"dependencies": {
"nativescript-camera": "../src",
"tns-core-modules": "^5.0.0"
"tns-core-modules": "androidx"
},
"devDependencies": {
"@types/chai": "~4.1.7",
Expand Down
18 changes: 9 additions & 9 deletions src/camera.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ let REQUEST_IMAGE_CAPTURE = 3453;
export let takePicture = function (options?): Promise<any> {
return new Promise((resolve, reject) => {
try {
if ((<any>android.support.v4.content.ContextCompat).checkSelfPermission(
if (androidx.core.content.ContextCompat.checkSelfPermission(
applicationModule.android.currentContext,
(<any>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"));

Expand All @@ -36,9 +36,9 @@ export let takePicture = function (options?): Promise<any> {
shouldKeepAspectRatio = types.isNullOrUndefined(options.keepAspectRatio) ? shouldKeepAspectRatio : options.keepAspectRatio;
}

if ((<any>android.support.v4.content.ContextCompat).checkSelfPermission(
if (androidx.core.content.ContextCompat.checkSelfPermission(
applicationModule.android.currentContext,
(<any>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;
}
Expand All @@ -62,7 +62,7 @@ export let takePicture = function (options?): Promise<any> {

let sdkVersionInt = parseInt(platform.device.sdkVersion);
if (sdkVersionInt >= 21) {
tempPictureUri = (<any>android.support.v4.content).FileProvider.getUriForFile(
tempPictureUri = androidx.core.content.FileProvider.getUriForFile(
applicationModule.android.currentContext,
applicationModule.android.nativeApp.getPackageName() + ".provider", nativeFile);
} else {
Expand Down Expand Up @@ -169,20 +169,20 @@ export let isAvailable = function () {

export let requestPermissions = function () {
return permissions.requestPermissions([
(<any>android).Manifest.permission.WRITE_EXTERNAL_STORAGE,
(<any>android).Manifest.permission.CAMERA
android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
android.Manifest.permission.CAMERA
]);
};

export let requestPhotosPermissions = function () {
return permissions.requestPermissions([
(<any>android).Manifest.permission.WRITE_EXTERNAL_STORAGE,
android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
]);
};

export let requestCameraPermissions = function () {
return permissions.requestPermissions([
(<any>android).Manifest.permission.CAMERA
android.Manifest.permission.CAMERA
]);
};

Expand Down
8 changes: 4 additions & 4 deletions src/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -43,11 +43,11 @@
],
"author": "NativeScript team",
"dependencies": {
"nativescript-permissions": "^1.2.3"
"nativescript-permissions": "~1.3.0"
},
"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",
Expand Down
2 changes: 1 addition & 1 deletion src/platforms/android/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<application>
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:grantUriPermissions="true">
Expand Down