Merge pull request #63 from boostcampwm-2022/demo

DoTheBestMayB · web-flow · commit 0634efd45420 · 2022-12-01T22:38:39.000+09:00
Fragment 간에 Navigation 데이터 연결
diff --git a/presentation/build.gradle b/presentation/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'androidx.navigation.safeargs'
     id 'kotlin-kapt'
+    id 'kotlin-parcelize'
     id 'com.google.dagger.hilt.android'
 }
 
diff --git a/presentation/src/main/java/com/stop/model/route/Coordinate.kt b/presentation/src/main/java/com/stop/model/route/Coordinate.kt
@@ -1,6 +1,10 @@
 package com.stop.model.route
 
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class Coordinate(
     val latitude: String,
     val longitude: String,
-)
+) : Parcelable
diff --git a/presentation/src/main/java/com/stop/model/route/Place.kt b/presentation/src/main/java/com/stop/model/route/Place.kt
@@ -1,6 +1,10 @@
 package com.stop.model.route
 
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class Place(
     val name: String,
     val coordinate: Coordinate,
-)
+) : Parcelable
diff --git a/presentation/src/main/java/com/stop/ui/map/MapFragment.kt b/presentation/src/main/java/com/stop/ui/map/MapFragment.kt
@@ -107,7 +107,8 @@ class MapFragment : Fragment(), MapHandler {
 
     private fun initNavigateAction() {
         binding.textViewSearch.setOnClickListener {
-            binding.root.findNavController().navigate(R.id.action_mapFragment_to_placeSearchFragment)
+            binding.root.findNavController()
+                .navigate(R.id.action_mapFragment_to_placeSearchFragment)
         }
 
         /*
@@ -117,11 +118,13 @@ class MapFragment : Fragment(), MapHandler {
         */
 
         binding.layoutPanel.findViewById<View>(R.id.view_panel_start).setOnClickListener {
-            binding.root.findNavController().navigate(R.id.action_mapFragment_to_routeFragment)
+            val action = MapFragmentDirections.actionMapFragmentToRouteFragment().setStart(placeSearchViewModel.panelInfo)
+            binding.root.findNavController().navigate(action)
         }
 
         binding.layoutPanel.findViewById<View>(R.id.view_panel_end).setOnClickListener {
-            binding.root.findNavController().navigate(R.id.action_mapFragment_to_routeFragment)
+            val action = MapFragmentDirections.actionMapFragmentToRouteFragment().setEnd(placeSearchViewModel.panelInfo)
+            binding.root.findNavController().navigate(action)
         }
     }
 
@@ -153,7 +156,11 @@ class MapFragment : Fragment(), MapHandler {
             event.getContentIfNotHandled()?.let { clickPlace ->
                 val clickTMapPoint = TMapPoint(clickPlace.centerLat, clickPlace.centerLon)
 
-                tMap.tMapView.setCenterPoint(clickTMapPoint.latitude, clickTMapPoint.longitude, true)
+                tMap.tMapView.setCenterPoint(
+                    clickTMapPoint.latitude,
+                    clickTMapPoint.longitude,
+                    true
+                )
                 tMap.addMarker(Marker.PLACE_MARKER, Marker.PLACE_MARKER_IMG, clickTMapPoint)
                 setPanel(clickTMapPoint)
             }
diff --git a/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchViewModel.kt b/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchViewModel.kt
@@ -12,6 +12,7 @@ import com.stop.domain.usecase.geoLocation.GeoLocationUseCase
 import com.stop.domain.usecase.nearplace.GetNearPlacesUseCase
 import com.stop.model.Event
 import com.stop.model.Location
+import com.stop.model.route.Coordinate
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -29,6 +30,8 @@ class PlaceSearchViewModel @Inject constructor(
 
     var currentLocation = Location(0.0, 0.0)
 
+    var panelInfo: com.stop.model.route.Place? = null
+
     private val _nearPlaceList = MutableStateFlow<List<Place>>(emptyList())
     val nearPlaceList: StateFlow<List<Place>> = _nearPlaceList
 
@@ -95,11 +98,22 @@ class PlaceSearchViewModel @Inject constructor(
     fun getGeoLocationInfo(latitude: Double, longitude: Double) {
         viewModelScope.launch {
             _geoLocation.value = geoLocationUseCase.getGeoLocationInfo(latitude, longitude)
+
+            readySendValue(latitude, longitude)
             _panelVisibility.value = View.VISIBLE
             getDistance(latitude, longitude)
         }
     }
 
+    private fun readySendValue(latitude: Double, longitude: Double) {
+        val clickedValue = _geoLocation.value ?: return
+
+        panelInfo = com.stop.model.route.Place(
+            clickedValue.title,
+            Coordinate(latitude.toString(), longitude.toString())
+        )
+    }
+
     private fun getDistance(latitude: Double, longitude: Double) {
         val startPoint = android.location.Location("Start")
         val endPoint = android.location.Location("End")
diff --git a/presentation/src/main/java/com/stop/ui/route/RouteFragment.kt b/presentation/src/main/java/com/stop/ui/route/RouteFragment.kt
@@ -8,12 +8,11 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
+import androidx.navigation.fragment.navArgs
 import com.stop.R
 import com.stop.databinding.FragmentRouteBinding
 import com.stop.domain.model.route.tmap.custom.Itinerary
 import com.stop.model.ErrorType
-import com.stop.model.route.Coordinate
-import com.stop.model.route.Place
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -25,6 +24,8 @@ class RouteFragment : Fragment() {
 
     private val viewModel: RouteViewModel by activityViewModels()
 
+    private val args: RouteFragmentArgs by navArgs()
+
     private lateinit var adapter: RouteAdapter
 
     override fun onCreateView(
@@ -39,6 +40,7 @@ class RouteFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         setBinding()
+        setListener()
         setRecyclerView()
         setStartAndDestinationText()
         setObserve()
@@ -49,8 +51,19 @@ class RouteFragment : Fragment() {
         binding.viewModel = viewModel
     }
 
+    private fun setListener() {
+        binding.textViewOrigin.setOnClickListener {
+            val action = RouteFragmentDirections.actionRouteFragmentToPlaceSearchFragment()
+            binding.root.findNavController().navigate(action)
+        }
+        binding.textViewDestination.setOnClickListener {
+            val action = RouteFragmentDirections.actionRouteFragmentToPlaceSearchFragment()
+            binding.root.findNavController().navigate(action)
+        }
+    }
+
     private fun setRecyclerView() {
-        adapter = RouteAdapter(object: OnItineraryClickListener {
+        adapter = RouteAdapter(object : OnItineraryClickListener {
             override fun onItineraryClick(itinerary: Itinerary) {
                 /**
                  * UI가 ViewModel을 직접 호출하면 안 되지만, 테스트를 위해 막차 조회 함수를 호출했습니다.
@@ -72,7 +85,7 @@ class RouteFragment : Fragment() {
 
         viewModel.errorMessage.observe(viewLifecycleOwner) {
             it.getContentIfNotHandled()?.let { errorType ->
-                val message = when(errorType) {
+                val message = when (errorType) {
                     ErrorType.NO_START -> getString(R.string.no_start_input)
                     ErrorType.NO_END -> getString(R.string.no_end_input)
                 }
@@ -89,8 +102,12 @@ class RouteFragment : Fragment() {
     }
 
     private fun setStartAndDestinationText() {
-        viewModel.setOrigin(Place(ORIGIN_NAME, Coordinate(ORIGIN_Y, ORIGIN_X)))
-        viewModel.setDestination(Place(DESTINATION_NAME, Coordinate(DESTINATION_Y, DESTINATION_X)))
+        args.start?.let {
+            viewModel.setOrigin(it)
+        }
+        args.end?.let {
+            viewModel.setDestination(it)
+        }
         viewModel.getRoute()
     }
 
@@ -99,14 +116,4 @@ class RouteFragment : Fragment() {
 
         super.onDestroyView()
     }
-
-    companion object {
-        private const val ORIGIN_NAME = "이앤씨벤쳐드림타워3차"
-        private const val ORIGIN_X = "126.893820"
-        private const val ORIGIN_Y = "37.4865002"
-
-        private const val DESTINATION_NAME = "Naver1784"
-        private const val DESTINATION_X = "127.105037"
-        private const val DESTINATION_Y = "37.3584879"
-    }
 }
diff --git a/presentation/src/main/res/layout/fragment_place_search.xml b/presentation/src/main/res/layout/fragment_place_search.xml
@@ -34,7 +34,7 @@
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="50dp"
             app:endIconMode="clear_text"
             app:layout_constraintEnd_toEndOf="@id/guide_line_end"
             app:layout_constraintStart_toStartOf="@id/guide_line_start"
diff --git a/presentation/src/main/res/layout/fragment_route.xml b/presentation/src/main/res/layout/fragment_route.xml
@@ -25,63 +25,56 @@
             app:layout_constraintEnd_toEndOf="@id/guideline_end_vertical"
             app:layout_constraintTop_toTopOf="@id/guideline_start_horizontal" />
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/text_input_layout_origin"
+
+        <TextView
+            android:id="@+id/text_view_origin"
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:paddingVertical="10dp"
+            android:text="@{viewModel.origin.name}"
+            android:background="@drawable/round_border"
             app:layout_constraintEnd_toStartOf="@id/button_swap_origin_with_destination"
             app:layout_constraintStart_toStartOf="@id/guideline_start_vertical"
-            app:layout_constraintTop_toBottomOf="@id/button_back_to_home">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/text_input_edit_text_origin"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@{viewModel.origin.name}"
-                tools:text="이앤씨벤쳐드림타워3차" />
-
-        </com.google.android.material.textfield.TextInputLayout>
+            app:layout_constraintTop_toBottomOf="@id/button_back_to_home"
+            tools:text="이앤씨벤쳐드림타워3차" />
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_swap_origin_with_destination"
             style="@style/Widget.AppCompat.Button.Small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/ic_baseline_swap_vert_24"
-            app:layout_constraintBottom_toBottomOf="@id/text_input_layout_origin"
+            app:layout_constraintBottom_toBottomOf="@id/text_view_origin"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toStartOf="@id/guideline_end_vertical"
-            app:layout_constraintTop_toTopOf="@id/text_input_layout_origin" />
+            app:layout_constraintTop_toTopOf="@id/text_view_origin" />
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/text_input_layout_destination"
+        <TextView
+            android:id="@+id/text_view_destination"
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:paddingVertical="10dp"
+            android:background="@drawable/round_border"
+            android:text="@{viewModel.destination.name}"
             app:layout_constraintEnd_toStartOf="@id/button_swap_origin_with_destination"
             app:layout_constraintStart_toStartOf="@id/guideline_start_vertical"
-            app:layout_constraintTop_toBottomOf="@id/text_input_layout_origin">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/text_input_edit_text_destination"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@{viewModel.destination.name}"
-                tools:text="Naver1784" />
+            app:layout_constraintTop_toBottomOf="@id/text_view_origin"
+            tools:text="Naver1784" />
 
-        </com.google.android.material.textfield.TextInputLayout>
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_erase_origin_and_destination"
             style="@style/Widget.AppCompat.Button.Small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/ic_baseline_replay_24"
-            app:layout_constraintBottom_toBottomOf="@id/text_input_layout_destination"
+            app:layout_constraintBottom_toBottomOf="@id/text_view_destination"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toStartOf="@id/guideline_end_vertical"
-            app:layout_constraintTop_toTopOf="@id/text_input_layout_destination" />
+            app:layout_constraintTop_toTopOf="@id/text_view_destination" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerview_route"
@@ -92,7 +85,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/guideline_end_vertical"
             app:layout_constraintStart_toStartOf="@id/guideline_start_vertical"
-            app:layout_constraintTop_toBottomOf="@id/text_input_layout_destination"
+            app:layout_constraintTop_toBottomOf="@id/text_view_destination"
             tools:listitem="@layout/route_item" />
 
         <androidx.constraintlayout.widget.Guideline
diff --git a/presentation/src/main/res/navigation/nav_graph.xml b/presentation/src/main/res/navigation/nav_graph.xml
@@ -75,6 +75,19 @@
         <action
             android:id="@+id/action_routeFragment_to_routeDetailFragment"
             app:destination="@id/routeDetailFragment" />
+        <argument
+            android:name="start"
+            app:argType="com.stop.model.route.Place"
+            app:nullable="true"
+            android:defaultValue="@null" />
+        <argument
+            android:name="end"
+            app:argType="com.stop.model.route.Place"
+            app:nullable="true"
+            android:defaultValue="@null" />
+        <action
+            android:id="@+id/action_routeFragment_to_placeSearchFragment"
+            app:destination="@id/placeSearchFragment" />
     </fragment>
     <fragment
         android:id="@+id/missionFragment"

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ plugins {`
`3`	`3`	`id 'org.jetbrains.kotlin.android'`
`4`	`4`	`id 'androidx.navigation.safeargs'`
`5`	`5`	`id 'kotlin-kapt'`
	`6`	`+ id 'kotlin-parcelize'`
`6`	`7`	`id 'com.google.dagger.hilt.android'`
`7`	`8`	`}`
`8`	`9`