diff --git a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java index 19f7be13..3e244189 100644 --- a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java +++ b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java @@ -363,7 +363,7 @@ class Camera1 extends CameraImpl { } @Override - void captureImage() { + void capturePicture() { if (mIsCapturingImage) return; if (!isCameraOpened()) return; if (mSessionType == SESSION_TYPE_VIDEO && mIsCapturingVideo) { @@ -403,9 +403,9 @@ class Camera1 extends CameraImpl { if (!isCameraOpened()) return; if (mIsCapturingImage) return; // This won't work while capturing a video. - // Switch to captureImage. + // Switch to capturePicture. if (mIsCapturingVideo) { - captureImage(); + capturePicture(); return; } mIsCapturingImage = true; diff --git a/camerakit/src/main/api21/com/flurgle/camerakit/Camera2.java b/camerakit/src/main/api21/com/flurgle/camerakit/Camera2.java index 5bbd22ec..9326cf45 100644 --- a/camerakit/src/main/api21/com/flurgle/camerakit/Camera2.java +++ b/camerakit/src/main/api21/com/flurgle/camerakit/Camera2.java @@ -178,7 +178,7 @@ class Camera2 extends CameraImpl { } @Override - void captureImage() { + void capturePicture() { } diff --git a/camerakit/src/main/base/com/flurgle/camerakit/CameraImpl.java b/camerakit/src/main/base/com/flurgle/camerakit/CameraImpl.java index 2b98dd14..8e458691 100644 --- a/camerakit/src/main/base/com/flurgle/camerakit/CameraImpl.java +++ b/camerakit/src/main/base/com/flurgle/camerakit/CameraImpl.java @@ -32,7 +32,7 @@ abstract class CameraImpl implements PreviewImpl.SurfaceCallback { abstract void setSessionType(@SessionType int sessionType); abstract void setLocation(double latitude, double longitude); - abstract void captureImage(); + abstract void capturePicture(); abstract void captureSnapshot(); abstract void startVideo(@NonNull File file); abstract void endVideo(); diff --git a/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java b/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java index dc55c358..4efba926 100644 --- a/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java +++ b/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java @@ -664,7 +664,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver { * Set the current session type to either picture or video. * When sessionType is video, * - {@link #startCapturingVideo(File)} will not throw any exception - * - {@link #captureImage()} will fallback to {@link #captureSnapshot()} + * - {@link #capturePicture()} will fallback to {@link #captureSnapshot()} * * @see CameraKit.Constants#SESSION_TYPE_PICTURE * @see CameraKit.Constants#SESSION_TYPE_VIDEO @@ -808,8 +808,8 @@ public class CameraView extends FrameLayout implements LifecycleObserver { * * @see #captureSnapshot() */ - public void captureImage() { - mCameraImpl.captureImage(); + public void capturePicture() { + mCameraImpl.capturePicture(); } @@ -818,10 +818,10 @@ public class CameraView extends FrameLayout implements LifecycleObserver { * This eventually triggers {@link CameraListener#onPictureTaken(byte[])} if a listener * was registered. * - * The difference with {@link #captureImage()} is that this capture is faster, so it might be + * The difference with {@link #capturePicture()} is that this capture is faster, so it might be * better on slower cameras, though the result can be generally blurry or low quality. * - * @see #captureImage() + * @see #capturePicture() */ public void captureSnapshot() { mCameraImpl.captureSnapshot(); diff --git a/demo/src/main/java/com/flurgle/camerakit/demo/MainActivity.java b/demo/src/main/java/com/flurgle/camerakit/demo/MainActivity.java index f6259af4..c9ad736d 100644 --- a/demo/src/main/java/com/flurgle/camerakit/demo/MainActivity.java +++ b/demo/src/main/java/com/flurgle/camerakit/demo/MainActivity.java @@ -139,7 +139,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLayoutChan } }; camera.addCameraListener(mPictureListener); - camera.captureImage(); + camera.capturePicture(); } @OnClick(R.id.captureVideo)