Skip to content

Commit

Permalink
[REFACTOR/#20] 리뷰 기반 코드 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
boiledEgg-s committed Jul 10, 2024
1 parent d8ae9e2 commit 067947a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.terning.core.designsystem.theme.Grey200
import com.terning.feature.R
import com.terning.feature.calendar.component.CalendarTopBar
Expand All @@ -48,7 +49,7 @@ fun CalendarScreen(
modifier: Modifier = Modifier,
viewModel: CalendarViewModel = hiltViewModel()
) {
val selectedDate by viewModel.selectedDate.collectAsState()
val selectedDate by viewModel.selectedDate.collectAsStateWithLifecycle()
val state by remember { mutableStateOf(CalendarState()) }

val listState = rememberLazyListState(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ fun CalendarWeekWithScrap(
) {
Card(
modifier = Modifier
.border(0.dp, Grey200, RoundedCornerShape(bottomStart = 20.dp, bottomEnd = 20.dp))
.border(
width = 0.dp,
color = Grey200,
shape = RoundedCornerShape(bottomStart = 20.dp, bottomEnd = 20.dp))
.shadow(
shape = RoundedCornerShape(bottomStart = 20.dp, bottomEnd = 20.dp),
elevation = 1.dp
Expand All @@ -49,7 +52,7 @@ fun CalendarWeekWithScrap(
LazyColumn(
modifier = Modifier
.fillMaxWidth()
){
) {
/*items(items = scrapLists[selectedDate?.dayOfMonth - 1]) {
}*/
Expand Down

0 comments on commit 067947a

Please sign in to comment.