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

Feature/jaino/#140 #146

Merged
merged 3 commits into from
Mar 4, 2024
Merged

Feature/jaino/#140 #146

merged 3 commits into from
Mar 4, 2024

Conversation

jeongjaino
Copy link
Member

@jeongjaino jeongjaino commented Mar 2, 2024

1. ๐Ÿ“„ ๊ด€๋ จ๋œ ์ด์Šˆ ๋ฐ ์†Œ๊ฐœ

#140 ์„ค๋ฌธ ๊ด€๋ฆฌ ํŽ˜์ด์ง€ UI ๊ฐœ์„  ๋ฐ Dummy Data ์†Œ๊ฑฐ

2. ๐Ÿ”ฅ ๋ณ€๊ฒฝ๋œ ์ 

  1. ์„ค๋ฌธ ๋ชจ๋ธ์ด ๋งคํ•‘๋˜๋Š” ํ–‰์‚ฌ ์ •๋ณด๊ฐ€, ๋”๋ฏธ ๋ฐ์ดํ„ฐ์—์„œ ์‹ค์ œ ํ–‰์‚ฌ ์ •๋ณด๋กœ ๋ณ€๊ฒฝ๋˜์—ˆ์Šต๋‹ˆ๋‹ค
  2. UI๋ฅผ ๊ฐœ์„ ํ–ˆ์Šต๋‹ˆ๋‹ค. ํ”ผ๊ทธ๋งˆ ๋งํฌ
  3. SurveyFormItemCard์™€ (surveySurveyItemCard์˜ ๋””์ž์ธ์„ ํ†ต์ผํ–ˆ์Šต๋‹ˆ๋‹ค (๊ธ€์ž ํฌ๊ธฐ, ์ƒ‰์ƒ, ๋ฐฐ์น˜)

3. โœ… ๊ผญ ํ™•์ธํ•ด์คฌ์œผ๋ฉด ํ•˜๋Š” ๋ถ€๋ถ„

ํ”ผ๊ทธ๋งˆ์— ์„ค๋ฌธ ์ •๋ ฌ ๋ฐ ๊ฒ€์ƒ‰ ๊ธฐ๋Šฅ์ด ํฌํ•จ๋œ ๋””์ž์ธ์œผ๋กœ ๋งŒ๋“ค์–ด๋†จ๋Š”๋ฐ
ํ”ผ๊ทธ๋งˆ ๋‚ด ์ฝ”๋ฉ˜ํŠธ ํ™•์ธ ๋ถ€ํƒ๋“œ๋ฆฝ๋‹ˆ๋‹ค !

(ํ˜„์žฌ ์ด์Šˆ์™€ ๋ณ„๊ฐœ์˜ ๊ธฐ๋Šฅ์ด๋ผ์„œ ๋”ฐ๋กœ ์ •๋ ฌ ๋ฒ„ํŠผ์„ ๊ตฌํ˜„ํ•˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค.)

4. ๐Ÿ“ธ ์Šคํฌ๋ฆฐ์ƒท(์„ ํƒ)

์ด์ „ ์„ค๋ฌธ ํ™•์ธ ๋””์ž์ธ
image

๊ตฌํ˜„ ๋””์ž์ธ
image

ํ”ผ๊ทธ๋งˆ ๋””์ž์ธ
image

5. ๐Ÿ’ก์•Œ๊ฒŒ๋œ ํ˜น์€ ๊ถ๊ธˆํ•œ ์‚ฌํ•ญ๋“ค

Compose Text ์†์„ฑ์ค‘ OverFlow๋ฅผ ํ™œ์šฉํ•˜๋ฉด ๊ธ€์ž๊ฐ€ ๋„˜๊ฒผ์„ ๋•Œ ...์œผ๋กœ ์ฒ˜๋ฆฌํ•  ์ˆ˜ ์žˆ๋‹ค.
Compose Text Overflow

@jeongjaino jeongjaino added ๐Ÿš€์ง„ํ˜ธ๐Ÿš€ ESTP ์ •์ง„ํ˜ธ 23์„ธ ๐ŸŒฑ๊ธฐ๋Šฅ๐ŸŒฑ ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ๋‘๋‘๋‘ฅ์žฅ! ๐ŸŽจ์œ ์•„์ด๐ŸŽจ ํ”ผ๊ทธ๋งˆ, ์—‘์„ธ๋ฉœ, ์ปดํฌ์ฆˆ ์œ ์•„์ด/์œ ์—‘์Šค ์ž‘์—… ๐Ÿ”ฅ๋ฆฌ๋ทฐ ๊ธฐ๋‹ค๋ฆฌ๋Š” ์ค‘๐Ÿ”ฅ PR์„ ์˜ฌ๋ฆฌ๊ณ  ์ฝ”๋“œ๋ฆฌ๋ทฐ๋ฅผ ๊ธฐ๋‹ค๋ฆฌ๊ณ  ์žˆ๋Š” ์ƒํƒœ์ž…๋‹ˆ๋‹ค. labels Mar 2, 2024
@jeongjaino jeongjaino self-assigned this Mar 2, 2024
Copy link
Member

@tgyuuAn tgyuuAn left a comment

Choose a reason for hiding this comment

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

์ง„ํ˜ธ์ƒ ์ผ๋‹จ ํŒŒ์ผ ๋ฐ”๋€๊ฒŒ ๋งŽ์ด ์—†์–ด์„œ lgtm์ด์—์š”!!

๋กœ์ง์€ ์ง„ํ˜ธ์ƒ์ด ์ž˜ ๊ตฌํ˜„ํ–ˆ๊ฒ ์ฃ  ํ—ˆํ—ˆ

์ผ๋‹จ ์ œ๊ฐ€ ๋ดค์„ ๋• ๊ตณ์ด๊ธด ํ•ฉ๋‹ˆ๋‹ค

Comment on lines +25 to +27

if (duration.toMinutes() == 0L) {
return "๋ฐฉ๊ธˆ"
Copy link
Member

Choose a reason for hiding this comment

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

๋ฐฉ๊ธˆ ์žฌ๋ฐŒ๋Š”๋ฐ์š” ์ง„ํ˜ธ์ƒ ใ…‹ใ…‹ใ…‹ใ…‹

@tgyuuAn tgyuuAn added ๐ŸŒŸ๋จธ์ง€ ํ•ด์ฃผ์„ธ์š”๐ŸŒŸ ์ฝ”๋“œ ๋ฆฌ๋ทฐ๊ฐ€ ์™„๋ฃŒ๋œ ๋’ค PR์„ ์˜ฌ๋ฆฐ์‚ฌ๋žŒ์ด Merge๋ฅผ ํ•˜๋ฉด ๋˜๋Š” ๋‹จ๊ณ„์ž…๋‹ˆ๋‹ค. and removed ๐Ÿ”ฅ๋ฆฌ๋ทฐ ๊ธฐ๋‹ค๋ฆฌ๋Š” ์ค‘๐Ÿ”ฅ PR์„ ์˜ฌ๋ฆฌ๊ณ  ์ฝ”๋“œ๋ฆฌ๋ทฐ๋ฅผ ๊ธฐ๋‹ค๋ฆฌ๊ณ  ์žˆ๋Š” ์ƒํƒœ์ž…๋‹ˆ๋‹ค. labels Mar 2, 2024
Comment on lines +26 to +41
if (duration.toMinutes() == 0L) {
return "๋ฐฉ๊ธˆ"
} else if (duration.toMinutes() < 60) {
val leftMinutes = duration.toMinutes().toString()
return leftMinutes + "๋ถ„ ์ „ ์ž‘์„ฑ"
}

if (duration.toHours() < 24) {
val leftHours = duration.toHours().toString()
return leftHours + "์‹œ๊ฐ„ ์ „ ์ž‘์„ฑ"
}

if (duration.toDays() < 31) {
val leftDays = duration.toDays().toString()
return leftDays + "์ผ ์ „ ์ž‘์„ฑ"
}
Copy link
Member

Choose a reason for hiding this comment

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

์—ฌ๊ธฐ ๋งค์ง๋„˜๋ฒ„๋“ค์€ ์ƒ์ˆ˜ํ™” ์‹œํ‚ฌ ๋งŒ ํ• ๊นŒ์š” ...?

๋งŒ์•ฝ ํ•œ๋‹ค๋ฉด ๋‹ค๋ฅธ ๊ณณ๋“ค๋„ ๋‹ค ํ•˜๊ธด ํ•ด์•ผ ํ•  ํ…๋ฐ ..

Copy link
Member Author

Choose a reason for hiding this comment

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

ํ•œ๋‹ค๋ฉด companionObject ๋‚ด์—์„œ ํ•ด์•ผํ•˜๋Š”๋ฐ

๋ฌธ๋งฅ์ƒ ์ดํ•ด๊ฐ€ ๋ผ์„œ
์ €๋Š” ๊ทธ๋ƒฅ ๊ทธ๋Œ€๋กœ ๋‚˜๋‘ฌ๋„ ๋ฌด๋ฐฉํ•  ๊ฒƒ ๊ฐ™์•„์š” ใ…Žใ…Ž

@jeongjaino jeongjaino merged commit 5abfab1 into develop Mar 4, 2024
1 check passed
@tgyuuAn tgyuuAn deleted the feature/jaino/#140 branch March 8, 2024 05:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
๐ŸŒŸ๋จธ์ง€ ํ•ด์ฃผ์„ธ์š”๐ŸŒŸ ์ฝ”๋“œ ๋ฆฌ๋ทฐ๊ฐ€ ์™„๋ฃŒ๋œ ๋’ค PR์„ ์˜ฌ๋ฆฐ์‚ฌ๋žŒ์ด Merge๋ฅผ ํ•˜๋ฉด ๋˜๋Š” ๋‹จ๊ณ„์ž…๋‹ˆ๋‹ค. ๐ŸŒฑ๊ธฐ๋Šฅ๐ŸŒฑ ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ๋‘๋‘๋‘ฅ์žฅ! ๐ŸŽจ์œ ์•„์ด๐ŸŽจ ํ”ผ๊ทธ๋งˆ, ์—‘์„ธ๋ฉœ, ์ปดํฌ์ฆˆ ์œ ์•„์ด/์œ ์—‘์Šค ์ž‘์—… ๐Ÿš€์ง„ํ˜ธ๐Ÿš€ ESTP ์ •์ง„ํ˜ธ 23์„ธ
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE]: ์„ค๋ฌธ ๊ด€๋ฆฌ ํŽ˜์ด์ง€ UI ๊ฐœ์„ 
2 participants