Add image size to camera response

peekaboo-ui/src/androidMain/kotlin/com/preat/peekaboo/ui/camera/PeekabooCamera.android.kt

@@ -42,6 +42,7 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.PermissionStatus
 import com.google.accompanist.permissions.rememberPermissionState
 import com.google.accompanist.permissions.shouldShowRationale
+import com.preat.peekaboo.ui.camera.model.PeekabooCameraImage
 import java.io.ByteArrayOutputStream
 import java.util.concurrent.Executors
 
@@ -54,7 +55,7 @@ actual fun PeekabooCamera(
     captureIcon: @Composable (onClick: () -> Unit) -> Unit,
     convertIcon: @Composable (onClick: () -> Unit) -> Unit,
     progressIndicator: @Composable () -> Unit,
-    onCapture: (byteArray: ByteArray?) -> Unit,
+    onCapture: (image: PeekabooCameraImage?) -> Unit,
     onFrame: ((frame: ByteArray) -> Unit)?,
     permissionDeniedContent: @Composable () -> Unit,
 ) {
@@ -219,16 +220,24 @@ private fun CameraWithGrantedPermission(
 }
 
 class ImageCaptureCallback(
-    private val onCapture: (byteArray: ByteArray?) -> Unit,
+    private val onCapture: (image: PeekabooCameraImage?) -> Unit,
     private val stopCapturing: () -> Unit,
 ) : OnImageCapturedCallback() {
     override fun onCaptureSuccess(image: ImageProxy) {
-        val imageBytes = image.toByteArray()
-        onCapture(imageBytes)
+        val peekabooImage = image.toPeekabooCameraImage()
+        onCapture(peekabooImage)
         stopCapturing()
     }
 }
 
+private fun ImageProxy.toPeekabooCameraImage(): PeekabooCameraImage {
+    return PeekabooCameraImage(
+        image = this.toByteArray(),
+        height = height,
+        width = width
+    )
+}
+
 private fun ImageProxy.toByteArray(): ByteArray {
     val rotationDegrees = imageInfo.rotationDegrees
     val bitmap = toBitmap()

peekaboo-ui/src/androidMain/kotlin/com/preat/peekaboo/ui/camera/PeekabooCameraState.android.kt

@@ -22,12 +22,13 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import com.preat.peekaboo.ui.camera.model.PeekabooCameraImage
 
 @Stable
 actual class PeekabooCameraState(
     cameraMode: CameraMode,
     internal var onFrame: ((frame: ByteArray) -> Unit)?,
-    internal var onCapture: (ByteArray?) -> Unit,
+    internal var onCapture: (PeekabooCameraImage?) -> Unit,
 ) {
     actual var isCameraReady: Boolean by mutableStateOf(false)
 
@@ -50,7 +51,7 @@ actual class PeekabooCameraState(
         isCapturing = false
     }
 
-    internal fun onCapture(image: ByteArray?) {
+    internal fun onCapture(image: PeekabooCameraImage?) {
         onCapture.invoke(image)
     }
 
@@ -61,7 +62,7 @@ actual class PeekabooCameraState(
     companion object {
         fun saver(
             onFrame: ((frame: ByteArray) -> Unit)?,
-            onCapture: (ByteArray?) -> Unit,
+            onCapture: (PeekabooCameraImage?) -> Unit,
         ): Saver<PeekabooCameraState, Int> {
             return Saver(
                 save = {
@@ -83,7 +84,7 @@ actual class PeekabooCameraState(
 actual fun rememberPeekabooCameraState(
     initialCameraMode: CameraMode,
     onFrame: ((frame: ByteArray) -> Unit)?,
-    onCapture: (ByteArray?) -> Unit,
+    onCapture: (PeekabooCameraImage?) -> Unit,
 ): PeekabooCameraState {
     return rememberSaveable(
         saver = PeekabooCameraState.saver(onFrame, onCapture),

peekaboo-ui/src/commonMain/kotlin/com/preat/peekaboo/ui/camera/PeekabooCamera.kt

@@ -17,6 +17,7 @@ package com.preat.peekaboo.ui.camera
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import com.preat.peekaboo.ui.camera.model.PeekabooCameraImage
 
 /**
  * `PeekabooCamera` is a composable function that provides a customizable camera UI within a Compose Multiplatform application.
@@ -44,7 +45,7 @@ expect fun PeekabooCamera(
     captureIcon: @Composable (onClick: () -> Unit) -> Unit,
     convertIcon: @Composable (onClick: () -> Unit) -> Unit = {},
     progressIndicator: @Composable () -> Unit = {},
-    onCapture: (byteArray: ByteArray?) -> Unit,
+    onCapture: (image: PeekabooCameraImage?) -> Unit,
     onFrame: ((frame: ByteArray) -> Unit)? = null,
     permissionDeniedContent: @Composable () -> Unit = {},
 )

peekaboo-ui/src/commonMain/kotlin/com/preat/peekaboo/ui/camera/PeekabooCameraState.kt

@@ -18,6 +18,7 @@ package com.preat.peekaboo.ui.camera
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.remember
+import com.preat.peekaboo.ui.camera.model.PeekabooCameraImage
 
 /**
  * Create and [remember] a [PeekabooCameraState]
@@ -28,7 +29,7 @@ import androidx.compose.runtime.remember
 expect fun rememberPeekabooCameraState(
     initialCameraMode: CameraMode = CameraMode.Back,
     onFrame: ((frame: ByteArray) -> Unit)? = null,
-    onCapture: (ByteArray?) -> Unit,
+    onCapture: (PeekabooCameraImage?) -> Unit,
 ): PeekabooCameraState
 
 /**

peekaboo-ui/src/commonMain/kotlin/com/preat/peekaboo/ui/camera/model/PeekabooCameraImage.kt

@@ -0,0 +1,7 @@
+package com.preat.peekaboo.ui.camera.model
+
+data class PeekabooCameraImage(
+    val image: ByteArray,
+    val height: Int,
+    val width: Int
+)

peekaboo-ui/src/iosMain/kotlin/com/preat/peekaboo/ui/camera/PeekabooCamera.ios.kt

@@ -32,6 +32,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.interop.UIKitView
+import com.preat.peekaboo.ui.camera.model.PeekabooCameraImage
 import kotlinx.cinterop.BetaInteropApi
 import kotlinx.cinterop.CValue
 import kotlinx.cinterop.ExperimentalForeignApi
@@ -186,7 +187,7 @@ actual fun PeekabooCamera(
     captureIcon: @Composable (onClick: () -> Unit) -> Unit,
     convertIcon: @Composable (onClick: () -> Unit) -> Unit,
     progressIndicator: @Composable () -> Unit,
-    onCapture: (byteArray: ByteArray?) -> Unit,
+    onCapture: (image: PeekabooCameraImage?) -> Unit,
     onFrame: ((frame: ByteArray) -> Unit)?,
     permissionDeniedContent: @Composable () -> Unit,
 ) {
@@ -236,7 +237,7 @@ private fun BoxScope.AuthorizedCamera(
     captureIcon: @Composable (onClick: () -> Unit) -> Unit,
     convertIcon: @Composable (onClick: () -> Unit) -> Unit,
     progressIndicator: @Composable () -> Unit,
-    onCapture: (byteArray: ByteArray?) -> Unit,
+    onCapture: (image: PeekabooCameraImage?) -> Unit,
 ) {
     var cameraReady by remember { mutableStateOf(false) }
     val camera: AVCaptureDevice? =
@@ -327,7 +328,7 @@ private fun BoxScope.RealDeviceCamera(
     captureIcon: @Composable (onClick: () -> Unit) -> Unit,
     convertIcon: @Composable (onClick: () -> Unit) -> Unit,
     progressIndicator: @Composable () -> Unit,
-    onCapture: (byteArray: ByteArray?) -> Unit,
+    onCapture: (image: PeekabooCameraImage?) -> Unit,
 ) {
     var isFrontCamera by remember { mutableStateOf(camera.position == AVCaptureDevicePositionFront) }
     val capturePhotoOutput = remember { AVCapturePhotoOutput() }
@@ -751,7 +752,7 @@ class CameraFrameAnalyzerDelegate(
 
 class PhotoCaptureDelegate(
     private val onCaptureEnd: () -> Unit,
-    private val onCapture: (byteArray: ByteArray?) -> Unit,
+    private val onCapture: (image: PeekabooCameraImage?) -> Unit,
 ) : NSObject(), AVCapturePhotoCaptureDelegateProtocol {
     @OptIn(ExperimentalForeignApi::class)
     override fun captureOutput(
@@ -788,6 +789,18 @@ class PhotoCaptureDelegate(
     }
 }
 
+private fun UIImage.toPeekabooCameraImage(): PeekabooCameraImage? {
+    return UIImagePNGRepresentation(this)?.let { imageData ->
+        val (width, height) = this.size.useContents { width to height }
+
+        PeekabooCameraImage(
+            image = imageData.toByteArray(),
+            height = height.roundToInt(),
+            width = width.roundToInt()
+        )
+    }
+}
+
 @OptIn(ExperimentalForeignApi::class)
 private inline fun NSData.toByteArray(): ByteArray {
     val size = length.toInt()

peekaboo-ui/src/iosMain/kotlin/com/preat/peekaboo/ui/camera/PeekabooCameraState.ios.kt

@@ -22,12 +22,13 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import com.preat.peekaboo.ui.camera.model.PeekabooCameraImage
 
 @Stable
 actual class PeekabooCameraState(
     cameraMode: CameraMode,
     internal var onFrame: ((frame: ByteArray) -> Unit)?,
-    internal var onCapture: (ByteArray?) -> Unit,
+    internal var onCapture: (PeekabooCameraImage?) -> Unit,
 ) {
     actual var isCameraReady: Boolean by mutableStateOf(false)
 
@@ -50,7 +51,7 @@ actual class PeekabooCameraState(
         isCapturing = false
     }
 
-    internal fun onCapture(image: ByteArray?) {
+    internal fun onCapture(image: PeekabooCameraImage?) {
         onCapture.invoke(image)
     }
 
@@ -61,7 +62,7 @@ actual class PeekabooCameraState(
     companion object {
         fun saver(
             onFrame: ((frame: ByteArray) -> Unit)?,
-            onCapture: (ByteArray?) -> Unit,
+            onCapture: (PeekabooCameraImage?) -> Unit,
         ): Saver<PeekabooCameraState, Int> {
             return Saver(
                 save = {
@@ -83,7 +84,7 @@ actual class PeekabooCameraState(
 actual fun rememberPeekabooCameraState(
     initialCameraMode: CameraMode,
     onFrame: ((frame: ByteArray) -> Unit)?,
-    onCapture: (ByteArray?) -> Unit,
+    onCapture: (PeekabooCameraImage?) -> Unit,
 ): PeekabooCameraState {
     return rememberSaveable(
         saver = PeekabooCameraState.saver(onFrame, onCapture),