Release : version 2.1.0 🎉

app/build.gradle

@@ -6,19 +6,18 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     Properties properties = new Properties()
     properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
     defaultConfig {
         applicationId "com.dongyang.android.youdongknowme"
         minSdk 24
-        targetSdk 33
-        versionCode 10
-        versionName "2.0.0"
+        targetSdk 34
+        versionCode 13
+        versionName "2.1.0"
 
-        buildConfigField "String", "API_KEY", properties['API_KEY']
         buildConfigField "String", "BASE_URL", properties['BASE_URL']
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/dongyang/android/youdongknowme/data/repository/CafeteriaRepository.kt

@@ -5,17 +5,42 @@ import com.dongyang.android.youdongknowme.data.remote.service.CafeteriaService
 import com.dongyang.android.youdongknowme.standard.network.ErrorResponseHandler
 import com.dongyang.android.youdongknowme.standard.network.NetworkResult
 import com.dongyang.android.youdongknowme.standard.network.RetrofitObject
+import com.dongyang.android.youdongknowme.standard.util.Weekdays
 
 class CafeteriaRepository(
     private val errorResponseHandler: ErrorResponseHandler
 ) {
     suspend fun fetchMenuList(): NetworkResult<List<Cafeteria>> {
         return try {
-            val response = RetrofitObject.getNetwork().create(CafeteriaService::class.java).getMenuList()
+            val response =
+                RetrofitObject.getNetwork().create(CafeteriaService::class.java).getMenuList()
             NetworkResult.Success(response)
         } catch (exception: Exception) {
             val error = errorResponseHandler.getError(exception)
             NetworkResult.Error(error)
         }
     }
+
+    fun fetchDaysMenus(todayDay: Weekdays): List<DaysMenu> {
+        return DaysMenu.values().filter { menu ->
+            menu.operatingDays.contains(todayDay)
+        }
+    }
+
+    enum class DaysMenu(
+        val menuNameKr: String,
+        val price: Int,
+        val operatingDays: List<Weekdays>,
+    ) {
+        PORKCUTLET("돈까스", 5_000, Weekdays.values().toList()),
+        CHEESE_PORKCUTLET("치즈돈까스", 5_500, Weekdays.values().toList()),
+        SWEET_POTATO_CHEESE_PORKCUTLET("고구마치즈돈까스", 6_000, Weekdays.values().toList()),
+        RAMEN("라면", 3_500, Weekdays.values().toList()),
+        CHEESE_RAMEN("치즈라면", 4_000, Weekdays.values().toList()),
+        SEAFOOD_RAMEN("해물라면", 4_500, Weekdays.values().toList()),
+        SPAM_KIMCHI_FRIED_RICE("스팸김치볶음밥", 4_900, listOf(Weekdays.MONDAY, Weekdays.TUESDAY)),
+        HOT_CHICKEN_MAYO_RICE("불닭마요덮밥", 4_500, listOf(Weekdays.WEDNESDAY, Weekdays.THURSDAY)),
+        CHICKEN_MAYO_RICE("치킨마요덮밥", 4_500, listOf(Weekdays.WEDNESDAY, Weekdays.THURSDAY)),
+        OMELET_RICE("오므라이스", 5_500, listOf(Weekdays.FRIDAY));
+    }
 }

app/src/main/java/com/dongyang/android/youdongknowme/standard/network/RetrofitObject.kt

@@ -16,7 +16,7 @@ object RetrofitObject {
             val request = chain.request().newBuilder()
             val originalHttpUrl = chain.request().url
 
-            val url = originalHttpUrl.newBuilder().addQueryParameter("api_key", BuildConfig.API_KEY)
+            val url = originalHttpUrl.newBuilder()
                 .build()
             request.url(url)
             chain.proceed(request.build())

app/src/main/java/com/dongyang/android/youdongknowme/standard/util/Weekdays.kt

@@ -0,0 +1,25 @@
+package com.dongyang.android.youdongknowme.standard.util
+
+import java.time.DayOfWeek
+
+enum class Weekdays {
+    MONDAY,
+    TUESDAY,
+    WEDNESDAY,
+    THURSDAY,
+    FRIDAY;
+
+    companion object {
+
+        fun from(dayOfWeek: DayOfWeek): Weekdays {
+            return when (dayOfWeek) {
+                DayOfWeek.MONDAY -> MONDAY
+                DayOfWeek.TUESDAY -> TUESDAY
+                DayOfWeek.WEDNESDAY -> WEDNESDAY
+                DayOfWeek.THURSDAY -> THURSDAY
+                DayOfWeek.FRIDAY -> FRIDAY
+                else -> throw IllegalArgumentException("월요일 - 금요일을 벗어났습니다.")
+            }
+        }
+    }
+}

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaFragment.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.util.TypedValue
 import android.view.MotionEvent
 import android.view.View
-import androidx.recyclerview.widget.RecyclerView
 import androidx.window.layout.WindowMetricsCalculator
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.FragmentCafeteriaBinding
@@ -17,12 +16,11 @@ import com.kizitonwose.calendarview.model.CalendarDay
 import com.kizitonwose.calendarview.ui.DayBinder
 import com.kizitonwose.calendarview.utils.Size
 import org.koin.androidx.viewmodel.ext.android.viewModel
-import java.time.DayOfWeek
+import java.time.DayOfWeek.*
 import java.time.LocalDate
 import java.time.YearMonth
 import java.time.temporal.TemporalAdjusters
 
-
 class CafeteriaFragment : BaseFragment<FragmentCafeteriaBinding, CafeteriaViewModel>(),
     CalendarInterface {
 
@@ -60,9 +58,9 @@ class CafeteriaFragment : BaseFragment<FragmentCafeteriaBinding, CafeteriaViewMo
         binding.cvCafeteriaCalendar.apply {
             val dayWidth = wmc.bounds.width() / 5
             val dayHeight: Int = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            124f,
-            resources.displayMetrics
+                TypedValue.COMPLEX_UNIT_DIP,
+                124f,
+                resources.displayMetrics
             ).toInt()
 
             daySize = Size(dayWidth, dayHeight)
@@ -74,10 +72,11 @@ class CafeteriaFragment : BaseFragment<FragmentCafeteriaBinding, CafeteriaViewMo
 
             override fun bind(container: CafeteriaContainer, day: CalendarDay) = container.bind(day)
         }
+
+        viewModel.updateDaysMenu(findNearestMonday(LocalDate.now()))
     }
 
     override fun initDataBinding() {
-
         viewModel.isLoading.observe(viewLifecycleOwner) {
             if (it) showLoading()
             else dismissLoading()
@@ -87,10 +86,12 @@ class CafeteriaFragment : BaseFragment<FragmentCafeteriaBinding, CafeteriaViewMo
             showToast(getString(resId))
         })
 
-        viewModel.menus.observe(viewLifecycleOwner) {
+        viewModel.koreaMenus.observe(viewLifecycleOwner) {
             koreanMenuAdapter.submitList(it)
-            // 일품 메뉴 : 일품 메뉴는 리스트로 제작하여 등록
-            anotherMenuAdapter.submitList(getString(R.string.cafeteria_another_list).split("/").map { it.trim() })
+        }
+
+        viewModel.daysMenus.observe(viewLifecycleOwner) {
+            anotherMenuAdapter.submitList(it)
         }
     }
 
@@ -101,13 +102,14 @@ class CafeteriaFragment : BaseFragment<FragmentCafeteriaBinding, CafeteriaViewMo
         binding.cvCafeteriaCalendar.setup(
             YearMonth.from(nearestMonday),
             YearMonth.from(nearestMonday.plusDays(4)),
-            DayOfWeek.MONDAY
+            MONDAY
         )
 
         binding.cvCafeteriaCalendar.scrollToDate(nearestMonday)
 
         binding.cafeteriaErrorContainer.refresh.setOnClickListener {
             viewModel.fetchCafeteria()
+            viewModel.updateDaysMenu(findNearestMonday(LocalDate.now()))
         }
 
         binding.cvCafeteriaCalendar.setOnTouchListener { _, event ->
@@ -123,27 +125,27 @@ class CafeteriaFragment : BaseFragment<FragmentCafeteriaBinding, CafeteriaViewMo
 
     private fun findNearestMonday(currentDate: LocalDate): LocalDate {
         return when (currentDate.dayOfWeek) {
-            DayOfWeek.SATURDAY, DayOfWeek.SUNDAY -> {
-                currentDate.with(TemporalAdjusters.next(DayOfWeek.MONDAY))
+            SATURDAY, SUNDAY -> {
+                currentDate.with(TemporalAdjusters.next(MONDAY))
             }
 
-            DayOfWeek.MONDAY -> {
+            MONDAY -> {
                 currentDate
             }
 
             else -> {
-                currentDate.with(TemporalAdjusters.previous(DayOfWeek.MONDAY))
+                currentDate.with(TemporalAdjusters.previous(MONDAY))
             }
         }
     }
 
     override fun onPause() {
         super.onPause()
         notifyDateChanged(
-            viewModel,
-            binding.cvCafeteriaCalendar,
-            viewModel.selectedDate.value,
-            LocalDate.now()
+            viewModel = viewModel,
+            calendarView = binding.cvCafeteriaCalendar,
+            oldDate = viewModel.selectedDate.value,
+            selectedDate = findNearestMonday(LocalDate.now())
         )
     }
 }

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaViewModel.kt

@@ -8,9 +8,11 @@ import com.dongyang.android.youdongknowme.data.remote.entity.Cafeteria
 import com.dongyang.android.youdongknowme.data.repository.CafeteriaRepository
 import com.dongyang.android.youdongknowme.standard.base.BaseViewModel
 import com.dongyang.android.youdongknowme.standard.network.NetworkResult
+import com.dongyang.android.youdongknowme.standard.util.Weekdays
 import com.dongyang.android.youdongknowme.ui.view.util.Event
 import com.dongyang.android.youdongknowme.ui.view.util.ResourceProvider
 import kotlinx.coroutines.launch
+import java.text.DecimalFormat
 import java.time.LocalDate
 
 class CafeteriaViewModel(
@@ -33,8 +35,11 @@ class CafeteriaViewModel(
     private val _cafeteriaList: MutableLiveData<List<Cafeteria>> = MutableLiveData()
     val cafeteriaList: LiveData<List<Cafeteria>> = _cafeteriaList
 
-    private val _menus: MutableLiveData<List<String>> = MutableLiveData()
-    val menus: LiveData<List<String>> = _menus
+    private val _koreaMenus: MutableLiveData<List<String>> = MutableLiveData()
+    val koreaMenus: LiveData<List<String>> = _koreaMenus
+
+    private val _daysMenus: MutableLiveData<List<String>> = MutableLiveData()
+    val daysMenus: LiveData<List<String>> = _daysMenus
 
     private val emptyMenu = listOf(resourceProvider.getString(R.string.cafeteria_no_menu))
 
@@ -68,12 +73,27 @@ class CafeteriaViewModel(
         val cafeteriaList = _cafeteriaList.value ?: emptyList()
         _selectedDate.value = selectedDate
         val selectedMenu = cafeteriaList.find { it.date == selectedDate.toString() }?.menus
-        _menus.postValue(
+        _koreaMenus.postValue(
             if (selectedMenu.isNullOrEmpty()) {
                 emptyMenu
             } else {
                 selectedMenu
             }
         )
     }
+
+    fun updateDaysMenu(selectedDate: LocalDate) {
+        viewModelScope.launch {
+            val dateToWeekday: Weekdays = Weekdays.from(selectedDate.dayOfWeek)
+            runCatching {
+                cafeteriaRepository.fetchDaysMenus(dateToWeekday)
+            }.onSuccess { daysMenus ->
+                val formatter = DecimalFormat("#,###")
+                val formattedMenuWithPrice = daysMenus.map { "${it.menuNameKr} ${formatter.format(it.price)}원" }
+                _daysMenus.value = formattedMenuWithPrice
+            }.onFailure {
+                _isError.value = true
+            }
+        }
+    }
 }

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CalendarInterface.kt

@@ -11,6 +11,7 @@ interface CalendarInterface {
         selectedDate: LocalDate
     ) {
         viewModel.updateMenuList(selectedDate)
+        viewModel.updateDaysMenu(selectedDate)
         calendarView.notifyDateChanged(selectedDate)
         oldDate?.let { calendarView.notifyDateChanged(it) }
     }

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt

@@ -1,14 +1,7 @@
 package com.dongyang.android.youdongknowme.ui.view.schedule
 
 import android.content.res.ColorStateList
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.PorterDuff
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
 import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
-import androidx.core.graphics.drawable.DrawableCompat
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.dongyang.android.youdongknowme.R
@@ -75,10 +68,16 @@ class ScheduleFragment : BaseFragment<FragmentScheduleBinding, ScheduleViewModel
         }
 
         // 최소 날짜, 최대 날짜 지정
+        if(viewModel.currentYear.value == null || viewModel.currentYear.value != LocalDate.now().year){
+            viewModel.setCurrentYear(LocalDate.now())
+        }
+
         binding.mvScheduleCalendar.apply {
-            this.state().edit().setMinimumDate(CalendarDay.from(2023, 1, 1))
-                .setMaximumDate(CalendarDay.from(2025, 2, 28))
-                .commit()
+            viewModel.currentYear.value?.let{
+                this.state().edit().setMinimumDate(CalendarDay.from(it-1, 1, 1))
+                    .setMaximumDate(CalendarDay.from(it+1, 2, 28))
+                    .commit()
+            }
         }
 
         // 연/월 방식으로 타이틀 처리