Merge pull request #90 from boostcampwm-2022/88-mission-bug-and-bottom-sheet-ui-bug

[PR] 지난 pr bug 해결 - bottom_sheet 에러 해결, 초기 위치 추가

Author: jeeminimini

presentation/src/main/java/com/stop/ui/mission/MissionFragment.kt

@@ -138,10 +138,10 @@ class MissionFragment : Fragment(), MissionHandler {
         lateinit var beforeLocation: Location
         lifecycleScope.launch {
             missionViewModel.userLocation.collectIndexed { index, userLocation ->
-                if (index == 1) {
+                if (index == 0) {
                     initMarker(userLocation)
                     beforeLocation = userLocation
-                } else if (index > 1) {
+                } else if (index > 0) {
                     drawNowLocationLine(TMapPoint(userLocation.latitude, userLocation.longitude), TMapPoint(beforeLocation.latitude, beforeLocation.longitude))
                     personCurrentLocation = userLocation
                     if (tMap.isTracking) {

presentation/src/main/java/com/stop/ui/mission/MissionTMap.kt

@@ -1,30 +1,31 @@
 package com.stop.ui.mission
 
 import android.content.Context
+import androidx.core.content.ContextCompat
 import com.skt.tmap.TMapPoint
 import com.skt.tmap.overlay.TMapPolyLine
 import com.stop.domain.model.route.tmap.custom.WalkRoute
 import com.stop.ui.util.TMap
 
 class MissionTMap(
-    context: Context,
+    private val context: Context,
     handler: MissionHandler,
 ) : TMap(context, handler) {
 
     fun drawMoveLine(nowLocation: TMapPoint, beforeLocation: TMapPoint, id: String, color: Int) {
         val points = arrayListOf(nowLocation, beforeLocation)
         val polyLine = TMapPolyLine(id, points).apply {
-            lineColor = color
-            outLineColor = color
+            lineColor = ContextCompat.getColor(context, color)
+            outLineColor = ContextCompat.getColor(context, color)
         }
 
         tMapView.addTMapPolyLine(polyLine)
     }
 
     fun drawWalkLines(points: ArrayList<TMapPoint>, id: String, color: Int) {
         val polyLine = TMapPolyLine(id, points).apply {
-            lineColor = color
-            outLineColor = color
+            lineColor = ContextCompat.getColor(context, color)
+            outLineColor = ContextCompat.getColor(context, color)
         }
         tMapView.addTMapPolyLine(polyLine)
     }

presentation/src/main/java/com/stop/ui/mission/MissionWorker.kt

@@ -10,7 +10,6 @@ import android.content.pm.PackageManager
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION
 import android.os.Build
 import android.os.Looper
-import android.util.Log
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.hilt.work.HiltWorker
@@ -51,6 +50,16 @@ class MissionWorker @AssistedInject constructor(
     }
 
     private fun getPersonLocation() {
+        fusedLocationClient.lastLocation
+            .addOnSuccessListener { location ->
+                if (location != null) {
+                    missionManager.userLocation.value = Location(location.latitude, location.longitude)
+                }
+            }
+            .addOnFailureListener {
+                it.printStackTrace()
+            }
+
         if (ActivityCompat.checkSelfPermission(
                 applicationContext,
                 Manifest.permission.ACCESS_FINE_LOCATION
@@ -102,7 +111,6 @@ class MissionWorker @AssistedInject constructor(
 
     private fun createChannel(id: String) {
         if (isMoreThanOreo()) {
-            Log.d("MissionWorker", "createChannel ${notificationManager.getNotificationChannel(id)}")
             if (notificationManager.getNotificationChannel(id) == null) {
                 val name = applicationContext.getString(R.string.mission_notification_channel_name)
                 NotificationChannel(id, name, NotificationManager.IMPORTANCE_DEFAULT).apply {
@@ -115,7 +123,6 @@ class MissionWorker @AssistedInject constructor(
     companion object {
         const val NOTIFICATION_ID = 82
         private const val NOTIFICATION_CONTENT = "사용자의 위치를 추적중입니다."
-        private var NUM = 0
         private const val INTERVAL_UNIT = 1000L
         const val MISSION_CODE = 88
     }

presentation/src/main/java/com/stop/ui/util/Marker.kt

@@ -1,6 +1,5 @@
 package com.stop.ui.util
 
-import android.graphics.Color
 import com.stop.R
 
 object Marker {
@@ -16,11 +15,11 @@ object Marker {
     const val PERSON_MARKER = "person_marker"
     const val PERSON_MARKER_IMG = R.drawable.ic_person_marker
     const val PERSON_LINE = "person_line"
-    const val PERSON_LINE_COLOR = Color.MAGENTA
+    const val PERSON_LINE_COLOR = R.color.mint
 
     const val DESTINATION_MARKER = "destination_marker"
     const val DESTINATION_MARKER_IMG = R.drawable.ic_start_marker
 
     const val WALK_LINE = "walk_line"
-    const val WALK_LINE_COLOR = Color.BLACK
+    const val WALK_LINE_COLOR = R.color.main_dark_grey
 }

presentation/src/main/res/drawable-v24/ic_person_marker.xml

@@ -5,7 +5,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#5DC19B"
+        android:fillColor="@color/mint"
         android:pathData="M19,2L5,2c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h4l2.29,2.29c0.39,0.39 1.02,0.39 1.41,0L15,20h4c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,5.3c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7S9.3,9.49 9.3,8s1.21,-2.7 2.7,-2.7zM18,16L6,16v-0.9c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v0.9z"
         android:strokeWidth="1"
         android:strokeColor="#FFFFFF" />