Merge remote-tracking branch 'origin/develop' into 97-feature-mission-service

# Conflicts:
#	presentation/src/main/java/com/stop/ui/map/MapFragment.kt
#	presentation/src/main/java/com/stop/ui/mission/MissionFragment.kt
#	presentation/src/main/java/com/stop/ui/mission/MissionWorker.kt
#	presentation/src/main/res/layout/bottom_sheet_home_state_expanded.xml
#	presentation/src/main/res/layout/fragment_mission.xml
#	presentation/src/main/res/layout/home_bottom_sheet.xml
#	presentation/src/main/res/values/strings.xml

Author: jeeminimini

presentation/src/main/assets/moving_bus.json

@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.21","a":"","k":"","d":"","tc":""},"fr":24,"ip":0,"op":48,"w":120,"h":120,"nm":"sand timer","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Null 3","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.742],"y":[0]},"t":16,"s":[0]},{"t":43,"s":[-180]}],"ix":10},"p":{"a":0,"k":[60,60,0],"ix":2},"a":{"a":0,"k":[50,50,0],"ix":1},"s":{"a":0,"k":[73,73,100],"ix":6}},"ao":0,"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"top sand","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,35.334,0],"ix":2},"a":{"a":0,"k":[-388.008,75.466,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,100],"ix":6}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"a","pt":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":-4,"s":[{"i":[[0,0],[8.5,-3],[0,0],[0,0],[0,0]],"o":[[0,0],[-8.896,3.14],[0,0],[0,0],[0,0]],"v":[[-371.449,64.5],[-389.008,58.5],[-404,64.5],[-404,87.25],[-371.449,87.25]],"c":true}]},{"i":{"x":0.557,"y":1},"o":{"x":0.167,"y":0.167},"t":19,"s":[{"i":[[0,0],[3.516,5.35],[0,0],[0,0],[0,0]],"o":[[0,0],[-4.234,-6.15],[0,0],[0,0],[0,0]],"v":[[-379.199,83.761],[-392.024,74.823],[-404,75.511],[-404,87.601],[-371.449,87.601]],"c":true}]},{"t":39.2138671875,"s":[{"i":[[0,0],[9.25,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-8.974,0],[0,0],[0,0],[0,0]],"v":[[-371.449,88],[-388.508,88],[-404,88],[-404,88],[-371.449,88]],"c":true}]}],"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"top mask"}],"shapes":[{"ty":"gr","it":[{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.507,3.571],[0,0],[0,0],[0,2.437],[0,0],[-0.43,0],[0,0],[0,-0.43],[0,0],[1.489,-1.691],[0,0]],"o":[[0,0],[0,0],[-1.707,-1.739],[0,0],[0,-0.43],[0,0],[0.43,0],[0,0],[0,2.251],[0,0],[0,0]],"v":[[-390.332,80.46],[-392.903,77.973],[-397.727,73.057],[-400.374,66.58],[-400.374,65.02],[-399.595,64.241],[-376.422,64.241],[-375.643,65.02],[-375.643,67.039],[-377.952,73.151],[-382.162,77.929]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"bottom sand 2","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,64.443,0],"ix":2},"a":{"a":0,"k":[-388.008,75.466,0],"ix":1},"s":{"a":0,"k":[136.986,-136.986,100],"ix":6}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"a","pt":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,0],[-8.5,0.021],[0,0],[0,0],[0,0]],"o":[[0,0],[8.896,-0.022],[0,0],[0,0],[0,0]],"v":[[-404,62.26],[-386.382,62.199],[-371.449,62.26],[-371.39,62],[-403.941,62]],"c":true}]},{"t":39,"s":[{"i":[[0,0],[-8.5,3],[0,0],[0,0],[0,0]],"o":[[0,0],[8.896,-3.14],[0,0],[0,0],[0,0]],"v":[[-404,95.75],[-386.382,87],[-371.449,95.75],[-371.39,58.25],[-403.941,58.25]],"c":true}]}],"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"top mask"}],"shapes":[{"ty":"gr","it":[{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,2.437],[0,0],[-0.43,0],[0,0],[0,-0.43],[0,0],[1.489,-1.691],[0,0],[0,0]],"o":[[0,0],[-1.707,-1.739],[0,0],[0,-0.43],[0,0],[0.43,0],[0,0],[0,2.251],[0,0],[0,0],[-3.071,3.486]],"v":[[-392.102,78.79],[-397.727,73.057],[-400.374,66.58],[-400.374,65.02],[-399.595,64.241],[-376.422,64.241],[-375.643,65.02],[-375.643,67.039],[-377.952,73.151],[-383.095,78.988],[-384.631,80.511]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"filler path","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50.685,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-18.312],[0.041,19]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":2,"lj":2,"bm":0,"d":[{"n":"d","nm":"dash","v":{"a":0,"k":0,"ix":1}},{"n":"o","nm":"offset","v":{"a":0,"k":0,"ix":7}}],"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.569],"y":[1]},"o":{"x":[0.37],"y":[0]},"t":1,"s":[0]},{"t":46,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.363],"y":[1]},"o":{"x":[0.613],"y":[-0.021]},"t":-4,"s":[28]},{"t":15.642578125,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":115,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"botter","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[-388.008,86.539,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,3.284],[0,0],[0,0],[0,0],[-2.475,-2.522],[0,0],[1.626,-1.657],[0,0],[0,-3.534],[0,0],[0,0],[0,0],[2.171,2.464],[0,0],[-1.419,1.61],[0,0]],"o":[[0,0],[0,0],[0,0],[0,3.534],[0,0],[1.626,1.657],[0,0],[-2.475,2.522],[0,0],[0,0],[0,0],[0,-3.284],[0,0],[-1.419,-1.61],[0,0],[2.171,-2.464]],"v":[[-371.674,68.761],[-371.674,59.435],[-404.342,59.435],[-404.342,68.343],[-400.481,77.792],[-394.803,83.578],[-394.803,89.547],[-400.481,95.333],[-404.342,104.782],[-404.342,113.642],[-371.674,113.642],[-371.674,104.364],[-375.043,95.445],[-380.388,89.379],[-380.388,83.745],[-375.043,77.68]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.9575,0.952,0.9425,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"top fill","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[49.985,7.498,0],"ix":2},"a":{"a":0,"k":[-388.008,58.473,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.981,0],[0,0],[0,0.981],[0,0],[-0.981,0],[0,0],[0,-0.981],[0,0]],"o":[[0,0],[-0.981,0],[0,0],[0,-0.981],[0,0],[0.981,0],[0,0],[0,0.981]],"v":[[-369.606,60.249],[-406.411,60.249],[-408.187,58.473],[-408.187,58.473],[-406.411,56.698],[-369.606,56.698],[-367.83,58.473],[-367.83,58.473]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"bottom fill","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50.015,92.116,0],"ix":2},"a":{"a":0,"k":[-388.008,114.495,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.981,0],[0,0],[0,0.981],[0,0],[-0.981,0],[0,0],[0,-0.981],[0,0]],"o":[[0,0],[-0.981,0],[0,0],[0,-0.981],[0,0],[0.981,0],[0,0],[0,0.981]],"v":[[-369.606,116.27],[-406.411,116.27],[-408.187,114.495],[-408.187,114.495],[-406.411,112.719],[-369.606,112.719],[-367.83,114.495],[-367.83,114.495]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.7804,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"cristal","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[-388.008,87.579,0],"ix":1},"s":{"a":0,"k":[136.986,136.986,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0.43],[0,0],[-1.706,1.741],[0,0],[3.507,3.571],[0,0],[0,2.437],[0,0],[-0.43,0],[0,0],[0,-0.43],[0,0],[1.489,-1.691],[0,0],[-3.071,-3.486],[0,0],[0,-2.252],[0,0],[0.43,0]],"o":[[-0.43,0],[0,0],[0,-2.437],[0,0],[3.506,-3.569],[0,0],[-1.707,-1.739],[0,0],[0,-0.43],[0,0],[0.43,0],[0,0],[0,2.251],[0,0],[-3.071,3.486],[0,0],[1.489,1.691],[0,0],[0,0.43],[0,0]],"v":[[-399.595,110.917],[-400.374,110.138],[-400.374,106.544],[-397.728,100.067],[-390.83,93.037],[-390.832,80.085],[-397.727,73.057],[-400.374,66.58],[-400.374,65.02],[-399.595,64.241],[-376.422,64.241],[-375.643,65.02],[-375.643,67.039],[-377.952,73.151],[-384.381,80.448],[-384.381,92.676],[-377.952,99.973],[-375.643,106.087],[-375.643,110.138],[-376.422,110.917]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0}],"markers":[]}

presentation/src/main/assets/timer.json

@@ -1,16 +1,25 @@
 package com.stop.bindingadapter
 
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.databinding.BindingAdapter
+import com.stop.R
 import com.stop.model.route.Place
 
-@BindingAdapter("set_place_name")
-fun TextView.setPlaceName(place: Place?) {
-    if (place == null) return
+@BindingAdapter("set_place_name", "set_text")
+fun TextView.setPlaceName(place: Place?, newText: String) {
+    if (place == null) {
+        setTextColor(ContextCompat.getColor(context, R.color.main_light_grey))
+        text = newText
+        return
+    }
+
+    setTextColor(ContextCompat.getColor(context, R.color.main_dark_grey))
 
     if (place.name.isEmpty()) {
         text = place.roadAddress
         return
     }
+
     text = place.name
 }

presentation/src/main/java/com/stop/bindingadapter/TextViewBindingAdapter.kt

@@ -64,7 +64,7 @@ class AlarmSettingFragment : Fragment() {
     }
 
     private fun initView() {
-        with(binding) {
+        with (binding) {
             numberPickerAlarmTime.minValue = 0
             numberPickerAlarmTime.maxValue = 60