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

메인화면 식단 영역 리뉴얼 #218

Merged
merged 8 commits into from
Apr 10, 2024
Merged

Conversation

wateralsie
Copy link
Contributor

이슈

작업사항

  • 식단 품절, 변경됨 여부에 따른 UI 반영
  • 식단 상세 칩이 들어가는 대신 시간 텍스트(아침, 점심, 저녁) 제목 옆으로 배치
  • 18:30~00:00 일때 "내일 아침"으로 표시
  • 식단 메뉴 배열 수평 -> 수직

참고사항

서버에서 넘어오는 품절, 변경됨 상태값이 string으로 변경됨에 따라 반영해주었습니다. 식단 상세에서 이미 이루어졌다면 해당 커밋 지우도록 하겠습니다

구현 화면

(오전 5시 47분 기준)
image
image image

@wateralsie wateralsie self-assigned this Apr 8, 2024
@wateralsie wateralsie requested a review from a team as a code owner April 8, 2024 20:50
@wateralsie wateralsie linked an issue Apr 9, 2024 that may be closed by this pull request
4 tasks
Copy link
Contributor

@yunjaena yunjaena left a comment

Choose a reason for hiding this comment

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

수고했습니다 :) 커멘트 확인해주세요.

@@ -8,6 +8,7 @@ sealed class DiningType(
object Breakfast : DiningType(0, "BREAKFAST", "아침")
object Lunch : DiningType(1, "LUNCH", "점심")
object Dinner : DiningType(2, "DINNER", "저녁")
object NextBreakfast : DiningType(3, "BREAKFAST", "내일 아침")
Copy link
Contributor

Choose a reason for hiding this comment

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

enum으로 가져가도 좋을것 같습니다.

Copy link
Contributor Author

@wateralsie wateralsie Apr 10, 2024

Choose a reason for hiding this comment

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

#217
여기에서 enum으로 변경된 것 같아서 217번 pr 머지 끝나고 차후에 반영해도 될까요?
반영 완료했습니다~

@@ -18,6 +18,8 @@ object DiningUtil {
DiningType.Lunch
} else if (TimeUtil.compareWithCurrentTime(diningEndTime[2]) >= 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

diningEndTime forEach로 검색하거나 size check를 해주면 좋을것 같습니다.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@yunjaena
d6ab894 forEachIndexed로 반영 완료했습니다!

Copy link
Collaborator

@Jokwanhee Jokwanhee left a comment

Choose a reason for hiding this comment

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

코드 작성 수고하셨습니다~

Copy link
Contributor

@ThirFir ThirFir left a comment

Choose a reason for hiding this comment

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

수고하셨습니다~ 👍👍

@wateralsie wateralsie force-pushed the feature/update-main-dining branch from 7bf944a to 85a047b Compare April 10, 2024 10:31
@wateralsie
Copy link
Contributor Author

오늘 10시에 이 기능 포함 qa를 진행해야하는지라 바로 머지하는 점 양해 부탁드립니다...!
(지금 이후로 노트북을 못 보는 상황이라...)

@wateralsie wateralsie merged commit 60ee630 into develop Apr 10, 2024
@yunjaena
Copy link
Contributor

yunjaena commented Apr 10, 2024

앞으로는 pr 리뷰 보는 기간까지 산정해서 작업을 진행하면 좋을것 같네요. 오래 걸릴 것 같은면 스프린트기간을 조율해야된다고 생각합니다

@wateralsie wateralsie deleted the feature/update-main-dining branch April 11, 2024 03:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[KOIN] 메인 페이지 식단 UI 수정
4 participants