From fb291f634f7d728b0a9e5b7ef67d4557faf3790b Mon Sep 17 00:00:00 2001 From: AllenTom Date: Sat, 12 Oct 2024 10:35:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3ActionButton?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riderpro/ui/composables/ActionButton.kt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/aiosman/riderpro/ui/composables/ActionButton.kt b/app/src/main/java/com/aiosman/riderpro/ui/composables/ActionButton.kt index 0e1f14c..afd4794 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/composables/ActionButton.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/composables/ActionButton.kt @@ -65,12 +65,13 @@ fun ActionButton( modifier = modifier .clip(RoundedCornerShape(24.dp)) .background(animatedBackgroundColor) - .padding(contentPadding) .noRippleClickable { if (enabled && !isLoading) { click() } - }, + } + .padding(contentPadding), + contentAlignment = Alignment.CenterStart ) { if (!isLoading) { @@ -86,15 +87,22 @@ fun ActionButton( }, contentAlignment = Alignment.Center ) { - Box(modifier = Modifier.align(Alignment.CenterStart)){ - leading?.invoke() + Box( + modifier = Modifier.fillMaxWidth(), + contentAlignment = Alignment.CenterStart + ) { + Box(modifier = Modifier.align(Alignment.CenterStart)){ + leading?.invoke() + } } + Text( text, fontSize = 17.sp, color = color, fontWeight = FontWeight.W900, textAlign = if (expandText) TextAlign.Center else TextAlign.Start + ) } }else{