-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feat/#5 week3 #6
base: develop
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
์ํ๊ธฐ๊ฐ์๋ ๊ณผ์ ํ์๋๋ผ ๊ณ ์ ๋ง์ผ์ จ์ด์! ๊ธฐ์กด์ Componentํ๋ฅผ ์ํ์ ์ ๋ญ๊ฐ ๋งํ์์ด ๊ณผ์ ํ์ ๊ฒ ๊ฐ์ ์ ๋ ์์ผ๋ก ๋ณธ๋ฐ์์ผ๊ฒ ๋ค๊ณ ์๊ฐํ ์ฝ๋์์ต๋๋ค..! ์ฝ๋๋ฆฌ๋ทฐ ๋ฐํ์ผ๋ก ์ ์ฝ๋๋ ๋ณด์ํด๋ณด๊ฒ ์ต๋๋น
fun CustomHeader( | ||
startIcon: @Composable (() -> Unit)? = null, | ||
centerContent: @Composable () -> Unit, | ||
endIcon: @Composable (() -> Unit)? = null |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
top bar์ ๋ฐฐ์น๊ฐ ๋ค ๋ฌ๋ผ์ ์ปดํฌ๋ํธํ๋ฅผ ์ํฌ ์ ์์๊น ์๋ฌธ์ด์๋๋ฐ, ์ปดํฌ์ ๋ธํ๊ฒ ๋๋คํจ์๋ฅผ ํตํด ๊ฐ ์์ด์ฝ๊ณผ ์ปจํ ์ธ ๋ฐฐ์น๊ฐ ๊ฐ๋ฅํ๊ตฐ์..! ์ ๊ณ ๋ฏผ์ ํ๋ฒ์ ํด๊ฒฐํด์ค ์ฝ๋์์ต๋๋ค.
placeholderColor: Color = Color(0xFFA5A5A5), | ||
focusedBorderColor: Color = Color(0xFF2F2F2F), | ||
unfocusedBorderColor: Color = Color(0xFF2F2F2F), | ||
errorBorderColor: Color = Color.Red |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
์๋ฌ ์ฒ๋ฆฌ๊น์ง..! ์ ๋ ๋ชฐ๋๋๋ฐ, ์ ๊ฐ ์จ์ด๋ธ ์ฑ์ ์์จ๋ณด๊ณ ํด์ ์ค๋ฅ ํ์๋ฅผ ์ํ๋ค์..ใ ใ ๊ผผ๊ผผํจ์ ์์ง๋ฅผ ๋๋ฆฝ๋๋ค!
@@ -116,7 +120,7 @@ fun LoginScreen(navController: NavController) { | |||
} | |||
|
|||
Spacer(modifier = Modifier.padding(top = 20.dp)) | |||
ThreeTextsWithDividers( | |||
FindIdPwOrSignUp( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
๊ฐ๋ ์ฑ์ด ์ข์ ์ปดํฌ๋ํธ ์ด๋ฆ!
} | ||
|
||
fun isValidEmail(email: String): Boolean { | ||
return Patterns.EMAIL_ADDRESS.matcher(email).matches() | ||
} | ||
|
||
fun isValidPassword(password: String): Boolean { | ||
private fun isValidPassword(password: String): Boolean { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
viewModel ๋ด์์๋ง ์ ์๋๋ ํจ์๋ฅผ ์ ๊ทผ ์ ์ด์๋ก ๋ณ๊ฒฝํ ๊ฒ์ด ์ข์ ๊ฒ ๊ฐ์์
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
๋ฐ์์ จ์ํ ๋ฐ ์ด๋ฒ์ฃผ๋ ๊ณ ์ ๋ง์์ต๋๋ค!! ํญ์ ๋ง์ด ๋ฐฐ์๊ฐ๋๋ค!!
@Composable | ||
fun CustomHeader( | ||
startIcon: @Composable (() -> Unit)? = null, | ||
centerContent: @Composable () -> Unit, | ||
endIcon: @Composable (() -> Unit)? = null |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Compose UI์ null๋ก ์ฌ๋ฌ ์ผ์ด์ค๋ฅผ ๊ณ ๋ คํ์ฌ ์ปดํฌ๋ํธ๋ฅผ ํ ์ ์๊ฒ ๊ตฐ์! ์ ๋ ๋ง์ด ๋ฐฐ์๊ฐ๋๋ค!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
๋ต..! ํด๋ณด๊ธด ํ๋๋ฐ ์ข์ ๋ฐฉ๋ฒ์ธ์ง๋ ์ ๋ชจ๋ฅด๊ฒ ์ด๋ค ใ ใ
fun CustomPwTextField( | ||
value: String, | ||
onValueChange: (String) -> Unit, | ||
modifier: Modifier = Modifier, | ||
placeholder: String, | ||
isError: Boolean = false, | ||
errorMessage: String? = null, | ||
textColor: Color = Color.White, | ||
placeholderColor: Color = Color(0xFFA5A5A5), | ||
focusedBorderColor: Color = Color(0xFF2F2F2F), | ||
unfocusedBorderColor: Color = Color(0xFF2F2F2F), | ||
errorBorderColor: Color = Color.Red | ||
) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CustomPwTextField๋ ๋ง์ ์ ์ ๋ฐฐ์๊ฐ๋๋ค. ์ฌ๋ฌ ์ฌ์ฉ ์ผ์ด์ค์์ ์ธ์๋ณ๋ก ์ด๋ป๊ฒ ์ฒ๋ฆฌํ ์ง ๊ณ ๋ฏผ์ด์๋๋ฐ, ์ด ๋ถ๋ถ ๊ณ ๋ฏผ์ ๋ง๋ํ๊ฒ ํด์๋ฉ๋๋ค.
CustomPwTextField( | ||
value = loginPassword, | ||
onValueChange = { viewModel.updatePassword(it) }, | ||
placeholder = stringResource(R.string.login_setting_password), | ||
modifier = Modifier.padding(vertical = 10.dp) | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
์ ์ธ์ ์ด์ ์ค์ ์ฌ์ฉ๊น์ง ์ง์ง ๊ณต๋ถ ๋ง์ด ๋์ต๋๋ค!
Spacer(modifier = Modifier.padding(top = 30.dp)) | ||
|
||
NavigateToMain { | ||
viewModel.login(userInfo) | ||
} | ||
|
||
LaunchedEffect(isLoginSuccessful) { | ||
isLoginSuccessful?.let { | ||
isLoginSuccessful.let { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ํน์ ?๋ฅผ ๋นผ์ ์ด์ ๊ฐ ์์๊น์? ๊ถ๊ธํฉ๋๋ค!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
๋ทฐ๋ชจ๋ธ์์ ํด๋น isLoginSuccessful์ Boolean ๊ฐ์ผ๋ก ์ค์ ํด์คฌ์ต๋๋ค! ๋์ด์ ๋์ฒดํฌํ ์ด์ ๊ฐ ์ฌ๋ผ์ก๊ธฐ ๋๋ฌธ์ด์์ฉ
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
๊ตฌ๋ฌ๋ฉด let๋ฌธ์ด ์์ด๋ ๋ ๊ฒ ๊ฐ๋ค์.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
3์ฃผ์ฐจ๋ ๋ ๊ณ ์ ๋ง์ผ์
จ์ต๋๋ค!?
์ด๋ฒ์ฃผ๋ ํฌ๊ฒ ๋ณผ ๋ถ๋ถ์ ์์ ๊ฒ ๊ฐ์์! ๊ฐ๋จํ ์ฝ๋ฉํธ๋ง ๋จ๊ฒจ๋์์ด์~!!
@Composable | ||
fun CustomHeader( | ||
startIcon: @Composable (() -> Unit)? = null, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://developer.android.com/develop/ui/compose/components/app-bars
์๊ฑฐ ์ฐธ๊ณ ํด๋ณด๋ ๊ฒ๋? ์ ๋งํ๋ฉด ์ ์ง๋ณด์ ์ฐจ์์ด๋ ํ์ฅ์ฑ ์ฐจ์์์ ์ปค์คํ
๋ทฐ๋ณด๋จ ์๋๋ก์ด๋์์ ์ง์ํ๋ ๊ธฐ๋ณธ ๊ธฐ๋ฅ์ ์ฐ๋๊ฒ ์ข์ต๋๋น
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
์..! ๊ทธ๋ ๊ฒ ๋ค์ ๊ฐ์ฌํฉ๋๋ค ใ ใ
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
๊ณ ์ํ๋์ ~
value: String, | ||
onValueChange: (String) -> Unit, | ||
modifier: Modifier = Modifier, | ||
placeholder: String, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ํ์๊ฐ์ด ๋จผ์ !!! ์ค๊ฒ ํด์ฃผ์ธ์ฉ ~
import androidx.compose.runtime.setValue | ||
|
||
@Composable | ||
fun CustomPwTextField( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
์ธ๋ฏธ๋ ๋ ์ ๊น ๋งํ๋ ๊ฒ์ฒ๋ผ Basicํ ํ
์คํธ ํ๋๋ฅผ ๋ง๋ค๊ณ ์ด๋ฅผ ํตํด์ PwText์ idText๋ฅผ ๋ง๋๋ ๊ฒ๋ ์ข์ ๊ฒ ๊ฐ์์.
๋ฌผ๋ก ์ ๋ต์ ์์ง๋ง ๊ฐ ์ทจ ~
import androidx.compose.runtime.setValue | ||
|
||
@Composable | ||
fun CustomPwTextField( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
์ค์๋ง์ ์ฌ์ฉํด์ ๋ค์ด๋ฐ ํ๊ธฐ๋ณด๋ค๋ ํ์ด์ ์์ฑํ์๋ ๊ฒ์ด ์ข์ต๋๋ค !
๋ฑ ๋ณด๊ณ ์ด๋ค ๊ฐ์ธ์ง ์ ์ ์๊ฒ์!
Spacer(modifier = Modifier.padding(top = 30.dp)) | ||
|
||
NavigateToMain { | ||
viewModel.login(userInfo) | ||
} | ||
|
||
LaunchedEffect(isLoginSuccessful) { | ||
isLoginSuccessful?.let { | ||
isLoginSuccessful.let { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
๊ตฌ๋ฌ๋ฉด let๋ฌธ์ด ์์ด๋ ๋ ๊ฒ ๊ฐ๋ค์.
fun FindIdPwOrSignUp( | ||
modifier: Modifier = Modifier, | ||
text1: String, | ||
text2: String, | ||
text3: String, | ||
findId: String, | ||
reSettingPw: String, | ||
signUp: String, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
์ข๋ค์์ค์ค
Related issue ๐
Work Description โ๏ธ
+ํ ์คํธํ๋ ์ปดํฌ๋ํธ๋ก ๋นผ๋ฉด์ ์ ์ ๋ชปํ๋ ํ์๊ฐ์ ํ์์ ๋ง์ง ์์ผ๋ฉด stroke ๋นจ๊ฐ์์ผ๋ก ๋จ๊ฒ ํ์ต๋๋ค
Screenshot ๐ธ
Screen_recording_20241101_215559.mp4
Uncompleted Tasks ๐
์๋ ์๋ ๋ถ๋ถ๋ค์ ์ปดํฌ๋ํธํ ์งํํ๋๋ฐ
์๋ ์์๋ sticky header๋ถ๋ถ์ ํด๋ณด๊ณ ์ถ์๋๋ฐ ์๋ฃํ์ง ๋ชปํ์ต๋๋ฟ.. ๋ค์์ฃผ์ sticky๊น์ง ๊ฐ์ด ๋ฃ์ด๋ณผ๊ฒ์!
To Reviewers ๐ข
์ปดํฌ๋ํธ ์ฐพ๊ณ ๋ทฐ์ค์ผ์นํ ๋ถ๋ถ์ ์๋ ๋ ธ์ ์ฐธ๊ณ ํด์ฃผ์ธ์!
https://rightful-narwhal-db9.notion.site/3-131037058d208073a5f1c9db0bcb5073?pvs=4