[MERGE] #268 -> develop

[FIX#268] 캘린더 2차 QA 반영
teamterning · Sep 27, 2024 · 436c3d2 · 436c3d2
2 parents 1bc83e9 + bdf1706
commit 436c3d2
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/core/src/main/assets/terning_scrap_cancel.json b/core/src/main/assets/terning_scrap_cancel.json
diff --git a/core/src/main/assets/terning_start_home.json b/core/src/main/assets/terning_start_home.json
diff --git a/feature/src/main/assets/terning_scrap_cancel.json b/feature/src/main/assets/terning_scrap_cancel.json
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
@@ -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,8 +176,7 @@ private fun CalendarListScreen(
                             )
 
                             CalendarScrapList(
-                                selectedDate = currentDate,
-                                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
@@ -6,6 +6,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.terning.core.designsystem.component.item.InternItem
 import com.terning.core.designsystem.component.item.ScrapBox
+import com.terning.core.designsystem.theme.Grey200
+import com.terning.core.extension.customShadow
 import com.terning.core.extension.noRippleClickable
 import com.terning.domain.entity.calendar.CalendarScrapDetail
 
@@ -17,12 +19,15 @@ fun CalendarScrap(
     modifier: Modifier = Modifier,
 ) {
     ScrapBox(
-        modifier = modifier.noRippleClickable {
+        modifier = modifier.customShadow(
+            color = Grey200,
+            shadowRadius = 5.dp,
+            shadowWidth = 1.dp,
+        ).noRippleClickable {
             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
@@ -3,17 +3,16 @@ 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
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.terning.domain.entity.calendar.CalendarScrapDetail
-import java.time.LocalDate
 
 @Composable
 internal fun CalendarScrapList(
-    selectedDate: LocalDate,
     scrapList: List<CalendarScrapDetail>,
     onScrapButtonClicked: (Long) -> Unit,
     onInternshipClicked: (CalendarScrapDetail) -> Unit,
@@ -23,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
@@ -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,10 +240,8 @@ private fun CalendarWeekSuccess(
     scrapList: List<CalendarScrapDetail>,
     onScrapButtonClicked: (Long) -> Unit,
     onInternshipClicked: (CalendarScrapDetail) -> Unit,
-    selectedDate: LocalDate,
 ) {
     CalendarScrapList(
-        selectedDate = selectedDate,
         scrapList = scrapList,
         onScrapButtonClicked = onScrapButtonClicked,
         onInternshipClicked = onInternshipClicked,