Merge pull request #80 from boostcampwm-2022/75-feature-alarm-modify

koreatlwls · web-flow · commit b74530925d3b · 2022-12-08T17:18:36.000+09:00
[PR]알람 설정, 시작 UI 수정
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
@@ -48,6 +48,7 @@
             android:excludeFromRecents="true"
             android:exported="true"
             android:launchMode="singleTask"
+            android:screenOrientation="portrait"
             android:showOnLockScreen="true"
             android:theme="@style/Theme.Splash">
 
diff --git a/presentation/src/main/java/com/stop/TimeConverter.kt b/presentation/src/main/java/com/stop/TimeConverter.kt
@@ -23,4 +23,12 @@ fun makeFullTime(time: String): Calendar {
     calendar.time = dateTime
 
     return calendar
+}
+
+fun convertTimeMillisToString(time: Long): String {
+    val hours = (time / 1000) / 60 / 60 % 24
+    val minutes = (time / 1000) / 60 % 60
+    val seconds = (time / 1000) % 60
+
+    return String.format("%02d:%02d:%02d", hours, minutes, seconds)
 }
diff --git a/presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt b/presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt
@@ -40,8 +40,6 @@ class AlarmSettingFragment : Fragment() {
 
         initView()
         setToggleListener()
-
-        // TODO 뷰모델 가져와서 경로 막차시간 등 연결 작업해야함
     }
 
     private fun initBinding() {
@@ -57,8 +55,8 @@ class AlarmSettingFragment : Fragment() {
         binding.apply {
             lifecycleOwner = viewLifecycleOwner
             alarmViewModel = alarmSettingViewModel
-            startPosition = itinerary.routes.first().start.name
-            endPosition = itinerary.routes.last().end.name
+            startPosition = routeResultViewModel.origin.value?.name
+            endPosition = routeResultViewModel.destination.value?.name
             lastTime = transportLastTime.timeToBoard
             walkTime = (itinerary.routes.first().sectionTime.div(60)).roundToInt()
             fragment = this@AlarmSettingFragment
@@ -98,8 +96,8 @@ class AlarmSettingFragment : Fragment() {
         }.first()
 
         val alarmUseCaseItem = AlarmUseCaseItem(
-            startPosition = itinerary.routes.first().start.name,
-            endPosition = itinerary.routes.last().end.name,
+            startPosition = routeResultViewModel.origin.value?.name ?: "",
+            endPosition = routeResultViewModel.destination.value?.name ?: "",
             routes = itinerary.routes,
             lastTime = transportLastTime.timeToBoard,
             walkTime = (itinerary.routes.first().sectionTime.div(60)).roundToInt(),
@@ -110,7 +108,7 @@ class AlarmSettingFragment : Fragment() {
 
         alarmSettingViewModel.saveAlarm(alarmUseCaseItem)
         alarmSettingViewModel.callAlarm(transportLastTime.timeToBoard)
-        alarmSettingViewModel.makeAlarmWorker(transportLastTime.timeToBoard)
+        //alarmSettingViewModel.makeAlarmWorker(transportLastTime.timeToBoard)
 
         val navController = findNavController()
         navController.setGraph(R.navigation.nav_graph)
diff --git a/presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingViewModel.kt b/presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingViewModel.kt
@@ -1,6 +1,6 @@
 package com.stop.ui.alarmsetting
 
-import android.util.Log
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -9,10 +9,12 @@ import androidx.work.WorkManager
 import androidx.work.workDataOf
 import com.stop.AlarmFunctions
 import com.stop.LastTimeCheckWorker
+import com.stop.convertTimeMillisToString
 import com.stop.domain.model.alarm.AlarmUseCaseItem
 import com.stop.domain.usecase.alarm.DeleteAlarmUseCase
 import com.stop.domain.usecase.alarm.GetAlarmUseCase
 import com.stop.domain.usecase.alarm.SaveAlarmUseCase
+import com.stop.makeFullTime
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_CODE
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_TIME
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.LAST_TIME
@@ -45,6 +47,9 @@ class AlarmSettingViewModel @Inject constructor(
 
     private lateinit var workerId : UUID
 
+    private val _lastTimeCountDown = MutableLiveData("")
+    val lastTimeCountDown: LiveData<String> = _lastTimeCountDown
+
     fun saveAlarm(alarmUseCaseItem: AlarmUseCaseItem) {
         viewModelScope.launch(Dispatchers.IO) {
             saveAlarmUseCase.saveAlarm(alarmUseCaseItem.copy(alarmTime = alarmTime.value ?: 0, alarmMethod = alarmMethod))
@@ -55,7 +60,7 @@ class AlarmSettingViewModel @Inject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             getAlarmUseCase.getAlarm().collectLatest {
                 _alarmItem.value = it
-                Log.d("MissonWorker","alarm viewModel에서 가져오나? ${_alarmItem.value}  ${_alarmItem.value?.routes}")
+
                 _isAlarmItemNotNull.value = it != null
             }
         }
@@ -65,13 +70,14 @@ class AlarmSettingViewModel @Inject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             deleteAlarmUseCase.deleteAlarm()
         }
+        cancelAlarm()
     }
 
     fun callAlarm(time: String) {
         alarmFunctions.callAlarm(time, alarmTime.value ?: 0, ALARM_CODE)
     }
 
-    fun cancelAlarm() {
+    private fun cancelAlarm() {
         alarmFunctions.cancelAlarm(ALARM_CODE)
     }
 
@@ -89,8 +95,26 @@ class AlarmSettingViewModel @Inject constructor(
         workManager.enqueue(workRequest)
     }
 
-    fun removeAlarmWorker(){
+    fun removeAlarmWorker() {
         workManager.cancelWorkById(workerId)
     }
 
+    fun startCountDownTimer() {
+        val lastTimeMillis = makeFullTime(_alarmItem.value?.lastTime ?: "").timeInMillis
+        val nowTimeMillis = System.currentTimeMillis()
+        var diffTimeMillis = if (lastTimeMillis > nowTimeMillis) lastTimeMillis - nowTimeMillis else 0L
+
+        viewModelScope.launch(Dispatchers.IO) {
+            var oldTimeMillis = System.currentTimeMillis()
+            while (diffTimeMillis > 0L) {
+                val delayMillis = System.currentTimeMillis() - oldTimeMillis
+                if (delayMillis == 1000L) {
+                    diffTimeMillis -= delayMillis
+                    _lastTimeCountDown.postValue(convertTimeMillisToString(diffTimeMillis))
+                    oldTimeMillis = System.currentTimeMillis()
+                }
+            }
+        }
+    }
+
 }
diff --git a/presentation/src/main/java/com/stop/ui/alarmstart/AlarmStartFragment.kt b/presentation/src/main/java/com/stop/ui/alarmstart/AlarmStartFragment.kt
@@ -35,36 +35,25 @@ class AlarmStartFragment : Fragment() {
         return binding.root
     }
 
-    private fun initBinding(){
+    private fun initBinding() {
         binding.apply {
             alarmSettingViewModel.getAlarm()
+            alarmSettingViewModel.startCountDownTimer()
             lifecycleOwner = viewLifecycleOwner
             viewModel = alarmSettingViewModel
+            fragment = this@AlarmStartFragment
         }
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        listenButton()
+    fun clickAlarmTurnOff() {
+        turnOffSoundService()
+        alarmSettingViewModel.deleteAlarm()
+        requireActivity().finish()
     }
 
-    private fun listenButton() {
-        with(binding) {
-            buttonAlarmTurnOff.setOnClickListener {
-                turnOffSoundService()
-                alarmSettingViewModel.deleteAlarm()
-                alarmSettingViewModel.removeAlarmWorker()
-                requireActivity().finish()
-            }
-
-            textViewMissionStart.setOnClickListener {
-                turnOffSoundService()
-                root.findNavController().navigate(R.id.action_alarmStartFragment_to_missionFragment)
-                alarmSettingViewModel.deleteAlarm()
-                alarmSettingViewModel.removeAlarmWorker()
-            }
-        }
+    fun clickMissionStart() {
+        turnOffSoundService()
+        binding.root.findNavController().navigate(R.id.action_alarmStartFragment_to_missionFragment)
     }
 
     private fun turnOffSoundService() {
diff --git a/presentation/src/main/java/com/stop/ui/map/MapFragment.kt b/presentation/src/main/java/com/stop/ui/map/MapFragment.kt
@@ -3,7 +3,6 @@ package com.stop.ui.map
 import android.Manifest.permission
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -133,7 +132,7 @@ class MapFragment : Fragment(), MapHandler {
 
         alarmViewModel.getAlarm()
 
-        alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner){
+        alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner) {
             behavior.isDraggable = it
         }
 
@@ -223,7 +222,7 @@ class MapFragment : Fragment(), MapHandler {
         }
     }
 
-    private fun listenButtonClick(){
+    private fun listenButtonClick() {
         binding.homeBottomSheet.layoutStateExpanded.buttonAlarmTurnOff.setOnClickListener {
             alarmViewModel.deleteAlarm()
             turnOffSoundService()
@@ -252,8 +251,7 @@ class MapFragment : Fragment(), MapHandler {
     }
 
     fun setMissionStart() {
-        Log.d("MissionWorker","mission 버튼 클릭")
-       findNavController().navigate(R.id.action_mapFragment_to_missionFragment)
+        findNavController().navigate(R.id.action_mapFragment_to_missionFragment)
     }
 
     companion object {
diff --git a/presentation/src/main/java/com/stop/ui/route/RouteFragment.kt b/presentation/src/main/java/com/stop/ui/route/RouteFragment.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AlertDialog
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.fragment.app.activityViewModels
@@ -32,6 +33,7 @@ class RouteFragment : Fragment() {
 
     private lateinit var adapter: RouteAdapter
     private lateinit var backPressedCallback: OnBackPressedCallback
+    private var progressDialog: AlertDialog? = null
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -62,6 +64,7 @@ class RouteFragment : Fragment() {
         setRecyclerView()
         setStartAndDestinationText()
         setObserve()
+        initDialog()
     }
 
     private fun setBinding() {
@@ -89,6 +92,7 @@ class RouteFragment : Fragment() {
                  * UI가 ViewModel을 직접 호출하면 안 되지만, 테스트를 위해 막차 조회 함수를 호출했습니다.
                  * 여기서 UI가 ViewModel을 직접 호출하지 않으면서 막차 조회 함수를 호출할 수 있을까요?
                  */
+                progressDialog?.show()
                 routeViewModel.calculateLastTransportTime(itinerary)
                 routeResultViewModel.setItineraries(itinerary)
             }
@@ -117,6 +121,8 @@ class RouteFragment : Fragment() {
                 routeResultViewModel.setLastTimes(response)
                 routeResultViewModel.setOrigin(routeViewModel.origin.value)
                 routeResultViewModel.setDestination(routeViewModel.destination.value)
+                progressDialog?.dismiss()
+
                 binding.root.findNavController()
                     .navigate(R.id.action_routeFragment_to_routeDetailFragment)
             }
@@ -133,6 +139,15 @@ class RouteFragment : Fragment() {
         routeViewModel.getRoute()
     }
 
+    private fun initDialog() {
+        val dialogView = layoutInflater.inflate(R.layout.dialog_progress, null)
+        progressDialog = AlertDialog.Builder(requireContext())
+            .setView(dialogView)
+            .setCancelable(false)
+            .create()
+        progressDialog?.window?.setBackgroundDrawableResource(R.color.transparent)
+    }
+
     override fun onDestroyView() {
         _binding = null
 
diff --git a/presentation/src/main/res/drawable/button_background.xml b/presentation/src/main/res/drawable/button_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="16dp" />
+    <solid android:color="@color/main_dark_grey" />
+
+</shape>
diff --git a/presentation/src/main/res/drawable/ic_baseline_directions_walk_32.xml b/presentation/src/main/res/drawable/ic_baseline_directions_walk_32.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="32dp"
-    android:tint="#000000" android:viewportHeight="24"
+    android:tint="@color/main_dark_grey" android:viewportHeight="24"
     android:viewportWidth="24" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M13.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.8,8.9L7,23h2.1l1.8,-8 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3C14.8,12 16.8,13 19,13v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1L6,8.3V13h2V9.6l1.8,-0.7"/>
 </vector>
diff --git a/presentation/src/main/res/drawable/ic_baseline_volume_down_24.xml b/presentation/src/main/res/drawable/ic_baseline_volume_down_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="48dp"
+    android:tint="#404550" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM5,9v6h4l5,5V4L9,9H5z"/>
+</vector>
diff --git a/presentation/src/main/res/layout/fragment_alarm_setting.xml b/presentation/src/main/res/layout/fragment_alarm_setting.xml
diff --git a/presentation/src/main/res/layout/fragment_alarm_start.xml b/presentation/src/main/res/layout/fragment_alarm_start.xml
diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
diff --git a/presentation/src/main/res/values/styles.xml b/presentation/src/main/res/values/styles.xml

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ package com.stop.ui.map`
`3`	`3`	`import android.Manifest.permission`
`4`	`4`	`import android.content.Intent`
`5`	`5`	`import android.os.Bundle`
`6`		`-import android.util.Log`
`7`	`6`	`import android.view.LayoutInflater`
`8`	`7`	`import android.view.View`
`9`	`8`	`import android.view.ViewGroup`
`@@ -133,7 +132,7 @@ class MapFragment : Fragment(), MapHandler {`
`133`	`132`
`134`	`133`	`alarmViewModel.getAlarm()`
`135`	`134`
`136`		`- alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner){`
	`135`	`+ alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner) {`
`137`	`136`	`behavior.isDraggable = it`
`138`	`137`	`}`
`139`	`138`
`@@ -223,7 +222,7 @@ class MapFragment : Fragment(), MapHandler {`
`223`	`222`	`}`
`224`	`223`	`}`
`225`	`224`
`226`		`- private fun listenButtonClick(){`
	`225`	`+ private fun listenButtonClick() {`
`227`	`226`	`binding.homeBottomSheet.layoutStateExpanded.buttonAlarmTurnOff.setOnClickListener {`
`228`	`227`	`alarmViewModel.deleteAlarm()`
`229`	`228`	`turnOffSoundService()`
`@@ -252,8 +251,7 @@ class MapFragment : Fragment(), MapHandler {`
`252`	`251`	`}`
`253`	`252`
`254`	`253`	`fun setMissionStart() {`
`255`		`- Log.d("MissionWorker","mission 버튼 클릭")`
`256`		`- findNavController().navigate(R.id.action_mapFragment_to_missionFragment)`
	`254`	`+ findNavController().navigate(R.id.action_mapFragment_to_missionFragment)`
`257`	`255`	`}`
`258`	`256`
`259`	`257`	`companion object {`