From d0afa9ef11926649946c8bb2836cba9dcd5b9323 Mon Sep 17 00:00:00 2001 From: Universall Date: Thu, 20 Feb 2025 15:48:20 +0300 Subject: [PATCH] Scan and search buttons removed from profile --- app/.gitignore | 3 +- .../acss/ui/profile/ProfileFragment.kt | 13 ----- app/src/main/res/layout/fragment_profile.xml | 47 ------------------- 3 files changed, 2 insertions(+), 61 deletions(-) diff --git a/app/.gitignore b/app/.gitignore index 42afabf..7dee254 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +src/main/java/com/displaynone/acss/config/Constants.kt diff --git a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt index cf7f6ae..60ce45b 100644 --- a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt +++ b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt @@ -41,14 +41,6 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { logout() } - binding.scan.setOnClickListener { - navigateTo(view, R.id.action_profileFragment_to_qrScanFragment) - } - - binding.buttonSearch.setOnClickListener { - navigateTo(view, R.id.action_profileFragment_to_adminFragment) - } - binding.recyclerViewLogs.adapter = adapter if (getIsMe()) { @@ -71,17 +63,12 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { private fun checkForAdmin() { val userDTO = UserServiceST.getInstance().getUserDTO() ?: return - if (userDTO.roles.any { it.name == "ROLE_ADMIN" }) { - binding.buttonSearch.visibility = View.VISIBLE - } Log.d("1234", userDTO.isACSBlocked.toString()) binding.rightsUsingSmartphone.text = if (userDTO.isACSBlocked) "Пропуск недействителен" else "Пропуск действителен" } private fun hideButtons() { binding.logout.visibility = View.GONE - binding.scan.visibility = View.GONE - binding.buttonSearch.visibility = View.GONE binding.changeRights.visibility = View.VISIBLE } diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index b7352b6..a2de7e5 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -136,53 +136,6 @@ android:textColor="?attr/colorOnBackground" android:textSize="18sp" /> - - - - -