From a41235a4d597dac8c09045e0118e4b0b01354ec7 Mon Sep 17 00:00:00 2001 From: Serafim_Pankin Date: Wed, 19 Feb 2025 18:52:15 +0300 Subject: [PATCH] Redesign and some REPAIRS --- .../com/displaynone/acss/ui/auth/AuthFragment.kt | 9 +++++++-- app/src/main/res/drawable/administrator.xml | 14 ++++++++++++++ app/src/main/res/menu/bottom_nav_menu.xml | 2 +- app/src/main/res/values-ru/strings-ru.xml | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable/administrator.xml diff --git a/app/src/main/java/com/displaynone/acss/ui/auth/AuthFragment.kt b/app/src/main/java/com/displaynone/acss/ui/auth/AuthFragment.kt index 25e3946..8c0dbe2 100644 --- a/app/src/main/java/com/displaynone/acss/ui/auth/AuthFragment.kt +++ b/app/src/main/java/com/displaynone/acss/ui/auth/AuthFragment.kt @@ -59,8 +59,12 @@ class AuthFragment: Fragment(R.layout.fragment_auth) { val username = s.toString() val valid = isUsernameValid(username) - - binding.hint.visibility = if(valid) View.INVISIBLE else View.VISIBLE + if (valid) { + binding.hint.visibility = View.INVISIBLE + }else{ + binding.login.error = getString(R.string.login_hint) + } +// binding.hint.visibility = if(valid) View.INVISIBLE else View.VISIBLE binding.next.isEnabled = valid val color = if (valid) R.color.primary else R.color.secondary binding.next.backgroundTintList = ContextCompat.getColorStateList(requireContext(), color) @@ -121,6 +125,7 @@ class AuthFragment: Fragment(R.layout.fragment_auth) { val login = binding.login.text.toString() val password = binding.password.text.toString() if (login.isEmpty()) return + viewModel.login(login, password) } diff --git a/app/src/main/res/drawable/administrator.xml b/app/src/main/res/drawable/administrator.xml new file mode 100644 index 0000000..2c14e48 --- /dev/null +++ b/app/src/main/res/drawable/administrator.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml index 74eb0c5..360006b 100644 --- a/app/src/main/res/menu/bottom_nav_menu.xml +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -11,7 +11,7 @@ diff --git a/app/src/main/res/values-ru/strings-ru.xml b/app/src/main/res/values-ru/strings-ru.xml index 3cd1857..18da3e6 100644 --- a/app/src/main/res/values-ru/strings-ru.xml +++ b/app/src/main/res/values-ru/strings-ru.xml @@ -6,7 +6,7 @@ Здравствуйте! Продолжить Выйти из аккаунта - Login must be at least 3 characters long,\start with a letter,\contain only letters and numbers. + Логин должен содержать не менее 3 символов, начинаться с буквы и содержать только буквы и цифры. Закрыть Сканировать Вход был отменён