From 44ff91387fa3c3cc5fbda74294dbc3a22ba7f577 Mon Sep 17 00:00:00 2001 From: yastruckov Date: Thu, 20 Feb 2025 15:30:08 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=91=D0=BB=D0=BE=D0=BA=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=B2=D1=85=D0=BE=D0=B4=D0=B0=20?= =?UTF-8?q?=D0=B8=20=D0=B2=D1=8B=D1=85=D0=BE=D0=B4=D0=B0=20=D1=83=20=D1=81?= =?UTF-8?q?=D0=BE=D1=82=D1=80=D1=83=D0=B4=D0=BD=D0=B8=D0=BA=D0=B0=20+=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=82=D0=B5=D0=BC=D0=BD=D0=BE=D0=B9?= =?UTF-8?q?=20=D1=82=D0=B5=D0=BC=D1=8B(=D0=BE=D0=BD=D0=B0=20=D0=BA=D1=80?= =?UTF-8?q?=D0=B0=D1=88=D0=B8=D0=BB=D0=B0=20=D0=BF=D1=80=D0=B8=D0=BB=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScannerStateNetworkDataSource.kt | 3 +++ .../myitschool/work/ui/admin/AdminFragment.kt | 16 +++++++++++---- .../work/ui/admin/AdminViewModel.kt | 1 - app/src/main/res/layout/fragment_login.xml | 14 ++++++------- app/src/main/res/layout/fragment_main.xml | 20 ++++++++++--------- app/src/main/res/values-night/colors.xml | 8 ++++++++ app/src/main/res/values/themes.xml | 6 ------ 7 files changed, 41 insertions(+), 27 deletions(-) create mode 100644 app/src/main/res/values-night/colors.xml diff --git a/app/src/main/java/ru/myitschool/work/data/scannerState/ScannerStateNetworkDataSource.kt b/app/src/main/java/ru/myitschool/work/data/scannerState/ScannerStateNetworkDataSource.kt index aea40ff..b905fe6 100644 --- a/app/src/main/java/ru/myitschool/work/data/scannerState/ScannerStateNetworkDataSource.kt +++ b/app/src/main/java/ru/myitschool/work/data/scannerState/ScannerStateNetworkDataSource.kt @@ -27,6 +27,9 @@ class ScannerStateNetworkDataSource( basicAuth(username, password) } } + if(result.status == HttpStatusCode.PreconditionFailed){ + error("Нельзя блокировать вход администратору") + } if (result.status != HttpStatusCode.OK) { error("Status ${result.status}") } diff --git a/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt b/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt index eb8e281..b8ee4f1 100644 --- a/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt @@ -21,6 +21,7 @@ class AdminFragment : Fragment(R.layout.fragment_admin) { private var _binding: FragmentAdminBinding? = null private val binding get() = _binding!! private val viewModel: AdminViewModel by viewModels{ AdminViewModel.Factory } + private var currentBtnState: Boolean = false override fun onViewCreated(view: View, savedInstanceState: Bundle?) { _binding = FragmentAdminBinding.bind(view) binding.searchBtn.setOnClickListener { @@ -97,15 +98,17 @@ class AdminFragment : Fragment(R.layout.fragment_admin) { AdminViewModel.BlockState.Success -> { binding.error.visibility = View.GONE binding.userInfo.visibility = View.VISIBLE + currentBtnState = !currentBtnState + btnState(currentBtnState) + } } } } - private fun showUserData(user: EmployeeEntity){ - binding.userName.text = user.name - binding.position.text = user.position - if(user.qrEnabled){ + private fun btnState(bool : Boolean){ + currentBtnState = bool + if(bool){ binding.blockBtn.text = ContextCompat.getString(requireContext(), R.string.block_btn) buttonRecolor(requireContext(), binding.blockBtn, R.color.accent_color, R.color.white ) } @@ -113,6 +116,11 @@ class AdminFragment : Fragment(R.layout.fragment_admin) { binding.blockBtn.text = ContextCompat.getString(requireContext(), R.string.unblock_btn) buttonRecolor(requireContext(), binding.blockBtn, R.color.bg_color, R.color.secondary_text_color ) } + } + private fun showUserData(user: EmployeeEntity){ + binding.userName.text = user.name + binding.position.text = user.position + btnState(user.qrEnabled) Picasso.get().load(user.photoUrl).into(binding.avatar) } diff --git a/app/src/main/java/ru/myitschool/work/ui/admin/AdminViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/admin/AdminViewModel.kt index c7c8019..40c26ab 100644 --- a/app/src/main/java/ru/myitschool/work/ui/admin/AdminViewModel.kt +++ b/app/src/main/java/ru/myitschool/work/ui/admin/AdminViewModel.kt @@ -65,7 +65,6 @@ class AdminViewModel( } ) } - searchUser(login) } companion object { @Suppress("UNCHECKED_CAST") diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index f54d4f2..7734a4b 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -1,10 +1,10 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/main" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="ru.myitschool.work.ui.login.LoginFragment"> android:fontFamily="@font/montserrat_bold" android:text="@string/login_error" android:textAlignment="center" - android:textColor="@color/red" + android:textColor="@color/error_color" android:textSize="20sp" android:visibility="gone" tools:visibility="gone" /> diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index bbdbc62..aac3a3c 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -150,12 +150,6 @@ app:layout_constraintLeft_toRightOf="@+id/guideline_left" app:layout_constraintRight_toLeftOf="@+id/guideline_right"> -