[UI/#204] 홈 뷰 / UI 수정사항 반영 및 리팩토링 #232
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: # feature/src/main/java/com/terning/feature/home/changefilter/ChangeFilterRoute.kt # feature/src/main/java/com/terning/feature/main/MainScreen.kt
# Conflicts: # feature/src/main/java/com/terning/feature/home/home/HomeViewModel.kt
leeeyubin
approved these changes
Sep 9, 2024
Comment on lines
126
to
132
| DatePickerUI( | ||
| chosenYear = defaultStartYear ?: Calendar.getInstance().currentYear, | ||
| chosenMonth = defaultStartMonth?.minus(1) | ||
| ?: Calendar.getInstance().currentMonth.minus(1), | ||
| onYearChosen = { currentStartYear = it }, | ||
| onMonthChosen = { currentStartMonth = it }, | ||
| ) |
There was a problem hiding this comment.
요거 제가 최근에 만든 YearMonthPicker 써주면 될 것 같아요!! (피그마에 나온 패딩값 적용하구, 앱 터지지 않게 만들었어요!)
feature.filtering.filteringthree.component파일에 써줬는데 확인해주시면 감사하겠습니당
There was a problem hiding this comment.
웁씨 깜빡했네요 감사합니다 근데 진짜 데이트피커 수정된거 정말 짱이네요👍🏻
Comment on lines
+15
to
+22
| companion object { | ||
| fun fromString(value: String?): Grade = when (value) { | ||
| "freshman" -> FRESHMAN | ||
| "sophomore" -> SOPHOMORE | ||
| "junior" -> JUNIOR | ||
| "senior" -> SENIOR | ||
| else -> FRESHMAN | ||
| } |
There was a problem hiding this comment.
단순 궁금증인데 value 값이 nullable인 이유가 궁금해요..!
There was a problem hiding this comment.
사용자 필터링 정보가 없을 때 null로 저장이 돼서 nullable하게 만들었습니다!! null 처리를 screen에서 하니까 코드가 너무 복잡해지더라구요😅
Comment on lines
100
to
104
| HomeFilteringInfoText( | ||
| text = "설정된 필터링 정보가 없어요", | ||
| modifier = Modifier | ||
| .align(Alignment.CenterVertically), | ||
| ) |
Comment on lines
+126
to
+131
|
|
||
| Text( | ||
| text = "유한킴벌리", | ||
| style = TerningTheme.typography.button5, | ||
| color = Grey500, | ||
| maxLines = 1, |
There was a problem hiding this comment.
제가 홈 뷰 로직은 잘 모르지만 요거 하드코딩 되어있는 이유가 있나용?
There was a problem hiding this comment.
어라...? 이게 뭐지??!?!?!?!?!?!?
boiledEgg-s
approved these changes
Sep 9, 2024
| onCLick: () -> Unit, | ||
| ) { | ||
| Row( | ||
| modifier = modifier | ||
| .noRippleClickable { onCLick() } | ||
| .noRippleClickable { onCLick() }, |
| onDismissRequest = { | ||
| homeViewModel.updateUpcomingDialogVisibility(false) | ||
| }, | ||
| onClickChangeColor = { }, |
There was a problem hiding this comment.
이제 보니까 여기에 스크랩을 할 경우 호출할 함수가 없네요,,, 이석준 할일 +1...
arinming
approved these changes
Sep 9, 2024
Comment on lines
239
to
273
| Row( | ||
| horizontalArrangement = Arrangement.SpaceBetween, | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| modifier = Modifier | ||
| .fillMaxWidth(), | ||
| horizontalArrangement = Arrangement.End, | ||
| .fillMaxWidth() | ||
| .padding(start = 24.dp, end = 18.dp), | ||
| ) { | ||
| SortingButton( | ||
| sortBy = currentSortBy.value, | ||
| onCLick = { sheetState = true }, | ||
| modifier = Modifier | ||
| .padding(vertical = 4.dp) | ||
| ) | ||
| Spacer( | ||
| modifier = Modifier.padding(9.dp) | ||
| ) | ||
| Row { | ||
| Text( | ||
| text = stringResource(id = R.string.home_recommend_total), | ||
| style = TerningTheme.typography.detail1, | ||
| color = Grey400, | ||
| modifier = Modifier | ||
| .padding(end = 3.dp), | ||
| ) | ||
| Text( | ||
| text = homeRecommendInternTotal.toString(), | ||
| style = TerningTheme.typography.button3, | ||
| color = TerningMain, | ||
| ) | ||
| Text( | ||
| text = stringResource(id = R.string.home_recommend_count), | ||
| style = TerningTheme.typography.detail1, | ||
| color = Grey400, | ||
| ) | ||
| } | ||
| Row { | ||
| SortingButton( | ||
| sortBy = currentSortBy.value, | ||
| onCLick = { sortingSheetState = true }, | ||
| modifier = Modifier | ||
| .padding(vertical = 4.dp) | ||
| ) | ||
| } | ||
| } |
There was a problem hiding this comment.
요 부분 검색때도 쓰여서 ㅎㅎ 납치해 갑니다 감사해용!!!!!
| onDismissRequest = { | ||
| homeViewModel.updateUpcomingDialogVisibility(false) | ||
| }, | ||
| onClickChangeColor = { }, |
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.
⛳️ Work Description
-[x] 홈 뷰 UI 수정
📸 Screenshot
Screen_Recording_20240909_230007_.terning.mp4
📢 To Reviewers