[UI/#37] 캘린더뷰 / 스크랩 목록 뷰 #54
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: # core/src/main/res/values/strings.xml
leeeyubin
approved these changes
Jul 11, 2024
Comment on lines
+52
to
+62
| AsyncImage( | ||
| model = ImageRequest.Builder(LocalContext.current) | ||
| .data(imageUrl) | ||
| .build(), | ||
| contentDescription = title, | ||
| Modifier | ||
| .fillMaxHeight() | ||
| .aspectRatio(1f) | ||
| .clip(RoundedCornerShape(5.dp)) | ||
| .background(color = Grey300) | ||
| ) |
Comment on lines
+82
to
+85
| Row( | ||
| modifier = Modifier.fillMaxHeight(), | ||
| verticalAlignment = Alignment.Bottom | ||
| ) { |
There was a problem hiding this comment.
단순 궁금증인데,, 여기선 modifier 변수 안 써주는 이유가 있나용?
There was a problem hiding this comment.
전 최상위 컴포저블에만 modifier를 적용하는 편입니다!!
Comment on lines
+54
to
+55
| val selectedDate by viewModel.selectedDate.collectAsStateWithLifecycle() | ||
| val state by remember { mutableStateOf(CalendarState()) } |
Comment on lines
60
to
62
| //To be erased in future | ||
| val mockScrapList: List<List<Scrap>> | ||
| get() { |
Comment on lines
+52
to
+56
| isFromList = true, | ||
| noScrapScreen = {}) | ||
|
|
||
|
|
||
| if (scrapList[day].isNotEmpty()) { |
Hyobeen-Park
approved these changes
Jul 11, 2024
| .data(imageUrl) | ||
| .build(), | ||
| contentDescription = title, | ||
| Modifier |
There was a problem hiding this comment.
위에 있는 modifier 변수 사용해줘도 될 것 같아요!!
There was a problem hiding this comment.
전 최상위 컴포저블에만 modifier를 적용하는 편입니다!!
Comment on lines
+10
to
+11
| fun LocalDate.getDateStringInKorean(): String = | ||
| "${monthValue}월 ${dayOfMonth}일 ${dayOfWeek.getDisplayName(TextStyle.FULL, Locale.KOREAN)}" |
Comment on lines
+67
to
+68
| snapshotFlow { listState.firstVisibleItemIndex } | ||
| .distinctUntilChanged() |
| val selectedDate by viewModel.selectedDate.collectAsStateWithLifecycle() | ||
| val state by remember { mutableStateOf(CalendarState()) } | ||
|
|
||
| val listState = rememberLazyListState( |
Comment on lines
+77
to
+81
| BackHandler { | ||
| if (selectedDate.isEnabled) { | ||
| viewModel.updateSelectedDate(selectedDate.selectedDate) | ||
| } | ||
| } |
Comment on lines
136
to
141
| Spacer( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .height(1.dp) | ||
| .background(color = Grey200) | ||
| ) |
There was a problem hiding this comment.
divider을 사용하지 않고 spacer를 사용한 이유가 궁금해요!!
Comment on lines
60
to
62
| //To be erased in future | ||
| val mockScrapList: List<List<Scrap>> | ||
| get() { |
| modifier = Modifier | ||
| .padding(top = 42.dp) | ||
| .fillMaxWidth(), | ||
| text = "선택하신 날짜에 지원 마감인 스크랩 공고가 없어요.", |
There was a problem hiding this comment.
마침표 빼주세요.... string 분리해주세요....
| ) | ||
| } | ||
| val topModifier = if(!isFromList) { | ||
| Modifier.fillMaxWidth().padding(horizontal = 24.dp).verticalScroll(scrollState) |
arinming
approved these changes
Jul 11, 2024
| sizeTransform = SizeTransform(clip = true) | ||
| ) | ||
| }, | ||
| label = "List Transition" |
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
📸 Screenshot
화면 구현 및 전환
2.mp4
공통 공고 컴포넌트 구현
📢 To Reviewers
복잡한 커밋과 PR을 날리게 된 점 굉장히 죄송합니다🙇
캘린더 구현 관련
공고 컴포넌트 관련