chore: Hide folder size

Infomaniak · Nov 25, 2024 · 24f2766 · 24f2766
1 parent aad1334
commit 24f2766
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItem.kt
@@ -46,14 +46,22 @@ fun FileItem(
     onClick: () -> Unit,
     onRemove: (() -> Unit)? = null,
 ) {
+    val description = if (file.isFolder) {
+        ""
+    } else {
+        HumanReadableSizeUtils.getHumanReadableSize(
+            LocalContext.current,
+            file.fileSize
+        )
+    }
     FileItemContent(
         onClick = onClick,
         isCheckboxVisible = isCheckboxVisible,
         isChecked = isChecked,
         isRemoveButtonVisible = isRemoveButtonVisible,
         onRemove = onRemove,
         title = file.fileName,
-        description = HumanReadableSizeUtils.getHumanReadableSize(LocalContext.current, file.fileSize),
+        description = description,
         content = {
             FilePreview(
                 file = file,

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItemList.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FileItemList.kt
@@ -66,7 +66,7 @@ fun FileItemList(
                 onClick = {
                     if (isCheckboxVisible()) {
                         setUidCheckStatus(file.uid, !isUidChecked(file.uid))
-                    } else if (file.isFolder == true) {
+                    } else if (file.isFolder) {
                         onClick?.invoke(file.uid)
                     }
                 },

diff --git a/...va/com/infomaniak/swisstransfer/ui/previewparameter/FileUiListPreviewParameterProvider.kt b/...va/com/infomaniak/swisstransfer/ui/previewparameter/FileUiListPreviewParameterProvider.kt
@@ -30,6 +30,7 @@ val filesPreviewData = listOf(
         // Non-preview file (i.e. pdf, txt, etc.)
         fileName = "How to not get fired.pdf",
         uid = "How to not get fired.pdf",
+        isFolder = false,
         fileSize = 10_302_130L,
         mimeType = null,
         localPath = "",
@@ -38,34 +39,39 @@ val filesPreviewData = listOf(
         // Preview file (i.e. png, jpg, etc.)
         fileName = "Opening images tutorial.png",
         uid = "Opening images tutorial.png",
+        isFolder = false,
         fileSize = 456_782L,
         mimeType = null,
         localPath = "https://picsum.photos/200/300",
     ),
     FileUi(
         fileName = "The 5 step guide to turning it off and on again.docx",
         uid = "The 5 step guide to turning it off and on again.docx",
+        isFolder = false,
         fileSize = 89_723_143L,
         mimeType = null,
         localPath = "",
     ),
     FileUi(
         uid = UUID.randomUUID().toString(),
         fileName = "Learning to Copy and Paste: A Complete Guide.docx",
+        isFolder = false,
         fileSize = 237_866_728L,
         mimeType = null,
         localPath = null,
     ),
     FileUi(
         uid = UUID.randomUUID().toString(),
         fileName = "Introduction to Turning It Off and On Again.pptx",
+        isFolder = false,
         fileSize = 98_723_143L,
         mimeType = null,
         localPath = null,
     ),
     FileUi(
         uid = UUID.randomUUID().toString(),
         fileName = "The 5-Step Guide to Not Breaking Your Code.txt",
+        isFolder = false,
         fileSize = 57_689_032L,
         mimeType = null,
         localPath = null,

diff --git a/...c/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportationFilesManager.kt b/...c/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/ImportationFilesManager.kt
@@ -102,6 +102,7 @@ class ImportationFilesManager @Inject constructor(
                 FileUi(
                     uid = fileToImport.fileName,
                     fileName = fileToImport.fileName,
+                    isFolder = false,
                     fileSize = fileToImport.fileSizeInBytes,
                     mimeType = null,
                     localPath = copiedFile.toUri().toString(),
@@ -131,6 +132,7 @@ class ImportationFilesManager @Inject constructor(
             FileUi(
                 uid = localFile.name,
                 fileName = localFile.name,
+                isFolder = false,
                 fileSize = fileSizeInBytes,
                 mimeType = null,
                 localPath = localFile.toUri().toString(),