Skip to content

Commit fddf157

Browse files
committed
feat : mapFragment의 initView 위치 변경
1 parent d508d37 commit fddf157

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

presentation/src/main/java/com/stop/ui/map/MapFragment.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class MapFragment : Fragment(), MapHandler {
5252
super.onViewCreated(view, savedInstanceState)
5353

5454
initTMap()
55-
initView()
5655
initNavigateAction()
5756
initBottomSheetBehavior()
5857
listenButtonClick()
@@ -78,6 +77,8 @@ class MapFragment : Fragment(), MapHandler {
7877
tMap.init()
7978

8079
binding.frameLayoutContainer.addView(tMap.tMapView)
80+
81+
initView()
8182
}
8283

8384
private fun initView() {

presentation/src/main/java/com/stop/ui/mission/MissionFragment.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ class MissionFragment : Fragment(), MissionHandler {
112112
fun clickMissionOver() {
113113
Snackbar.make(requireActivity().findViewById(R.id.constraint_layout_container), "미션을 취소합니다", Snackbar.LENGTH_SHORT).show()
114114
missionViewModel.isMissionOver.value = true
115-
//findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
115+
findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
116+
Log.d("MissionWorker","clickMissionOver")
116117
}
117118

118119
override fun alertTMapReady() {
@@ -187,7 +188,6 @@ class MissionFragment : Fragment(), MissionHandler {
187188
private fun getAlarmInfo() {
188189
alarmSettingViewModel.getAlarm()
189190
val linePoints = arrayListOf<TMapPoint>()
190-
Log.d("MissionWorker","alarm으로 부터의 데이터 ${alarmSettingViewModel.alarmItem.value?.routes?.first()}")
191191
val walkInfo = alarmSettingViewModel.alarmItem.value?.routes?.first() as WalkRoute
192192
tMap.drawWalkRoute(walkInfo, linePoints)
193193
tMap.drawWalkLines(linePoints, Marker.WALK_LINE, Marker.WALK_LINE_COLOR)
@@ -233,6 +233,7 @@ class MissionFragment : Fragment(), MissionHandler {
233233

234234
override fun onAnimationEnd(animation: Animator) {
235235
//findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
236+
Log.d("MissionWorker","setSuccessAnimation onAnimationEnd")
236237
}
237238

238239
override fun onAnimationCancel(animation: Animator) {
@@ -263,6 +264,7 @@ class MissionFragment : Fragment(), MissionHandler {
263264

264265
override fun onAnimationEnd(animation: Animator) {
265266
//findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
267+
Log.d("MissionWorker","setFailAnimation onAnimationEnd")
266268
}
267269

268270
override fun onAnimationCancel(animation: Animator) {

0 commit comments

Comments
 (0)