digital card fragment coding is finished, testing is pending

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

app/build.gradle

@@ -71,16 +71,15 @@ dependencies {
     implementation 'com.google.android.gms:play-services-location:21.0.1'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
     implementation 'com.google.android.things:androidthings:1.0'
-    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta11'
-    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta11")
+    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta10'
+    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta10")
 
 
     // Testing
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    testImplementation 'org.mockito:mockito-core:3.12.0'
-    testImplementation "androidx.arch.core:core-testing:2.2.0"
+
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
     implementation 'com.opencsv:opencsv:4.6'

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

@@ -61,6 +61,8 @@ object Constants {
         "HC-V1-018",
         "HC-V1-019",
         "HC-V1-020",
+        "HCV-000-3001",
+        "HCV-000-3002",
     )
 
     const val password = "SMI@12345"
@@ -69,5 +71,7 @@ object Constants {
     const val KIT_COUNT = "KitCount"
     const val BUFFER_VALUE_1 = "BufferValue1"
     const val BUFFER_VALUE_2 = "BufferValue2"
+    const val BUFFER_VALUE_3 = "BufferValue3"
+    const val BUFFER_VALUE_4 = "BufferValue4"
     const val DEVICE_ID = "DEVICE_ID"
 }

app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt

@@ -11,7 +11,7 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.google.android.datatransport.runtime.dagger.Provides
 import javax.inject.Singleton
 
-@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 3, exportSchema = false)
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 6, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao

app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt

@@ -9,12 +9,16 @@ data class HemoCubeTestData(
     var _id: String = "",
     var name: String = "",
     var birthYear: String = "",
+    var state: String = "",
+    var abhaId: String = "",
+    var bloodGroup: String = "",
     var userImageURL: String = "",
     var location: UserData.Location? = null,
     var reportUploadTime: String? = "",
     var testType: String? = "HEMOCUBE",
     var testTime: String? = "",
     var testStatus: Boolean? = false,
+    var gender: String = "",
     var localFlag: Boolean = false,
     var deviceId: String? = "",
     var appVersion:String? = "",
@@ -24,10 +28,16 @@ data class HemoCubeTestData(
     var resultData: String = "",
     var led1Buffer: Double? = null,
     var led2Buffer: Double? = null,
+    var led3Buffer: Double? = null,
+    var led4Buffer: Double? = null,
     var led1Sample: Double? = null,
     var led2Sample: Double? = null,
+    var led3Sample: Double? = null,
+    var led4Sample: Double? = null,
     var led1Average: Double? = null,
     var led2Average: Double? = null,
+    var led3Average: Double? = null,
+    var led4Average: Double? = null,
     var deviceRatio: Double? = null,
     var calculatedRatio: Double? = null,
     var coefficients: String? = "",

app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt

@@ -11,7 +11,9 @@ data class UserData(
     var name: String = "",
     var incubationTime: String = "",
     var birthYear: String = "",
+    var abhaId: String = "",
     var userImageURL: String = "",
+    var gender: String ="",
     var location: Location? = null,
     var createdBy: String? = "",
     var reportUploadTime: String? = "",
@@ -19,6 +21,7 @@ data class UserData(
     var testStatus: Boolean? = false,
     var mobileId: String = "",
     var deviceId: String = "",
+    var state: String = "",
     var deviceSerialNumber: String = "",
     var kitSerial: String = "",
     var csvPath: String = "",
@@ -44,5 +47,6 @@ fun UserData.toHemoCubeTestData() = HemoCubeTestData(
     birthYear = birthYear,
     userImageURL = userImageURL,
     testStatus = testStatus,
-    location = location
+    location = location,
+    gender = gender
 )

app/src/main/java/com/example/hpostesting/data/model/test/ViewModelModule.kt

@@ -1,29 +0,0 @@
-package com.example.hpostesting.di
-
-import android.content.Context
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.data.dao.UserDao
-import com.example.hpostesting.domain.SaveRawData
-import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.presentation.testRight.TestRightViewModel
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ViewModelComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
-
-@Module
-@InstallIn(ViewModelComponent::class)
-object ViewModelModule {
-
-    @Provides
-    fun provideTestRightViewModel(
-        saveRawData: SaveRawData,
-        saveRawDataTest: SaveRawDataTest,
-        databaseRepository: DatabaseRepository,
-        userDao: UserDao,
-        context: Context
-    ): TestRightViewModel {
-        return TestRightViewModel(saveRawData, saveRawDataTest, databaseRepository, userDao, context)
-    }
-}

app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt

@@ -138,8 +138,4 @@ class DatabaseRepository : Repository {
         // Find the DeviceData object with the specified deviceId
         return allDeviceDataList.find { it.deviceId == deviceId }
     }
-
-    override fun <UserData> addTestToDatabase(testDetails: UserData): Any {
-        TODO("Not yet implemented")
-    }
 }

app/src/main/java/com/example/hpostesting/data/repository/Repository.kt

@@ -1,6 +1,5 @@
 package com.example.hpostesting.data.repository
 
 interface Repository {
-    abstract fun <UserData> addTestToDatabase(testDetails: UserData): Any
 //    suspend fun addToDatabase(data: PatientDetails)
 }

app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt

@@ -11,7 +11,6 @@ import androidx.appcompat.app.AppCompatActivity
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import com.example.hpostesting.presentation.testRight.TestRightActivity
 import com.google.android.material.snackbar.Snackbar

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

@@ -40,7 +40,7 @@ import java.util.Locale
 class HomeFragment : Fragment() {
     private var _binding: FragmentHomeBinding? = null
     private val binding get() = _binding!!
-    private val viewModel: TestRightViewModel<Any?> by activityViewModels()
+    private val viewModel: TestRightViewModel by activityViewModels()
     private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
     private lateinit var rvAdapter: UserListAdapter
     private var batLevel: Int = 0 // Initialize with a default value, or obtain the actual battery level

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

@@ -0,0 +1,61 @@
+package com.example.hpostesting.presentation.hemocube
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.model.patient.toHemoCubeTestData
+import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentDigitalCardBinding
+import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
+import java.text.SimpleDateFormat
+import java.util.Date
+
+class DigitalCardFragment : Fragment() {
+    private lateinit var binding: FragmentDigitalCardBinding
+    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private lateinit var sharedPreferences: SharedPreferences
+    val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+    ): View {
+        binding = FragmentDigitalCardBinding.inflate(inflater, container, false)
+        sharedPreferences =
+            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initViews()
+    }
+
+    private fun initViews() {
+        activity?.runOnUiThread {
+            binding.progressBar.visibility = View.VISIBLE
+        }
+        val originalDateStr = testDetails?.testTime
+        val originalDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+        val originalDate: Date? = originalDateFormat.parse(originalDateStr)
+        val desiredDateFormat = SimpleDateFormat("MMM dd, yyyy")
+        val formattedDate: String = originalDate?.let { desiredDateFormat.format(it) } ?: "N/A"
+        activity?.runOnUiThread {
+            binding.progressBar.visibility = View.GONE
+        }
+        binding.name.text = "Name: ${testDetails?.name}"
+        binding.dob.text = "DOB: ${testDetails?.birthYear}"
+        binding.gender.text = "gender: ${testDetails?.gender}"
+        binding.State.text = "state: ${testDetails?.state}"
+        binding.abhaid.text = "ABHA ID: ${testDetails?.abhaId}"
+        binding.blood.text = "Blood Group: ${testDetails?.bloodGroup}"
+        binding.sicklecell.text = "Sickle-Cell: ${testDetails?.classificationResult}"
+        binding.issueDate.text = "Issue Date: $formattedDate"
+    }
+}

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

@@ -20,6 +20,7 @@ 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.diagnostics.DiagnosticsActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import com.google.firebase.crashlytics.ktx.crashlytics
@@ -41,7 +42,15 @@ class HemoCubeFragment : Fragment() {
     private var isUsingExistingBuffer = false
     private var isTestOngoing = false
     private var startListening = MutableLiveData<Boolean>(false)
-    val testingTrace = Firebase.performance.newTrace("testing_trace")
+    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
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
@@ -55,8 +64,9 @@ class HemoCubeFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initViews()
+        listenToHemoCube()
+        getDeviceInfo()
         observeViewModel()
-        checkAndStartProcess()
     }
 
     private fun initViews() {
@@ -68,34 +78,58 @@ 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
         binding.nameEditText.visibility = View.GONE
         binding.tvTitle.visibility = View.GONE
         binding.btnGo.visibility = View.GONE
-        binding.btnSubmit.isEnabled = false
-        binding.btnSubmit.isClickable = false
-
+        binding.btnSubmit.isEnabled = true
+        binding.btnSubmit.isClickable = true
+        binding.btnPlacebuffer.visibility = View.GONE
 
         binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}"
-        Log.e("nametext", binding.tvName.text.toString())
+        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
+                }
+                checkAndStartProcess()
+            }
+            it.visibility = View.GONE
+        }
+
     }
 
     private fun observeViewModel() {
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 showToast("Test Results Uploaded Successfully")
-                val i = Intent(
-                    requireContext().applicationContext, DashboardActivity::class.java
-                )
-                startActivity(i)
-                (activity as HemocubeActivity).finish()
+
+                val digitalCardFragment = DigitalCardFragment()
+                val transaction = parentFragmentManager.beginTransaction()
+                transaction.replace(R.id.fragment_container, digitalCardFragment)
+                transaction.addToBackStack(null)
+                transaction.commit()
+
+//                val i = Intent(
+//                    requireContext().applicationContext, DashboardActivity::class.java
+//                )
+//                startActivity(i)
+//                (activity as HemocubeActivity).finish()
             }
             if (result == "Local") {
                 showToast("Internet not available, test details stored locally")
@@ -131,42 +165,39 @@ 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() {
-        if (isBufferValueAvailable()) {
-            showBufferAlertDialog()
-        } else {
-            listenToHemoCube()
-            startBufferProcess()
-        }
+        startBufferProcess()
     }
 
     private fun isBufferValueAvailable(): Boolean {
-        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 {
+        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("error while getting existing buffer")
             false
         }
     }
@@ -184,13 +215,15 @@ class HemoCubeFragment : Fragment() {
             positiveText,
             object : MyDialogListener {
                 override fun onClickNegativeButton() {
-                    listenToHemoCube()
                     startBufferProcess()
                 }
 
                 override fun onClickPositiveButton() {
-                    listenToHemoCube()
-                    startSampleProcess()
+                    activity?.runOnUiThread {
+                        binding.btnPlacebuffer.visibility = View.GONE
+                        binding.btnSamplestart.visibility = View.VISIBLE
+                        binding.tvSubtitle4.text = "Place Sample"
+                    }
                     isUsingExistingBuffer = true
                 }
             })
@@ -226,42 +259,112 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
+    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("#Buffer Completed") -> showStartSampleDialog()
-            stringData.contains("#Sample Completed") -> {
+            stringData.contains("SN") -> {
+                val slData = stringData.split(" ")
+                if (slData.size > 1) {
+                    val hardwareId = slData[1].trim()
+                    with(sharedPreferences.edit()) {
+                        putString(Constants.DEVICE_ID, hardwareId)
+                        apply()
+                    }
+                }
+                activity?.runOnUiThread {
+                    binding.btnPlacebuffer.visibility = View.VISIBLE
+                }
+                hemoCubeViewModel.messages.postValue("Start")
+            }
+
+            stringData.contains("#BS") -> {
+                hemoCubeViewModel.messages.postValue("Buffer Started")
+            }
+
+            stringData.contains("#BC") -> {
+                activity?.runOnUiThread {
+                    binding.tvSubtitle4.text = "Buffer Completed"
+                    binding.btnSamplestart.visibility = View.VISIBLE
+                }
+            }
+
+            stringData.contains("#SS") -> {
+                activity?.runOnUiThread {
+                    binding.tvSubtitle4.text = "Sample Started"
+                    binding.btnSamplestart.visibility = View.GONE
+                }
+            }
+
+            stringData.contains("#SC") -> {
+                binding.tvSubtitle4.text = "Sample Completed"
                 fetchResult()
                 testingTrace.stop()
             }
 
-            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)
-                    }
+            resultData.contains("REND") -> {
+                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()!!
                 } else {
-                    results = resultData.split("\n")
-                    validString = parseResult(results)
+                    bufferIntensity.toDoubleOrNull()!!
                 }
-                if (validString.isNotEmpty()) {
-                    handleValidResult(validString, resultData)
+                bufferIntensity = resultLines[2].split(' ')[1].trim()
+                led2BufferForDevice = if (isUsingExistingBuffer) {
+                    sharedPreferences.getString(Constants.BUFFER_VALUE_2, "")?.toDoubleOrNull()!!
+                } else {
+                    bufferIntensity.toDoubleOrNull()!!
                 }
+                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(),
@@ -291,106 +394,65 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
-    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) {
+    private fun processResult() {
         try {
-            val result = validString.split(" ")
             val deviceLog = resultData
-            if (result.size == 8) {
-                val deviceSerialNo = result[2]
-                with(sharedPreferences.edit()) {
-                    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
-//                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
+            val pInfo = requireActivity().packageManager.getPackageInfo(
+                requireActivity().packageName, 0
+            )
+            val version = pInfo.versionName
+
+            val led1Average = log10(led1BufferForDevice?.div(led1SampleForDevice!!) ?: 0.0)
+            val led2Average = log10(led2BufferForDevice?.div(led2SampleForDevice!!) ?: 0.0)
+            val led3Average = log10(led3BufferForDevice?.div(led3SampleForDevice!!) ?: 0.0)
+            val led4Average = log10(led4BufferForDevice?.div(led4SampleForDevice!!) ?: 0.0)
+            val deviceRatio = led1Average / led3Average
+
+            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 = 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.deviceRatio = deviceRatio
+                this.calculatedRatio = calculateRatio(deviceRatio)
+                this.coefficients = currentDeviceData?.coefficients?.get(0)
+                    .toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
+                this.classificationResult = findResult(calculatedRatio)
+                hemoCubeViewModel.messages.postValue(this.classificationResult)
+                this.resultData = deviceLog
+                if (!isUsingExistingBuffer) {
+                    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())
+                        apply()
                     }
                 }
-
-                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.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"))
                     }
-                }
+                    binding.btnSubmit.isEnabled = true
+                    binding.btnSubmit.isClickable = true
+                    binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
             }
         } catch (e: Exception) {
             Toast.makeText(
@@ -437,6 +499,10 @@ class HemoCubeFragment : Fragment() {
     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?) {}
@@ -480,29 +546,6 @@ class HemoCubeFragment : Fragment() {
         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

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

@@ -95,10 +95,16 @@ class HemoCubeViewModel @Inject constructor(
         testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
         testDetails?.led1Buffer = DataHolder.hemoCubeTestData?.led1Buffer
         testDetails?.led2Buffer = DataHolder.hemoCubeTestData?.led2Buffer
+        testDetails?.led3Buffer = DataHolder.hemoCubeTestData?.led3Buffer
+        testDetails?.led4Buffer = DataHolder.hemoCubeTestData?.led4Buffer
         testDetails?.led1Sample = DataHolder.hemoCubeTestData?.led1Sample
         testDetails?.led2Sample = DataHolder.hemoCubeTestData?.led2Sample
+        testDetails?.led3Sample = DataHolder.hemoCubeTestData?.led3Sample
+        testDetails?.led4Sample = DataHolder.hemoCubeTestData?.led4Sample
         testDetails?.led1Average = DataHolder.hemoCubeTestData?.led1Average
         testDetails?.led2Average = DataHolder.hemoCubeTestData?.led2Average
+        testDetails?.led3Average = DataHolder.hemoCubeTestData?.led3Average
+        testDetails?.led4Average = DataHolder.hemoCubeTestData?.led4Average
         testDetails?.deviceRatio = DataHolder.hemoCubeTestData?.deviceRatio
         testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio
         testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients

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

@@ -32,7 +32,7 @@ import `in`.sminnovations.hpostesting.databinding.ActivityTestRightBinding
 class TestRightActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityTestRightBinding
-    private val viewModel by viewModels<TestRightViewModel<Any?>>()
+    private val viewModel by viewModels<TestRightViewModel>()
     private var myMenu: Menu? = null
 
     private lateinit var mDriver: UsbSerialDriver

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

@@ -25,7 +25,7 @@ import `in`.sminnovations.hpostesting.databinding.FragmentTestRightExpReferenceB
 @AndroidEntryPoint
 class TestRightExpReference : Fragment() {
     private lateinit var binding: FragmentTestRightExpReferenceBinding
-    private val viewModel: TestRightViewModel<Any?> by activityViewModels()
+    private val viewModel: TestRightViewModel by activityViewModels()
     private val TAG = "TestRightExpReference"
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?

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

@@ -27,7 +27,7 @@ import `in`.sminnovations.hpostesting.databinding.FragmentTestRightExpSampleBind
 class TestRightExpSample : Fragment() {
 
     private lateinit var binding: FragmentTestRightExpSampleBinding
-    private val viewModel: TestRightViewModel<Any?> by activityViewModels()
+    private val viewModel: TestRightViewModel by activityViewModels()
 
     private val TAG = "TestRightExpSample"
 

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

@@ -32,7 +32,7 @@ import kotlinx.coroutines.withContext
 class TestRightResults : Fragment() {
 
     private lateinit var binding: FragmentTestRightResultsBinding
-    private val viewModel: TestRightViewModel<Any?> by activityViewModels()
+    private val viewModel: TestRightViewModel by activityViewModels()
     private lateinit var sharedPreference: SharedPreferences
 
     override fun onCreateView(

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

@@ -26,7 +26,6 @@ import com.example.hpostesting.domain.TestRightResultCalculation
 import com.example.hpostesting.util.MyUtils
 import com.google.firebase.storage.FirebaseStorage
 import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.scopes.ViewModelScoped
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import java.io.File
@@ -39,16 +38,14 @@ import kotlin.math.log10
 import kotlin.math.pow
 
 @HiltViewModel
-@ViewModelScoped
 class TestRightViewModel @Inject constructor(
     private val saveRawData: SaveRawData,
     private val saveRawDataTest: SaveRawDataTest,
     private val repository: DatabaseRepository,
     private val userDao: UserDao,
-    context: Context?
+    context: Context
 ) : ViewModel() {
 
-
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
 
@@ -57,10 +54,10 @@ class TestRightViewModel @Inject constructor(
 
     val fireBaseUpload = MutableLiveData<String>()
 
-    var testDetails = DataHolder.selectedTest
+    val testDetails = DataHolder.selectedTest
 
-    private val _networkStatusLiveData = context?.let { NetworkStatusLiveData(it) }
-    val networkStatusLiveData: NetworkStatusLiveData?
+    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    val networkStatusLiveData: LiveData<Boolean>
         get() = _networkStatusLiveData
 
     val allUserData = userDao.getAll()
@@ -442,7 +439,7 @@ class TestRightViewModel @Inject constructor(
                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
             ).format(Calendar.getInstance().time)
             when (repository.addTestToDatabase(testDetails)) {
-                is Response.Success<*> -> {
+                is Response.Success -> {
                     fireBaseUpload.postValue("Success")
                 }
 
@@ -451,45 +448,43 @@ class TestRightViewModel @Inject constructor(
         }
     }
 
-    fun uploadResultToDatabase(context: Context, isOnline: Boolean, deviceSerialNumber: String) =
-        viewModelScope.launch {
-            val csvFilePath = MyUtils.getAppFolderPath(context) + getCSVFileName()
-            val logTxtFilePath = MyUtils.getAppFolderPath(context) + getLogFileName()
-            testDetails?.csvPath = csvFilePath
-            testDetails?.reportPath = logTxtFilePath
-            testDetails?.deviceSerialNumber = deviceSerialNumber
-            if (isOnline) {
-                val storageRef = FirebaseStorage.getInstance().reference
-                val storageTestDetailsRef = storageRef.child("${testDetails?._id}/")
+    fun uploadResultToDatabase(context: Context, isOnline: Boolean,deviceSerialNumber: String) = viewModelScope.launch {
+        val csvFilePath = MyUtils.getAppFolderPath(context) + getCSVFileName()
+        val logTxtFilePath = MyUtils.getAppFolderPath(context) + getLogFileName()
+        testDetails?.csvPath = csvFilePath
+        testDetails?.reportPath = logTxtFilePath
+        testDetails?.deviceSerialNumber = deviceSerialNumber
+        if (isOnline) {
+            val storageRef = FirebaseStorage.getInstance().reference
+            val storageTestDetailsRef = storageRef.child("${testDetails?._id}/")
 
-                try {
-                    val csvFileUri = Uri.fromFile(File(csvFilePath))
-                    val logTxtFileUri = Uri.fromFile(File(logTxtFilePath))
+            try {
+                val csvFileUri = Uri.fromFile(File(csvFilePath))
+                val logTxtFileUri = Uri.fromFile(File(logTxtFilePath))
 
-                    val csvUploadTask =
-                        storageTestDetailsRef.child(csvFileUri.lastPathSegment!!)
-                            .putFile(csvFileUri)
-                            .await()
-                    val logUploadTask = storageTestDetailsRef.child(logTxtFileUri.lastPathSegment!!)
-                        .putFile(logTxtFileUri).await()
+                val csvUploadTask =
+                    storageTestDetailsRef.child(csvFileUri.lastPathSegment!!).putFile(csvFileUri)
+                        .await()
+                val logUploadTask = storageTestDetailsRef.child(logTxtFileUri.lastPathSegment!!)
+                    .putFile(logTxtFileUri).await()
 
-                    val csvUri = csvUploadTask.storage.downloadUrl.await().toString()
-                    val logUri = logUploadTask.storage.downloadUrl.await().toString()
-                    val serialNumber = Constants.STATICID.firstOrNull { it == deviceSerialNumber }
-                    testDetails?.csvPath = csvUri
-                    testDetails?.reportPath = logUri
+                val csvUri = csvUploadTask.storage.downloadUrl.await().toString()
+                val logUri = logUploadTask.storage.downloadUrl.await().toString()
+                val serialNumber = Constants.STATICID.firstOrNull { it == deviceSerialNumber }
+                testDetails?.csvPath = csvUri
+                testDetails?.reportPath = logUri
 
-                    addResultTestToDb()
-                } catch (exception: Exception) {
-                    // Handle the exception appropriately (e.g., log the error, display an error message)
-                }
-            } else {
-                testDetails?.testTime = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                ).format(Calendar.getInstance().time)
-                userDao.insertAll(testDetails!!)
+                addResultTestToDb()
+            } catch (exception: Exception) {
+                // Handle the exception appropriately (e.g., log the error, display an error message)
             }
+        } else {
+            testDetails?.testTime = SimpleDateFormat(
+                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+            ).format(Calendar.getInstance().time)
+            userDao.insertAll(testDetails!!)
         }
+    }
 
     fun bulkUploadResultToDatabase(userData: UserData) = viewModelScope.launch {
         val storageRef = FirebaseStorage.getInstance().reference
@@ -524,7 +519,7 @@ class TestRightViewModel @Inject constructor(
                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
             ).format(Calendar.getInstance().time)
             when (repository.addTestToDatabase(userData)) {
-                is Response.Success<*> -> {
+                is Response.Success -> {
                     fireBaseUpload.postValue("Success")
                 }
 

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(115200, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
+        mPort.setParameters(9600, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
         isUsbConnected = true
         Log.d(TAG, "My Usb Connected ${mPort.driver}")
 

app/src/main/res/drawable/person.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>

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

@@ -0,0 +1,243 @@
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.example.hpostesting.presentation.hemocube.DigitalCardFragment">
+
+<androidx.constraintlayout.widget.ConstraintLayout
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/fragment_container">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/userCard"
+        android:layout_width="match_parent"
+        android:layout_height="350dp"
+        android:layout_marginTop="24dp"
+        app:cardBackgroundColor="#C0C0C0"
+        app:cardCornerRadius="25dp"
+        app:cardElevation="0dp"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="22dp">
+
+            <ImageView
+                android:id="@+id/userImage"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:src="@drawable/karnataka" />
+
+            <ImageView
+                android:id="@+id/userName"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_marginStart="46dp"
+                app:layout_constraintTop_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/userImage"
+                app:layout_constraintTop_toTopOf="@+id/userImage"
+                tools:src="@drawable/sickle_cell_gov_logo"/>
+
+
+            <ImageView
+                android:id="@+id/userImage3"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_marginStart="36dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/userName"
+                app:layout_constraintTop_toTopOf="@+id/userName"
+                tools:src="@drawable/indianoil"/>
+
+            <ImageView
+                android:id="@+id/userImage4"
+                android:layout_width="80dp"
+                android:layout_height="100dp"
+                android:layout_marginTop="30dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/userImage"
+                tools:src="@drawable/person" />
+
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/userdetails"
+                android:layout_width="150dp"
+                android:layout_height="120dp"
+                android:layout_marginTop="24dp"
+                app:cardBackgroundColor="#FFFFFF"
+                app:cardCornerRadius="5dp"
+                app:layout_constraintTop_toBottomOf="@id/userImage"
+                app:layout_constraintStart_toEndOf="@+id/userImage4"
+                app:cardElevation="0dp">
+
+                <TextView
+                    android:id="@+id/name"
+                    style="@style/title1_1"
+                    android:layout_width="80dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/userImage"
+                    android:text="Name: Mariya" />
+
+
+                <TextView
+                    android:id="@+id/dob"
+                    style="@style/title1_1"
+                    android:layout_width="80dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:gravity="center"
+                    android:layout_marginTop="30dp"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/name"
+                    app:layout_constraintTop_toBottomOf="@id/name"
+                    android:text="DOB: 1998" />
+
+
+                <TextView
+                    android:id="@+id/gender"
+                    style="@style/title1_1"
+                    android:layout_width="80dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:gravity="center"
+                    android:layout_marginTop="50dp"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/dob"
+                    app:layout_constraintTop_toBottomOf="@id/dob"
+                    android:text="gender: female" />
+
+
+                <TextView
+                    android:id="@+id/State"
+                    style="@style/title1_1"
+                    android:layout_width="80dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:gravity="center"
+                    android:layout_marginTop="70dp"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/gender"
+                    app:layout_constraintTop_toBottomOf="@id/gender"
+                    android:text="State: Kerala" />
+
+            </androidx.cardview.widget.CardView>
+            <androidx.cardview.widget.CardView
+                android:id="@+id/userdetails2"
+                android:layout_width="150dp"
+                android:layout_marginStart="10dp"
+                android:layout_height="120dp"
+                android:layout_marginTop="24dp"
+                app:cardBackgroundColor="#FFFFFF"
+                app:cardCornerRadius="5dp"
+                app:layout_constraintTop_toBottomOf="@id/userImage3"
+                app:layout_constraintStart_toEndOf="@+id/userdetails"
+                app:cardElevation="0dp">
+
+                <TextView
+                    android:id="@+id/abhaid"
+                    style="@style/title1_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="10dp"
+                    android:gravity="start"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/userImage3"
+                    android:text="ABHA-ID: XXXX-8734" />
+
+                <TextView
+                    android:id="@+id/blood"
+                    style="@style/title1_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="30dp"
+                    android:gravity="start"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/userImage3"
+                    android:text="Blood Group: O +ve" />
+                <TextView
+                    android:id="@+id/sicklecell"
+                    style="@style/title1_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="50dp"
+                    android:gravity="start"
+                    android:textColor="@color/black"
+                    android:textSize="8sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/userImage3"
+                    android:text="Sickle-Cell: Normal (HbA)" />
+                <TextView
+                    android:id="@+id/issueDate"
+                    style="@style/title1_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="70dp"
+                    android:gravity="start"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/userImage3"
+                    android:text="Issue Date: Oct 2,2023" />
+
+
+            </androidx.cardview.widget.CardView>
+
+
+            <Button
+                android:id="@+id/digitalcard"
+                android:backgroundTint="#00008B"
+                app:cardBackgroundColor="#00008B"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="20dp"
+                android:text="@string/digital_card"
+                android:textColor="@color/white"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/userdetails" />
+
+            <ProgressBar
+                android:id="@+id/progressBar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:elevation="12dp"
+                android:indeterminate="true"
+                android:indeterminateDrawable="@drawable/progressbar_drawable"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

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

@@ -147,8 +147,35 @@
             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"
@@ -178,61 +205,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btn_submit" />
 
-<!--        <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"

app/src/main/res/values/strings.xml

@@ -113,7 +113,7 @@
     <string name="sickle_find">Sickle Find</string>
     <string name="submit">Submit</string>
     <string name="diagnostics">Device Diagnostics</string>
-    <string name="place_buffer">Start Buffer</string>
+    <string name="place_buffer">Start</string>
     <string name="Start_Sample">Start Sample</string>
     <string name="new_kit">New Kit</string>
     <string name="new_buffer">New Buffer</string>
@@ -158,6 +158,7 @@
     <string name="is_patient_married_yes_no">Is Patient Married? (Yes/No)</string>
     <string name="category">Category</string>
     <string name="blood_group">Blood Group</string>
+    <string name="digital_card">Digital Counselling Card</string>
     <string name="patient_medical_records">Patient Medical Records</string>
     <string name="patient_address_details">Patient Address Details</string>
     <string name="district">District</string>

app/src/test/java/com/example/hpostesting/HemocubeViewModelTest.kt

@@ -1,60 +0,0 @@
-package com.example.hpostesting
-
-import android.content.SharedPreferences
-import android.view.View
-import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
-import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
-import org.junit.Before
-import org.junit.Test
-import org.mockito.ArgumentMatchers.any
-import org.mockito.ArgumentMatchers.anyString
-import org.mockito.Mock
-import org.mockito.Mockito.verify
-import org.mockito.Mockito.`when`
-import org.mockito.MockitoAnnotations
-
-class HemocubeViewModelTest {
-    @Mock
-    private lateinit var mockSharedPreferences: SharedPreferences
-
-    @Mock
-    private lateinit var mockActivity: HemocubeActivity // Replace with your actual Activity class
-
-    @Mock
-    private lateinit var mockBinding: FragmentHemoCubeReferenceBinding // Replace with your actual Binding class
-
-    private lateinit var hemoCubeFragment: HemoCubeFragment
-
-    @Before
-    fun setUp() {
-        MockitoAnnotations.initMocks(this)
-        hemoCubeFragment = HemoCubeFragment()
-    }
-
-    @Test
-    fun `handleValidResult with valid input`() {
-
-        val validString = "valid string"
-        val fullReadOutput = "full read output"
-        `when`(mockSharedPreferences.getString(anyString(), anyString())).thenReturn("dummy_value")
-        `when`(mockActivity.runOnUiThread(any())).thenAnswer {
-            val runnable = it.getArgument(0, Runnable::class.java)
-            runnable.run()
-        }
-
-        // Act
-        hemoCubeFragment.handleValidResult(validString, fullReadOutput)
-
-        // Assert
-        // Add appropriate assertions based on the behavior you expect
-        verify(mockSharedPreferences).edit()
-        verify(mockBinding).btnSubmit.visibility = View.VISIBLE
-        verify(mockBinding).btnSubmit.isEnabled = true
-        // Add more verifications as needed
-    }
-
-
-    // Add more test cases for different scenarios if needed
-}

app/src/test/java/com/example/hpostesting/TestRightViewModelTest.kt

@@ -1,49 +1,17 @@
 package com.example.hpostesting
 
-import android.content.Context
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.dao.UserDao
-import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.domain.SaveRawData
-import com.example.hpostesting.domain.SaveRawDataTest
+import com.example.hpostesting.data.model.PatientData
+import com.example.hpostesting.data.model.test.TestRightResultType
 import com.example.hpostesting.presentation.testRight.TestRightViewModel
 import junit.framework.Assert.assertEquals
-import org.junit.Before
 import org.junit.Test
-import org.mockito.Mock
-import org.mockito.MockitoAnnotations
 import java.math.RoundingMode
 import java.text.DecimalFormat
 
 class TestRightViewModelTest {
-
-    @Mock
-    lateinit var mockContext: Context
-
-    @Mock
-    lateinit var mockRepository: DatabaseRepository
-
-    @Mock
-    lateinit var mockSaveRawData: SaveRawData
-
-    @Mock
-    lateinit var mockSaveRawDataTest: SaveRawDataTest
-
-    @Mock
-    lateinit var mockUserDao: UserDao
-
-    lateinit var viewModel: TestRightViewModel<Any?>
-
-    @Before
-    fun setUp() {
-        // Initialize mocks
-        MockitoAnnotations.initMocks(this)
-
-        // Create the ViewModel with mock dependencies
-        viewModel = TestRightViewModel(mockSaveRawData,mockSaveRawDataTest,mockRepository,mockUserDao,mockContext)
-    }
+    private val viewModel = TestRightViewModel()
     private val data = InputData()
 
     @Test
@@ -95,11 +63,8 @@ class TestRightViewModelTest {
         viewModel.mapDeviceConstants(data.inputRead)
         viewModel.mapPixelNumberToWavelength()
         viewModel.mapIntensityValues(TestDataGenerator().getInputReferenceMapIntensityValues(), true)
-        val mapIntensityValues = viewModel.mapIntensityValues(
-            TestDataGenerator().getInputSampleMapIntensityValues(),
-            false
-        )
-        viewModel.testDetails = UserData("Surya", "2", "Male")
+        viewModel.mapIntensityValues(TestDataGenerator().getInputSampleMapIntensityValues(), false)
+        viewModel.patientDetails = PatientData("Surya", 2, "Male", TestRightResultType.UNDEFINED)
         viewModel.mapWavelengthToAbsorbance()
 
         val wavelengthList = TestDataGenerator().getOutputMapPixelNumberToWavelength()

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         kotlin_version = '1.8.21'
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath 'com.google.gms:google-services:4.4.0'
         classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.1'
     }