From f8a7bff5b29bee4e50a583f8682fbacb9923b590 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Sun, 10 Sep 2023 23:55:24 +0530 Subject: [PATCH 1/4] add new kit button - device data processing error toast --- .../hpostesting/presentation/hemocube/HemoCubeFragment.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt index 4edae9e..9e74155 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt @@ -101,6 +101,11 @@ class HemoCubeFragment : Fragment() { (activity as HemocubeActivity).finish() } }) + } else { + resetKitCount() + val intent = Intent(context, KitScanActivity::class.java) + startActivity(intent) + (activity as HemocubeActivity).finish() } } } @@ -374,7 +379,7 @@ class HemoCubeFragment : Fragment() { } } catch (_: Exception) { - + Toast.makeText( requireContext(), "Error while processing device data", Toast.LENGTH_SHORT).show() } } From d6bacd578c4877f4cb9fbf910397b1fecf2ea61a Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Sun, 10 Sep 2023 23:58:02 +0530 Subject: [PATCH 2/4] show users in ordered, latest first --- .../example/hpostesting/presentation/dashboard/HomeFragment.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt index bbc15c9..b379d90 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt @@ -20,6 +20,7 @@ import com.example.hpostesting.presentation.adapter.UserListAdapter import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel import com.example.hpostesting.presentation.testRight.TestRightViewModel import com.firebase.ui.firestore.FirestoreRecyclerOptions +import com.google.firebase.firestore.Query import com.google.firebase.firestore.ktx.firestore import com.google.firebase.ktx.Firebase import dagger.hilt.android.AndroidEntryPoint @@ -90,7 +91,7 @@ class HomeFragment : Fragment() { } } private fun loadUserData() { - val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false) + val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false).orderBy("createdAt", Query.Direction.DESCENDING) query.get().addOnSuccessListener { if (it.documents.isEmpty()) { binding.pendingTest.visibility = View.VISIBLE From 38f2122444bfa06b6fb7e5607d53d9b5ed95c341 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Sun, 10 Sep 2023 23:59:54 +0530 Subject: [PATCH 3/4] add version name in the settings --- .../presentation/dashboard/SlideshowFragment.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt index dffb325..d62d53b 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt @@ -9,6 +9,7 @@ import androidx.lifecycle.ViewModelProvider import com.example.hpostesting.presentation.dashboard.ui.slideshow.SlideshowViewModel import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding + class SlideshowFragment : Fragment() { private var _binding: FragmentSlideshowBinding? = null @@ -20,7 +21,7 @@ class SlideshowFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View { val slideshowViewModel = ViewModelProvider(this).get(SlideshowViewModel::class.java) @@ -28,6 +29,12 @@ class SlideshowFragment : Fragment() { _binding = FragmentSlideshowBinding.inflate(inflater, container, false) val root: View = binding.root + val pInfo = requireActivity().packageManager.getPackageInfo( + requireActivity().packageName, 0 + ) + val version = pInfo.versionName + binding.textSlideshow.text = version + // val textView: TextView = binding.textSlideshow // slideshowViewModel.text.observe(viewLifecycleOwner) { // textView.text = it From 4289d1c399d918f9920a8c36e705b23214e229ea Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Mon, 11 Sep 2023 09:20:55 +0530 Subject: [PATCH 4/4] release version 2.1.3 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dafd795..4162287 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { applicationId "in.sminnovations.hpostesting.prod" minSdk 21 targetSdk 34 - versionCode 2 - versionName "2.0.1" + versionCode 3 + versionName "2.1.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" }