ANDROID-14001 Fix chevron glitch on button link

Telefonica · Nov 16, 2023 · afced57 · afced57
1 parent 4611eb6
commit afced57
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/library/src/main/java/com/telefonica/mistica/compose/button/Button.kt b/library/src/main/java/com/telefonica/mistica/compose/button/Button.kt
@@ -8,6 +8,7 @@ import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -148,8 +149,6 @@ private fun ButtonContent(
     withChevron: Boolean,
     enabled: Boolean,
 ) {
-    var textHeight by remember { mutableStateOf(0.dp) }
-    val density = LocalDensity.current
     AnimatedVisibility(
         modifier = Modifier.fillMaxHeight(),
         visible = !isLoading,
@@ -170,32 +169,31 @@ private fun ButtonContent(
             }
             Text(
                 modifier = Modifier
-                    .align(Alignment.CenterVertically)
-                    .onGloballyPositioned {
-                        textHeight = with(density) {
-                            it.size.height.toDp()
-                        }
-                    },
+                    .align(Alignment.CenterVertically),
                 text = text,
                 color = textColor,
                 style = size.textStyle,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
             )
             if (withChevron) {
-                Spacer(modifier = Modifier.width(dimensionResource(id = R.dimen.button_chevron_padding)))
-                CompositionLocalProvider(
-                    LocalContentAlpha provides if (enabled) ContentAlpha.high else ContentAlpha.disabled,
+                Box(
+                    modifier = Modifier
+                        .height(IntrinsicSize.Min)
+                        .aspectRatio(CHEVRON_ASPECT_RATIO)
+                        .align(Alignment.CenterVertically)
                 ) {
-                    Image(
-                        painterResource(id = R.drawable.icn_chevron),
-                        null,
-                        modifier = Modifier
-                            .height(textHeight)
-                            .aspectRatio(CHEVRON_ASPECT_RATIO)
-                            .align(Alignment.CenterVertically),
-                        colorFilter = ColorFilter.tint(style.textColor.copy(LocalContentAlpha.current)),
-                    )
+                    Spacer(modifier = Modifier.width(dimensionResource(id = R.dimen.button_chevron_padding)))
+                    CompositionLocalProvider(
+                        LocalContentAlpha provides if (enabled) ContentAlpha.high else ContentAlpha.disabled,
+                    ) {
+                        Image(
+                            painterResource(id = R.drawable.icn_chevron),
+                            null,
+                            modifier = Modifier.align(Alignment.Center),
+                            colorFilter = ColorFilter.tint(style.textColor.copy(LocalContentAlpha.current)),
+                        )
+                    }
                 }
             }
         }