Add camera functionality for task completion photos
- Add camera picker interface to common ImagePicker.kt - Implement camera capture for Android using ActivityResultContracts.TakePicture - Implement camera capture for iOS using UIImagePickerController - Add camera picker stubs for wasmJs, jsMain, and jvmMain platforms - Update CompleteTaskDialog to show both "Take Photo" and "Choose from Library" buttons - Add camera permissions to Android manifest (CAMERA permission, camera intent queries) - Configure Android FileProvider for camera photo sharing - Add camera and photo library usage descriptions to iOS Info.plist - Update iOS CompleteTaskView with native camera picker support - Fix cancel button in CompleteTaskView using @Environment(\.dismiss) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -2,6 +2,13 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
<uses-permission android:name="android.permission.CAMERA" />
|
||||||
|
|
||||||
|
<queries>
|
||||||
|
<intent>
|
||||||
|
<action android:name="android.media.action.IMAGE_CAPTURE" />
|
||||||
|
</intent>
|
||||||
|
</queries>
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
@@ -32,6 +39,17 @@
|
|||||||
android:host="reset-password" />
|
android:host="reset-password" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
|
<!-- FileProvider for camera photos -->
|
||||||
|
<provider
|
||||||
|
android:name="androidx.core.content.FileProvider"
|
||||||
|
android:authorities="${applicationId}.fileprovider"
|
||||||
|
android:exported="false"
|
||||||
|
android:grantUriPermissions="true">
|
||||||
|
<meta-data
|
||||||
|
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||||
|
android:resource="@xml/file_paths" />
|
||||||
|
</provider>
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
@@ -1,11 +1,15 @@
|
|||||||
package com.mycrib.platform
|
package com.mycrib.platform
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||||
import androidx.activity.result.PickVisualMediaRequest
|
import androidx.activity.result.PickVisualMediaRequest
|
||||||
import androidx.activity.result.contract.ActivityResultContracts
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
|
import androidx.core.content.FileProvider
|
||||||
|
import java.io.File
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
actual fun rememberImagePicker(
|
actual fun rememberImagePicker(
|
||||||
@@ -50,6 +54,46 @@ actual fun rememberImagePicker(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
actual fun rememberCameraPicker(
|
||||||
|
onImageCaptured: (ImageData) -> Unit
|
||||||
|
): () -> Unit {
|
||||||
|
val context = LocalContext.current
|
||||||
|
|
||||||
|
// Create a temp file URI for the camera to save to
|
||||||
|
val photoUri = remember {
|
||||||
|
val photoFile = File(context.cacheDir, "camera_photo_${System.currentTimeMillis()}.jpg")
|
||||||
|
FileProvider.getUriForFile(
|
||||||
|
context,
|
||||||
|
"${context.packageName}.fileprovider",
|
||||||
|
photoFile
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
val launcher = rememberLauncherForActivityResult(
|
||||||
|
contract = ActivityResultContracts.TakePicture()
|
||||||
|
) { success: Boolean ->
|
||||||
|
if (success) {
|
||||||
|
try {
|
||||||
|
val inputStream = context.contentResolver.openInputStream(photoUri)
|
||||||
|
val bytes = inputStream?.readBytes()
|
||||||
|
inputStream?.close()
|
||||||
|
|
||||||
|
if (bytes != null) {
|
||||||
|
val fileName = "camera_${System.currentTimeMillis()}.jpg"
|
||||||
|
onImageCaptured(ImageData(bytes, fileName))
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
e.printStackTrace()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
launcher.launch(photoUri)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun getFileNameFromUri(context: android.content.Context, uri: Uri): String {
|
private fun getFileNameFromUri(context: android.content.Context, uri: Uri): String {
|
||||||
var fileName = "image_${System.currentTimeMillis()}.jpg"
|
var fileName = "image_${System.currentTimeMillis()}.jpg"
|
||||||
|
|
||||||
|
|||||||
4
composeApp/src/androidMain/res/xml/file_paths.xml
Normal file
4
composeApp/src/androidMain/res/xml/file_paths.xml
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<paths xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<cache-path name="camera_images" path="/" />
|
||||||
|
</paths>
|
||||||
@@ -29,3 +29,8 @@ data class ImageData(
|
|||||||
expect fun rememberImagePicker(
|
expect fun rememberImagePicker(
|
||||||
onImagesPicked: (List<ImageData>) -> Unit
|
onImagesPicked: (List<ImageData>) -> Unit
|
||||||
): () -> Unit
|
): () -> Unit
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
expect fun rememberCameraPicker(
|
||||||
|
onImageCaptured: (ImageData) -> Unit
|
||||||
|
): () -> Unit
|
||||||
|
|||||||
@@ -8,12 +8,14 @@ import androidx.compose.material.icons.Icons
|
|||||||
import androidx.compose.material.icons.filled.Close
|
import androidx.compose.material.icons.filled.Close
|
||||||
import androidx.compose.material3.*
|
import androidx.compose.material3.*
|
||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.*
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.text.input.KeyboardType
|
import androidx.compose.ui.text.input.KeyboardType
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import com.mycrib.shared.models.TaskCompletionCreateRequest
|
import com.mycrib.shared.models.TaskCompletionCreateRequest
|
||||||
import com.mycrib.platform.ImageData
|
import com.mycrib.platform.ImageData
|
||||||
import com.mycrib.platform.rememberImagePicker
|
import com.mycrib.platform.rememberImagePicker
|
||||||
|
import com.mycrib.platform.rememberCameraPicker
|
||||||
import kotlinx.datetime.*
|
import kotlinx.datetime.*
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@@ -34,6 +36,10 @@ fun CompleteTaskDialog(
|
|||||||
selectedImages = images
|
selectedImages = images
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val cameraPicker = rememberCameraPicker { image ->
|
||||||
|
selectedImages = selectedImages + image
|
||||||
|
}
|
||||||
|
|
||||||
AlertDialog(
|
AlertDialog(
|
||||||
onDismissRequest = onDismiss,
|
onDismissRequest = onDismiss,
|
||||||
title = { Text("Complete Task: $taskTitle") },
|
title = { Text("Complete Task: $taskTitle") },
|
||||||
@@ -89,11 +95,23 @@ fun CompleteTaskDialog(
|
|||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.height(4.dp))
|
Spacer(modifier = Modifier.height(4.dp))
|
||||||
|
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||||
|
) {
|
||||||
|
OutlinedButton(
|
||||||
|
onClick = { cameraPicker() },
|
||||||
|
modifier = Modifier.weight(1f)
|
||||||
|
) {
|
||||||
|
Text("Take Photo")
|
||||||
|
}
|
||||||
|
|
||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
onClick = { imagePicker() },
|
onClick = { imagePicker() },
|
||||||
modifier = Modifier.fillMaxWidth()
|
modifier = Modifier.weight(1f)
|
||||||
) {
|
) {
|
||||||
Text("Select Images (up to 5)")
|
Text("Choose from Library")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Display selected images
|
// Display selected images
|
||||||
|
|||||||
@@ -101,6 +101,53 @@ private fun NSData.toByteArray(): ByteArray {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@OptIn(ExperimentalForeignApi::class)
|
||||||
|
@Composable
|
||||||
|
actual fun rememberCameraPicker(
|
||||||
|
onImageCaptured: (ImageData) -> Unit
|
||||||
|
): () -> Unit {
|
||||||
|
val viewController = LocalUIViewController.current
|
||||||
|
|
||||||
|
val cameraDelegate = remember {
|
||||||
|
object : NSObject(), UIImagePickerControllerDelegateProtocol, UINavigationControllerDelegateProtocol {
|
||||||
|
override fun imagePickerController(
|
||||||
|
picker: UIImagePickerController,
|
||||||
|
didFinishPickingMediaWithInfo: Map<Any?, *>
|
||||||
|
) {
|
||||||
|
picker.dismissViewControllerAnimated(true, null)
|
||||||
|
|
||||||
|
val image = didFinishPickingMediaWithInfo[UIImagePickerControllerOriginalImage] as? UIImage
|
||||||
|
if (image != null) {
|
||||||
|
// Convert to JPEG
|
||||||
|
val jpegData = UIImageJPEGRepresentation(image, 0.8)
|
||||||
|
if (jpegData != null) {
|
||||||
|
val bytes = jpegData.toByteArray()
|
||||||
|
val fileName = "camera_${NSDate().timeIntervalSince1970.toLong()}.jpg"
|
||||||
|
onImageCaptured(ImageData(bytes, fileName))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun imagePickerControllerDidCancel(picker: UIImagePickerController) {
|
||||||
|
picker.dismissViewControllerAnimated(true, null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
// Check if camera is available
|
||||||
|
if (UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.UIImagePickerControllerSourceTypeCamera)) {
|
||||||
|
val picker = UIImagePickerController().apply {
|
||||||
|
setSourceType(UIImagePickerControllerSourceType.UIImagePickerControllerSourceTypeCamera)
|
||||||
|
setDelegate(cameraDelegate)
|
||||||
|
setCameraCaptureMode(UIImagePickerControllerCameraCaptureMode.UIImagePickerControllerCameraCaptureModePhoto)
|
||||||
|
}
|
||||||
|
|
||||||
|
viewController.presentViewController(picker, animated = true, completion = null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
private fun <T : Any> synchronized(lock: Any, block: () -> T): T {
|
private fun <T : Any> synchronized(lock: Any, block: () -> T): T {
|
||||||
return block()
|
return block()
|
||||||
|
|||||||
@@ -13,3 +13,15 @@ actual fun rememberImagePicker(
|
|||||||
println("Image picker not yet implemented for web")
|
println("Image picker not yet implemented for web")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
actual fun rememberCameraPicker(
|
||||||
|
onImageCaptured: (ImageData) -> Unit
|
||||||
|
): () -> Unit {
|
||||||
|
// Web camera picker would require HTML5 media capture
|
||||||
|
// This is a placeholder implementation
|
||||||
|
return {
|
||||||
|
// TODO: Implement web camera capture
|
||||||
|
println("Camera picker not yet implemented for web")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -13,3 +13,15 @@ actual fun rememberImagePicker(
|
|||||||
println("Image picker not yet implemented for desktop")
|
println("Image picker not yet implemented for desktop")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
actual fun rememberCameraPicker(
|
||||||
|
onImageCaptured: (ImageData) -> Unit
|
||||||
|
): () -> Unit {
|
||||||
|
// Desktop camera picker would require platform-specific camera access
|
||||||
|
// This is a placeholder implementation
|
||||||
|
return {
|
||||||
|
// TODO: Implement desktop camera capture
|
||||||
|
println("Camera picker not yet implemented for desktop")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -13,3 +13,15 @@ actual fun rememberImagePicker(
|
|||||||
println("Image picker not yet implemented for WASM")
|
println("Image picker not yet implemented for WASM")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
actual fun rememberCameraPicker(
|
||||||
|
onImageCaptured: (ImageData) -> Unit
|
||||||
|
): () -> Unit {
|
||||||
|
// WASM camera picker would require HTML5 media capture
|
||||||
|
// This is a placeholder implementation
|
||||||
|
return {
|
||||||
|
// TODO: Implement WASM camera capture
|
||||||
|
println("Camera picker not yet implemented for WASM")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -15,5 +15,9 @@
|
|||||||
<string>com.mycrib.app</string>
|
<string>com.mycrib.app</string>
|
||||||
</dict>
|
</dict>
|
||||||
</array>
|
</array>
|
||||||
|
<key>NSCameraUsageDescription</key>
|
||||||
|
<string>MyCrib needs access to your camera to take photos of completed tasks</string>
|
||||||
|
<key>NSPhotoLibraryUsageDescription</key>
|
||||||
|
<string>MyCrib needs access to your photo library to select photos of completed tasks</string>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ struct ResidenceDetailView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.sheet(item: $selectedTaskForComplete) { task in
|
.sheet(item: $selectedTaskForComplete) { task in
|
||||||
CompleteTaskView(task: task, isPresented: .constant(true)) {
|
CompleteTaskView(task: task) {
|
||||||
selectedTaskForComplete = nil
|
selectedTaskForComplete = nil
|
||||||
loadResidenceTasks()
|
loadResidenceTasks()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -155,7 +155,7 @@ struct AllTasksView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.sheet(item: $selectedTaskForComplete) { task in
|
.sheet(item: $selectedTaskForComplete) { task in
|
||||||
CompleteTaskView(task: task, isPresented: .constant(true)) {
|
CompleteTaskView(task: task) {
|
||||||
selectedTaskForComplete = nil
|
selectedTaskForComplete = nil
|
||||||
loadAllTasks()
|
loadAllTasks()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ import ComposeApp
|
|||||||
|
|
||||||
struct CompleteTaskView: View {
|
struct CompleteTaskView: View {
|
||||||
let task: TaskDetail
|
let task: TaskDetail
|
||||||
@Binding var isPresented: Bool
|
|
||||||
let onComplete: () -> Void
|
let onComplete: () -> Void
|
||||||
|
|
||||||
|
@Environment(\.dismiss) private var dismiss
|
||||||
@StateObject private var taskViewModel = TaskViewModel()
|
@StateObject private var taskViewModel = TaskViewModel()
|
||||||
@State private var completedByName: String = ""
|
@State private var completedByName: String = ""
|
||||||
@State private var actualCost: String = ""
|
@State private var actualCost: String = ""
|
||||||
@@ -17,6 +17,7 @@ struct CompleteTaskView: View {
|
|||||||
@State private var isSubmitting: Bool = false
|
@State private var isSubmitting: Bool = false
|
||||||
@State private var showError: Bool = false
|
@State private var showError: Bool = false
|
||||||
@State private var errorMessage: String = ""
|
@State private var errorMessage: String = ""
|
||||||
|
@State private var showCamera: Bool = false
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
NavigationStack {
|
NavigationStack {
|
||||||
@@ -127,17 +128,28 @@ struct CompleteTaskView: View {
|
|||||||
// Images Section
|
// Images Section
|
||||||
Section {
|
Section {
|
||||||
VStack(alignment: .leading, spacing: 12) {
|
VStack(alignment: .leading, spacing: 12) {
|
||||||
|
HStack(spacing: 12) {
|
||||||
|
Button(action: {
|
||||||
|
showCamera = true
|
||||||
|
}) {
|
||||||
|
Label("Take Photo", systemImage: "camera")
|
||||||
|
.frame(maxWidth: .infinity)
|
||||||
|
.foregroundStyle(.blue)
|
||||||
|
}
|
||||||
|
.buttonStyle(.bordered)
|
||||||
|
|
||||||
PhotosPicker(
|
PhotosPicker(
|
||||||
selection: $selectedItems,
|
selection: $selectedItems,
|
||||||
maxSelectionCount: 5,
|
maxSelectionCount: 5,
|
||||||
matching: .images,
|
matching: .images,
|
||||||
photoLibrary: .shared()
|
photoLibrary: .shared()
|
||||||
) {
|
) {
|
||||||
Label("Add Photos", systemImage: "photo.on.rectangle.angled")
|
Label("Library", systemImage: "photo.on.rectangle.angled")
|
||||||
.frame(maxWidth: .infinity)
|
.frame(maxWidth: .infinity)
|
||||||
.foregroundStyle(.blue)
|
.foregroundStyle(.blue)
|
||||||
}
|
}
|
||||||
.buttonStyle(.bordered)
|
.buttonStyle(.bordered)
|
||||||
|
}
|
||||||
.onChange(of: selectedItems) { newItems in
|
.onChange(of: selectedItems) { newItems in
|
||||||
Task {
|
Task {
|
||||||
selectedImages = []
|
selectedImages = []
|
||||||
@@ -200,7 +212,7 @@ struct CompleteTaskView: View {
|
|||||||
.toolbar {
|
.toolbar {
|
||||||
ToolbarItem(placement: .cancellationAction) {
|
ToolbarItem(placement: .cancellationAction) {
|
||||||
Button("Cancel") {
|
Button("Cancel") {
|
||||||
isPresented = false
|
dismiss()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -209,6 +221,13 @@ struct CompleteTaskView: View {
|
|||||||
} message: {
|
} message: {
|
||||||
Text(errorMessage)
|
Text(errorMessage)
|
||||||
}
|
}
|
||||||
|
.sheet(isPresented: $showCamera) {
|
||||||
|
CameraPickerView { image in
|
||||||
|
if selectedImages.count < 5 {
|
||||||
|
selectedImages.append(image)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -265,7 +284,7 @@ struct CompleteTaskView: View {
|
|||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
if result is ApiResultSuccess<TaskCompletion> {
|
if result is ApiResultSuccess<TaskCompletion> {
|
||||||
self.isSubmitting = false
|
self.isSubmitting = false
|
||||||
self.isPresented = false
|
self.dismiss()
|
||||||
self.onComplete()
|
self.onComplete()
|
||||||
} else if let errorResult = result as? ApiResultError {
|
} else if let errorResult = result as? ApiResultError {
|
||||||
self.errorMessage = errorResult.message
|
self.errorMessage = errorResult.message
|
||||||
@@ -322,3 +341,41 @@ struct ImageThumbnailView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Camera Picker View Component
|
||||||
|
struct CameraPickerView: UIViewControllerRepresentable {
|
||||||
|
@Environment(\.dismiss) var dismiss
|
||||||
|
let onImageCaptured: (UIImage) -> Void
|
||||||
|
|
||||||
|
func makeUIViewController(context: Context) -> UIImagePickerController {
|
||||||
|
let picker = UIImagePickerController()
|
||||||
|
picker.sourceType = .camera
|
||||||
|
picker.delegate = context.coordinator
|
||||||
|
return picker
|
||||||
|
}
|
||||||
|
|
||||||
|
func updateUIViewController(_ uiViewController: UIImagePickerController, context: Context) {}
|
||||||
|
|
||||||
|
func makeCoordinator() -> Coordinator {
|
||||||
|
Coordinator(self)
|
||||||
|
}
|
||||||
|
|
||||||
|
class Coordinator: NSObject, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
|
||||||
|
let parent: CameraPickerView
|
||||||
|
|
||||||
|
init(_ parent: CameraPickerView) {
|
||||||
|
self.parent = parent
|
||||||
|
}
|
||||||
|
|
||||||
|
func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
|
||||||
|
if let image = info[.originalImage] as? UIImage {
|
||||||
|
parent.onImageCaptured(image)
|
||||||
|
}
|
||||||
|
parent.dismiss()
|
||||||
|
}
|
||||||
|
|
||||||
|
func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
|
||||||
|
parent.dismiss()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user