empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix view-based selfie flash.

Browse source
This commit is contained in:
Alex Hart 2022-08-30 13:56:29 -03:00 • committed by Greyson Parrelli
parent 6cb359b2d0
commit 5a1a23d9ac
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
View file

@ -458,6 +458,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
selfieFlash selfieFlash
); );
flashHelper.onWillTakePicture();
cameraController.takePicture(Executors.mainThreadExecutor(), new ImageCapture.OnImageCapturedCallback() { cameraController.takePicture(Executors.mainThreadExecutor(), new ImageCapture.OnImageCapturedCallback() {
@Override @Override
public void onCaptureSuccess(@NonNull ImageProxy image) { public void onCaptureSuccess(@NonNull ImageProxy image) {

13
app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXSelfieFlashHelper.java
View file

@ -23,6 +23,7 @@ final class CameraXSelfieFlashHelper {
private float brightnessBeforeFlash; private float brightnessBeforeFlash;
private boolean inFlash; private boolean inFlash;
private int flashMode = -1;
CameraXSelfieFlashHelper(@NonNull Window window, CameraXSelfieFlashHelper(@NonNull Window window,
@NonNull CameraController camera, @NonNull CameraController camera,
@ -33,6 +34,13 @@ final class CameraXSelfieFlashHelper {
this.selfieFlash = selfieFlash; this.selfieFlash = selfieFlash;
} }
void onWillTakePicture() {
if (!inFlash && shouldUseViewBasedFlash()) {
flashMode = camera.getImageCaptureFlashMode();
camera.setImageCaptureFlashMode(ImageCapture.FLASH_MODE_OFF);
}
}
void startFlash() { void startFlash() {
if (inFlash || !shouldUseViewBasedFlash()) return; if (inFlash || !shouldUseViewBasedFlash()) return;
inFlash = true; inFlash = true;
@ -56,6 +64,9 @@ final class CameraXSelfieFlashHelper {
params.screenBrightness = brightnessBeforeFlash; params.screenBrightness = brightnessBeforeFlash;
window.setAttributes(params); window.setAttributes(params);
camera.setImageCaptureFlashMode(flashMode);
flashMode = -1;
selfieFlash.animate() selfieFlash.animate()
.alpha(0f) .alpha(0f)
.setDuration(SELFIE_FLASH_DURATION_MS); .setDuration(SELFIE_FLASH_DURATION_MS);
@ -66,7 +77,7 @@ final class CameraXSelfieFlashHelper {
private boolean shouldUseViewBasedFlash() { private boolean shouldUseViewBasedFlash() {
CameraSelector cameraSelector = camera.getCameraSelector() ; CameraSelector cameraSelector = camera.getCameraSelector() ;
return camera.getImageCaptureFlashMode() == ImageCapture.FLASH_MODE_ON && return (camera.getImageCaptureFlashMode() == ImageCapture.FLASH_MODE_ON || flashMode == ImageCapture.FLASH_MODE_ON) &&
cameraSelector == CameraSelector.DEFAULT_FRONT_CAMERA; cameraSelector == CameraSelector.DEFAULT_FRONT_CAMERA;
} }
} }