Skip to content

Commit

Permalink
ui/#8: SignUp screen에 hobby TextField 추가
Browse files Browse the repository at this point in the history
WavveActionTextField에서도 키보드 옵션 인자 추가
  • Loading branch information
kangyein9892 committed Nov 15, 2024
1 parent 9fcd32e commit 20ceb45
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,17 @@ fun WavveActionTextField(
hint: String,
onValueChange: (String) -> Unit,
modifier: Modifier = Modifier,
keyboardOptions: KeyboardOptions = KeyboardOptions(
imeAction = ImeAction.Done
)
){
var isShowPassword by remember { mutableStateOf(false) }

WavveTextField(
value = value,
hint = hint,
onValueChange = onValueChange,
keyboardOptions = KeyboardOptions(
imeAction = ImeAction.Done
),
keyboardOptions = keyboardOptions,
visualTransformation = if (isShowPassword) VisualTransformation.None else PasswordVisualTransformation(),
actionButton = {
Text(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,28 @@ fun SignUpScreen(
value = state.password,
hint = stringResource(R.string.signup_password_hint),
onValueChange = { viewModel.updatePassword(it) },
modifier = Modifier.padding(horizontal = 8.dp)
modifier = Modifier.padding(horizontal = 8.dp),
keyboardOptions = KeyboardOptions(
imeAction = ImeAction.Next
)
)

InfoWithText(R.string.signup_password_guide)

Spacer(modifier = Modifier.height(12.dp))

WavveTextField(
value = state.hobby,
hint = stringResource(R.string.signup_hobby_hint),
onValueChange = { viewModel.updateHobby(it) },
modifier = Modifier.padding(horizontal = 8.dp),
keyboardOptions = KeyboardOptions(
imeAction = ImeAction.Done
)
)

InfoWithText(R.string.signup_hobby_guide)

Spacer(modifier = Modifier.padding(32.dp))

DividerWithText(
Expand Down
8 changes: 5 additions & 3 deletions presentation/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@

<string name="signup_top_bar_title">회원가입</string>
<string name="signup_intro_text">이메일과 비밀번호만으로\nWavve를 즐길 수 있어요!</string>
<string name="signup_login_hint">[email protected]</string>
<string name="signup_login_guide">로그인, 비밀번호 찾기, 알림에 사용되니 정확한 이메일을 입력해주세요.</string>
<string name="signup_login_hint">Wavve 사용자 이름 설정</string>
<string name="signup_login_guide">사용자 이름을 8자까지 입력해주세요.</string>
<string name="signup_password_hint">Wavve 비밀번호 설정</string>
<string name="signup_password_guide">비밀번호는 8~20자 이내로 영문 대소문자, 숫자, 특수문자 중 3가지 이상 혼용하여 입력해 주세요.</string>
<string name="signup_password_guide">비밀번호는 8자까지 입력해 주세요.</string>
<string name="signup_hobby_hint">Wavve 사용자 취미 설정</string>
<string name="signup_hobby_guide">사용자 취미는 8자까지 입력해주세요.</string>
<string name="signup_other_service_text">또는 다른 서비스 계정으로 가입</string>
<string name="signup_other_service_guide">"SNS계정을 간편하게 가입하여 서비스를 이용하실 수 있습니다. 기\n존 POOQ 계정 또는 Wavve 계정과는 연동되지 않으니 이용에 참고\n하세요."</string>
<string name="signup_button_text">wavve 회원가입</string>
Expand Down

0 comments on commit 20ceb45

Please sign in to comment.