From 5a7b29385649497f6dab8ff774df2b9fcae6bf38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Sun, 11 Feb 2024 12:12:17 +0900 Subject: [PATCH 01/14] =?UTF-8?q?refactor=20:=20=EC=8B=9D=EB=8B=B9=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20-=20=EB=B7=B0=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EB=8A=94=20=EC=95=84=EC=9D=B4=EB=94=94=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/cafeteria/CafeteriaFragment.kt | 40 ++-------- .../ui/view/cafeteria/CafeteriaViewModel.kt | 8 -- .../main/res/layout/fragment_cafeteria.xml | 79 +++---------------- 3 files changed, 20 insertions(+), 107 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaFragment.kt index df3f94be..d110d595 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaFragment.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaFragment.kt @@ -26,18 +26,14 @@ class CafeteriaFragment : BaseFragment { + binding.cvCafeteriaCalendar.dayBinder = object : DayBinder { override fun create(view: View): CafeteriaContainer = - CafeteriaContainer(view, binding.cafeteriaCalendar, viewModel) + CafeteriaContainer(view, binding.cvCafeteriaCalendar, viewModel) override fun bind(container: CafeteriaContainer, day: CalendarDay) = container.bind(day) } @@ -103,20 +83,16 @@ class CafeteriaFragment : BaseFragment, List>> = MutableLiveData() val stuMenus: LiveData, List>> = _stuMenus - private val _eduMenus: MutableLiveData, List>> = MutableLiveData() - val eduMenus: LiveData, List>> = _eduMenus - init { fetchCafeteria() } @@ -77,12 +74,7 @@ class CafeteriaViewModel( it.date == selectedDate && it.restaurant == resourceProvider.getString(R.string.cafeteria_student) && it.menuContent != "-" }?.menuContent ?: "" - val eduMenu = cafeteriaList.find { - it.date == selectedDate && it.restaurant == resourceProvider.getString(R.string.cafeteria_employee) && it.menuContent != "-" - }?.menuContent ?: "" - _stuMenus.value = parsingMenu(stuMenu) - _eduMenus.value = parsingMenu(eduMenu) } private fun parsingMenu(menu: String): Pair, List> { diff --git a/app/src/main/res/layout/fragment_cafeteria.xml b/app/src/main/res/layout/fragment_cafeteria.xml index a32c5660..aaf1847b 100644 --- a/app/src/main/res/layout/fragment_cafeteria.xml +++ b/app/src/main/res/layout/fragment_cafeteria.xml @@ -16,7 +16,7 @@ app:title="@{@string/cafeteria_main}" /> + app:layout_constraintTop_toBottomOf="@id/cv_cafeteria_calendar"> + app:layout_constraintTop_toBottomOf="@id/cafeteria_info_container" + app:layout_constraintBottom_toTopOf="@id/mv_cafeteria_another"> - - - - - - - + app:layout_constraintTop_toBottomOf="@id/mv_cafeteria_korean"> - - - - - - - From 8291a3823aa06f872e24cbfd672dda5f9b88c81f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Sun, 11 Feb 2024 14:53:20 +0900 Subject: [PATCH 02/14] =?UTF-8?q?design=20:=20=EC=8B=9D=EB=8B=B9=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20-=20=EC=9D=B8=ED=8F=AC=20=ED=8F=B0?= =?UTF-8?q?=ED=8A=B8=20=ED=81=AC=EA=B8=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_cafeteria.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_cafeteria.xml b/app/src/main/res/layout/fragment_cafeteria.xml index aaf1847b..4b5a5850 100644 --- a/app/src/main/res/layout/fragment_cafeteria.xml +++ b/app/src/main/res/layout/fragment_cafeteria.xml @@ -50,6 +50,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="horizontal" + android:gravity="center" android:paddingHorizontal="16dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -62,7 +63,7 @@ Date: Sun, 11 Feb 2024 14:54:11 +0900 Subject: [PATCH 03/14] =?UTF-8?q?refactor=20:=20=EC=8B=9D=EB=8B=B9=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20-=20string=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a8f5881a..0c79e47a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -100,14 +100,13 @@ 식단 학생식당 - 교직원식당 메뉴 점심 - 11:30 ~ 14:00 + 11:30 - 14:00, 16:30 - 18:00 8호관 3층 😅 등록된 메뉴가 없어요. 🍚 한식 - 😋 일품 + 🍛 일품 오픈소스 라이센스 From f1409257f4bbf2a7ef14be0926b53b3a5734bb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Sun, 11 Feb 2024 14:58:48 +0900 Subject: [PATCH 04/14] =?UTF-8?q?refactor=20:=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=20-=20materialCardView=20Background=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - materialCardView는 Background가 적용되지 않으므로 불필요한 속성 삭제 --- app/src/main/res/layout/fragment_cafeteria.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_cafeteria.xml b/app/src/main/res/layout/fragment_cafeteria.xml index 4b5a5850..20bb70ca 100644 --- a/app/src/main/res/layout/fragment_cafeteria.xml +++ b/app/src/main/res/layout/fragment_cafeteria.xml @@ -115,7 +115,6 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="12dp" - android:background="@color/main" app:cardCornerRadius="16dp" app:cardElevation="8dp" app:layout_constraintEnd_toEndOf="parent" @@ -155,7 +154,6 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="12dp" - android:background="@color/main" app:cardCornerRadius="16dp" app:cardElevation="8dp" app:layout_constraintEnd_toEndOf="parent" From 778a5b92c4e10b58fe3d822174126c800d6ad66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Sun, 11 Feb 2024 15:20:42 +0900 Subject: [PATCH 05/14] =?UTF-8?q?refactor=20:=20=EC=8B=9D=EB=8B=B9=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20-=20materialCardView=20Background=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - materialCardView는 Background가 적용되지 않으므로 불필요한 속성 삭제 --- .../main/res/layout/fragment_cafeteria.xml | 63 +++++++++++++++++-- 1 file changed, 58 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/fragment_cafeteria.xml b/app/src/main/res/layout/fragment_cafeteria.xml index 4b5a5850..70b7bfd8 100644 --- a/app/src/main/res/layout/fragment_cafeteria.xml +++ b/app/src/main/res/layout/fragment_cafeteria.xml @@ -49,8 +49,8 @@ android:id="@+id/cafeteria_info_container" android:layout_width="0dp" android:layout_height="wrap_content" - android:orientation="horizontal" android:gravity="center" + android:orientation="horizontal" android:paddingHorizontal="16dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -108,20 +108,24 @@ >>>>>> Stashed changes bind_is_error="@{vm.cafeteriaList == null}" bind_is_loading="@{vm.isLoading()}" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="12dp" - android:background="@color/main" + android:outlineSpotShadowColor="@color/blue300" app:cardCornerRadius="16dp" app:cardElevation="8dp" + app:layout_constraintBottom_toTopOf="@id/mv_cafeteria_another" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/cafeteria_info_container" - app:layout_constraintBottom_toTopOf="@id/mv_cafeteria_another"> + app:layout_constraintTop_toBottomOf="@id/cafeteria_info_container"> +<<<<<<< Updated upstream +======= + + + + + + + + +>>>>>>> Stashed changes + + + + +======= + app:layout_constraintTop_toBottomOf="@id/cafeteria_stu_menu_container"> +>>>>>>> Stashed changes Date: Sun, 11 Feb 2024 15:21:56 +0900 Subject: [PATCH 06/14] =?UTF-8?q?refactor=20:=20=EC=8B=9D=EB=8B=B9=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20-=20amend=20=EC=A4=91=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_cafeteria.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/src/main/res/layout/fragment_cafeteria.xml b/app/src/main/res/layout/fragment_cafeteria.xml index 70b7bfd8..19721582 100644 --- a/app/src/main/res/layout/fragment_cafeteria.xml +++ b/app/src/main/res/layout/fragment_cafeteria.xml @@ -108,11 +108,7 @@ >>>>>> Stashed changes bind_is_error="@{vm.cafeteriaList == null}" bind_is_loading="@{vm.isLoading()}" android:layout_width="0dp" @@ -148,9 +144,6 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" tools:listitem="@layout/item_cafeteria_menu" /> -<<<<<<< Updated upstream -======= - @@ -191,7 +184,6 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" tools:listitem="@layout/item_cafeteria_menu" /> ->>>>>>> Stashed changes @@ -209,11 +201,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" -<<<<<<< Updated upstream app:layout_constraintTop_toBottomOf="@id/mv_cafeteria_korean"> -======= - app:layout_constraintTop_toBottomOf="@id/cafeteria_stu_menu_container"> ->>>>>>> Stashed changes Date: Sun, 11 Feb 2024 15:23:03 +0900 Subject: [PATCH 07/14] =?UTF-8?q?design=20:=20=EC=8B=9D=EB=8B=B9=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20-=20constraint=20=EC=A0=9C=EC=95=BD=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_cafeteria.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_cafeteria.xml b/app/src/main/res/layout/fragment_cafeteria.xml index 19721582..62d2c979 100644 --- a/app/src/main/res/layout/fragment_cafeteria.xml +++ b/app/src/main/res/layout/fragment_cafeteria.xml @@ -198,7 +198,6 @@ android:outlineSpotShadowColor="@color/blue300" app:cardCornerRadius="16dp" app:cardElevation="8dp" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/mv_cafeteria_korean"> From 2f5c486ba8071d22ec287c6ed637252f4895be48 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: Sun, 11 Feb 2024 17:05:54 +0900 Subject: [PATCH 08/14] =?UTF-8?q?chore=20:=20=EC=8B=9D=EB=8B=A8=20->=20?= =?UTF-8?q?=EA=B8=88=EC=A3=BC=EC=9D=98=20=EC=8B=9D=EB=8B=A8?= 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 0c79e47a..a92ae54c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -98,7 +98,7 @@ 알림함 - 식단 + 금주의 식단 학생식당 메뉴 점심 From 70ddf4d8fdb2ec9e2cef45bfe83ec0c73933deef 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: Sun, 11 Feb 2024 17:06:36 +0900 Subject: [PATCH 09/14] =?UTF-8?q?design=20:=20=EC=8B=9D=EB=8B=A8=20-=20?= =?UTF-8?q?=EB=82=A0=EC=A7=9C=20=EC=84=A0=ED=83=9D=20=EC=8B=9C=20=EC=83=89?= =?UTF-8?q?=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/cafeteria/CafeteriaContainer.kt | 25 ++++++++++------- app/src/main/res/layout/item_calendar_day.xml | 27 +++++++++++++------ 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaContainer.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaContainer.kt index 4c64f030..6e0a5fa3 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaContainer.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaContainer.kt @@ -36,15 +36,22 @@ class CafeteriaContainer( bind.itemCalendarDay.text = dayFormatter.format(day.date) bind.itemCalendarMonth.text = monthFormatter.format(day.date) - bind.itemCalendarDate.setTextColor( - ContextCompat.getColor( - view.context, - if (day.date == viewModel.selectedDate.value) { - R.color.main - } else { - R.color.black - } + 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.itemCalendarDate.setTextColor(ContextCompat.getColor(view.context, R.color.black)) + } } } diff --git a/app/src/main/res/layout/item_calendar_day.xml b/app/src/main/res/layout/item_calendar_day.xml index efa4db91..a53af55b 100644 --- a/app/src/main/res/layout/item_calendar_day.xml +++ b/app/src/main/res/layout/item_calendar_day.xml @@ -29,15 +29,26 @@ android:textColor="@color/black" tools:text="Jun" /> - + app:cardElevation="0dp" + app:cardCornerRadius="10dp"> + + + From 0ecd5a2d016c7fe806f6d0c8ef8a0be0947c1c62 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: Sun, 11 Feb 2024 17:23:02 +0900 Subject: [PATCH 10/14] =?UTF-8?q?reafactor=20:=20=EC=8B=9D=EB=8B=A8=20-=20?= =?UTF-8?q?=EC=8B=9D=EB=8B=A8=20=EC=A4=91=EB=B3=B5=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/cafeteria/CafeteriaFragment.kt | 5 +- .../main/res/layout/fragment_cafeteria.xml | 48 ++----------------- 2 files changed, 7 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaFragment.kt index d110d595..9ad03964 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaFragment.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/cafeteria/CafeteriaFragment.kt @@ -1,6 +1,9 @@ package com.dongyang.android.youdongknowme.ui.view.cafeteria +import android.view.MenuItem import android.view.View +import androidx.appcompat.view.menu.MenuAdapter +import androidx.recyclerview.widget.LinearLayoutManager import androidx.window.layout.WindowMetricsCalculator import com.dongyang.android.youdongknowme.R import com.dongyang.android.youdongknowme.databinding.FragmentCafeteriaBinding @@ -33,7 +36,7 @@ class CafeteriaFragment : BaseFragment @@ -138,47 +136,7 @@ android:textColor="@color/black" /> - - - - - - - - - - - + app:layout_constraintTop_toBottomOf="@id/mv_cafeteria_menu"> Date: Sun, 11 Feb 2024 17:48:19 +0900 Subject: [PATCH 11/14] =?UTF-8?q?design=20:=20=EC=8B=9D=EB=8B=A8=20-=20?= =?UTF-8?q?=EA=B7=B8=EB=A6=BC=EC=9E=90=20=EB=88=84=EB=9D=BD,=20=EB=A7=88?= =?UTF-8?q?=EC=A7=84=EA=B0=92=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_cafeteria.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_cafeteria.xml b/app/src/main/res/layout/fragment_cafeteria.xml index 152a1986..62692fdb 100644 --- a/app/src/main/res/layout/fragment_cafeteria.xml +++ b/app/src/main/res/layout/fragment_cafeteria.xml @@ -115,6 +115,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="12dp" + android:outlineSpotShadowColor="@color/blue300" app:cardCornerRadius="16dp" app:cardElevation="8dp" app:layout_constraintEnd_toEndOf="parent" @@ -140,7 +141,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:layout_marginTop="8dp" + android:layout_marginVertical="8dp" tools:listitem="@layout/item_cafeteria_menu" /> @@ -179,7 +180,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:layout_marginTop="8dp" + android:layout_marginVertical="8dp" tools:listitem="@layout/item_cafeteria_menu" /> From ac7aeecd01891bb01920cf26f549e7cbcf47bade 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: Sun, 11 Feb 2024 17:54:39 +0900 Subject: [PATCH 12/14] =?UTF-8?q?design=20:=20=EC=8B=9D=EB=8B=A8=20-=20inf?= =?UTF-8?q?o=EC=9D=98=20padding=20=EC=86=8D=EC=84=B1=20horizontal=20->=20v?= =?UTF-8?q?ertical?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_cafeteria.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_cafeteria.xml b/app/src/main/res/layout/fragment_cafeteria.xml index 62692fdb..f0f0767b 100644 --- a/app/src/main/res/layout/fragment_cafeteria.xml +++ b/app/src/main/res/layout/fragment_cafeteria.xml @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:gravity="center" android:orientation="horizontal" - android:paddingHorizontal="16dp" + android:paddingVertical="16dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/cv_cafeteria_calendar"> From 7fe59ec2ecaf105340a8ef8d40f347452aa0667c 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: Sun, 11 Feb 2024 17:55:00 +0900 Subject: [PATCH 13/14] =?UTF-8?q?design=20:=20=EC=8B=9D=EB=8B=A8=20-=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EC=95=84=EC=9D=B4=ED=85=9C=20=EB=B0=B0?= =?UTF-8?q?=EA=B2=BD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/item_cafeteria_menu.xml | 1 + app/src/main/res/values/styles.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/item_cafeteria_menu.xml b/app/src/main/res/layout/item_cafeteria_menu.xml index 0cad87e2..ff89058e 100644 --- a/app/src/main/res/layout/item_cafeteria_menu.xml +++ b/app/src/main/res/layout/item_cafeteria_menu.xml @@ -11,6 +11,7 @@ style="@style/Colors_Widget.MaterialComponents.Chip" android:layout_width="wrap_content" android:layout_height="48dp" + android:backgroundTint="@color/blue100" android:clickable="false" android:text="@{menu, default = 해바라기멸치볶음}" android:textAlignment="center" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 40e6cc5a..ff376610 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -15,7 +15,7 @@ From dd8dce7a1a69c13acfff37e1c60a06de3c9c5c0c 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: Sun, 11 Feb 2024 17:59:13 +0900 Subject: [PATCH 14/14] =?UTF-8?q?chore=20:=20=EC=8B=9D=EB=8B=A8-=20title?= =?UTF-8?q?=EC=9A=A9=20string=20=EA=B0=92=20=EC=B6=94=EA=B0=80=20=EB=B0=8F?= =?UTF-8?q?=20=EC=88=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_cafeteria.xml | 2 +- app/src/main/res/values/strings.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_cafeteria.xml b/app/src/main/res/layout/fragment_cafeteria.xml index f0f0767b..46b4c457 100644 --- a/app/src/main/res/layout/fragment_cafeteria.xml +++ b/app/src/main/res/layout/fragment_cafeteria.xml @@ -13,7 +13,7 @@ layout="@layout/standard_toolbar" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" - app:title="@{@string/cafeteria_main}" /> + app:title="@{@string/cafeteria_title}" /> 알림함 - 금주의 식단 + 식단 + 금주의 식단 학생식당 메뉴 점심