From cdda24e0fc2ff6fb0a6576486719b066b4d2cc61 Mon Sep 17 00:00:00 2001 From: nazero Date: Sat, 30 Mar 2024 16:17:14 +0900 Subject: [PATCH] Modify color name --- .../accountauth/AccountAuthScreen.kt | 17 +++++++++------- .../accountsetup/AccountSetupScreen.kt | 12 +++++------ .../businessauth/BusinessAuthScreen.kt | 20 +++++++++---------- .../businessauth/SearchStoreScreen.kt | 10 +++++----- .../completesignup/CompleteSignupScreen.kt | 11 ++++++---- .../dialog/BusinessAlertDialog.kt | 8 ++------ .../feature_signup/textfield/AuthTextField.kt | 7 ++----- .../textfield/LinedTextField.kt | 3 --- .../in/koreatech/business/ui/theme/Color.kt | 10 ++++++++++ 9 files changed, 52 insertions(+), 46 deletions(-) diff --git a/business/src/main/java/in/koreatech/business/feature_signup/accountauth/AccountAuthScreen.kt b/business/src/main/java/in/koreatech/business/feature_signup/accountauth/AccountAuthScreen.kt index 7c6374b6e..f9b1db81a 100644 --- a/business/src/main/java/in/koreatech/business/feature_signup/accountauth/AccountAuthScreen.kt +++ b/business/src/main/java/in/koreatech/business/feature_signup/accountauth/AccountAuthScreen.kt @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -30,15 +31,17 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight.Companion.Bold import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import `in`.koreatech.business.R import `in`.koreatech.business.feature_signup.textfield.AuthTextField import `in`.koreatech.business.ui.theme.ColorActiveButton import `in`.koreatech.business.ui.theme.ColorDisabledButton -import `in`.koreatech.business.ui.theme.Gray1 -import `in`.koreatech.business.ui.theme.Gray2 -import `in`.koreatech.business.ui.theme.Orange +import `in`.koreatech.business.ui.theme.ColorUnachieved +import `in`.koreatech.business.ui.theme.ColorDescription +import `in`.koreatech.business.ui.theme.KOIN_ANDROIDTheme +import `in`.koreatech.business.ui.theme.ColorEmphasis import kotlinx.coroutines.delay @Composable @@ -78,7 +81,7 @@ fun AccountAuthScreen(modifier: Modifier = Modifier) { ) { Text( modifier = Modifier, - color = Orange, + color = ColorEmphasis, text = stringResource(id = R.string.account_authentication) ) Text(text = stringResource(id = R.string.two_third)) @@ -89,14 +92,14 @@ fun AccountAuthScreen(modifier: Modifier = Modifier) { .padding(16.dp) ) { drawLine( - color = Gray1, + color = ColorUnachieved, start = Offset(0f - 40, 0f), end = Offset(size.width + 35, size.height), strokeWidth = 4.dp.toPx(), cap = StrokeCap.Round ) drawLine( - color = Orange, + color = ColorEmphasis, start = Offset(0f - 40, 0f), end = Offset((size.width + 40) * 2 / 3, size.height), strokeWidth = 4.dp.toPx(), @@ -120,7 +123,7 @@ fun AccountAuthScreen(modifier: Modifier = Modifier) { Text( text = stringResource(id = R.string.verification_code_prompt), fontSize = 15.sp, - color = Gray2, + color = ColorDescription, ) Spacer(modifier = Modifier.height(38.dp)) diff --git a/business/src/main/java/in/koreatech/business/feature_signup/accountsetup/AccountSetupScreen.kt b/business/src/main/java/in/koreatech/business/feature_signup/accountsetup/AccountSetupScreen.kt index c47342d88..aa382ab02 100644 --- a/business/src/main/java/in/koreatech/business/feature_signup/accountsetup/AccountSetupScreen.kt +++ b/business/src/main/java/in/koreatech/business/feature_signup/accountsetup/AccountSetupScreen.kt @@ -36,9 +36,9 @@ import `in`.koreatech.business.feature_signup.textfield.LinedTextField import `in`.koreatech.business.ui.theme.ColorActiveButton import `in`.koreatech.business.ui.theme.ColorDisabledButton import `in`.koreatech.business.ui.theme.ColorHelper -import `in`.koreatech.business.ui.theme.Gray1 +import `in`.koreatech.business.ui.theme.ColorUnachieved import `in`.koreatech.business.ui.theme.KOIN_ANDROIDTheme -import `in`.koreatech.business.ui.theme.Orange +import `in`.koreatech.business.ui.theme.ColorEmphasis @Composable @@ -80,10 +80,10 @@ fun AccountSetupScreen(modifier: Modifier = Modifier) { ) { Text( modifier = Modifier, - color = Orange, + color = ColorEmphasis, text = stringResource(id = R.string.input_basic_information), ) - Text(text = stringResource(id = R.string.one_third), color = Orange,) + Text(text = stringResource(id = R.string.one_third), color = ColorEmphasis,) } Canvas( modifier = Modifier @@ -91,14 +91,14 @@ fun AccountSetupScreen(modifier: Modifier = Modifier) { .padding(16.dp) ) { drawLine( - color = Gray1, + color = ColorUnachieved, start = Offset(0f - 40, 0f), end = Offset(size.width + 35, size.height), strokeWidth = 4.dp.toPx(), cap = StrokeCap.Round ) drawLine( - color = Orange, + color = ColorEmphasis, start = Offset(0f - 40, 0f), end = Offset((size.width + 40) / 3, size.height), strokeWidth = 4.dp.toPx(), diff --git a/business/src/main/java/in/koreatech/business/feature_signup/businessauth/BusinessAuthScreen.kt b/business/src/main/java/in/koreatech/business/feature_signup/businessauth/BusinessAuthScreen.kt index 37a2af584..b7ebcfd83 100644 --- a/business/src/main/java/in/koreatech/business/feature_signup/businessauth/BusinessAuthScreen.kt +++ b/business/src/main/java/in/koreatech/business/feature_signup/businessauth/BusinessAuthScreen.kt @@ -44,10 +44,10 @@ import `in`.koreatech.business.feature_signup.textfield.LinedTextField import `in`.koreatech.business.ui.theme.ColorActiveButton import `in`.koreatech.business.ui.theme.ColorDisabledButton import `in`.koreatech.business.ui.theme.ColorHelper -import `in`.koreatech.business.ui.theme.Gray2 -import `in`.koreatech.business.ui.theme.Gray3 +import `in`.koreatech.business.ui.theme.ColorDescription +import `in`.koreatech.business.ui.theme.ColorMinor import `in`.koreatech.business.ui.theme.KOIN_ANDROIDTheme -import `in`.koreatech.business.ui.theme.Orange +import `in`.koreatech.business.ui.theme.ColorEmphasis @Composable fun BusinessAuthScreen(modifier: Modifier = Modifier) { @@ -85,10 +85,10 @@ fun BusinessAuthScreen(modifier: Modifier = Modifier) { horizontalArrangement = Arrangement.SpaceBetween ) { Text( - color = Orange, text = stringResource(id = R.string.business_auth) + color = ColorEmphasis, text = stringResource(id = R.string.business_auth) ) Text( - color = Orange, text = stringResource(id = R.string.three_third) + color = ColorEmphasis, text = stringResource(id = R.string.three_third) ) } Canvas( @@ -98,7 +98,7 @@ fun BusinessAuthScreen(modifier: Modifier = Modifier) { ) { drawLine( - color = Orange, + color = ColorEmphasis, start = Offset(0f - 35, 0f), end = Offset(size.width + 35, size.height), strokeWidth = 4.dp.toPx(), @@ -168,7 +168,7 @@ fun BusinessAuthScreen(modifier: Modifier = Modifier) { modifier = Modifier.size(24.dp), painter = painterResource(id = R.drawable.plus_square), contentDescription = stringResource(id = R.string.upload_file_icon), - tint = Orange + tint = ColorEmphasis ) Text( text = stringResource(id = R.string.file_upload_prompt), @@ -179,7 +179,7 @@ fun BusinessAuthScreen(modifier: Modifier = Modifier) { Text( text = stringResource(id = R.string.file_upload_instruction), fontSize = 11.sp, - color = Gray2, + color = ColorDescription, ) } @@ -241,9 +241,9 @@ fun UploadFileList(item: MutableList) { .padding(end = 8.dp), painter = painterResource(id = R.drawable.file_icon), contentDescription = stringResource(id = R.string.file_icon), - tint = Gray3, + tint = ColorMinor, ) - Text(text = "", fontSize = 15.sp, color = Gray3) + Text(text = "", fontSize = 15.sp, color = ColorMinor) } Spacer(modifier = Modifier.width(12.dp)) } diff --git a/business/src/main/java/in/koreatech/business/feature_signup/businessauth/SearchStoreScreen.kt b/business/src/main/java/in/koreatech/business/feature_signup/businessauth/SearchStoreScreen.kt index f5876fb21..f79c6fcec 100644 --- a/business/src/main/java/in/koreatech/business/feature_signup/businessauth/SearchStoreScreen.kt +++ b/business/src/main/java/in/koreatech/business/feature_signup/businessauth/SearchStoreScreen.kt @@ -49,8 +49,8 @@ import androidx.compose.ui.unit.sp import `in`.koreatech.business.R import `in`.koreatech.business.ui.theme.ColorActiveButton import `in`.koreatech.business.ui.theme.ColorHelper -import `in`.koreatech.business.ui.theme.Gray2 -import `in`.koreatech.business.ui.theme.Gray4 +import `in`.koreatech.business.ui.theme.ColorDescription +import `in`.koreatech.business.ui.theme.ColorSearch import `in`.koreatech.business.ui.theme.KOIN_ANDROIDTheme @Composable @@ -107,13 +107,13 @@ fun SearchStoreScreen(modifier: Modifier = Modifier) { colors = TextFieldDefaults.colors( focusedIndicatorColor = Color.Transparent, unfocusedIndicatorColor = Color.Transparent, - unfocusedContainerColor = Gray4, - focusedLabelColor = Gray4, + unfocusedContainerColor = ColorSearch, + focusedLabelColor = ColorSearch, ), placeholder = { Text( text = stringResource(id = R.string.search_shop), - color = Gray2, + color = ColorDescription, fontSize = 13.sp ) }, diff --git a/business/src/main/java/in/koreatech/business/feature_signup/completesignup/CompleteSignupScreen.kt b/business/src/main/java/in/koreatech/business/feature_signup/completesignup/CompleteSignupScreen.kt index 0dd23bb5a..4b0175a30 100644 --- a/business/src/main/java/in/koreatech/business/feature_signup/completesignup/CompleteSignupScreen.kt +++ b/business/src/main/java/in/koreatech/business/feature_signup/completesignup/CompleteSignupScreen.kt @@ -3,6 +3,7 @@ package `in`.koreatech.business.feature_signup.completesignup import androidx.compose.foundation.layout.Arrangement.Center import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -21,13 +22,15 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight.Companion.Bold import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import `in`.koreatech.business.R import `in`.koreatech.business.ui.theme.ColorActiveButton import `in`.koreatech.business.ui.theme.ColorDisabledButton -import `in`.koreatech.business.ui.theme.Gray2 -import `in`.koreatech.business.ui.theme.Orange +import `in`.koreatech.business.ui.theme.ColorDescription +import `in`.koreatech.business.ui.theme.KOIN_ANDROIDTheme +import `in`.koreatech.business.ui.theme.ColorEmphasis @Composable fun CompleteSignupScreen(modifier: Modifier = Modifier) { @@ -55,7 +58,7 @@ fun CompleteSignupScreen(modifier: Modifier = Modifier) { modifier = Modifier.size(55.dp), painter = painterResource(id = R.drawable.signup_check), contentDescription = stringResource(id = R.string.check_icon), - tint = Orange + tint = ColorEmphasis ) Spacer(modifier = Modifier.height(25.dp)) @@ -72,7 +75,7 @@ fun CompleteSignupScreen(modifier: Modifier = Modifier) { textAlign = TextAlign.Center, text = stringResource(id = R.string.signup_request_complete_description), fontSize = 16.sp, - color = Gray2, + color = ColorDescription, ) Spacer(modifier = Modifier.height(51.dp)) diff --git a/business/src/main/java/in/koreatech/business/feature_signup/dialog/BusinessAlertDialog.kt b/business/src/main/java/in/koreatech/business/feature_signup/dialog/BusinessAlertDialog.kt index 54eceb2f3..6b7c45e62 100644 --- a/business/src/main/java/in/koreatech/business/feature_signup/dialog/BusinessAlertDialog.kt +++ b/business/src/main/java/in/koreatech/business/feature_signup/dialog/BusinessAlertDialog.kt @@ -28,7 +28,7 @@ import androidx.compose.ui.window.Dialog import `in`.koreatech.business.R import `in`.koreatech.business.ui.theme.ColorActiveButton import `in`.koreatech.business.ui.theme.ColorDisabledButton -import `in`.koreatech.business.ui.theme.Gray3 +import `in`.koreatech.business.ui.theme.ColorMinor @Composable @@ -88,7 +88,7 @@ fun BusinessAlertDialog( Text( textAlign = TextAlign.Center, text = stringResource(id = R.string.cancel), - color = Gray3, + color = ColorMinor, ) } @@ -115,12 +115,8 @@ fun BusinessAlertDialog( text = positiveButtonText ) } - } - } } - - } } diff --git a/business/src/main/java/in/koreatech/business/feature_signup/textfield/AuthTextField.kt b/business/src/main/java/in/koreatech/business/feature_signup/textfield/AuthTextField.kt index 8f651fdd6..f71f5d149 100644 --- a/business/src/main/java/in/koreatech/business/feature_signup/textfield/AuthTextField.kt +++ b/business/src/main/java/in/koreatech/business/feature_signup/textfield/AuthTextField.kt @@ -26,7 +26,7 @@ import androidx.compose.ui.unit.sp import `in`.koreatech.business.R import `in`.koreatech.business.ui.theme.ColorError import `in`.koreatech.business.ui.theme.ColorHelper -import `in`.koreatech.business.ui.theme.Orange +import `in`.koreatech.business.ui.theme.ColorEmphasis @Composable @@ -64,7 +64,7 @@ fun AuthTextField( ) { drawLine( color = if (value.isEmpty()) ColorHelper else if (isError) ColorError - else Orange, + else ColorEmphasis, start = Offset(0f, size.height), end = Offset(size.width, size.height), strokeWidth = 1.dp.toPx(), @@ -79,10 +79,7 @@ fun AuthTextField( fontSize = 11.sp, color = ColorError ) - } - - } ) } diff --git a/business/src/main/java/in/koreatech/business/feature_signup/textfield/LinedTextField.kt b/business/src/main/java/in/koreatech/business/feature_signup/textfield/LinedTextField.kt index a6d01624c..c12e7a031 100644 --- a/business/src/main/java/in/koreatech/business/feature_signup/textfield/LinedTextField.kt +++ b/business/src/main/java/in/koreatech/business/feature_signup/textfield/LinedTextField.kt @@ -84,10 +84,7 @@ fun LinedTextField( if (isError) Text(text = errorText, fontSize = 11.sp, color = ColorError) } - } - - } ) } diff --git a/business/src/main/java/in/koreatech/business/ui/theme/Color.kt b/business/src/main/java/in/koreatech/business/ui/theme/Color.kt index 7caf3be6d..e31eb0cec 100644 --- a/business/src/main/java/in/koreatech/business/ui/theme/Color.kt +++ b/business/src/main/java/in/koreatech/business/ui/theme/Color.kt @@ -9,3 +9,13 @@ val Pink80 = Color(0xFFEFB8C8) val Purple40 = Color(0xFF6650a4) val PurpleGrey40 = Color(0xFF625b71) val Pink40 = Color(0xFF7D5260) + +val ColorError = Color(0xFFF05D3D) +val ColorHelper = Color(0xFFD2DAE2) +val ColorActiveButton = Color(0xFF175C8E) +val ColorDisabledButton = Color(0xFFC4C4C4) +val ColorEmphasis = Color(0xFFF7941E) +val ColorUnachieved = Color(0xFFF4F4F4) +val ColorDescription = Color(0xFFA1A1A1) +val ColorMinor = Color(0xFF858585) +val ColorSearch = Color(0xFFF6F8F9) \ No newline at end of file