[CHORE/#37] 로직 오류 수정

teamterning · Jul 11, 2024 · ecf16b3 · ecf16b3
1 parent a123cf2
commit ecf16b3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/core/src/main/java/com/terning/core/extension/LocalDateExt.kt b/core/src/main/java/com/terning/core/extension/LocalDateExt.kt
@@ -10,6 +10,6 @@ fun LocalDate.getStringAsTitle(): String =
 fun LocalDate.getDateStringInKorean(): String =
     "${monthValue}월 ${dayOfMonth}일 ${dayOfWeek.getDisplayName(TextStyle.FULL, Locale.KOREAN)}"
 
-fun LocalDate.getWeekIndexContainingSelectedDate(inDays: Int): Int = (inDays + dayOfMonth) / 7
+fun LocalDate.getWeekIndexContainingSelectedDate(inDays: Int): Int = (inDays + dayOfMonth - 1) / 7
 
 fun LocalDate.isToday(): Boolean = this == LocalDate.now()
diff --git a/feature/src/main/java/com/terning/feature/calendar/calendar/CalendarRoute.kt b/feature/src/main/java/com/terning/feature/calendar/calendar/CalendarRoute.kt
@@ -117,8 +117,8 @@ fun CalendarScreen(
                 )
             },
             label = "List Transition"
-        ) {
-            if (it) {
+        ) { isListExpanded ->
+            if (isListExpanded) {
                 CalendarScrapListScreen(
                     modifier = Modifier
                         .padding(top = paddingValues.calculateTopPadding()),

diff --git a/feature/src/main/java/com/terning/feature/calendar/calendar/CalendarViewModel.kt b/feature/src/main/java/com/terning/feature/calendar/calendar/CalendarViewModel.kt
@@ -39,7 +39,11 @@ class CalendarViewModel @Inject constructor(
                 )
             }
         } else {
-            disableWeekCalendar()
+            _selectedDate.update { currentState ->
+                currentState.copy(
+                    isEnabled = !currentState.isEnabled
+                )
+            }
         }
     }
 

diff --git a/feature/src/main/java/com/terning/feature/calendar/calendar/CalendarWeek.kt b/feature/src/main/java/com/terning/feature/calendar/calendar/CalendarWeek.kt
@@ -34,9 +34,6 @@ fun CalendarWeek(
         pageCount = {monthData.totalDays / 7}
     )
 
-    Timber.tag("CalendarScreen")
-        .d("currentWeek:$currentWeek, totalDays: ${monthData.totalDays}, ${monthData.totalDays / 7}")
-
     HorizontalPager(
         modifier = modifier,
         state = pagerState) { page ->