Merge pull request #119 from EAT-SSU/118-fix-calendar-error

fix: 날짜 제대로 반영 안되는거 수정
EAT-SSU · Nov 27, 2023 · 0c354ea · 0c354ea
2 parents 7d2c4af + e8bc089
commit 0c354ea
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt b/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt
@@ -91,6 +91,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             val dayFormat = DateTimeFormatter.ofPattern("dd")
 
             val todayDate = LocalDateTime.now().format(dayFormat)
+
             viewModel.setData(todayDate)
 
             val preSunday: LocalDateTime = LocalDateTime.now().with(
@@ -142,8 +143,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
                 holderSelect.binding.date.isSelected = true
                 holderSelect.binding.weekCardview.setBackgroundResource(R.drawable.transparent_calendar_element)
 
-                //val viewModel = ViewModelProvider(this@MainActivity)[CalendarViewModel::class.java]
                 viewModel.setData(selected)
+
                 // viewModel에 값 넘어가서 메뉴 뜨는지 확인하는 코드
                 //var senddate = "14"
                 //viewModel.setData(senddate)
@@ -155,10 +156,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
                 // 2) FragmentStateAdapter 생성 : Fragment 여러개를 ViewPager2에 연결해주는 역할
                 val viewpagerFragmentAdapter = ViewPager2Adapter(this@MainActivity)
 
-                viewpagerFragmentAdapter.setMenudate(selected)
-
-                Log.d("todaydate", selected)
-
                 // 3) ViewPager2의 adapter에 설정
                 viewPager.adapter = viewpagerFragmentAdapter
                 viewPager.setCurrentItem(

diff --git a/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt b/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt
@@ -32,9 +32,4 @@ class ViewPager2Adapter(fragmentActivity: FragmentActivity) :
         // 예를 들어, 첫 번째 Fragment를 디폴트로 설정하려면 0을 반환합니다.
         return 1
     }
-
-    fun setMenudate(date : String){
-        this.menuDate = date
-        Log.d("vpdate", menuDate)
-    }
 }
diff --git a/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt
@@ -81,11 +81,24 @@ class MenuFragment(val time: Time) : Fragment() {
             ViewModelProvider(this, MenuViewModelFactory(menuService))[MenuViewModel::class.java]
 
         val calendarViewModel = ViewModelProvider(requireActivity())[CalendarViewModel::class.java]
+
+        val dayFormat = DateTimeFormatter.ofPattern("dd")
+        val todayDate = LocalDateTime.now().format(dayFormat)
+
         // ViewModel에서 데이터 가져오기
         calendarViewModel.getData().observe(viewLifecycleOwner) { dataReceived ->
-            menuDate =
-                LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMM")) + dataReceived
+            if (dataReceived < todayDate) {
+                val nextMonthDate = LocalDateTime.now().plusMonths(1)
+                val nextMonthYear = nextMonthDate.format(DateTimeFormatter.ofPattern("yyyy"))
+                val nextMonthMonth = nextMonthDate.format(DateTimeFormatter.ofPattern("MM"))
+                menuDate = "$nextMonthYear$nextMonthMonth$dataReceived"
+            }
+            else {
+                menuDate =
+                    LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMM")) + dataReceived
+            }
 
+            Log.d("menucalendar", menuDate)
 
             // Assuming menuDate is a String in the format "yyyyMMdd"
             val formattedDate =