feat : PR 싱크 후 추가 로직 추가

Author: koreatlwls

data/src/main/java/com/stop/data/remote/network/NearPlaceApiService.kt

@@ -11,8 +11,8 @@ interface NearPlaceApiService {
     suspend fun getNearPlaces(
         @Query("version") version: Int,
         @Query("searchKeyword") searchKeyword: String,
-        @Query("centerLon") centerLon: Float,
-        @Query("centerLat") centerLat: Float,
+        @Query("centerLon") centerLon: Double,
+        @Query("centerLat") centerLat: Double,
         @Query("appKey") appKey: String,
     ): NetworkResult<NearPlcaeResponse>
 

data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSource.kt

@@ -7,8 +7,8 @@ interface NearPlaceRemoteDataSource {
     suspend fun getNearPlaces(
         version : Int,
         searchKeyword: String,
-        centerLon: Float,
-        centerLat: Float,
+        centerLon: Double,
+        centerLat: Double,
         appKey: String
     ): List<Place>
 

data/src/main/java/com/stop/data/remote/source/nearplace/NearPlaceRemoteDataSourceImpl.kt

@@ -12,8 +12,8 @@ internal class NearPlaceRemoteDataSourceImpl @Inject constructor(
     override suspend fun getNearPlaces(
         version: Int,
         searchKeyword: String,
-        centerLon: Float,
-        centerLat: Float,
+        centerLon: Double,
+        centerLat: Double,
         appKey: String
     ): List<Place> {
         val result = nearPlaceApiService.getNearPlaces(

data/src/main/java/com/stop/data/repository/NearPlaceRepositoryImpl.kt

@@ -14,8 +14,8 @@ internal class NearPlaceRepositoryImpl @Inject constructor(
     override suspend fun getNearPlaces(
         version: Int,
         searchKeyword: String,
-        centerLon: Float,
-        centerLat: Float,
+        centerLon: Double,
+        centerLat: Double,
         appKey: String
     ): Flow<List<Place>> = flow<List<Place>> {
         emit(

domain/src/main/java/com/stop/domain/repository/NearPlaceRepository.kt

@@ -8,8 +8,8 @@ interface NearPlaceRepository {
     suspend fun getNearPlaces(
         version: Int,
         searchKeyword: String,
-        centerLon: Float,
-        centerLat: Float,
+        centerLon: Double,
+        centerLat: Double,
         appKey: String
     ): Flow<List<Place>>
 

domain/src/main/java/com/stop/domain/usecase/nearplace/GetNearPlacesUseCase.kt

@@ -8,8 +8,8 @@ interface GetNearPlacesUseCase {
     suspend fun getNearPlaces(
         version: Int,
         searchKeyword: String,
-        centerLon: Float,
-        centerLat: Float,
+        centerLon: Double,
+        centerLat: Double,
         appKey: String
     ) : Flow<List<Place>>
 

domain/src/main/java/com/stop/domain/usecase/nearplace/GetNearPlacesUseCaseImpl.kt

@@ -12,8 +12,8 @@ internal class GetNearPlacesUseCaseImpl @Inject constructor(
     override suspend fun getNearPlaces(
         version: Int,
         searchKeyword: String,
-        centerLon: Float,
-        centerLat: Float,
+        centerLon: Double,
+        centerLat: Double,
         appKey: String
     ): Flow<List<Place>> =
         nearPlaceRepository.getNearPlaces(

presentation/build.gradle

@@ -4,6 +4,7 @@ plugins {
     id 'androidx.navigation.safeargs'
     id 'kotlin-kapt'
     id 'com.google.dagger.hilt.android'
+    id 'kotlin-parcelize'
 }
 
 Properties properties = new Properties()

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

@@ -2,6 +2,7 @@ package com.stop.ui.map
 
 import android.Manifest.permission
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,6 +18,7 @@ import com.skt.tmap.TMapPoint
 import com.skt.tmap.TMapView
 import com.skt.tmap.address.TMapAddressInfo
 import com.skt.tmap.overlay.TMapMarkerItem
+import com.stop.BuildConfig
 import com.stop.R
 import com.stop.databinding.FragmentMapBinding
 import com.stop.model.Location
@@ -34,7 +36,6 @@ class MapFragment : Fragment() {
 
     private lateinit var tMapView: TMapView
     private var isTracking = true
-    private var lastMarker = NONE_LOCATION
     private var mapUIVisibility = false
 
     override fun onCreateView(
@@ -103,13 +104,12 @@ class MapFragment : Fragment() {
 
     private fun clickLocation() {
         tMapView.setOnLongClickListenerCallback { _, _, tMapPoint ->
-            lastMarker = TMapPoint(tMapPoint.latitude, tMapPoint.longitude)
             makeMarker(
                 R.drawable.ic_baseline_location_on_32,
-                lastMarker
+                tMapPoint
             )
-            tMapView.setCenterPoint(tMapPoint.latitude, tMapPoint.longitude, true)
 
+            tMapView.setCenterPoint(tMapPoint.latitude, tMapPoint.longitude, true)
             setPanel(tMapPoint)
         }
     }
@@ -149,15 +149,22 @@ class MapFragment : Fragment() {
     }
 
     private fun makeMarker(icon: Int, location: TMapPoint) {
-        val marker = TMapMarkerItem()
-        marker.id = MARKER
-        marker.icon = ContextCompat.getDrawable(
-            requireActivity(),
-            icon
-        )?.toBitmap()
-        marker.setTMapPoint(location.latitude, location.longitude)
-        tMapView.removeTMapMarkerItem(MARKER)
-        tMapView.addTMapMarkerItem(marker)
+        val marker = TMapMarkerItem().apply {
+            this.id = MARKER
+            this.icon = ContextCompat.getDrawable(
+                requireContext(),
+                icon
+            )?.toBitmap()
+            this.tMapPoint = location
+        }
+
+        try {
+            tMapView.removeTMapMarkerItem(MARKER)
+            tMapView.addTMapMarkerItem(marker)
+        }catch (e : Exception){
+            Log.e("ABC", e.printStackTrace().toString())
+        }
+
     }
 
     private fun initBinding() {
@@ -182,11 +189,13 @@ class MapFragment : Fragment() {
 
     private fun initTMap() {
         tMapView = TMapView(requireContext())
-        tMapView.setSKTMapApiKey(T_MAP_API_KEY)
+        tMapView.setSKTMapApiKey(BuildConfig.TMAP_APP_KEY)
         tMapView.setOnMapReadyListener {
             tMapView.mapType = TMapView.MapType.NIGHT
             tMapView.zoomLevel = 16
             requestPermissionsLauncher.launch(PERMISSIONS)
+
+            observeClickPlace()
         }
         tMapView.setOnEnableScrollWithZoomLevelListener { _, _ ->
             isTracking = false
@@ -233,19 +242,34 @@ class MapFragment : Fragment() {
             }
         }
     }
-    
+
+    private fun observeClickPlace() {
+        placeSearchViewModel.clickPlace.observe(viewLifecycleOwner) { event ->
+            event.getContentIfNotHandled()?.let { clickPlace ->
+                val clickTmapPoint = TMapPoint(clickPlace.centerLat, clickPlace.centerLon)
+
+                tMapView.setCenterPoint(clickTmapPoint.latitude, clickTmapPoint.longitude, true)
+
+                setPanel(clickTmapPoint)
+
+                makeMarker(
+                    R.drawable.ic_baseline_location_on_32,
+                    clickTmapPoint
+                )
+            }
+        }
+    }
+
     override fun onDestroyView() {
         _binding = null
         super.onDestroyView()
     }
 
     companion object {
-        private const val T_MAP_API_KEY = "l7xxc7cabdc0790f4cbeacd90982df581610"
         private const val MARKER = "marker"
         private const val LOT_ADDRESS_TYPE = "A02"
         private const val ROAD_ADDRESS_TYPE = "A04"
         private const val SAME_POINT = 1
-        private val NONE_LOCATION = TMapPoint(0.0, 0.0)
         val PERMISSIONS = arrayOf(permission.ACCESS_FINE_LOCATION, permission.ACCESS_COARSE_LOCATION)
     }
 }

presentation/src/main/java/com/stop/ui/nearplace/PlaceSearchFragment.kt

@@ -48,18 +48,19 @@ class PlaceSearchFragment : Fragment() {
         logErrorMessage()
     }
 
-    private fun initAdapter(){
+    private fun initAdapter() {
         nearPlaceAdapter = NearPlaceAdapter()
         binding.recyclerViewPlace.adapter = nearPlaceAdapter
 
         nearPlaceAdapter.onItemClick = {
             placeSearchViewModel.setClickPlace(it)
+            placeSearchViewModel.setNearPlaceListEmpty()
             binding.root.findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
         }
     }
 
-    private fun buttonClick(){
-        with(binding){
+    private fun buttonClick() {
+        with(binding) {
             textViewCurrentLocation.setOnClickListener {
                 root.findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
             }