From 21c51d69bafd5e7d6d6db260465f5ba4bc82f1ee Mon Sep 17 00:00:00 2001 From: Izlydov Date: Thu, 20 Feb 2025 15:52:58 +0300 Subject: [PATCH] swiperefreshlayout fix, added backToSearch btn --- .../acss/components/acs/models/visit/VisitEntity.kt | 4 ---- .../com/displaynone/acss/ui/profile/ProfileFragment.kt | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 app/src/main/java/com/displaynone/acss/components/acs/models/visit/VisitEntity.kt diff --git a/app/src/main/java/com/displaynone/acss/components/acs/models/visit/VisitEntity.kt b/app/src/main/java/com/displaynone/acss/components/acs/models/visit/VisitEntity.kt deleted file mode 100644 index a08a0d8..0000000 --- a/app/src/main/java/com/displaynone/acss/components/acs/models/visit/VisitEntity.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.displaynone.acss.components.acs.models.visit - -class VisitEntity { -} \ No newline at end of file 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..c86bfa6 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 @@ -33,8 +33,10 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { _binding = FragmentProfileBinding.bind(view) checkForAdmin() + binding.swipeRefresh.setOnRefreshListener { if (getIsMe()) refreshData() else showData(getUserDto()!!); + binding.swipeRefresh.isRefreshing = false } binding.logout.setOnClickListener { @@ -53,10 +55,16 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { if (getIsMe()) { refreshData() + viewModel.visitListState.collectWithLifecycle(this) { data -> adapter.submitData(data) } // waitForQRScanResult() } else { showData(getUserDto()!!) + binding.backToSearch.visibility = View.VISIBLE + + binding.backToSearch.setOnClickListener { + navigateTo(view, R.id.action_profileFragment_to_adminFragment) + } Log.d("ProfileFragment", "set login") viewModel.visitListStateFromLogin.collectWithLifecycle(this) { data -> adapter.submitData(data)