commit 7fac91ae1d757e688a3b033795b8190083203947
author LuK1337 <priv.luk@gmail.com> Sun Aug 14 16:49:17 2022 +0200
committer LuK1337 <priv.luk@gmail.com> Thu Sep 29 22:28:28 2022 +0200
tree 2d08357d7abade1ccddaa0537a0d7f5d01657f66
parent 353926dafb88eba7b420eaf2cbd1a0750d6558ac

Aperture: Use `when` in cycleFlashMode()

Change-Id: Id60ce26c2b85a0721d26587ae33f839b178ec81f

app/src/main/java/org/lineageos/aperture/MainActivity.kt

diff --git a/app/src/main/java/org/lineageos/aperture/MainActivity.kt b/app/src/main/java/org/lineageos/aperture/MainActivity.kt
index 0257b37..eec0cad 100644
--- a/app/src/main/java/org/lineageos/aperture/MainActivity.kt
+++ b/app/src/main/java/org/lineageos/aperture/MainActivity.kt
@@ -768,8 +768,12 @@
     @androidx.camera.camera2.interop.ExperimentalCamera2Interop
     private fun cycleFlashMode() {
         setFlashMode(
-            if (cameraController.imageCaptureFlashMode >= ImageCapture.FLASH_MODE_OFF) ImageCapture.FLASH_MODE_AUTO
-            else cameraController.imageCaptureFlashMode + 1
+            when (cameraController.imageCaptureFlashMode) {
+                ImageCapture.FLASH_MODE_AUTO -> ImageCapture.FLASH_MODE_ON
+                ImageCapture.FLASH_MODE_ON -> ImageCapture.FLASH_MODE_OFF
+                ImageCapture.FLASH_MODE_OFF -> ImageCapture.FLASH_MODE_AUTO
+                else -> ImageCapture.FLASH_MODE_AUTO
+            }
         )
     }