Skip to content

Commit 351cf46

Browse files
committed
fix: merge conflict 해결
1 parent 5f45993 commit 351cf46

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.stop.ui.route
22

33
import androidx.lifecycle.ViewModel
4+
import com.stop.domain.model.route.TransportLastTime
45
import com.stop.domain.model.route.tmap.custom.Itinerary
56

67
class ClickRouteViewModel : ViewModel() {
78

89
var clickRoute : Itinerary? = null
9-
var lastTime = "23:30:00"
10+
var lastTimes: List<TransportLastTime?>? = null
11+
val lastTime = "23:30:00"
1012

1113
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class RouteFragment : Fragment() {
9494

9595
routeViewModel.lastTimeResponse.observe(viewLifecycleOwner) { event ->
9696
event.getContentIfNotHandled()?.let { response ->
97-
routeViewModel.lastTimes = response.toMutableList()
97+
clickRouteViewModel.lastTimes = response
9898
binding.root.findNavController().navigate(R.id.action_routeFragment_to_routeDetailFragment)
9999
}
100100
}

0 commit comments

Comments
 (0)