diff --git a/core/src/main/java/in/koreatech/koin/core/dialog/ZoomableDialog.kt b/core/src/main/java/in/koreatech/koin/core/dialog/ImageZoomableDialog.kt similarity index 100% rename from core/src/main/java/in/koreatech/koin/core/dialog/ZoomableDialog.kt rename to core/src/main/java/in/koreatech/koin/core/dialog/ImageZoomableDialog.kt diff --git a/koin/src/main/java/in/koreatech/koin/ui/dining/DiningItemsFragment.kt b/koin/src/main/java/in/koreatech/koin/ui/dining/DiningItemsFragment.kt index b4398939f..1d9abfbc4 100644 --- a/koin/src/main/java/in/koreatech/koin/ui/dining/DiningItemsFragment.kt +++ b/koin/src/main/java/in/koreatech/koin/ui/dining/DiningItemsFragment.kt @@ -33,7 +33,7 @@ class DiningItemsFragment : Fragment(R.layout.fragment_dining_items) { viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { viewModel.dining.collect { val diningList = it.filter { dining -> dining.type == type }.arrange() - diningAdapter.submitList( diningList.filter { dining -> dining.menu.isNotEmpty() } ) + diningAdapter.submitList( diningList.filter { dining -> dining.menu.isNotEmpty() && dining.menu.first() != "미운영" } ) } } } diff --git a/koin/src/main/java/in/koreatech/koin/ui/dining/adapter/DiningAdapter.kt b/koin/src/main/java/in/koreatech/koin/ui/dining/adapter/DiningAdapter.kt index ecc0a2c35..04126735a 100644 --- a/koin/src/main/java/in/koreatech/koin/ui/dining/adapter/DiningAdapter.kt +++ b/koin/src/main/java/in/koreatech/koin/ui/dining/adapter/DiningAdapter.kt @@ -62,12 +62,13 @@ class DiningAdapter : ListAdapter(diffCallback) textViewNoPhoto.visibility = View.VISIBLE imageViewNoPhoto.visibility = View.VISIBLE imageViewDining.visibility = View.INVISIBLE - cardViewDining.setOnClickListener(null) - EventLogger.logClickEvent( - AnalyticsConstant.Domain.CAMPUS, - AnalyticsConstant.Label.MENU_IMAGE, - DiningUtil.getKoreanName(dining.type) + "_" + dining.place - ) + cardViewDining.setOnClickListener { + EventLogger.logClickEvent( + AnalyticsConstant.Domain.CAMPUS, + AnalyticsConstant.Label.MENU_IMAGE, + DiningUtil.getKoreanName(dining.type) + "_" + dining.place + ) + } } if(dining.changedAt.isNotEmpty()) { @@ -134,7 +135,6 @@ class DiningAdapter : ListAdapter(diffCallback) } companion object { - private const val DIALOG_MIN_SCALE = 0.75f private val diffCallback = object : DiffUtil.ItemCallback() { override fun areItemsTheSame( oldItem: Dining, diff --git a/koin/src/main/res/layout/activity_dining.xml b/koin/src/main/res/layout/activity_dining.xml index c37638bf8..c2fe85977 100644 --- a/koin/src/main/res/layout/activity_dining.xml +++ b/koin/src/main/res/layout/activity_dining.xml @@ -63,7 +63,8 @@ android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintTop_toBottomOf="@id/tabs_dining_time" - app:layout_constraintBottom_toBottomOf="parent"/> + app:layout_constraintBottom_toBottomOf="parent" + android:background="@color/background_dark"/> diff --git a/koin/src/main/res/layout/fragment_dining_items.xml b/koin/src/main/res/layout/fragment_dining_items.xml index 6b9cb2e22..b219f71eb 100644 --- a/koin/src/main/res/layout/fragment_dining_items.xml +++ b/koin/src/main/res/layout/fragment_dining_items.xml @@ -1,33 +1,38 @@ - - + android:layout_height="wrap_content"> - + android:paddingBottom="8dp" + android:background="@color/background_dark"> - + - + + + \ No newline at end of file diff --git a/koin/src/main/res/values/strings.xml b/koin/src/main/res/values/strings.xml index 99c74c5cb..ef3062ddc 100644 --- a/koin/src/main/res/values/strings.xml +++ b/koin/src/main/res/values/strings.xml @@ -407,7 +407,7 @@ 버스 전체보기 회원가입 완료 - 식단 정보는 운영 상황에 따라 변동될 수 있습니다. + 식단 정보는 운영 상황에 따라 변동될 수 있습니다. 세트 메뉴 사이드 메뉴 대표 메뉴