From 418aa562194c8d80a76323bdc6253591112c7b7c Mon Sep 17 00:00:00 2001
From: edv-Shin <edvedv613@gmail.com>
Date: Sun, 15 Dec 2024 22:33:50 +0900
Subject: [PATCH 1/7] =?UTF-8?q?=E2=9C=A8=20Feat:=20=EB=B3=B4=EA=B4=80?=
 =?UTF-8?q?=ED=95=A8=20=EC=BA=98=EB=A6=B0=EB=8D=94=20=ED=98=84=EC=9E=AC=20?=
 =?UTF-8?q?=EB=8B=AC=EC=97=90=20=EB=94=B0=EB=9D=BC=20=ED=85=8D=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=83=89=20=EB=B3=80=EA=B2=BD=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to: #348
---
 .idea/deploymentTargetSelector.xml            |  4 +-
 .idea/other.xml                               | 33 ++++---
 .../ui/home/diary/DiaryCalendarFragment.kt    | 34 ++++---
 .../diary/adapter/DiaryCalendarAdapter.kt     | 89 +++++++++++++------
 .../res/layout/item_diary_calendar_date.xml   |  1 +
 5 files changed, 110 insertions(+), 51 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 7bcb4f36..80a9922b 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-10-29T09:50:21.570709Z">
+        <DropdownSelection timestamp="2024-12-14T06:58:16.787099Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/nahyun/.android/avd/Pixel_4_API_30.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/sindong-won/.android/avd/Pixel_4_API_33.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/other.xml b/.idea/other.xml
index 94c96f63..104e542e 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -25,6 +25,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2160" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="Lenovo" />
+          <option name="codename" value="TB370FU" />
+          <option name="id" value="TB370FU" />
+          <option name="manufacturer" value="Lenovo" />
+          <option name="name" value="Tab P12" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1840" />
+          <option name="screenY" value="2944" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="samsung" />
@@ -245,6 +256,17 @@
           <option name="screenX" value="1812" />
           <option name="screenY" value="2176" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q6q" />
+          <option name="id" value="q6q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1856" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="30" />
           <option name="brand" value="google" />
@@ -301,17 +323,6 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2424" />
         </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
       </list>
     </option>
   </component>
diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt
index 236291e1..f0088a53 100644
--- a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt
+++ b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt
@@ -112,38 +112,48 @@ class DiaryCalendarFragment :
         var scrollJob: Job? = null // 코루틴 Job 변수로 스크롤을 제어
 
         binding.diaryCalendarRv.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            private var isScrollingFast = false
             override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
                 super.onScrollStateChanged(recyclerView, newState)
                 if (newState == RecyclerView.SCROLL_STATE_IDLE) {
-                    // 스크롤이 멈췄을 때만 API 호출
                     scrollJob?.cancel() // 기존 Job 취소
                     scrollJob = CoroutineScope(Dispatchers.Main).launch {
                         delay(200)
                         setDiaryIndicator(recyclerView)
+                        updateVisibleMonth(recyclerView) // 스크롤 멈췄을 때 중앙 달 업데이트
                     }
-                    isScrollingFast = false // 스크롤 멈추면 속도 상태 초기화
                 }
             }
 
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                 super.onScrolled(recyclerView, dx, dy)
-                checkFirstDay(recyclerView)
                 updateReturnBtnVisible()
-                // 스크롤 속도가 빠른지 감지
-                isScrollingFast = dy > recyclerView.height / 3
-                if (!isScrollingFast) {
-                    if (scrollJob == null || scrollJob?.isActive == false) {
-                        scrollJob = CoroutineScope(Dispatchers.Main).launch {
-                            delay(300)
-                            setDiaryIndicator(recyclerView)
-                        }
+                if (scrollJob == null || scrollJob?.isActive == false) {
+                    scrollJob = CoroutineScope(Dispatchers.Main).launch {
+                        delay(300)
+                        updateVisibleMonth(recyclerView) // 스크롤 도중에도 중앙 달 업데이트
                     }
                 }
             }
         })
     }
 
+    private fun updateVisibleMonth(recyclerView: RecyclerView) {
+        val layoutManager = recyclerView.layoutManager as GridLayoutManager
+        val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
+        val lastVisiblePosition = layoutManager.findLastVisibleItemPosition()
+
+        // 중앙에 위치한 아이템 계산
+        val centerPosition = (firstVisiblePosition + lastVisiblePosition) / 2
+        val centerItem = calendarAdapter.getItemAtPosition(centerPosition)
+
+        // 어댑터에 중앙에 보이는 달 전달
+        centerItem?.let {
+            val currentMonth = it.toYearMonth()
+            calendarAdapter.updateVisibleMonth(currentMonth)
+        }
+    }
+
+
 
 
     private fun updateReturnBtnVisible() {
diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
index bee2f710..a6548558 100644
--- a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
+++ b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
@@ -13,47 +13,63 @@ import com.mongmong.namo.domain.model.CalendarDate
 import com.mongmong.namo.domain.model.CalendarDay
 import com.mongmong.namo.domain.model.ScheduleType
 import com.mongmong.namo.presentation.utils.converter.DiaryDateConverter.toYearMonth
+import java.util.Calendar
 
 class DiaryCalendarAdapter(
     private val recyclerView: RecyclerView,
     private val items: List<CalendarDay>,
     private val listener: OnCalendarListener
 ) : RecyclerView.Adapter<DiaryCalendarAdapter.ViewHolder>() {
+
     private var diaryDates: MutableMap<String, Set<CalendarDate>> = mutableMapOf() // "yyyy-MM": [기록된 날짜들]
-    private var isOpeningBottomSheet: Boolean = false
+    private var isBottomSheetOpen: Boolean = false // 바텀시트 상태
     private var selectedDateView: TextView? = null  // 선택된 날짜의 TextView
     private var selectedDate: CalendarDay? = null  // 선택된 날짜
+    private var visibleMonth: String? = null // 현재 화면 중앙의 달 ("yyyy-MM")
 
     fun updateDiaryDates(yearMonth: String, diaryDates: Set<CalendarDate>) {
         this.diaryDates[yearMonth] = diaryDates
 
         items.forEachIndexed { index, calendarDay ->
-            if (calendarDay.toYearMonth() == yearMonth && diaryDates.any { it.date == calendarDay.date.toString() }) {
+            if (calendarDay.toYearMonth() == yearMonth) {
                 notifyItemChanged(index)
             }
         }
     }
 
-    fun updateBottomSheetState(isOpened: Boolean) {
-        this.isOpeningBottomSheet = isOpened
-
-        // 화면에 보이는 아이템들의 위치를 가져옴
-        val layoutManager = recyclerView.layoutManager ?: return
-        val firstVisibleItemPosition = (layoutManager as GridLayoutManager).findFirstVisibleItemPosition()
-        val lastVisibleItemPosition = layoutManager.findLastVisibleItemPosition()
-
-        // 화면에 보이는 아이템들에 대해서는 애니메이션 적용
-        for (i in firstVisibleItemPosition..lastVisibleItemPosition) {
-            val viewHolder = recyclerView.findViewHolderForAdapterPosition(i) as ViewHolder
-            viewHolder.updateItemWithAnimate(isOpened)
+    fun updateVisibleMonth(visibleMonth: String) {
+        if (this.visibleMonth != visibleMonth) {
+            this.visibleMonth = visibleMonth
+            notifyDataSetChanged() // 현재 보이는 달이 바뀌었을 때 전체 갱신
         }
+    }
 
-        // 화면에 보이지 않는 아이템들은 높이 변경을 직접 적용하도록 notify
-        if (firstVisibleItemPosition > 0) {
-            notifyItemRangeChanged(0, firstVisibleItemPosition)
-        }
-        if (lastVisibleItemPosition < itemCount - 1) {
-            notifyItemRangeChanged(lastVisibleItemPosition + 1, itemCount - lastVisibleItemPosition - 1)
+    fun updateBottomSheetState(isOpened: Boolean) {
+        if (isBottomSheetOpen != isOpened) {
+            isBottomSheetOpen = isOpened
+
+            // 화면에 보이는 아이템들의 위치를 가져옴
+            val layoutManager = recyclerView.layoutManager ?: return
+            val firstVisibleItemPosition = (layoutManager as GridLayoutManager).findFirstVisibleItemPosition()
+            val lastVisibleItemPosition = layoutManager.findLastVisibleItemPosition()
+
+            // 보이는 아이템은 애니메이션 적용
+            for (i in firstVisibleItemPosition..lastVisibleItemPosition) {
+                val viewHolder = recyclerView.findViewHolderForAdapterPosition(i) as? ViewHolder
+                viewHolder?.updateItemWithAnimate(isOpened)
+            }
+
+            // 보이지 않는 아이템은 notify로 높이 변경
+            if (firstVisibleItemPosition > 0) {
+                for (i in 0 until firstVisibleItemPosition) {
+                    notifyItemChanged(i, isOpened)
+                }
+            }
+            if (lastVisibleItemPosition < itemCount - 1) {
+                for (i in lastVisibleItemPosition + 1 until itemCount) {
+                    notifyItemChanged(i, isOpened)
+                }
+            }
         }
     }
 
@@ -65,7 +81,18 @@ class DiaryCalendarAdapter(
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val item = items[position]
         holder.bind(item)
-        holder.updateItem(isOpeningBottomSheet)
+
+        // 현재 달 상태에 따라 아이템을 업데이트
+        holder.updateItem(isBottomSheetOpen)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        if (payloads.isNotEmpty()) {
+            val isOpened = payloads[0] as Boolean
+            holder.updateItem(isOpened)
+        } else {
+            super.onBindViewHolder(holder, position, payloads)
+        }
     }
 
     fun getItemAtPosition(position: Int): CalendarDay? {
@@ -80,6 +107,7 @@ class DiaryCalendarAdapter(
         fun bind(calendarDay: CalendarDay) {
             binding.calendarDay = calendarDay
 
+            // Indicator 설정
             val dateType = diaryDates[calendarDay.toYearMonth()]?.find { it.date == calendarDay.date.toString() }?.type
             binding.diaryCalendarHasDiaryIndicatorIv.visibility = if (dateType != null) View.VISIBLE else View.GONE
 
@@ -96,20 +124,29 @@ class DiaryCalendarAdapter(
                 )
             }
 
+            // 텍스트 색상 설정
             binding.diaryCalendarDateTv.setTextColor(
                 binding.root.context.getColor(
                     when {
-                        calendarDay.isSameDate(selectedDate) -> R.color.main
-                        calendarDay.isAfterToday() -> R.color.text_placeholder
-                        else -> R.color.main_text
+                        calendarDay.isSameDate(selectedDate) -> R.color.main // 선택된 날짜
+                        calendarDay.toYearMonth() == visibleMonth -> R.color.main_text // 현재 달
+                        else -> R.color.text_placeholder // 다른 달
                     }
                 )
             )
 
+            // 클릭 리스너 설정
             binding.root.setOnClickListener {
                 updateSelectedDateView(binding.diaryCalendarDateTv, calendarDay)
                 listener.onCalendarDayClick(calendarDay)
             }
+
+            // 아이템 높이 설정
+            val height = dpToPx(if (isBottomSheetOpen) OPEN_HEIGHT else CLOSE_HEIGHT, binding.root.context)
+            binding.root.layoutParams = binding.root.layoutParams.apply {
+                this.height = height
+            }
+            binding.root.requestLayout()
         }
 
         fun updateItem(isOpening: Boolean) {
@@ -147,7 +184,7 @@ class DiaryCalendarAdapter(
             if (selectedDate?.isSameDate(newDate) == true) {
                 selectedDateView?.setTextColor(
                     binding.diaryCalendarDateTv.context.getColor(
-                        if (newDate.isAfterToday()) R.color.text_placeholder else R.color.main_text
+                        if (newDate.toYearMonth() == visibleMonth) R.color.main_text else R.color.text_placeholder
                     )
                 )
                 selectedDate = null
@@ -156,7 +193,7 @@ class DiaryCalendarAdapter(
                 // 새로운 날짜를 선택
                 selectedDateView?.setTextColor(
                     binding.diaryCalendarDateTv.context.getColor(
-                        if (newDate.isAfterToday()) R.color.text_placeholder else R.color.main_text
+                        if (selectedDate?.toYearMonth() == visibleMonth) R.color.main_text else R.color.text_placeholder
                     )
                 )
                 selectedDate = newDate
diff --git a/app/src/main/res/layout/item_diary_calendar_date.xml b/app/src/main/res/layout/item_diary_calendar_date.xml
index 773b0165..853a3ca5 100644
--- a/app/src/main/res/layout/item_diary_calendar_date.xml
+++ b/app/src/main/res/layout/item_diary_calendar_date.xml
@@ -31,6 +31,7 @@
             android:visibility="gone"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="13dp"
+            android:src="@drawable/ic_archive_diary_small"
             app:layout_constraintTop_toBottomOf="@id/diary_calendar_date_tv"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

From a2fde0aaeee435092f43319c6a8c2cbd0f9951b8 Mon Sep 17 00:00:00 2001
From: edv-Shin <edvedv613@gmail.com>
Date: Sun, 15 Dec 2024 22:36:04 +0900
Subject: [PATCH 2/7] =?UTF-8?q?=E2=9C=A8=20Feat:=20=EB=B3=B4=EA=B4=80?=
 =?UTF-8?q?=ED=95=A8=20=EC=BA=98=EB=A6=B0=EB=8D=94=20=EA=B8=B0=EB=A1=9D=20?=
 =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to: #348
---
 .../ui/home/diary/adapter/DiaryCalendarAdapter.kt           | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
index a6548558..a2c7e841 100644
--- a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
+++ b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
@@ -156,9 +156,6 @@ class DiaryCalendarAdapter(
                 this.height = height
             }
             binding.root.requestLayout()
-
-            val indicatorImage = if (isOpening) R.drawable.ic_archive_diary_small else R.drawable.ic_archive_diary
-            binding.diaryCalendarHasDiaryIndicatorIv.setImageResource(indicatorImage)
         }
 
         fun updateItemWithAnimate(isOpening: Boolean) {
@@ -174,9 +171,6 @@ class DiaryCalendarAdapter(
             }
             valueAnimator.duration = ANIMATION_DURATION
             valueAnimator.start()
-
-            val indicatorImage = if (isOpening) R.drawable.ic_archive_diary_small else R.drawable.ic_archive_diary
-            binding.diaryCalendarHasDiaryIndicatorIv.setImageResource(indicatorImage)
         }
 
         private fun updateSelectedDateView(newDateView: TextView, newDate: CalendarDay) {

From 2ad3e9c7bfe4c97b63f6b9e7ee7e96dc58435a2b Mon Sep 17 00:00:00 2001
From: edv-Shin <edvedv613@gmail.com>
Date: Mon, 16 Dec 2024 18:35:33 +0900
Subject: [PATCH 3/7] =?UTF-8?q?=E2=9C=A8=20Feat:=20=EB=B3=B4=EA=B4=80?=
 =?UTF-8?q?=ED=95=A8=20=EC=BA=98=EB=A6=B0=EB=8D=94=20=ED=98=84=EC=9E=AC=20?=
 =?UTF-8?q?=EB=8B=AC=20=EC=8A=A4=EB=82=B5=EB=B0=94=20=EB=B3=B5=EA=B5=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to: #348
---
 .../ui/home/diary/DiaryCalendarFragment.kt    | 28 ++++---------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt
index f0088a53..37208593 100644
--- a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt
+++ b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt
@@ -44,7 +44,7 @@ class DiaryCalendarFragment :
     private lateinit var personalDiaryAdapter: PersonalDiaryRVAdapter
     private lateinit var moimDiaryAdapter: MoimDiaryRVAdapter
     private var isInitialLoad = true
-    private var lastDisplayedMonth: Int? = null // 마지막으로 표시된 월을 저장하는 변수
+    private var lastDisplayedMonth: String? = null // 마지막으로 표시된 월을 저장
     private val fetchedMonths = mutableSetOf<String>() // 이미 요청한 월을 저장하는 집합
 
     override fun setup() {
@@ -149,6 +149,10 @@ class DiaryCalendarFragment :
         // 어댑터에 중앙에 보이는 달 전달
         centerItem?.let {
             val currentMonth = it.toYearMonth()
+            if (currentMonth != lastDisplayedMonth) {
+                lastDisplayedMonth = currentMonth
+                showMonthSnackBar(it.year, it.month + 1) // 스낵바 띄우기
+            }
             calendarAdapter.updateVisibleMonth(currentMonth)
         }
     }
@@ -167,28 +171,6 @@ class DiaryCalendarFragment :
         viewModel.setReturnBtnVisible(!isAtBottom && !isBottomSheetOpened)
     }
 
-    private fun checkFirstDay(recyclerView: RecyclerView) {
-        val layoutManager = recyclerView.layoutManager as GridLayoutManager
-        val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
-        val lastVisiblePosition = firstVisiblePosition + INDICATOR_LAST
-
-        for (position in firstVisiblePosition..lastVisiblePosition) {
-            val calendarDay = calendarAdapter.getItemAtPosition(position)
-            if (calendarDay != null) {
-                if (calendarDay.date == 1) {
-                    val currentMonth = calendarDay.month + 1
-
-                    // 달이 바뀐 경우에만 스낵바
-                    if (lastDisplayedMonth == null || lastDisplayedMonth != currentMonth) {
-                        lastDisplayedMonth = currentMonth
-                        showMonthSnackBar(calendarDay.year, currentMonth)
-                    }
-                    break
-                }
-            }
-        }
-    }
-
     private fun setDiaryIndicator(recyclerView: RecyclerView) {
         val layoutManager = recyclerView.layoutManager as GridLayoutManager
         val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()

From d4126d4988d0f0bc182be74da40d9ba76815a5ca Mon Sep 17 00:00:00 2001
From: edv-Shin <edvedv613@gmail.com>
Date: Tue, 17 Dec 2024 23:27:31 +0900
Subject: [PATCH 4/7] =?UTF-8?q?=F0=9F=94=A7=20Chore:=20=EB=B6=88=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EC=83=81=EC=88=98=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to: #348
---
 .../namo/presentation/ui/home/diary/DiaryCalendarFragment.kt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt
index 37208593..7c655fd8 100644
--- a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt
+++ b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/DiaryCalendarFragment.kt
@@ -309,9 +309,4 @@ class DiaryCalendarFragment :
             viewModel.toggleBottomSheetState()
         }
     }
-
-    companion object {
-        const val INDICATOR_FIRST = 7
-        const val INDICATOR_LAST = 21
-    }
 }

From eb58d2853f4d1e5aa6acde2265dfd77b75f0df72 Mon Sep 17 00:00:00 2001
From: edv-Shin <edvedv613@gmail.com>
Date: Wed, 18 Dec 2024 14:46:28 +0900
Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=90=9B=20Fix:=20=EB=82=A0=EC=A7=9C=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=20=ED=85=8D=EC=8A=A4=ED=8A=B8=EA=B0=80=20?=
 =?UTF-8?q?=EC=A4=91=EB=B3=B5=EC=A0=81=EC=9A=A9=EB=90=98=EB=8A=94=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to: #348
---
 .../diary/adapter/DiaryCalendarAdapter.kt     | 136 +++++-------------
 1 file changed, 39 insertions(+), 97 deletions(-)

diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
index a2c7e841..0bb4ae06 100644
--- a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
+++ b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
@@ -13,7 +13,6 @@ import com.mongmong.namo.domain.model.CalendarDate
 import com.mongmong.namo.domain.model.CalendarDay
 import com.mongmong.namo.domain.model.ScheduleType
 import com.mongmong.namo.presentation.utils.converter.DiaryDateConverter.toYearMonth
-import java.util.Calendar
 
 class DiaryCalendarAdapter(
     private val recyclerView: RecyclerView,
@@ -21,54 +20,35 @@ class DiaryCalendarAdapter(
     private val listener: OnCalendarListener
 ) : RecyclerView.Adapter<DiaryCalendarAdapter.ViewHolder>() {
 
-    private var diaryDates: MutableMap<String, Set<CalendarDate>> = mutableMapOf() // "yyyy-MM": [기록된 날짜들]
-    private var isBottomSheetOpen: Boolean = false // 바텀시트 상태
-    private var selectedDateView: TextView? = null  // 선택된 날짜의 TextView
-    private var selectedDate: CalendarDay? = null  // 선택된 날짜
-    private var visibleMonth: String? = null // 현재 화면 중앙의 달 ("yyyy-MM")
+    private var diaryDates: MutableMap<String, Set<CalendarDate>> = mutableMapOf()
+    private var isBottomSheetOpen: Boolean = false
+    private var selectedDate: CalendarDay? = null // 선택된 날짜
+    private var visibleMonth: String? = null
 
     fun updateDiaryDates(yearMonth: String, diaryDates: Set<CalendarDate>) {
         this.diaryDates[yearMonth] = diaryDates
-
         items.forEachIndexed { index, calendarDay ->
-            if (calendarDay.toYearMonth() == yearMonth) {
-                notifyItemChanged(index)
-            }
+            if (calendarDay.toYearMonth() == yearMonth) notifyItemChanged(index)
         }
     }
 
     fun updateVisibleMonth(visibleMonth: String) {
         if (this.visibleMonth != visibleMonth) {
             this.visibleMonth = visibleMonth
-            notifyDataSetChanged() // 현재 보이는 달이 바뀌었을 때 전체 갱신
+            notifyDataSetChanged()
         }
     }
 
     fun updateBottomSheetState(isOpened: Boolean) {
         if (isBottomSheetOpen != isOpened) {
             isBottomSheetOpen = isOpened
-
-            // 화면에 보이는 아이템들의 위치를 가져옴
-            val layoutManager = recyclerView.layoutManager ?: return
-            val firstVisibleItemPosition = (layoutManager as GridLayoutManager).findFirstVisibleItemPosition()
+            val layoutManager = recyclerView.layoutManager as? GridLayoutManager ?: return
+            val firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition()
             val lastVisibleItemPosition = layoutManager.findLastVisibleItemPosition()
 
-            // 보이는 아이템은 애니메이션 적용
             for (i in firstVisibleItemPosition..lastVisibleItemPosition) {
-                val viewHolder = recyclerView.findViewHolderForAdapterPosition(i) as? ViewHolder
-                viewHolder?.updateItemWithAnimate(isOpened)
-            }
-
-            // 보이지 않는 아이템은 notify로 높이 변경
-            if (firstVisibleItemPosition > 0) {
-                for (i in 0 until firstVisibleItemPosition) {
-                    notifyItemChanged(i, isOpened)
-                }
-            }
-            if (lastVisibleItemPosition < itemCount - 1) {
-                for (i in lastVisibleItemPosition + 1 until itemCount) {
-                    notifyItemChanged(i, isOpened)
-                }
+                (recyclerView.findViewHolderForAdapterPosition(i) as? ViewHolder)
+                    ?.updateItemWithAnimate(isOpened)
             }
         }
     }
@@ -80,21 +60,11 @@ class DiaryCalendarAdapter(
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val item = items[position]
-        holder.bind(item)
-
-        // 현재 달 상태에 따라 아이템을 업데이트
+        val isSelected = selectedDate?.isSameDate(item) == true
+        holder.bind(item, isSelected)
         holder.updateItem(isBottomSheetOpen)
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
-        if (payloads.isNotEmpty()) {
-            val isOpened = payloads[0] as Boolean
-            holder.updateItem(isOpened)
-        } else {
-            super.onBindViewHolder(holder, position, payloads)
-        }
-    }
-
     fun getItemAtPosition(position: Int): CalendarDay? {
         return if (position in items.indices) items[position] else null
     }
@@ -104,11 +74,11 @@ class DiaryCalendarAdapter(
     inner class ViewHolder(val binding: ItemDiaryCalendarDateBinding) :
         RecyclerView.ViewHolder(binding.root) {
 
-        fun bind(calendarDay: CalendarDay) {
+        fun bind(calendarDay: CalendarDay, isSelected: Boolean) {
             binding.calendarDay = calendarDay
 
-            // Indicator 설정
-            val dateType = diaryDates[calendarDay.toYearMonth()]?.find { it.date == calendarDay.date.toString() }?.type
+            val dateType = diaryDates[calendarDay.toYearMonth()]
+                ?.find { it.date == calendarDay.date.toString() }?.type
             binding.diaryCalendarHasDiaryIndicatorIv.visibility = if (dateType != null) View.VISIBLE else View.GONE
 
             val color = when (dateType) {
@@ -116,88 +86,60 @@ class DiaryCalendarAdapter(
                 ScheduleType.MOIM -> R.color.main
                 else -> null
             }
-
             color?.let {
                 binding.diaryCalendarHasDiaryIndicatorIv.setColorFilter(
-                    binding.root.context.getColor(it),
-                    android.graphics.PorterDuff.Mode.SRC_IN
+                    binding.root.context.getColor(it), android.graphics.PorterDuff.Mode.SRC_IN
                 )
             }
 
-            // 텍스트 색상 설정
             binding.diaryCalendarDateTv.setTextColor(
                 binding.root.context.getColor(
                     when {
-                        calendarDay.isSameDate(selectedDate) -> R.color.main // 선택된 날짜
-                        calendarDay.toYearMonth() == visibleMonth -> R.color.main_text // 현재 달
-                        else -> R.color.text_placeholder // 다른 달
+                        isSelected -> R.color.main
+                        calendarDay.toYearMonth() == visibleMonth -> R.color.main_text
+                        else -> R.color.text_placeholder
                     }
                 )
             )
+            binding.diaryCalendarDateTv.invalidate()
 
-            // 클릭 리스너 설정
             binding.root.setOnClickListener {
-                updateSelectedDateView(binding.diaryCalendarDateTv, calendarDay)
+                updateSelectedDate(calendarDay)
                 listener.onCalendarDayClick(calendarDay)
             }
-
-            // 아이템 높이 설정
-            val height = dpToPx(if (isBottomSheetOpen) OPEN_HEIGHT else CLOSE_HEIGHT, binding.root.context)
-            binding.root.layoutParams = binding.root.layoutParams.apply {
-                this.height = height
-            }
-            binding.root.requestLayout()
         }
 
         fun updateItem(isOpening: Boolean) {
-            // 높이 조정
             val height = dpToPx(if (isOpening) OPEN_HEIGHT else CLOSE_HEIGHT, binding.root.context)
-            binding.root.layoutParams = binding.root.layoutParams.apply {
-                this.height = height
-            }
+            binding.root.layoutParams = binding.root.layoutParams.apply { this.height = height }
             binding.root.requestLayout()
         }
 
         fun updateItemWithAnimate(isOpening: Boolean) {
-            // 높이 조정
             val fromHeight = binding.root.height
             val toHeight = dpToPx(if (isOpening) OPEN_HEIGHT else CLOSE_HEIGHT, binding.root.context)
-
-            val valueAnimator = ValueAnimator.ofInt(fromHeight, toHeight)
-            valueAnimator.addUpdateListener { animator ->
-                val layoutParams = binding.root.layoutParams
-                layoutParams.height = animator.animatedValue as Int
-                binding.root.layoutParams = layoutParams
-            }
-            valueAnimator.duration = ANIMATION_DURATION
-            valueAnimator.start()
-        }
-
-        private fun updateSelectedDateView(newDateView: TextView, newDate: CalendarDay) {
-            // 선택한 날짜를 다시 클릭하면 선택을 해제
-            if (selectedDate?.isSameDate(newDate) == true) {
-                selectedDateView?.setTextColor(
-                    binding.diaryCalendarDateTv.context.getColor(
-                        if (newDate.toYearMonth() == visibleMonth) R.color.main_text else R.color.text_placeholder
-                    )
-                )
-                selectedDate = null
-                selectedDateView = null
-            } else {
-                // 새로운 날짜를 선택
-                selectedDateView?.setTextColor(
-                    binding.diaryCalendarDateTv.context.getColor(
-                        if (selectedDate?.toYearMonth() == visibleMonth) R.color.main_text else R.color.text_placeholder
-                    )
-                )
-                selectedDate = newDate
-                selectedDateView = newDateView.apply {
-                    setTextColor(context.getColor(R.color.main))
+            ValueAnimator.ofInt(fromHeight, toHeight).apply {
+                addUpdateListener { animator ->
+                    binding.root.layoutParams = binding.root.layoutParams.apply {
+                        height = animator.animatedValue as Int
+                    }
                 }
+                duration = ANIMATION_DURATION
+                start()
             }
         }
     }
 
+    private fun updateSelectedDate(newDate: CalendarDay) {
+        val oldSelectedPosition = items.indexOfFirst { it.isSameDate(selectedDate) }
+        val newSelectedPosition = items.indexOfFirst { it.isSameDate(newDate) }
+
+        selectedDate = if (selectedDate?.isSameDate(newDate) == true) null else newDate
+
+        if (oldSelectedPosition != -1) notifyItemChanged(oldSelectedPosition)
+        if (newSelectedPosition != -1) notifyItemChanged(newSelectedPosition)
+    }
+
     interface OnCalendarListener {
         fun onCalendarDayClick(calendarDay: CalendarDay)
     }

From 7ed76ea725f9220fa4b78474ead6a7d3689f7e00 Mon Sep 17 00:00:00 2001
From: edv-Shin <edvedv613@gmail.com>
Date: Wed, 25 Dec 2024 00:30:58 +0900
Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=90=9B=20Fix:=20notifyItemChanged?=
 =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=95=A0=EB=8B=88=EB=A9=94?=
 =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=98=A4=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

Related to: #348
---
 .../diary/adapter/DiaryCalendarAdapter.kt     | 162 +++++++++++++-----
 1 file changed, 120 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
index 0bb4ae06..ab6d433e 100644
--- a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
+++ b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
@@ -1,6 +1,7 @@
 package com.mongmong.namo.presentation.ui.home.diary.adapter
 
 import android.animation.ValueAnimator
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,6 +14,7 @@ import com.mongmong.namo.domain.model.CalendarDate
 import com.mongmong.namo.domain.model.CalendarDay
 import com.mongmong.namo.domain.model.ScheduleType
 import com.mongmong.namo.presentation.utils.converter.DiaryDateConverter.toYearMonth
+import java.util.Calendar
 
 class DiaryCalendarAdapter(
     private val recyclerView: RecyclerView,
@@ -20,35 +22,54 @@ class DiaryCalendarAdapter(
     private val listener: OnCalendarListener
 ) : RecyclerView.Adapter<DiaryCalendarAdapter.ViewHolder>() {
 
-    private var diaryDates: MutableMap<String, Set<CalendarDate>> = mutableMapOf()
-    private var isBottomSheetOpen: Boolean = false
-    private var selectedDate: CalendarDay? = null // 선택된 날짜
-    private var visibleMonth: String? = null
+    private var diaryDates: MutableMap<String, Set<CalendarDate>> = mutableMapOf() // "yyyy-MM": [기록된 날짜들]
+    private var isBottomSheetOpen: Boolean = false // 바텀시트 상태
+    private var selectedDateView: TextView? = null  // 선택된 날짜의 TextView
+    private var selectedDate: CalendarDay? = null  // 선택된 날짜
+    private var visibleMonth: String? = null // 현재 화면 중앙의 달 ("yyyy-MM")
 
     fun updateDiaryDates(yearMonth: String, diaryDates: Set<CalendarDate>) {
         this.diaryDates[yearMonth] = diaryDates
+
         items.forEachIndexed { index, calendarDay ->
-            if (calendarDay.toYearMonth() == yearMonth) notifyItemChanged(index)
+            if (calendarDay.toYearMonth() == yearMonth) {
+                notifyItemChanged(index)
+            }
         }
     }
 
     fun updateVisibleMonth(visibleMonth: String) {
         if (this.visibleMonth != visibleMonth) {
             this.visibleMonth = visibleMonth
-            notifyDataSetChanged()
+            notifyDataSetChanged() // 현재 보이는 달이 바뀌었을 때 전체 갱신
         }
     }
 
     fun updateBottomSheetState(isOpened: Boolean) {
-        if (isBottomSheetOpen != isOpened) {
-            isBottomSheetOpen = isOpened
-            val layoutManager = recyclerView.layoutManager as? GridLayoutManager ?: return
-            val firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition()
-            val lastVisibleItemPosition = layoutManager.findLastVisibleItemPosition()
-
-            for (i in firstVisibleItemPosition..lastVisibleItemPosition) {
-                (recyclerView.findViewHolderForAdapterPosition(i) as? ViewHolder)
-                    ?.updateItemWithAnimate(isOpened)
+        if (isBottomSheetOpen == isOpened) return
+        isBottomSheetOpen = isOpened
+
+        // 화면에 보이는 아이템들의 위치를 가져옴
+        val layoutManager = recyclerView.layoutManager ?: return
+        val firstVisibleItemPosition =
+            (layoutManager as GridLayoutManager).findFirstVisibleItemPosition()
+        val lastVisibleItemPosition = layoutManager.findLastVisibleItemPosition()
+
+        // 보이는 아이템은 애니메이션 적용
+        for (i in firstVisibleItemPosition..lastVisibleItemPosition) {
+            val viewHolder = recyclerView.findViewHolderForAdapterPosition(i) as? ViewHolder
+            viewHolder?.updateItemWithAnimate(isOpened)
+        }
+
+        // 보이지 않는 아이템은 notify로 높이 변경
+        if (firstVisibleItemPosition > 0) {
+            for (i in 0 until firstVisibleItemPosition) {
+                notifyItemChanged(i, isOpened)
+            }
+        }
+        if (lastVisibleItemPosition < itemCount - 1) {
+            for (i in lastVisibleItemPosition + 1 until itemCount) {
+                notifyItemChanged(i, isOpened)
             }
         }
     }
@@ -60,11 +81,30 @@ class DiaryCalendarAdapter(
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val item = items[position]
-        val isSelected = selectedDate?.isSameDate(item) == true
-        holder.bind(item, isSelected)
+        holder.bind(item)
+
+        // 현재 달 상태에 따라 아이템을 업데이트
         holder.updateItem(isBottomSheetOpen)
     }
 
+    override fun onBindViewHolder(holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        if (payloads.isNotEmpty()) {
+            when (payloads[0]) {
+                PAYLOAD_SELECT -> holder.setSelected(true)
+                PAYLOAD_DESELECT -> holder.setSelected(false)
+                else -> {
+                    Log.e("DiaryCalendarAdapter", "Unexpected payload: ${payloads[0]}")
+                    holder.bind(items[position])
+                }
+            }
+        } else {
+            Log.e("DiaryCalendarAdapter", "Unexpected payload2")
+            holder.bind(items[position])
+        }
+    }
+
+
+
     fun getItemAtPosition(position: Int): CalendarDay? {
         return if (position in items.indices) items[position] else null
     }
@@ -74,11 +114,11 @@ class DiaryCalendarAdapter(
     inner class ViewHolder(val binding: ItemDiaryCalendarDateBinding) :
         RecyclerView.ViewHolder(binding.root) {
 
-        fun bind(calendarDay: CalendarDay, isSelected: Boolean) {
+        fun bind(calendarDay: CalendarDay) {
             binding.calendarDay = calendarDay
 
-            val dateType = diaryDates[calendarDay.toYearMonth()]
-                ?.find { it.date == calendarDay.date.toString() }?.type
+            // Indicator 설정
+            val dateType = diaryDates[calendarDay.toYearMonth()]?.find { it.date == calendarDay.date.toString() }?.type
             binding.diaryCalendarHasDiaryIndicatorIv.visibility = if (dateType != null) View.VISIBLE else View.GONE
 
             val color = when (dateType) {
@@ -86,58 +126,93 @@ class DiaryCalendarAdapter(
                 ScheduleType.MOIM -> R.color.main
                 else -> null
             }
+
             color?.let {
                 binding.diaryCalendarHasDiaryIndicatorIv.setColorFilter(
-                    binding.root.context.getColor(it), android.graphics.PorterDuff.Mode.SRC_IN
+                    binding.root.context.getColor(it),
+                    android.graphics.PorterDuff.Mode.SRC_IN
                 )
             }
 
+            // 텍스트 색상 설정
             binding.diaryCalendarDateTv.setTextColor(
                 binding.root.context.getColor(
                     when {
-                        isSelected -> R.color.main
-                        calendarDay.toYearMonth() == visibleMonth -> R.color.main_text
-                        else -> R.color.text_placeholder
+                        calendarDay.isSameDate(selectedDate) -> R.color.main // 선택된 날짜
+                        calendarDay.toYearMonth() == visibleMonth -> R.color.main_text // 현재 달
+                        else -> R.color.text_placeholder // 다른 달
                     }
                 )
             )
-            binding.diaryCalendarDateTv.invalidate()
 
+            // 클릭 리스너 설정
             binding.root.setOnClickListener {
-                updateSelectedDate(calendarDay)
+                updateSelectedDateView(binding.diaryCalendarDateTv, calendarDay)
                 listener.onCalendarDayClick(calendarDay)
             }
+
+            // 아이템 높이 설정
+            val height = dpToPx(if (isBottomSheetOpen) OPEN_HEIGHT else CLOSE_HEIGHT, binding.root.context)
+            binding.root.layoutParams = binding.root.layoutParams.apply {
+                this.height = height
+            }
+            binding.root.requestLayout()
+        }
+
+        fun setSelected(isSelected: Boolean) {
+            binding.diaryCalendarDateTv.setTextColor(
+                binding.root.context.getColor(
+                    if (isSelected) R.color.main
+                    else if (binding.calendarDay?.toYearMonth() == visibleMonth) R.color.main_text
+                    else R.color.text_placeholder
+                )
+            )
         }
 
         fun updateItem(isOpening: Boolean) {
+            // 높이 조정
             val height = dpToPx(if (isOpening) OPEN_HEIGHT else CLOSE_HEIGHT, binding.root.context)
-            binding.root.layoutParams = binding.root.layoutParams.apply { this.height = height }
+            binding.root.layoutParams = binding.root.layoutParams.apply {
+                this.height = height
+            }
             binding.root.requestLayout()
         }
 
         fun updateItemWithAnimate(isOpening: Boolean) {
+            // 높이 조정
             val fromHeight = binding.root.height
             val toHeight = dpToPx(if (isOpening) OPEN_HEIGHT else CLOSE_HEIGHT, binding.root.context)
-            ValueAnimator.ofInt(fromHeight, toHeight).apply {
-                addUpdateListener { animator ->
-                    binding.root.layoutParams = binding.root.layoutParams.apply {
-                        height = animator.animatedValue as Int
-                    }
-                }
-                duration = ANIMATION_DURATION
-                start()
+
+            val valueAnimator = ValueAnimator.ofInt(fromHeight, toHeight)
+            valueAnimator.addUpdateListener { animator ->
+                val layoutParams = binding.root.layoutParams
+                layoutParams.height = animator.animatedValue as Int
+                binding.root.layoutParams = layoutParams
             }
+            valueAnimator.duration = ANIMATION_DURATION
+            valueAnimator.start()
         }
-    }
 
-    private fun updateSelectedDate(newDate: CalendarDay) {
-        val oldSelectedPosition = items.indexOfFirst { it.isSameDate(selectedDate) }
-        val newSelectedPosition = items.indexOfFirst { it.isSameDate(newDate) }
+        private fun updateSelectedDateView(newDateView: TextView, newDate: CalendarDay) {
+            // 이전 선택된 날짜 초기화
+            selectedDate?.let { oldDate ->
+                val oldIndex = items.indexOfFirst { it.isSameDate(oldDate) }
+                if (oldIndex != -1) {
+                    notifyItemChanged(oldIndex, PAYLOAD_DESELECT)
+                }
+            }
+
+            // 새로운 날짜 선택
+            selectedDate = newDate
+            selectedDateView = newDateView
+            newDateView.setTextColor(newDateView.context.getColor(R.color.main))
 
-        selectedDate = if (selectedDate?.isSameDate(newDate) == true) null else newDate
+            val newIndex = items.indexOfFirst { it.isSameDate(newDate) }
+            if (newIndex != -1) {
+                notifyItemChanged(newIndex, PAYLOAD_SELECT)
+            }
+        }
 
-        if (oldSelectedPosition != -1) notifyItemChanged(oldSelectedPosition)
-        if (newSelectedPosition != -1) notifyItemChanged(newSelectedPosition)
     }
 
     interface OnCalendarListener {
@@ -152,5 +227,8 @@ class DiaryCalendarAdapter(
         const val ANIMATION_DURATION = 170L
         const val OPEN_HEIGHT = 56
         const val CLOSE_HEIGHT = 84
+        const val PAYLOAD_SELECT = "select"
+        const val PAYLOAD_DESELECT = "deselect"
     }
+
 }

From 02fa0153a873446cddccd0fb01077f19725c76f4 Mon Sep 17 00:00:00 2001
From: edv-Shin <edvedv613@gmail.com>
Date: Wed, 25 Dec 2024 11:45:37 +0900
Subject: [PATCH 7/7] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20=EB=B6=88?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EB=A6=AC?=
 =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to: #348
---
 .../diary/adapter/DiaryCalendarAdapter.kt     | 33 +++++--------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
index ab6d433e..2cb61ea2 100644
--- a/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
+++ b/app/src/main/java/com/mongmong/namo/presentation/ui/home/diary/adapter/DiaryCalendarAdapter.kt
@@ -14,7 +14,6 @@ import com.mongmong.namo.domain.model.CalendarDate
 import com.mongmong.namo.domain.model.CalendarDay
 import com.mongmong.namo.domain.model.ScheduleType
 import com.mongmong.namo.presentation.utils.converter.DiaryDateConverter.toYearMonth
-import java.util.Calendar
 
 class DiaryCalendarAdapter(
     private val recyclerView: RecyclerView,
@@ -30,7 +29,6 @@ class DiaryCalendarAdapter(
 
     fun updateDiaryDates(yearMonth: String, diaryDates: Set<CalendarDate>) {
         this.diaryDates[yearMonth] = diaryDates
-
         items.forEachIndexed { index, calendarDay ->
             if (calendarDay.toYearMonth() == yearMonth) {
                 notifyItemChanged(index)
@@ -46,31 +44,23 @@ class DiaryCalendarAdapter(
     }
 
     fun updateBottomSheetState(isOpened: Boolean) {
-        if (isBottomSheetOpen == isOpened) return
+        if (isBottomSheetOpen == isOpened || itemCount == 0) return
         isBottomSheetOpen = isOpened
 
-        // 화면에 보이는 아이템들의 위치를 가져옴
-        val layoutManager = recyclerView.layoutManager ?: return
-        val firstVisibleItemPosition =
-            (layoutManager as GridLayoutManager).findFirstVisibleItemPosition()
+        val layoutManager = recyclerView.layoutManager as? GridLayoutManager ?: return
+        val firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition()
         val lastVisibleItemPosition = layoutManager.findLastVisibleItemPosition()
 
-        // 보이는 아이템은 애니메이션 적용
         for (i in firstVisibleItemPosition..lastVisibleItemPosition) {
             val viewHolder = recyclerView.findViewHolderForAdapterPosition(i) as? ViewHolder
             viewHolder?.updateItemWithAnimate(isOpened)
         }
 
-        // 보이지 않는 아이템은 notify로 높이 변경
-        if (firstVisibleItemPosition > 0) {
-            for (i in 0 until firstVisibleItemPosition) {
-                notifyItemChanged(i, isOpened)
-            }
+        for (i in 0 until firstVisibleItemPosition) {
+            notifyItemChanged(i, isOpened)
         }
-        if (lastVisibleItemPosition < itemCount - 1) {
-            for (i in lastVisibleItemPosition + 1 until itemCount) {
-                notifyItemChanged(i, isOpened)
-            }
+        for (i in lastVisibleItemPosition + 1 until itemCount) {
+            notifyItemChanged(i, isOpened)
         }
     }
 
@@ -82,8 +72,6 @@ class DiaryCalendarAdapter(
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val item = items[position]
         holder.bind(item)
-
-        // 현재 달 상태에 따라 아이템을 업데이트
         holder.updateItem(isBottomSheetOpen)
     }
 
@@ -103,14 +91,12 @@ class DiaryCalendarAdapter(
         }
     }
 
-
+    override fun getItemCount(): Int = items.size
 
     fun getItemAtPosition(position: Int): CalendarDay? {
         return if (position in items.indices) items[position] else null
     }
 
-    override fun getItemCount(): Int = items.size
-
     inner class ViewHolder(val binding: ItemDiaryCalendarDateBinding) :
         RecyclerView.ViewHolder(binding.root) {
 
@@ -202,7 +188,6 @@ class DiaryCalendarAdapter(
                 }
             }
 
-            // 새로운 날짜 선택
             selectedDate = newDate
             selectedDateView = newDateView
             newDateView.setTextColor(newDateView.context.getColor(R.color.main))
@@ -212,7 +197,6 @@ class DiaryCalendarAdapter(
                 notifyItemChanged(newIndex, PAYLOAD_SELECT)
             }
         }
-
     }
 
     interface OnCalendarListener {
@@ -230,5 +214,4 @@ class DiaryCalendarAdapter(
         const val PAYLOAD_SELECT = "select"
         const val PAYLOAD_DESELECT = "deselect"
     }
-
 }