diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java index 573caff9..da503993 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java @@ -258,7 +258,7 @@ class Camera1 extends CameraController { } private boolean mergeWhiteBalance(Camera.Parameters params, WhiteBalance oldWhiteBalance) { - if (mOptions.getSupportedWhiteBalance().contains(mWhiteBalance)) { + if (mOptions.supports(mWhiteBalance)) { params.setWhiteBalance((String) mMapper.map(mWhiteBalance)); return true; } @@ -279,7 +279,7 @@ class Camera1 extends CameraController { } private boolean mergeHdr(Camera.Parameters params, Hdr oldHdr) { - if (mOptions.getSupportedHdr().contains(mHdr)) { + if (mOptions.supports(mHdr)) { params.setSceneMode((String) mMapper.map(mHdr)); return true; } @@ -301,7 +301,7 @@ class Camera1 extends CameraController { private boolean mergeFlash(Camera.Parameters params, Flash oldFlash) { - if (mOptions.getSupportedFlash().contains(mFlash)) { + if (mOptions.supports(mFlash)) { params.setFlashMode((String) mMapper.map(mFlash)); return true; } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java index d40084db..3b52da82 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java @@ -88,6 +88,50 @@ public class CameraOptions { CameraOptions(CameraCharacteristics params) {} + /** + * Shorthand for getSupportedFacing().contains(value). + * + * @param facing value + * @return whether it's supported + */ + public boolean supports(Facing facing) { + return getSupportedFacing().contains(facing); + } + + + /** + * Shorthand for getSupportedFlash().contains(value). + * + * @param flash value + * @return whether it's supported + */ + public boolean supports(Flash flash) { + return getSupportedFlash().contains(flash); + } + + + /** + * Shorthand for getSupportedWhiteBalance().contains(value). + * + * @param whiteBalance value + * @return whether it's supported + */ + public boolean supports(WhiteBalance whiteBalance) { + return getSupportedWhiteBalance().contains(whiteBalance); + } + + + /** + * Shorthand for getSupportedHdr().contains(value). + * + * @param hdr value + * @return whether it's supported + */ + public boolean supports(Hdr hdr) { + return getSupportedHdr().contains(hdr); + } + + /** * Set of supported facing values. *