Refactor Quick Settings UI

.gemini/styleguide.md

@@ -62,6 +62,7 @@ When reviewing a pull request, focus on the following key areas:
 8.  **Resource Management**
     * **No Hardcoded Strings:** Forbid hardcoded user-facing strings in composables. All text should be extracted into `strings.xml` to support localization and make updates easier.
     * **Prefer Vector Drawables:** For icons and simple graphics, vector drawables (SVGs) should be preferred over raster images (PNGs) to reduce APK size and ensure sharp rendering on all screen densities.
+    * **Delete Unused Resources:** When refactoring or removing components, ensure that any associated resources (such as strings in `strings.xml` or icons/drawables in the `res/drawable` directory) that are no longer used anywhere in the project are deleted to reduce the final file size and maintain codebase cleanliness.
 
 9.  **Readability, Logging, and Documentation**
     *   **Code Clarity:** Is the code clear, concise, and easy to understand? Are function and variable names descriptive?

feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewScreen.kt

@@ -532,7 +532,8 @@ private fun ContentScreen(
                         quickSettingsController.toggleQuickSettings()
                         onNavigateToSettings()
                     },
-                    quickSettingsController = quickSettingsController
+                    quickSettingsController = quickSettingsController,
+                    showMoreSettingsButton = true
                 )
             }
         },

ui/components/capture/src/main/java/com/google/jetpackcamera/ui/components/capture/DisabledReason.kt

@@ -66,5 +66,9 @@ enum class DisabledReason(
     HDR_SIMULTANEOUS_IMAGE_VIDEO_UNSUPPORTED(
         HDR_SIMULTANEOUS_IMAGE_VIDEO_UNSUPPORTED_TAG,
         R.string.toast_hdr_simultaneous_image_video_unsupported
+    ),
+    FLASH_UNSUPPORTED_ON_LENS(
+        FLASH_UNSUPPORTED_ON_LENS_TAG,
+        R.string.toast_flash_unsupported_on_lens
     )
 }

ui/components/capture/src/main/java/com/google/jetpackcamera/ui/components/capture/TestTags.kt

@@ -44,6 +44,7 @@ const val HDR_IMAGE_UNSUPPORTED_ON_MULTI_STREAM_TAG = "HdrImageUnsupportedOnMult
 const val HDR_VIDEO_UNSUPPORTED_ON_DEVICE_TAG = "HdrVideoUnsupportedOnDeviceTag"
 const val HDR_VIDEO_UNSUPPORTED_ON_LENS_TAG = "HdrVideoUnsupportedOnDeviceTag"
 const val HDR_SIMULTANEOUS_IMAGE_VIDEO_UNSUPPORTED_TAG = "HdrSimultaneousImageVideoUnsupportedTag"
+const val FLASH_UNSUPPORTED_ON_LENS_TAG = "FlashUnsupportedOnLensTag"
 const val ZOOM_BUTTON_ROW_TAG = "ZoomButtonRowTag"
 const val ZOOM_BUTTON_MIN_TAG = "ZoomButtonMinTag"
 const val ZOOM_BUTTON_1_TAG = "ZoomButton1Tag"
@@ -95,3 +96,17 @@ const val BTN_QUICK_SETTINGS_FOCUSED_CAPTURE_MODE_VIDEO_ONLY =
     "quick_settings_focused_capture_mode_btn_option_video_only"
 const val BTN_QUICK_SETTINGS_FOCUSED_CAPTURE_MODE_IMAGE_ONLY =
     "quick_settings_focused_capture_mode_btn_option_image_only"
+
+const val BTN_QUICK_SETTINGS_FLASH_OPTION_OFF = "btn_quick_settings_flash_option_off"
+const val BTN_QUICK_SETTINGS_FLASH_OPTION_ON = "btn_quick_settings_flash_option_on"
+const val BTN_QUICK_SETTINGS_FLASH_OPTION_AUTO = "btn_quick_settings_flash_option_auto"
+const val BTN_QUICK_SETTINGS_FLASH_OPTION_LOW_LIGHT_BOOST =
+    "btn_quick_settings_flash_option_low_light_boost"
+
+const val BTN_QUICK_SETTINGS_HDR_OPTION_ON = "btn_quick_settings_hdr_option_on"
+const val BTN_QUICK_SETTINGS_HDR_OPTION_OFF = "btn_quick_settings_hdr_option_off"
+
+const val QUICK_SETTINGS_CAPTURE_MODE_ROW = "quick_settings_capture_mode_row"
+const val QUICK_SETTINGS_HDR_ROW = "quick_settings_hdr_row"
+const val QUICK_SETTINGS_ASPECT_RATIO_ROW = "quick_settings_aspect_ratio_row"
+const val QUICK_SETTINGS_FLASH_ROW = "quick_settings_flash_row"

ui/components/capture/src/main/java/com/google/jetpackcamera/ui/components/capture/quicksettings/QuickSettingsEnums.kt

@@ -105,22 +105,6 @@ enum class CameraAspectRatio : QuickSettingsEnum {
     }
 }
 
-enum class CameraStreamConfig : QuickSettingsEnum {
-    MULTI_STREAM {
-        override fun getDrawableResId() = R.drawable.multi_stream_icon
-
-        override fun getTextResId() = R.string.quick_settings_stream_config_multi
-        override fun getDescriptionResId() = R.string.quick_settings_stream_config_multi_description
-    },
-    SINGLE_STREAM {
-        override fun getDrawableResId() = R.drawable.single_stream_capture_icon
-
-        override fun getTextResId() = R.string.quick_settings_stream_config_single
-        override fun getDescriptionResId() =
-            R.string.quick_settings_stream_config_single_description
-    }
-}
-
 enum class CameraDynamicRange : QuickSettingsEnum {
     SDR {
 
@@ -165,19 +149,3 @@ enum class CameraCaptureMode : QuickSettingsEnum {
             R.string.quick_settings_description_capture_mode_image_only
     }
 }
-enum class CameraConcurrentCameraMode : QuickSettingsEnum {
-    OFF {
-        override fun getDrawableResId() = R.drawable.picture_in_picture_off_icon
-
-        override fun getTextResId() = R.string.quick_settings_text_concurrent_camera_off
-        override fun getDescriptionResId() =
-            R.string.quick_settings_description_concurrent_camera_off
-    },
-    DUAL {
-
-        override fun getDrawableResId() = R.drawable.ic_picture_in_picture
-        override fun getTextResId() = R.string.quick_settings_text_concurrent_camera_dual
-        override fun getDescriptionResId() =
-            R.string.quick_settings_description_concurrent_camera_dual
-    }
-}