fix: UI가 없을 시 패널이 나타나지 않던 버그 수정

Author: khcho226

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

@@ -53,8 +53,8 @@ class MapFragment : Fragment(), MapHandler {
 
     override fun alertTMapReady() {
         requestPermissionsLauncher.launch(PERMISSIONS)
-        tMap.initListener()
 
+        tMap.initListener()
         addBookmarkMarker()
         observeClickPlace()
         observeClickCurrentLocation()
@@ -80,6 +80,8 @@ class MapFragment : Fragment(), MapHandler {
 
         binding.layoutCurrent.setOnClickListener {
             requestPermissionsLauncher.launch(PERMISSIONS)
+
+            tMap.isTracking = true
             tMap.tMapView.setCenterPoint(
                 placeSearchViewModel.currentLocation.latitude,
                 placeSearchViewModel.currentLocation.longitude,
@@ -93,7 +95,6 @@ class MapFragment : Fragment(), MapHandler {
                     placeSearchViewModel.currentLocation.longitude
                 )
             )
-            tMap.isTracking = true
         }
 
         binding.layoutBookmark.setOnClickListener {
@@ -181,6 +182,20 @@ class MapFragment : Fragment(), MapHandler {
         placeSearchViewModel.getGeoLocationInfo(tMapPoint.latitude, tMapPoint.longitude)
     }
 
+    override fun setOnLocationChangeListener(location: android.location.Location) {
+        placeSearchViewModel.currentLocation = Location(location.latitude, location.longitude)
+    }
+
+    override fun setOnDisableScrollWIthZoomLevelListener() {
+        if (binding.layoutPanel.visibility == View.VISIBLE) {
+            binding.layoutPanel.visibility = View.GONE
+            tMap.tMapView.removeTMapMarkerItem(PLACE_MARKER)
+        } else {
+            setViewVisibility()
+            mapUIVisibility = mapUIVisibility.xor(View.GONE)
+        }
+    }
+
     private fun setViewVisibility() {
         with(binding) {
             layoutSearch.visibility = mapUIVisibility
@@ -198,20 +213,6 @@ class MapFragment : Fragment(), MapHandler {
         ).toInt()
     }
 
-    override fun setOnLocationChangeListener(location: android.location.Location) {
-        placeSearchViewModel.currentLocation = Location(location.latitude, location.longitude)
-    }
-
-    override fun setOnDisableScrollWIthZoomLevelListener() {
-        if (binding.layoutPanel.visibility == View.VISIBLE) {
-            binding.layoutPanel.visibility = View.GONE
-            tMap.tMapView.removeTMapMarkerItem(PLACE_MARKER)
-        } else {
-            setViewVisibility()
-            mapUIVisibility = mapUIVisibility.xor(View.GONE)
-        }
-    }
-
     override fun onDestroyView() {
         _binding = null
 
@@ -238,4 +239,4 @@ class MapFragment : Fragment(), MapHandler {
         private val PERMISSIONS =
             arrayOf(permission.ACCESS_FINE_LOCATION, permission.ACCESS_COARSE_LOCATION)
     }
-}
+}

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

@@ -1,45 +1,73 @@
 package com.stop.ui.map
 
 import android.content.Context
+import android.graphics.PointF
+import com.skt.tmap.TMapPoint
+import com.skt.tmap.TMapView
+import com.skt.tmap.TMapView.OnClickListenerCallback
+import com.skt.tmap.overlay.TMapMarkerItem
+import com.skt.tmap.poi.TMapPOIItem
 import com.stop.R
 import com.stop.model.Location
 import com.stop.ui.util.TMap
+import java.util.ArrayList
 
 class MapTMap(
     context: Context,
     private val handler: MapHandler,
 ) : TMap(context, handler) {
 
+    private val enablePoints = mutableSetOf<Location>()
+    private var isLongClick = false
+
     fun initListener() {
-        val enablePoint = mutableSetOf<Location>()
-        tMapView.setOnEnableScrollWithZoomLevelListener { _, centerPoint ->
-            enablePoint.add(Location(centerPoint.latitude, centerPoint.longitude))
-            isTracking = false
+        tMapView.setOnClickListenerCallback(onClickListenerCallback)
+        tMapView.setOnLongClickListenerCallback(onLongClickListenerCallback)
+        tMapView.setOnEnableScrollWithZoomLevelListener(onEnableScrollWithZoomLevelCallback)
+    }
+
+    private val onClickListenerCallback = object : OnClickListenerCallback {
+        override fun onPressDown(
+            p0: ArrayList<TMapMarkerItem>?,
+            p1: ArrayList<TMapPOIItem>?,
+            p2: TMapPoint?,
+            p3: PointF?
+        ) {
+            isLongClick = false
         }
 
-        tMapView.setOnDisableScrollWithZoomLevelListener { _, _ ->
-            if (enablePoint.size == SAME_POINT) {
+        override fun onPressUp(
+            p0: ArrayList<TMapMarkerItem>?,
+            p1: ArrayList<TMapPOIItem>?,
+            p2: TMapPoint?,
+            p3: PointF?
+        ) {
+            if (enablePoints.size < SCROLL_NUM && isLongClick.not()) {
                 handler.setOnDisableScrollWIthZoomLevelListener()
             }
-            enablePoint.clear()
-        }
 
-        tMapView.setOnLongClickListenerCallback { _, _, tMapPoint ->
-            addMarker(
-                PLACE_MARKER,
-                PLACE_MARKER_IMG,
-                tMapPoint
-            )
+            enablePoints.clear()
+        }
+    }
 
+    private val onLongClickListenerCallback =
+        TMapView.OnLongClickListenerCallBack { _, _, tMapPoint ->
+            isLongClick = true
             tMapView.setCenterPoint(tMapPoint.latitude, tMapPoint.longitude, true)
+            addMarker(PLACE_MARKER, PLACE_MARKER_IMG, tMapPoint)
             handler.setPanel(tMapPoint)
         }
-    }
+
+    private val onEnableScrollWithZoomLevelCallback =
+        TMapView.OnEnableScrollWithZoomLevelCallback { _, tMapPoint ->
+            isTracking = false
+            enablePoints.add(Location(tMapPoint.latitude, tMapPoint.longitude))
+        }
 
     companion object {
         private const val PLACE_MARKER = "place_marker"
         private const val PLACE_MARKER_IMG = R.drawable.ic_place_marker
 
-        private const val SAME_POINT = 1
+        private const val SCROLL_NUM = 3
     }
 }

presentation/src/main/java/com/stop/ui/util/TMap.kt

@@ -106,7 +106,7 @@ open class TMap(
         private const val KOREA_LONGITUDE_MIN = 124.661865
         private const val KOREA_LONGITUDE_MAX = 132.550049
 
-        private const val PERSON_MARKER = "marker_person_pin"
+        private const val PERSON_MARKER = "person_marker"
         private const val PERSON_MARKER_IMG = R.drawable.ic_person_marker
     }
 }

presentation/src/main/res/layout/fragment_map.xml

@@ -57,14 +57,13 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/layout_panel"
             android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginEnd="15dp"
+            android:layout_height="170dp"
+            android:layout_marginEnd="90dp"
             android:layout_marginTop="30dp"
             android:elevation="15dp"
             android:visibility="@{placeSearchViewModel.panelVisibility}"
             app:layout_constraintStart_toStartOf="@id/guideline_start"
-            app:layout_constraintEnd_toStartOf="@id/layout_compass"
-            app:layout_constraintTop_toTopOf="@id/layout_compass"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/guideline_bottom">
 
             <include