Skip to content
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

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Feat/#5 week3 #6

wants to merge 4 commits into from

Conversation

hyoeunjoo
Copy link
Collaborator

@hyoeunjoo hyoeunjoo commented Nov 1, 2024

Related issue ๐Ÿ› 

Work Description โœ๏ธ

  • ๊ณตํ†ต ์ปดํฌ๋„ŒํŠธ ์ฐพ๊ธฐ
  • ๋ทฐ ์Šค์ผ€์น˜ ๋ฐ ๊ฐ ํ™”๋ฉด ์ปดํฌ๋„ŒํŠธํ™”
  • UI ๋กœ์ง ์„ค๊ณ„
  • ๊ณตํ†ต๋˜๋Š” ๋กœ์ง ํ™•์žฅํ•จ์ˆ˜ํ™”
  • ๊ฐœ๋ฐœ ์ง„ํ–‰

+ํ…์ŠคํŠธํ•„๋“œ ์ปดํฌ๋„ŒํŠธ๋กœ ๋นผ๋ฉด์„œ ์ „์— ๋ชปํ–ˆ๋˜ ํšŒ์›๊ฐ€์ž… ํ˜•์‹์— ๋งž์ง€ ์•Š์œผ๋ฉด stroke ๋นจ๊ฐ„์ƒ‰์œผ๋กœ ๋œจ๊ฒŒ ํ–ˆ์Šต๋‹ˆ๋‹ค

Screenshot ๐Ÿ“ธ

Screen_recording_20241101_215559.mp4

Uncompleted Tasks ๐Ÿ˜…

์›๋ž˜ ์žˆ๋˜ ๋ถ€๋ถ„๋“ค์€ ์ปดํฌ๋„ŒํŠธํ™” ์ง„ํ–‰ํ–ˆ๋Š”๋ฐ
์›๋ž˜ ์—†์—ˆ๋˜ sticky header๋ถ€๋ถ„์€ ํ•ด๋ณด๊ณ ์‹ถ์—ˆ๋Š”๋ฐ ์™„๋ฃŒํ•˜์ง€ ๋ชปํ–ˆ์Šต๋‹ˆ๋‹ฟ.. ๋‹ค์Œ์ฃผ์— sticky๊นŒ์ง€ ๊ฐ™์ด ๋„ฃ์–ด๋ณผ๊ฒŒ์š”!

To Reviewers ๐Ÿ“ข

์ปดํฌ๋„ŒํŠธ ์ฐพ๊ณ  ๋ทฐ์Šค์ผ€์น˜ํ•œ ๋ถ€๋ถ„์€ ์•„๋ž˜ ๋…ธ์…˜ ์ฐธ๊ณ ํ•ด์ฃผ์„ธ์š”!
https://rightful-narwhal-db9.notion.site/3-131037058d208073a5f1c9db0bcb5073?pvs=4

Copy link

@imtaejugkim imtaejugkim left a 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

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

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(

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 {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

viewModel ๋‚ด์—์„œ๋งŒ ์ •์˜๋˜๋Š” ํ•จ์ˆ˜๋ฅผ ์ ‘๊ทผ ์ œ์–ด์ž๋กœ ๋ณ€๊ฒฝํ•œ ๊ฒƒ์ด ์ข‹์€ ๊ฒƒ ๊ฐ™์•„์š”

Copy link

@sayyyho sayyyho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๋ฐ”์˜์…จ์„ํ…๋ฐ ์ด๋ฒˆ์ฃผ๋„ ๊ณ ์ƒ ๋งŽ์•˜์Šต๋‹ˆ๋‹ค!! ํ•ญ์ƒ ๋งŽ์ด ๋ฐฐ์›Œ๊ฐ‘๋‹ˆ๋‹ค!!

Comment on lines +13 to +17
@Composable
fun CustomHeader(
startIcon: @Composable (() -> Unit)? = null,
centerContent: @Composable () -> Unit,
endIcon: @Composable (() -> Unit)? = null
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compose UI์™€ null๋กœ ์—ฌ๋Ÿฌ ์ผ€์ด์Šค๋ฅผ ๊ณ ๋ คํ•˜์—ฌ ์ปดํฌ๋„ŒํŠธ๋ฅผ ํ•  ์ˆ˜ ์žˆ๊ฒ ๊ตฐ์š”! ์ €๋„ ๋งŽ์ด ๋ฐฐ์›Œ๊ฐ‘๋‹ˆ๋‹ค!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๋„ต..! ํ•ด๋ณด๊ธด ํ–ˆ๋Š”๋ฐ ์ข‹์€ ๋ฐฉ๋ฒ•์ธ์ง€๋Š” ์ž˜ ๋ชจ๋ฅด๊ฒ ์Šด๋‹ค ใ…Žใ…Ž

Comment on lines +28 to +40
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
) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CustomPwTextField๋„ ๋งŽ์€ ์ ์„ ๋ฐฐ์›Œ๊ฐ‘๋‹ˆ๋‹ค. ์—ฌ๋Ÿฌ ์‚ฌ์šฉ ์ผ€์ด์Šค์—์„œ ์ธ์ž๋ณ„๋กœ ์–ด๋–ป๊ฒŒ ์ฒ˜๋ฆฌํ•  ์ง€ ๊ณ ๋ฏผ์ด์—ˆ๋Š”๋ฐ, ์ด ๋ถ€๋ถ„ ๊ณ ๋ฏผ์€ ๋ง๋”ํ•˜๊ฒŒ ํ•ด์†Œ๋ฉ๋‹ˆ๋‹ค.

Comment on lines +95 to +100
CustomPwTextField(
value = loginPassword,
onValueChange = { viewModel.updatePassword(it) },
placeholder = stringResource(R.string.login_setting_password),
modifier = Modifier.padding(vertical = 10.dp)
)
Copy link

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 {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ํ˜น์‹œ ?๋ฅผ ๋นผ์‹  ์ด์œ ๊ฐ€ ์žˆ์„๊นŒ์š”? ๊ถ๊ธˆํ•ฉ๋‹ˆ๋‹ค!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๋ทฐ๋ชจ๋ธ์—์„œ ํ•ด๋‹น isLoginSuccessful์„ Boolean ๊ฐ’์œผ๋กœ ์„ค์ •ํ•ด์คฌ์Šต๋‹ˆ๋‹ค! ๋”์ด์ƒ ๋„์ฒดํฌํ•  ์ด์œ ๊ฐ€ ์‚ฌ๋ผ์กŒ๊ธฐ ๋•Œ๋ฌธ์ด์—์šฉ

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๊ตฌ๋Ÿฌ๋ฉด let๋ฌธ์ด ์—†์–ด๋„ ๋  ๊ฒƒ ๊ฐ™๋„ค์š”.

Copy link

@kez-lab kez-lab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3์ฃผ์ฐจ๋„ ๋„˜ ๊ณ ์ƒ ๋งŽ์œผ์…จ์Šต๋‹ˆ๋‹ค!?
์ด๋ฒˆ์ฃผ๋Š” ํฌ๊ฒŒ ๋ณผ ๋ถ€๋ถ„์€ ์—†์„ ๊ฒƒ ๊ฐ™์•„์„œ! ๊ฐ„๋‹จํžˆ ์ฝ”๋ฉ˜ํŠธ๋งŒ ๋‚จ๊ฒจ๋‘์—ˆ์–ด์š”~!!

Comment on lines +13 to +15
@Composable
fun CustomHeader(
startIcon: @Composable (() -> Unit)? = null,
Copy link

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
์š”๊ฑฐ ์ฐธ๊ณ ํ•ด๋ณด๋Š” ๊ฒƒ๋„? ์™ ๋งŒํ•˜๋ฉด ์œ ์ง€๋ณด์ˆ˜ ์ฐจ์›์ด๋‚˜ ํ™•์žฅ์„ฑ ์ฐจ์›์—์„œ ์ปค์Šคํ…€๋ทฐ๋ณด๋‹จ ์•ˆ๋“œ๋กœ์ด๋“œ์—์„œ ์ง€์›ํ•˜๋Š” ๊ธฐ๋ณธ ๊ธฐ๋Šฅ์„ ์“ฐ๋Š”๊ฒŒ ์ข‹์Šต๋‹ˆ๋‹น

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์•„..! ๊ทธ๋ ‡๊ฒ ๋„ค์š” ๊ฐ์‚ฌํ•ฉ๋‹ˆ๋‹ค ใ…Žใ…Ž

Copy link
Contributor

@jihyunniiii jihyunniiii left a 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,
Copy link
Contributor

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(
Copy link
Contributor

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(
Copy link
Contributor

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 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๊ตฌ๋Ÿฌ๋ฉด let๋ฌธ์ด ์—†์–ด๋„ ๋  ๊ฒƒ ๊ฐ™๋„ค์š”.

Comment on lines +159 to +163
fun FindIdPwOrSignUp(
modifier: Modifier = Modifier,
text1: String,
text2: String,
text3: String,
findId: String,
reSettingPw: String,
signUp: String,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์ข‹๋„ค์š”์˜ค์˜ค

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEAT] 3์ฃผ์ฐจ ๊ณผ์ œ ๊ตฌํ˜„
5 participants