Disable button when it's loading

Infomaniak · Oct 17, 2024 · 4fa5afa · 4fa5afa
1 parent a402761
commit 4fa5afa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/Buttons.kt
@@ -110,7 +110,7 @@ private fun CoreButton(
     onClick: () -> Unit,
     imageVector: ImageVector?,
 ) {
-    val isEnabled by remember { derivedStateOf { enabled() || showIndeterminateProgress() } }
+    val isEnabled by remember { derivedStateOf { enabled() && !showIndeterminateProgress() && progress == null } }
     val buttonColors = style.buttonColors()
 
     Button(
@@ -155,7 +155,7 @@ private fun ButtonTextContent(imageVector: ImageVector?, titleRes: Int, modifier
 
 @Composable
 private fun getProgressSpecs(buttonColors: ButtonColors): Pair<Color, Modifier> {
-    val progressColor = buttonColors.contentColor
+    val progressColor = buttonColors.disabledContentColor
     val progressModifier = Modifier
         .fillMaxHeight(0.8f)
         .aspectRatio(1f)