fix: Update TextDotText to handle the possibility to set the 2nd te…

…xt in "error mode"
Infomaniak · Oct 31, 2024 · 4b02440 · 4b02440
1 parent b9f55fa
commit 4b02440
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 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
@@ -35,6 +35,7 @@ fun TextDotText(
     modifier: Modifier = Modifier,
     color: Color = SwissTransferTheme.colors.secondaryTextColor,
     style: TextStyle = SwissTransferTheme.typography.bodySmallRegular,
+    optionalSecondTextColor: Color? = null,
 ) {
     Row(modifier) {
         CustomText(firstText, color, style)
@@ -45,7 +46,7 @@ fun TextDotText(
             style = style,
         )
         Spacer(Modifier.width(Margin.Mini))
-        CustomText(secondText, color, style)
+        CustomText(secondText, optionalSecondTextColor ?: color, style)
     }
 }
 

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/transfer/TransferItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/transfer/TransferItem.kt
@@ -57,6 +57,18 @@ fun TransferItem(
     val uploadedSize = Formatter.formatShortFileSize(LocalContext.current, transfer.sizeUploaded)
     val files = transfer.files
     val filesCount = files.count()
+    val (expiryText, expiryColor) = when {
+        remainingDays < 0 -> {
+            stringResource(R.string.expiredThe, expirationDate.format(FORMAT_DATE_SIMPLE)) to
+                    SwissTransferTheme.materialColors.error
+        }
+        remainingDownloads == 0 -> {
+            "Transfert expiré (TODO)" to SwissTransferTheme.materialColors.error
+        }
+        else -> {
+            stringResource(R.string.expiresIn, remainingDays) to SwissTransferTheme.colors.secondaryTextColor
+        }
+    }
 
     Card(
         onClick = onClick,
@@ -83,24 +95,8 @@ fun TransferItem(
                 Spacer(modifier = Modifier.height(Margin.Mini))
                 TextDotText(
                     firstText = { uploadedSize },
-                    secondText = {
-
-                        val (text, color) = when {
-                            remainingDays < 0 -> {
-                                stringResource(R.string.expiredThe, expirationDate.format(FORMAT_DATE_SIMPLE)) to
-                                        SwissTransferTheme.materialColors.error
-                            }
-                            remainingDownloads == 0 -> {
-                                "Transfert expiré (TODO)" to SwissTransferTheme.materialColors.error
-                            }
-                            else -> {
-                                stringResource(R.string.expiresIn, remainingDays) to SwissTransferTheme.colors.secondaryTextColor
-                            }
-                        }
-
-                        // TODO: Find a way to also send the color
-                        text to color
-                    },
+                    secondText = { expiryText },
+                    optionalSecondTextColor = expiryColor,
                 )
 
                 Spacer(modifier = Modifier.height(Margin.Mini))