From f62e3ac57d7ca94577cd5e08120db45238b0c0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?=
<84004687+huiwoo-jo@users.noreply.github.com>
Date: Tue, 9 Apr 2024 21:23:55 +0900
Subject: [PATCH 1/2] =?UTF-8?q?refactor=20:=20=EC=9D=BC=ED=92=88=20?=
=?UTF-8?q?=EC=8B=9D=EB=8B=A8=20=EA=B0=80=EA=B2=A9=20=ED=95=98=ED=96=A5=20?=
=?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/res/values/strings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3debe4c1..a017cb41 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -127,7 +127,7 @@
😅 등록된 메뉴가 없어요.
🍚 한식
🍛 일품
- 김치볶음밥 4,900원 / 라면 4,000원 / 치즈라면 4,500원 / 해물짬뽕라면 4,500원 / 돈가스 5,000원 / 치즈돈가스 5,500원 / 고구마치즈돈까스 6,000원
+ 라면 3,500원 / 치즈라면 4,000원 / 해물라면 4,500원 / 돈까스 5,500원 / 치즈돈까스 5,500원 / 고구마치즈돈까스 6,000원 / 스팸김치볶음밥 4,900원 / 치킨마요덮밥 4,500원 / 불닭마요덮밥 4,500원 / 오므라이스 5,500원
오픈소스 라이센스
From 0c87cf351ffc958f84750a296febc16b0507e7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?=
<84004687+huiwoo-jo@users.noreply.github.com>
Date: Tue, 9 Apr 2024 21:24:25 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=EC=8B=9D=EB=8B=A8=EC=9D=B4=20?=
=?UTF-8?q?=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EB=B9=88=20=EB=A6=AC?=
=?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=A1=9C=20=EC=98=A4=EB=8A=94=20=EA=B2=83?=
=?UTF-8?q?=EC=9D=84=20=EB=B0=98=EC=98=81=ED=95=98=EC=97=AC=20=EC=88=98?=
=?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../youdongknowme/ui/view/cafeteria/CafeteriaViewModel.kt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaViewModel.kt
index d4606ccd..2882ea1b 100644
--- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaViewModel.kt
+++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaViewModel.kt
@@ -68,7 +68,10 @@ class CafeteriaViewModel(
val cafeteriaList = _cafeteriaList.value ?: emptyList()
_selectedDate.value = selectedDate
_menus.postValue(
- cafeteriaList.find { it.date == selectedDate.toString() }?.menus ?: emptyMenu
+ cafeteriaList.find { it.date == selectedDate.toString() }?.menus
+ .takeIf { it.isNullOrEmpty() }
+ ?.let { emptyMenu }
+ ?: cafeteriaList.find { it.date == selectedDate.toString() }?.menus
)
}
}