feat : 남은 시간 textView에 띄우기 구현

Author: jeeminimini

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

@@ -2,7 +2,6 @@ package com.stop.ui.mission
 
 import android.Manifest
 import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -35,7 +34,7 @@ class MissionFragment : Fragment(), MissionHandler {
         get() = _binding!!
 
     private val missionViewModel: MissionViewModel by viewModels()
-    private val alarmSettingViewModel: AlarmSettingViewModel by activityViewModels<AlarmSettingViewModel>()
+    private val alarmSettingViewModel: AlarmSettingViewModel by activityViewModels()
 
     private lateinit var tMap: MissionTMap
 
@@ -54,9 +53,7 @@ class MissionFragment : Fragment(), MissionHandler {
         super.onViewCreated(view, savedInstanceState)
 
         setDataBinding()
-        initViewModel()
         initTMap()
-        setObserve()
         setMissionOver()
 
     }
@@ -69,7 +66,8 @@ class MissionFragment : Fragment(), MissionHandler {
 
     private fun setDataBinding() {
         binding.lifecycleOwner = viewLifecycleOwner
-        binding.viewModel = missionViewModel
+        binding.missionViewModel = missionViewModel
+        binding.alarmSettingViewModel = alarmSettingViewModel
         binding.fragment = this@MissionFragment
     }
 
@@ -80,10 +78,6 @@ class MissionFragment : Fragment(), MissionHandler {
         binding.constraintLayoutContainer.addView(tMap.tMapView)
     }
 
-    private fun initViewModel() {
-        missionViewModel.countDownWith(LEFT_TIME)
-    }
-
     fun setCompassMode() {
         tMap.tMapView.isCompassMode = tMap.tMapView.isCompassMode.not()
     }
@@ -118,38 +112,6 @@ class MissionFragment : Fragment(), MissionHandler {
         findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
     }
 
-    private fun setObserve() {
-        val shortAnimationDuration =
-            resources.getInteger(android.R.integer.config_shortAnimTime)
-
-        missionViewModel.timeIncreased.observe(viewLifecycleOwner) {
-            val sign = if (it > 0) {
-                PLUS
-            } else {
-                MINUS
-            }
-            binding.textViewChangedTime.text =
-                resources.getString(R.string.number_format).format(sign, it)
-            binding.textViewChangedTime.apply {
-                alpha = 0f
-                visibility = View.VISIBLE
-                animate().alpha(1f)
-                    .setDuration(shortAnimationDuration.toLong())
-                    .setListener(object : AnimatorListenerAdapter() {
-                        override fun onAnimationEnd(animation: Animator?) {
-                            animate().alpha(0f)
-                                .setDuration(shortAnimationDuration.toLong())
-                                .setListener(object : AnimatorListenerAdapter() {
-                                    override fun onAnimationEnd(animation: Animator?) {
-                                        binding.textViewChangedTime.visibility = View.GONE
-                                    }
-                                })
-                        }
-                    })
-            }
-        }
-    }
-
     override fun alertTMapReady() {
         requestPermissionsLauncher.launch(PERMISSIONS)
         getAlarmInfo()
@@ -326,10 +288,6 @@ class MissionFragment : Fragment(), MissionHandler {
     }
 
     companion object {
-        private const val PLUS = "+"
-        private const val MINUS = ""
-        private const val LEFT_TIME = 60
-
         private var PERSON_LINE_NUM = 0
 
         private val PERMISSIONS =

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

@@ -1,49 +1,23 @@
 package com.stop.ui.mission
 
-import android.util.Log
-import androidx.lifecycle.*
+import androidx.lifecycle.ViewModel
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import com.stop.domain.model.route.tmap.custom.Coordinate
 import com.stop.domain.model.route.tmap.custom.Place
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
 import java.util.*
 import javax.inject.Inject
-import kotlin.random.Random
 
 @HiltViewModel
 class MissionViewModel @Inject constructor(
     private val workManager: WorkManager,
     missionManager: MissionManager
 ) : ViewModel() {
 
-    private val random = Random(System.currentTimeMillis())
-
     val destination = MutableStateFlow(Place("null",Coordinate("37.553836", "126.969652")))
 
-    private val _timeIncreased = MutableLiveData<Int>()
-    val timeIncreased: LiveData<Int>
-        get() = _timeIncreased
-
-    private val _estimatedTimeRemaining = MutableLiveData<Int>()
-    val estimatedTimeRemaining: LiveData<Int>
-        get() = _estimatedTimeRemaining
-
-    val leftMinute: LiveData<String> = Transformations.switchMap(estimatedTimeRemaining) {
-        MutableLiveData<String>().apply {
-            value = (it / TIME_UNIT).toString().padStart(TIME_DIGIT, '0')
-        }
-    }
-
-    val leftSecond: LiveData<String> = Transformations.switchMap(estimatedTimeRemaining) {
-        MutableLiveData<String>().apply {
-            value = (it % TIME_UNIT).toString().padStart(TIME_DIGIT, '0')
-        }
-    }
-
     val userLocation = missionManager.userLocation
     val isMissionOver = missionManager.isMissionOver
 
@@ -53,39 +27,6 @@ class MissionViewModel @Inject constructor(
         makeMissionWorker()
     }
 
-    fun countDownWith(startTime: Int) {
-        _estimatedTimeRemaining.value = startTime
-        var leftTime = startTime
-        viewModelScope.launch {
-            while (leftTime > TIME_ZERO) {
-                delay(DELAY_TIME)
-                leftTime -= ONE_SECOND
-                if (leftTime <= TIME_ZERO) {
-                    break
-                }
-                _estimatedTimeRemaining.value = leftTime
-            }
-        }
-
-        viewModelScope.launch {
-            while (leftTime > TIME_ZERO) {
-                delay(DELAY_TIME)
-                if (random.nextInt(ZERO, RANDOM_LIMIT) == ZERO) {
-                    val increasedTime = random.nextInt(-RANDOM_LIMIT, RANDOM_LIMIT)
-                    if (increasedTime == ZERO) {
-                        continue
-                    }
-                    leftTime += increasedTime
-                    _timeIncreased.value = increasedTime
-                }
-                if (leftTime < TIME_ZERO) {
-                    leftTime = 0
-                }
-                _estimatedTimeRemaining.value = leftTime
-            }
-        }
-    }
-
     private fun makeMissionWorker() {
         val workRequest = OneTimeWorkRequestBuilder<MissionWorker>()
             .build()
@@ -96,18 +37,7 @@ class MissionViewModel @Inject constructor(
     }
 
     fun cancelMission() {
-        Log.d("MissionWorker","취소 되나연")
         workManager.cancelWorkById(requestId)
     }
 
-    companion object {
-        private const val DELAY_TIME = 1000L
-        private const val TIME_ZERO = 0
-        private const val TIME_UNIT = 60
-        private const val TIME_DIGIT = 2
-        private const val ONE_SECOND = 1
-        private const val RANDOM_LIMIT = 5
-        private const val ZERO = 0
-
-    }
 }

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

@@ -6,12 +6,16 @@
     <data>
 
         <variable
-            name="viewModel"
+            name="missionViewModel"
             type="com.stop.ui.mission.MissionViewModel" />
 
         <variable
             name="fragment"
             type="com.stop.ui.mission.MissionFragment" />
+
+        <variable
+            name="alarmSettingViewModel"
+            type="com.stop.ui.alarmsetting.AlarmSettingViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -62,7 +66,7 @@
             android:layout_height="0dp"
             android:layout_marginHorizontal="10dp"
             android:gravity="center_vertical"
-            android:text="@{viewModel.destination.name}"
+            android:text="@{missionViewModel.destination.name}"
             android:textColor="@color/main_dark_grey"
             android:textSize="17sp"
             android:textStyle="bold"
@@ -86,7 +90,7 @@
             android:shadowDx="7.0"
             android:shadowDy="7.0"
             android:shadowRadius="15.0"
-            android:text="@{@string/minute_and_second(viewModel.leftMinute, viewModel.leftSecond)}"
+            android:text="@{alarmSettingViewModel.lastTimeCountDown}"
             android:textColor="@color/main_dark_grey"
             android:textSize="48sp"
             app:layout_constraintEnd_toEndOf="parent"