From ac3044f52bb6cf709b22c123f719d60b739de94d Mon Sep 17 00:00:00 2001 From: darthpaul Date: Tue, 11 Oct 2022 00:24:41 +0100 Subject: [PATCH] show shutter animation along with sound --- .../simplemobiletools/camera/activities/MainActivity.kt | 7 +++++-- .../camera/implementations/CameraXPreview.kt | 1 + .../camera/implementations/CameraXPreviewListener.kt | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt index a33d9732..81fae8e9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -432,8 +432,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera toggleBottomButtons(true) change_resolution.isEnabled = true mPreview?.tryTakePicture() - shutter_animation.alpha = 1.0f - shutter_animation.animate().alpha(0f).setDuration(CAPTURE_ANIMATION_DURATION).start() } else { mPreview?.toggleRecording() } @@ -648,6 +646,11 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera } } + override fun shutterAnimation() { + shutter_animation.alpha = 1.0f + shutter_animation.animate().alpha(0f).setDuration(CAPTURE_ANIMATION_DURATION).start() + } + override fun onMediaSaved(uri: Uri) { change_resolution.isEnabled = true loadLastTakenMedia(uri) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt index 0181cf1e..9709de77 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt @@ -423,6 +423,7 @@ class CameraXPreview( val mediaOutput = mediaOutputHelper.getImageMediaOutput() imageCapture.takePicture(mainExecutor, object : OnImageCapturedCallback() { override fun onCaptureSuccess(image: ImageProxy) { + listener.shutterAnimation() playShutterSoundIfEnabled() ensureBackgroundThread { image.use { diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreviewListener.kt b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreviewListener.kt index 2e5fe335..4cfef036 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreviewListener.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreviewListener.kt @@ -10,6 +10,7 @@ interface CameraXPreviewListener { fun setFlashAvailable(available: Boolean) fun onChangeCamera(frontCamera: Boolean) fun toggleBottomButtons(hide: Boolean) + fun shutterAnimation() fun onMediaSaved(uri: Uri) fun onImageCaptured(bitmap: Bitmap) fun onChangeFlashMode(flashMode: Int)