[Feature/#20] : 약속 생성 마지막 2페이지 구현 #21
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
youjin09222
approved these changes
Jan 13, 2025
Comment on lines
14
to
20
| val categoryType = CategoryType.fromText(text) | ||
| val resolvedBackgroundColor = when (categoryType) { | ||
| CategoryType.IMPORTANT -> NoostakTheme.colors.orange | ||
| CategoryType.SCHEDULE -> NoostakTheme.colors.blue | ||
| CategoryType.HOBBY -> NoostakTheme.colors.purple | ||
| CategoryType.ETC -> NoostakTheme.colors.mint | ||
| } |
Comment on lines
3
to
17
| enum class CategoryType { | ||
| IMPORTANT, SCHEDULE, HOBBY, ETC; | ||
|
|
||
| companion object { | ||
| fun fromText(text: String): CategoryType { | ||
| return when (text.uppercase()) { | ||
| "중요" -> IMPORTANT | ||
| "일정" -> SCHEDULE | ||
| "취미" -> HOBBY | ||
| "기타" -> ETC | ||
| else -> ETC | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
P3: enum class 사용 너무 좋습니다ㅏㅏ
Comment on lines
+189
to
+241
| @Composable | ||
| fun AppointmentInfoRow( | ||
| @DrawableRes icon: Int, | ||
| label: String, | ||
| content: String, | ||
| additionalContent: String? = null, | ||
| isChip: Boolean = false | ||
| ) { | ||
| Row( | ||
| modifier = Modifier.fillMaxWidth() | ||
| ) { | ||
| Row( | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Image( | ||
| imageVector = ImageVector.vectorResource(id = icon), | ||
| contentDescription = null | ||
| ) | ||
| Text( | ||
| modifier = Modifier.padding(start = 3.dp), | ||
| text = label, | ||
| color = NoostakTheme.colors.gray700, | ||
| style = NoostakTheme.typography.b4Regular | ||
| ) | ||
| } | ||
| Spacer(modifier = Modifier.weight(1f)) | ||
| if (isChip) { | ||
| NoostakCategoryChip(text = content) | ||
| } else { | ||
| Column( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| verticalArrangement = Arrangement.spacedBy(5.dp) | ||
| ) { | ||
| Text( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| text = content, | ||
| style = NoostakTheme.typography.b4SemiBold, | ||
| color = NoostakTheme.colors.gray900, | ||
| textAlign = TextAlign.End | ||
| ) | ||
| if (additionalContent != null) { | ||
| Text( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| text = additionalContent, | ||
| style = NoostakTheme.typography.b4SemiBold, | ||
| color = NoostakTheme.colors.gray900, | ||
| textAlign = TextAlign.End | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
P3: 오 이거 너무 야무지게 잘 만드셨네요!!
...ain/java/com/sopt/presentation/appointmentCreate/appointmentSubmit/AppointmentSubmitRoute.kt
Show resolved
Hide resolved
...t/presentation/appointmentCreate/appointmentSubmitComplete/AppointmentSubmitCompleteRoute.kt
Outdated
Show resolved
Hide resolved
Comment on lines
+35
to
+42
| @Composable | ||
| fun AppointmentSubmitRoute( | ||
| groupId: Long, | ||
| appointmentName: String, | ||
| appointmentDate: String, | ||
| appointmentTime: String? = null, | ||
| appointmentCategory: String, | ||
| appointmentDuration: Int, |
There was a problem hiding this comment.
P2: 매개변수가 꽤 많은데 Entity 사용하는건 어떠신가요??
There was a problem hiding this comment.
하늘 언니 뷰 완료되면 그때 언니랑 얘기해볼게욥 👍
Comment on lines
+34
to
+39
| groupId: Long, | ||
| appointmentName: String, | ||
| appointmentDate: String, | ||
| appointmentTime: String? = null, | ||
| appointmentCategory: String, | ||
| appointmentDuration: Int, |
There was a problem hiding this comment.
P2: 여기도 Entity 사용하면 가독성과 유지보수에 좋을 것 같네요!
Eonji-sw
approved these changes
Jan 14, 2025
…into feature/#20-appointment-create-complete-ui
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
✅ 𝗖𝗵𝗲𝗰𝗸-𝗟𝗶𝘀𝘁
📌 𝗜𝘀𝘀𝘂𝗲𝘀
📎 𝗪𝗼𝗿𝗸 𝗗𝗲𝘀𝗰𝗿𝗶𝗽𝘁𝗶𝗼𝗻
📷 𝗦𝗰𝗿𝗲𝗲𝗻𝘀𝗵𝗼𝘁
💬 𝗧𝗼 𝗥𝗲𝘃𝗶𝗲𝘄𝗲𝗿𝘀
카테고리 텍스트에 따라 배경색 변경되는 로직 추가했구 하늘 언니 뷰랑 연결해야돼서 스크린샷은 프리뷰로 대체합니답 😪
그리고 하늘언니 뷰에서 내용들을 모두 전달해주어야 할 것 같네요.. like 앱잼 회원가입 view...
그룹 아이디, 약속 이름, 약속 시간, 일자, 카테고리, 소요시간 정보 같은 정보 화면 연결 할 때 꼭 전달해주세요!!!