commit c1472a01540b258444f0aa0dc96580205b158a3d
author Sebastiano Barezzi <seba@sebaubuntu.dev> Sun Jun 11 00:36:24 2023 +0200
committer Luca Stefani <luca.stefani.ge1@gmail.com> Thu Jul 13 19:27:13 2023 +0200
tree f6c2578e5fdb8baab3523bab7fd9eedfe5c9de75
parent 9e0a3f71f4b16145ab5090bb52b337dad00a7d1c

Aperture: Simplify flash mode handling

Change-Id: I5ec3fcb523cf4cc240e9dbaed124bc330b2db08d

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

diff --git a/app/src/main/java/org/lineageos/aperture/CameraActivity.kt b/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
index ed478ac..4864b80 100644
--- a/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
+++ b/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
@@ -1642,13 +1642,8 @@
     private fun cycleFlashMode() {
         val currentFlashMode = flashMode
         val newFlashMode = when (cameraMode) {
-            CameraMode.PHOTO -> currentFlashMode.next()
-            CameraMode.VIDEO ->
-                if (currentFlashMode != FlashMode.OFF) {
-                    FlashMode.OFF
-                } else {
-                    FlashMode.TORCH
-                }
+            CameraMode.PHOTO -> FlashMode.PHOTO_ALLOWED_MODES.next(currentFlashMode)
+            CameraMode.VIDEO -> FlashMode.VIDEO_ALLOWED_MODES.next(currentFlashMode)
             else -> FlashMode.OFF
         }
 

app/src/main/java/org/lineageos/aperture/camera/FlashMode.kt

diff --git a/app/src/main/java/org/lineageos/aperture/camera/FlashMode.kt b/app/src/main/java/org/lineageos/aperture/camera/FlashMode.kt
index af41b53..5f501b7 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/FlashMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/camera/FlashMode.kt
@@ -38,4 +38,24 @@
      * Get the next mode.
      */
     fun next() = values().next(this)
+
+    companion object {
+        /**
+         * Allowed flash modes when in photo mode.
+         */
+        val PHOTO_ALLOWED_MODES = listOf(
+            OFF,
+            AUTO,
+            ON,
+            TORCH,
+        )
+
+        /**
+         * Allowed flash modes when in video mode.
+         */
+        val VIDEO_ALLOWED_MODES = listOf(
+            OFF,
+            TORCH,
+        )
+    }
 }