-
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
[UI/#20] 캘린더뷰 / 주간 캘린더 구현 #33
Merged
Merged
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
24bc3e2
[MOD/#20] selectedDate 로직 변경
boiledEgg-s da62b7d
[UI/#20] 주간 캘린더 UI 구현
boiledEgg-s 9c70c38
[UI/#20] 주간 캘린더 + 당일 스크랩 목록 표시 화면 구현
boiledEgg-s ab47b7b
[FEAT/#20] 캘린더 전환 구현
boiledEgg-s 629b177
Merge remote-tracking branch 'origin/develop' into ui/#20-calendar-vi…
boiledEgg-s b0cc77f
[CHORE/#20] 애니메이션 라벨 추가
boiledEgg-s cdd13f8
[MOD/#20] LocalDate 확장함수 구현
boiledEgg-s 21a8942
[MOD/#20] 확장함수 기반 코드 수정
boiledEgg-s 76615cc
[FEAT/#20] 주간->월간 전환 구현
boiledEgg-s 6e89f2a
[ADD/#20] SelectedDateState 추가
boiledEgg-s 05f7daf
[REFACTOR/#20] SelectedDateState 기반 코드 수정
boiledEgg-s 43482a4
[ADD/#38] ScrapBox 컴포넌트 추가
boiledEgg-s d10d547
[ADD/#38] 주석 추가
boiledEgg-s 3b9c59f
[CHORE/#38] 프리뷰 수정
boiledEgg-s d8ae9e2
[MERGE] #38 -> #20
boiledEgg-s 067947a
[REFACTOR/#20] 리뷰 기반 코드 수정
boiledEgg-s 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
[UI/#20] 주간 캘린더 + 당일 스크랩 목록 표시 화면 구현
- Loading branch information
commit 9c70c38475d8ad852bc353486df140edfcfc1ab4
There are no files selected for viewing
59 changes: 59 additions & 0 deletions
59
feature/src/main/java/com/terning/feature/calendar/CalendarWeekWithScrap.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 |
---|---|---|
@@ -0,0 +1,59 @@ | ||
package com.terning.feature.calendar | ||
|
||
import androidx.compose.foundation.background | ||
import androidx.compose.foundation.border | ||
import androidx.compose.foundation.layout.Column | ||
import androidx.compose.foundation.layout.fillMaxWidth | ||
import androidx.compose.foundation.lazy.LazyColumn | ||
import androidx.compose.foundation.shape.RoundedCornerShape | ||
import androidx.compose.material3.Card | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.draw.shadow | ||
import androidx.compose.ui.unit.dp | ||
import com.terning.core.designsystem.theme.Grey200 | ||
import com.terning.core.designsystem.theme.White | ||
import com.terning.feature.calendar.models.Scrap | ||
import java.time.LocalDate | ||
|
||
@Composable | ||
fun CalendarWeekWithScrap( | ||
modifier: Modifier = Modifier, | ||
selectedDate: LocalDate?, | ||
scrapLists: List<List<Scrap>> = listOf(), | ||
onDateSelected: (LocalDate) -> Unit | ||
) { | ||
Column( | ||
modifier = modifier | ||
) { | ||
Card( | ||
modifier = Modifier | ||
.border(0.dp, Grey200, RoundedCornerShape(bottomStart = 20.dp, bottomEnd = 20.dp)) | ||
.shadow( | ||
shape = RoundedCornerShape(bottomStart = 20.dp, bottomEnd = 20.dp), | ||
elevation = 1.dp | ||
), | ||
|
||
shape = RoundedCornerShape(bottomStart = 20.dp, bottomEnd = 20.dp), | ||
) { | ||
CalendarWeek( | ||
modifier = Modifier | ||
.fillMaxWidth() | ||
.background(White), | ||
selectedDate = selectedDate?: LocalDate.now(), | ||
onDateSelected = onDateSelected | ||
) | ||
} | ||
|
||
LazyColumn( | ||
modifier = Modifier | ||
.fillMaxWidth() | ||
){ | ||
/*items(items = scrapLists[selectedDate?.dayOfMonth - 1]) { | ||
|
||
}*/ | ||
|
||
} | ||
} | ||
|
||
} |
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.
border에도 named argument 달아주는 것도 좋을 것 같네용