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 index 124c5f92..cdf50fe5 100644 --- a/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt @@ -134,7 +134,7 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl holder.binding.weekCardview.setBackgroundResource(R.drawable.ic_selector_background_white) holder.binding.day.isSelected = false holder.binding.date.isSelected = false - if (holder.today.equals(data.cl_date)) { + if (holder.today == data.cl_date) { holderSelect = holder selected = holder.today } 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 index 6170e20a..4e5d6dd6 100644 --- 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 @@ -28,6 +28,8 @@ import java.time.DayOfWeek import java.time.LocalDate import java.time.LocalDateTime import java.time.format.DateTimeFormatter +import java.time.temporal.TemporalAdjusters +import java.util.Locale class MenuFragment : Fragment() { private var _binding: FragmentMenuBinding? = null @@ -101,14 +103,21 @@ class MenuFragment : Fragment() { // ViewModel에서 데이터 가져오기 calendarViewModel.getData().observe(viewLifecycleOwner) { dataReceived -> - if (dataReceived.toInt() < 7) { - val nextMonthDate = LocalDateTime.now().plusMonths(1) - val nextMonth = nextMonthDate.format(DateTimeFormatter.ofPattern("yyyyMM")) - menuDate = "$nextMonth$dataReceived" - } - else { - menuDate = - LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMM")) + dataReceived + + val preSunday: LocalDateTime = LocalDateTime.now().with( + TemporalAdjusters.previousOrSame( + DayOfWeek.SUNDAY + ) + ) + + val dateFormat = + DateTimeFormatter.ofPattern("dd").withLocale(Locale.forLanguageTag("ko")) + val fullFormat = DateTimeFormatter.ofPattern("yyyyMMdd").withLocale(Locale.forLanguageTag("ko")) + + for (i in 0..6) { + if (preSunday.plusDays(i.toLong()).format(dateFormat) == dataReceived) { + menuDate = preSunday.plusDays(i.toLong()).format(fullFormat) + } } Log.d("menucalendar", menuDate)