From ecf16b31b9c528a3d108a1eaff2557e054025c24 Mon Sep 17 00:00:00 2001
From: boiledegg <tjrwns2163@naver.com>
Date: Fri, 12 Jul 2024 03:09:27 +0900
Subject: [PATCH] =?UTF-8?q?[CHORE/#37]=20=EB=A1=9C=EC=A7=81=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/terning/core/extension/LocalDateExt.kt    | 2 +-
 .../com/terning/feature/calendar/calendar/CalendarRoute.kt  | 4 ++--
 .../terning/feature/calendar/calendar/CalendarViewModel.kt  | 6 +++++-
 .../com/terning/feature/calendar/calendar/CalendarWeek.kt   | 3 ---
 4 files changed, 8 insertions(+), 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
index ae9e81f13..702ea1182 100644
--- 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()
\ No newline at end of file
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
index 661e303bf..db0fb56b5 100644
--- 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
index 15a33ddf9..49f263050 100644
--- 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
index 409b5949c..ea6bb76b6 100644
--- 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 ->