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/#117 #152

Merged
merged 5 commits into from
Mar 8, 2024
Merged

Feature/jaino/#117 #152

merged 5 commits into from
Mar 8, 2024

Conversation

jeongjaino
Copy link
Member

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

#117 ์„ค๋ฌธ ํ•ญ๋ชฉ ์‚ญ์ œ ๊ธฐ๋Šฅ ๊ตฌํ˜„

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

  1. ์ด์ œ ์„ค๋ฌธ์—์„œ ํ•ญ๋ชฉ์„ ์‚ญ์ œํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.
image (Figma)

  1. ์„ค๋ฌธ ํ•ญ๋ชฉ ์ถ”๊ฐ€์‹œ, default ํƒ€์ž…์ธ ์ฃผ๊ด€์‹์œผ๋กœ ์„ค์ •๋˜์—ˆ์Šต๋‹ˆ๋‹ค.

  2. ๋กœ๊ทธ์ธ ์‹œ unfocusedText ์†์„ฑ์„ ์ถ”๊ฐ€ํ•˜์˜€์Šต๋‹ˆ๋‹ค.

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

  • ๋งŽ์€ ์„ค๋ฌธ ํ•ญ๋ชฉ ์‚ญ์ œ QA
    • ์ตœ๋Œ€ํ•œ ๋งŽ์ด ํŠธ๋ผ์ดํ–ˆ๋Š”๋ฐ, ์•„์ง๊นŒ์ง€๋Š” ๊ดœ์ฐฎ์•„์š”

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

8d6ed1ab-ab1d-468b-9c69-65202ceb424d.mp4

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

@jeongjaino jeongjaino added ๐Ÿš€์ง„ํ˜ธ๐Ÿš€ ESTP ์ •์ง„ํ˜ธ 23์„ธ ๐ŸŒฑ๊ธฐ๋Šฅ๐ŸŒฑ ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ๋‘๋‘๋‘ฅ์žฅ! ๐ŸŽจ์œ ์•„์ด๐ŸŽจ ํ”ผ๊ทธ๋งˆ, ์—‘์„ธ๋ฉœ, ์ปดํฌ์ฆˆ ์œ ์•„์ด/์œ ์—‘์Šค ์ž‘์—… ๐Ÿ”ฅ๋ฆฌ๋ทฐ ๊ธฐ๋‹ค๋ฆฌ๋Š” ์ค‘๐Ÿ”ฅ PR์„ ์˜ฌ๋ฆฌ๊ณ  ์ฝ”๋“œ๋ฆฌ๋ทฐ๋ฅผ ๊ธฐ๋‹ค๋ฆฌ๊ณ  ์žˆ๋Š” ์ƒํƒœ์ž…๋‹ˆ๋‹ค. labels Mar 7, 2024
@jeongjaino jeongjaino self-assigned this Mar 7, 2024
@tgyuuAn tgyuuAn self-requested a review March 7, 2024 12:55
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.

์•„์ด๊ณ  ์ด ๋ถ€๋ถ„ ์™„์ „ ์•Œ๊ณ ๋ฆฌ์ฆ˜์ด๋„ค์š”.. ์—ฌ๊ธฐ ํ…Œ์ŠคํŠธ ์ฝ”๋“œ๊ฐ€ ๋”ฑ ๋“ค์–ด๊ฐ€์•ผ ํ•˜๋Š”๋ฐ...

๊ณ ์ƒํ•˜์…จ์”๋‹ˆ๋‹ค ๋‚˜์˜๋‹˜์ด๋ž‘ ์„ฑ์šฐ๋‹˜ QA ๋Œ๋ ค๋ณผ๊ฒŒ์š” ํ—ˆํ—ˆํ—ˆ

๊ณ ์ƒํ•˜์…จ์”๋‹ˆ๋‹ค ์ƒˆ๋กœ ์ƒ๊ธด ์ฝ”๋“œ๊ฐ€ ๋ณ„๋กœ ์—†์–ด์„œ ํผ์ง€๋ง‰ํ•œ ๋กœ์ง ๋ง๊ณ ๋Š” ์„ธ์„ธํ•œ ๊ฑด ์—†๋Š” ๊ฒƒ ๊ฐ™์•„์š”!

๐Ÿ‘๐Ÿ‘๐Ÿ‘

@@ -124,6 +124,7 @@ internal fun SignInScreen(
colors = OutlinedTextFieldDefaults.colors(
focusedTextColor = WappTheme.colors.white,
focusedBorderColor = WappTheme.colors.yellow34,
unfocusedTextColor = WappTheme.colors.white,
Copy link
Member

Choose a reason for hiding this comment

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

๐Ÿ‘๐Ÿ‘๐Ÿ‘

Comment on lines +232 to +251
fun deleteSurveyQuestion() {
val totalQuestionNumber = _totalQuestionNumber.value
if (totalQuestionNumber < 1) {
emitValidationErrorMessage("์‚ญ์ œํ•  ๋ฌธํ•ญ์ด ์—†์Šต๋‹ˆ๋‹ค.")
return
}

val currentQuestionNumber = _currentQuestionNumber.value
val lastQuestionNumber = _questionList.value.lastIndex // ๋งˆ์ง€๋ง‰ ์งˆ๋ฌธ ๋ฒˆํ˜ธ
if (currentQuestionNumber <= lastQuestionNumber) {
val questionList = _questionList.value
questionList.removeAt(currentQuestionNumber)
} // ๋“ฑ๋ก๋˜์ง€ ์•Š์€ ์งˆ๋ฌธ์„ ์‚ญ์ œํ•˜๋Š” ๊ฒฝ์šฐ๋Š” skip

if (currentQuestionNumber > 0) { // 5/5 -> 4/4, 1/4 -> 1/3, 2/3 -> 1/2
setPreviousQuestionNumber()
}
_totalQuestionNumber.value -= 1
}

Copy link
Member

Choose a reason for hiding this comment

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

์ด ๋ถ€๋ถ„ QA ๋Œ๋ ค ๋ด์•ผํ•  ๊ฒƒ ๊ฐ™์€ ๋Š๋‚Œ์ด ๋“œ๋„ค์š”

@gjsk132 @Redish03 ํ—ˆํ—ˆํ—ˆ

Copy link

Choose a reason for hiding this comment

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

์Œ...๋ฌธํ•ญ ์ถ”๊ฐ€ ๋˜๋ฉด ๋™์•„๋ฆฌ์›๋“ค (์„ค๋ฌธ ํ•˜๋Š” ์‚ฌ๋žŒ๋“ค)์—๊ฒŒ ์–ด๋–ป๊ฒŒ ๋ณด์ผ์ง€ ๋ชจ๋ฅด๊ฒŸ๋„ค์š”

์ผ๋‹จ ํ•ด๋ด์•ผ ์•Œ๊ฒƒ ๊ฐ™์•„์œ 

@@ -246,6 +269,8 @@ class SurveyFormEditViewModel @Inject constructor(

fun setSurveyDateDeadline(date: LocalDate) { _dateDeadline.value = date }

private fun setDefaultSurveyQuestionType() { _questionType.value = QuestionType.SUBJECTIVE }

private fun clearSurveyQuestionTitle() { _questionTitle.value = "" }

private fun isNotValidSurveyQuestion() = _questionTitle.value.isBlank()
Copy link
Member

Choose a reason for hiding this comment

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

์ง„ํ˜ธ์ƒ ์ด๊ฑฐ ๊ฐ‘์ž๊ธฐ ๋“  ์—„์ฒญ๋‚˜๊ฒŒ ์‚ฌ์†Œํ•œ ์ƒ๊ฐ์ธ๋ฐ ์–ด์ฐจํ”ผ isBlank()๋‚˜ isEmpty() ๋กœ ๋ฉ”์†Œ๋“œ๋ฅผ ์ œ๊ณตํ•˜๊ณ  ์žˆ๋Š”๋ฐ ํ•œ ๋ฒˆ ๋” ๋ž˜ํ•‘ํ•  ์ด์œ ๊ฐ€ ์žˆ์„๊นŒ ? ๋ผ๋Š” ์ƒ๊ฐ์ด ๋“ค์–ด์š”. ์–ด๋–ป๊ฒŒ ์ƒ๊ฐํ•˜์‹œ๋‚˜์š˜?????

Copy link
Member Author

Choose a reason for hiding this comment

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

์‚ฌ์‹ค ์—„๋ฐ€ํžˆ ๋งํ•˜๋ฉด StateFlow. getValue(). isBlank()์ด๊ธด ํ•ด์š” !

์ฝ”๋“œ๊ฐ€ ๋Š˜์–ด๋‚˜๊ธด ํ• ํ…๋ฐ, ํ•ด๋‹น ํ•จ์ˆ˜๊ฐ€ Validation์„ ๊ฒ€์ฆํ•˜๋Š” ํ•จ์ˆ˜๋‚ด์—์„œ ์‚ฌ์šฉ๋˜๋ฉด ๊ฐ€๋…์„ฑ์ด ๊ฐœ์„ ๋˜๋Š” ์—ฌ์ง€๊ฐ€ ์žˆ์–ด์„œ
์ €๋Š” ์ข‹์€ ๊ฒƒ ๊ฐ™์•„์š”

@tgyuuAn tgyuuAn added ๐ŸŒŸ๋จธ์ง€ ํ•ด์ฃผ์„ธ์š”๐ŸŒŸ ์ฝ”๋“œ ๋ฆฌ๋ทฐ๊ฐ€ ์™„๋ฃŒ๋œ ๋’ค PR์„ ์˜ฌ๋ฆฐ์‚ฌ๋žŒ์ด Merge๋ฅผ ํ•˜๋ฉด ๋˜๋Š” ๋‹จ๊ณ„์ž…๋‹ˆ๋‹ค. and removed ๐Ÿ”ฅ๋ฆฌ๋ทฐ ๊ธฐ๋‹ค๋ฆฌ๋Š” ์ค‘๐Ÿ”ฅ PR์„ ์˜ฌ๋ฆฌ๊ณ  ์ฝ”๋“œ๋ฆฌ๋ทฐ๋ฅผ ๊ธฐ๋‹ค๋ฆฌ๊ณ  ์žˆ๋Š” ์ƒํƒœ์ž…๋‹ˆ๋‹ค. labels Mar 7, 2024
@jeongjaino
Copy link
Member Author

ํ•ด๋‹น ์ž‘์—… develop ๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉ๋˜๋ฉด,

release ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ ๋ฐ ๋ณ‘ํ•ฉ ์˜ˆ์ •์ž…๋‹ˆ๋‹ค !

@tgyuuAn

release ๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉ ์ „, ์ถ”๊ฐ€ ๊ธฐ๋Šฅ ๊ตฌํ˜„์‚ฌํ•ญ ์žˆ์œผ์‹œ๋ฉด ๋ง์”€ ์ฃผ์„ธ์š” !

@tgyuuAn
Copy link
Member

tgyuuAn commented Mar 8, 2024

ํ•ด๋‹น ์ž‘์—… develop ๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉ๋˜๋ฉด,

release ๋ธŒ๋žœ์น˜ ์ƒ์„ฑ ๋ฐ ๋ณ‘ํ•ฉ ์˜ˆ์ •์ž…๋‹ˆ๋‹ค !

@tgyuuAn

release ๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉ ์ „, ์ถ”๊ฐ€ ๊ธฐ๋Šฅ ๊ตฌํ˜„์‚ฌํ•ญ ์žˆ์œผ์‹œ๋ฉด ๋ง์”€ ์ฃผ์„ธ์š” !

์ง€๊ธˆ ์ด ์ƒํƒœ๋กœ mvp๋ฐฐํฌ ํ•ด๋„ ์ข‹์„ ๊ฒƒ ๊ฐ™์Šต๋‹ˆ๋‹ค!

๋ฆด๋ฆฌ์ฆˆ ๋ธŒ๋žœ์น˜ ํŒŒ๊ณ  ๋””๋ฒ„๊น…๋งŒ ํ•ด๋ณด๋Š” ์ชฝ์œผ๋กœ ํ•ด์š”!

@jeongjaino jeongjaino merged commit 7e7f32b into develop Mar 8, 2024
1 check passed
@tgyuuAn tgyuuAn deleted the feature/jaino/#117 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
3 participants