Skip to content

Commit 02f1a2f

Browse files
committed
[FIX/#330] 달력 영역 수정
1 parent f51f632 commit 02f1a2f

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

  • feature/calendar/src/main/java/com/terning/feature/calendar/calendar/component/group

feature/calendar/src/main/java/com/terning/feature/calendar/calendar/component/group/CalendarWeekGroup.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.terning.feature.calendar.calendar.component.group
33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.layout.Column
55
import androidx.compose.foundation.layout.Row
6+
import androidx.compose.foundation.layout.fillMaxHeight
67
import androidx.compose.foundation.layout.fillMaxWidth
78
import androidx.compose.foundation.layout.wrapContentHeight
89
import androidx.compose.runtime.Composable
@@ -45,7 +46,7 @@ internal fun CalendarWeekGroup(
4546
){
4647
dayModels.forEach { dayModel ->
4748
Column(
48-
modifier = Modifier
49+
modifier = (Modifier.fillMaxHeight().takeIf { !isWeekEnabled } ?: Modifier)
4950
.weight(1f)
5051
.noRippleClickable {
5152
if (!dayModel.isOutDate) {
@@ -107,7 +108,7 @@ private fun CalendarWeekGroupScrapPreview() {
107108

108109
CalendarWeekGroup(
109110
selectedDay = DayModel(date = LocalDate.now().minusDays(1), weekIndex = 0, isOutDate = false),
110-
isWeekEnabled = false,
111+
isWeekEnabled = true,
111112
dayModels = listOf(
112113
DayModel(date = LocalDate.now().minusDays(3), weekIndex = 0, isOutDate = false),
113114
DayModel(date = LocalDate.now().minusDays(2), weekIndex = 0, isOutDate = false),

0 commit comments

Comments
 (0)