Add captureMode parameter to PeekabooCamera composable for camera pos…

…ition control
onseok · Dec 15, 2023 · fde0511 · fde0511
1 parent cee3d06
commit fde0511
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 8 deletions.
diff --git a/peekaboo-ui/src/androidMain/kotlin/com/preat/peekaboo/ui/PeekabooCamera.android.kt b/peekaboo-ui/src/androidMain/kotlin/com/preat/peekaboo/ui/PeekabooCamera.android.kt
@@ -50,6 +50,7 @@ private val executor = Executors.newSingleThreadExecutor()
 @Composable
 actual fun PeekabooCamera(
     modifier: Modifier,
+    cameraMode: CameraMode,
     onCapture: (byteArray: ByteArray?) -> Unit,
 ) {
     val cameraPermissionState =
@@ -58,7 +59,7 @@ actual fun PeekabooCamera(
         )
     when (cameraPermissionState.status) {
         PermissionStatus.Granted -> {
-            CameraWithGrantedPermission(modifier, onCapture)
+            CameraWithGrantedPermission(modifier, cameraMode, onCapture)
         }
         is PermissionStatus.Denied -> {
             LaunchedEffect(Unit) {
@@ -72,6 +73,7 @@ actual fun PeekabooCamera(
 @Composable
 private fun CameraWithGrantedPermission(
     modifier: Modifier,
+    cameraMode: CameraMode,
     onCapture: (byteArray: ByteArray) -> Unit,
 ) {
     val context = LocalContext.current
@@ -81,7 +83,14 @@ private fun CameraWithGrantedPermission(
     val preview = Preview.Builder().build()
     val previewView = remember { PreviewView(context) }
     val imageCapture: ImageCapture = remember { ImageCapture.Builder().build() }
-    var isFrontCamera by rememberSaveable { mutableStateOf(false) }
+    var isFrontCamera by rememberSaveable {
+        mutableStateOf(
+            when (cameraMode) {
+                CameraMode.Front -> true
+                CameraMode.Back -> false
+            },
+        )
+    }
     val cameraSelector =
         remember(isFrontCamera) {
             val lensFacing =
@@ -129,7 +138,7 @@ private fun CameraWithGrantedPermission(
         modifier =
             modifier
                 .pointerInput(isFrontCamera) {
-                    detectHorizontalDragGestures { change, dragAmount ->
+                    detectHorizontalDragGestures { _, dragAmount ->
                         if (dragAmount.absoluteValue > 50.0) {
                             isFrontCamera = !isFrontCamera
                         }

diff --git a/peekaboo-ui/src/commonMain/kotlin/com/preat/peekaboo/ui/CameraMode.kt b/peekaboo-ui/src/commonMain/kotlin/com/preat/peekaboo/ui/CameraMode.kt
@@ -0,0 +1,7 @@
+package com.preat.peekaboo.ui
+
+sealed class CameraMode {
+    data object Front : CameraMode()
+
+    data object Back : CameraMode()
+}
diff --git a/peekaboo-ui/src/commonMain/kotlin/com/preat/peekaboo/ui/PeekabooCamera.kt b/peekaboo-ui/src/commonMain/kotlin/com/preat/peekaboo/ui/PeekabooCamera.kt
@@ -7,5 +7,6 @@ import androidx.compose.ui.Modifier
 @Composable
 expect fun PeekabooCamera(
     modifier: Modifier,
+    cameraMode: CameraMode = CameraMode.Back,
     onCapture: (byteArray: ByteArray?) -> Unit,
 )
diff --git a/peekaboo-ui/src/iosMain/kotlin/com/preat/peekaboo/ui/PeekabooCamera.ios.kt b/peekaboo-ui/src/iosMain/kotlin/com/preat/peekaboo/ui/PeekabooCamera.ios.kt
@@ -36,6 +36,7 @@ import platform.AVFoundation.AVCaptureDevice
 import platform.AVFoundation.AVCaptureDeviceDiscoverySession.Companion.discoverySessionWithDeviceTypes
 import platform.AVFoundation.AVCaptureDeviceInput
 import platform.AVFoundation.AVCaptureDeviceInput.Companion.deviceInputWithDevice
+import platform.AVFoundation.AVCaptureDevicePositionBack
 import platform.AVFoundation.AVCaptureDevicePositionFront
 import platform.AVFoundation.AVCaptureDeviceTypeBuiltInDualCamera
 import platform.AVFoundation.AVCaptureDeviceTypeBuiltInDualWideCamera
@@ -96,6 +97,7 @@ private val deviceTypes =
 @Composable
 actual fun PeekabooCamera(
     modifier: Modifier,
+    cameraMode: CameraMode,
     onCapture: (byteArray: ByteArray?) -> Unit,
 ) {
     var cameraAccess: CameraAccess by remember { mutableStateOf(CameraAccess.Undefined) }
@@ -135,21 +137,28 @@ actual fun PeekabooCamera(
             }
 
             CameraAccess.Authorized -> {
-                AuthorizedCamera(onCapture)
+                AuthorizedCamera(cameraMode, onCapture)
             }
         }
     }
 }
 
 @Suppress("FunctionName")
 @Composable
-private fun BoxScope.AuthorizedCamera(onCapture: (byteArray: ByteArray?) -> Unit) {
+private fun BoxScope.AuthorizedCamera(
+    cameraMode: CameraMode,
+    onCapture: (byteArray: ByteArray?) -> Unit,
+) {
     val camera: AVCaptureDevice? =
         remember {
             discoverySessionWithDeviceTypes(
                 deviceTypes = deviceTypes,
                 mediaType = AVMediaTypeVideo,
-                position = AVCaptureDevicePositionFront,
+                position =
+                    when (cameraMode) {
+                        CameraMode.Front -> AVCaptureDevicePositionFront
+                        CameraMode.Back -> AVCaptureDevicePositionBack
+                    },
             ).devices.firstOrNull() as? AVCaptureDevice
         }
     if (camera != null) {
@@ -191,7 +200,11 @@ private fun BoxScope.RealDeviceCamera(
                     if (photoData != null) {
                         var uiImage = UIImage(photoData)
                         if (uiImage.imageOrientation != UIImageOrientation.UIImageOrientationUp) {
-                            UIGraphicsBeginImageContextWithOptions(uiImage.size, false, uiImage.scale)
+                            UIGraphicsBeginImageContextWithOptions(
+                                uiImage.size,
+                                false,
+                                uiImage.scale,
+                            )
                             uiImage.drawInRect(
                                 CGRectMake(
                                     x = 0.0,

diff --git a/sample/common/src/commonMain/kotlin/com/preat/peekaboo/common/App.kt b/sample/common/src/commonMain/kotlin/com/preat/peekaboo/common/App.kt
@@ -32,6 +32,7 @@ import com.preat.peekaboo.image.picker.SelectionMode
 import com.preat.peekaboo.image.picker.rememberImagePickerLauncher
 import com.preat.peekaboo.image.picker.toImageBitmap
 import com.preat.peekaboo.ui.BackButton
+import com.preat.peekaboo.ui.CameraMode
 import com.preat.peekaboo.ui.PeekabooCamera
 import com.preat.peekaboo.ui.style.PeekabooTheme
 import kotlinx.coroutines.launch
@@ -81,13 +82,14 @@ fun App() {
                         if (showCamera) {
                             PeekabooCamera(
                                 modifier = Modifier.fillMaxSize(),
+                                cameraMode = CameraMode.Back,
                                 onCapture = { byteArray ->
                                     byteArray?.let {
                                         images = listOf(it.toImageBitmap())
                                     } ?: scope.launch {
                                         snackbarHostState.showSnackbar(
                                             message =
-                                                "Error occurred.",
+                                                "Unable to capture the image. Please try again.",
                                         )
                                     }
                                     showCamera = false