diff --git a/core/network/src/main/kotlin/dev/meloda/fast/network/ValidationType.kt b/core/network/src/main/kotlin/dev/meloda/fast/network/ValidationType.kt index e29218b8..eb364032 100644 --- a/core/network/src/main/kotlin/dev/meloda/fast/network/ValidationType.kt +++ b/core/network/src/main/kotlin/dev/meloda/fast/network/ValidationType.kt @@ -2,7 +2,8 @@ package dev.meloda.fast.network enum class ValidationType(val value: String) { APP("2fa_app"), - SMS("2fa_sms"); + SMS("sms"), + SMS2("2fa_sms"); companion object { fun parse(value: String): ValidationType = diff --git a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/ValidationViewModel.kt b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/ValidationViewModel.kt index 16e64e00..554c75d7 100644 --- a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/ValidationViewModel.kt +++ b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/ValidationViewModel.kt @@ -4,7 +4,6 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dev.meloda.fast.auth.validation.model.ValidationScreenState -import dev.meloda.fast.auth.validation.model.ValidationType import dev.meloda.fast.auth.validation.navigation.Validation import dev.meloda.fast.auth.validation.validation.ValidationValidator import dev.meloda.fast.common.extensions.createTimerFlow @@ -12,6 +11,7 @@ import dev.meloda.fast.common.extensions.listenValue import dev.meloda.fast.common.extensions.setValue import dev.meloda.fast.data.processState import dev.meloda.fast.domain.AuthUseCase +import dev.meloda.fast.network.ValidationType import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/model/ValidationType.kt b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/model/ValidationType.kt deleted file mode 100644 index f6e22c0f..00000000 --- a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/model/ValidationType.kt +++ /dev/null @@ -1,11 +0,0 @@ -package dev.meloda.fast.auth.validation.model - -enum class ValidationType(val value: String) { - SMS("2fa_sms"), - APP("2fa_app"); - - companion object { - fun parse(value: String): ValidationType = entries.firstOrNull { it.value == value } - ?: throw IllegalArgumentException("Unknown validation type with value: $value") - } -} diff --git a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/presentation/ValidationScreen.kt b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/presentation/ValidationScreen.kt index ae45faf2..04c55fe8 100644 --- a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/presentation/ValidationScreen.kt +++ b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/presentation/ValidationScreen.kt @@ -52,7 +52,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import dev.meloda.fast.auth.validation.ValidationViewModel import dev.meloda.fast.auth.validation.ValidationViewModelImpl import dev.meloda.fast.auth.validation.model.ValidationScreenState -import dev.meloda.fast.auth.validation.model.ValidationType +import dev.meloda.fast.network.ValidationType import dev.meloda.fast.ui.R import dev.meloda.fast.ui.common.FastPreview import dev.meloda.fast.ui.components.ActionInvokeDismiss @@ -118,7 +118,7 @@ fun ValidationScreen( val validationText by remember(validationType) { mutableStateOf( when (validationType) { - ValidationType.SMS -> "SMS with the code is sent to ${screenState.phoneMask}" + ValidationType.SMS, ValidationType.SMS2 -> "SMS with the code is sent to ${screenState.phoneMask}" ValidationType.APP -> "Enter the code from the code generator application" null -> ""