diff --git a/android/app/src/main/java/com/yarisobd/app/DashcamScreen.kt b/android/app/src/main/java/com/yarisobd/app/DashcamScreen.kt index 8d3d6eb..7f5ebc2 100644 --- a/android/app/src/main/java/com/yarisobd/app/DashcamScreen.kt +++ b/android/app/src/main/java/com/yarisobd/app/DashcamScreen.kt @@ -30,6 +30,8 @@ import androidx.compose.material3.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Download +import androidx.compose.material.icons.filled.CloudDone +import androidx.compose.material.icons.filled.CloudQueue import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Alignment @@ -255,12 +257,22 @@ private fun VideoRow( color = MaterialTheme.colorScheme.primary ) } else { - Text( - text = if (video.uploaded) "Uploaded" else "Pending", - style = MaterialTheme.typography.bodySmall, - color = if (video.uploaded) MaterialTheme.colorScheme.primary - else MaterialTheme.colorScheme.error - ) + Row(verticalAlignment = Alignment.CenterVertically) { + Icon( + if (video.uploaded) Icons.Filled.CloudDone else Icons.Filled.CloudQueue, + contentDescription = if (video.uploaded) "On server" else "Not on server", + tint = if (video.uploaded) MaterialTheme.colorScheme.primary + else MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.size(16.dp) + ) + Spacer(Modifier.width(4.dp)) + Text( + text = if (video.uploaded) "On server" else "Not uploaded", + style = MaterialTheme.typography.bodySmall, + color = if (video.uploaded) MaterialTheme.colorScheme.primary + else MaterialTheme.colorScheme.onSurfaceVariant + ) + } } } diff --git a/android/app/src/main/java/com/yarisobd/app/DownloadWorker.kt b/android/app/src/main/java/com/yarisobd/app/DownloadWorker.kt index 4896b24..af92a2f 100644 --- a/android/app/src/main/java/com/yarisobd/app/DownloadWorker.kt +++ b/android/app/src/main/java/com/yarisobd/app/DownloadWorker.kt @@ -75,7 +75,11 @@ class DownloadWorker( .setContentIntent(pendingIntent) .setContentText("$progress%") .setProgress(100, progress, progress == 0) - return ForegroundInfo(NOTIFICATION_ID_BASE, builder.build()) + return ForegroundInfo( + NOTIFICATION_ID_BASE, + builder.build(), + android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC, + ) } }