From ef2f3eb766c0fab7194580bd24afef11b9dadfc6 Mon Sep 17 00:00:00 2001 From: darthpaul Date: Fri, 25 Nov 2022 15:50:05 +0000 Subject: [PATCH] PR changes: - remove rotating close icon from shutter button - remove toggling flashlight on each countdown tick - remove sound (to be addressed later) --- .../camera/activities/MainActivity.kt | 1 - .../camera/helpers/MediaSoundHelper.kt | 4 ---- .../camera/implementations/CameraXPreview.kt | 10 ---------- .../camera/interfaces/MyPreview.kt | 2 -- .../main/res/drawable/ic_shutter_animated.xml | 5 ----- .../res/drawable/ic_shutter_timer_cancel.xml | 13 ++++--------- .../shutter_pressed_to_timer_cancel.xml | 19 ------------------- 7 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 app/src/main/res/drawable/shutter_pressed_to_timer_cancel.xml 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 b2f896eb..16f6c06f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -847,7 +847,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera timer_text.beVisible() countDownTimer = object : CountDownTimer(timerMode.millisInFuture, 1000) { override fun onTick(millisUntilFinished: Long) { - mPreview!!.toggleFlash() val seconds = (TimeUnit.MILLISECONDS.toSeconds(millisUntilFinished) + 1).toString() timer_text.setText(seconds) } diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/MediaSoundHelper.kt b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/MediaSoundHelper.kt index 988880dc..1e32a822 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/helpers/MediaSoundHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/helpers/MediaSoundHelper.kt @@ -23,10 +23,6 @@ class MediaSoundHelper(context: Context) { mediaActionSound.play(MediaActionSound.STOP_VIDEO_RECORDING) } - fun playFocusCompleteSound() { - mediaActionSound.play(MediaActionSound.FOCUS_COMPLETE) - } - fun release() { mediaActionSound.release() } 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 3743a60e..0e237a30 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt @@ -465,16 +465,6 @@ class CameraXPreview( listener.onChangeFlashMode(flashState) } - override fun toggleFlash() { - if (config.isSoundEnabled) { - mediaSoundHelper.playFocusCompleteSound() - } - camera?.cameraControl?.enableTorch(true) - cameraHandler.postDelayed({ - camera?.cameraControl?.enableTorch(false) - }, TOGGLE_FLASH_DELAY) - } - override fun tryTakePicture() { val imageCapture = imageCapture ?: throw IllegalStateException("Camera initialization failed.") diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/interfaces/MyPreview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/interfaces/MyPreview.kt index 639f409c..f3b770a8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/interfaces/MyPreview.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/interfaces/MyPreview.kt @@ -19,6 +19,4 @@ interface MyPreview { fun initVideoMode() fun showChangeResolution() - - fun toggleFlash() } diff --git a/app/src/main/res/drawable/ic_shutter_animated.xml b/app/src/main/res/drawable/ic_shutter_animated.xml index 174a5d3e..62dde700 100644 --- a/app/src/main/res/drawable/ic_shutter_animated.xml +++ b/app/src/main/res/drawable/ic_shutter_animated.xml @@ -29,9 +29,4 @@ android:drawable="@drawable/shutter_unpressed_to_pressed" android:fromId="@id/unpressed" android:toId="@id/pressed" /> - - diff --git a/app/src/main/res/drawable/ic_shutter_timer_cancel.xml b/app/src/main/res/drawable/ic_shutter_timer_cancel.xml index 794114b4..db5dd642 100644 --- a/app/src/main/res/drawable/ic_shutter_timer_cancel.xml +++ b/app/src/main/res/drawable/ic_shutter_timer_cancel.xml @@ -8,13 +8,8 @@ android:fillType="evenOdd" android:pathData="M256,485C382.47,485 485,382.47 485,256C485,129.53 382.47,27 256,27C129.53,27 27,129.53 27,256C27,382.47 129.53,485 256,485ZM256,465C370.32,465 463,371.43 463,256C463,140.57 370.32,47 256,47C141.68,47 49,140.57 49,256C49,371.43 141.68,465 256,465Z" /> - - - + diff --git a/app/src/main/res/drawable/shutter_pressed_to_timer_cancel.xml b/app/src/main/res/drawable/shutter_pressed_to_timer_cancel.xml deleted file mode 100644 index 865d7fe4..00000000 --- a/app/src/main/res/drawable/shutter_pressed_to_timer_cancel.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - -