Merge remote-tracking branch 'origin/master'

app/src/main/java/com/displaynone/acss/ui/auth/AuthFragment.kt

@@ -1,11 +1,7 @@
 package com.displaynone.acss.ui.auth
 
 import android.annotation.SuppressLint
-import android.graphics.drawable.TransitionDrawable
 import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.core.content.ContextCompat
@@ -37,7 +33,10 @@ class AuthFragment: Fragment(R.layout.fragment_auth) {
         viewModel.errorState.collectWithLifecycle(this) { errorStatus ->
             errorStatus?.let {
                 Toast.makeText(requireContext(), it, Toast.LENGTH_SHORT).show()
-                binding.errorTitle.text = errorStatus
+                val errorDescription = getErrorDescription(errorStatus.toString())
+                binding.errorTitle.text = errorDescription
+
+                binding.errorTitle.text = errorDescription
                 binding.errorTitle.visibility = View.VISIBLE
             }
         }
@@ -45,6 +44,15 @@ class AuthFragment: Fragment(R.layout.fragment_auth) {
             onLoginButtonClicked(view)
         }
     }
+    @SuppressLint("StringFormatMatches")
+    private fun getErrorDescription(errorCode: String): String {
+        return when (errorCode) {
+            401.toString()+' ' -> getString(R.string.error_401)
+            404.toString()+' ' -> getString(R.string.error_404)
+            500.toString()+' ' -> getString(R.string.error_500)
+            else -> getString(R.string.error_unknown, errorCode)
+        }
+    }
     private fun blockLoginButton() {
         binding.next.isEnabled = false
     }

app/src/main/res/values-en/strings-en.xml

@@ -11,7 +11,6 @@
     <string name="cancel">The entrance was cancelled</string>
     <string name="success">Successful</string>
     <string name="wrong">Somethings wrong</string>
-    <string name="error_401">The login does not work or is incorrect</string>
     <string name="ok">ОК</string>
     <string name="error">Error</string>
     <string name="administrator_search">Enter the username</string>
@@ -27,10 +26,14 @@
     <string name="serverIsUnabailable">Server is unavailable</string>
     <string name="AdminFragment">Checking the session employee</string>
     <string name="error_password_too_short">The password must contain at least 8 characters</string>
-    <string name="error_password_no_uppercase">The password must contain at least one uppercase letter</string>
+
-    <string name="error_password_no_digit">The password must contain at least one digit</string>
     <string name="error_login_empty">The username cannot be empty</string>
     <string name="error_login_too_short">Login must contain at least 3 characters</string>
     <string name="error_login_starts_with_digit">Login cannot start with a digit</string>
     <string name="error_login_invalid_characters">Login can contain only letters, numbers, and underscores</string>
+    <string name="error_401">Authorization error: Invalid login or password</string>
+    <string name="error_404">Error: Requested resource not found</string>
+    <string name="error_500">Server error: Try again later</string>
+    <string name="error_unknown">Неизвестная ошибка (%s)</string>
+
 </resources>

app/src/main/res/values-ru/strings-ru.xml

@@ -12,7 +12,6 @@
     <string name="cancel">Вход был отменён</string>
     <string name="success">Успешно</string>
     <string name="wrong">Что-то пошло не так</string>
-    <string name="error_401">Логина не существует или неверный</string>
     <string name="ok">ОК</string>
     <string name="error">Ошибка</string>
  <string name="administrator_search">Введите логин пользователя</string>
@@ -27,6 +26,16 @@
  <string name="AdminFragment">Проверка сотрудника</string>
  <string name="noInternet">Нет связи с интернетом</string>
  <string name="serverIsUnabailable">Сервер недоступен</string>
+ <string name="error_401">Ошибка авторизации: Неверные учетные данные</string>
+ <string name="error_404">Ошибка: Запрашиваемый ресурс не найден</string>
+ <string name="error_500">Ошибка сервера: Попробуйте позже</string>
+ <string name="error_unknown">Неизвестная ошибка (%s)</string>
+ <string name="error_password_too_short">Пароль должен содержать не менее 8 символов</string>
+
+ <string name="error_login_empty">Имя пользователя не может быть пустым</string>
+ <string name="error_login_too_short">Логин должен содержать не менее 3 символов</string>
+ <string name="error_login_starts_with_digit">Логин в систему не может начинаться с цифры</string>
+ <string name="error_login_invalid_characters">Логин может содержать только буквы, цифры и символы подчеркивания</string>
 
 
 

app/src/main/res/values/strings.xml

@@ -11,7 +11,7 @@
     <string name="cancel">The entrance was cancelled</string>
     <string name="success">Successful</string>
     <string name="wrong">Somethings wrong</string>
-    <string name="error_401">The login does not work or is incorrect</string>
+    <string name="error_401">Authorization error: Invalid login or password</string>
     <string name="ok">ОК</string>
     <string name="error">Error</string>
     <string name="administrator_search">Enter the username</string>
@@ -26,11 +26,16 @@
     <string name="qrResultFragment">Scan result</string>
     <string name="profile">Profile</string>
     <string name="error_password_too_short">The password must contain at least 8 characters</string>
-    <string name="error_password_no_uppercase">The password must contain at least one uppercase letter</string>
+
-    <string name="error_password_no_digit">The password must contain at least one digit</string>
-    <string name="AdminFragment">Checking the session employee</string>
     <string name="error_login_empty">The username cannot be empty</string>
     <string name="error_login_too_short">Login must contain at least 3 characters</string>
     <string name="error_login_starts_with_digit">Login cannot start with a digit</string>
     <string name="error_login_invalid_characters">Login can contain only letters, numbers, and underscores</string>
+
+    <string name="AdminFragment">Checking the session employee</string>
+
+
+    <string name="error_404">Error: Requested resource not found</string>
+    <string name="error_500">Server error: Try again later</string>
+    <string name="error_unknown">Неизвестная ошибка (%s)</string>
 </resources>