From 9381d70b76ea242633fe8ace82a39d3a7c631c15 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Fri, 19 Jul 2024 23:46:13 +0900 Subject: [PATCH] =?UTF-8?q?[FIX/#167]=20=ED=82=A4=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=EB=B0=8F=20=EC=8A=A4=ED=83=9D=20=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/textfield/SearchTextField.kt | 1 - .../filtering/starthome/StartHomeScreen.kt | 31 +++++++++---------- .../onboarding/signup/SignUpViewModel.kt | 10 +++--- feature/src/main/res/values/strings.xml | 1 + 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt b/core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt index 79aab22a8..c5aa71711 100644 --- a/core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt +++ b/core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt @@ -43,7 +43,6 @@ fun SearchTextField( readOnly = readOnly, onSearchAction = { if (text.isNotBlank()) { - keyboardController?.hide() keyboardController?.hide() focusManager.clearFocus() onSearchAction() diff --git a/feature/src/main/java/com/terning/feature/filtering/starthome/StartHomeScreen.kt b/feature/src/main/java/com/terning/feature/filtering/starthome/StartHomeScreen.kt index e117e44bf..8b7a9560b 100644 --- a/feature/src/main/java/com/terning/feature/filtering/starthome/StartHomeScreen.kt +++ b/feature/src/main/java/com/terning/feature/filtering/starthome/StartHomeScreen.kt @@ -2,7 +2,6 @@ package com.terning.feature.filtering.starthome import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn -import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -11,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -22,28 +20,21 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalConfiguration -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.navigation.NavController import androidx.navigation.NavOptions import androidx.navigation.compose.rememberNavController -import com.airbnb.lottie.Lottie import com.airbnb.lottie.compose.LottieAnimation import com.airbnb.lottie.compose.LottieCompositionSpec import com.airbnb.lottie.compose.LottieConstants -import com.airbnb.lottie.compose.rememberLottieAnimatable import com.airbnb.lottie.compose.rememberLottieComposition import com.terning.core.designsystem.component.button.RectangleButton -import com.terning.core.designsystem.theme.TerningPointTheme import com.terning.core.designsystem.theme.TerningTheme import com.terning.feature.R -import com.terning.feature.filtering.starthome.navigation.StartHome import com.terning.feature.home.home.navigation.navigateHome import com.terning.feature.onboarding.signin.navigation.SignIn -import com.terning.feature.onboarding.splash.navigation.Splash import kotlinx.coroutines.delay @Composable @@ -91,12 +82,14 @@ fun StartHomeScreen( style = TerningTheme.typography.button0, paddingVertical = 20.dp, text = R.string.start_home_next_button, - onButtonClick = { navController.navigateHome( - navOptions = NavOptions.Builder().setPopUpTo( - route = SignIn, - inclusive = true - ).build() - ) }, + onButtonClick = { + navController.navigateHome( + navOptions = NavOptions.Builder().setPopUpTo( + route = SignIn, + inclusive = true + ).build() + ) + }, ) } } @@ -111,10 +104,14 @@ fun StartHomeLottieAnimation( LottieAnimation( modifier = modifier .fillMaxWidth() - .aspectRatio((lottieComposition?.bounds?.width()?.toFloat()?:1f) / (lottieComposition?.bounds?.height()?:1)) + .aspectRatio( + (lottieComposition?.bounds + ?.width() + ?.toFloat() + ?: 1f) / (lottieComposition?.bounds?.height() ?: 1) + ) .padding(horizontal = 24.dp), composition = lottieComposition, iterations = LottieConstants.IterateForever ) } - diff --git a/feature/src/main/java/com/terning/feature/onboarding/signup/SignUpViewModel.kt b/feature/src/main/java/com/terning/feature/onboarding/signup/SignUpViewModel.kt index 86a944511..dc8c4b37a 100644 --- a/feature/src/main/java/com/terning/feature/onboarding/signup/SignUpViewModel.kt +++ b/feature/src/main/java/com/terning/feature/onboarding/signup/SignUpViewModel.kt @@ -62,10 +62,10 @@ class SignUpViewModel @Inject constructor( outOfBoundName -> _state.value = _state.value.copy( name = trimmedName, - drawLineColor = Grey500, - helper = R.string.sign_up_helper, - helperIcon = null, - helperColor = Grey400, + drawLineColor =WarningRed, + helper = R.string.sign_up_helper_out, + helperIcon = R.drawable.ic_sign_up_error, + helperColor = WarningRed, isButtonValid = false ) @@ -114,7 +114,7 @@ class SignUpViewModel @Inject constructor( } companion object { - const val NAME_ERROR = "[!@#\$%^&*(),.?\":{}|<>\\[\\]\\\\/]" + const val NAME_ERROR = "[!@#\$%^&*(),.?\":{}|<>\\[\\]\\\\/\\-=+~`\\p{S}\\p{P}]" private const val MAX_LENGTH = 12 private const val KAKA0 = "KAKAO" } diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml index 35e11fc38..b99d06656 100644 --- a/feature/src/main/res/values/strings.xml +++ b/feature/src/main/res/values/strings.xml @@ -26,6 +26,7 @@ 12자리 이내, 문자/숫자 가능, 특수문자/기호 입력불가 이름에 특수문자는 입력할 수 없어요 사용 가능한 이름이에요 + 이름은 12자리 이내로 설정해 주세요 관심있는 인턴 공고 키워드를 검색해 보세요