Merge pull request #291 from TeamDMU/refactor/cafeteria-v2

Refactor: 금주의 식단 디자인 수정

Author: huiwoo-jo

app/src/main/java/com/dongyang/android/youdongknowme/data/model/AnotherMenuItem.kt

@@ -0,0 +1,7 @@
+package com.dongyang.android.youdongknowme.data.model
+
+data class AnotherMenu(
+    val menuNameKr: String,
+    val name: String,
+    val price: String
+)

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

@@ -32,15 +32,26 @@ class CafeteriaRepository(
         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()),
+        SPAM_KIMCHI_FRIED_RICE("스팸 김치 볶음밥", 4_900, listOf(Weekdays.MONDAY, Weekdays.TUESDAY)),
+        CHICKEN_MAYO_RICE("치킨 마요 덮밥", 4_900, listOf(Weekdays.WEDNESDAY)),
+        SPICY_MAYO_RICE("불닭 마요 덮밥", 4_900, listOf(Weekdays.WEDNESDAY)),
+        PORK_BELLY_RICE("삼겹살 덮밥", 5_500, listOf(Weekdays.THURSDAY)),
+        JANGJORIM_BUTTER_RICE("장조림 버터 비빔밥", 4_500, listOf(Weekdays.FRIDAY)),
+
         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));
+        CHEESE_RAMEN("치즈 라면", 4_000, Weekdays.values().toList()),
+        SEAFOOD_RAMEN("해물짬뽕 라면", 4_500, Weekdays.values().toList()),
+
+        CHAPAGETTI("짜파게티", 3_500, Weekdays.values().toList()),
+        CHAPAGETTI_EGG_CHEESE("짜계치", 4_000, Weekdays.values().toList()),
+        SPICY_RAMEN("불닭볶음면", 3_500, Weekdays.values().toList()),
+        CARBONARA_SPICY_RAMEN("까르보 불닭볶음면", 3_800, Weekdays.values().toList()),
+        CHEESE_SPICY_RAMEN("치즈 불닭볶음면", 4_000, Weekdays.values().toList()),
+
+        PORK_CUTLET("돈까스", 5_000, Weekdays.values().toList()),
+        CHEESE_PORK_CUTLET("치즈 돈까스", 5_500, Weekdays.values().toList()),
+        BRISKET_CHICKEN_CUTLET("통가슴살 치킨까스", 5_200, Weekdays.values().toList()),
+        SWEET_POTATO_CHEESE_PORK_CUTLET("고구마 치즈 돈까스", 6_000, Weekdays.values().toList()),
+        HOMEMADE_KING_PORK_CUTLET("수제 왕 돈까스", 6_000, Weekdays.values().toList()),
     }
 }

app/src/main/java/com/dongyang/android/youdongknowme/standard/di/KoinModules.kt

@@ -92,7 +92,7 @@ val viewModelModule = module {
         AlarmViewModel(get())
     }
     viewModel {
-        CafeteriaViewModel(get(), get())
+        CafeteriaViewModel(get())
     }
     viewModel {
         LicenseViewModel()

app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/CafeteriaAnotherAdapter.kt

@@ -0,0 +1,43 @@
+package com.dongyang.android.youdongknowme.ui.adapter
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.dongyang.android.youdongknowme.data.model.AnotherMenu
+import com.dongyang.android.youdongknowme.databinding.ItemCafeteriaAnotherBinding
+import com.dongyang.android.youdongknowme.ui.viewholder.CafeteriaAnotherViewHolder
+
+class CafeteriaAnotherAdapter : RecyclerView.Adapter<CafeteriaAnotherViewHolder>() {
+
+    init {
+        setHasStableIds(true)
+    }
+
+    private var menu = arrayListOf<AnotherMenu>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CafeteriaAnotherViewHolder {
+        return CafeteriaAnotherViewHolder(
+            ItemCafeteriaAnotherBinding.inflate(
+                LayoutInflater.from(parent.context), parent, false
+            )
+        )
+    }
+
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
+
+    override fun onBindViewHolder(holder: CafeteriaAnotherViewHolder, position: Int) {
+        holder.bind(menu[position])
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun submitList(item: List<AnotherMenu>) {
+        menu.clear()
+        menu.addAll(item)
+        notifyDataSetChanged()
+    }
+
+    override fun getItemCount(): Int = menu.size
+}

…ongknowme/ui/adapter/CafeteriaAdapter.kt …wme/ui/adapter/CafeteriaKoreanAdapter.ktapp/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/CafeteriaAdapter.kt renamed to app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/CafeteriaKoreanAdapter.kt app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/CafeteriaAdapter.kt renamed to app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/CafeteriaKoreanAdapter.kt

@@ -4,26 +4,26 @@ import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.dongyang.android.youdongknowme.databinding.ItemCafeteriaMenuBinding
+import com.dongyang.android.youdongknowme.databinding.ItemCafeteriaKoreanBinding
 
-class CafeteriaAdapter : RecyclerView.Adapter<CafeteriaAdapter.ViewHolder>() {
+class CafeteriaKoreanAdapter : RecyclerView.Adapter<CafeteriaKoreanAdapter.ViewHolder>() {
 
     init {
         setHasStableIds(true)
     }
 
     private var menu = arrayListOf<String>()
 
-    inner class ViewHolder(private val binding: ItemCafeteriaMenuBinding) :
+    inner class ViewHolder(private val binding: ItemCafeteriaKoreanBinding) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(item: String) {
-            binding.menu = item
+            binding.koreanMenu = item
         }
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         return ViewHolder(
-            ItemCafeteriaMenuBinding.inflate(
+            ItemCafeteriaKoreanBinding.inflate(
                 LayoutInflater.from(parent.context), parent, false
             )
         )

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

@@ -7,6 +7,7 @@ import com.dongyang.android.youdongknowme.databinding.ItemCalendarDayBinding
 import com.kizitonwose.calendarview.CalendarView
 import com.kizitonwose.calendarview.model.CalendarDay
 import com.kizitonwose.calendarview.ui.ViewContainer
+import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 
 class CafeteriaContainer(
@@ -24,34 +25,44 @@ class CafeteriaContainer(
 
     init {
         view.setOnClickListener {
-            if (viewModel.selectedDate.value != day.date) {
-                notifyDateChanged(viewModel, calendarView, viewModel.selectedDate.value, day.date)
+            viewModel.selectedDate.value?.let { selectedDate ->
+                if (selectedDate != day.date) {
+                    notifyDateChanged(viewModel, calendarView, selectedDate, day.date)
+                }
             }
         }
     }
 
     fun bind(day: CalendarDay) {
         this.day = day
-        bind.itemCalendarDate.text = dateFormatter.format(day.date)
-        bind.itemCalendarDay.text = dayFormatter.format(day.date)
-        bind.itemCalendarMonth.text = monthFormatter.format(day.date)
-
-        if (day.date == viewModel.selectedDate.value) {
-            bind.mvItemCalendarDate.setCardBackgroundColor(
-                ContextCompat.getColor(
-                    view.context,
-                    R.color.blue300
-                )
-            )
-            bind.itemCalendarDate.setTextColor(ContextCompat.getColor(view.context, R.color.white))
-        } else {
-            bind.mvItemCalendarDate.setCardBackgroundColor(
-                ContextCompat.getColor(
-                    view.context,
-                    R.color.white
-                )
+        bind.apply {
+            tvItemCalendarDate.text = dateFormatter.format(day.date)
+            tvItemCalendarDay.text = dayFormatter.format(day.date)
+            tvItemCalendarMonth.text = monthFormatter.format(day.date)
+        }
+
+        val (bgColor, textColor) = when (day.date) {
+            viewModel.selectedDate.value -> R.color.blue300 to R.color.white
+            LocalDate.now() -> R.color.gray200 to R.color.gray500
+            else -> R.color.white to R.color.gray500
+        }
+
+        bind.mvItemCalendarContainer.setCardBackgroundColor(
+            ContextCompat.getColor(
+                view.context,
+                bgColor
             )
-            bind.itemCalendarDate.setTextColor(ContextCompat.getColor(view.context, R.color.black))
+        )
+        setTextColor(textColor)
+    }
+
+    private fun setTextColor(colorRes: Int) {
+        val color = ContextCompat.getColor(view.context, colorRes)
+
+        bind.apply {
+            tvItemCalendarDate.setTextColor(color)
+            tvItemCalendarDay.setTextColor(color)
+            tvItemCalendarMonth.setTextColor(color)
         }
     }
-}
+}