Skip to content

Commit

Permalink
feat:(android) gradle lib migration (#159)
Browse files Browse the repository at this point in the history
  • Loading branch information
@triniwiz
triniwiz authored May 7, 2021
1 parent 568c2a9 commit c287411
Show file tree
Hide file tree
Showing 5 changed files with 299 additions and 253 deletions.
2 changes: 1 addition & 1 deletion demo/app/App_Resources/Android/app.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ android {
}

project.ext {
kotlinVersion = "1.4.20"
kotlinVersion = "1.4.32"
}
64 changes: 31 additions & 33 deletions src/camera-plus.android.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const DEVICE_INFO_STRING = () => `device: ${device.manufacturer} ${device.model}
export class CameraPlus extends CameraPlusBase {
// @GetSetProperty() public camera: android.hardware.Camera;
// Snapshot-friendly, since the decorator will include the snapshot-unknown object "android"
private _camera: com.github.triniwiz.fancycamera.FancyCamera;
private _camera: io.github.triniwiz.fancycamera.FancyCamera;
private _cameraId;

@GetSetProperty()
Expand Down Expand Up @@ -154,42 +154,42 @@ export class CameraPlus extends CameraPlusBase {
switch (value) {
case WhiteBalance.Cloudy:
this._camera.setWhiteBalance(
com.github.triniwiz.fancycamera.WhiteBalance.Cloudy
io.github.triniwiz.fancycamera.WhiteBalance.Cloudy
);
break;
case WhiteBalance.Fluorescent:
this._camera.setWhiteBalance(
com.github.triniwiz.fancycamera.WhiteBalance.Fluorescent
io.github.triniwiz.fancycamera.WhiteBalance.Fluorescent
);
break;
case WhiteBalance.Incandescent:
this._camera.setWhiteBalance(
com.github.triniwiz.fancycamera.WhiteBalance.Incandescent
io.github.triniwiz.fancycamera.WhiteBalance.Incandescent
);
break;
case WhiteBalance.Shadow:
this._camera.setWhiteBalance(
com.github.triniwiz.fancycamera.WhiteBalance.Shadow
io.github.triniwiz.fancycamera.WhiteBalance.Shadow
);
break;
case WhiteBalance.Sunny:
this._camera.setWhiteBalance(
com.github.triniwiz.fancycamera.WhiteBalance.Sunny
io.github.triniwiz.fancycamera.WhiteBalance.Sunny
);
break;
case WhiteBalance.Twilight:
this._camera.setWhiteBalance(
com.github.triniwiz.fancycamera.WhiteBalance.Twilight
io.github.triniwiz.fancycamera.WhiteBalance.Twilight
);
break;
case WhiteBalance.WarmFluorescent:
this._camera.setWhiteBalance(
com.github.triniwiz.fancycamera.WhiteBalance.WarmFluorescent
io.github.triniwiz.fancycamera.WhiteBalance.WarmFluorescent
);
break;
default:
this._camera.setWhiteBalance(
com.github.triniwiz.fancycamera.WhiteBalance.Auto
io.github.triniwiz.fancycamera.WhiteBalance.Auto
);
break;
}
Expand All @@ -199,19 +199,19 @@ export class CameraPlus extends CameraPlusBase {
get whiteBalance(): WhiteBalance | string {
if (this._camera) {
switch (this._camera.getWhiteBalance()) {
case com.github.triniwiz.fancycamera.WhiteBalance.Cloudy:
case io.github.triniwiz.fancycamera.WhiteBalance.Cloudy:
return WhiteBalance.Cloudy;
case com.github.triniwiz.fancycamera.WhiteBalance.Fluorescent:
case io.github.triniwiz.fancycamera.WhiteBalance.Fluorescent:
return WhiteBalance.Fluorescent;
case com.github.triniwiz.fancycamera.WhiteBalance.Incandescent:
case io.github.triniwiz.fancycamera.WhiteBalance.Incandescent:
return WhiteBalance.Incandescent;
case com.github.triniwiz.fancycamera.WhiteBalance.Shadow:
case io.github.triniwiz.fancycamera.WhiteBalance.Shadow:
return WhiteBalance.Shadow;
case com.github.triniwiz.fancycamera.WhiteBalance.Sunny:
case io.github.triniwiz.fancycamera.WhiteBalance.Sunny:
return WhiteBalance.Sunny;
case com.github.triniwiz.fancycamera.WhiteBalance.Twilight:
case io.github.triniwiz.fancycamera.WhiteBalance.Twilight:
return WhiteBalance.Twilight;
case com.github.triniwiz.fancycamera.WhiteBalance.WarmFluorescent:
case io.github.triniwiz.fancycamera.WhiteBalance.WarmFluorescent:
return WhiteBalance.WarmFluorescent;
default:
return WhiteBalance.Auto;
Expand Down Expand Up @@ -263,7 +263,7 @@ export class CameraPlus extends CameraPlusBase {
// create the Android RelativeLayout
app.android.on('activityRequestPermissions', this._permissionListener);
this._nativeView = new android.widget.RelativeLayout(this._context);
this._camera = new com.github.triniwiz.fancycamera.FancyCamera(this._context);
this._camera = new io.github.triniwiz.fancycamera.FancyCamera(this._context);
(this._camera as any).setLayoutParams(
new android.view.ViewGroup.LayoutParams(
android.view.ViewGroup.LayoutParams.MATCH_PARENT,
Expand All @@ -287,7 +287,6 @@ export class CameraPlus extends CameraPlusBase {

private _permissionListenerFn(args) {
if (this._camera) {
console.log('', this._camera.hasCameraPermission() || this._camera.hasPermission());
if (this._camera.hasCameraPermission() || this._camera.hasPermission()) {
this._camera.startPreview();
}
Expand All @@ -297,14 +296,13 @@ export class CameraPlus extends CameraPlusBase {
initNativeView() {
super.initNativeView();
this.on(View.layoutChangedEvent, this._onLayoutChangeListener);
const listenerImpl = (com as any).github.triniwiz.fancycamera.CameraEventListenerUI.extend({
const listenerImpl = (<any>io).github.triniwiz.fancycamera.CameraEventListenerUI.extend({
owner: null,
onReady(): void { },
onCameraCloseUI(): void {
},
onCameraError(message: string, ex: java.lang.Exception): void {
console.log('onCameraError', message);
ex.printStackTrace();
console.error('onCameraError', message);
const owner = this.owner ? this.owner.get() : null;
if (owner) {
owner._lastCameraOptions.shift();
Expand Down Expand Up @@ -411,7 +409,7 @@ export class CameraPlus extends CameraPlusBase {
owner.isRecording = false;
}
},
onCameraAnalysisUI(imageAnalysis: com.github.triniwiz.fancycamera.ImageAnalysis): void {
onCameraAnalysisUI(imageAnalysis: io.github.triniwiz.fancycamera.ImageAnalysis): void {

}
});
Expand All @@ -437,11 +435,11 @@ export class CameraPlus extends CameraPlusBase {
if (this._camera) {
switch (id) {
case CAMERA_FACING_FRONT:
this._camera.setPosition(com.github.triniwiz.fancycamera.CameraPosition.FRONT);
this._camera.setPosition(io.github.triniwiz.fancycamera.CameraPosition.FRONT);
this._cameraId = CAMERA_FACING_FRONT;
break;
default:
this._camera.setPosition(com.github.triniwiz.fancycamera.CameraPosition.BACK);
this._camera.setPosition(io.github.triniwiz.fancycamera.CameraPosition.BACK);
this._cameraId = CAMERA_FACING_BACK;
break;
}
Expand Down Expand Up @@ -521,25 +519,25 @@ export class CameraPlus extends CameraPlusBase {
this._camera.setSaveToGallery(!!options.saveToGallery);
switch (options.quality) {
case CameraVideoQuality.HIGHEST:
this._camera.setQuality(com.github.triniwiz.fancycamera.Quality.HIGHEST);
this._camera.setQuality(io.github.triniwiz.fancycamera.Quality.HIGHEST);
break;
case CameraVideoQuality.LOWEST:
this._camera.setQuality(com.github.triniwiz.fancycamera.Quality.LOWEST);
this._camera.setQuality(io.github.triniwiz.fancycamera.Quality.LOWEST);
break;
case CameraVideoQuality.MAX_2160P:
this._camera.setQuality(com.github.triniwiz.fancycamera.Quality.MAX_2160P);
this._camera.setQuality(io.github.triniwiz.fancycamera.Quality.MAX_2160P);
break;
case CameraVideoQuality.MAX_1080P:
this._camera.setQuality(com.github.triniwiz.fancycamera.Quality.MAX_1080P);
this._camera.setQuality(io.github.triniwiz.fancycamera.Quality.MAX_1080P);
break;
case CameraVideoQuality.MAX_720P:
this._camera.setQuality(com.github.triniwiz.fancycamera.Quality.MAX_720P);
this._camera.setQuality(io.github.triniwiz.fancycamera.Quality.MAX_720P);
break;
case CameraVideoQuality.QVGA:
this._camera.setQuality(com.github.triniwiz.fancycamera.Quality.QVGA);
this._camera.setQuality(io.github.triniwiz.fancycamera.Quality.QVGA);
break;
default:
this._camera.setQuality(com.github.triniwiz.fancycamera.Quality.MAX_480P);
this._camera.setQuality(io.github.triniwiz.fancycamera.Quality.MAX_480P);
break;
}
// -1 uses profile value;
Expand Down Expand Up @@ -807,7 +805,7 @@ export class CameraPlus extends CameraPlusBase {
public getCurrentCamera(): 'front' | 'rear' {
if (!this._camera) return 'rear';
switch (this._camera.getPosition()) {
case com.github.triniwiz.fancycamera.CameraPosition.FRONT:
case io.github.triniwiz.fancycamera.CameraPosition.FRONT:
return 'front';
default:
return 'rear';
Expand Down Expand Up @@ -854,7 +852,7 @@ export class CameraPlus extends CameraPlusBase {
*/
public getFlashMode() {
if (this.hasFlash()) {
if (this._camera.getFlashMode() !== com.github.triniwiz.fancycamera.CameraFlashMode.OFF) {
if (this._camera.getFlashMode() !== io.github.triniwiz.fancycamera.CameraFlashMode.OFF) {
return 'on';
}
return 'off';
Expand Down
5 changes: 2 additions & 3 deletions src/platforms/android/include.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
allprojects {
repositories {
maven { url "https://jitpack.io" }
google()
maven { url "https://dl.bintray.com/triniwiz/maven" }
maven { url "https://repo1.maven.org/maven2/" }
}
}

dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
implementation('com.github.triniwiz:fancycamera:3.0.0-alpha19'){
implementation('io.github.triniwiz:fancycamera:3.0.0-alpha22'){
transitive = true
}
}
Binary file modified src/platforms/android/nativescript_camera_plus.aar
View file
Binary file not shown.
Loading

0 comments on commit c287411

Please sign in to comment.