feat: Request external storage permission on recording start if not granted already

app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/AudioRecordingStart.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.InsertDriveFile
 import androidx.compose.material.icons.filled.Mic
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -29,8 +30,10 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import app.myzel394.alibi.R
 import app.myzel394.alibi.db.AppSettings
+import app.myzel394.alibi.ui.SUPPORTS_SCOPED_STORAGE
 import app.myzel394.alibi.ui.components.atoms.PermissionRequester
 import app.myzel394.alibi.ui.models.AudioRecorderModel
+import app.myzel394.alibi.ui.utils.PermissionHelper
 
 @Composable
 fun AudioRecordingStart(
@@ -52,16 +55,31 @@ fun AudioRecordingStart(
     }
 
     PermissionRequester(
-        permission = Manifest.permission.RECORD_AUDIO,
+        permission = Manifest.permission.WRITE_EXTERNAL_STORAGE,
-        icon = Icons.Default.Mic,
+        icon = Icons.Default.InsertDriveFile,
         onPermissionAvailable = {
             startRecording = true
         }
-    ) { trigger ->
+    ) { triggerExternalStorage ->
+        PermissionRequester(
+            permission = Manifest.permission.RECORD_AUDIO,
+            icon = Icons.Default.Mic,
+            onPermissionAvailable = {
+                if (!SUPPORTS_SCOPED_STORAGE && !PermissionHelper.hasGranted(
+                        context,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE
+                    )
+                ) {
+                    triggerExternalStorage()
+                } else {
+                    startRecording = true
+                }
+            }
+        ) { triggerRecordAudio ->
             val label = stringResource(R.string.ui_audioRecorder_action_start_label)
 
             Button(
-            onClick = trigger,
+                onClick = triggerRecordAudio,
                 modifier = Modifier
                     .semantics {
                         contentDescription = label
@@ -88,3 +106,4 @@ fun AudioRecordingStart(
             }
         }
     }
+}

app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/molecules/VideoRecordingStart.kt

@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.CameraAlt
+import androidx.compose.material.icons.filled.InsertDriveFile
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -44,6 +45,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import app.myzel394.alibi.R
 import app.myzel394.alibi.db.AppSettings
 import app.myzel394.alibi.ui.BIG_PRIMARY_BUTTON_SIZE
+import app.myzel394.alibi.ui.SUPPORTS_SCOPED_STORAGE
 import app.myzel394.alibi.ui.components.atoms.PermissionRequester
 import app.myzel394.alibi.ui.models.VideoRecorderModel
 import app.myzel394.alibi.ui.utils.PermissionHelper
@@ -78,13 +80,25 @@ fun VideoRecordingStart(
         )
     }
 
+    val hasGrantedStorage = SUPPORTS_SCOPED_STORAGE || PermissionHelper.hasGranted(
+        context,
+        Manifest.permission.WRITE_EXTERNAL_STORAGE
+    )
+
+    PermissionRequester(
+        permission = Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        icon = Icons.Default.InsertDriveFile,
+        onPermissionAvailable = {
+            showSheet = true
+        }
+    ) { triggerExternalStorage ->
         PermissionRequester(
             permission = Manifest.permission.CAMERA,
             icon = Icons.Default.CameraAlt,
             onPermissionAvailable = {
                 showSheet = true
             },
-    ) { trigger ->
+        ) { triggerCamera ->
             val label = stringResource(R.string.ui_videoRecorder_action_start_label)
 
             Column(
@@ -98,6 +112,11 @@ fun VideoRecordingStart(
                         interactionSource = remember { MutableInteractionSource() },
                         indication = rememberRipple(color = MaterialTheme.colorScheme.primary),
                         onClick = {
+                            if (!hasGrantedStorage) {
+                                triggerExternalStorage()
+                                return@combinedClickable
+                            }
+
                             if (PermissionHelper.hasGranted(
                                     context,
                                     Manifest.permission.CAMERA
@@ -140,3 +159,4 @@ fun VideoRecordingStart(
             }
         }
     }
+}