wip

composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/CompleteTaskDialog.kt

@@ -4,14 +4,17 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import com.mycrib.shared.models.TaskCompletionCreateRequest
-import kotlinx.datetime.Clock
-import kotlin.time.ExperimentalTime
+import com.mycrib.platform.ImageData
+import com.mycrib.platform.rememberImagePicker
+import kotlinx.datetime.*
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -19,12 +22,17 @@ fun CompleteTaskDialog(
     taskId: Int,
     taskTitle: String,
     onDismiss: () -> Unit,
-    onComplete: (TaskCompletionCreateRequest) -> Unit
+    onComplete: (TaskCompletionCreateRequest, List<ImageData>) -> Unit
 ) {
     var completedByName by remember { mutableStateOf("") }
     var actualCost by remember { mutableStateOf("") }
     var notes by remember { mutableStateOf("") }
     var rating by remember { mutableStateOf(3) }
+    var selectedImages by remember { mutableStateOf<List<ImageData>>(emptyList()) }
+
+    val imagePicker = rememberImagePicker { images ->
+        selectedImages = images
+    }
 
     AlertDialog(
         onDismissRequest = onDismiss,
@@ -72,6 +80,57 @@ fun CompleteTaskDialog(
                         modifier = Modifier.fillMaxWidth()
                     )
                 }
+
+                // Image upload section
+                Column {
+                    Text(
+                        text = "Add Images",
+                        style = MaterialTheme.typography.labelMedium
+                    )
+                    Spacer(modifier = Modifier.height(4.dp))
+
+                    OutlinedButton(
+                        onClick = { imagePicker() },
+                        modifier = Modifier.fillMaxWidth()
+                    ) {
+                        Text("Select Images (up to 5)")
+                    }
+
+                    // Display selected images
+                    if (selectedImages.isNotEmpty()) {
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = "${selectedImages.size} image(s) selected",
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+
+                        selectedImages.forEach { image ->
+                            Row(
+                                modifier = Modifier.fillMaxWidth(),
+                                horizontalArrangement = Arrangement.SpaceBetween,
+                                verticalAlignment = androidx.compose.ui.Alignment.CenterVertically
+                            ) {
+                                Text(
+                                    text = image.fileName,
+                                    style = MaterialTheme.typography.bodySmall,
+                                    modifier = Modifier.weight(1f)
+                                )
+                                IconButton(
+                                    onClick = {
+                                        selectedImages = selectedImages.filter { it != image }
+                                    }
+                                ) {
+                                    Icon(
+                                        Icons.Default.Close,
+                                        contentDescription = "Remove image",
+                                        modifier = Modifier.size(16.dp)
+                                    )
+                                }
+                            }
+                        }
+                    }
+                }
             }
         },
         confirmButton = {
@@ -88,7 +147,8 @@ fun CompleteTaskDialog(
                             actualCost = actualCost.ifBlank { null },
                             notes = notes.ifBlank { null },
                             rating = rating
-                        )
+                        ),
+                        selectedImages
                     )
                 }
             ) {
@@ -104,8 +164,6 @@ fun CompleteTaskDialog(
 }
 
 // Helper function to get current date/time in ISO format
-@OptIn(ExperimentalTime::class)
 private fun getCurrentDateTime(): String {
-    val now = kotlin.time.Clock.System.now()
-    return now.toString()
+    return kotlinx.datetime.LocalDate.toString()
 }

composeApp/src/commonMain/kotlin/com/example/mycrib/ui/screens/ResidenceDetailScreen.kt

@@ -69,8 +69,18 @@ fun ResidenceDetailScreen(
                 selectedTask = null
                 taskCompletionViewModel.resetCreateState()
             },
-            onComplete = { request ->
-                taskCompletionViewModel.createTaskCompletion(request)
+            onComplete = { request, images ->
+                if (images.isNotEmpty()) {
+                    // Use the method that supports images
+                    taskCompletionViewModel.createTaskCompletionWithImages(
+                        request = request,
+                        images = images.map { it.bytes },
+                        imageFileNames = images.map { it.fileName }
+                    )
+                } else {
+                    // Use the regular method without images
+                    taskCompletionViewModel.createTaskCompletion(request)
+                }
             }
         )
     }