Skip to content

Commit d6329da

Browse files
committed
refactor: 주말 출력 방식 오류 및 viewModel 인자 수정
1 parent 31515f3 commit d6329da

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ val viewModelModule = module {
9292
AlarmViewModel(get())
9393
}
9494
viewModel {
95-
CafeteriaViewModel(get(), get())
95+
CafeteriaViewModel(get())
9696
}
9797
viewModel {
9898
LicenseViewModel()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ class CafeteriaFragment : BaseFragment<FragmentCafeteriaBinding, CafeteriaViewMo
116116

117117
viewModel.selectedDate.observe(viewLifecycleOwner) {
118118
viewModel.updateDaysMenu(it)
119+
viewModel.selectedCategory.value?.let { selectedCategory -> updateCafeteriaState(selectedCategory) }
119120
}
120121
}
121122

@@ -132,7 +133,6 @@ class CafeteriaFragment : BaseFragment<FragmentCafeteriaBinding, CafeteriaViewMo
132133
binding.cvCafeteriaCalendar.scrollToDate(nearestMonday)
133134

134135
binding.cafeteriaErrorContainer.refresh.setOnClickListener {
135-
viewModel.fetchCafeteria()
136136
viewModel.updateDaysMenu(viewModel.selectedDate.value ?: nearestMonday)
137137
}
138138

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import java.time.LocalDate
1616

1717
class CafeteriaViewModel(
1818
private val cafeteriaRepository: CafeteriaRepository,
19-
private val resourceProvider: ResourceProvider,
2019
) : BaseViewModel() {
2120

2221
private val _errorState: MutableLiveData<Event<Int>> = MutableLiveData()
@@ -47,7 +46,7 @@ class CafeteriaViewModel(
4746
fetchCafeteria()
4847
}
4948

50-
fun fetchCafeteria() {
49+
private fun fetchCafeteria() {
5150
viewModelScope.launch {
5251
_isLoading.postValue(true)
5352
when (val result = cafeteriaRepository.fetchMenuList()) {
@@ -99,6 +98,10 @@ class CafeteriaViewModel(
9998
}
10099
}
101100

101+
fun setSelectedDate(selectedDate: LocalDate){
102+
_selectedDate.value = selectedDate
103+
}
104+
102105
fun setCategory(category: String) {
103106
_selectedCategory.value = category
104107
}

0 commit comments

Comments
 (0)