chore: Don't display file size when navigating files

Infomaniak · Nov 27, 2024 · a0bce41 · a0bce41
1 parent 90ccfb9
commit a0bce41
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/TextDotText.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/TextDotText.kt
@@ -39,14 +39,16 @@ fun TextDotText(
 ) {
     Row(modifier) {
         CustomText(firstText, color, style)
-        Spacer(Modifier.width(Margin.Mini))
-        Text(
-            text = "•",
-            color = color,
-            style = style,
-        )
-        Spacer(Modifier.width(Margin.Mini))
-        CustomText(secondText, optionalSecondTextColor ?: color, style)
+        if (secondText().isNotEmpty()) {
+            Spacer(Modifier.width(Margin.Mini))
+            Text(
+                text = "•",
+                color = color,
+                style = style,
+            )
+            Spacer(Modifier.width(Margin.Mini))
+            CustomText(secondText, optionalSecondTextColor ?: color, style)
+        }
     }
 }
 

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/FilesSize.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/FilesSize.kt
@@ -41,16 +41,21 @@ import com.infomaniak.swisstransfer.ui.utils.HumanReadableSizeUtils.formatSpaceL
 import com.infomaniak.swisstransfer.ui.utils.HumanReadableSizeUtils.getSpaceLeft
 
 @Composable
-fun FilesSize(files: List<FileUi>, withSpaceLeft: Boolean) {
+fun FilesSize(files: List<FileUi>, withFileSize: Boolean, withSpaceLeft: Boolean) {
     Row(modifier = Modifier.padding(vertical = Margin.Medium)) {
         Spacer(Modifier.size(Margin.Medium))
         val context = LocalContext.current
+        val secondText = if (withFileSize) {
+            HumanReadableSizeUtils.getHumanReadableSize(context, files.sumOf { it.fileSize })
+        } else {
+            ""
+        }
         TextDotText(
             firstText = {
                 val filesCount = files.count()
                 pluralStringResource(R.plurals.filesCount, filesCount, filesCount)
             },
-            secondText = { HumanReadableSizeUtils.getHumanReadableSize(context, files.sumOf { it.fileSize }) },
+            secondText = { secondText },
         )
         if (withSpaceLeft) {
             val spaceLeft = formatSpaceLeft { context.getSpaceLeft(files) }
@@ -71,7 +76,7 @@ fun FilesSize(files: List<FileUi>, withSpaceLeft: Boolean) {
 fun FileSizePreview(@PreviewParameter(FileUiListPreviewParameter::class) files: List<FileUi>) {
     SwissTransferTheme {
         Surface {
-            FilesSize(files, withSpaceLeft = true)
+            FilesSize(files, withFileSize = false, withSpaceLeft = true)
         }
     }
 }
diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/FilesDetailsScreen.kt b/...java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/FilesDetailsScreen.kt
@@ -85,7 +85,7 @@ private fun FilesDetailsScreen(
             TopAppBarButton.closeButton { onCloseClicked() },
         )
 
-        FilesSize(files, withSpaceLeft)
+        FilesSize(files, withFileSize = false, withSpaceLeft)
         FileItemList(
             modifier = Modifier.padding(horizontal = Margin.Medium),
             files = files,