Wydaj aplikację kierowcy 1.0.80 (133)

app/build.gradle.kts

@@ -34,8 +34,8 @@ android {
         applicationId = "pl.firmatpp.kierowca"
         minSdk = 26
         targetSdk = 36
-        versionCode = 131
+        versionCode = 133
-        versionName = "1.0.78"
+        versionName = "1.0.80"
         setProperty("archivesBaseName", "pl.firmatpp.kierowca")
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/pl/firmatpp/kierowca/data/PhotoUploadMetadata.kt

@@ -1,5 +1,6 @@
 package pl.firmatpp.kierowca.data
 
+import java.io.Serializable
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -9,7 +10,7 @@ data class PhotoUploadMetadata(
     val latitude: Double? = null,
     val longitude: Double? = null,
     val locationAccuracyMeters: Double? = null,
-)
+) : Serializable
 
 fun PhotoUploadMetadata.toMultipartTextParts(): Map<String, RequestBody> = buildMap {
     takenAt?.let { put("takenAt", it.toPlainTextBody()) }

app/src/main/java/pl/firmatpp/kierowca/ui/DriverApp.kt

@@ -115,6 +115,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -1202,9 +1203,22 @@ private fun RoutesScreen(
     val context = LocalContext.current
     val coroutineScope = rememberCoroutineScope()
     var cameraUri by remember { mutableStateOf<Uri?>(null) }
+    var cameraLocationMetadata by remember { mutableStateOf(PhotoUploadMetadata()) }
+    var cameraMetadataGeneration by remember { mutableStateOf(0L) }
     var showPreciseLocationPermissionDialog by remember { mutableStateOf(false) }
     var showRouteDatePicker by remember { mutableStateOf(false) }
     var showTachographConfirmation by remember { mutableStateOf(false) }
+    val prepareCameraMetadata = {
+        val generation = cameraMetadataGeneration + 1
+        cameraMetadataGeneration = generation
+        cameraLocationMetadata = PhotoUploadMetadata()
+        coroutineScope.launch {
+            val metadata = cameraPhotoMetadata(context).copy(takenAt = null)
+            if (cameraMetadataGeneration == generation) {
+                cameraLocationMetadata = metadata
+            }
+        }
+    }
     val cameraLauncher = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { ok ->
         val capturedUri = cameraUri
         if (
@@ -1215,10 +1229,13 @@ private fun RoutesScreen(
                 hasFineLocation = hasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION),
             )
         ) {
-            coroutineScope.launch {
+            onDispatchSheetUpload(
-                onDispatchSheetUpload(capturedUri, "camera", cameraPhotoMetadata(context))
+                capturedUri,
-            }
+                "camera",
+                cameraLocationMetadata.copy(takenAt = Instant.now().toString()),
+            )
         }
+        cameraMetadataGeneration += 1
         cameraUri = null
     }
     val cameraPermissionLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { grants ->
@@ -1228,10 +1245,14 @@ private fun RoutesScreen(
             hasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)
         if (!canLaunchCameraWithLocationPolicy(state.requirePreciseLocationForPhotos, fineLocationGranted)) {
             showPreciseLocationPermissionDialog = true
+            cameraMetadataGeneration += 1
             cameraUri = null
             return@rememberLauncherForActivityResult
         }
-        if (cameraGranted && pendingUri != null) cameraLauncher.launch(pendingUri)
+        if (cameraGranted && pendingUri != null) {
+            prepareCameraMetadata()
+            cameraLauncher.launch(pendingUri)
+        }
     }
 
     LaunchedEffect(state.routeDayLiveUpdateMessage) {
@@ -1339,6 +1360,7 @@ private fun RoutesScreen(
                                         requirePreciseLocation = state.requirePreciseLocationForPhotos,
                                     )
                                     if (missingPermissions.isEmpty()) {
+                                        prepareCameraMetadata()
                                         cameraLauncher.launch(newUri)
                                     } else {
                                         cameraPermissionLauncher.launch(missingPermissions)
@@ -4441,21 +4463,28 @@ private fun RouteStageScreen(
 ) {
     val context = LocalContext.current
     val coroutineScope = rememberCoroutineScope()
-    var cameraUri by remember { mutableStateOf<Uri?>(null) }
+    var cameraUri by rememberSaveable(stage) { mutableStateOf<Uri?>(null) }
-    var pendingCameraMode by remember { mutableStateOf<RouteStageCameraMode?>(null) }
+    var pendingCameraMode by rememberSaveable(stage) { mutableStateOf<RouteStageCameraMode?>(null) }
-    var showMultiplePhotoCamera by remember(stage) { mutableStateOf(false) }
+    var showMultiplePhotoCamera by rememberSaveable(stage) { mutableStateOf(false) }
-    var multiplePhotoLocationMetadata by remember(stage) { mutableStateOf(PhotoUploadMetadata()) }
+    var multiplePhotoLocationMetadata by rememberSaveable(stage) { mutableStateOf(PhotoUploadMetadata()) }
-    var showPreciseLocationPermissionDialog by remember { mutableStateOf(false) }
+    var showPreciseLocationPermissionDialog by rememberSaveable(stage) { mutableStateOf(false) }
     var voiceDictationActive by remember(stage) { mutableStateOf(false) }
-    var cameraAttachmentTarget by remember(stage) { mutableStateOf<RouteWorkflowAttachmentTarget?>(null) }
+    var cameraAttachmentTarget by rememberSaveable(stage) { mutableStateOf<RouteWorkflowAttachmentTarget?>(null) }
-    var pickerAttachmentTarget by remember(stage) { mutableStateOf<RouteWorkflowAttachmentTarget?>(null) }
+    var pickerAttachmentTarget by rememberSaveable(stage) { mutableStateOf<RouteWorkflowAttachmentTarget?>(null) }
+    var singlePhotoLocationMetadata by rememberSaveable(stage) { mutableStateOf(PhotoUploadMetadata()) }
+    var singlePhotoMetadataGeneration by rememberSaveable(stage) { mutableStateOf(0L) }
     val route = state.displaySelectedRoute
     val stagePhotos = route?.photos?.let { routePhotosForStage(it, stage) }.orEmpty()
     val stageUploads = state.photoUploads.filter { normalizedRoutePhotoStage(it.stage) == stage }
+    val stagePreparations = state.preparingPhotoUploads.filter { normalizedRoutePhotoStage(it.stage) == stage }
     val usableStageUploads = routeStageUsableUploads(stageUploads)
     val cargoStagePhotos = stagePhotos.filter { it.workflowDocumentId.isNullOrBlank() }
     val cargoStageUploads = usableStageUploads.filter { it.workflowDocumentId.isNullOrBlank() }
-    val attachmentCount = visiblePhotoAttachmentCount(cargoStagePhotos.size, cargoStageUploads.size)
+    val cargoStagePreparations = stagePreparations.filter { it.workflowDocumentId.isNullOrBlank() }
+    val attachmentCount = visiblePhotoAttachmentCount(
+        cargoStagePhotos.size,
+        cargoStageUploads.size + cargoStagePreparations.size,
+    )
     val photoRequirement = if (stage == "loading") state.loadingPhotoRequirement else state.unloadingPhotoRequirement
     val weightRequirement = if (stage == "loading") state.loadingWeightRequirement else state.unloadingWeightRequirement
     val submitBlocker = if (state.routeWorkflow != null) {
@@ -4494,9 +4523,21 @@ private fun RouteStageScreen(
         submitBlocker
     }
     val weightBlocker = submitBlocker?.takeIf { it.contains("wag", ignoreCase = true) || it.contains("popraw", ignoreCase = true) }
+    val prepareSinglePhotoMetadata = {
+        val generation = singlePhotoMetadataGeneration + 1
+        singlePhotoMetadataGeneration = generation
+        singlePhotoLocationMetadata = PhotoUploadMetadata()
+        coroutineScope.launch {
+            val metadata = cameraPhotoMetadata(context).copy(takenAt = null)
+            if (singlePhotoMetadataGeneration == generation) {
+                singlePhotoLocationMetadata = metadata
+            }
+        }
+    }
 
     val cameraLauncher = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { ok ->
         val capturedUri = cameraUri
+        val attachmentTarget = cameraAttachmentTarget
         if (
             ok &&
             capturedUri != null &&
@@ -4509,12 +4550,13 @@ private fun RouteStageScreen(
                 onUpload(
                     capturedUri,
                     "camera",
-                    cameraPhotoMetadata(context),
+                    singlePhotoLocationMetadata.copy(takenAt = Instant.now().toString()),
-                    cameraAttachmentTarget?.stepId,
+                    attachmentTarget?.stepId,
-                    cameraAttachmentTarget?.documentId,
+                    attachmentTarget?.documentId,
                 )
             }
         }
+        singlePhotoMetadataGeneration += 1
         cameraUri = null
         cameraAttachmentTarget = null
     }
@@ -4533,6 +4575,7 @@ private fun RouteStageScreen(
             hasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)
         if (!canLaunchCameraWithLocationPolicy(state.requirePreciseLocationForPhotos, fineLocationGranted)) {
             showPreciseLocationPermissionDialog = true
+            singlePhotoMetadataGeneration += 1
             cameraUri = null
             pendingCameraMode = null
             return@rememberLauncherForActivityResult
@@ -4540,7 +4583,10 @@ private fun RouteStageScreen(
         if (cameraGranted) {
             when (requestedMode) {
                 RouteStageCameraMode.Single -> {
-                    if (pendingUri != null) cameraLauncher.launch(pendingUri)
+                    if (pendingUri != null) {
+                        prepareSinglePhotoMetadata()
+                        cameraLauncher.launch(pendingUri)
+                    }
                 }
                 RouteStageCameraMode.Multiple -> {
                     openMultiplePhotoCamera()
@@ -4553,28 +4599,30 @@ private fun RouteStageScreen(
         pendingCameraMode = null
     }
     val pickerLauncher = rememberLauncherForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
+        val attachmentTarget = pickerAttachmentTarget
         if (uri != null) {
             coroutineScope.launch {
                 onUpload(
                     uri,
                     "gallery",
                     PhotoUploadMetadata(),
-                    pickerAttachmentTarget?.stepId,
+                    attachmentTarget?.stepId,
-                    pickerAttachmentTarget?.documentId,
+                    attachmentTarget?.documentId,
                 )
             }
         }
         pickerAttachmentTarget = null
     }
     val filePickerLauncher = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+        val attachmentTarget = pickerAttachmentTarget
         if (uri != null) {
             coroutineScope.launch {
                 onUpload(
                     uri,
                     "file",
                     PhotoUploadMetadata(),
-                    pickerAttachmentTarget?.stepId,
+                    attachmentTarget?.stepId,
-                    pickerAttachmentTarget?.documentId,
+                    attachmentTarget?.documentId,
                 )
             }
         }
@@ -4629,6 +4677,7 @@ private fun RouteStageScreen(
                             weightText = state.routeStageWeightText,
                             serverPhotos = stagePhotos,
                             localUploads = usableStageUploads,
+                            preparingUploads = stagePreparations,
                             onStepToggle = onStepToggle,
                             onTakeDocumentPhoto = { stepId, documentId ->
                                 cameraAttachmentTarget = RouteWorkflowAttachmentTarget(stepId, documentId)
@@ -4641,6 +4690,7 @@ private fun RouteStageScreen(
                                 )
                                 if (missingPermissions.isEmpty()) {
                                     pendingCameraMode = null
+                                    prepareSinglePhotoMetadata()
                                     cameraLauncher.launch(newUri)
                                 } else {
                                     cameraPermissionLauncher.launch(missingPermissions)
@@ -4726,6 +4776,7 @@ private fun RouteStageScreen(
                                     )
                                     if (missingPermissions.isEmpty()) {
                                         pendingCameraMode = null
+                                        prepareSinglePhotoMetadata()
                                         cameraLauncher.launch(newUri)
                                     } else {
                                         cameraPermissionLauncher.launch(missingPermissions)
@@ -4761,6 +4812,7 @@ private fun RouteStageScreen(
                         PhotoGrid(
                             photos = cargoStagePhotos,
                             uploads = stageUploads.filter { it.workflowDocumentId.isNullOrBlank() },
+                            preparations = cargoStagePreparations,
                             deletingPhotoIds = state.deletingPhotoIds,
                             imageAuthHeader = state.imageAuthHeader,
                             onPhoto = onPhoto,
@@ -4807,7 +4859,7 @@ private fun RouteStageScreen(
 private data class RouteWorkflowAttachmentTarget(
     val stepId: String,
     val documentId: String,
-)
+) : java.io.Serializable
 
 @Composable
 private fun RouteWorkflowStepsCard(
@@ -4816,6 +4868,7 @@ private fun RouteWorkflowStepsCard(
     weightText: String,
     serverPhotos: List<RoutePhotoDto>,
     localUploads: List<PhotoUploadEntity>,
+    preparingUploads: List<PreparingPhotoUpload>,
     onStepToggle: (String, Boolean) -> Unit,
     onTakeDocumentPhoto: (String, String) -> Unit,
     onPickDocumentPhoto: (String, String) -> Unit,
@@ -4902,7 +4955,10 @@ private fun RouteWorkflowStepsCard(
                                 it.status != PhotoUploadStatus.Cancelled.storageValue &&
                                 it.status != PhotoUploadStatus.FailedPermanent.storageValue
                         }
-                        val count = documentServerPhotos.size + documentUploads.size
+                        val documentPreparations = preparingUploads.count {
+                            it.workflowStepId == step.id && it.workflowDocumentId == document.id
+                        }
+                        val count = documentServerPhotos.size + documentUploads.size + documentPreparations
                         Column(
                             Modifier
                                 .fillMaxWidth()
@@ -5951,6 +6007,7 @@ private fun CargoActionButton(label: String, icon: ImageVector, color: Color, on
 private fun PhotoGrid(
     photos: List<RoutePhotoDto>,
     uploads: List<PhotoUploadEntity>,
+    preparations: List<PreparingPhotoUpload> = emptyList(),
     deletingPhotoIds: Set<String>,
     imageAuthHeader: String?,
     onPhoto: (RoutePhotoDto) -> Unit,
@@ -5960,9 +6017,13 @@ private fun PhotoGrid(
     readOnly: Boolean = false,
 ) {
     var pendingDelete by remember { mutableStateOf<PhotoDeleteTarget?>(null) }
-    val items = (uploads.map { PhotoGridItem.Upload(it) } + photos.map { PhotoGridItem.Server(it) })
+    val items = (
+        preparations.map { PhotoGridItem.Preparing(it) } +
+            uploads.map { PhotoGridItem.Upload(it) } +
+            photos.map { PhotoGridItem.Server(it) }
+        )
         .sortedByDescending { it.sortEpochMillis }
-    val visibleAttachmentCount = visiblePhotoAttachmentCount(photos.size, uploads.size)
+    val visibleAttachmentCount = visiblePhotoAttachmentCount(photos.size, uploads.size + preparations.size)
 
     Card(
         colors = CardDefaults.cardColors(containerColor = TppTheme.colors.card),
@@ -6009,6 +6070,10 @@ private fun PhotoGrid(
                                             readOnly = readOnly,
                                             modifier = Modifier.weight(1f),
                                         )
+                                        is PhotoGridItem.Preparing -> PreparingPhotoTile(
+                                            preparation = item.preparation,
+                                            modifier = Modifier.weight(1f),
+                                        )
                                     }
                                 }
                                 if (rowItems.size == 1) {
@@ -6055,6 +6120,9 @@ private sealed class PhotoGridItem(open val sortEpochMillis: Long) {
     )
 
     data class Upload(val upload: PhotoUploadEntity) : PhotoGridItem(upload.createdAtEpochMillis)
+
+    data class Preparing(val preparation: PreparingPhotoUpload) :
+        PhotoGridItem(preparation.createdAtEpochMillis)
 }
 
 private sealed class PhotoDeleteTarget {
@@ -6288,6 +6356,40 @@ private fun PendingPhotoTile(
     }
 }
 
+@Composable
+private fun PreparingPhotoTile(
+    preparation: PreparingPhotoUpload,
+    modifier: Modifier = Modifier,
+) {
+    Box(modifier.aspectRatio(1f).background(TppTheme.colors.panel, RoundedCornerShape(4.dp))) {
+        AsyncImage(
+            model = preparation.uri,
+            contentDescription = "Przygotowywane zdjęcie",
+            contentScale = ContentScale.Crop,
+            modifier = Modifier.fillMaxSize(),
+        )
+        Box(Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.24f)))
+        CircularProgressIndicator(
+            modifier = Modifier.align(Alignment.Center).size(30.dp),
+            color = Color.White,
+            trackColor = Color.White.copy(alpha = 0.3f),
+            strokeWidth = 2.5.dp,
+        )
+        Text(
+            "Przygotowuję zdjęcie",
+            color = TppTheme.colors.ink,
+            fontFamily = FontFamily.Monospace,
+            fontWeight = FontWeight.Bold,
+            style = MaterialTheme.typography.labelMedium,
+            modifier = Modifier
+                .align(Alignment.BottomStart)
+                .fillMaxWidth()
+                .background(Color.White.copy(alpha = 0.94f))
+                .padding(10.dp),
+        )
+    }
+}
+
 @Composable
 private fun PhotoTileLoadingOverlay() {
     Box(

app/src/main/java/pl/firmatpp/kierowca/ui/DriverViewModel.kt

@@ -73,6 +73,16 @@ enum class DriverScreen { Initializing, Phone, Otp, Routes, Profile, Diagnostics
 
 enum class ServerConnectionState { Unknown, Reachable, Degraded }
 
+data class PreparingPhotoUpload(
+    val id: String,
+    val routeId: String,
+    val uri: Uri,
+    val stage: String,
+    val workflowStepId: String?,
+    val workflowDocumentId: String?,
+    val createdAtEpochMillis: Long = System.currentTimeMillis(),
+)
+
 data class DriverUiState(
     val screen: DriverScreen = DriverScreen.Initializing,
     val loading: Boolean = true,
@@ -111,6 +121,7 @@ data class DriverUiState(
     val routeActions: List<RouteActionEntity> = emptyList(),
     val visibleRouteActions: List<RouteActionEntity> = emptyList(),
     val photoUploads: List<PhotoUploadEntity> = emptyList(),
+    val preparingPhotoUploads: List<PreparingPhotoUpload> = emptyList(),
     val queuedPhotoUploads: List<PhotoUploadEntity> = emptyList(),
     val dispatchSheetReminder: DispatchSheetReminderDto? = null,
     val tachographReminder: TachographReminderDto? = null,
@@ -1496,23 +1507,46 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             _state.update { it.copy(error = "Zdjęcia możesz dodać tylko w zaplanowanym zakresie kursu.") }
             return null
         }
+        val preparation = PreparingPhotoUpload(
+            id = UUID.randomUUID().toString(),
+            routeId = route.id,
+            uri = uri,
+            stage = stage,
+            workflowStepId = workflowStepId,
+            workflowDocumentId = workflowDocumentId,
+        )
+        _state.update {
+            it.copy(
+                preparingPhotoUploads = it.preparingPhotoUploads + preparation,
+                error = null,
+            )
+        }
         return viewModelScope.launch {
-            _state.update { it.copy(error = null) }
+            try {
-            runCatching {
+                runCatching {
-                photoUploadOutbox.enqueue(
+                    photoUploadOutbox.enqueue(
-                    routeId = route.id,
+                        routeId = route.id,
-                    uri = uri,
+                        uri = uri,
-                    source = source,
+                        source = source,
-                    metadata = metadata,
+                        metadata = metadata,
-                    stage = stage,
+                        stage = stage,
-                    workflowVersion = snapshot.routeWorkflow?.version,
+                        workflowVersion = snapshot.routeWorkflow?.version,
-                    workflowStepId = workflowStepId,
+                        workflowStepId = workflowStepId,
-                    workflowDocumentId = workflowDocumentId,
+                        workflowDocumentId = workflowDocumentId,
-                )
+                    )
-            }
-                .onFailure { throwable ->
-                    _state.update { it.withApiError(throwable) }
                 }
+                    .onFailure { throwable ->
+                        _state.update { it.withApiError(throwable) }
+                    }
+            } finally {
+                _state.update {
+                    it.copy(
+                        preparingPhotoUploads = it.preparingPhotoUploads.filterNot { item ->
+                            item.id == preparation.id
+                        },
+                    )
+                }
+            }
         }
     }
 
@@ -2017,7 +2051,14 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                 DriverScreen.Detail -> {
                     photoUploadsJob?.cancel()
                     routeActionsJob?.cancel()
-                    it.copy(screen = DriverScreen.Routes, selectedRoute = null, routeActions = emptyList(), photoUploads = emptyList(), feedback = null)
+                    it.copy(
+                        screen = DriverScreen.Routes,
+                        selectedRoute = null,
+                        routeActions = emptyList(),
+                        photoUploads = emptyList(),
+                        preparingPhotoUploads = emptyList(),
+                        feedback = null,
+                    )
                 }
                 DriverScreen.Profile -> it.copy(screen = DriverScreen.Routes)
                 DriverScreen.Diagnostics -> it.copy(screen = DriverScreen.Profile)

app/src/main/java/pl/firmatpp/kierowca/ui/MultiplePhotoCameraScreen.kt

@@ -43,6 +43,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -74,7 +75,7 @@ internal fun MultiplePhotoCameraScreen(
             imageCaptureMode = ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY
         }
     }
-    var capturedCount by remember { mutableIntStateOf(0) }
+    var capturedCount by rememberSaveable(stage) { mutableIntStateOf(0) }
     var pendingUploads by remember { mutableIntStateOf(0) }
     var isCapturing by remember { mutableStateOf(false) }
     var cameraUnavailable by remember { mutableStateOf(false) }