[TNT-181] 트레이니 홈 화면 일별 기록 출력 API 연동 #100
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
- 디자인 변동 사항에 맞춰 피드백 개수가 아닌 여부를 받도록 수정
# Conflicts: # data/network/src/main/java/co/kr/data/network/model/trainee/DailyRecordResponse.kt # data/network/src/main/java/co/kr/data/network/service/ApiService.kt # data/network/src/main/java/co/kr/data/network/source/TraineeRemoteDataSource.kt # data/repository/src/main/java/co/kr/data/repository/TraineeRepositoryImpl.kt # domain/src/main/java/co/kr/tnt/domain/repository/TraineeRepository.kt # feature/trainee/home/src/main/java/co/kr/tnt/trainee/home/TraineeHomeScreen.kt
- recordType이 MealType 일때만 이동
hoyahozz
approved these changes
Feb 13, 2025
Comment on lines
+22
to
+26
| val trainerName: String?, | ||
| val trainerProfileImage: String?, | ||
| val session: Int?, | ||
| val lessonStart: String?, | ||
| val lessonEnd: String?, |
There was a problem hiding this comment.
서버 response 따라가다보니 nullable로 됐습니당.. 배포하고 다시 수정해야 할 것 같습니다!!!
| modifier = Modifier | ||
| .padding(start = 16.dp, end = 16.dp, bottom = 12.dp) | ||
| .clickable { | ||
| if (record.recordType is RecordType.MealType) { |
There was a problem hiding this comment.
식단 기록 아닌 타입도 클릭 활성화되는지 확인 필요할 것 같아용~
There was a problem hiding this comment.
정상 작동합니다!
default.mp4
There was a problem hiding this comment.
아 지금 상세 화면으로 안가지는게 맞는데 클릭 자체가 활성화되는게 맞나 해서요 '-'
There was a problem hiding this comment.
비활성화 되도록 수정했습니다
feature/trainee/home/src/main/java/co/kr/tnt/trainee/home/TraineeHomeViewModel.kt
Outdated
Show resolved
Hide resolved
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.
📝 작업 내용
Closes [TNT-181] 트레이니의 일별 기록 출력 #44
주간 캘린더에서 선택한 날짜에 맞는 PT 수업과 기록 조회 API를 연동했습니다.
사용자가 날짜를 선택할 때마다 API를 호출해 해당 날짜의 수업 및 기록 데이터를 갱신하도록 구현했습니다.
+ 추가선택된 날짜의 식단 기록을 누르면 식단 기록 확인 화면으로 이동하도록 구현했습니다.📸 실행 화면
TraineeDailyRecord.mp4
TraineeHomeToMealDetail.mp4
🙆🏻 리뷰 요청 사항
없습니다!
👀 레퍼런스