resolve package conflicts

sopt-makers · Oct 7, 2023 · 96c8f5b · 96c8f5b
1 parent bb299c5
commit 96c8f5b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/app/src/main/java/org/sopt/official/feature/attendance/AttendanceViewModel.kt b/app/src/main/java/org/sopt/official/feature/attendance/AttendanceViewModel.kt
@@ -5,7 +5,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
-import org.sopt.official.core.lifecycle.combineWith
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -240,7 +239,7 @@ class AttendanceViewModel @Inject constructor(
         setProgressBarState { copy(isThirdProgressBarBeforeAttendance = isBeforeAttendance) }
     }
 
-    fun fetchAttendanceHistory() {
+    private fun fetchAttendanceHistory() {
         viewModelScope.launch {
             _attendanceHistory.value = AttendanceState.Loading
             attendanceRepository.fetchAttendanceHistory()

diff --git a/.../core/lifecycle/FragmentLifecycleOwner.kt → ...ommon/lifecycle/FragmentLifecycleOwner.kt b/.../core/lifecycle/FragmentLifecycleOwner.kt → ...ommon/lifecycle/FragmentLifecycleOwner.kt
diff --git a/.../sopt/official/core/lifecycle/LiveData.kt → ...opt/official/common/lifecycle/LiveData.kt b/.../sopt/official/core/lifecycle/LiveData.kt → ...opt/official/common/lifecycle/LiveData.kt