diff --git a/compose/src/main/java/com/yourssu/design/system/compose/atom/SearchTextField.kt b/compose/src/main/java/com/yourssu/design/system/compose/atom/SearchTextField.kt index f4186a6f..fdb9346e 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/atom/SearchTextField.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/atom/SearchTextField.kt @@ -4,7 +4,10 @@ import android.widget.Toast import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsFocusedAsState +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardActions @@ -67,7 +70,8 @@ fun SearchTextField( .background( color = YdsTheme.colors.inputFieldElevated, shape = RoundedCornerShape(8.dp), - ), + ) + .height(40.dp), interactionSource = interactionSource, decorationBox = { innerTextField -> TextFieldDefaults.OutlinedTextFieldDecorationBox( @@ -95,15 +99,15 @@ fun SearchTextField( trailingIcon = { if (isTyping) { YdsBaseButton( - onClick = { - onValueChange("") - }, - colors = ButtonColorState(), + onClick = { onValueChange("") }, + colors = ButtonColorState( + contentColor = YdsTheme.colors.buttonNormal, + disabledContentColor = Color.Transparent + ) ) { Icon( id = R.drawable.ic_x_line, - iconSize = IconSize.ExtraSmall, - tint = YdsTheme.colors.buttonNormal, + iconSize = IconSize.ExtraSmall ) } } @@ -147,19 +151,26 @@ private fun PreviewSearchTextField() { val context = LocalContext.current var text: String by rememberSaveable { mutableStateOf("") } - SearchTextField( - onValueChange = { - text = it - }, - onSearch = { - Toast.makeText( - context, - "onSearch!", - Toast.LENGTH_SHORT, - ).show() - }, - text = text, - placeHolderText = "플레이스 홀더 입니다", - isDisabled = false, - ) + Column( + Modifier + .background(Color.White) + .fillMaxWidth() + ) { + SearchTextField( + onValueChange = { + text = it + }, + onSearch = { + Toast.makeText( + context, + "onSearch!", + Toast.LENGTH_SHORT, + ).show() + }, + text = text, + placeHolderText = "플레이스 홀더 입니다", + isDisabled = false, + modifier = Modifier.fillMaxWidth() + ) + } } \ No newline at end of file diff --git a/compose/src/main/java/com/yourssu/design/system/compose/atom/TopBarButton.kt b/compose/src/main/java/com/yourssu/design/system/compose/atom/TopBarButton.kt index 57a008b2..6ddb3b7e 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/atom/TopBarButton.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/atom/TopBarButton.kt @@ -23,8 +23,8 @@ import com.yourssu.design.system.compose.states.ButtonColorState @Composable fun TopBarButton( - onClick: () -> Unit = {}, modifier: Modifier = Modifier, + onClick: () -> Unit = {}, isDisabled: Boolean = true, text: String = "", @DrawableRes icon: Int? = null, @@ -38,6 +38,8 @@ fun TopBarButton( ), enabled = !isDisabled, rounding = 0.dp, + minWidth = 0.dp, + minHeight = 0.dp, contentPadding = PaddingValues(horizontal = 12.dp), ) { if (icon == null && text.isNotEmpty()) { diff --git a/compose/src/main/java/com/yourssu/design/system/compose/base/YdsBaseButton.kt b/compose/src/main/java/com/yourssu/design/system/compose/base/YdsBaseButton.kt index 68c2407e..b6ca89e4 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/base/YdsBaseButton.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/base/YdsBaseButton.kt @@ -7,9 +7,8 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope -import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember @@ -49,9 +48,7 @@ internal fun YdsBaseButton( Surface( onClick = onClick, - modifier = modifier - .width(minWidth) - .height(minHeight), + modifier = modifier, enabled = enabled, rounding = rounding, color = buttonColors.backgroundColor(enabled).value, @@ -62,6 +59,10 @@ internal fun YdsBaseButton( ProvideTextStyle(value = YdsTheme.typography.button2) { Row( modifier = Modifier + .defaultMinSize( + minWidth = minWidth, + minHeight = minHeight, + ) .padding(contentPadding), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically, diff --git a/compose/src/main/java/com/yourssu/design/system/compose/components/DoubleTitleTopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/DoubleTitleTopBar.kt similarity index 98% rename from compose/src/main/java/com/yourssu/design/system/compose/components/DoubleTitleTopBar.kt rename to compose/src/main/java/com/yourssu/design/system/compose/component/DoubleTitleTopBar.kt index ba313fc3..10466f2d 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/components/DoubleTitleTopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/DoubleTitleTopBar.kt @@ -1,4 +1,4 @@ -package com.yourssu.design.system.compose.components +package com.yourssu.design.system.compose.component import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -22,9 +22,9 @@ import com.yourssu.design.system.compose.base.YdsText @Composable fun DoubleTitleTopBar( + modifier: Modifier = Modifier, title: String = "", subtitle: String = "", - modifier: Modifier = Modifier, actions: @Composable RowScope.() -> Unit = {}, ) { TopAppBar( diff --git a/compose/src/main/java/com/yourssu/design/system/compose/components/SearchTopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/SearchTopBar.kt similarity index 97% rename from compose/src/main/java/com/yourssu/design/system/compose/components/SearchTopBar.kt rename to compose/src/main/java/com/yourssu/design/system/compose/component/SearchTopBar.kt index 2642b04e..aa9cd1a7 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/components/SearchTopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/SearchTopBar.kt @@ -1,4 +1,4 @@ -package com.yourssu.design.system.compose.components +package com.yourssu.design.system.compose.component import android.widget.Toast import androidx.compose.foundation.interaction.MutableInteractionSource @@ -29,9 +29,9 @@ import com.yourssu.design.system.compose.base.YdsScaffold @Composable fun SearchTopBar( + modifier: Modifier = Modifier, text: String = "", placeHolderText: String = "", - modifier: Modifier = Modifier, isDisabled: Boolean = false, onValueChange: (String) -> Unit, onSearch: () -> Unit, @@ -65,6 +65,7 @@ fun SearchTopBar( interactionSource = interactionSource, modifier = Modifier .padding(start = 4.dp, end = 16.dp) + .fillMaxWidth() .align(alignment = CenterVertically), ) } diff --git a/compose/src/main/java/com/yourssu/design/system/compose/components/SingleTitleTopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/SingleTitleTopBar.kt similarity index 93% rename from compose/src/main/java/com/yourssu/design/system/compose/components/SingleTitleTopBar.kt rename to compose/src/main/java/com/yourssu/design/system/compose/component/SingleTitleTopBar.kt index 842898ae..43957579 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/components/SingleTitleTopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/SingleTitleTopBar.kt @@ -1,4 +1,4 @@ -package com.yourssu.design.system.compose.components +package com.yourssu.design.system.compose.component import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues @@ -9,13 +9,10 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentHeight -import androidx.compose.foundation.layout.wrapContentSize -import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.yourssu.design.system.compose.R @@ -26,8 +23,8 @@ import com.yourssu.design.system.compose.base.YdsText @Composable fun SingleTitleTopBar( - title: String = "", modifier: Modifier = Modifier, + title: String = "", actions: @Composable RowScope.() -> Unit = {}, ) { TopAppBar( diff --git a/compose/src/main/java/com/yourssu/design/system/compose/components/TopBar.kt b/compose/src/main/java/com/yourssu/design/system/compose/component/TopBar.kt similarity index 96% rename from compose/src/main/java/com/yourssu/design/system/compose/components/TopBar.kt rename to compose/src/main/java/com/yourssu/design/system/compose/component/TopBar.kt index 3dbd398f..0ba4953c 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/components/TopBar.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/component/TopBar.kt @@ -1,4 +1,4 @@ -package com.yourssu.design.system.compose.components +package com.yourssu.design.system.compose.component import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues @@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -23,8 +22,8 @@ import com.yourssu.design.system.compose.base.YdsText @Composable fun TopBar( - title: String = "", modifier: Modifier = Modifier, + title: String = "", navigationIcon: @Composable () -> Unit = {}, actions: @Composable RowScope.() -> Unit = {}, ) {