Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ def safeExtGet(prop, fallback) {
buildscript {
repositories {
google()
maven {
url 'https://maven.google.com'
}
jcenter()
}

Expand Down Expand Up @@ -61,7 +64,9 @@ android {
repositories {
google()
jcenter()
mavenCentral()
maven {
url 'https://maven.google.com'
}
maven { url "https://jitpack.io" }
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
Expand All @@ -76,9 +81,9 @@ dependencies {
implementation "com.google.zxing:core:3.3.3"
implementation "com.drewnoakes:metadata-extractor:2.11.0"
generalImplementation "com.google.android.gms:play-services-vision:$googlePlayServicesVisionVersion"
implementation "androidx.exifinterface:exifinterface:1.0.0"
implementation "androidx.annotation:annotation:1.0.0"
implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation "com.android.support:exifinterface:${safeExtGet('supportLibVersion', '28.0.0')}"
implementation "com.android.support:support-annotations:${safeExtGet('supportLibVersion', '28.0.0')}"
implementation "com.android.support:support-v4:${safeExtGet('supportLibVersion', '28.0.0')}"
mlkitImplementation "com.google.firebase:firebase-ml-vision:${safeExtGet('firebase-ml-vision', '19.0.3')}"
mlkitImplementation "com.google.firebase:firebase-ml-vision-face-model:${safeExtGet('firebase-ml-vision-face-model', '17.0.2')}"
}
2 changes: 0 additions & 2 deletions android/gradle.properties

This file was deleted.

2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Wed Jan 23 23:35:17 CST 2019
#Sun Dec 31 13:43:56 BRST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import androidx.exifinterface.media.ExifInterface;
import android.support.media.ExifInterface;
import android.net.Uri;
import android.os.AsyncTask;
import android.util.Log;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.NonNull;
import androidx.collection.SparseArrayCompat;
import android.support.annotation.NonNull;
import android.support.v4.util.SparseArrayCompat;

/**
* Immutable class for describing proportional relationship between width and height.
Expand Down
14 changes: 7 additions & 7 deletions android/src/main/java/com/google/android/cameraview/Camera1.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import android.media.MediaRecorder;
import android.os.Build;
import android.os.Handler;
import androidx.collection.SparseArrayCompat;
import android.support.v4.util.SparseArrayCompat;
import android.util.Log;
import android.view.SurfaceHolder;

Expand Down Expand Up @@ -89,11 +89,11 @@ class Camera1 extends CameraViewImpl implements MediaRecorder.OnInfoListener,
private boolean mIsRecording;

private final SizeMap mPreviewSizes = new SizeMap();

private boolean mIsPreviewActive = false;

private final SizeMap mPictureSizes = new SizeMap();

private Size mPictureSize;

private AspectRatio mAspectRatio;
Expand Down Expand Up @@ -209,7 +209,7 @@ private void startCameraPreview() {
mCamera.setPreviewCallback(this);
}
}

@Override
public void resumePreview() {
startCameraPreview();
Expand Down Expand Up @@ -253,12 +253,12 @@ Set<AspectRatio> getSupportedAspectRatios() {
}
return idealAspectRatios.ratios();
}

@Override
SortedSet<Size> getAvailablePictureSizes(AspectRatio ratio) {
return mPictureSizes.sizes(ratio);
}

@Override
void setPictureSize(Size size) {
if (size == null) {
Expand All @@ -283,7 +283,7 @@ void setPictureSize(Size size) {
}
}
}

@Override
Size getPictureSize() {
return mPictureSize;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import android.media.Image;
import android.media.ImageReader;
import android.media.MediaRecorder;
import androidx.annotation.NonNull;
import android.support.annotation.NonNull;
import android.util.Log;
import android.util.SparseIntArray;
import android.view.Surface;
Expand Down Expand Up @@ -133,6 +133,9 @@ public void onConfigured(@NonNull CameraCaptureSession session) {
Log.e(TAG, "Failed to start camera preview because it couldn't access camera", e);
} catch (IllegalStateException e) {
Log.e(TAG, "Failed to start camera preview.", e);
} catch (IllegalArgumentException e) {
Log.e(TAG, "Something went wrong: " + e.getMessage());
mCallback.onMountError();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.os.ParcelableCompat;
import androidx.core.os.ParcelableCompatCreatorCallbacks;
import androidx.core.view.ViewCompat;
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.os.ParcelableCompat;
import android.support.v4.os.ParcelableCompatCreatorCallbacks;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.NonNull;
import android.support.annotation.NonNull;

/**
* Immutable class for describing width and height dimensions in pixels.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.google.android.cameraview;

import androidx.collection.ArrayMap;
import android.support.v4.util.ArrayMap;

import java.util.Set;
import java.util.SortedSet;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.google.android.cameraview;

import android.content.Context;
import androidx.core.view.ViewCompat;
import android.support.v4.view.ViewCompat;
import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Matrix;
import androidx.exifinterface.media.ExifInterface;
import android.support.media.ExifInterface;
import android.util.Base64;
import android.util.Log;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.lwansbrough.RCTCamera;

import androidx.annotation.Nullable;
import android.support.annotation.Nullable;

import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.common.MapBuilder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.reactnative.camera;

import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.MapBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import android.media.CamcorderProfile;
import android.media.MediaActionSound;
import android.os.Build;
import androidx.core.content.ContextCompat;
import android.support.v4.content.ContextCompat;
import android.view.View;
import android.os.AsyncTask;
import com.facebook.react.bridge.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.graphics.Paint;
import android.media.CamcorderProfile;
import android.os.Build;
import androidx.exifinterface.media.ExifInterface;
import android.support.media.ExifInterface;
import android.view.ViewGroup;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.ReactContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.reactnative.camera.events;

import androidx.core.util.Pools;
import android.support.v4.util.Pools;

import org.reactnative.camera.CameraViewManager;
import com.facebook.react.bridge.Arguments;
Expand All @@ -11,6 +11,7 @@
import com.google.zxing.Result;
import com.google.zxing.ResultPoint;

import java.util.Date;
import java.util.Formatter;

public class BarCodeReadEvent extends Event<BarCodeReadEvent> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.reactnative.camera.events;

import androidx.core.util.Pools;
import android.support.v4.util.Pools;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.events.Event;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.reactnative.camera.events;

import androidx.core.util.Pools;
import android.util.SparseArray;
import android.support.v4.util.Pools;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableArray;
import com.facebook.react.bridge.WritableMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.reactnative.camera.events;

import androidx.core.util.Pools;
import android.support.v4.util.Pools;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.events.Event;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package org.reactnative.camera.events;

import androidx.core.util.Pools;
import android.support.v4.util.Pools;

import org.reactnative.camera.CameraViewManager;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.events.Event;
import com.facebook.react.uimanager.events.RCTEventEmitter;

import java.util.Date;

public class CameraReadyEvent extends Event<CameraReadyEvent> {
private static final Pools.SynchronizedPool<CameraReadyEvent> EVENTS_POOL = new Pools.SynchronizedPool<>(3);
private CameraReadyEvent() {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.reactnative.camera.events;

import androidx.core.util.Pools;
import android.support.v4.util.Pools;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.events.Event;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.reactnative.camera.events;

import androidx.core.util.Pools;
import android.support.v4.util.Pools;

import org.reactnative.camera.CameraViewManager;
import com.facebook.react.bridge.Arguments;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.reactnative.camera.events;

import androidx.core.util.Pools;
import android.support.v4.util.Pools;

import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.events.Event;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package org.reactnative.camera.events;

import androidx.core.util.Pools;
import android.support.v4.util.Pools;

import org.reactnative.camera.CameraViewManager;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.events.Event;
import com.facebook.react.uimanager.events.RCTEventEmitter;

import java.util.Date;

public class PictureTakenEvent extends Event<PictureTakenEvent> {
private static final Pools.SynchronizedPool<PictureTakenEvent> EVENTS_POOL = new Pools.SynchronizedPool<>(3);
private PictureTakenEvent() {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.reactnative.camera.events;

import androidx.core.util.Pools;
import android.support.v4.util.Pools;

import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableArray;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.graphics.Matrix;
import android.net.Uri;
import android.os.AsyncTask;
import androidx.exifinterface.media.ExifInterface;
import android.support.media.ExifInterface;
import android.util.Base64;

import org.reactnative.camera.RNCameraViewHelper;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.reactnative.facedetector.tasks;

import android.content.Context;
import androidx.exifinterface.media.ExifInterface;
import android.support.media.ExifInterface;
import android.net.Uri;
import android.os.AsyncTask;
import android.util.Log;
Expand Down
Loading