From 2642106b32450e28874a0b0f602436693b8c9f25 Mon Sep 17 00:00:00 2001
From: Kaif <mohamedkaif@sminnovations.in>
Date: Fri, 5 Jan 2024 15:03:23 +0530
Subject: [PATCH] Removed incubation time, error message and displaying only
 one HB value

---
 app/build.gradle                                     |  4 ++--
 .../presentation/adapter/UserListAdapter.kt          |  4 ++--
 .../presentation/hemocube/HemoCubeFragment.kt        | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index df72036..3a410b4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         applicationId "in.sminnovations.hpostesting.quality"
         minSdk 21
         targetSdk 34
-        versionCode 60
-        versionName "2.1.61"
+        versionCode 72
+        versionName "2.1.72"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
index e0034c0..5b3b12a 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
@@ -213,13 +213,13 @@ class UserListAdapter(
                         ).show()
                     } else {
                         if (model.incubationTime != "") {
-                            if (isBetween15And30Minutes(model.incubationTime) < 15) {
+                            if (isBetween15And30Minutes(model.incubationTime) < 0) {
                                 Toast.makeText(
                                     view.context,
                                     context?.getString(R.string.incubation_not_completed),
                                     Toast.LENGTH_SHORT
                                 ).show()
-                            } else if (isBetween15And30Minutes(model.incubationTime) > 30) {
+                            } else if (isBetween15And30Minutes(model.incubationTime) > 140000) {
                                 Toast.makeText(
                                     view.context,
                                     context?.getString(R.string.incubation_crossed_30_minutes),
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 054bdcf..311b2da 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
@@ -459,7 +459,7 @@ class HemoCubeFragment : Fragment() {
                 allErrorMessages += "Error: Invalid Test. Improper buffer reading (low)"
                 activity?.runOnUiThread {
                     binding.errorMessage.text = getString(R.string.error_improper_buffer_low)
-                    binding.errorMessage.visibility = View.VISIBLE
+//                    binding.errorMessage.visibility = View.VISIBLE
                 }
             }
 
@@ -480,7 +480,7 @@ class HemoCubeFragment : Fragment() {
                 activity?.runOnUiThread {
                     binding.errorMessage.text =
                         getString(R.string.error_improper_buffer_high)
-                    binding.errorMessage.visibility = View.VISIBLE
+//                    binding.errorMessage.visibility = View.VISIBLE
                     binding.btnSubmit.isEnabled = true
                     binding.btnSubmit.isClickable = true
                 }
@@ -525,7 +525,7 @@ class HemoCubeFragment : Fragment() {
                 allErrorMessages += "Error: Invalid Test. Problem with de-oxygenation" + "\n"
                 activity?.runOnUiThread {
                     binding.errorMessage.text = getString(R.string.error_invalid_test)
-                    binding.errorMessage.visibility = View.VISIBLE
+//                    binding.errorMessage.visibility = View.VISIBLE
                 }
             }
 
@@ -533,7 +533,7 @@ class HemoCubeFragment : Fragment() {
                 validationError = true
                 activity?.runOnUiThread {
                     binding.errorMessage.text = getString(R.string.error_negative_abs)
-                    binding.errorMessage.visibility = View.VISIBLE
+//                    binding.errorMessage.visibility = View.VISIBLE
                 }
             }
 
@@ -542,7 +542,7 @@ class HemoCubeFragment : Fragment() {
                 allErrorMessages += "Error: Low Hb. Repeat test" + "\n"
                 activity?.runOnUiThread {
                     binding.errorMessage.text = "Error: Low Hb. Repeat test"
-                    binding.errorMessage.visibility = View.VISIBLE
+//                    binding.errorMessage.visibility = View.VISIBLE
                 }
             }
 
@@ -574,7 +574,7 @@ class HemoCubeFragment : Fragment() {
                     .toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
                 this.classificationResult = findResult(calculatedRatio)
                 this.prdClassification = absorbanceBasedClassification(predictedDenovixRatio)
-                hemoCubeViewModel.messages.postValue("Hb1: $_hb1,\nHb2: $_hb2,\nHb3: $_hb3,\n Hb4: $_hb4")
+                hemoCubeViewModel.messages.postValue("HB: $_hb4")
                 this.errorMessages = allErrorMessages
                 this.resultData = deviceLog
                 this.batteryLevel = hemoCubeViewModel.getBatteryLevel().toString()