From 30d94bd236ba2cab85f09e1db82c65b42dc6f9a1 Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Fri, 27 Sep 2024 00:20:21 +0000
Subject: [PATCH 01/12] Implement default setting to start recordings muted or
 with audio

---
 .idea/androidTestResultsUserPreferences.xml   | 14 +++
 .idea/inspectionProfiles/Project_Default.xml  | 28 ++++++
 .../settings/JcaSettingsSerializer.kt         |  1 +
 .../settings/LocalSettingsRepository.kt       | 11 ++-
 .../settings/SettingsRepository.kt            |  5 +-
 .../settings/test/FakeSettingsRepository.kt   |  4 +
 .../jetpackcamera/settings/jca_settings.proto |  1 +
 .../feature/preview/PreviewViewModel.kt       |  4 +
 .../jetpackcamera/settings/SettingsScreen.kt  | 11 +++
 .../jetpackcamera/settings/SettingsUiState.kt | 10 +-
 .../settings/SettingsViewModel.kt             | 16 +++-
 .../settings/ui/SettingsComponents.kt         | 92 ++++++++++++-------
 .../settings/src/main/res/values/strings.xml  |  9 ++
 13 files changed, 166 insertions(+), 40 deletions(-)

diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
index c64c91021..4050478cd 100644
--- a/.idea/androidTestResultsUserPreferences.xml
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -17,6 +17,20 @@
             </AndroidTestResultsTableState>
           </value>
         </entry>
+        <entry key="1458034232">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_2_API_28" value="120" />
+                  <entry key="Pixel_8_API_34" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
       </map>
     </option>
   </component>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 44ca2d9b0..fb93d254a 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,34 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/JcaSettingsSerializer.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/JcaSettingsSerializer.kt
index 42ad15e62..53e061190 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/JcaSettingsSerializer.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/JcaSettingsSerializer.kt
@@ -38,6 +38,7 @@ object JcaSettingsSerializer : Serializer<JcaSettings> {
         .setDynamicRangeStatus(DynamicRange.DYNAMIC_RANGE_UNSPECIFIED)
         .setImageFormatStatus(ImageOutputFormat.IMAGE_OUTPUT_FORMAT_JPEG)
         .setMaxVideoDurationMillis(UNLIMITED_VIDEO_DURATION)
+        .setAudioMutedStatus(false)
         .build()
 
     override suspend fun readFrom(input: InputStream): JcaSettings {
diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/LocalSettingsRepository.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/LocalSettingsRepository.kt
index 9f56d9a52..950581071 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/LocalSettingsRepository.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/LocalSettingsRepository.kt
@@ -72,7 +72,8 @@ class LocalSettingsRepository @Inject constructor(
                 },
                 dynamicRange = DynamicRange.fromProto(it.dynamicRangeStatus),
                 imageFormat = ImageOutputFormat.fromProto(it.imageFormatStatus),
-                maxVideoDurationMillis = it.maxVideoDurationMillis
+                maxVideoDurationMillis = it.maxVideoDurationMillis,
+                audioMuted = it.audioMutedStatus
             )
         }
 
@@ -194,4 +195,12 @@ class LocalSettingsRepository @Inject constructor(
                 .build()
         }
     }
+
+    override suspend fun updateMutedMode(isMutedByDefault: Boolean) {
+        jcaSettings.updateData { currentSettings ->
+            currentSettings.toBuilder()
+                .setAudioMutedStatus(isMutedByDefault)
+                .build()
+        }
+    }
 }
diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsRepository.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsRepository.kt
index c1bbdacec..e73b8bf44 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsRepository.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsRepository.kt
@@ -56,4 +56,7 @@ interface SettingsRepository {
     suspend fun updateImageFormat(imageFormat: ImageOutputFormat)
 
     suspend fun updateMaxVideoDuration(durationMillis: Long)
-}
+
+    suspend fun updateMutedMode(isMutedByDefault: Boolean)
+
+    }
diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt
index 2e697125a..fa156e1a9 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt
@@ -87,4 +87,8 @@ object FakeSettingsRepository : SettingsRepository {
     override suspend fun updateMaxVideoDuration(durationMillis: Long) {
         currentCameraSettings = currentCameraSettings.copy(maxVideoDurationMillis = durationMillis)
     }
+
+    override suspend fun updateMutedMode(boolean: Boolean) {
+        currentCameraSettings =
+            currentCameraSettings.copy(audioMuted = boolean)    }
 }
diff --git a/data/settings/src/main/proto/com/google/jetpackcamera/settings/jca_settings.proto b/data/settings/src/main/proto/com/google/jetpackcamera/settings/jca_settings.proto
index 36357df14..5ca9dd8fd 100644
--- a/data/settings/src/main/proto/com/google/jetpackcamera/settings/jca_settings.proto
+++ b/data/settings/src/main/proto/com/google/jetpackcamera/settings/jca_settings.proto
@@ -42,6 +42,7 @@ message JcaSettings {
   DynamicRange dynamic_range_status = 8;
   ImageOutputFormat image_format_status = 10;
   uint64 max_video_duration_millis = 11;
+  bool audio_muted_status = 12;
 
   // Non-camera app settings
   DarkMode dark_mode_status = 9;
diff --git a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewViewModel.kt b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewViewModel.kt
index d11d9a204..babe26123 100644
--- a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewViewModel.kt
+++ b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewViewModel.kt
@@ -232,6 +232,10 @@ class PreviewViewModel @AssistedInject constructor(
                     cameraUseCase.setMaxVideoDuration(entry.value as Long)
                 }
 
+                CameraAppSettings::audioMuted -> {
+                    cameraUseCase.setAudioMuted(entry.value as Boolean)
+                }
+
                 CameraAppSettings::darkMode -> {}
 
                 else -> TODO("Unhandled CameraAppSetting $entry")
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsScreen.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsScreen.kt
index 8a21504d4..10b05249d 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsScreen.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsScreen.kt
@@ -40,6 +40,7 @@ import com.google.jetpackcamera.settings.ui.DarkModeSetting
 import com.google.jetpackcamera.settings.ui.DefaultCameraFacing
 import com.google.jetpackcamera.settings.ui.FlashModeSetting
 import com.google.jetpackcamera.settings.ui.MaxVideoDurationSetting
+import com.google.jetpackcamera.settings.ui.MuteRecordingSetting
 import com.google.jetpackcamera.settings.ui.SectionHeader
 import com.google.jetpackcamera.settings.ui.SettingsPageHeader
 import com.google.jetpackcamera.settings.ui.StabilizationSetting
@@ -67,6 +68,7 @@ fun SettingsScreen(
         setTargetFrameRate = viewModel::setTargetFrameRate,
         setAspectRatio = viewModel::setAspectRatio,
         setCaptureMode = viewModel::setCaptureMode,
+        setMuted = viewModel::setVideoMuted,
         setVideoStabilization = viewModel::setVideoStabilization,
         setPreviewStabilization = viewModel::setPreviewStabilization,
         setMaxVideoDuration = viewModel::setMaxVideoDuration,
@@ -84,6 +86,7 @@ private fun SettingsScreen(
     setTargetFrameRate: (Int) -> Unit = {},
     setAspectRatio: (AspectRatio) -> Unit = {},
     setCaptureMode: (CaptureMode) -> Unit = {},
+    setMuted: (Boolean) -> Unit = {},
     setVideoStabilization: (Stabilization) -> Unit = {},
     setPreviewStabilization: (Stabilization) -> Unit = {},
     setMaxVideoDuration: (Long) -> Unit = {},
@@ -107,6 +110,7 @@ private fun SettingsScreen(
                 setTargetFrameRate = setTargetFrameRate,
                 setAspectRatio = setAspectRatio,
                 setCaptureMode = setCaptureMode,
+                setMuted = setMuted,
                 setVideoStabilization = setVideoStabilization,
                 setPreviewStabilization = setPreviewStabilization,
                 setMaxVideoDuration = setMaxVideoDuration,
@@ -125,6 +129,7 @@ fun SettingsList(
     setTargetFrameRate: (Int) -> Unit = {},
     setAspectRatio: (AspectRatio) -> Unit = {},
     setCaptureMode: (CaptureMode) -> Unit = {},
+    setMuted: (Boolean) -> Unit = {},
     setVideoStabilization: (Stabilization) -> Unit = {},
     setPreviewStabilization: (Stabilization) -> Unit = {},
     setMaxVideoDuration: (Long) -> Unit = {},
@@ -163,12 +168,18 @@ fun SettingsList(
         maxVideoDurationUiState = uiState.maxVideoDurationUiState,
         setMaxDuration = setMaxVideoDuration
     )
+
     StabilizationSetting(
         stabilizationUiState = uiState.stabilizationUiState,
         setVideoStabilization = setVideoStabilization,
         setPreviewStabilization = setPreviewStabilization
     )
 
+    MuteRecordingSetting(
+        mutedUiState = uiState.muteAudioUiState,
+        setDefaultMuted = setMuted
+    )
+
     SectionHeader(title = stringResource(id = R.string.section_title_app_settings))
 
     DarkModeSetting(
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
index 737c5d579..f9c2180ce 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
@@ -54,7 +54,8 @@ sealed interface SettingsUiState {
         val fpsUiState: FpsUiState,
         val lensFlipUiState: FlipLensUiState,
         val stabilizationUiState: StabilizationUiState,
-        val maxVideoDurationUiState: MaxVideoDurationUiState.Enabled
+        val maxVideoDurationUiState: MaxVideoDurationUiState.Enabled,
+        val muteAudioUiState: MuteAudioUiState
     ) : SettingsUiState
 }
 
@@ -170,6 +171,12 @@ sealed interface StabilizationUiState {
 
 /* Settings that don't currently depend on constraints */
 
+sealed interface MuteAudioUiState{
+    data class Enabled(
+        val isMuted: Boolean,
+        val additionalContext: String = ""
+    ):MuteAudioUiState
+}
 // this could be constrained w/ a check to see if a torch is available?
 sealed interface FlashUiState {
     data class Enabled(
@@ -214,6 +221,7 @@ val TYPICAL_SETTINGS_UISTATE = SettingsUiState.Enabled(
     aspectRatioUiState = AspectRatioUiState.Enabled(DEFAULT_CAMERA_APP_SETTINGS.aspectRatio),
     captureModeUiState = CaptureModeUiState.Enabled(DEFAULT_CAMERA_APP_SETTINGS.captureMode),
     darkModeUiState = DarkModeUiState.Enabled(DEFAULT_CAMERA_APP_SETTINGS.darkMode),
+    muteAudioUiState = MuteAudioUiState.Enabled(DEFAULT_CAMERA_APP_SETTINGS.audioMuted),
     flashUiState =
     FlashUiState.Enabled(currentFlashMode = DEFAULT_CAMERA_APP_SETTINGS.flashMode),
     fpsUiState = FpsUiState.Enabled(
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
index 083916605..bb80570aa 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
@@ -40,7 +40,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 
 private const val TAG = "SettingsViewModel"
-val fpsOptions = setOf(FPS_15, FPS_30, FPS_60)
+private val fpsOptions = setOf(FPS_15, FPS_30, FPS_60)
 
 /**
  * [ViewModel] for [SettingsScreen].
@@ -64,6 +64,7 @@ class SettingsViewModel @Inject constructor(
                 ),
                 flashUiState = FlashUiState.Enabled(updatedSettings.flashMode),
                 darkModeUiState = DarkModeUiState.Enabled(updatedSettings.darkMode),
+                muteAudioUiState = MuteAudioUiState.Enabled(updatedSettings.audioMuted),
                 fpsUiState = getFpsUiState(constraints, updatedSettings),
                 lensFlipUiState = getLensFlipUiState(constraints, updatedSettings),
                 stabilizationUiState = getStabilizationUiState(constraints, updatedSettings)
@@ -372,9 +373,9 @@ class SettingsViewModel @Inject constructor(
 
         // if stabilization is on and the option is incompatible, disable
         if ((
-                previewStabilization == Stabilization.ON &&
-                    (fpsOption == FPS_15 || fpsOption == FPS_60)
-                ) ||
+                    previewStabilization == Stabilization.ON &&
+                            (fpsOption == FPS_15 || fpsOption == FPS_60)
+                    ) ||
             (videoStabilization == Stabilization.ON && fpsOption == FPS_60)
         ) {
             return SingleSelectableState.Disabled(
@@ -447,4 +448,11 @@ class SettingsViewModel @Inject constructor(
             Log.d(TAG, "set video duration: $durationMillis ms")
         }
     }
+
+    fun setVideoMuted(isMuted: Boolean) {
+        viewModelScope.launch {
+            settingsRepository.updateMutedMode(isMuted)
+            Log.d(TAG, "recording audio muted: $isMuted")
+        }
+    }
 }
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
index 56a83838f..10dc24794 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
@@ -65,6 +65,7 @@ import com.google.jetpackcamera.settings.FlashUiState
 import com.google.jetpackcamera.settings.FlipLensUiState
 import com.google.jetpackcamera.settings.FpsUiState
 import com.google.jetpackcamera.settings.MaxVideoDurationUiState
+import com.google.jetpackcamera.settings.MuteAudioUiState
 import com.google.jetpackcamera.settings.R
 import com.google.jetpackcamera.settings.SIXTY_SECONDS_DURATION
 import com.google.jetpackcamera.settings.SingleSelectableState
@@ -428,15 +429,15 @@ fun TargetFpsSetting(
                             enabled = when (fpsOption) {
                                 FPS_15 ->
                                     fpsUiState.fpsFifteenState is
-                                        SingleSelectableState.Selectable
+                                            SingleSelectableState.Selectable
 
                                 FPS_30 ->
                                     fpsUiState.fpsThirtyState is
-                                        SingleSelectableState.Selectable
+                                            SingleSelectableState.Selectable
 
                                 FPS_60 ->
                                     fpsUiState.fpsSixtyState is
-                                        SingleSelectableState.Selectable
+                                            SingleSelectableState.Selectable
 
                                 else -> false
                             }
@@ -532,7 +533,7 @@ fun StabilizationSetting(
                         SingleChoiceSelector(
                             modifier = Modifier.apply {
                                 if (stabilizationUiState.stabilizationOnState
-                                        is SingleSelectableState.Disabled
+                                            is SingleSelectableState.Disabled
                                 ) {
                                     testTag(
                                         stabilizationUiState.stabilizationOnState
@@ -545,15 +546,15 @@ fun StabilizationSetting(
                                 id = R.string.stabilization_selector_on_info
                             ),
                             enabled = stabilizationUiState.stabilizationOnState is
-                                SingleSelectableState.Selectable,
+                                    SingleSelectableState.Selectable,
                             selected = (
-                                stabilizationUiState.currentPreviewStabilization
-                                    == Stabilization.ON
-                                ) &&
-                                (
-                                    stabilizationUiState.currentVideoStabilization
-                                        != Stabilization.OFF
-                                    ),
+                                    stabilizationUiState.currentPreviewStabilization
+                                            == Stabilization.ON
+                                    ) &&
+                                    (
+                                            stabilizationUiState.currentVideoStabilization
+                                                    != Stabilization.OFF
+                                            ),
                             onClick = {
                                 setVideoStabilization(Stabilization.UNDEFINED)
                                 setPreviewStabilization(Stabilization.ON)
@@ -565,7 +566,7 @@ fun StabilizationSetting(
                         SingleChoiceSelector(
                             modifier = Modifier.apply {
                                 if (stabilizationUiState.stabilizationHighQualityState
-                                        is SingleSelectableState.Disabled
+                                            is SingleSelectableState.Disabled
                                 ) {
                                     testTag(
                                         stabilizationUiState.stabilizationHighQualityState
@@ -580,16 +581,16 @@ fun StabilizationSetting(
                                 id = R.string.stabilization_selector_high_quality_info
                             ),
                             enabled = stabilizationUiState.stabilizationHighQualityState
-                                == SingleSelectableState.Selectable,
+                                    == SingleSelectableState.Selectable,
 
                             selected = (
-                                stabilizationUiState.currentPreviewStabilization
-                                    == Stabilization.UNDEFINED
-                                ) &&
-                                (
-                                    stabilizationUiState.currentVideoStabilization
-                                        == Stabilization.ON
-                                    ),
+                                    stabilizationUiState.currentPreviewStabilization
+                                            == Stabilization.UNDEFINED
+                                    ) &&
+                                    (
+                                            stabilizationUiState.currentVideoStabilization
+                                                    == Stabilization.ON
+                                            ),
                             onClick = {
                                 setVideoStabilization(Stabilization.ON)
                                 setPreviewStabilization(Stabilization.UNDEFINED)
@@ -600,13 +601,13 @@ fun StabilizationSetting(
                         SingleChoiceSelector(
                             text = stringResource(id = R.string.stabilization_selector_off),
                             selected = (
-                                stabilizationUiState.currentPreviewStabilization
-                                    != Stabilization.ON
-                                ) &&
-                                (
-                                    stabilizationUiState.currentVideoStabilization
-                                        != Stabilization.ON
-                                    ),
+                                    stabilizationUiState.currentPreviewStabilization
+                                            != Stabilization.ON
+                                    ) &&
+                                    (
+                                            stabilizationUiState.currentVideoStabilization
+                                                    != Stabilization.ON
+                                            ),
                             onClick = {
                                 setVideoStabilization(Stabilization.OFF)
                                 setPreviewStabilization(Stabilization.OFF)
@@ -622,6 +623,31 @@ fun StabilizationSetting(
     )
 }
 
+@Composable
+fun MuteRecordingSetting(
+    modifier: Modifier = Modifier,
+    mutedUiState: MuteAudioUiState,
+    setDefaultMuted: (Boolean) -> Unit
+) {
+    SwitchSettingUI(
+        modifier = modifier,
+        title = stringResource(id = R.string.mute_audio_title),
+        description = if (mutedUiState is MuteAudioUiState.Enabled) {
+            if (mutedUiState.isMuted) {
+                stringResource(R.string.mute_selector_on)
+            } else
+                stringResource(R.string.mute_selector_off)
+        } else TODO("mute toggle currently has no disabled criteria"),
+        leadingIcon = null,
+        onSwitchChanged = { on ->
+            setDefaultMuted(on)
+            println("$on something???")
+        },
+        settingValue = mutedUiState.isMuted,
+        enabled = true
+    )
+}
+
 @Composable
 fun VersionInfo(versionName: String, modifier: Modifier = Modifier, buildType: String = "") {
     SettingUI(
@@ -631,11 +657,11 @@ fun VersionInfo(versionName: String, modifier: Modifier = Modifier, buildType: S
         enabled = true
     ) {
         val versionString = versionName +
-            if (buildType.isNotEmpty()) {
-                "/${buildType.toUpperCase(Locale.current)}"
-            } else {
-                ""
-            }
+                if (buildType.isNotEmpty()) {
+                    "/${buildType.toUpperCase(Locale.current)}"
+                } else {
+                    ""
+                }
         Text(text = versionString)
     }
 }
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index a3212f34a..9b4853856 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -53,6 +53,15 @@
     <string name="flash_mode_description_on">Flash is On</string>
     <string name="flash_mode_description_off">Flash is Off</string>
 
+    <!-- Mute setting strings -->
+    <string name="mute_audio_title">Mute Audio</string>
+
+    <string name="mute_selector_on">Recordings will start muted</string>
+    <string name="mute_selector_off">Recordings will start with audio enabled</string>
+
+    <string name="mute_description_on">Audio is enabled</string>
+    <string name="mute_description_off">Audio is muted</string>
+
     <!-- Capture mode setting strings -->
     <string name="capture_mode_title">Set Capture Mode</string>
 

From 1ff8c06e4991c42ea312f94565544527e8e39c48 Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Mon, 30 Sep 2024 17:48:55 +0000
Subject: [PATCH 02/12] cleanup

---
 .idea/other.xml                               | 318 ++++++++++++++++++
 .../settings/SettingsRepository.kt            |   3 +-
 .../settings/test/FakeSettingsRepository.kt   |   3 +-
 .../jetpackcamera/settings/SettingsUiState.kt |  18 +-
 .../settings/SettingsViewModel.kt             |   6 +-
 .../settings/ui/SettingsComponents.kt         |  74 ++--
 .../settings/src/main/res/values/strings.xml  |   2 +-
 7 files changed, 376 insertions(+), 48 deletions(-)
 create mode 100644 .idea/other.xml

diff --git a/.idea/other.xml b/.idea/other.xml
new file mode 100644
index 000000000..94c96f631
--- /dev/null
+++ b/.idea/other.xml
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="direct_access_persist.xml">
+    <option name="deviceSelectionList">
+      <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="27" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="F01L" />
+          <option name="id" value="F01L" />
+          <option name="manufacturer" value="FUJITSU" />
+          <option name="name" value="F-01L" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1280" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="28" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="SH-01L" />
+          <option name="id" value="SH-01L" />
+          <option name="manufacturer" value="SHARP" />
+          <option name="name" value="AQUOS sense2 SH-01L" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a51" />
+          <option name="id" value="a51" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A51" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b0q" />
+          <option name="id" value="b0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S22 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="32" />
+          <option name="brand" value="google" />
+          <option name="codename" value="bluejay" />
+          <option name="id" value="bluejay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="caiman" />
+          <option name="id" value="caiman" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="960" />
+          <option name="screenY" value="2142" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="comet" />
+          <option name="id" value="comet" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro Fold" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="2076" />
+          <option name="screenY" value="2152" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="crownqlteue" />
+          <option name="id" value="crownqlteue" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Note9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2220" />
+          <option name="screenY" value="1080" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm3q" />
+          <option name="id" value="dm3q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S23 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e1q" />
+          <option name="id" value="e1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix_camera" />
+          <option name="id" value="felix_camera" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold (Camera-enabled)" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8uwifi" />
+          <option name="id" value="gts8uwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8 Ultra" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1848" />
+          <option name="screenY" value="2960" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="husky" />
+          <option name="id" value="husky" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8 Pro" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="java" />
+          <option name="id" value="java" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="G20" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="komodo" />
+          <option name="id" value="komodo" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro XL" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="lynx" />
+          <option name="id" value="lynx" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="google" />
+          <option name="codename" value="oriole" />
+          <option name="id" value="oriole" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="panther" />
+          <option name="id" value="panther" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q5q" />
+          <option name="id" value="q5q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold5" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1812" />
+          <option name="screenY" value="2176" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="r11" />
+          <option name="id" value="r11" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Watch" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+          <option name="type" value="WEAR_OS" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="redfin" />
+          <option name="id" value="redfin" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 5" />
+          <option name="screenDensity" value="440" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="shiba" />
+          <option name="id" value="shiba" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tangorpro" />
+          <option name="id" value="tangorpro" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Tablet" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="id" value="tokay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="x1q" />
+          <option name="id" value="x1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S20" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3200" />
+        </PersistentDeviceSelectionData>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsRepository.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsRepository.kt
index e73b8bf44..122025268 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsRepository.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsRepository.kt
@@ -58,5 +58,4 @@ interface SettingsRepository {
     suspend fun updateMaxVideoDuration(durationMillis: Long)
 
     suspend fun updateMutedMode(isMutedByDefault: Boolean)
-
-    }
+}
diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt
index fa156e1a9..c092bc2ad 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt
@@ -90,5 +90,6 @@ object FakeSettingsRepository : SettingsRepository {
 
     override suspend fun updateMutedMode(boolean: Boolean) {
         currentCameraSettings =
-            currentCameraSettings.copy(audioMuted = boolean)    }
+            currentCameraSettings.copy(audioMuted = boolean)
+    }
 }
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
index f9c2180ce..cbf6e28e2 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
@@ -125,7 +125,11 @@ fun getLensUnsupportedRationale(
     }
 }
 
-/* Settings that currently have constraints **/
+//////////////////////////////////////////////////////////////
+//
+// Settings that currently depend on constraints
+//
+//////////////////////////////////////////////////////////////
 
 sealed interface FpsUiState {
     data class Enabled(
@@ -168,15 +172,19 @@ sealed interface StabilizationUiState {
     // Stabilization selection completely disabled. Cannot open dialog.
     data class Disabled(val disabledRationale: DisabledRationale) : StabilizationUiState
 }
+//////////////////////////////////////////////////////////////
+//
+// Settings that DON'T currently depend on constraints
+//
+//////////////////////////////////////////////////////////////
 
-/* Settings that don't currently depend on constraints */
-
-sealed interface MuteAudioUiState{
+sealed interface MuteAudioUiState {
     data class Enabled(
         val isMuted: Boolean,
         val additionalContext: String = ""
-    ):MuteAudioUiState
+    ) : MuteAudioUiState
 }
+
 // this could be constrained w/ a check to see if a torch is available?
 sealed interface FlashUiState {
     data class Enabled(
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
index bb80570aa..40fe4c385 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
@@ -373,9 +373,9 @@ class SettingsViewModel @Inject constructor(
 
         // if stabilization is on and the option is incompatible, disable
         if ((
-                    previewStabilization == Stabilization.ON &&
-                            (fpsOption == FPS_15 || fpsOption == FPS_60)
-                    ) ||
+                previewStabilization == Stabilization.ON &&
+                    (fpsOption == FPS_15 || fpsOption == FPS_60)
+                ) ||
             (videoStabilization == Stabilization.ON && fpsOption == FPS_60)
         ) {
             return SingleSelectableState.Disabled(
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
index 10dc24794..8dd01339e 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
@@ -429,15 +429,15 @@ fun TargetFpsSetting(
                             enabled = when (fpsOption) {
                                 FPS_15 ->
                                     fpsUiState.fpsFifteenState is
-                                            SingleSelectableState.Selectable
+                                        SingleSelectableState.Selectable
 
                                 FPS_30 ->
                                     fpsUiState.fpsThirtyState is
-                                            SingleSelectableState.Selectable
+                                        SingleSelectableState.Selectable
 
                                 FPS_60 ->
                                     fpsUiState.fpsSixtyState is
-                                            SingleSelectableState.Selectable
+                                        SingleSelectableState.Selectable
 
                                 else -> false
                             }
@@ -533,7 +533,7 @@ fun StabilizationSetting(
                         SingleChoiceSelector(
                             modifier = Modifier.apply {
                                 if (stabilizationUiState.stabilizationOnState
-                                            is SingleSelectableState.Disabled
+                                        is SingleSelectableState.Disabled
                                 ) {
                                     testTag(
                                         stabilizationUiState.stabilizationOnState
@@ -546,15 +546,15 @@ fun StabilizationSetting(
                                 id = R.string.stabilization_selector_on_info
                             ),
                             enabled = stabilizationUiState.stabilizationOnState is
-                                    SingleSelectableState.Selectable,
+                                SingleSelectableState.Selectable,
                             selected = (
-                                    stabilizationUiState.currentPreviewStabilization
-                                            == Stabilization.ON
-                                    ) &&
-                                    (
-                                            stabilizationUiState.currentVideoStabilization
-                                                    != Stabilization.OFF
-                                            ),
+                                stabilizationUiState.currentPreviewStabilization
+                                    == Stabilization.ON
+                                ) &&
+                                (
+                                    stabilizationUiState.currentVideoStabilization
+                                        != Stabilization.OFF
+                                    ),
                             onClick = {
                                 setVideoStabilization(Stabilization.UNDEFINED)
                                 setPreviewStabilization(Stabilization.ON)
@@ -566,7 +566,7 @@ fun StabilizationSetting(
                         SingleChoiceSelector(
                             modifier = Modifier.apply {
                                 if (stabilizationUiState.stabilizationHighQualityState
-                                            is SingleSelectableState.Disabled
+                                        is SingleSelectableState.Disabled
                                 ) {
                                     testTag(
                                         stabilizationUiState.stabilizationHighQualityState
@@ -581,16 +581,16 @@ fun StabilizationSetting(
                                 id = R.string.stabilization_selector_high_quality_info
                             ),
                             enabled = stabilizationUiState.stabilizationHighQualityState
-                                    == SingleSelectableState.Selectable,
+                                == SingleSelectableState.Selectable,
 
                             selected = (
-                                    stabilizationUiState.currentPreviewStabilization
-                                            == Stabilization.UNDEFINED
-                                    ) &&
-                                    (
-                                            stabilizationUiState.currentVideoStabilization
-                                                    == Stabilization.ON
-                                            ),
+                                stabilizationUiState.currentPreviewStabilization
+                                    == Stabilization.UNDEFINED
+                                ) &&
+                                (
+                                    stabilizationUiState.currentVideoStabilization
+                                        == Stabilization.ON
+                                    ),
                             onClick = {
                                 setVideoStabilization(Stabilization.ON)
                                 setPreviewStabilization(Stabilization.UNDEFINED)
@@ -601,13 +601,13 @@ fun StabilizationSetting(
                         SingleChoiceSelector(
                             text = stringResource(id = R.string.stabilization_selector_off),
                             selected = (
-                                    stabilizationUiState.currentPreviewStabilization
-                                            != Stabilization.ON
-                                    ) &&
-                                    (
-                                            stabilizationUiState.currentVideoStabilization
-                                                    != Stabilization.ON
-                                            ),
+                                stabilizationUiState.currentPreviewStabilization
+                                    != Stabilization.ON
+                                ) &&
+                                (
+                                    stabilizationUiState.currentVideoStabilization
+                                        != Stabilization.ON
+                                    ),
                             onClick = {
                                 setVideoStabilization(Stabilization.OFF)
                                 setPreviewStabilization(Stabilization.OFF)
@@ -635,13 +635,15 @@ fun MuteRecordingSetting(
         description = if (mutedUiState is MuteAudioUiState.Enabled) {
             if (mutedUiState.isMuted) {
                 stringResource(R.string.mute_selector_on)
-            } else
+            } else {
                 stringResource(R.string.mute_selector_off)
-        } else TODO("mute toggle currently has no disabled criteria"),
+            }
+        } else {
+            TODO("mute toggle currently has no disabled criteria")
+        },
         leadingIcon = null,
         onSwitchChanged = { on ->
             setDefaultMuted(on)
-            println("$on something???")
         },
         settingValue = mutedUiState.isMuted,
         enabled = true
@@ -657,11 +659,11 @@ fun VersionInfo(versionName: String, modifier: Modifier = Modifier, buildType: S
         enabled = true
     ) {
         val versionString = versionName +
-                if (buildType.isNotEmpty()) {
-                    "/${buildType.toUpperCase(Locale.current)}"
-                } else {
-                    ""
-                }
+            if (buildType.isNotEmpty()) {
+                "/${buildType.toUpperCase(Locale.current)}"
+            } else {
+                ""
+            }
         Text(text = versionString)
     }
 }
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index 9b4853856..02c750cb4 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -122,7 +122,7 @@
     <string name="fps_unsupported"> %1$s is unsupported at %2$d fps</string>
     <string name="stabilization_unsupported">%$1s is unsupported by the current stabilization</string>
     <string name="current_lens_unsupported">%$s is unsupported by the current lens</string>
-    <string name="rear_lens_unsupported">%$s is unsupported by the rear lens</string>
+    <string name="rear_lens_unsupported">%$s is unsupported by the rear lens</string>s
     <string name="front_lens_unsupported">%$s is unsupported by the front lens</string>
 
 

From d2c0b04a42aa018a0c8b063db91553a1f46e10c7 Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Tue, 8 Oct 2024 14:10:47 -0700
Subject: [PATCH 03/12] remove "s" typo

Co-authored-by: Jaehwa Noh <shwoghk14@gmail.com>
---
 feature/settings/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index 02c750cb4..9b4853856 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -122,7 +122,7 @@
     <string name="fps_unsupported"> %1$s is unsupported at %2$d fps</string>
     <string name="stabilization_unsupported">%$1s is unsupported by the current stabilization</string>
     <string name="current_lens_unsupported">%$s is unsupported by the current lens</string>
-    <string name="rear_lens_unsupported">%$s is unsupported by the rear lens</string>s
+    <string name="rear_lens_unsupported">%$s is unsupported by the rear lens</string>
     <string name="front_lens_unsupported">%$s is unsupported by the front lens</string>
 
 

From 7cb15dd46c16ea9865d02f61e41402e1ceddd0cb Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Tue, 8 Oct 2024 21:25:29 +0000
Subject: [PATCH 04/12] use new .withAudioEnabled API

---
 .../com/google/jetpackcamera/core/camera/CameraSession.kt   | 6 +++---
 gradle/libs.versions.toml                                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
index 3759c24d3..01f4d657d 100644
--- a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
+++ b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
@@ -524,7 +524,9 @@ private suspend fun startVideoRecordingInternal(
             currentCoroutineContext()[ContinuationInterceptor] as?
                 CoroutineDispatcher
             )?.asExecutor() ?: ContextCompat.getMainExecutor(context)
-    return pendingRecord.start(callbackExecutor) { onVideoRecordEvent ->
+    return pendingRecord
+        .withAudioEnabled(initialMuted)
+        .start(callbackExecutor) { onVideoRecordEvent ->
         Log.d(TAG, onVideoRecordEvent.toString())
         when (onVideoRecordEvent) {
             is VideoRecordEvent.Finalize -> {
@@ -555,8 +557,6 @@ private suspend fun startVideoRecordingInternal(
                 )
             }
         }
-    }.apply {
-        mute(initialMuted)
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f869f0fa6..d2c2d9707 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ protobufPlugin = "0.9.4"
 androidxActivityCompose = "1.8.2"
 androidxAppCompat = "1.6.1"
 androidxBenchmark = "1.2.3"
-androidxCamera = "1.5.0-SNAPSHOT"
+androidxCamera = "1.5.0-alpha02"
 androidxConcurrentFutures = "1.1.0"
 androidxCoreKtx = "1.12.0"
 androidxDatastore = "1.0.0"

From c2bf8f2bc3627caa8510c6c20d369ede3f3ee230 Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Tue, 8 Oct 2024 23:24:12 +0000
Subject: [PATCH 05/12] spotless

---
 .../core/camera/CameraSession.kt              | 47 ++++++++++---------
 .../jetpackcamera/settings/SettingsUiState.kt |  8 ++--
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
index 01f4d657d..b94b4a286 100644
--- a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
+++ b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
@@ -527,37 +527,38 @@ private suspend fun startVideoRecordingInternal(
     return pendingRecord
         .withAudioEnabled(initialMuted)
         .start(callbackExecutor) { onVideoRecordEvent ->
-        Log.d(TAG, onVideoRecordEvent.toString())
-        when (onVideoRecordEvent) {
-            is VideoRecordEvent.Finalize -> {
-                when (onVideoRecordEvent.error) {
-                    ERROR_NONE, ERROR_DURATION_LIMIT_REACHED ->
-                        onVideoRecord(
-                            CameraUseCase.OnVideoRecordEvent.OnVideoRecorded(
-                                onVideoRecordEvent.outputResults.outputUri
+            Log.d(TAG, onVideoRecordEvent.toString())
+            when (onVideoRecordEvent) {
+                is VideoRecordEvent.Finalize -> {
+                    when (onVideoRecordEvent.error) {
+                        ERROR_NONE, ERROR_DURATION_LIMIT_REACHED ->
+                            onVideoRecord(
+                                CameraUseCase.OnVideoRecordEvent.OnVideoRecorded(
+                                    onVideoRecordEvent.outputResults.outputUri
+                                )
                             )
-                        )
 
-                    else ->
-                        onVideoRecord(
-                            CameraUseCase.OnVideoRecordEvent.OnVideoRecordError(
-                                onVideoRecordEvent.cause
+                        else ->
+                            onVideoRecord(
+                                CameraUseCase.OnVideoRecordEvent.OnVideoRecordError(
+                                    onVideoRecordEvent.cause
+                                )
                             )
-                        )
+                    }
                 }
-            }
 
-            is VideoRecordEvent.Status -> {
-                onVideoRecord(
-                    CameraUseCase.OnVideoRecordEvent.OnVideoRecordStatus(
-                        audioAmplitude = onVideoRecordEvent.recordingStats.audioStats
-                            .audioAmplitude,
-                        elapsedTimeNanos = onVideoRecordEvent.recordingStats.recordedDurationNanos
+                is VideoRecordEvent.Status -> {
+                    onVideoRecord(
+                        CameraUseCase.OnVideoRecordEvent.OnVideoRecordStatus(
+                            audioAmplitude = onVideoRecordEvent.recordingStats.audioStats
+                                .audioAmplitude,
+                            elapsedTimeNanos = onVideoRecordEvent.recordingStats
+                                .recordedDurationNanos
+                        )
                     )
-                )
+                }
             }
         }
-    }
 }
 
 private suspend fun runVideoRecording(
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
index cbf6e28e2..a81ef9099 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
@@ -125,11 +125,11 @@ fun getLensUnsupportedRationale(
     }
 }
 
-//////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////
 //
 // Settings that currently depend on constraints
 //
-//////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////
 
 sealed interface FpsUiState {
     data class Enabled(
@@ -172,11 +172,11 @@ sealed interface StabilizationUiState {
     // Stabilization selection completely disabled. Cannot open dialog.
     data class Disabled(val disabledRationale: DisabledRationale) : StabilizationUiState
 }
-//////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////
 //
 // Settings that DON'T currently depend on constraints
 //
-//////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////
 
 sealed interface MuteAudioUiState {
     data class Enabled(

From 1122b726c47984c116a4bb62412429e196b61283 Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Tue, 8 Oct 2024 23:41:33 +0000
Subject: [PATCH 06/12] fixed API usage

---
 .../java/com/google/jetpackcamera/core/camera/CameraSession.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
index b94b4a286..a4bcff15a 100644
--- a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
+++ b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
@@ -516,7 +516,7 @@ private suspend fun startVideoRecordingInternal(
     }
     pendingRecord.apply {
         if (audioEnabled) {
-            withAudioEnabled()
+            withAudioEnabled(initialMuted)
         }
     }
     val callbackExecutor: Executor =
@@ -525,7 +525,6 @@ private suspend fun startVideoRecordingInternal(
                 CoroutineDispatcher
             )?.asExecutor() ?: ContextCompat.getMainExecutor(context)
     return pendingRecord
-        .withAudioEnabled(initialMuted)
         .start(callbackExecutor) { onVideoRecordEvent ->
             Log.d(TAG, onVideoRecordEvent.toString())
             when (onVideoRecordEvent) {

From a709a35364ac7c1544a3f3a4ea84e2cc5199afbf Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Thu, 10 Oct 2024 16:12:05 +0000
Subject: [PATCH 07/12] add permission constraint to mute setting

---
 .../settings/PermissionChecker.kt             | 36 +++++++++++++++++++
 .../jetpackcamera/settings/SettingsModule.kt  |  5 +++
 .../jetpackcamera/settings/SettingsUiState.kt | 30 ++++++++++++----
 .../settings/SettingsViewModel.kt             | 32 ++++++++++++++---
 .../settings/ui/SettingsComponents.kt         | 20 +++++++----
 .../jetpackcamera/settings/ui/TestTags.kt     |  1 +
 .../settings/src/main/res/values/strings.xml  |  4 +++
 gradle/libs.versions.toml                     |  2 +-
 settings.gradle.kts                           |  2 +-
 9 files changed, 113 insertions(+), 19 deletions(-)
 create mode 100644 data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt

diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt
new file mode 100644
index 000000000..6f6e910ed
--- /dev/null
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.jetpackcamera.settings
+
+import android.app.Application
+import android.content.pm.PackageManager
+import androidx.core.content.ContextCompat
+import javax.inject.Inject
+
+interface PermissionChecker {
+    fun isPermissionGranted(permission: String): Boolean
+}
+
+class LocalPermissionChecker @Inject constructor(private val application: Application) :
+    PermissionChecker {
+    override fun isPermissionGranted(permission: String): Boolean {
+        return ContextCompat.checkSelfPermission(
+            application.applicationContext,
+            permission
+        ) == PackageManager.PERMISSION_GRANTED
+    }
+}
\ No newline at end of file
diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsModule.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsModule.kt
index f523b5580..49491a6b9 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsModule.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsModule.kt
@@ -39,6 +39,11 @@ interface SettingsModule {
         settableConstraintsRepository: SettableConstraintsRepositoryImpl
     ): SettableConstraintsRepository
 
+    @Binds
+    fun bindsPermissionChecker(
+        localSettingsRepository: LocalPermissionChecker
+    ): PermissionChecker
+
     /**
      * ConstraintsRepository without setter.
      *
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
index a81ef9099..9eb031ba7 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
@@ -27,6 +27,7 @@ import com.google.jetpackcamera.settings.model.Stabilization
 import com.google.jetpackcamera.settings.ui.DEVICE_UNSUPPORTED_TAG
 import com.google.jetpackcamera.settings.ui.FPS_UNSUPPORTED_TAG
 import com.google.jetpackcamera.settings.ui.LENS_UNSUPPORTED_TAG
+import com.google.jetpackcamera.settings.ui.PERMISSION_RECORD_AUDIO_NOT_GRANTED_TAG
 import com.google.jetpackcamera.settings.ui.STABILIZATION_UNSUPPORTED_TAG
 
 const val FPS_AUTO = 0
@@ -75,6 +76,14 @@ sealed interface DisabledRationale {
     /**
      * Text will be [affectedSettingNameResId] is [R.string.device_unsupported]
      */
+
+    data class PermissionRecordAudioNotGrantedRationale(override val affectedSettingNameResId: Int) :
+        DisabledRationale {
+        override val reasonTextResId: Int = R.string.permission_record_audio_unsupported
+        override val testTag = PERMISSION_RECORD_AUDIO_NOT_GRANTED_TAG
+    }
+
+
     data class DeviceUnsupportedRationale(override val affectedSettingNameResId: Int) :
         DisabledRationale {
         override val reasonTextResId: Int = R.string.device_unsupported
@@ -172,19 +181,28 @@ sealed interface StabilizationUiState {
     // Stabilization selection completely disabled. Cannot open dialog.
     data class Disabled(val disabledRationale: DisabledRationale) : StabilizationUiState
 }
-// ////////////////////////////////////////////////////////////
-//
-// Settings that DON'T currently depend on constraints
-//
-// ////////////////////////////////////////////////////////////
 
 sealed interface MuteAudioUiState {
+    val isMuted: Boolean
+
     data class Enabled(
-        val isMuted: Boolean,
+        override val isMuted: Boolean,
         val additionalContext: String = ""
     ) : MuteAudioUiState
+
+    data class Disabled(
+        override val isMuted: Boolean,
+        val disabledRationale: DisabledRationale
+    ) : MuteAudioUiState
 }
 
+// ////////////////////////////////////////////////////////////
+//
+// Settings that DON'T currently depend on constraints
+//
+// ////////////////////////////////////////////////////////////
+
+
 // this could be constrained w/ a check to see if a torch is available?
 sealed interface FlashUiState {
     data class Enabled(
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
index 40fe4c385..5b715f3f1 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
@@ -15,6 +15,7 @@
  */
 package com.google.jetpackcamera.settings
 
+import android.Manifest
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -31,13 +32,13 @@ import com.google.jetpackcamera.settings.model.Stabilization
 import com.google.jetpackcamera.settings.model.SupportedStabilizationMode
 import com.google.jetpackcamera.settings.model.SystemConstraints
 import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 private const val TAG = "SettingsViewModel"
 private val fpsOptions = setOf(FPS_15, FPS_30, FPS_60)
@@ -48,6 +49,7 @@ private val fpsOptions = setOf(FPS_15, FPS_30, FPS_60)
 @HiltViewModel
 class SettingsViewModel @Inject constructor(
     private val settingsRepository: SettingsRepository,
+    private val permissionChecker: PermissionChecker,
     constraintsRepository: ConstraintsRepository
 ) : ViewModel() {
 
@@ -64,7 +66,10 @@ class SettingsViewModel @Inject constructor(
                 ),
                 flashUiState = FlashUiState.Enabled(updatedSettings.flashMode),
                 darkModeUiState = DarkModeUiState.Enabled(updatedSettings.darkMode),
-                muteAudioUiState = MuteAudioUiState.Enabled(updatedSettings.audioMuted),
+                muteAudioUiState = getMuteAudioUiState(
+                    permissionChecker,
+                    updatedSettings.audioMuted
+                ),
                 fpsUiState = getFpsUiState(constraints, updatedSettings),
                 lensFlipUiState = getLensFlipUiState(constraints, updatedSettings),
                 stabilizationUiState = getStabilizationUiState(constraints, updatedSettings)
@@ -75,6 +80,23 @@ class SettingsViewModel @Inject constructor(
             initialValue = SettingsUiState.Disabled
         )
 
+
+    private fun getMuteAudioUiState(
+        permissionChecker: PermissionChecker,
+        isMuted: Boolean
+    ): MuteAudioUiState {
+        return if (permissionChecker.isPermissionGranted(Manifest.permission.RECORD_AUDIO))
+            MuteAudioUiState.Enabled(isMuted)
+        else
+            MuteAudioUiState.Disabled(
+                isMuted,
+                DisabledRationale
+                    .PermissionRecordAudioNotGrantedRationale(
+                        R.string.mute_audio_rationale_prefix
+                    )
+            )
+    }
+
     private fun getStabilizationUiState(
         systemConstraints: SystemConstraints,
         cameraAppSettings: CameraAppSettings
@@ -373,9 +395,9 @@ class SettingsViewModel @Inject constructor(
 
         // if stabilization is on and the option is incompatible, disable
         if ((
-                previewStabilization == Stabilization.ON &&
-                    (fpsOption == FPS_15 || fpsOption == FPS_60)
-                ) ||
+                    previewStabilization == Stabilization.ON &&
+                            (fpsOption == FPS_15 || fpsOption == FPS_60)
+                    ) ||
             (videoStabilization == Stabilization.ON && fpsOption == FPS_60)
         ) {
             return SingleSelectableState.Disabled(
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
index 8dd01339e..603c1a039 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
@@ -15,6 +15,7 @@
  */
 package com.google.jetpackcamera.settings.ui
 
+import android.Manifest
 import android.content.res.Configuration
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
@@ -38,6 +39,7 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -632,24 +634,25 @@ fun MuteRecordingSetting(
     SwitchSettingUI(
         modifier = modifier,
         title = stringResource(id = R.string.mute_audio_title),
-        description = if (mutedUiState is MuteAudioUiState.Enabled) {
-            if (mutedUiState.isMuted) {
+        description = when (mutedUiState) {
+            is MuteAudioUiState.Enabled -> if (mutedUiState.isMuted) {
                 stringResource(R.string.mute_selector_on)
             } else {
                 stringResource(R.string.mute_selector_off)
             }
-        } else {
-            TODO("mute toggle currently has no disabled criteria")
-        },
+
+            is MuteAudioUiState.Disabled ->  {
+            disabledRationaleString(disabledRationale =  (mutedUiState as MuteAudioUiState.Disabled).disabledRationale) }},
         leadingIcon = null,
         onSwitchChanged = { on ->
             setDefaultMuted(on)
         },
         settingValue = mutedUiState.isMuted,
-        enabled = true
+        enabled =  (mutedUiState is MuteAudioUiState.Enabled)
     )
 }
 
+
 @Composable
 fun VersionInfo(versionName: String, modifier: Modifier = Modifier, buildType: String = "") {
     SettingUI(
@@ -850,6 +853,11 @@ fun disabledRationaleString(disabledRationale: DisabledRationale): String {
             disabledRationale.reasonTextResId,
             stringResource(disabledRationale.affectedSettingNameResId)
         )
+
+        is DisabledRationale.PermissionRecordAudioNotGrantedRationale -> stringResource(
+            disabledRationale.reasonTextResId,
+            stringResource(disabledRationale.affectedSettingNameResId)
+        )
     }
 }
 
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/TestTags.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/TestTags.kt
index 8253fc1a8..821463c53 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/TestTags.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/TestTags.kt
@@ -22,3 +22,4 @@ const val DEVICE_UNSUPPORTED_TAG = "DeviceUnsupportedTag"
 const val STABILIZATION_UNSUPPORTED_TAG = "StabilizationUnsupportedTag"
 const val LENS_UNSUPPORTED_TAG = "LensUnsupportedTag"
 const val FPS_UNSUPPORTED_TAG = "FpsUnsupportedTag"
+const val PERMISSION_RECORD_AUDIO_NOT_GRANTED_TAG = "PermissionRecordAudioNotGrantedTag"
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index 9b4853856..1e7e23ae2 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -124,6 +124,7 @@
     <string name="current_lens_unsupported">%$s is unsupported by the current lens</string>
     <string name="rear_lens_unsupported">%$s is unsupported by the rear lens</string>
     <string name="front_lens_unsupported">%$s is unsupported by the front lens</string>
+    <string name="permission_record_audio_unsupported">%1$s requires permission to record audio</string>
 
 
     <!-- Rationale prefixes -->
@@ -135,6 +136,9 @@
     <string name="rear_lens_rationale_prefix">Rear lens</string>
     <string name="no_fixed_fps_rationale_prefix">Fixed frame rate</string>
 
+    <string name="mute_audio_rationale_prefix">Mute</string>
+
+
 
     <!-- Version info strings -->
     <string name="version_info_title">Version</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d2c2d9707..f869f0fa6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ protobufPlugin = "0.9.4"
 androidxActivityCompose = "1.8.2"
 androidxAppCompat = "1.6.1"
 androidxBenchmark = "1.2.3"
-androidxCamera = "1.5.0-alpha02"
+androidxCamera = "1.5.0-SNAPSHOT"
 androidxConcurrentFutures = "1.1.0"
 androidxCoreKtx = "1.12.0"
 androidxDatastore = "1.0.0"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7702c1882..0e07aaf61 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,7 +26,7 @@ dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         maven {
-            setUrl("https://androidx.dev/snapshots/builds/12335046/artifacts/repository")
+            setUrl("https://androidx.dev/snapshots/builds/12478400/artifacts/repository")
         }
         google()
         mavenCentral()

From 7f4c011d718b2e456d4cbd9f9bc250cc11d3af63 Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Thu, 10 Oct 2024 16:32:11 +0000
Subject: [PATCH 08/12] spotless

---
 .../jetpackcamera/settings/PermissionChecker.kt   |  3 +--
 .../jetpackcamera/settings/SettingsModule.kt      |  4 +---
 .../jetpackcamera/settings/SettingsUiState.kt     |  7 +++----
 .../jetpackcamera/settings/SettingsViewModel.kt   | 14 +++++++-------
 .../settings/ui/SettingsComponents.kt             | 15 ++++++---------
 5 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt
index 6f6e910ed..434b9d180 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.google.jetpackcamera.settings
 
 import android.app.Application
@@ -33,4 +32,4 @@ class LocalPermissionChecker @Inject constructor(private val application: Applic
             permission
         ) == PackageManager.PERMISSION_GRANTED
     }
-}
\ No newline at end of file
+}
diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsModule.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsModule.kt
index 49491a6b9..237d30d7c 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsModule.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/SettingsModule.kt
@@ -40,9 +40,7 @@ interface SettingsModule {
     ): SettableConstraintsRepository
 
     @Binds
-    fun bindsPermissionChecker(
-        localSettingsRepository: LocalPermissionChecker
-    ): PermissionChecker
+    fun bindsPermissionChecker(localSettingsRepository: LocalPermissionChecker): PermissionChecker
 
     /**
      * ConstraintsRepository without setter.
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
index 9eb031ba7..5cd3ee384 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
@@ -77,13 +77,13 @@ sealed interface DisabledRationale {
      * Text will be [affectedSettingNameResId] is [R.string.device_unsupported]
      */
 
-    data class PermissionRecordAudioNotGrantedRationale(override val affectedSettingNameResId: Int) :
-        DisabledRationale {
+    data class PermissionRecordAudioNotGrantedRationale(
+        override val affectedSettingNameResId: Int
+    ) : DisabledRationale {
         override val reasonTextResId: Int = R.string.permission_record_audio_unsupported
         override val testTag = PERMISSION_RECORD_AUDIO_NOT_GRANTED_TAG
     }
 
-
     data class DeviceUnsupportedRationale(override val affectedSettingNameResId: Int) :
         DisabledRationale {
         override val reasonTextResId: Int = R.string.device_unsupported
@@ -202,7 +202,6 @@ sealed interface MuteAudioUiState {
 //
 // ////////////////////////////////////////////////////////////
 
-
 // this could be constrained w/ a check to see if a torch is available?
 sealed interface FlashUiState {
     data class Enabled(
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
index 5b715f3f1..56fbdd60f 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsViewModel.kt
@@ -32,13 +32,13 @@ import com.google.jetpackcamera.settings.model.Stabilization
 import com.google.jetpackcamera.settings.model.SupportedStabilizationMode
 import com.google.jetpackcamera.settings.model.SystemConstraints
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 private const val TAG = "SettingsViewModel"
 private val fpsOptions = setOf(FPS_15, FPS_30, FPS_60)
@@ -80,14 +80,13 @@ class SettingsViewModel @Inject constructor(
             initialValue = SettingsUiState.Disabled
         )
 
-
     private fun getMuteAudioUiState(
         permissionChecker: PermissionChecker,
         isMuted: Boolean
     ): MuteAudioUiState {
-        return if (permissionChecker.isPermissionGranted(Manifest.permission.RECORD_AUDIO))
+        return if (permissionChecker.isPermissionGranted(Manifest.permission.RECORD_AUDIO)) {
             MuteAudioUiState.Enabled(isMuted)
-        else
+        } else {
             MuteAudioUiState.Disabled(
                 isMuted,
                 DisabledRationale
@@ -95,6 +94,7 @@ class SettingsViewModel @Inject constructor(
                         R.string.mute_audio_rationale_prefix
                     )
             )
+        }
     }
 
     private fun getStabilizationUiState(
@@ -395,9 +395,9 @@ class SettingsViewModel @Inject constructor(
 
         // if stabilization is on and the option is incompatible, disable
         if ((
-                    previewStabilization == Stabilization.ON &&
-                            (fpsOption == FPS_15 || fpsOption == FPS_60)
-                    ) ||
+                previewStabilization == Stabilization.ON &&
+                    (fpsOption == FPS_15 || fpsOption == FPS_60)
+                ) ||
             (videoStabilization == Stabilization.ON && fpsOption == FPS_60)
         ) {
             return SingleSelectableState.Disabled(
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
index 603c1a039..a1bdb2660 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/ui/SettingsComponents.kt
@@ -15,7 +15,6 @@
  */
 package com.google.jetpackcamera.settings.ui
 
-import android.Manifest
 import android.content.res.Configuration
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
@@ -39,7 +38,6 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -641,18 +639,17 @@ fun MuteRecordingSetting(
                 stringResource(R.string.mute_selector_off)
             }
 
-            is MuteAudioUiState.Disabled ->  {
-            disabledRationaleString(disabledRationale =  (mutedUiState as MuteAudioUiState.Disabled).disabledRationale) }},
-        leadingIcon = null,
-        onSwitchChanged = { on ->
-            setDefaultMuted(on)
+            is MuteAudioUiState.Disabled -> {
+                disabledRationaleString(disabledRationale = mutedUiState.disabledRationale)
+            }
         },
+        leadingIcon = null,
+        onSwitchChanged = { on -> setDefaultMuted(on) },
         settingValue = mutedUiState.isMuted,
-        enabled =  (mutedUiState is MuteAudioUiState.Enabled)
+        enabled = mutedUiState is MuteAudioUiState.Enabled
     )
 }
 
-
 @Composable
 fun VersionInfo(versionName: String, modifier: Modifier = Modifier, buildType: String = "") {
     SettingUI(

From 534715b1daa31b084353e06217805dc1c2d709ff Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Thu, 10 Oct 2024 19:44:20 +0000
Subject: [PATCH 09/12] address pr comments * remove .idea files * implement
 FakePermissionChecker for test

---
 .idea/androidTestResultsUserPreferences.xml   | 37 ----------
 .idea/inspectionProfiles/Project_Default.xml  | 69 -------------------
 .../settings/test/FakeSettingsRepository.kt   |  4 +-
 .../CameraAppSettingsViewModelTest.kt         | 12 ++--
 .../settings/FakePermissionChecker.kt         | 28 ++++++++
 5 files changed, 38 insertions(+), 112 deletions(-)
 delete mode 100644 .idea/androidTestResultsUserPreferences.xml
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt

diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
deleted file mode 100644
index 4050478cd..000000000
--- a/.idea/androidTestResultsUserPreferences.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidTestResultsUserPreferences">
-    <option name="androidTestResultsTableState">
-      <map>
-        <entry key="811462001">
-          <value>
-            <AndroidTestResultsTableState>
-              <option name="preferredColumnWidths">
-                <map>
-                  <entry key="Duration" value="90" />
-                  <entry key="Pixel_7_Pro_API_34" value="120" />
-                  <entry key="Pixel_C_API_34" value="120" />
-                  <entry key="Tests" value="360" />
-                </map>
-              </option>
-            </AndroidTestResultsTableState>
-          </value>
-        </entry>
-        <entry key="1458034232">
-          <value>
-            <AndroidTestResultsTableState>
-              <option name="preferredColumnWidths">
-                <map>
-                  <entry key="Duration" value="90" />
-                  <entry key="Pixel_2_API_28" value="120" />
-                  <entry key="Pixel_8_API_34" value="120" />
-                  <entry key="Tests" value="360" />
-                </map>
-              </option>
-            </AndroidTestResultsTableState>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index fb93d254a..000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt
index c092bc2ad..53143a182 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/test/FakeSettingsRepository.kt
@@ -88,8 +88,8 @@ object FakeSettingsRepository : SettingsRepository {
         currentCameraSettings = currentCameraSettings.copy(maxVideoDurationMillis = durationMillis)
     }
 
-    override suspend fun updateMutedMode(boolean: Boolean) {
+    override suspend fun updateMutedMode(isMutedByDefault: Boolean) {
         currentCameraSettings =
-            currentCameraSettings.copy(audioMuted = boolean)
+            currentCameraSettings.copy(audioMuted = isMutedByDefault)
     }
 }
diff --git a/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt
index dbbc72bde..5a439ba27 100644
--- a/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt
+++ b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt
@@ -63,7 +63,11 @@ internal class CameraAppSettingsViewModelTest {
         val constraintsRepository = SettableConstraintsRepositoryImpl().apply {
             updateSystemConstraints(TYPICAL_SYSTEM_CONSTRAINTS)
         }
-        settingsViewModel = SettingsViewModel(settingsRepository, constraintsRepository)
+        settingsViewModel = SettingsViewModel(
+            settingsRepository,
+            FakePermissionChecker(),
+            constraintsRepository
+        )
         advanceUntilIdle()
     }
 
@@ -128,9 +132,9 @@ internal class CameraAppSettingsViewModelTest {
 
         val newDarkMode =
             (
-                assertIsEnabled(settingsViewModel.settingsUiState.value)
-                    .darkModeUiState as DarkModeUiState.Enabled
-                )
+                    assertIsEnabled(settingsViewModel.settingsUiState.value)
+                        .darkModeUiState as DarkModeUiState.Enabled
+                    )
                 .currentDarkMode
 
         assertEquals(initialDarkMode, DarkMode.SYSTEM)
diff --git a/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt
new file mode 100644
index 000000000..98069e1c6
--- /dev/null
+++ b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.jetpackcamera.settings
+
+const val FAKE_PERMISSION_FALSE = "fakePermissionFalse"
+
+class FakePermissionChecker : PermissionChecker {
+    override fun isPermissionGranted(permission: String): Boolean {
+        return if (permission == FAKE_PERMISSION_FALSE)
+            false
+        else
+            true
+    }
+}
\ No newline at end of file

From f8fbbbe33af7f729ddcdd73efe4fa342904a0c94 Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Fri, 11 Oct 2024 12:51:37 +0000
Subject: [PATCH 10/12] spotless

---
 .../settings/CameraAppSettingsViewModelTest.kt            | 6 +++---
 .../jetpackcamera/settings/FakePermissionChecker.kt       | 8 ++++----
 .../com/google/jetpackcamera/settings/SettingsUiState.kt  | 7 +++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt
index 5a439ba27..c7768f757 100644
--- a/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt
+++ b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt
@@ -132,9 +132,9 @@ internal class CameraAppSettingsViewModelTest {
 
         val newDarkMode =
             (
-                    assertIsEnabled(settingsViewModel.settingsUiState.value)
-                        .darkModeUiState as DarkModeUiState.Enabled
-                    )
+                assertIsEnabled(settingsViewModel.settingsUiState.value)
+                    .darkModeUiState as DarkModeUiState.Enabled
+                )
                 .currentDarkMode
 
         assertEquals(initialDarkMode, DarkMode.SYSTEM)
diff --git a/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt
index 98069e1c6..f4addf799 100644
--- a/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt
+++ b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.google.jetpackcamera.settings
 
 const val FAKE_PERMISSION_FALSE = "fakePermissionFalse"
 
 class FakePermissionChecker : PermissionChecker {
     override fun isPermissionGranted(permission: String): Boolean {
-        return if (permission == FAKE_PERMISSION_FALSE)
+        return if (permission == FAKE_PERMISSION_FALSE) {
             false
-        else
+        } else {
             true
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
index 5cd3ee384..8c7dddfc9 100644
--- a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
+++ b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsUiState.kt
@@ -73,10 +73,6 @@ sealed interface DisabledRationale {
     val reasonTextResId: Int
     val testTag: String
 
-    /**
-     * Text will be [affectedSettingNameResId] is [R.string.device_unsupported]
-     */
-
     data class PermissionRecordAudioNotGrantedRationale(
         override val affectedSettingNameResId: Int
     ) : DisabledRationale {
@@ -84,6 +80,9 @@ sealed interface DisabledRationale {
         override val testTag = PERMISSION_RECORD_AUDIO_NOT_GRANTED_TAG
     }
 
+    /**
+     * Text will be [affectedSettingNameResId] is [R.string.device_unsupported]
+     */
     data class DeviceUnsupportedRationale(override val affectedSettingNameResId: Int) :
         DisabledRationale {
         override val reasonTextResId: Int = R.string.device_unsupported

From 66b88dbb91806c11efd9d3be4b61e0264f487b8c Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Fri, 11 Oct 2024 13:41:22 +0000
Subject: [PATCH 11/12] inject context instead of application in
 PermissionChecker

---
 .../google/jetpackcamera/settings/PermissionChecker.kt    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt
index 434b9d180..1749742e1 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt
@@ -16,19 +16,23 @@
 package com.google.jetpackcamera.settings
 
 import android.app.Application
+import android.content.Context
 import android.content.pm.PackageManager
 import androidx.core.content.ContextCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 interface PermissionChecker {
     fun isPermissionGranted(permission: String): Boolean
 }
 
-class LocalPermissionChecker @Inject constructor(private val application: Application) :
+class LocalPermissionChecker @Inject constructor(
+    @ApplicationContext private val context: Context
+) :
     PermissionChecker {
     override fun isPermissionGranted(permission: String): Boolean {
         return ContextCompat.checkSelfPermission(
-            application.applicationContext,
+            context,
             permission
         ) == PackageManager.PERMISSION_GRANTED
     }

From a4c48befc3fa74591676cf62e8bdfe7c92afed9b Mon Sep 17 00:00:00 2001
From: Kimberly Crevecoeur <kcrevecoeur@google.com>
Date: Fri, 11 Oct 2024 14:45:37 +0000
Subject: [PATCH 12/12] add test

---
 .../settings/PermissionChecker.kt             |  7 ++++++-
 .../CameraAppSettingsViewModelTest.kt         | 21 +++++++++++++++++++
 .../settings/FakePermissionChecker.kt         | 11 ++++------
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt b/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt
index 1749742e1..4c937b912 100644
--- a/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt
+++ b/data/settings/src/main/java/com/google/jetpackcamera/settings/PermissionChecker.kt
@@ -15,7 +15,6 @@
  */
 package com.google.jetpackcamera.settings
 
-import android.app.Application
 import android.content.Context
 import android.content.pm.PackageManager
 import androidx.core.content.ContextCompat
@@ -23,6 +22,12 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 interface PermissionChecker {
+    /**
+     * Checks if the specified permission is granted to the application.
+     *
+     * @param permission The name of the permission to check.
+     * @return `true` if the permission is granted, `false` otherwise.
+     */
     fun isPermissionGranted(permission: String): Boolean
 }
 
diff --git a/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt
index c7768f757..a7fd1c9d4 100644
--- a/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt
+++ b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/CameraAppSettingsViewModelTest.kt
@@ -92,6 +92,27 @@ internal class CameraAppSettingsViewModelTest {
         )
     }
 
+    @Test
+    fun setMute_permission_granted() = runTest(StandardTestDispatcher()) {
+        // Wait for first Enabled state
+        val initialState = settingsViewModel.settingsUiState.first {
+            it is SettingsUiState.Enabled
+        }
+
+        val initialMutedSTate = assertIsEnabled(initialState).muteAudioUiState
+        // assert that muteUiState is Enabled
+        assertThat(initialMutedSTate).isInstanceOf(MuteAudioUiState.Enabled::class.java)
+
+        val nextMuteAudioUiState = !initialMutedSTate.isMuted
+        settingsViewModel.setVideoMuted(nextMuteAudioUiState)
+
+        advanceUntilIdle()
+
+        assertIsEnabled(settingsViewModel.settingsUiState.value).also {
+            assertThat(it.muteAudioUiState.isMuted).isEqualTo(nextMuteAudioUiState)
+        }
+    }
+
     @Test
     fun setDefaultToFrontCamera() = runTest(StandardTestDispatcher()) {
         // Wait for first Enabled state
diff --git a/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt
index f4addf799..c771ad9dd 100644
--- a/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt
+++ b/feature/settings/src/androidTest/java/com/google/jetpackcamera/settings/FakePermissionChecker.kt
@@ -15,14 +15,11 @@
  */
 package com.google.jetpackcamera.settings
 
-const val FAKE_PERMISSION_FALSE = "fakePermissionFalse"
-
 class FakePermissionChecker : PermissionChecker {
+    /**
+     * This implementation simulates permission checks. It always returns `true`
+     */
     override fun isPermissionGranted(permission: String): Boolean {
-        return if (permission == FAKE_PERMISSION_FALSE) {
-            false
-        } else {
-            true
-        }
+        return true
     }
 }