feat : Click 경로 연결해서 뷰연결

Author: koreatlwls

presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt

@@ -15,9 +15,10 @@ import com.stop.AlarmFunctions
 import com.stop.AlarmWorker
 import com.stop.R
 import com.stop.databinding.FragmentAlarmSettingBinding
-import com.stop.ui.route.RouteViewModel
+import com.stop.ui.route.ClickRouteViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import java.util.concurrent.TimeUnit
+import kotlin.math.roundToInt
 
 @AndroidEntryPoint
 class AlarmSettingFragment : Fragment() {
@@ -26,7 +27,7 @@ class AlarmSettingFragment : Fragment() {
     private val binding get() = _binding!!
 
     private val alarmSettingViewModel by viewModels<AlarmSettingViewModel>()
-    private val routeViewModel by activityViewModels<RouteViewModel>()
+    private val clickRouteViewModel by activityViewModels<ClickRouteViewModel>()
 
     private lateinit var alarmFunctions: AlarmFunctions
 
@@ -55,14 +56,16 @@ class AlarmSettingFragment : Fragment() {
         binding.apply {
             lifecycleOwner = viewLifecycleOwner
             alarmViewModel = alarmSettingViewModel
-            routeViewModel = routeViewModel
+            startPosition = clickRouteViewModel.clickRoute?.routes?.first()?.start?.name ?: "출발지 없음"
+            endPosition = clickRouteViewModel.clickRoute?.routes?.last()?.end?.name ?: "도착지 없음"
+            lastTime = clickRouteViewModel.lastTime
+            walkTime = (clickRouteViewModel.clickRoute?.routes?.first()?.sectionTime?.div(60))?.roundToInt() ?: 0
             fragment = this@AlarmSettingFragment
         }
     }
 
     private fun initView() {
         with(binding) {
-            textViewLastTime.text = getString(R.string.last_transport_arrival_time, 23, 30)
             textViewWalk.text = getString(R.string.last_transport_walking_time, 10)
 
             numberPickerAlarmTime.minValue = 0

presentation/src/main/java/com/stop/ui/route/ClickRouteViewModel.kt

@@ -0,0 +1,11 @@
+package com.stop.ui.route
+
+import androidx.lifecycle.ViewModel
+import com.stop.domain.model.route.tmap.custom.Itinerary
+
+class ClickRouteViewModel : ViewModel() {
+
+    var clickRoute : Itinerary? = null
+    var lastTime = "23:30:00"
+
+}

presentation/src/main/java/com/stop/ui/route/RouteFragment.kt

@@ -22,7 +22,8 @@ class RouteFragment : Fragment() {
     private val binding: FragmentRouteBinding
         get() = _binding!!
 
-    private val viewModel: RouteViewModel by activityViewModels()
+    private val routeViewModel: RouteViewModel by activityViewModels()
+    private val clickRouteViewModel : ClickRouteViewModel by activityViewModels()
 
     private val args: RouteFragmentArgs by navArgs()
 
@@ -48,7 +49,7 @@ class RouteFragment : Fragment() {
 
     private fun setBinding() {
         binding.lifecycleOwner = viewLifecycleOwner
-        binding.viewModel = viewModel
+        binding.viewModel = routeViewModel
     }
 
     private fun setListener() {
@@ -69,21 +70,22 @@ class RouteFragment : Fragment() {
                  * UI가 ViewModel을 직접 호출하면 안 되지만, 테스트를 위해 막차 조회 함수를 호출했습니다.
                  * 여기서 UI가 ViewModel을 직접 호출하지 않으면서 막차 조회 함수를 호출할 수 있을까요?
                  */
-                viewModel.calculateLastTransportTime(itinerary)
+                routeViewModel.calculateLastTransportTime(itinerary)
+                clickRouteViewModel.clickRoute = itinerary
             }
         })
         binding.recyclerviewRoute.adapter = adapter
     }
 
     private fun setObserve() {
-        viewModel.routeResponse.observe(viewLifecycleOwner) {
+        routeViewModel.routeResponse.observe(viewLifecycleOwner) {
             if (it == null) {
                 return@observe
             }
             adapter.submitList(it)
         }
 
-        viewModel.errorMessage.observe(viewLifecycleOwner) {
+        routeViewModel.errorMessage.observe(viewLifecycleOwner) {
             it.getContentIfNotHandled()?.let { errorType ->
                 val message = when (errorType) {
                     ErrorType.NO_START -> getString(R.string.no_start_input)
@@ -94,22 +96,22 @@ class RouteFragment : Fragment() {
             }
         }
 
-        viewModel.lastTimeResponse.observe(viewLifecycleOwner) { event ->
+        routeViewModel.lastTimeResponse.observe(viewLifecycleOwner) { event ->
             event.getContentIfNotHandled()?.let { response ->
-                viewModel.lastTimes = response.toMutableList()
+                routeViewModel.lastTimes = response.toMutableList()
                 binding.root.findNavController().navigate(R.id.action_routeFragment_to_routeDetailFragment)
             }
         }
     }
 
     private fun setStartAndDestinationText() {
         args.start?.let {
-            viewModel.setOrigin(it)
+            routeViewModel.setOrigin(it)
         }
         args.end?.let {
-            viewModel.setDestination(it)
+            routeViewModel.setDestination(it)
         }
-        viewModel.getRoute()
+        routeViewModel.getRoute()
     }
 
     override fun onDestroyView() {

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

@@ -10,8 +10,20 @@
             type="com.stop.ui.alarmsetting.AlarmSettingViewModel" />
 
         <variable
-            name="routeViewModel"
-            type="com.stop.ui.route.RouteViewModel" />
+            name="startPosition"
+            type="String" />
+
+        <variable
+            name="endPosition"
+            type="String" />
+
+        <variable
+            name="lastTime"
+            type="String" />
+
+        <variable
+            name="walkTime"
+            type="int" />
 
         <variable
             name="fragment"
@@ -54,7 +66,7 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:padding="8dp"
-            android:text="출발지 : 아남타워"
+            android:text="@{@string/start_position_text(startPosition)}"
             android:textColor="@color/black"
             android:textSize="24sp"
             android:textStyle="bold"
@@ -71,7 +83,7 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:padding="8dp"
-            android:text="도착지 : 강남역"
+            android:text="@{@string/end_position_text(endPosition)}"
             android:textColor="@color/black"
             android:textSize="24sp"
             android:textStyle="bold"
@@ -87,10 +99,10 @@
             android:gravity="center"
             android:textColor="@color/black"
             android:textSize="21sp"
+            android:text="@{@string/last_transport_arrival_time(lastTime)}"
             app:layout_constraintEnd_toEndOf="@id/guide_line_end"
             app:layout_constraintStart_toStartOf="@id/guide_line_start"
-            app:layout_constraintTop_toBottomOf="@id/text_view_end_position"
-            tools:text="막차가 23시30분에 도착할 예정이에요!!" />
+            app:layout_constraintTop_toBottomOf="@id/text_view_end_position" />
 
 
         <ImageView
@@ -109,10 +121,10 @@
             android:textColor="@color/black"
             android:textSize="18sp"
             app:layout_constraintBottom_toBottomOf="@id/image_view_walk"
+            android:text="@{@string/last_transport_walking_time(walkTime)}"
             app:layout_constraintEnd_toEndOf="@id/guide_line_end"
             app:layout_constraintStart_toEndOf="@id/image_view_walk"
-            app:layout_constraintTop_toTopOf="@id/image_view_walk"
-            tools:text="막차까지 도보 시간이 10분 소요될것으로 예상돼요!!" />
+            app:layout_constraintTop_toTopOf="@id/image_view_walk" />
 
         <NumberPicker
             android:id="@+id/number_picker_alarm_time"

presentation/src/main/res/values/strings.xml

@@ -24,8 +24,8 @@
     <string name="mission_toggle_text">미션 여부</string>
     <string name="on_text">ON</string>
     <string name="off_text">OFF</string>
-    <string name="last_transport_arrival_time">막차가 %1$d시 %2$d분에 도착할 예정이에요!!</string>
-    <string name="last_transport_walking_time">막차까지 도보 시간이 %1$d분 소요될것으로 예상돼요!!</string>
+    <string name="last_transport_arrival_time">막차가 %1$s에 도착할 예정이에요!!</string>
+    <string name="last_transport_walking_time">막차까지 도보 시간이 %1$d분 소요될것으로 예상되요!!</string>
     <string name="alarm_time_text">알람이 막차시간\n%1$d분 전에\n울리도록 설정하시겠습니까?</string>
     <string name="register_alarm_text">알람 등록</string>
     <string name="search_hint">장소, 주소 검색</string>