Merge pull request #38 from boostcampwm-2022/sprint2-sync

[PR] Sprint2 Sync 작업

Author: koreatlwls

presentation/src/main/java/com/stop/MainActivity.kt

@@ -10,7 +10,6 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
-import com.stop.databinding.ActivityMainBinding
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {

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
@@ -13,6 +12,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
 import com.skt.tmap.TMapData
+import com.skt.tmap.TMapGpsManager
 import com.skt.tmap.TMapPoint
 import com.skt.tmap.TMapView
 import com.skt.tmap.address.TMapAddressInfo
@@ -26,7 +26,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-
 class MapFragment : Fragment() {
     private var _binding: FragmentMapBinding? = null
     private val binding get() = _binding!!
@@ -52,10 +51,6 @@ class MapFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        placeSearchViewModel.clickPlace.observe(viewLifecycleOwner){
-            Log.e("ABC",it.toString())
-        }
-
         buttonClick()
         initView()
         initTMap()
@@ -231,6 +226,7 @@ class MapFragment : Fragment() {
             tMapView.removeTMapMarkerItem("marker_person_pin")
             tMapView.addTMapMarkerItem(marker)
             tMapView.setLocationPoint(location.latitude, location.longitude)
+            placeSearchViewModel.currentLocation = Location(location.latitude, location.longitude)
 
             if (isTracking) {
                 tMapView.setCenterPoint(location.latitude, location.longitude, true)

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

@@ -41,7 +41,7 @@ class PlaceSearchFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
+        Log.e("ABC", placeSearchViewModel.currentLocation.toString())
         initAdapter()
         buttonClick()
         initBinding()
@@ -80,7 +80,7 @@ class PlaceSearchFragment : Fragment() {
 
     private fun listenEditTextChange() {
         with(binding) {
-            textInputEditTextPlaceSearch.setOnFocusChangeListener { v, hasFocus ->
+            textInputEditTextPlaceSearch.setOnFocusChangeListener { _, hasFocus ->
                 if (hasFocus.not()) {
                     hideKeyBoard()
                 }

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

@@ -8,6 +8,7 @@ import androidx.lifecycle.viewModelScope
 import com.stop.BuildConfig
 import com.stop.domain.model.nearplace.Place
 import com.stop.domain.usecase.nearplace.GetNearPlacesUseCase
+import com.stop.model.Location
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
@@ -28,6 +29,8 @@ class PlaceSearchViewModel @Inject constructor(
     private val _clickPlace = MutableLiveData<Place>()
     val clickPlace : LiveData<Place> = _clickPlace
 
+    var currentLocation = Location(0.0,0.0)
+
     fun afterTextChanged(s: Editable?) {
         if(s.toString().isBlank()){
             _nearPlaceList.postValue(emptyList())

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

@@ -8,7 +8,4 @@
     <string name="select_map_text">지도에서 선택</string>
     <string name="distance_km">%1$skm</string>
     <string name="location_address_search_text">장소, 주소 검색</string>
-    <string name="bookmark">즐겨찾기 추가</string>
-    <string name="start_location">출발지</string>
-    <string name="end_location">도착지</string>
 </resources>