badge de status de sync

This commit is contained in:
m
2026-09-14 09:56:48 +02:00
parent a973d789cd
commit 95e63da1a1
4 changed files with 19 additions and 2 deletions
@@ -50,6 +50,7 @@ import com.vaultdrop.mobile.data.local.entity.FolderEntity
import com.vaultdrop.mobile.features.connection.ConnectionStatusViewModel import com.vaultdrop.mobile.features.connection.ConnectionStatusViewModel
import com.vaultdrop.mobile.features.sync.SyncViewModel import com.vaultdrop.mobile.features.sync.SyncViewModel
import com.vaultdrop.mobile.ui.components.FileCategoryIcon import com.vaultdrop.mobile.ui.components.FileCategoryIcon
import com.vaultdrop.mobile.ui.components.FilePendingReviewBadge
import com.vaultdrop.mobile.ui.components.FileSyncStatusIcon import com.vaultdrop.mobile.ui.components.FileSyncStatusIcon
import com.vaultdrop.mobile.ui.components.FolderNameDialog import com.vaultdrop.mobile.ui.components.FolderNameDialog
import com.vaultdrop.mobile.ui.components.MoveFolderPickerDialog import com.vaultdrop.mobile.ui.components.MoveFolderPickerDialog
@@ -422,7 +423,13 @@ private fun FileRow(
if (selection.active) { if (selection.active) {
SelectionStatusIcon(selected = selected) SelectionStatusIcon(selected = selected)
} else { } else {
FileSyncStatusIcon(file = file, size = 20.dp) Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
FilePendingReviewBadge(file = file)
FileSyncStatusIcon(file = file, size = 20.dp)
}
} }
} }
} }
@@ -77,6 +77,7 @@ import com.vaultdrop.mobile.ui.components.DeleteConfirmDialog
import com.vaultdrop.mobile.ui.components.DeleteReview import com.vaultdrop.mobile.ui.components.DeleteReview
import com.vaultdrop.mobile.ui.components.DeleteWarningDialog import com.vaultdrop.mobile.ui.components.DeleteWarningDialog
import com.vaultdrop.mobile.ui.components.FileCategoryIcon import com.vaultdrop.mobile.ui.components.FileCategoryIcon
import com.vaultdrop.mobile.ui.components.FilePendingReviewBadge
import com.vaultdrop.mobile.ui.components.FileSyncStatusIcon import com.vaultdrop.mobile.ui.components.FileSyncStatusIcon
import com.vaultdrop.mobile.ui.components.FolderNameDialog import com.vaultdrop.mobile.ui.components.FolderNameDialog
import com.vaultdrop.mobile.ui.components.SelectionState import com.vaultdrop.mobile.ui.components.SelectionState
@@ -828,7 +829,13 @@ private fun FileCard(
if (selection.active) { if (selection.active) {
SelectionStatusIcon(selected = selected) SelectionStatusIcon(selected = selected)
} else { } else {
FileSyncStatusIcon(file = file, size = 20.dp) Row(
verticalAlignment = androidx.compose.ui.Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
FilePendingReviewBadge(file = file)
FileSyncStatusIcon(file = file, size = 20.dp)
}
} }
} }
Spacer(Modifier.height(8.dp)) Spacer(Modifier.height(8.dp))
@@ -62,6 +62,7 @@ import com.vaultdrop.mobile.ui.components.DeleteConfirmDialog
import com.vaultdrop.mobile.ui.components.DeleteReview import com.vaultdrop.mobile.ui.components.DeleteReview
import com.vaultdrop.mobile.ui.components.DeleteWarningDialog import com.vaultdrop.mobile.ui.components.DeleteWarningDialog
import com.vaultdrop.mobile.ui.components.FileCategoryIcon import com.vaultdrop.mobile.ui.components.FileCategoryIcon
import com.vaultdrop.mobile.ui.components.FilePendingReviewBadge
import com.vaultdrop.mobile.ui.components.FileSyncStatusIcon import com.vaultdrop.mobile.ui.components.FileSyncStatusIcon
import com.vaultdrop.mobile.ui.components.MoveFolderPickerDialog import com.vaultdrop.mobile.ui.components.MoveFolderPickerDialog
import com.vaultdrop.mobile.ui.components.SelectionState import com.vaultdrop.mobile.ui.components.SelectionState
@@ -464,6 +465,7 @@ private fun SearchResultCard(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp),
) { ) {
FilePendingReviewBadge(file = file)
Text( Text(
text = formatSize(file.size), text = formatSize(file.size),
style = MaterialTheme.typography.labelMedium, style = MaterialTheme.typography.labelMedium,
@@ -48,6 +48,7 @@
<string name="no_folders_yet">Aucun dossier pour le moment. Appuie sur « Ajouter un dossier » pour synchroniser un dossier.</string> <string name="no_folders_yet">Aucun dossier pour le moment. Appuie sur « Ajouter un dossier » pour synchroniser un dossier.</string>
<string name="no_files_yet">Aucun fichier pour le moment. Appuie sur « Ajouter un dossier » pour synchroniser tes fichiers.</string> <string name="no_files_yet">Aucun fichier pour le moment. Appuie sur « Ajouter un dossier » pour synchroniser tes fichiers.</string>
<string name="empty_folder">Dossier vide — le prochain syncDevice l\'actualisera.</string> <string name="empty_folder">Dossier vide — le prochain syncDevice l\'actualisera.</string>
<string name="file_pending_review">À traiter</string>
<string name="unit_bytes">o</string> <string name="unit_bytes">o</string>
<string name="unit_kilobytes">ko</string> <string name="unit_kilobytes">ko</string>
<string name="unit_megabytes">Mo</string> <string name="unit_megabytes">Mo</string>