From fcd6a1fc01897bae4f83731d75e8ce8f8f587195 Mon Sep 17 00:00:00 2001 From: Serafim_Pankin Date: Wed, 19 Feb 2025 10:10:55 +0300 Subject: [PATCH] Design --- .../displaynone/acss/ui/admin/AdminFragment.kt | 2 +- .../com/displaynone/acss/ui/auth/AuthFragment.kt | 1 + app/src/main/res/drawable/search_by_login.xml | 14 +++++++------- app/src/main/res/layout/fragment_admin.xml | 16 +++++++++------- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/displaynone/acss/ui/admin/AdminFragment.kt b/app/src/main/java/com/displaynone/acss/ui/admin/AdminFragment.kt index 522c287..e6ab029 100644 --- a/app/src/main/java/com/displaynone/acss/ui/admin/AdminFragment.kt +++ b/app/src/main/java/com/displaynone/acss/ui/admin/AdminFragment.kt @@ -28,7 +28,7 @@ class AdminFragment : Fragment(R.layout.fragment_admin) { } private fun onSearchButtonClicked() { - val login = binding.editTextTextEmailAddress.text.toString() + val login = binding.login_search.text.toString() if (login.isEmpty()) return viewModel.getDataByLogin(login) 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 7cea88b..86e3855 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 @@ -58,6 +58,7 @@ class AuthFragment: Fragment(R.layout.fragment_auth) { binding.error.visibility = View.GONE val username = s.toString() val valid = isUsernameValid(username) + 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 diff --git a/app/src/main/res/drawable/search_by_login.xml b/app/src/main/res/drawable/search_by_login.xml index 4be7615..8a48e7a 100644 --- a/app/src/main/res/drawable/search_by_login.xml +++ b/app/src/main/res/drawable/search_by_login.xml @@ -1,15 +1,15 @@ - + - + - + - + - + - - + + diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index c139f47..c9bba6f 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -18,7 +18,7 @@ android:textSize="20sp" android:layout_marginBottom="15dp" android:text="@string/administrator_search" - app:layout_constraintBottom_toTopOf="@+id/editTextTextEmailAddress" + app:layout_constraintBottom_toTopOf="@+id/login" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -52,15 +52,17 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent"/> - + tools:ignore="MissingConstraints" /> \ No newline at end of file