diff --git a/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/folderdetail/FolderDetailScreen.kt b/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/folderdetail/FolderDetailScreen.kt index 09f265b..5aed662 100644 --- a/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/folderdetail/FolderDetailScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/folderdetail/FolderDetailScreen.kt @@ -50,6 +50,7 @@ import com.vaultdrop.mobile.data.local.entity.FolderEntity import com.vaultdrop.mobile.features.connection.ConnectionStatusViewModel import com.vaultdrop.mobile.features.sync.SyncViewModel 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.FolderNameDialog import com.vaultdrop.mobile.ui.components.MoveFolderPickerDialog @@ -422,7 +423,13 @@ private fun FileRow( if (selection.active) { SelectionStatusIcon(selected = selected) } 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) + } } } } diff --git a/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/folderlist/FolderListScreen.kt b/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/folderlist/FolderListScreen.kt index 4d9640c..28c1ac1 100644 --- a/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/folderlist/FolderListScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/folderlist/FolderListScreen.kt @@ -77,6 +77,7 @@ import com.vaultdrop.mobile.ui.components.DeleteConfirmDialog import com.vaultdrop.mobile.ui.components.DeleteReview import com.vaultdrop.mobile.ui.components.DeleteWarningDialog 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.FolderNameDialog import com.vaultdrop.mobile.ui.components.SelectionState @@ -828,7 +829,13 @@ private fun FileCard( if (selection.active) { SelectionStatusIcon(selected = selected) } 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)) diff --git a/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/search/SearchScreen.kt b/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/search/SearchScreen.kt index 8ff77a9..d1d3560 100644 --- a/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/search/SearchScreen.kt +++ b/mobile-kotlin/app/src/main/java/com/vaultdrop/mobile/ui/search/SearchScreen.kt @@ -62,6 +62,7 @@ import com.vaultdrop.mobile.ui.components.DeleteConfirmDialog import com.vaultdrop.mobile.ui.components.DeleteReview import com.vaultdrop.mobile.ui.components.DeleteWarningDialog 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.MoveFolderPickerDialog import com.vaultdrop.mobile.ui.components.SelectionState @@ -464,6 +465,7 @@ private fun SearchResultCard( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), ) { + FilePendingReviewBadge(file = file) Text( text = formatSize(file.size), style = MaterialTheme.typography.labelMedium, diff --git a/mobile-kotlin/app/src/main/res/values/strings.xml b/mobile-kotlin/app/src/main/res/values/strings.xml index 5a31d26..6e30e21 100644 --- a/mobile-kotlin/app/src/main/res/values/strings.xml +++ b/mobile-kotlin/app/src/main/res/values/strings.xml @@ -48,6 +48,7 @@ Aucun dossier pour le moment. Appuie sur « Ajouter un dossier » pour synchroniser un dossier. Aucun fichier pour le moment. Appuie sur « Ajouter un dossier » pour synchroniser tes fichiers. Dossier vide — le prochain syncDevice l\'actualisera. + À traiter o ko Mo