Merge pull request #40 from boostcampwm-2022/8-feature-button

[PR] 현재 위치 클릭 시 flow 통해 이벤트 발생시켜 마커 및 패널 띄우기 구현

Author: koreatlwls

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

@@ -17,7 +17,7 @@ internal class NearPlaceRepositoryImpl @Inject constructor(
         centerLon: Double,
         centerLat: Double,
         appKey: String
-    ): Flow<List<Place>> = flow<List<Place>> {
+    ): Flow<List<Place>> = flow {
         emit(
             nearPlaceRemoteDataSource.getNearPlaces(
                 version,

presentation/src/main/java/com/stop/model/Event.kt

@@ -1,19 +1,19 @@
 package com.stop.model
 
-open class Event<out T>(private val content : T){
+class Event<out T>(private val content: T) {
 
     var hasBeenHandled = false
         private set
 
-    fun getContentIfNotHandled() : T?{
-        return if (hasBeenHandled){
+    fun getContentIfNotHandled(): T? {
+        return if (hasBeenHandled) {
             null
-        }else {
+        } else {
             hasBeenHandled = true
             content
         }
     }
 
-    fun peekContent() : T = content
+    fun peekContent(): T = content
 
 }

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

@@ -2,7 +2,6 @@ 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
@@ -11,6 +10,8 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
 import com.skt.tmap.TMapData
 import com.skt.tmap.TMapGpsManager
@@ -158,13 +159,8 @@ class MapFragment : Fragment() {
             this.tMapPoint = location
         }
 
-        try {
-            tMapView.removeTMapMarkerItem(MARKER)
-            tMapView.addTMapMarkerItem(marker)
-        }catch (e : Exception){
-            Log.e("ABC", e.printStackTrace().toString())
-        }
-
+        tMapView.removeTMapMarkerItem(MARKER)
+        tMapView.addTMapMarkerItem(marker)
     }
 
     private fun initBinding() {
@@ -196,6 +192,7 @@ class MapFragment : Fragment() {
             requestPermissionsLauncher.launch(PERMISSIONS)
 
             observeClickPlace()
+            observeClickCurrentLocation()
         }
         tMapView.setOnEnableScrollWithZoomLevelListener { _, _ ->
             isTracking = false
@@ -260,6 +257,28 @@ class MapFragment : Fragment() {
         }
     }
 
+    private fun observeClickCurrentLocation() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            launch {
+                placeSearchViewModel.clickCurrentLocation
+                    .flowWithLifecycle(viewLifecycleOwner.lifecycle)
+                    .collect {
+                        val currentLocation = placeSearchViewModel.currentLocation
+                        val currentTmapPoint = TMapPoint(currentLocation.latitude, currentLocation.longitude)
+
+                        tMapView.setCenterPoint(currentTmapPoint.latitude, currentTmapPoint.longitude)
+
+                        setPanel(currentTmapPoint)
+
+                        makeMarker(
+                            R.drawable.ic_baseline_location_on_32,
+                            currentTmapPoint
+                        )
+                    }
+            }
+        }
+    }
+
     override fun onDestroyView() {
         _binding = null
         super.onDestroyView()

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

@@ -55,18 +55,20 @@ class PlaceSearchFragment : Fragment() {
         nearPlaceAdapter.onItemClick = {
             placeSearchViewModel.setClickPlace(it)
             placeSearchViewModel.setNearPlaceListEmpty()
+
             binding.root.findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
         }
     }
 
     private fun buttonClick() {
         with(binding) {
             textViewCurrentLocation.setOnClickListener {
-                root.findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
+                placeSearchViewModel.setClickCurrentLocation()
+                binding.root.findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
             }
 
             textViewSelectMap.setOnClickListener {
-                root.findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
+                binding.root.findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
             }
         }
     }

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

@@ -27,11 +27,14 @@ class PlaceSearchViewModel @Inject constructor(
     private val _nearPlaceList = MutableLiveData<List<Place>>()
     val nearPlaceList: LiveData<List<Place>> = _nearPlaceList
 
+    private val errorMessageChannel = Channel<String>()
+    val errorMessage = errorMessageChannel.receiveAsFlow()
+
     private val _clickPlace = MutableLiveData<Event<Place>>()
     val clickPlace: LiveData<Event<Place>> = _clickPlace
 
-    private val eventChannel = Channel<String>()
-    val errorMessage = eventChannel.receiveAsFlow()
+    private val clickCurrentLocationChannel = Channel<Boolean>()
+    val clickCurrentLocation = clickCurrentLocationChannel.receiveAsFlow()
 
 
     fun afterTextChanged(s: Editable?) {
@@ -64,7 +67,7 @@ class PlaceSearchViewModel @Inject constructor(
                 }
             } catch (e: Exception) {
                 setNearPlaceListEmpty()
-                eventChannel.send(e.message ?: "something is wrong")
+                errorMessageChannel.send(e.message ?: "something is wrong")
             }
         }
     }
@@ -77,6 +80,12 @@ class PlaceSearchViewModel @Inject constructor(
         _clickPlace.value = Event(place)
     }
 
+    fun setClickCurrentLocation() {
+        viewModelScope.launch {
+            clickCurrentLocationChannel.send(true)
+        }
+    }
+
     companion object {
         private const val TMAP_VERSION = 1
     }

presentation/src/main/res/navigation/nav_graph.xml

@@ -13,6 +13,11 @@
         <action
             android:id="@+id/action_mapFragment_to_placeSearchFragment"
             app:destination="@id/placeSearchFragment" />
+        <argument
+            android:name="currentLocation"
+            app:argType="string"
+            app:nullable="true"
+            android:defaultValue="@null"/>
     </fragment>
     <fragment
         android:id="@+id/placeSearchFragment"