-
Notifications
You must be signed in to change notification settings - Fork 1
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
[FIX/#236] 홈 뷰 / 1차 QA 반영 #243
Merged
Merged
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
b7238b0
[CHORE/#236] 라이팅 수정
Hyobeen-Park 6f6395f
[MOD/#236] 필터링 재설정 데이트피커 월 오류 수정
Hyobeen-Park 9aa8d54
[MOD/#236] 필터링 재설정 API 데이터 형식 string으로 수정
Hyobeen-Park df6d01b
[MOD/#236] 뷰 크기 및 패딩 값 조정
Hyobeen-Park 34ddc8b
[MOD/#236] 곧 마감 공고 아이템 테두리 수정
Hyobeen-Park 2067fd9
[FEAT/#236] 곧 마감 공고 기업명 추가
Hyobeen-Park d28f477
[MOD/#236] 곧 마감 공고 스크랩 색상 변경 반영
Hyobeen-Park 86b26b2
[MOD/#236] 맞춤 공고 다이얼로그 수정
Hyobeen-Park 0e8b354
[MOD/#236] 사용자 정보 서버통신 위치 수정
Hyobeen-Park 071e93d
[CHORE/#236] 불필요한 함수 삭제
Hyobeen-Park 794b403
[MOD/#236] 다이얼로그 수정
Hyobeen-Park 3ae5a07
Merge remote-tracking branch 'origin/develop' into fix/#236-home-qa
Hyobeen-Park c3e6256
[CHORE/#236] import 오류 수정
Hyobeen-Park 01c2ea4
Merge remote-tracking branch 'origin/develop' into fix/#236-home-qa
Hyobeen-Park cbd87a2
[CHORE/#236] internItem string 추출
Hyobeen-Park File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
4 changes: 2 additions & 2 deletions
4
domain/src/main/java/com/terning/domain/entity/home/HomeFilteringInfo.kt
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
package com.terning.domain.entity.home | ||
|
||
data class HomeFilteringInfo( | ||
val grade: Int?, | ||
val workingPeriod: Int?, | ||
val grade: String?, | ||
val workingPeriod: String?, | ||
val startYear: Int?, | ||
val startMonth: Int?, | ||
) |
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
4 changes: 2 additions & 2 deletions
4
domain/src/main/java/com/terning/domain/entity/request/ChangeFilteringRequestModel.kt
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
package com.terning.domain.entity.request | ||
|
||
data class ChangeFilteringRequestModel( | ||
val grade: Int, | ||
val workingPeriod: Int, | ||
val grade: String, | ||
val workingPeriod: String, | ||
val startYear: Int, | ||
val startMonth: Int, | ||
) |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -86,6 +86,7 @@ fun HomeRoute( | |
val context = LocalContext.current | ||
|
||
LaunchedEffect(key1 = true) { | ||
viewModel.getProfile() | ||
viewModel.getFilteringInfo() | ||
} | ||
Comment on lines
88
to
91
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 수정 감사합니당:) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 😎 |
||
|
||
|
@@ -158,9 +159,9 @@ fun HomeScreen( | |
|
||
if (changeFilteringSheetState) { | ||
HomeFilteringBottomSheet( | ||
defaultGrade = homeFilteringInfo.grade?.let { Grade.entries[it] }, | ||
defaultGrade = homeFilteringInfo.grade?.let { Grade.fromString(it) }, | ||
defaultWorkingPeriod = homeFilteringInfo.workingPeriod?.let { | ||
WorkingPeriod.entries[it] | ||
WorkingPeriod.fromString(it) | ||
}, | ||
defaultStartYear = homeFilteringInfo.startYear, | ||
defaultStartMonth = homeFilteringInfo.startMonth, | ||
|
@@ -178,18 +179,48 @@ fun HomeScreen( | |
} | ||
} | ||
|
||
LaunchedEffect( | ||
homeState.homeRecommendDialogVisibility, | ||
homeState.homeUpcomingDialogVisibility | ||
) { | ||
with(homeState) { | ||
if (!homeRecommendDialogVisibility && !homeUpcomingDialogVisibility) { | ||
viewModel.getRecommendInternsData( | ||
sortBy = sortBy.ordinal, | ||
startYear = homeFilteringInfo.startYear ?: Calendar.getInstance().currentYear, | ||
startMonth = homeFilteringInfo.startMonth | ||
?: Calendar.getInstance().currentMonth, | ||
) | ||
if (homeState.homeRecommendDialogVisibility) { | ||
with(homeState.homeInternModel) { | ||
if (this != null) { | ||
if (isScrapped) { | ||
ScrapCancelDialog( | ||
Comment on lines
+182
to
+186
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 깔꼼 |
||
internshipAnnouncementId = internshipAnnouncementId, | ||
onDismissRequest = { | ||
viewModel.updateRecommendDialogVisibility(false) | ||
viewModel.getHomeUpcomingInternList() | ||
viewModel.getRecommendInternsData( | ||
sortBy = homeState.sortBy.ordinal, | ||
startYear = homeFilteringInfo.startYear ?: Calendar.getInstance().currentYear, | ||
startMonth = homeFilteringInfo.startMonth | ||
?: Calendar.getInstance().currentMonth, | ||
) | ||
} | ||
) | ||
} else { | ||
ScrapDialog( | ||
title = title, | ||
scrapColor = CalRed, | ||
deadline = deadline, | ||
startYearMonth = startYearMonth, | ||
workingPeriod = workingPeriod, | ||
internshipAnnouncementId = internshipAnnouncementId, | ||
companyImage = companyImage, | ||
isScrapped = isScrapped, | ||
onDismissRequest = { | ||
viewModel.updateRecommendDialogVisibility( | ||
false | ||
) | ||
viewModel.getHomeUpcomingInternList() | ||
viewModel.getRecommendInternsData( | ||
sortBy = homeState.sortBy.ordinal, | ||
startYear = homeFilteringInfo.startYear ?: Calendar.getInstance().currentYear, | ||
startMonth = homeFilteringInfo.startMonth | ||
?: Calendar.getInstance().currentMonth, | ||
) | ||
}, | ||
onClickNavigateButton = navigateToIntern | ||
) | ||
} | ||
} | ||
} | ||
} | ||
|
@@ -216,10 +247,7 @@ fun HomeScreen( | |
.fillMaxWidth(), | ||
) { | ||
item { | ||
Column( | ||
modifier = Modifier | ||
.padding(bottom = 16.dp) | ||
) { | ||
Column { | ||
ShowMainTitleWithName(homeUserName) | ||
ShowUpcomingIntern( | ||
homeUpcomingInternState = homeState.homeUpcomingInternState, | ||
|
@@ -300,41 +328,6 @@ fun HomeScreen( | |
} | ||
} | ||
) | ||
|
||
if (homeState.homeRecommendDialogVisibility) { | ||
with(homeState.homeInternModel) { | ||
if (this != null) { | ||
if (isScrapped) { | ||
ScrapCancelDialog( | ||
internshipAnnouncementId = internshipAnnouncementId, | ||
onDismissRequest = { | ||
viewModel.updateRecommendDialogVisibility(false) | ||
viewModel.getHomeUpcomingInternList() | ||
} | ||
) | ||
} else { | ||
ScrapDialog( | ||
title = title, | ||
scrapColor = CalRed, | ||
deadline = deadline, | ||
startYearMonth = startYearMonth, | ||
workingPeriod = workingPeriod, | ||
internshipAnnouncementId = internshipAnnouncementId, | ||
companyImage = companyImage, | ||
isScrapped = isScrapped, | ||
onDismissRequest = { | ||
viewModel.updateRecommendDialogVisibility( | ||
false | ||
) | ||
viewModel.getHomeUpcomingInternList() | ||
}, | ||
onClickChangeColor = { /*TODO*/ }, | ||
onClickNavigateButton = navigateToIntern | ||
) | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} else { | ||
item { | ||
|
@@ -382,8 +375,12 @@ private fun ShowMainTitleWithName(userName: String) { | |
else userName | ||
), | ||
modifier = Modifier | ||
.padding(top = 11.dp, bottom = 19.dp) | ||
.padding(horizontal = 24.dp), | ||
.padding( | ||
top = 2.dp, | ||
bottom = 20.dp, | ||
start = 24.dp, | ||
end = 24.dp, | ||
), | ||
style = TerningTheme.typography.title1, | ||
color = Black, | ||
) | ||
|
@@ -422,8 +419,11 @@ private fun ShowRecommendTitle() { | |
style = TerningTheme.typography.title1, | ||
color = Black, | ||
modifier = Modifier | ||
.padding(top = 5.dp) | ||
.padding(horizontal = 24.dp), | ||
.padding( | ||
top = 22.dp, | ||
start = 24.dp, | ||
end = 24.dp, | ||
), | ||
) | ||
} | ||
|
||
|
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
요거는 추출하는 게 좋을 것 같아요!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
확인했습니당!!