Revert "저장용: merge XML을 코드로 생성해서 추가하면 화면이 이상하게 보인다."

This reverts commit 5b7076f.

Author: DoTheBestMayB

presentation/src/main/java/com/stop/model/route/RouteItem.kt

@@ -11,8 +11,7 @@ data class RouteItem(
     val lastTime: String?,
     val beforeColor: Int,
     val currentColor: Int,
-    val type: RouteItemType,
-    val typeName: String = "",
+    val type: RouteItemType
 )
 
 fun RouteItem.toFirstRouteItem(): RouteItem {
@@ -21,10 +20,7 @@ fun RouteItem.toFirstRouteItem(): RouteItem {
     )
 }
 
-fun RouteItem.toLastRouteItem(
-    name: String,
-    coordinate: com.stop.model.route.Coordinate
-): RouteItem {
+fun RouteItem.toLastRouteItem(name: String, coordinate: com.stop.model.route.Coordinate): RouteItem {
     return this.copy(
         name = name,
         coordinate = Coordinate(coordinate.latitude, coordinate.longitude),

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

@@ -1,22 +1,16 @@
 package com.stop.ui.route
 
-import android.graphics.Color
 import android.graphics.Rect
 import android.view.View
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import com.stop.R
 import com.stop.databinding.RouteItemBinding
-import com.stop.domain.model.route.tmap.custom.*
-import com.stop.model.route.RouteItem
-import com.stop.model.route.RouteItemType
+import com.stop.domain.model.route.tmap.custom.Itinerary
 
 class RouteViewHolder(
     private val binding: RouteItemBinding
 ) : RecyclerView.ViewHolder(binding.root) {
 
-    private val adapter = RouteDetailAdapter()
-    var routeItemColor = 0
+    private val adapter = TimeLineAdapter()
 
     init {
         binding.recyclerviewTimeLine.adapter = adapter
@@ -37,67 +31,8 @@ class RouteViewHolder(
 
     fun bind(itinerary: Itinerary) {
         binding.textViewExpectedRequiredTime.text = secondToHourAndMinute(itinerary.totalTime)
-        val routeItems = mutableListOf<RouteItem>()
 
-        itinerary.routes.forEach { route ->
-            routeItems.add(
-                RouteItem(
-                    name = route.start.name,
-                    coordinate = route.start.coordinate,
-                    mode = getRouteItemMode(route),
-                    distance = route.distance,
-                    travelTime = route.sectionTime.toInt(),
-                    lastTime = "",
-                    beforeColor = getRouteItemColor(route, false),
-                    currentColor = getRouteItemColor(route, true),
-                    type = RouteItemType.PATH,
-                    typeName = getTypeName(route),
-                )
-            )
-        }
-        adapter.submitList(routeItems)
-        binding.timeLineContainer.submitList(itinerary.routes)
-    }
-
-    private fun getTypeName(route: Route): String {
-        return when(route) {
-            is WalkRoute -> "도보"
-            is TransportRoute -> getSubwayTypeName(route)
-            else -> ""
-        }
-    }
-
-    private fun getSubwayTypeName(route: TransportRoute): String {
-        return when(route.mode) {
-            MoveType.SUBWAY -> route.routeInfo.replace("수도권", "")
-            MoveType.BUS -> route.routeInfo.split(":")[1]
-            else -> route.routeInfo
-        }
-    }
-
-    private fun getRouteItemColor(route: Route, isCurrent: Boolean): Int {
-        return if (isCurrent) {
-            when (route) {
-                is TransportRoute -> Color.parseColor("#${route.routeColor}")
-                is WalkRoute -> ContextCompat.getColor(binding.root.context, R.color.main_yellow)
-                else -> ContextCompat.getColor(binding.root.context, R.color.main_lighter_grey)
-            }
-        } else {
-            if (routeItemColor != 0) {
-                routeItemColor
-            } else {
-                getRouteItemColor(route, true)
-            }
-        }
-    }
-
-    private fun getRouteItemMode(route: Route): Int {
-        return when (route.mode) {
-            MoveType.WALK, MoveType.TRANSFER -> R.drawable.ic_walk_white
-            MoveType.BUS -> R.drawable.ic_bus_white
-            MoveType.SUBWAY -> R.drawable.ic_subway_white
-            else -> R.drawable.ic_star_white
-        }
+        adapter.submitList(itinerary.routes)
     }
 
     private fun secondToHourAndMinute(second: Int): String {

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

@@ -1,5 +1,6 @@
 package com.stop.ui.util
 
+import com.stop.domain.model.route.seoul.subway.StationLastTime
 import com.stop.domain.model.route.tmap.custom.Itinerary
 import com.stop.model.route.RouteItem
 import java.text.DecimalFormat

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

@@ -27,26 +27,18 @@
             app:layout_constraintTop_toTopOf="@id/guideline_start_horizontal"
             tools:text="1시간 10분" />
 
-        <com.stop.ui.route.TimeLineContainer
-            android:id="@+id/time_line_container"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="@id/guideline_end_vertical"
-            app:layout_constraintStart_toStartOf="@id/guideline_start_vertical"
-            app:layout_constraintTop_toBottomOf="@id/text_view_required_time_text" />
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerview_time_line"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            tools:listitem="@layout/time_line_item"
             android:layout_marginBottom="16dp"
-            android:orientation="vertical"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintTop_toBottomOf="@id/text_view_required_time_text"
             app:layout_constraintEnd_toStartOf="@id/guideline_end_vertical"
-            app:layout_constraintStart_toStartOf="@id/guideline_start_vertical"
-            app:layout_constraintTop_toBottomOf="@id/time_line_container"
-            tools:listitem="@layout/route_path_at_time_line_item" />
+            app:layout_constraintStart_toStartOf="@id/guideline_start_vertical" />
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline_start_vertical"