diff --git a/data/src/main/java/in/koreatech/koin/data/util/DiningUtil.kt b/data/src/main/java/in/koreatech/koin/data/util/DiningUtil.kt
index d8352345d..6e3f1fa5b 100644
--- a/data/src/main/java/in/koreatech/koin/data/util/DiningUtil.kt
+++ b/data/src/main/java/in/koreatech/koin/data/util/DiningUtil.kt
@@ -8,5 +8,10 @@ fun DiningType.localized(context: Context) = when(this) {
DiningType.Breakfast -> context.getString(R.string.dining_breakfast)
DiningType.Lunch -> context.getString(R.string.dining_lunch)
DiningType.Dinner -> context.getString(R.string.dining_dinner)
- DiningType.NextBreakfast -> context.getString(R.string.dining_next_breakfast)
+ else -> context.getString(R.string.dining_breakfast)
+}
+
+fun DiningType.todayOrTomorrow(context: Context) = when(this) {
+ DiningType.NextBreakfast -> context.getString(R.string.dining_tomorrow)
+ else -> context.getString(R.string.dining_today)
}
\ No newline at end of file
diff --git a/data/src/main/res/values/strings.xml b/data/src/main/res/values/strings.xml
index b51abd41f..919578216 100644
--- a/data/src/main/res/values/strings.xml
+++ b/data/src/main/res/values/strings.xml
@@ -61,5 +61,6 @@
아침
점심
저녁
- 내일 아침
+ 오늘
+ 내일
\ No newline at end of file
diff --git a/koin/src/main/java/in/koreatech/koin/ui/main/activity/MainActivity.kt b/koin/src/main/java/in/koreatech/koin/ui/main/activity/MainActivity.kt
index 9db1bbc77..1650c7086 100644
--- a/koin/src/main/java/in/koreatech/koin/ui/main/activity/MainActivity.kt
+++ b/koin/src/main/java/in/koreatech/koin/ui/main/activity/MainActivity.kt
@@ -1,29 +1,29 @@
package `in`.koreatech.koin.ui.main.activity
+import android.os.Bundle
+import android.view.View
+import androidx.activity.viewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
+import dagger.hilt.android.AndroidEntryPoint
import `in`.koreatech.koin.R
import `in`.koreatech.koin.core.recyclerview.RecyclerViewClickListener
import `in`.koreatech.koin.core.util.dataBinding
import `in`.koreatech.koin.core.viewpager.HorizontalMarginItemDecoration
import `in`.koreatech.koin.core.viewpager.ScaledViewPager2Transformation
-import `in`.koreatech.koin.data.util.localized
+import `in`.koreatech.koin.data.util.todayOrTomorrow
import `in`.koreatech.koin.databinding.ActivityMainBinding
+import `in`.koreatech.koin.domain.model.dining.DiningPlace
import `in`.koreatech.koin.ui.main.StoreCategoryRecyclerAdapter
import `in`.koreatech.koin.ui.main.adapter.BusPagerAdapter
+import `in`.koreatech.koin.ui.main.adapter.DiningContainerViewPager2Adapter
import `in`.koreatech.koin.ui.main.viewmodel.MainActivityViewModel
import `in`.koreatech.koin.ui.navigation.KoinNavigationDrawerActivity
import `in`.koreatech.koin.ui.navigation.state.MenuState
-import `in`.koreatech.koin.util.ext.observeLiveData
-import android.os.Bundle
-import android.view.View
-import androidx.activity.viewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
-import dagger.hilt.android.AndroidEntryPoint
-import `in`.koreatech.koin.domain.model.dining.DiningPlace
-import `in`.koreatech.koin.ui.main.adapter.DiningContainerViewPager2Adapter
import `in`.koreatech.koin.ui.store.contract.StoreActivityContract
+import `in`.koreatech.koin.util.ext.observeLiveData
@AndroidEntryPoint
class MainActivity : KoinNavigationDrawerActivity() {
@@ -121,7 +121,7 @@ class MainActivity : KoinNavigationDrawerActivity() {
}
observeLiveData(selectedType) {
- binding.textViewDiningTodayOrTomorrow.text = it.localized(this@MainActivity)
+ binding.textViewDiningTodayOrTomorrow.text = it.todayOrTomorrow(this@MainActivity)
}
observeLiveData(busTimer) {
diff --git a/koin/src/main/java/in/koreatech/koin/ui/main/fragment/DiningContainerFragment.kt b/koin/src/main/java/in/koreatech/koin/ui/main/fragment/DiningContainerFragment.kt
index e87c641f2..8be0868e9 100644
--- a/koin/src/main/java/in/koreatech/koin/ui/main/fragment/DiningContainerFragment.kt
+++ b/koin/src/main/java/in/koreatech/koin/ui/main/fragment/DiningContainerFragment.kt
@@ -28,17 +28,10 @@ class DiningContainerFragment : Fragment(R.layout.fragment_dining_container) {
super.onViewCreated(view, savedInstanceState)
initView()
- addListener()
initViewModel()
}
private fun initView() {
- place.apply {
-// binding.textViewDiningContainer.text = this.toString()
- }
- }
-
- private fun addListener() {
}