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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Serafim_Pankin 2025-02-20 16:05:16 +03:00
commit 865dbfafd5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/displaynone/acss/components/acs/models/visit/VisitEntity.kt
View File

@ -1,4 +0,0 @@
package com.displaynone.acss.components.acs.models.visit
class VisitEntity {
}

8
app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt
View File

@ -33,8 +33,10 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
_binding = FragmentProfileBinding.bind(view) _binding = FragmentProfileBinding.bind(view)
checkForAdmin() checkForAdmin()
binding.swipeRefresh.setOnRefreshListener { binding.swipeRefresh.setOnRefreshListener {
if (getIsMe()) refreshData() else showData(getUserDto()!!); if (getIsMe()) refreshData() else showData(getUserDto()!!);
binding.swipeRefresh.isRefreshing = false
} }
binding.logout.setOnClickListener { binding.logout.setOnClickListener {
@ -45,10 +47,16 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
if (getIsMe()) { if (getIsMe()) {
refreshData() refreshData()
viewModel.visitListState.collectWithLifecycle(this) { data -> adapter.submitData(data) } viewModel.visitListState.collectWithLifecycle(this) { data -> adapter.submitData(data) }
// waitForQRScanResult() // waitForQRScanResult()
} else { } else {
showData(getUserDto()!!) showData(getUserDto()!!)
binding.backToSearch.visibility = View.VISIBLE
binding.backToSearch.setOnClickListener {
navigateTo(view, R.id.action_profileFragment_to_adminFragment)
}
Log.d("ProfileFragment", "set login") Log.d("ProfileFragment", "set login")
viewModel.visitListStateFromLogin.collectWithLifecycle(this) { data -> viewModel.visitListStateFromLogin.collectWithLifecycle(this) { data ->
adapter.submitData(data) adapter.submitData(data)