feat: ModeType.TRANSFER 분기 추가

Author: khcho226

data/src/main/java/com/stop/data/di/NetworkModule.kt

@@ -11,11 +11,8 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import okhttp3.Interceptor
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
-import okhttp3.Protocol
 import okhttp3.Response
-import okhttp3.ResponseBody.Companion.toResponseBody
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -32,9 +29,6 @@ internal object NetworkModule {
     private const val APIS_KEY_NAME = "ServiceKey"
     private const val WS_KEY_NAME = "ServiceKey"
 
-    private const val TRANSPORT_URL = "transit/routes"
-    private const val FAKE_JSON_URL = "response.json"
-
     @Provides
     @Singleton
     fun provideOkHttpClient(
@@ -156,20 +150,6 @@ internal object NetworkModule {
         override fun intercept(chain: Interceptor.Chain): Response {
             val url = chain.request().url.toUri().toString()
 
-            if (chain.request().url.toUri().toString().contains(TRANSPORT_URL)) {
-                val response = readJson(FAKE_JSON_URL)
-                return chain.proceed(chain.request())
-                    .newBuilder()
-                    .code(200)
-                    .protocol(Protocol.HTTP_2)
-                    .message("success")
-                    .body(
-                        response.toByteArray()
-                            .toResponseBody("application/json".toMediaTypeOrNull())
-                    ).addHeader("content-type", "application/json")
-                    .build()
-            }
-
             val (name: String, key: String) = when {
                 url.contains(BuildConfig.OPEN_API_SEOUL_URL) -> Pair(
                     OPEN_API_SEOUL_KEY_NAME,
@@ -196,12 +176,6 @@ internal object NetworkModule {
                     .build()
                 proceed(newRequest)
             }
-
-        }
-
-        private fun readJson(fileName: String): String {
-            return Thread.currentThread().contextClassLoader?.getResource(fileName)
-                ?.readText() ?: ""
         }
     }
 }

data/src/main/resources/response.json

@@ -140,16 +140,19 @@ class RouteViewModel @Inject constructor(
             MoveType.WALK -> R.drawable.ic_walk_white
             MoveType.BUS -> R.drawable.ic_bus_white
             MoveType.SUBWAY -> R.drawable.ic_subway_white
+            MoveType.TRANSFER -> R.drawable.ic_transfer_white
             else -> R.drawable.ic_star_white
         }
     }
 
     private fun getRouteItemColor(route: Route, isCurrent: Boolean): Int {
         return if (isCurrent) {
-            routeItemColor = when (route) {
-                is TransportRoute -> Color.parseColor("#${route.routeColor}")
-                is WalkRoute -> Color.parseColor(MAIN_WALK_GREY)
-                else -> Color.parseColor(MAIN_YELLOW)
+            routeItemColor = if (route is TransportRoute) {
+                Color.parseColor("#${route.routeColor}")
+            } else if (route.mode == MoveType.WALK) {
+                Color.parseColor(MAIN_WALK_GREY)
+            } else {
+                Color.parseColor(MAIN_YELLOW)
             }
             routeItemColor
         } else {

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

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@color/white">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M22,18v-2H8V4h2L7,1 4,4h2v2H2v2h4v8c0,1.1 0.9,2 2,2h8v2h-2l3,3 3,-3h-2v-2h4zM10,8h6v6h2V8c0,-1.1 -0.9,-2 -2,-2h-6v2z"/>
+</vector>

presentation/src/main/res/drawable/ic_transfer_white.xml

@@ -61,7 +61,6 @@
                     android:layout_height="match_parent"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="1dp"
                     android:maxLines="1"
                     android:ellipsize="end"
                     android:gravity="center_vertical|center_horizontal"
@@ -89,7 +88,6 @@
                     android:layout_height="match_parent"
                     android:layout_marginStart="5dp"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginBottom="1dp"
                     android:maxLines="1"
                     android:ellipsize="end"
                     android:gravity="center_vertical|center_horizontal"

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

@@ -88,7 +88,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:layout_marginBottom="2dp"
                 android:text="@string/alarm_setting"
                 android:textSize="13sp"
                 android:gravity="center"

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

@@ -36,7 +36,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
-            android:layout_marginBottom="2dp"
             android:text="@{routeItem.name}"
             android:textColor="@color/main_dark_grey"
             android:textSize="15sp"
@@ -64,7 +63,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="5dp"
-            android:layout_marginBottom="1dp"
             android:text="@{routeItem.lastTime != null ? @string/last_time : null}"
             android:textSize="12sp"
             android:textColor="@color/main_light_grey"