Added Offline Incubation feature

Added testStatus field

app/src/main/java/com/example/hpostesting/data/constant/Constants.kt

@@ -110,4 +110,13 @@ object Constants {
             listOf(24500, 26250),
         )
     )
+
+
+    val COEFFICIENTS: Map<String, List<List<Double>>> = mapOf(
+        "HC-V1-005" to listOf(
+            listOf(1.5,0.0),
+            listOf(0.0,0.0)
+        )
+    )
+
 }

app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt

@@ -1,6 +1,8 @@
 package com.example.hpostesting.presentation.adapter
 
+import android.annotation.SuppressLint
 import android.content.Context
+import android.content.res.Resources
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -26,7 +28,9 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
     RecyclerView.Adapter<OfflineUserListAdapter.OfflineUserListViewHolder>() {
 
     inner class OfflineUserListViewHolder(val binding: OfflineUserListViewBinding) :
-        RecyclerView.ViewHolder(binding.root)
+        RecyclerView.ViewHolder(binding.root) {
+
+    }
 
     private val differCallback = object : DiffUtil.ItemCallback<HemoCubeTestData>() {
         override fun areItemsTheSame(
@@ -54,61 +58,58 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
         return differ.currentList.size
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: OfflineUserListViewHolder, position: Int) {
         val userList = differ.currentList[position]
         holder.binding.apply {
             userID.text = "User ID: ${userList._id}"
             bloodGroup.text = "Blood group: ${userList.bloodGroup}"
-            time.text = "Time: ${userList.incubationTime}"
+            time.text = "Time: ${isBetween15And30Minutes(userList.incubationTime)} \n Started at: ${
+                SimpleDateFormat("HH:mm:ss").format(
+                    SimpleDateFormat(
+                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                    ).parse(userList.incubationTime)!!
+                )
+            }"
+
+            if (userList.testStatus!!) {
+                teststatus.text = view.context.getString(R.string.test_concluded)
+
+            } else {
+                teststatus.text = view.context.getString(R.string.test_pending)
+            }
+
             userCard.setOnClickListener {
                 if (batLevel < 40) {
-                    Toast.makeText(
-                        view.context,
-                        context?.getString(R.string.low_battery_warning),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    return@setOnClickListener
-                }
-                if (userList.testStatus != null) {
-                    if (userList.testStatus!!) {
-                        Toast.makeText(
-                            view.context,
-                            context?.getString(R.string.test_already_conducted),
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    } else {
-                        if (userList.incubationTime != "") {
-                            if (isBetween15And30Minutes(userList.incubationTime) < Constants.INCUBATION_TIME_MIN) {
-                                Toast.makeText(
-                                    view.context,
-                                    context?.getString(R.string.incubation_not_completed),
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            } else if (isBetween15And30Minutes(userList.incubationTime) > Constants.INCUBATION_TIME_MAX) {
-                                Toast.makeText(
-                                    view.context,
-                                    context?.getString(R.string.incubation_crossed_30_minutes),
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            } else {
-                                DataHolder.selectedTest = UserData(
-                                    _id = userList._id,
-                                    bloodGroup = userList.bloodGroup,
-                                    incubationTime = userList.incubationTime
-                                )
-                                view.findNavController()
-                                    .navigate(R.id.action_nav_home_to_mainActivity)
-                            }
+                    showWarningToast(R.string.low_battery_warning)
+                } else {
+                    if (userList.testStatus != null) {
+                        if (userList.testStatus!!) {
+                            showWarningToast(R.string.test_already_conducted)
                         } else {
-                            Toast.makeText(
-                                view.context,
-                                context?.getString(R.string.incubation_not_started),
-                                Toast.LENGTH_SHORT
-                            ).show()
+                            if (userList.incubationTime != "") {
+                                val incubationTimeDiff = isBetween15And30Minutes(userList.incubationTime)
+                                if (incubationTimeDiff < 15) {
+                                    showWarningToast(R.string.incubation_not_completed)
+                                } else if (incubationTimeDiff > 30) {
+                                    showWarningToast(R.string.incubation_crossed_30_minutes)
+                                } else {
+                                    DataHolder.selectedTest = UserData(
+                                        _id = userList._id,
+                                        bloodGroup = userList.bloodGroup,
+                                        incubationTime = userList.incubationTime
+                                    )
+                                    view.findNavController()
+                                        .navigate(R.id.action_nav_home_to_mainActivity)
+                                }
+                            } else {
+                                showWarningToast(R.string.incubation_not_started)
+                            }
                         }
                     }
                 }
             }
+
         }
     }
 
@@ -122,4 +123,25 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
 
         return diffMillis / (60 * 1000)
     }
+
+
+    private fun showWarningToast(resId: Int) {
+        val contextToUse = view.context ?: return
+
+        val message = try {
+            contextToUse.getString(resId)
+        } catch (e: Resources.NotFoundException) {
+            "Resource not found for ID: $resId"
+        }
+
+        Toast.makeText(
+            contextToUse,
+            message,
+            Toast.LENGTH_SHORT
+        ).show()
+    }
+
+
+
+
 }

app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt

@@ -138,6 +138,7 @@ class HomeFragment : Fragment() {
         binding.btnSubmit.setOnClickListener {
             val userId = binding.userId.text.toString()
             val bloodGroup = binding.etBloodGroup.text
+
             if (userId.length >= 18 && !bloodGroup.equals("Select Blood Group") || !bloodGroup.isNullOrBlank()) {
                 hemoCubeViewModel.addUser(
                     HemoCubeTestData(

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt

@@ -1,11 +1,11 @@
 package com.example.hpostesting.presentation.hemocube
 
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.Color
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -19,7 +19,7 @@ import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.presentation.UsbServiceListener
-
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import com.google.firebase.crashlytics.ktx.crashlytics
@@ -34,30 +34,16 @@ class HemoCubeFragment : Fragment() {
     private lateinit var binding: FragmentHemoCubeReferenceBinding
     private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
     private lateinit var sharedPreferences: SharedPreferences
-    private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
+    val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
     private var isOnline = false
     private var currentDeviceData: DeviceData? = null
     private var resultData: String = ""
+    private var deviceSerialNo: String = ""
+    private var coefficient: String? = ""
     private var isUsingExistingBuffer = false
     private var isTestOngoing = false
     private var startListening = MutableLiveData<Boolean>(false)
-    private val testingTrace = Firebase.performance.newTrace("testing_trace")
-    private var led1BufferForDevice = 0.0
-    private var led2BufferForDevice = 0.0
-    private var led3BufferForDevice = 0.0
-    private var led4BufferForDevice = 0.0
-    private var led1SampleForDevice = 0.0
-    private var led2SampleForDevice = 0.0
-    private var led3SampleForDevice = 0.0
-    private var led4SampleForDevice = 0.0
-    private var fittedAbs1 = 0.0
-    private var fittedAbs2 = 0.0
-    private var fittedAbs3 = 0.0
-    private var fittedAbs4 = 0.0
-    private var _predictedDenovixRatio = 0.0
-    private var validationError = false
-    private var deviceHardwareId = ""
-    private var allErrorMessages = ""
+    val testingTrace = Firebase.performance.newTrace("testing_trace")
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
@@ -71,9 +57,8 @@ class HemoCubeFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initViews()
-        listenToHemoCube()
-        getDeviceInfo()
         observeViewModel()
+        checkAndStartProcess()
     }
 
     private fun initViews() {
@@ -85,6 +70,11 @@ class HemoCubeFragment : Fragment() {
                 isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
             )
         }
+        if (isTestOngoing) {
+//            binding.btnKit.visibility = View.GONE
+//            binding.btnKit.isEnabled = false
+//            binding.btnKit.isClickable = false
+        }
 
         binding.tvTitle2.visibility = View.GONE
         binding.etAbhaId.visibility = View.GONE
@@ -93,59 +83,27 @@ class HemoCubeFragment : Fragment() {
         binding.btnGo.visibility = View.GONE
 //        binding.btnSubmit.isEnabled = false
 //        binding.btnSubmit.isClickable = false
-        binding.btnPlacebuffer.visibility = View.GONE
 
         binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}"
-        binding.tvSubtitle4.text = "Config"
-
-        binding.btnSamplestart.setOnClickListener {
-            activity?.runOnUiThread {
-                binding.tvSubtitle4.visibility = View.VISIBLE
-//                binding.tvSubtitle4.text = "Sample Started"
-            }
-            startSampleProcess()
-            it.visibility = View.GONE
-        }
-
-        binding.btnPlacebuffer.setOnClickListener {
-            if (isBufferValueAvailable()) {
-                showBufferAlertDialog()
-            } else {
-                activity?.runOnUiThread {
-                    binding.tvSubtitle4.visibility = View.VISIBLE
-//                    binding.tvSubtitle4.text = "Buffer Started"
-                }
-
-                checkAndStartProcess()
-                it.visibility = View.GONE
-            }
-
-        }
-
+        Log.e("nametext", binding.tvName.text.toString())
     }
 
     private fun observeViewModel() {
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
-                showToast(R.string.test_upload)
-
-                activity?.runOnUiThread {
-                    binding.btnSubmit.visibility = View.GONE
-                    binding.btnDigitalCard.visibility = View.VISIBLE
-                    binding.btnDigitalCard.setOnClickListener {
-                        val i = Intent(
-                            requireContext().applicationContext, DigitalCardActivity::class.java
-                        )
-                        startActivity(i)
-                    }
-                }
+                showToast("Test Results Uploaded Successfully")
+                val i = Intent(
+                    requireContext().applicationContext, DashboardActivity::class.java
+                )
+                startActivity(i)
+                (activity as HemocubeActivity).finish()
             }
             if (result == "Local") {
-                showToast(R.string.internt_not_local)
+                showToast("Internet not available, test details stored locally")
                 startActivity(Intent(requireActivity(), DashboardActivity::class.java))
             }
             if (result == "Error") {
-                showToast(R.string.error_local)
+                showToast("Error uploading data, test details stored locally")
                 startActivity(Intent(requireActivity(), DashboardActivity::class.java))
             }
 
@@ -160,13 +118,25 @@ class HemoCubeFragment : Fragment() {
 
         hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
             apply {
-                DataHolder.hemoCubeTestData?.let {
-                    currentDeviceData?.coefficients?.let { coefficients ->
-                        val coefficient1 = coefficients[0]
-                        val coefficient2 = coefficients[1]
-                        val result = coefficient1 * coefficient2
+//                if (isNetworkAvailable) {
+                    // Online mode
+                    DataHolder.hemoCubeTestData?.let {
+                        currentDeviceData?.coefficients?.let { coefficients ->
+                            val coefficient1 = coefficients[0]
+                            val coefficient2 = coefficients[1]
+                            val result = coefficient1 * coefficient2
+                            // Process result in online mode
+                        }
                     }
-                }
+//                } else {
+//                    // Offline mode
+//                    val coefficient1 = Constants.COEFFICIENTS[deviceSerialNo]?.get(0)?.get(0).toString().toDoubleOrNull() ?: 0.0
+//                    val coefficient2 = Constants.COEFFICIENTS[deviceSerialNo]?.get(1)?.get(0).toString().toDoubleOrNull() ?: 0.0
+//                    val result = coefficient1 * coefficient2
+//
+//                    // Process result in offline mode
+//                }
+
                 isOnline = isNetworkAvailable
             }
         }
@@ -174,48 +144,51 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
         }
+//        startListening.observe(viewLifecycleOwner) {
+//            if (it) {
+//                lifecycleScope.launch {
+//                    delay(1000)
+//                    if (binding.tvSubtitle4.text.toString().isEmpty()) {
+//                        (activity as HemocubeActivity).reconnectDevice()
+//                        if (isBufferValueAvailable()) {
+//                            showBufferAlertDialog()
+//                        } else {
+//                            listenToHemoCube()
+//                            startBufferProcess()
+//                        }
+//                    }
+//                }
+//            }
+//        }
     }
 
     private fun checkAndStartProcess() {
-        startBufferProcess()
+        if (isBufferValueAvailable()) {
+            showBufferAlertDialog()
+        } else {
+            listenToHemoCube()
+            startBufferProcess()
+        }
     }
 
     private fun isBufferValueAvailable(): Boolean {
-        return try {
-            if (sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_1, ""
-                ) != "" && sharedPreferences.getString(Constants.BUFFER_VALUE_2, "") != ""
-                && sharedPreferences.getString(Constants.BUFFER_VALUE_3, "") != ""
-                && sharedPreferences.getString(Constants.BUFFER_VALUE_4, "") != ""
-            ) {
-                sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")
-                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_2,
-                    ""
-                )
-                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_3,
-                    ""
-                )
-                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_4,
-                    ""
-                )
-                    ?.toDouble()!! > 0.0
-            } else {
-                false
-            }
-        } catch (e: Exception) {
-            showToast(R.string.error_exist)
+        return if (sharedPreferences.getString(
+                Constants.BUFFER_VALUE_1, ""
+            ) != "" && sharedPreferences.getString(Constants.BUFFER_VALUE_2, "") != ""
+        ) {
+            sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")
+                ?.toDouble()!! > 0.0 && sharedPreferences.getString(Constants.BUFFER_VALUE_2, "")
+                ?.toDouble()!! > 0.0
+        } else {
             false
         }
     }
 
     private fun showBufferAlertDialog() {
         val title = "WARNING"
-        val message = getString(R.string.do_exist)
+        val message = "Do you want to continue with existing buffer?"
         val negativeText = getString(R.string.no)
-        val positiveText = getString(R.string.yes)
+        val positiveText = "Yes"
 
         UIUtils.createAlertDialog(requireContext(),
             title,
@@ -224,15 +197,13 @@ class HemoCubeFragment : Fragment() {
             positiveText,
             object : MyDialogListener {
                 override fun onClickNegativeButton() {
+                    listenToHemoCube()
                     startBufferProcess()
                 }
 
                 override fun onClickPositiveButton() {
-                    activity?.runOnUiThread {
-                        binding.btnPlacebuffer.visibility = View.GONE
-                        binding.btnSamplestart.visibility = View.VISIBLE
-                        binding.tvSubtitle4.text = getString(R.string.place_sample)
-                    }
+                    listenToHemoCube()
+                    startSampleProcess()
                     isUsingExistingBuffer = true
                 }
             })
@@ -263,123 +234,47 @@ class HemoCubeFragment : Fragment() {
                 }
             })
         } catch (e: Exception) {
-            showToast(R.string.test_ongoing)
+            showToast("test is going on")
             Firebase.crashlytics.recordException(e)
         }
     }
 
-    private fun getDeviceInfo() {
-        hemoCubeViewModel.progressBar.postValue(true)
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.getDeviceId,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        hemoCubeViewModel.messages.postValue(stringData)
-                        binding.tvSubtitle4.text = stringData
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hemoCubeViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
     private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
         if (stringData.contains("#")) {
+            hemoCubeViewModel.messages.postValue(stringData)
             isTestOngoing = true
         }
 
         resultData += stringData
 
         when {
-            stringData.contains("SN") -> {
-                val slData = stringData.split(" ")
-                if (slData.size > 1) {
-                    val hardwareId = slData[1].trim()
-                    deviceHardwareId = hardwareId
-                    with(sharedPreferences.edit()) {
-                        putString(Constants.DEVICE_ID, hardwareId)
-                        apply()
-                    }
-                }
-                activity?.runOnUiThread {
-                    binding.btnPlacebuffer.visibility = View.VISIBLE
-                }
-                hemoCubeViewModel.messages.postValue(getString(R.string.start))
-            }
-
-            stringData.contains("#BS") -> {
-                hemoCubeViewModel.messages.postValue(getString(R.string.buffer_started))
-            }
-
-            stringData.contains("#BC") -> {
-                activity?.runOnUiThread {
-                    binding.tvSubtitle4.text = getString(R.string.buffer_completed)
-                    binding.btnSamplestart.visibility = View.VISIBLE
-                }
-            }
-
-            stringData.contains("#SS") -> {
-                activity?.runOnUiThread {
-                    binding.tvSubtitle4.text = getString(R.string.sample_started)
-                    binding.btnSamplestart.visibility = View.GONE
-                }
-            }
-
-            stringData.contains("#SC") -> {
-                hemoCubeViewModel.messages.postValue(
-                    getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data))
+            stringData.contains("#Buffer Completed") -> showStartSampleDialog()
+            stringData.contains("#Sample Completed") -> {
                 fetchResult()
                 testingTrace.stop()
             }
 
-            resultData.contains("REND") -> {
-                hemoCubeViewModel.messages.postValue(
-                    getString(R.string.data_collected_processing_data)
-                )
-                val resultLines = resultData.split("\\s+(?=LB|LS)".toRegex())
-                var bufferIntensity = resultLines[1].split(' ')[1].trim()
-                led1BufferForDevice = if (isUsingExistingBuffer) {
-                    sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")?.toDoubleOrNull()!!
+            stringData.contains("RESULT") || resultData.contains("REND") -> {
+                var validString: String
+                val results: List<String>
+                if (stringData.contains("RESULT")) {
+                    validString = isValidResult(stringData)
+                    if (validString.isEmpty()) {
+                        results = resultData.split("\n")
+                        validString = parseResult(results)
+                    }
                 } else {
-                    bufferIntensity.toDoubleOrNull()!!
+                    results = resultData.split("\n")
+                    validString = parseResult(results)
                 }
-                bufferIntensity = resultLines[2].split(' ')[1].trim()
-                led2BufferForDevice = if (isUsingExistingBuffer) {
-                    sharedPreferences.getString(Constants.BUFFER_VALUE_2, "")?.toDoubleOrNull()!!
-                } else {
-                    bufferIntensity.toDoubleOrNull()!!
+                if (validString.isNotEmpty()) {
+                    handleValidResult(validString, resultData)
                 }
-                bufferIntensity = resultLines[3].split(' ')[1].trim()
-                led3BufferForDevice = if (isUsingExistingBuffer) {
-                    sharedPreferences.getString(Constants.BUFFER_VALUE_3, "")?.toDoubleOrNull()!!
-                } else {
-                    bufferIntensity.toDoubleOrNull()!!
-                }
-                bufferIntensity = resultLines[4].split(' ')[1].trim()
-                led4BufferForDevice = if (isUsingExistingBuffer) {
-                    sharedPreferences.getString(Constants.BUFFER_VALUE_4, "")?.toDoubleOrNull()!!
-                } else {
-                    bufferIntensity.toDoubleOrNull()!!
-                }
-
-                var sampleIntensity = resultLines[5].split(' ')[1].trim()
-                led1SampleForDevice = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
-                sampleIntensity = resultLines[6].split(' ')[1].trim()
-                led2SampleForDevice = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
-                sampleIntensity = resultLines[7].split(' ')[1].trim()
-                led3SampleForDevice = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                sampleIntensity = resultLines[8].split(' ')[1].split('\r')[0].trim()
-                led4SampleForDevice =
-                    resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
-                processResult()
             }
         }
     }
 
+
     private fun showError() {
         activity?.runOnUiThread {
             UIUtils.createAlertDialog(requireContext(),
@@ -402,248 +297,166 @@ class HemoCubeFragment : Fragment() {
             // If the test is ongoing, don't allow the back button action
             // You can optionally show a message to the user indicating why the back button is disabled
             // For example, show a Toast or Snackbar.
-            showToast(R.string.test_go_noback)
+            showToast("Test is ongoing. Cannot go back.")
         } else {
             // If the test is not ongoing, you can trigger the back action of the hosting activity
             activity?.onBackPressed()
         }
     }
 
-    private fun processResult() {
+    private fun showStartSampleDialog() {
+        activity?.runOnUiThread {
+            UIUtils.createAlertDialog(requireContext(),
+                "Start Sample",
+                "Do you want to start sample reading?",
+                getString(R.string.no),
+                "Yes",
+                object : MyDialogListener {
+                    override fun onClickNegativeButton() {}
+
+                    override fun onClickPositiveButton() {
+                        listenToHemoCube()
+                        startSampleProcess()
+                    }
+                })
+        }
+    }
+
+    fun handleValidResult(validString: String, fullReadOutput: String) {
         try {
-            hemoCubeViewModel.messages.postValue(getString(R.string.processing_result))
+            val result = validString.split(" ")
             val deviceLog = resultData
-
-            val pInfo = requireActivity().packageManager.getPackageInfo(
-                requireActivity().packageName, 0
-            )
-            val version = pInfo.versionName
-
-            val led1Average = log10(led1BufferForDevice.div(led1SampleForDevice))
-            val led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
-            val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
-            val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
-            val deviceRatio = led3Average / led1Average
-
-            if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
-                    ?.get(0)!!
-                || led2BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    1
-                )?.get(0)!!
-                || led3BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    2
-                )?.get(0)!!
-                || led4BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    3
-                )?.get(0)!!
-            ) {
-                validationError = true
-                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
-                }
-            }
-
-            if (led1BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
-                    ?.get(1)!!
-                || led2BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    1
-                )?.get(1)!!
-                || led3BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    2
-                )?.get(1)!!
-                || led4BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    3
-                )?.get(1)!!
-            ) {
-                validationError = true
-                allErrorMessages += "Error: Invalid Test. Improper buffer reading (high)" + "\n"
-                activity?.runOnUiThread {
-                    binding.errorMessage.text =
-                        getString(R.string.error_improper_buffer_high)
-                    binding.errorMessage.visibility = View.VISIBLE
-                    binding.btnSubmit.isEnabled = true
-                    binding.btnSubmit.isClickable = true
-                }
-            }
-
-            var gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(0)?.get(0)
-            var constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(0)?.get(1)
-            fittedAbs1 = gradient?.times(led1Average)?.plus(constant!!)!!
-
-            gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(1)?.get(0)
-            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(1)?.get(1)
-            fittedAbs2 = gradient?.times(led2Average)?.plus(constant!!)!!
-
-            gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(2)?.get(0)
-            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(2)?.get(1)
-            fittedAbs3 = gradient?.times(led3Average)?.plus(constant!!)!!
-
-            gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(3)?.get(0)
-            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(3)?.get(1)
-            fittedAbs4 = gradient?.times(led4Average)?.plus(constant!!)!!
-
-            _predictedDenovixRatio = fittedAbs3.div(fittedAbs1)
-
-            if (fittedAbs1 <= fittedAbs2) {
-                validationError = true
-                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
-                }
-            }
-
-            if (fittedAbs1 < 0 || fittedAbs2 < 0 || fittedAbs3 < 0 || fittedAbs4 < 0) {
-                validationError = true
-                activity?.runOnUiThread {
-                    binding.errorMessage.text = getString(R.string.error_negative_abs)
-                    binding.errorMessage.visibility = View.VISIBLE
-                }
-            }
-
-            if (fittedAbs3 < 0.1) {
-                validationError = true
-                allErrorMessages += "Error: Low Hb. Repeat test" + "\n"
-                activity?.runOnUiThread {
-                    binding.errorMessage.text = "Error: Low Hb. Repeat test"
-                    binding.errorMessage.visibility = View.VISIBLE
-                }
-            }
-
-            DataHolder.hemoCubeTestData?.apply {
-                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()
-                led1Buffer = led1BufferForDevice
-                led2Buffer = led2BufferForDevice
-                led3Buffer = led3BufferForDevice
-                led4Buffer = led4BufferForDevice
-                appVersion = version
-                this.led1Sample = led1SampleForDevice
-                this.led2Sample = led2SampleForDevice
-                this.led3Sample = led3SampleForDevice
-                this.led4Sample = led4SampleForDevice
-                this.led1Average = led1Average
-                this.led2Average = led2Average
-                this.led3Average = led3Average
-                this.led4Average = led4Average
-                this.abs1 = fittedAbs1
-                this.abs2 = fittedAbs2
-                this.abs3 = fittedAbs3
-                this.abs4 = fittedAbs4
-                this.deviceRatio = deviceRatio
-                this.calculatedRatio = calculateRatio(deviceRatio)
-                this.predictedDenovixRatio = _predictedDenovixRatio
-                this.coefficients = currentDeviceData?.coefficients?.get(0)
-                    .toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
-                this.classificationResult = findResult(calculatedRatio)
-                this.prdClassification = absorbanceBasedClassification(predictedDenovixRatio)
-                hemoCubeViewModel.messages.postValue(this.prdClassification)
-                this.errorMessages = allErrorMessages
-                this.resultData = deviceLog
-                this.batteryLevel = hemoCubeViewModel.getBatteryLevel().toString()
-                this.batteryCapacity =
-                    hemoCubeViewModel.getBatteryCapacity(requireContext()).toString()
-                this.batteryMaxCapacity =
-                    hemoCubeViewModel.getBatteryMaxCapacity(requireContext()).toString()
-                this.batteryTemperature = hemoCubeViewModel.getBatteryTemperature().toString()
-                this.batteryVoltage =
-                    hemoCubeViewModel.getBatteryVoltage(requireContext()).toString()
-            }
-
-            if (!isUsingExistingBuffer) {
+            if (result.size == 8) {
+                val deviceSerialNo = result[2]
                 with(sharedPreferences.edit()) {
-                    putString(Constants.BUFFER_VALUE_1, led1BufferForDevice.toString())
-                    putString(Constants.BUFFER_VALUE_2, led2BufferForDevice.toString())
-                    putString(Constants.BUFFER_VALUE_3, led3BufferForDevice.toString())
-                    putString(Constants.BUFFER_VALUE_4, led4BufferForDevice.toString())
+                    putString(Constants.DEVICE_ID, deviceSerialNo)
                     apply()
                 }
-            }
+                val loginId = sharedPreferences.getString(Constants.USER_ID, "").toString()
+                if (checkDeviceIdMismatch(deviceSerialNo, loginId)) {
+                    activity?.runOnUiThread {
+                        binding.errorMessage.text = "Warning: Login Id is different"
+                        binding.errorMessage.visibility = View.VISIBLE
+                    }
+                }
+                val led1BufferForDevice = if (isUsingExistingBuffer) {
+                    sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")?.toDoubleOrNull()
+                } else {
+                    result[3].toDoubleOrNull()
+                }
+                val led2BufferForDevice = if (isUsingExistingBuffer) {
+                    sharedPreferences.getString(Constants.BUFFER_VALUE_2, "")?.toDoubleOrNull()
+                } else {
+                    result[4].toDoubleOrNull()
+                }
+                val pInfo = requireActivity().packageManager.getPackageInfo(
+                    requireActivity().packageName, 0
+                )
+                val version = pInfo.versionName
+                val led1Sample = result[5].toDoubleOrNull()
+                val led2Sample = result[6].toDoubleOrNull()
+                val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0)
+                val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0)
+                val deviceRatio = led1Average / led2Average
+                val coefficientsList = Constants.COEFFICIENTS[deviceSerialNo]
+//                if (coefficientsList != null) {
+                val coefficient1 = coefficientsList?.get(0)?.get(0).toString()
+                val coefficient2 = coefficientsList?.get(1)?.get(0).toString()
+                val coefficientsString = "$coefficient1,$coefficient2"
 
-//            if (!validationError) {
-            activity?.runOnUiThread {
-                binding.btnSubmit.visibility = View.VISIBLE
-                binding.btnSubmit.isEnabled = true
-                binding.btnSubmit.isClickable = true
-                binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
+//                if (led1BufferForDevice!! > 20000 && led1BufferForDevice < 24000 && led2BufferForDevice!! > 20000 && led2BufferForDevice < 24000) {
+//                    if (led1Sample!! < led1BufferForDevice && led1Sample < 24000 && led2Sample!! < led2BufferForDevice && led2Sample < 24000) {
+//                        if (deviceRatio < 0.08) {
+//                            if (deviceRatio > 1.07) {
+//
+//                            }
+//                        }
+//                    }
+//                }
+
+                if (led1Average < 0 || led2Average < 0) {
+                    activity?.runOnUiThread{
+                        binding.errorMessage.text = "Warning: Negative Abs. Retake Blank Reading"
+                        binding.errorMessage.visibility = View.VISIBLE
+                    }
+                }
+
+                DataHolder.hemoCubeTestData?.apply {
+                    deviceId = deviceSerialNo
+                    led1Buffer = led1BufferForDevice
+                    led2Buffer = led2BufferForDevice
+                    appVersion = version
+                    this.led1Sample = led1Sample
+                    this.led2Sample = led2Sample
+                    this.led1Average = led1Average
+                    this.led2Average = led2Average
+                    this.deviceRatio = deviceRatio
+                    this.calculatedRatio = calculateRatio(deviceRatio)
+//                    this.coefficients = currentDeviceData?.coefficients?.get(0).toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
+                    this.coefficients = coefficientsString
+                    this.classificationResult = findResult(calculatedRatio)
+                    hemoCubeViewModel.messages.postValue(this.classificationResult)
+                    this.resultData = deviceLog
+                    if (!isUsingExistingBuffer) {
+                        with(sharedPreferences.edit()) {
+                            putString(Constants.BUFFER_VALUE_1, led1Buffer.toString())
+                            putString(Constants.BUFFER_VALUE_2, led2Buffer.toString())
+                            apply()
+                        }
+                    }
+                    activity?.runOnUiThread {
+                        binding.btnSubmit.visibility = View.VISIBLE
+                        binding.btnSubmit.isEnabled = true
+                        binding.btnSubmit.isClickable = true
+                        binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
+                    }
+                }
             }
-//            }
         } catch (e: Exception) {
             Toast.makeText(
                 requireContext(),
-                R.string.error_processing_device_data,
+                "Error while processing device data",
                 Toast.LENGTH_SHORT
             ).show()
             Firebase.crashlytics.recordException(e)
         }
     }
 
-    fun findResult(calculatedRatio: Double?): String {
+    private fun findResult(calculatedRatio: Double?): String {
         try {
-            hemoCubeViewModel.messages.postValue("result classification")
             if (calculatedRatio != null) {
                 if (calculatedRatio < 0.05)
-                    return getString(R.string.error_repeat_test_higher_volume)
+                    return "Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume"
                 if (calculatedRatio in 0.05..0.155)
-                    return getString(R.string.normal)
+                    return "Normal"
                 if (calculatedRatio in 0.155..0.175)
-                    return getString(R.string.negative_borderline)
+                    return "Negative Borderline. Repeat Test"
                 if (calculatedRatio in 0.175..0.22)
-                    return getString(R.string.sickle_cell_trait)
+                    return "Sickle Cell Trait"
                 if (calculatedRatio in 0.22..0.25)
-                    return getString(R.string.positive_for_sickle_cell)
+                    return "Positive for Sickle Cell. HPLC for Confirmation"
                 if (calculatedRatio in 0.25..0.35)
-                    return getString(R.string.sickle_cell_disease)
+                    return "Sickle Cell Disease"
                 if (calculatedRatio > 0.35)
-                    return getString(R.string.error_repeat_test_lower_volume)
+                    return "Inconclusive. Repeat with test with lower volume of blood"
             } else {
-                return getString(R.string.invalid)
+                return "NULL"
             }
         } catch (e: Exception) {
-            showToast(R.string.error_classification)
+            showToast("error while performing classification")
             Firebase.crashlytics.recordException(e)
-            return getString(R.string.error)
+            return "ERROR"
         }
-        return getString(R.string.invalid)
+        return "NULL"
     }
 
-    private fun absorbanceBasedClassification(predictedDenovixRatio: Double?): String {
-        try {
-            hemoCubeViewModel.messages.postValue("result classification")
-            if (predictedDenovixRatio != null) {
-                if (predictedDenovixRatio in 0.0..0.16)
-                    return getString(R.string.normal)
-                if (predictedDenovixRatio in 0.16..0.165)
-                    return getString(R.string.negative_borderline)
-                if (predictedDenovixRatio in 0.165..0.235)
-                    return getString(R.string.sickle_cell_trait)
-                if (predictedDenovixRatio in 0.235..0.24)
-                    return getString(R.string.positive_borderline)
-                if (predictedDenovixRatio in 0.24..1.0)
-                    return getString(R.string.sickle_cell_disease)
-            } else {
-                return getString(R.string.invalid)
-            }
-        } catch (e: Exception) {
-            showToast(R.string.error_classification)
-            Firebase.crashlytics.recordException(e)
-            return getString(R.string.error)
-        }
-        return getString(R.string.invalid)
-    }
-
-    private fun showToast(messageResId: Int) {
-        Toast.makeText(requireContext(), getString(messageResId), Toast.LENGTH_SHORT).show()
+    private fun showToast(message: String) {
+        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
     }
 
     private fun startBufferProcess() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        activity?.runOnUiThread {
-            binding.btnPlacebuffer.visibility = View.GONE
-        }
-
         (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startBuffer,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
@@ -682,14 +495,38 @@ class HemoCubeFragment : Fragment() {
     }
 
     private fun calculateRatio(ratio: Double): Double {
-        val coefficient1 = currentDeviceData?.coefficients?.get(0) ?: 0.0
-        val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 0.0
+        val coefficient1: Double = (Constants.COEFFICIENTS[deviceSerialNo]?.get(0) ?: 0.0) as Double
+        val coefficient2: Double = (Constants.COEFFICIENTS[deviceSerialNo]?.get(1) ?: 0.0) as Double
         return coefficient1 * ratio + coefficient2
     }
 
+
+    private fun parseResult(frames: List<String>): String {
+        val lines = mutableListOf<String>()
+        for (frame in frames.reversed()) {
+            if (frame.contains("REND") || frame.contains("RESULT")) lines += frame
+            if (frame.contains("RESULT")) {
+                break
+            }
+        }
+        val line = lines.reversed().joinToString("").trim()
+        if (line.contains("RESULT") && line.split(" ").size == 8) {
+            return line
+        }
+        return ""
+    }
+
+    private fun isValidResult(line: String): String {
+        return if (line.contains("RESULT") && line.split(" ").size == 8) {
+            line
+        } else {
+            ""
+        }
+    }
+
     private fun checkDeviceIdMismatch(deviceId: String, loginId: String): Boolean {
         if (!deviceId.isNullOrEmpty() && !loginId.isNullOrEmpty() && deviceId.last() != loginId.last())
             return true
         return false
     }
-}
+}

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt

@@ -166,6 +166,8 @@ class HemoCubeViewModel @Inject constructor(
                             fireBaseUpload.postValue("Error")
                             hemoCubeDao.insertAll(testDetails)
                         }
+
+                        else -> {}
                     }
                 } catch (e: Exception) {
                     Log.e("Testdb", "Exception during data upload: ${e.message}")
@@ -190,6 +192,8 @@ class HemoCubeViewModel @Inject constructor(
                             Log.e("Testdb", "Error uploading data to Firestore: $response")
                             fireBaseUpload.postValue("Error")
                         }
+
+                        else -> {}
                     }
                 } catch (e: Exception) {
                     Log.e("Testdb", "Exception during data upload: ${e.message}")

app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt

@@ -34,7 +34,7 @@ class UsbService : Service() {
     fun connect(driver: UsbSerialDriver, connection: UsbDeviceConnection) {
         mPort = driver.ports[0] // Most devices have just one port (port 0)
         mPort.open(connection)
-        mPort.setParameters(9600, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
+        mPort.setParameters(115200, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
         isUsbConnected = true
         Log.d(TAG, "My Usb Connected ${mPort.driver}")
 

app/src/main/res/layout/fragment_hemo_cube_reference.xml

@@ -31,17 +31,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title" />
 
-<!--        <TextView-->
-<!--            android:id="@+id/tv_subtitle3"-->
-<!--            style="@style/title2"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginHorizontal="24dp"-->
-<!--            android:layout_marginTop="16dp"-->
-<!--            android:text="@string/step5"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->
+        <!--        <TextView-->
+        <!--            android:id="@+id/tv_subtitle3"-->
+        <!--            style="@style/title2"-->
+        <!--            android:layout_width="0dp"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginHorizontal="24dp"-->
+        <!--            android:layout_marginTop="16dp"-->
+        <!--            android:text="@string/step5"-->
+        <!--            app:layout_constraintEnd_toEndOf="parent"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->
 
         <TextView
             android:id="@+id/tv_name"
@@ -147,35 +147,8 @@
             app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toEndOf="@id/et_abha_id"
             app:layout_constraintTop_toTopOf="@id/et_abha_id" />
-        <Button
-            android:visibility="gone"
-            android:id="@+id/btn_samplestart"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/Start_Sample"
-            android:textColor="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_placebuffer" />
 
 
-
-        <Button
-            android:id="@+id/btn_placebuffer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/place_buffer"
-            android:textColor="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
-
         <Button
             android:visibility="gone"
             android:id="@+id/btn_submit"
@@ -205,19 +178,62 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btn_submit" />
 
-        <Button
-            android:visibility="gone"
-            android:id="@+id/btn_digitalCard"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="DigitalCard View"
-            android:textColor="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/error_message" />
+        <!--        <com.google.android.material.textfield.TextInputLayout-->
+        <!--            android:id="@+id/til_blood_group"-->
+        <!--            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginHorizontal="24dp"-->
+        <!--            android:layout_marginTop="16dp"-->
+        <!--            app:layout_constraintEnd_toEndOf="parent"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4">-->
+
+        <!--            <AutoCompleteTextView-->
+        <!--                android:id="@+id/et_blood_group"-->
+        <!--                android:layout_width="match_parent"-->
+        <!--                android:layout_height="wrap_content"-->
+        <!--                android:hint="@string/select_blood_group"-->
+        <!--                android:inputType="none"-->
+        <!--                android:labelFor="@id/til_blood_group"-->
+        <!--                app:simpleItems="@array/blood_group" />-->
+
+        <!--        </com.google.android.material.textfield.TextInputLayout>-->
+
+        <!--        <Button-->
+        <!--            android:id="@+id/btn_kit"-->
+        <!--            android:layout_width="wrap_content"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_margin="10dp"-->
+        <!--            android:text="@string/new_kit"-->
+        <!--            android:textColor="@color/white"-->
+        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--            app:layout_constraintEnd_toEndOf="parent"-->
+        <!--            app:layout_constraintStart_toStartOf="parent" />-->
+
+        <!--        <Button-->
+        <!--            android:id="@+id/btn_buffer"-->
+        <!--            android:layout_width="wrap_content"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:text="@string/new_buffer"-->
+        <!--            android:textColor="@color/white"-->
+        <!--            android:layout_margin="10dp"-->
+        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintEnd_toStartOf="@id/btn_kit"/>-->
+
+        <!--        <Button-->
+        <!--            android:id="@+id/btn_read"-->
+        <!--            android:layout_width="wrap_content"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:text="@string/read"-->
+        <!--            android:layout_margin="16dp"-->
+        <!--            android:clickable="false"-->
+        <!--            app:layout_constraintTop_toBottomOf="@id/btn_set_reference"-->
+        <!--            app:layout_constraintStart_toStartOf="parent" />-->
+
+        <!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
+
         <ProgressBar
             android:id="@+id/progressBar"
             android:layout_width="wrap_content"
@@ -233,5 +249,5 @@
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-    </layout>
+</layout>
 

app/src/main/res/layout/offline_user_list_view.xml

@@ -48,6 +48,20 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/userID"
                 tools:text="UserID: MohamedKaif" />
+            <TextView
+                android:id="@+id/teststatus"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                style="@style/title1_1"
+                android:layout_marginTop="4dp"
+                android:layout_marginStart="16dp"
+                android:gravity="start"
+                android:textColor="@color/black"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/bloodGroup"
+                tools:text="Test Status: Completed"/>
 
             <TextView
                 android:id="@+id/time"
@@ -61,9 +75,8 @@
                 android:textSize="14sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/bloodGroup"
-                tools:text="Test Status: Completed" />
-
+                app:layout_constraintTop_toBottomOf="@id/teststatus"
+                tools:text="startedAt: yyyy-MM-dd HH:mm:ss" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>