#48 [MOD] date click event 추가

Noostak · Feb 21, 2025 · 7dc42a5 · 7dc42a5
1 parent ec764a2
commit 7dc42a5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/core/src/main/java/com/sopt/core/designsystem/component/calendar/CalendarMonth.kt b/core/src/main/java/com/sopt/core/designsystem/component/calendar/CalendarMonth.kt
@@ -13,14 +13,14 @@ import com.sopt.core.designsystem.theme.NoostakTheme
 import com.sopt.core.extension.getMonthDays
 import com.sopt.domain.entity.CalendarSchedule
 import com.sopt.domain.entity.DayEntity
-import com.sopt.presentation.calendar.component.CalendarWeek
 import java.time.YearMonth
 
 @Composable
 fun CalendarMonth(
     weeks: List<List<DayEntity>>,
     modifier: Modifier = Modifier,
-    scheduleMap: Map<String, List<CalendarSchedule>> = emptyMap()
+    scheduleMap: Map<String, List<CalendarSchedule>> = emptyMap(),
+    onItemClick: () -> Unit = {}
 ) {
     Column(
         modifier = modifier
@@ -31,7 +31,8 @@ fun CalendarMonth(
             CalendarWeek(
                 dayInfo = week,
                 scheduleMap = scheduleMap,
-                modifier = Modifier.padding(top = if (index == 0) 0.dp else 4.dp)
+                modifier = Modifier.padding(top = if (index == 0) 0.dp else 4.dp),
+                onItemClick = { onItemClick() }
             )
         }
     }

diff --git a/core/src/main/java/com/sopt/core/designsystem/component/calendar/CalendarMonthPager.kt b/core/src/main/java/com/sopt/core/designsystem/component/calendar/CalendarMonthPager.kt
@@ -18,7 +18,8 @@ import com.sopt.domain.entity.CalendarSchedule
 fun CalendarMonthPager(
     pagerState: PagerState,
     scheduleMap: Map<String, List<CalendarSchedule>>,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    onItemClick: () -> Unit = {}
 ) {
     HorizontalPager(
         state = pagerState,
@@ -27,7 +28,8 @@ fun CalendarMonthPager(
         CalendarMonth(
             weeks = getMonthDays(getYearMonthByPage(page)),
             scheduleMap = scheduleMap,
-            modifier = Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize(),
+            onItemClick = { onItemClick() }
         )
     }
 }

diff --git a/core/src/main/java/com/sopt/core/designsystem/component/calendar/CalendarWeek.kt b/core/src/main/java/com/sopt/core/designsystem/component/calendar/CalendarWeek.kt
@@ -1,4 +1,4 @@
-package com.sopt.presentation.calendar.component
+package com.sopt.core.designsystem.component.calendar
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -13,11 +13,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.sopt.core.designsystem.component.calendar.CalendarDay
-import com.sopt.core.designsystem.component.calendar.CalendarScheduleGroup
 import com.sopt.core.designsystem.theme.NoostakAndroidTheme
 import com.sopt.core.designsystem.theme.NoostakTheme
 import com.sopt.core.extension.isToday
+import com.sopt.core.extension.noRippleClickable
 import com.sopt.core.extension.toDateString
 import com.sopt.domain.entity.CalendarSchedule
 import com.sopt.domain.entity.DayEntity
@@ -27,7 +26,8 @@ import java.time.LocalDate
 internal fun CalendarWeek(
     dayInfo: List<DayEntity>,
     modifier: Modifier = Modifier,
-    scheduleMap: Map<String, List<CalendarSchedule>> = emptyMap()
+    scheduleMap: Map<String, List<CalendarSchedule>> = emptyMap(),
+    onItemClick: () -> Unit = {}
 ) {
     Row(
         modifier = modifier.background(NoostakTheme.colors.white),
@@ -40,7 +40,8 @@ internal fun CalendarWeek(
             Column(
                 modifier = Modifier
                     .height(84.dp)
-                    .weight(1f),
+                    .weight(1f)
+                    .noRippleClickable { onItemClick() },
                 horizontalAlignment = Alignment.CenterHorizontally
             ) {
                 CalendarDay(

diff --git a/presentation/src/main/java/com/sopt/presentation/calendar/CalendarMonthScreen.kt b/presentation/src/main/java/com/sopt/presentation/calendar/CalendarMonthScreen.kt
@@ -21,7 +21,8 @@ fun CalendarMonthScreen(
     pagerState: PagerState,
     scheduleMap: Map<String, List<CalendarSchedule>>,
     modifier: Modifier = Modifier,
-    calendarViewModel: CalendarViewModel = hiltViewModel()
+    calendarViewModel: CalendarViewModel = hiltViewModel(),
+    onItemClick: () -> Unit = {}
 ) {
     LaunchedEffect(key1 = pagerState.currentPage) {
         snapshotFlow { pagerState.currentPage }
@@ -35,7 +36,8 @@ fun CalendarMonthScreen(
             .fillMaxSize()
             .background(NoostakTheme.colors.white),
         pagerState = pagerState,
-        scheduleMap = scheduleMap
+        scheduleMap = scheduleMap,
+        onItemClick = { onItemClick() }
     )
 }