diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderCreateScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderCreateScreen.kt index 2a407133..335ed7f7 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderCreateScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderCreateScreen.kt @@ -107,7 +107,7 @@ private fun FolderCreateScreen( .background(DayoTheme.colorScheme.background) .fillMaxSize() .padding(contentPadding) - .padding(horizontal = 18.dp, vertical = 16.dp), + .padding(horizontal = 20.dp, vertical = 16.dp), horizontalAlignment = Alignment.CenterHorizontally ) { DayoTextField( @@ -143,7 +143,10 @@ private fun FolderCreateScreen( ToggleButtonWithLabel( label = stringResource(R.string.write_post_folder_new_folder_privacy_title), isToggled = privacy.value == Privacy.ONLY_ME, - onToggleChanged = { privacy.value = if (it) Privacy.ONLY_ME else Privacy.ALL } + onToggleChanged = { privacy.value = if (it) Privacy.ONLY_ME else Privacy.ALL }, + modifier = Modifier + .fillMaxWidth() + .align(Alignment.End), ) } } diff --git a/presentation/src/main/java/daily/dayo/presentation/view/Switch.kt b/presentation/src/main/java/daily/dayo/presentation/view/Switch.kt index 9578b159..e8beb9ce 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/Switch.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/Switch.kt @@ -3,10 +3,7 @@ package daily.dayo.presentation.view import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width -import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.material.Text import androidx.compose.material3.Switch import androidx.compose.material3.SwitchDefaults @@ -24,15 +21,13 @@ import daily.dayo.presentation.theme.White_FFFFFF fun ToggleButtonWithLabel( label: String, isToggled: Boolean, - onToggleChanged: (Boolean) -> Unit + onToggleChanged: (Boolean) -> Unit, + modifier: Modifier = Modifier ) { Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.End, - modifier = Modifier - .padding(18.dp) - .fillMaxWidth() - .wrapContentHeight() + modifier = modifier ) { Text( text = label, diff --git a/presentation/src/main/java/daily/dayo/presentation/view/TextField.kt b/presentation/src/main/java/daily/dayo/presentation/view/TextField.kt index 3356c721..be35c50c 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/TextField.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/TextField.kt @@ -53,6 +53,7 @@ import daily.dayo.presentation.common.TextLimitUtil import daily.dayo.presentation.theme.Dark import daily.dayo.presentation.theme.DayoTheme import daily.dayo.presentation.theme.Gray2_767B83 +import daily.dayo.presentation.theme.Gray3_9FA5AE import daily.dayo.presentation.theme.Gray4_C5CAD2 import daily.dayo.presentation.theme.Gray5_E8EAEE import daily.dayo.presentation.theme.Gray6_F0F1F3 @@ -90,7 +91,7 @@ fun DayoTextField( Text( text = label, style = DayoTheme.typography.caption3.copy( - color = Gray4_C5CAD2, + color = Gray3_9FA5AE, fontWeight = FontWeight.SemiBold ) ) @@ -143,7 +144,7 @@ fun DayoTextField( errorContainerColor = Color.Transparent, focusedContainerColor = Color.Transparent, unfocusedLabelColor = Color.Transparent, // 라벨 - focusedLabelColor = Gray4_C5CAD2, + focusedLabelColor = Gray3_9FA5AE, errorLabelColor = Red_FF4545, focusedPlaceholderColor = Gray5_E8EAEE, // 힌트 unfocusedPlaceholderColor = Gray5_E8EAEE, @@ -224,7 +225,7 @@ fun DayoPasswordTextField( Text( text = label, style = DayoTheme.typography.caption3.copy( - color = Gray4_C5CAD2, + color = Gray3_9FA5AE, fontWeight = FontWeight.SemiBold ) ) @@ -278,7 +279,7 @@ fun DayoPasswordTextField( errorContainerColor = Color.Transparent, focusedContainerColor = Color.Transparent, unfocusedLabelColor = Color.Transparent, // 라벨 - focusedLabelColor = Gray4_C5CAD2, + focusedLabelColor = Gray3_9FA5AE, errorLabelColor = Red_FF4545, focusedPlaceholderColor = Gray5_E8EAEE, // 힌트 unfocusedPlaceholderColor = Gray5_E8EAEE, @@ -355,7 +356,7 @@ fun DayoTimerTextField( isError: Boolean = false, errorMessage: String = "", timeOutErrorMessage: String = stringResource(id = R.string.email_address_certificate_alert_message_time_fail), - labelColor: Color = Gray4_C5CAD2, + labelColor: Color = Gray3_9FA5AE, onTimeOut: (() -> Unit) = { }, textAlign: TextAlign = TextAlign.Left, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, @@ -437,7 +438,7 @@ fun DayoTimerTextField( errorContainerColor = Color.Transparent, focusedContainerColor = Color.Transparent, unfocusedLabelColor = Color.Transparent, // 라벨 - focusedLabelColor = Gray4_C5CAD2, + focusedLabelColor = Gray3_9FA5AE, errorLabelColor = Red_FF4545, focusedPlaceholderColor = Gray5_E8EAEE, // 힌트 unfocusedPlaceholderColor = Gray5_E8EAEE,