[#1011] 타이머 이슈 해소

sopt-makers · Jan 23, 2025 · da75b4e · da75b4e
1 parent 7dcde81
commit da75b4e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 17 deletions.
diff --git a/app/src/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationScreen.kt b/app/src/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationScreen.kt
@@ -41,6 +41,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -52,6 +53,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.flowWithLifecycle
+import kotlinx.coroutines.launch
 import org.sopt.official.R
 import org.sopt.official.R.drawable.ic_auth_memeber_error
 import org.sopt.official.R.drawable.ic_auth_process_first
@@ -83,6 +85,7 @@ internal fun CertificationRoute(
     viewModel: CertificationViewModel = hiltViewModel()
 ) {
     val lifecycleOwner = LocalLifecycleOwner.current
+    val scope = rememberCoroutineScope()
     val context = LocalContext.current
 
     val state by viewModel.state.collectAsStateWithLifecycle()
@@ -107,8 +110,10 @@ internal fun CertificationRoute(
         onCreateCodeClick = {
             onShowSnackBar()
             // TODO: 실제 전화번호 넣기 by leeeyubin
-            viewModel.createCode(status)
-            viewModel.startTimer(state.currentTime)
+            scope.launch {
+                viewModel.createCode(status)
+                viewModel.startTimer()
+            }
         },
         onCertificateClick = {
             // TODO: 실제 인증코드 넣기 by leeeyubin

diff --git a/app/src/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationState.kt b/app/src/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationState.kt
@@ -1,7 +1,17 @@
 package org.sopt.official.feature.auth.feature.certificate
 
+import java.util.Locale
+
 data class CertificationState(
     val phone: String = "",
     val code: String = "",
-    val currentTime: String = "03:00"
-)
+    val currentTimeValue: Int = 180
+) {
+    val currentTime: String
+        get() = String.format(
+            Locale.US,
+            "%02d:%02d",
+            currentTimeValue / 60,
+            currentTimeValue % 60
+        )
+}
diff --git a/...rc/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationViewModel.kt b/...rc/main/java/org/sopt/official/feature/auth/feature/certificate/CertificationViewModel.kt
@@ -3,6 +3,8 @@ package org.sopt.official.feature.auth.feature.certificate
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -11,13 +13,14 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.sopt.official.domain.auth.model.InformationWithCode
 import org.sopt.official.domain.auth.model.InitialInformation
 import org.sopt.official.domain.auth.model.UserPhoneNumber
 import org.sopt.official.domain.auth.repository.AuthRepository
 import org.sopt.official.feature.auth.model.AuthStatus
-import java.util.Locale
+import timber.log.Timber
 import javax.inject.Inject
 
 @HiltViewModel
@@ -31,6 +34,8 @@ class CertificationViewModel @Inject constructor(
     private val _sideEffect = MutableSharedFlow<CertificationSideEffect>()
     val sideEffect: SharedFlow<CertificationSideEffect> = _sideEffect.asSharedFlow()
 
+    private var timerJob: Job? = null
+
     fun updatePhone(phone: String) {
         _state.update { currentState ->
             currentState.copy(
@@ -98,26 +103,26 @@ class CertificationViewModel @Inject constructor(
         }
     }
 
-    fun startTimer(currentTime: String) {
-        viewModelScope.launch {
-            var (minutes, seconds) = currentTime.split(":").map { it.toInt() }
-            var totalSeconds: Int = minutes * 60 + seconds
-
-            while (totalSeconds > 0) {
+    suspend fun startTimer() {
+        timerJob?.cancelAndJoin()
+        timerJob = null
+        _state.update { currentState ->
+            currentState.copy(
+                currentTimeValue = 180
+            )
+        }
+        timerJob = viewModelScope.launch {
+            while (isActive) {
                 delay(1000L)
-
-                totalSeconds--
-                minutes = totalSeconds / 60
-                seconds = totalSeconds % 60
+                Timber.d("totalSeconds: ${state.value}")
 
                 _state.update { currentState ->
                     currentState.copy(
-                        currentTime = String.format(Locale.US, "%02d:%02d", minutes, seconds)
+                        currentTimeValue = currentState.currentTimeValue - 1
                     )
                 }
             }
             delay(1000L)
-            // TODO : 에러 화면 띄우기 by leeeyubin
         }
     }
 }