diff --git a/feature/src/main/java/com/terning/feature/calendar/list/CalendarListScreen.kt b/feature/src/main/java/com/terning/feature/calendar/list/CalendarListScreen.kt index cfa84d3b..36df6fd9 100644 --- a/feature/src/main/java/com/terning/feature/calendar/list/CalendarListScreen.kt +++ b/feature/src/main/java/com/terning/feature/calendar/list/CalendarListScreen.kt @@ -44,6 +44,7 @@ import com.terning.feature.calendar.list.component.CalendarScrapList import com.terning.feature.calendar.list.model.CalendarListUiState import com.terning.feature.dialog.cancel.ScrapCancelDialog import com.terning.feature.dialog.detail.ScrapDialog +import okhttp3.internal.toImmutableList import java.time.LocalDate @Composable @@ -175,7 +176,7 @@ private fun CalendarListScreen( ) CalendarScrapList( - scrapList = scrapMap[dateInKorean].orEmpty(), + scrapList = scrapMap[dateInKorean].orEmpty().toImmutableList(), onScrapButtonClicked = onClickScrapButton, onInternshipClicked = onClickInternship, isFromList = true, diff --git a/feature/src/main/java/com/terning/feature/calendar/list/component/CalendarScrap.kt b/feature/src/main/java/com/terning/feature/calendar/list/component/CalendarScrap.kt index 44debaee..4b05329b 100644 --- a/feature/src/main/java/com/terning/feature/calendar/list/component/CalendarScrap.kt +++ b/feature/src/main/java/com/terning/feature/calendar/list/component/CalendarScrap.kt @@ -27,8 +27,7 @@ fun CalendarScrap( onInternshipClicked(scrap) }, cornerRadius = 10.dp, - scrapColor = Color(android.graphics.Color.parseColor(scrap.color)), - elevation = 1.dp, + scrapColor = Color(android.graphics.Color.parseColor(scrap.color)) ) { InternItem( scrapId = scrap.internshipAnnouncementId, diff --git a/feature/src/main/java/com/terning/feature/calendar/list/component/CalendarScrapList.kt b/feature/src/main/java/com/terning/feature/calendar/list/component/CalendarScrapList.kt index 8661eb19..8ca28306 100644 --- a/feature/src/main/java/com/terning/feature/calendar/list/component/CalendarScrapList.kt +++ b/feature/src/main/java/com/terning/feature/calendar/list/component/CalendarScrapList.kt @@ -3,6 +3,7 @@ package com.terning.feature.calendar.list.component import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.Composable @@ -21,7 +22,7 @@ internal fun CalendarScrapList( val scrollState = rememberScrollState() val topModifier = modifier.then( if (!isFromList) { - Modifier.verticalScroll(scrollState) + Modifier.verticalScroll(scrollState).padding(top = 15.dp) } else { Modifier } diff --git a/feature/src/main/java/com/terning/feature/calendar/week/CalendarWeekScreen.kt b/feature/src/main/java/com/terning/feature/calendar/week/CalendarWeekScreen.kt index 8a02e7ff..0186f8db 100644 --- a/feature/src/main/java/com/terning/feature/calendar/week/CalendarWeekScreen.kt +++ b/feature/src/main/java/com/terning/feature/calendar/week/CalendarWeekScreen.kt @@ -187,7 +187,7 @@ private fun CalendarWeekScreen( color = Black, modifier = Modifier .fillMaxWidth() - .padding(start = 24.dp, top = 16.dp, bottom = 15.dp) + .padding(start = 24.dp, top = 16.dp) ) when (uiState.loadState) { @@ -203,7 +203,6 @@ private fun CalendarWeekScreen( is UiState.Success -> { CalendarWeekSuccess( scrapList = uiState.loadState.data.toImmutableList(), - selectedDate = selectedDate, onScrapButtonClicked = onClickScrapButton, onInternshipClicked = onClickInternship ) @@ -241,7 +240,6 @@ private fun CalendarWeekSuccess( scrapList: List, onScrapButtonClicked: (Long) -> Unit, onInternshipClicked: (CalendarScrapDetail) -> Unit, - selectedDate: LocalDate, ) { CalendarScrapList( scrapList = scrapList,