chore: restrict video capture mode to api level 22 above

ujizin · Dec 13, 2023 · ee4a760 · ee4a760
1 parent b96934c
commit ee4a760
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 8 deletions.
diff --git a/camposer/src/main/java/com/ujizin/camposer/extensions/CameraStateExtensions.kt b/camposer/src/main/java/com/ujizin/camposer/extensions/CameraStateExtensions.kt
@@ -2,7 +2,9 @@ package com.ujizin.camposer.extensions
 
 import android.content.ContentValues
 import android.net.Uri
+import android.os.Build
 import android.provider.MediaStore
+import androidx.annotation.RequiresApi
 import androidx.camera.core.ImageCapture
 import androidx.camera.view.video.OutputFileOptions
 import com.ujizin.camposer.state.CameraState
@@ -43,13 +45,15 @@ public suspend fun CameraState.takePicture(
 /**
  * Transform toggle recording file to suspend function
  * */
+@RequiresApi(Build.VERSION_CODES.M)
 public suspend fun CameraState.toggleRecording(file: File): Uri? = suspendCancellableCoroutine { cont ->
     with(cont) { toggleRecording(file, ::toggleRecordContinuation) }
 }
 
 /**
  * Transform toggle recording content values options to suspend function
  * */
+@RequiresApi(Build.VERSION_CODES.M)
 public suspend fun CameraState.toggleRecording(
     contentValues: ContentValues,
     saveCollection: Uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI
@@ -60,6 +64,7 @@ public suspend fun CameraState.toggleRecording(
 /**
  * Transform toggle recording output files options to suspend function
  * */
+@RequiresApi(Build.VERSION_CODES.M)
 public suspend fun CameraState.toggleRecording(
     outputFileOptions: OutputFileOptions
 ): Uri? = suspendCancellableCoroutine { cont ->

diff --git a/camposer/src/main/java/com/ujizin/camposer/state/CameraState.kt b/camposer/src/main/java/com/ujizin/camposer/state/CameraState.kt
@@ -6,9 +6,12 @@ import android.content.ContentValues
 import android.content.Context
 import android.hardware.camera2.CameraManager
 import android.net.Uri
+import android.os.Build
 import android.provider.MediaStore
 import android.util.Log
+import androidx.annotation.ChecksSdkIntAtLeast
 import androidx.annotation.OptIn
+import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import androidx.camera.core.FocusMeteringAction
 import androidx.camera.core.ImageAnalysis
@@ -322,6 +325,13 @@ public class CameraState(context: Context) {
             }
         }
 
+    /**
+     * Return if video is supported.
+     * */
+
+    @ChecksSdkIntAtLeast(Build.VERSION_CODES.M)
+    public var isVideoSupported: Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+
     /**
      * Return true if it's recording.
      * */
@@ -417,6 +427,7 @@ public class CameraState(context: Context) {
      * @param onResult Callback called when [VideoCaptureResult] is ready
      * */
     @OptIn(markerClass = [ExperimentalVideo::class])
+    @RequiresApi(Build.VERSION_CODES.M)
     public fun startRecording(file: File, onResult: (VideoCaptureResult) -> Unit) {
         startRecording(OutputFileOptions.builder(file).build(), onResult)
     }
@@ -429,6 +440,7 @@ public class CameraState(context: Context) {
      *  @param onResult Callback called when [VideoCaptureResult] is ready
      *  */
     @OptIn(markerClass = [ExperimentalVideo::class])
+    @RequiresApi(Build.VERSION_CODES.M)
     public fun startRecording(
         saveCollection: Uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
         contentValues: ContentValues,
@@ -447,6 +459,7 @@ public class CameraState(context: Context) {
      * @param onResult Callback called when [VideoCaptureResult] is ready
      * */
     @ExperimentalVideo
+    @RequiresApi(Build.VERSION_CODES.M)
     public fun startRecording(
         outputFileOptions: OutputFileOptions,
         onResult: (VideoCaptureResult) -> Unit,
@@ -484,13 +497,15 @@ public class CameraState(context: Context) {
      * Stop recording camera.
      * */
     @OptIn(markerClass = [ExperimentalVideo::class])
+    @RequiresApi(Build.VERSION_CODES.M)
     public fun stopRecording() {
         controller.stopRecording()
     }
 
     /**
      * Toggle recording camera.
      * */
+    @RequiresApi(Build.VERSION_CODES.M)
     public fun toggleRecording(
         file: File,
         onResult: (VideoCaptureResult) -> Unit
@@ -504,6 +519,7 @@ public class CameraState(context: Context) {
     /**
      * Toggle recording camera.
      * */
+    @RequiresApi(Build.VERSION_CODES.M)
     public fun toggleRecording(
         contentValues: ContentValues,
         saveCollection: Uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
@@ -518,6 +534,7 @@ public class CameraState(context: Context) {
     /**
      * Toggle recording camera.
      * */
+    @RequiresApi(Build.VERSION_CODES.M)
     @OptIn(markerClass = [ExperimentalVideo::class])
     public fun toggleRecording(
         outputFileOptions: OutputFileOptions,

diff --git a/camposer/src/main/java/com/ujizin/camposer/state/CaptureMode.kt b/camposer/src/main/java/com/ujizin/camposer/state/CaptureMode.kt
@@ -1,6 +1,8 @@
 package com.ujizin.camposer.state
 
+import android.os.Build
 import androidx.annotation.OptIn
+import androidx.annotation.RequiresApi
 import androidx.camera.view.CameraController.IMAGE_CAPTURE
 import androidx.camera.view.CameraController.VIDEO_CAPTURE
 import androidx.camera.view.video.ExperimentalVideo
@@ -15,5 +17,6 @@ import androidx.camera.view.video.ExperimentalVideo
 @OptIn(markerClass = [ExperimentalVideo::class])
 public enum class CaptureMode(internal val value: Int) {
     Image(IMAGE_CAPTURE),
+    @RequiresApi(Build.VERSION_CODES.M)
     Video(VIDEO_CAPTURE),
 }
diff --git a/sample/src/main/java/com/ujizin/sample/feature/camera/CameraScreen.kt b/sample/src/main/java/com/ujizin/sample/feature/camera/CameraScreen.kt
@@ -130,6 +130,7 @@ fun CameraSection(
             cameraOption = cameraOption,
             hasFlashUnit = hasFlashUnit,
             qrCodeText = qrCodeText,
+            isVideoSupported = cameraState.isVideoSupported,
             onFlashModeChanged = { flash ->
                 enableTorch = flash == Flash.Always
                 flashMode = flash.toFlashMode()
@@ -161,6 +162,7 @@ fun CameraInnerContent(
     hasFlashUnit: Boolean,
     qrCodeText: String?,
     lastPicture: File?,
+    isVideoSupported: Boolean,
     onGalleryClick: () -> Unit,
     onFlashModeChanged: (Flash) -> Unit,
     onZoomFinish: () -> Unit,
@@ -199,6 +201,7 @@ fun CameraInnerContent(
             qrCodeText = qrCodeText,
             onTakePicture = onTakePicture,
             isRecording = isRecording,
+            isVideoSupported = isVideoSupported,
             onRecording = onRecording,
             onSwitchCamera = onSwitchCamera,
             onCameraOptionChanged = onCameraOptionChanged,

diff --git a/sample/src/main/java/com/ujizin/sample/feature/camera/CameraViewModel.kt b/sample/src/main/java/com/ujizin/sample/feature/camera/CameraViewModel.kt
@@ -8,16 +8,16 @@ import android.util.Log
 import androidx.camera.core.ImageProxy
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.DecodeHintType
+import com.google.zxing.MultiFormatReader
 import com.ujizin.camposer.state.CameraState
 import com.ujizin.camposer.state.ImageCaptureResult
 import com.ujizin.camposer.state.VideoCaptureResult
 import com.ujizin.sample.data.local.datasource.FileDataSource
 import com.ujizin.sample.data.local.datasource.UserDataSource
 import com.ujizin.sample.domain.User
 import com.ujizin.sample.extensions.getQRCodeResult
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.DecodeHintType
-import com.google.zxing.MultiFormatReader
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.onStart
@@ -80,10 +80,12 @@ class CameraViewModel(
                     onResult = ::onVideoResult
                 )
 
-                else -> toggleRecording(
-                    fileDataSource.getFile("mp4"),
-                    onResult = ::onVideoResult
-                )
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.M -> {
+                    toggleRecording(
+                        fileDataSource.getFile("mp4"),
+                        onResult = ::onVideoResult
+                    )
+                }
             }
         }
     }

diff --git a/sample/src/main/java/com/ujizin/sample/feature/camera/components/ActionsBox.kt b/sample/src/main/java/com/ujizin/sample/feature/camera/components/ActionsBox.kt
@@ -16,6 +16,7 @@ fun ActionBox(
     isRecording: Boolean,
     qrCodeText: String?,
     lastPicture: File?,
+    isVideoSupported: Boolean,
     onGalleryClick: () -> Unit,
     onTakePicture: () -> Unit,
     onSwitchCamera: () -> Unit,
@@ -32,6 +33,7 @@ fun ActionBox(
             qrCodeText = qrCodeText)
         OptionSection(
             modifier = Modifier.fillMaxWidth(),
+            isVideoSupported = isVideoSupported,
             currentCameraOption = cameraOption,
             onCameraOptionChanged = onCameraOptionChanged
         )

diff --git a/sample/src/main/java/com/ujizin/sample/feature/camera/components/OptionSection.kt b/sample/src/main/java/com/ujizin/sample/feature/camera/components/OptionSection.kt
@@ -17,17 +17,21 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.ujizin.sample.feature.camera.model.CameraOption
+
 @Composable
 fun OptionSection(
     modifier: Modifier = Modifier,
     currentCameraOption: CameraOption,
+    isVideoSupported: Boolean,
     onCameraOptionChanged: (CameraOption) -> Unit,
 ) {
     Row(
         modifier = modifier,
         horizontalArrangement = Arrangement.Center,
     ) {
         CameraOption.values().forEach { option ->
+            if (!isVideoSupported && option == CameraOption.Video) return@forEach
+
             Text(
                 modifier = Modifier
                     .clickable(

diff --git a/sample/src/main/java/com/ujizin/sample/feature/camera/model/CameraOption.kt b/sample/src/main/java/com/ujizin/sample/feature/camera/model/CameraOption.kt
@@ -1,5 +1,6 @@
 package com.ujizin.sample.feature.camera.model
 
+import android.os.Build
 import androidx.annotation.StringRes
 import com.ujizin.camposer.state.CaptureMode
 import com.ujizin.sample.R
@@ -11,6 +12,10 @@ enum class CameraOption(@StringRes val titleRes: Int) {
 
     fun toCaptureMode(): CaptureMode = when(this) {
         QRCode, Photo -> CaptureMode.Image
-        Video -> CaptureMode.Video
+        Video -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            CaptureMode.Video
+        } else {
+            throw IllegalStateException("Camera state not support video capture mode")
+        }
     }
 }