Skip to content

Commit 85945c7

Browse files
committed
refactor: merge conflict 해결
1 parent f27ecfa commit 85945c7

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import android.view.ViewGroup
77
import androidx.fragment.app.Fragment
88
import androidx.fragment.app.activityViewModels
99
import androidx.navigation.fragment.findNavController
10+
import androidx.navigation.navGraphViewModels
1011
import com.stop.R
1112
import com.stop.databinding.FragmentAlarmSettingBinding
1213
import com.stop.domain.model.alarm.AlarmUseCaseItem
@@ -108,8 +109,8 @@ class AlarmSettingFragment : Fragment() {
108109
)
109110

110111
alarmSettingViewModel.saveAlarm(alarmUseCaseItem)
111-
alarmSettingViewModel.callAlarm(clickRouteViewModel.lastTime)
112-
alarmSettingViewModel.makeAlarmWorker(clickRouteViewModel.lastTime)
112+
alarmSettingViewModel.callAlarm(transportLastTime.timeToBoard)
113+
alarmSettingViewModel.makeAlarmWorker(transportLastTime.timeToBoard)
113114

114115
val navController = findNavController()
115116
navController.setGraph(R.navigation.nav_graph)

presentation/src/main/java/com/stop/ui/route/ClickRouteViewModel.kt

Whitespace-only changes.

0 commit comments

Comments
 (0)