wip Animating button disabling

Infomaniak · Oct 17, 2024 · 22736b1 · 22736b1
1 parent f86afeb
commit 22736b1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 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
@@ -19,9 +19,11 @@ package com.infomaniak.swisstransfer.ui.components
 
 import android.content.res.Configuration
 import androidx.annotation.StringRes
+import androidx.compose.animation.animateColorAsState
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -44,8 +46,9 @@ fun LargeButton(
     enabled: () -> Boolean = { true },
     onClick: () -> Unit,
     imageVector: ImageVector? = null,
+    animatedEnabling: Boolean = false,
 ) {
-    CoreButton(titleRes, modifier, ButtonSize.LARGE, style, enabled, onClick, imageVector)
+    CoreButton(titleRes, modifier, ButtonSize.LARGE, style, enabled, onClick, imageVector, animatedEnabling)
 }
 
 @Composable
@@ -57,7 +60,7 @@ fun SmallButton(
     onClick: () -> Unit,
     imageVector: ImageVector? = null,
 ) {
-    CoreButton(titleRes, modifier, ButtonSize.SMALL, style, enabled, onClick, imageVector)
+    CoreButton(titleRes, modifier, ButtonSize.SMALL, style, enabled, onClick, imageVector, false)
 }
 
 @Composable
@@ -69,12 +72,28 @@ private fun CoreButton(
     enabled: () -> Boolean,
     onClick: () -> Unit,
     imageVector: ImageVector?,
+    animatedEnabling: Boolean,
 ) {
+    val isEnabled = enabled()
+
+    val buttonColors = if (animatedEnabling) {
+        val defaultColors = style.buttonColors()
+        val animatedContainerColor by animateColorAsState(if (isEnabled) defaultColors.containerColor else defaultColors.disabledContainerColor)
+        val animatedContentColor by animateColorAsState(if (isEnabled) defaultColors.contentColor else defaultColors.disabledContentColor)
+
+        ButtonDefaults.buttonColors(
+            containerColor = animatedContainerColor,
+            contentColor = animatedContentColor,
+            disabledContainerColor = animatedContainerColor,
+            disabledContentColor = animatedContentColor,
+        )
+    } else style.buttonColors()
+
     Button(
         modifier = modifier.height(buttonSize.height),
-        colors = style.buttonColors(),
+        colors = buttonColors,
         shape = Shapes.medium,
-        enabled = enabled(),
+        enabled = isEnabled,
         onClick = onClick,
     ) {
         imageVector?.let {
@@ -126,7 +145,7 @@ private fun LargeButtonPreview() {
             Column {
                 ButtonType.entries.forEach {
                     Row {
-                        LargeButton(titleRes = R.string.appName, style = it, imageVector = AppIcons.Add, onClick = {})
+                        LargeButton(titleRes = R.string.appName, style = it, onClick = {}, imageVector = AppIcons.Add)
                         Spacer(modifier = Modifier.width(Margin.Small))
                         SmallButton(titleRes = R.string.appName, style = it, imageVector = AppIcons.Add, onClick = {})
                     }

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferBottomSheet.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/SwissTransferBottomSheet.kt
@@ -127,16 +127,16 @@ private fun BottomSheetDefaultsPreview() {
                 },
                 topButton = {
                     LargeButton(
-                        modifier = it,
                         titleRes = R.string.appName,
+                        modifier = it,
                         style = ButtonType.ERROR,
                         onClick = {},
                     )
                 },
                 bottomButton = {
                     LargeButton(
-                        modifier = it,
                         titleRes = R.string.appName,
+                        modifier = it,
                         style = ButtonType.TERTIARY,
                         onClick = {},
                     )

diff --git a/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt b/.../java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt
@@ -96,6 +96,7 @@ private fun ImportFilesScreen(
                 titleRes = R.string.transferSendButton,
                 style = ButtonType.PRIMARY,
                 enabled = { isSendButtonEnabled },
+                animatedEnabling = true,
                 onClick = { /*TODO*/ },
             )
         },