DisplayNone/DisplayNone-front
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of https://gitnto.innovationcampus.ru/DisplayNone/DisplayNone-front

Browse Source
This commit is contained in:
Universall 2025-02-19 18:55:40 +03:00
commit 8d5ec27fc0
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,8 +59,12 @@ class AuthFragment: Fragment(R.layout.fragment_auth) {
val username = s.toString() val username = s.toString()
val valid = isUsernameValid(username) val valid = isUsernameValid(username)
if (valid) {
binding.hint.visibility = if(valid) View.INVISIBLE else View.VISIBLE 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 binding.next.isEnabled = valid
val color = if (valid) R.color.primary else R.color.secondary val color = if (valid) R.color.primary else R.color.secondary
binding.next.backgroundTintList = ContextCompat.getColorStateList(requireContext(), color) 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 login = binding.login.text.toString()
val password = binding.password.text.toString() val password = binding.password.text.toString()
if (login.isEmpty()) return if (login.isEmpty()) return
viewModel.login(login, password) viewModel.login(login, password)
} }

14
app/src/main/res/drawable/administrator.xml Normal file
View File

File diff suppressed because one or more lines are too long

2
app/src/main/res/menu/bottom_nav_menu.xml
View File

@ -11,7 +11,7 @@
<item <item
android:id="@+id/nav_admin" android:id="@+id/nav_admin"
android:icon="@drawable/_user_" android:icon="@drawable/administrator"
android:title="@string/admin" /> android:title="@string/admin" />
</menu> </menu>

2
app/src/main/res/values-ru/strings-ru.xml
View File

@ -6,7 +6,7 @@
<string name="hello">Здравствуйте!</string> <string name="hello">Здравствуйте!</string>
<string name="continue_">Продолжить</string> <string name="continue_">Продолжить</string>
<string name="logout">Выйти из аккаунта</string> <string name="logout">Выйти из аккаунта</string>
<string name="login_hint">Login must be at least 3 characters long,\start with a letter,\contain only letters and numbers.</string> <string name="login_hint">Логин должен содержать не менее 3 символов, начинаться с буквы и содержать только буквы и цифры.</string>
<string name="close_button">Закрыть</string> <string name="close_button">Закрыть</string>
<string name="scan">Сканировать</string> <string name="scan">Сканировать</string>
<string name="cancel">Вход был отменён</string> <string name="cancel">Вход был отменён</string>