From 02f1a2f11e35452ffbe68d8836eec7349ac38673 Mon Sep 17 00:00:00 2001 From: boiledegg Date: Mon, 13 Jan 2025 01:51:35 +0900 Subject: [PATCH] =?UTF-8?q?[FIX/#330]=20=EB=8B=AC=EB=A0=A5=20=EC=98=81?= =?UTF-8?q?=EC=97=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calendar/calendar/component/group/CalendarWeekGroup.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/feature/calendar/src/main/java/com/terning/feature/calendar/calendar/component/group/CalendarWeekGroup.kt b/feature/calendar/src/main/java/com/terning/feature/calendar/calendar/component/group/CalendarWeekGroup.kt index c242f3a8..de12884b 100644 --- a/feature/calendar/src/main/java/com/terning/feature/calendar/calendar/component/group/CalendarWeekGroup.kt +++ b/feature/calendar/src/main/java/com/terning/feature/calendar/calendar/component/group/CalendarWeekGroup.kt @@ -3,6 +3,7 @@ package com.terning.feature.calendar.calendar.component.group import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.runtime.Composable @@ -45,7 +46,7 @@ internal fun CalendarWeekGroup( ){ dayModels.forEach { dayModel -> Column( - modifier = Modifier + modifier = (Modifier.fillMaxHeight().takeIf { !isWeekEnabled } ?: Modifier) .weight(1f) .noRippleClickable { if (!dayModel.isOutDate) { @@ -107,7 +108,7 @@ private fun CalendarWeekGroupScrapPreview() { CalendarWeekGroup( selectedDay = DayModel(date = LocalDate.now().minusDays(1), weekIndex = 0, isOutDate = false), - isWeekEnabled = false, + isWeekEnabled = true, dayModels = listOf( DayModel(date = LocalDate.now().minusDays(3), weekIndex = 0, isOutDate = false), DayModel(date = LocalDate.now().minusDays(2), weekIndex = 0, isOutDate = false),