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

[feat] 핑글 개최 프로세스 - 내용요약/확인 뷰 구현 #65

Merged
merged 22 commits into from
Jan 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0e4f8d0
[add] #42 내용 요약/확인 뷰string 리소스 추가
HAJIEUN02 Jan 5, 2024
7bdcadd
[chore] #42 PlanActivity fragmentList에 내용 요약/확인 프래그먼트 추가
HAJIEUN02 Jan 5, 2024
9f44ed5
Merge branch 'develop' into feat-plan-summary-confirmation
HAJIEUN02 Jan 7, 2024
b636da2
[feat] #39 내용 요약/확인 페이지 구현
HAJIEUN02 Jan 7, 2024
9cc5d0e
[mod] #39 viewModel 호출 로직수정
HAJIEUN02 Jan 8, 2024
664d517
Merge branch 'develop' into feat-plan-summary-confirmation
HAJIEUN02 Jan 9, 2024
5c6af6c
Merge branch 'develop' into feat-plan-summary-confirmation
HAJIEUN02 Jan 9, 2024
9b1a288
[chore] #60 viewModel binding 선언
HAJIEUN02 Jan 9, 2024
de8f744
[chore] #60 viewModel -> activityViewModel로 수정
HAJIEUN02 Jan 9, 2024
ded080d
Merge branch 'develop' into feat-plan-summary-confirmation
HAJIEUN02 Jan 9, 2024
bfb3843
[chore] #42 viewModel -> activityViewModel로 수정
HAJIEUN02 Jan 9, 2024
0f2d198
[feat] #42 내용 요약/확인 뷰 구현
HAJIEUN02 Jan 9, 2024
0f4b962
[chore] #42 ktlint 적용
HAJIEUN02 Jan 9, 2024
40737a4
[feat] #42 start/end시간 출력형태 가공 함수 추가
HAJIEUN02 Jan 9, 2024
7c99cab
[add] #42 text_appearance 추가 및 UI 수정
HAJIEUN02 Jan 9, 2024
b6205e9
[chore] #42 maxLines=2로 수정
HAJIEUN02 Jan 9, 2024
17a8d76
[feat] #42 date 출력형태 가공 함수 추가
HAJIEUN02 Jan 9, 2024
884dc9c
[chore] #42 코드리뷰 반영
HAJIEUN02 Jan 9, 2024
7d06e51
[chore] #42 코드리뷰 반영2
HAJIEUN02 Jan 9, 2024
9b877f5
[chore] #42 코드리뷰 반영3
HAJIEUN02 Jan 9, 2024
0bf7f3e
[chore] #42 상수화 및 제약 수정
HAJIEUN02 Jan 9, 2024
88597a8
Merge branch 'develop' into feat-plan-summary-confirmation
HAJIEUN02 Jan 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,29 @@ class PlanSummaryConfirmationFragment :
tvPlanSummaryConfirmationName.text = viewModel.planTitle.value
tvPlanSummaryConfirmationOwnerName.text = "개최자"
Copy link
Collaborator

Choose a reason for hiding this comment

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

이거 나중에 서버통신으로 사용자 정보 받아와서 개최자 닉네임 넣어주는 로직으로 수정해주는 거 맞죠?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

넵 API명세서에 있는 거 씁니둥,,

tvPlanSummaryConfirmationCalenderDetail.text =
viewModel.planDate.value + "\n" + makeTimeClean(viewModel.startTime.value) + " ~ " + makeTimeClean(viewModel.endTime.value)
makeDateClean(viewModel.planDate.value) + "\n" + makeTimeClean(viewModel.startTime.value) + " ~ " + makeTimeClean(
viewModel.endTime.value
)
tvPlanSummaryConfirmationMapDetail.text = viewModel.selectedLocation.value?.location
tvPlanSummaryConfirmationRecruitmentDetail.text = getString(R.string.plan_summary_confirmation_recruitment_number, viewModel.selectedRecruitment.value)
tvPlanSummaryConfirmationRecruitmentDetail.text = getString(
R.string.plan_summary_confirmation_recruitment_number,
viewModel.selectedRecruitment.value
)
}
}
}

private fun makeTimeClean(time: String): String = time.substring(0, 5)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
private fun makeTimeClean(time: String): String = time.substring(0, 5)
private fun convertWithoutSecondFormatHours(time: String): String = time.substring(0, 5)

이런 식으로 네이밍하는 게 좋을 것 같고 0이랑 5는 상수화 해주세요

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

뭔가 직관적이지 않은 것 같아서 convertDateFormat, convertTimeFormat으로 수정했슴둥

private fun makeDateClean(date: String): String {
val year = date.substring(0, 4)
val month = date.substring(5, 7)
val day = date.substring(8, 10)
return year + YEAR + month + MONTH + day + DAY
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

이거 위랑 비슷하게 네이밍 해주시고 상수화 진행해주세요


companion object {
const val YEAR = "년 "
const val MONTH = "월 "
const val DAY = "일"
}
}
Loading