From 4d60166fa1be904bf17cc0572914d9c83abf74f1 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Sat, 24 Aug 2024 11:22:56 +0700 Subject: [PATCH] style: Adjust LoadingButton styling --- .../presentation/component/LoadingButton.kt | 4 +--- .../component/LoadingButtonComposeView.kt | 16 +++++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/yokai/presentation/component/LoadingButton.kt b/app/src/main/java/yokai/presentation/component/LoadingButton.kt index 7868757108..b04bbc178e 100644 --- a/app/src/main/java/yokai/presentation/component/LoadingButton.kt +++ b/app/src/main/java/yokai/presentation/component/LoadingButton.kt @@ -40,7 +40,6 @@ fun LoadingButton( text: () -> String, loading: () -> Boolean, onClick: () -> Unit, - modifier: Modifier = Modifier, ) { val transition = updateTransition( targetState = loading(), @@ -57,7 +56,7 @@ fun LoadingButton( ) Button( onClick = onClick, - modifier = modifier.defaultMinSize(minWidth = 1.dp), + modifier = Modifier.defaultMinSize(minWidth = 1.dp), contentPadding = PaddingValues( horizontal = horizontalContentPadding, vertical = 8.dp, @@ -145,7 +144,6 @@ private fun LoadingButtonPreview() { contentAlignment = Alignment.Center, ) { LoadingButton( - modifier = Modifier.fillMaxWidth(), text = { "Test" }, loading = { false }, onClick = {}, diff --git a/app/src/main/java/yokai/presentation/component/LoadingButtonComposeView.kt b/app/src/main/java/yokai/presentation/component/LoadingButtonComposeView.kt index 02313df144..949c5b6993 100644 --- a/app/src/main/java/yokai/presentation/component/LoadingButtonComposeView.kt +++ b/app/src/main/java/yokai/presentation/component/LoadingButtonComposeView.kt @@ -4,11 +4,13 @@ import android.content.Context import android.util.AttributeSet import android.view.Gravity import android.widget.FrameLayout +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.AbstractComposeView import androidx.compose.ui.platform.ViewCompositionStrategy @@ -50,12 +52,16 @@ class LoadingButtonComposeView @JvmOverloads constructor( @Composable override fun Content() { YokaiTheme { - LoadingButton( + Box( modifier = Modifier.fillMaxWidth(), - text = { text }, - loading = { isLoading }, - onClick = onClick, - ) + contentAlignment = Alignment.Center, + ) { + LoadingButton( + text = { text }, + loading = { isLoading }, + onClick = onClick, + ) + } } } }