fix: 막차 시간이 없을 때 버튼을 비활성화 하도록 변경

khcho226 · khcho226 · commit 5fbeb9493430 · 2022-12-12T11:19:22.000+09:00
diff --git a/presentation/src/main/java/com/stop/ui/route/RouteResultViewModel.kt b/presentation/src/main/java/com/stop/ui/route/RouteResultViewModel.kt
@@ -21,6 +21,10 @@ class RouteResultViewModel : ViewModel() {
     val lastTimes: LiveData<List<TransportLastTime?>>
         get() = _lastTimes
 
+    private val _isLastTimeAvailable = MutableLiveData<Boolean>()
+    val isLastTimeAvailable: LiveData<Boolean>
+        get() = _isLastTimeAvailable
+
     private val _origin = MutableLiveData<Place>()
     val origin: LiveData<Place>
         get() = _origin
@@ -29,6 +33,7 @@ class RouteResultViewModel : ViewModel() {
     val destination: LiveData<Place>
         get() = _destination
 
+    private var isLastTimeChecked = false
     private var routeItemColor = 0
 
     fun setItineraries(itinerary: Itinerary) {
@@ -51,6 +56,7 @@ class RouteResultViewModel : ViewModel() {
         val routeItems = mutableListOf<RouteItem>()
 
         itinerary.value?.routes?.forEachIndexed { index, route ->
+            checkLastTime(index, route)
             routeItems.add(
                 RouteItem(
                     name = getRouteItemName(index, route),
@@ -65,6 +71,7 @@ class RouteResultViewModel : ViewModel() {
                 )
             )
         }
+        isLastTimeChecked = false
         routeItems.add(0, routeItems.first().toFirstRouteItem())
         destination.value?.let {
             routeItems.add(routeItems.last().toLastRouteItem(it.name, it.coordinate))
@@ -73,6 +80,16 @@ class RouteResultViewModel : ViewModel() {
         return routeItems.toList()
     }
 
+    private fun checkLastTime(index: Int, route: Route) {
+        if (route is TransportRoute) {
+            if (isLastTimeChecked.not()) {
+                _isLastTimeAvailable.value = lastTimes.value?.get(index) != null
+            }
+
+            isLastTimeChecked = true
+        }
+    }
+
     private fun getRouteItemName(index: Int, route: Route): String {
         return if (index == 0) {
             origin.value?.name ?: ""
diff --git a/presentation/src/main/java/com/stop/ui/routedetail/RouteDetailFragment.kt b/presentation/src/main/java/com/stop/ui/routedetail/RouteDetailFragment.kt
@@ -69,7 +69,9 @@ class RouteDetailFragment : Fragment(), RouteDetailHandler {
         }
 
         binding.routeDetailDrawer.viewAlarm.setOnClickListener {
-            findNavController().navigate(R.id.action_routeDetailFragment_to_alarmSetting)
+            if (routeResultViewModel.isLastTimeAvailable.value == true) {
+                findNavController().navigate(R.id.action_routeDetailFragment_to_alarmSetting)
+            }
         }
 
         binding.imageViewClose.setOnClickListener {
diff --git a/presentation/src/main/res/drawable/background_route_detail_button_light.xml b/presentation/src/main/res/drawable/background_route_detail_button_light.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <solid android:color="#FFFFFF" />
+
+    <stroke
+        android:width="2dp"
+        android:color="@color/main_walk_grey" />
+
+    <corners
+        android:topLeftRadius="100dp"
+        android:topRightRadius="100dp"
+        android:bottomLeftRadius="100dp"
+        android:bottomRightRadius="100dp" />
+</shape>
diff --git a/presentation/src/main/res/drawable/ic_alarm_off.xml b/presentation/src/main/res/drawable/ic_alarm_off.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="@color/main_dark_grey">
+    android:tint="@color/red">
 
     <path
         android:fillColor="@android:color/white"
diff --git a/presentation/src/main/res/layout/bottom_sheet_home_state_expanded.xml b/presentation/src/main/res/layout/bottom_sheet_home_state_expanded.xml
@@ -292,7 +292,7 @@
                 android:layout_marginStart="10dp"
                 android:text="@string/alarm_delete_text"
                 android:textSize="17sp"
-                android:textColor="@color/main_dark_grey"
+                android:textColor="@color/red"
                 android:gravity="center"
                 app:layout_constraintStart_toEndOf="@id/image_view_alarm"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/presentation/src/main/res/layout/fragment_route_detail.xml b/presentation/src/main/res/layout/fragment_route_detail.xml
@@ -142,6 +142,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginEnd="30dp"
                 android:layout_gravity="start"
+                bind:routeResultViewModel="@{routeResultViewModel}"
                 bind:itinerary="@{itinerary}"
                 layout="@layout/route_detail_drawer" />
         </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/presentation/src/main/res/layout/route_detail_drawer.xml b/presentation/src/main/res/layout/route_detail_drawer.xml
@@ -5,8 +5,13 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+        <import type="android.view.View"/>
         <import type="com.stop.ui.util.DrawerStringUtils" />
 
+        <variable
+            name="routeResultViewModel"
+            type="com.stop.ui.route.RouteResultViewModel" />
+
         <variable
             name="itinerary"
             type="com.stop.domain.model.route.tmap.custom.Itinerary" />
@@ -63,13 +68,15 @@
             android:layout_height="40dp"
             android:layout_marginTop="17dp"
             android:background="@drawable/background_route_detail_button"
+            android:visibility="@{routeResultViewModel.isLastTimeAvailable() ? View.VISIBLE : View.INVISIBLE}"
             app:layout_constraintStart_toStartOf="@id/guideline_start"
             app:layout_constraintEnd_toEndOf="@id/guideline_end"
             app:layout_constraintTop_toBottomOf="@id/text_view_information" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:visibility="@{routeResultViewModel.isLastTimeAvailable() ? View.VISIBLE : View.INVISIBLE}"
             app:layout_constraintStart_toStartOf="@id/view_alarm"
             app:layout_constraintEnd_toEndOf="@id/view_alarm"
             app:layout_constraintTop_toTopOf="@id/view_alarm"
@@ -97,6 +104,29 @@
                 app:layout_constraintBottom_toBottomOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <View
+            android:id="@+id/view_alarm_2"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_marginTop="17dp"
+            android:background="@drawable/background_route_detail_button_light"
+            android:visibility="@{routeResultViewModel.isLastTimeAvailable() ? View.INVISIBLE : View.VISIBLE}"
+            app:layout_constraintStart_toStartOf="@id/guideline_start"
+            app:layout_constraintEnd_toEndOf="@id/guideline_end"
+            app:layout_constraintTop_toBottomOf="@id/text_view_information" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/last_time_not_found"
+            android:textSize="13sp"
+            android:textColor="@color/main_walk_grey"
+            android:visibility="@{routeResultViewModel.isLastTimeAvailable() ? View.INVISIBLE : View.VISIBLE}"
+            app:layout_constraintStart_toStartOf="@id/view_alarm_2"
+            app:layout_constraintEnd_toEndOf="@id/view_alarm_2"
+            app:layout_constraintTop_toTopOf="@id/view_alarm_2"
+            app:layout_constraintBottom_toBottomOf="@id/view_alarm_2" />
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view_route_detail"
             android:layout_width="0dp"
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
@@ -48,7 +48,7 @@
     <string name="alarm_content_text">막차를 타러 이제 나가야해요~!!</string>
     <string name="mission_notification_channel_id">mission_notification_channel_id</string>
     <string name="mission_notification_channel_name">mission_notification_channel_name</string>
-    <string name="mission_notification_title">실시간 위치 추적중</string>
+    <string name="mission_notification_title">실시간 위치 트래킹 중</string>
     <string name="mission_cancel_text">취소하기</string>
     <string name="mission_content_text">정류장까지 달려~!</string>
     <string name="no_alarm">현재 등록된 막차 알림이 없습니다.</string>
@@ -79,4 +79,5 @@
     <string name="end_position_text">도착지 : %1$s</string>
     <string name="last_time_text">막차시간 : %1$s</string>
     <string name="walk_time_text">%1$d분</string>
+    <string name="last_time_not_found">알람을 설정할 수 없습니다</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,9 @@ class RouteDetailFragment : Fragment(), RouteDetailHandler {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`binding.routeDetailDrawer.viewAlarm.setOnClickListener {`
`72`		`- findNavController().navigate(R.id.action_routeDetailFragment_to_alarmSetting)`
	`72`	`+ if (routeResultViewModel.isLastTimeAvailable.value == true) {`
	`73`	`+ findNavController().navigate(R.id.action_routeDetailFragment_to_alarmSetting)`
	`74`	`+ }`
`73`	`75`	`}`
`74`	`76`
`75`	`77`	`binding.imageViewClose.setOnClickListener {`