From 61f278f60387dfa5029632e16ed31a265936d8c5 Mon Sep 17 00:00:00 2001 From: v228a Date: Thu, 20 Feb 2025 11:38:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=BE=D1=80=D0=BC=20=D0=BE=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=BE?= =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/ru/myitschool/work/ui/login/LoginFragment.kt | 7 ++++++- .../java/ru/myitschool/work/ui/login/LoginViewModel.kt | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt index abb97b2..0c430e3 100644 --- a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt @@ -3,6 +3,7 @@ package ru.myitschool.work.ui.login import android.os.Bundle import android.text.Editable import android.view.View +import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController @@ -37,7 +38,11 @@ class LoginFragment : Fragment(R.layout.fragment_login) { when (state) { is LoginViewModel.State.Loading -> Unit is LoginViewModel.State.Error -> { - binding.error.text = state.errorText + when(state.error.localizedMessage){ + "Error 401" -> binding.error.text = ContextCompat.getContextForLanguage(requireContext()).getString(R.string.login_wrong_password_login) + else -> binding.error.text = state.error.localizedMessage + } + } is LoginViewModel.State.Show -> { diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt index 104df6c..fa41679 100644 --- a/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt +++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt @@ -45,8 +45,7 @@ class LoginViewModel @Inject constructor( onFailure = { error -> _state.update { State.Error( - errorText = error.localizedMessage - ?: context.resources.getString(R.string.login_error) + error = error ) } } @@ -79,7 +78,7 @@ class LoginViewModel @Inject constructor( data object Loading : State data class Error( - val errorText: String, + val error: Throwable, ) : State data class Show(