production errors

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "in.sminnovations.hpostesting"
         minSdk 21
         targetSdk 34
-        versionCode 7
+        versionCode 2
-        versionName "2.1.7"
+        versionName "2.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -70,9 +70,6 @@ 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-beta10'
-    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta10")
-
 
     // Testing
     testImplementation 'junit:junit:4.13.2'

app/src/main/AndroidManifest.xml

@@ -13,8 +13,11 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <uses-feature android:name="android.hardware.usb.host" />
+
     <uses-permission android:name="android.permission.USB_PERMISSION" />
+
     <application
         android:name="com.example.hpostesting.HPOSTestingApplication"
         android:allowBackup="true"
@@ -26,6 +29,11 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.HPOSTesting"
         tools:targetApi="31">
+        <activity
+            android:name="com.example.hpostesting.presentation.BloodCollectingMethodActivity"
+            android:exported="true"
+            android:noHistory="true"
+            android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
             android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
             android:exported="false"
@@ -91,7 +99,7 @@
         </activity>
         <activity
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="portrait"
+            android:screenOrientation="fullSensor"
             android:stateNotNeeded="true"
             tools:replace="android:screenOrientation" />
     </application>

app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt

@@ -15,8 +15,6 @@ import javax.inject.Singleton
 
 @HiltAndroidApp
 class HPOSTestingApplication: Application() {
-    val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
     override fun onCreate() {
         super.onCreate()
         val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)

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

@@ -55,4 +55,8 @@ object Constants {
     const val KIT_COUNT = "KitCount"
     const val BUFFER_VALUE_1 = "BufferValue1"
     const val BUFFER_VALUE_2 = "BufferValue2"
+
+    const val BLOOD_COLLECTING_METHOD = "bloodCollectingMethod"
+    const val VENOUS_BLOOD = "venousBlood"
+    const val FINGER_PRICK_BLOOD = "fingerPrickBlood"
 }

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

@@ -9,15 +9,15 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 @Dao
 interface HemoCubeDao {
-    @Query("SELECT * from hemo_cube_test_table")
+    @Query("SELECT * from HemocubeTest_table")
     fun getAll(): LiveData<List<HemoCubeTestData>>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(hemoCubeTestData: HemoCubeTestData)
 
-    @Query("SELECT * FROM hemo_cube_test_table WHERE _id = :id")
+    @Query("SELECT * FROM hemocubetest_table WHERE _id = :id")
     suspend fun getUserByID(id: String): HemoCubeTestData
 
-    @Query("DELETE FROM hemo_cube_test_table WHERE _id = :id")
+    @Query("DELETE FROM hemocubetest_table WHERE _id = :id")
     suspend fun deleteById(id: String)
 }

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

@@ -3,7 +3,7 @@ package com.example.hpostesting.data.model.patient
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
-@Entity(tableName = "hemo_cube_test_table")
+@Entity(tableName = "HemocubeTest_table")
 data class HemoCubeTestData(
     @PrimaryKey
     var _id: String = "",

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

@@ -0,0 +1,57 @@
+package com.example.hpostesting.presentation
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.presentation.hemocube.HemocubeActivity
+import com.example.hpostesting.presentation.testRight.TestRightActivity
+import `in`.sminnovations.hpostesting.databinding.ActivityBloodCollectingMethodBinding
+
+class BloodCollectingMethodActivity : AppCompatActivity() {
+
+    private lateinit var binding: ActivityBloodCollectingMethodBinding
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityBloodCollectingMethodBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        init()
+    }
+
+    private fun init() {
+        setSupportActionBar(binding.toolbar)
+        binding.btnGo.setOnClickListener {
+            DataHolder.usbConnected.observe(this) {
+                if (it) {
+                    if (binding.venousBloodRadioButton.isChecked) {
+                        moveToNext(Constants.VENOUS_BLOOD)
+                    } else {
+                        moveToNext(Constants.FINGER_PRICK_BLOOD)
+                    }
+                } else {
+                    Toast.makeText(this, "No Device Connected", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun moveToNext(bloodCollectingMethod: String) {
+        DataHolder.deviceType.observe(this) { deviceType ->
+            when (deviceType) {
+                Constants.DEVICE_TYPE_HOMOCUBE -> {
+                    val intent = Intent(applicationContext, HemocubeActivity::class.java)
+                    intent.putExtra(Constants.BLOOD_COLLECTING_METHOD, bloodCollectingMethod)
+                    startActivity(intent)
+                }
+
+                Constants.DEVICE_TYPE_TEST_RIGHT -> {
+                    val intent = Intent(applicationContext, TestRightActivity::class.java)
+                    intent.putExtra(Constants.BLOOD_COLLECTING_METHOD, bloodCollectingMethod)
+                    startActivity(intent)
+                }
+            }
+        }
+    }
+}

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

@@ -11,8 +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.hemocube.HemocubeActivity
-import com.example.hpostesting.presentation.testRight.TestRightActivity
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.journeyapps.barcodescanner.ScanContract
@@ -66,25 +64,14 @@ class KitScanActivity : AppCompatActivity() {
 //                putString(Constants.BUFFER_VALUE_1, "")
 //                putString(Constants.BUFFER_VALUE_2, "")
 //                apply()
-//            }
 //            }
 
 
-        try {
         if (checkHemoCubeKitData()) {
+            try {
                 DataHolder.selectedTest!!.kitSerial =
                     sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
                 moveToNext()
-            } else {
-                // Handle the case when checkHemoCubeKitData() returns false
-                with(sharedPreference.edit()) {
-                    putString(Constants.KIT_NUMBER, "")
-                    putInt(Constants.KIT_COUNT, 0)
-                    putString(Constants.BUFFER_VALUE_1, "")
-                    putString(Constants.BUFFER_VALUE_2, "")
-                    apply()
-                }
-            }
             } catch (e: NullPointerException) {
                 // Handle the NullPointerException here
                 e.printStackTrace() // You can log the exception for debugging
@@ -95,8 +82,18 @@ class KitScanActivity : AppCompatActivity() {
                 // Optionally, show a user-friendly error message to the user
 //                Toast.makeText(applicationContext, "An error occurred", Toast.LENGTH_SHORT).show()
             }
+        } else {
+            with(sharedPreference.edit()) {
+                putString(Constants.KIT_NUMBER, "")
+                putInt(Constants.KIT_COUNT, 0)
+                putString(Constants.BUFFER_VALUE_1, "")
+                putString(Constants.BUFFER_VALUE_2, "")
+                apply()
+            }
 
 
+    }
+
         binding.nameEditText.setText("SMI/SC/")
 
         setSupportActionBar(binding.toolbar)
@@ -138,22 +135,10 @@ class KitScanActivity : AppCompatActivity() {
     }
 
     private fun moveToNext() {
-
+        val i = Intent(applicationContext, BloodCollectingMethodActivity::class.java)
-        DataHolder.deviceType.observe(this) { deviceType ->
-            when (deviceType) {
-                Constants.DEVICE_TYPE_HOMOCUBE -> {
-                    val i = Intent(applicationContext, HemocubeActivity::class.java)
         startActivity(i)
     }
 
-                Constants.DEVICE_TYPE_TEST_RIGHT -> {
-                    val i = Intent(applicationContext, TestRightActivity::class.java)
-                    startActivity(i)
-                }
-            }
-        }
-    }
-
     private fun startScanningNow() {
         val options = ScanOptions()
         options.setDesiredBarcodeFormats(ScanOptions.QR_CODE)

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

@@ -20,7 +20,6 @@ import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestType
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.android.gms.location.*
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
@@ -86,11 +85,6 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        if (DataHolder.selectedTest == null) {
-            startActivity(Intent(this, DashboardActivity::class.java))
-            finish()
-        }
-
 
 //        val crashButton = Button(this)
 //        crashButton.text = "Test Crash"
@@ -167,14 +161,12 @@ class MainActivity : AppCompatActivity() {
             DataHolder.selectedTestType = TestType.SICKLECERT
             val i = Intent(applicationContext, KitScanActivity::class.java)
             startActivity(i)
-            finish()
         }
 
         binding.cvItem2.setOnClickListener {
             DataHolder.selectedTestType = TestType.SICKLEFIND
             val i = Intent(applicationContext, KitScanActivity::class.java)
             startActivity(i)
-            finish()
         }
 
         DataHolder.usbConnected.observe(this) {
@@ -258,15 +250,12 @@ class MainActivity : AppCompatActivity() {
 //        }
 
 
+
+
             fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
                 location?.let {
-                if (DataHolder.selectedTest != null) {
                     DataHolder.selectedTest!!.location =
                         UserData.Location(location.latitude, location.longitude)
-                } else {
-                    startActivity(Intent(this, DashboardActivity::class.java))
-                    finish()
-                }
                     DataHolder.location =
                         UserData.Location(location.latitude, location.longitude)
                 } ?: run {
@@ -284,6 +273,8 @@ class MainActivity : AppCompatActivity() {
 
 
 
+
+
     }
 
     private fun requestLocationUpdates() {

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

@@ -2,7 +2,6 @@ package com.example.hpostesting.presentation.dashboard
 
 import android.os.Bundle
 import android.view.Menu
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.findNavController
@@ -11,8 +10,6 @@ import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.navigation.NavigationView
-import com.google.firebase.appdistribution.FirebaseAppDistribution
-import com.google.firebase.appdistribution.FirebaseAppDistributionException
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
@@ -28,6 +25,7 @@ class DashboardActivity : AppCompatActivity() {
 
         binding = ActivityDashboardBinding.inflate(layoutInflater)
         setContentView(binding.root)
+
         setSupportActionBar(binding.appBarDashboard.toolbar)
 
         val drawerLayout: DrawerLayout = binding.drawerLayout
@@ -55,31 +53,4 @@ class DashboardActivity : AppCompatActivity() {
         return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
     }
 
-
-    override fun onResume() {
-        super.onResume()
-        // Copy and paste this into any part of your app - for example, in your main
-// activity's onResume method.
-        val firebaseAppDistribution = FirebaseAppDistribution.getInstance()
-        firebaseAppDistribution.updateIfNewReleaseAvailable()
-            .addOnProgressListener { updateProgress ->
-                Toast.makeText(this, "Updating", Toast.LENGTH_SHORT).show()
-            }
-            .addOnFailureListener { e ->
-                // (Optional) Handle errors.
-                if (e is FirebaseAppDistributionException) {
-                    when (e.errorCode) {
-                        FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> {
-                            // SDK did nothing. This is expected when building for Play.
-                        }
-
-                        else -> {
-                            // Handle other errors.
-                        }
-                    }
-                }
-            }
-    }
-
-
 }

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

@@ -20,7 +20,6 @@ import com.example.hpostesting.presentation.adapter.UserListAdapter
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.TestRightViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
-import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.AndroidEntryPoint
@@ -99,7 +98,6 @@ class HomeFragment : Fragment() {
         }
     }
     private fun loadUserData() {
-//        val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false).orderBy("createdAt", Query.Direction.DESCENDING)
         val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false)
         query.get().addOnSuccessListener {
             if (it.documents.isEmpty()) {
@@ -164,10 +162,8 @@ class HomeFragment : Fragment() {
                         binding.aadharIdRadioButton.isChecked -> "aadharId"
                         else -> null
                     }
-
                     field?.let { getData(query, it) }
                     false
-
                 } else {
                     loadUserData()
                     false
@@ -264,7 +260,7 @@ class HomeFragment : Fragment() {
 
     private fun deleteHemoCubeIncompleteRegistrations(userDataList: List<HemoCubeTestData>) {
         userDataList.forEach { userData ->
-            if (userData.testTime?.isEmpty() == true) {
+            if (userData.testTime?.isEmpty() == false) {
                 hemoCubeViewModel.deleteById(userData._id)
             }
         }

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

@@ -9,7 +9,6 @@ import androidx.lifecycle.ViewModelProvider
 import com.example.hpostesting.presentation.dashboard.ui.slideshow.SlideshowViewModel
 import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
 
-
 class SlideshowFragment : Fragment() {
 
     private var _binding: FragmentSlideshowBinding? = null
@@ -21,7 +20,7 @@ class SlideshowFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
+        savedInstanceState: Bundle?
     ): View {
         val slideshowViewModel =
             ViewModelProvider(this).get(SlideshowViewModel::class.java)
@@ -29,12 +28,6 @@ class SlideshowFragment : Fragment() {
         _binding = FragmentSlideshowBinding.inflate(inflater, container, false)
         val root: View = binding.root
 
-        val pInfo = requireActivity().packageManager.getPackageInfo(
-            requireActivity().packageName, 0
-        )
-        val version = pInfo.versionName
-        binding.textSlideshow.text = version
-
 //        val textView: TextView = binding.textSlideshow
 //        slideshowViewModel.text.observe(viewLifecycleOwner) {
 //            textView.text = it

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

@@ -10,7 +10,6 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.lifecycleScope
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
@@ -22,6 +21,7 @@ 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.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
@@ -29,7 +29,6 @@ import `in`.sminnovations.hpostesting.BuildConfig
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
@@ -45,7 +44,6 @@ class HemoCubeFragment : Fragment() {
     private var resultData: String = ""
     private var isUsingExistingBuffer = false
     private var isTestOngoing = false
-    private var startListening = MutableLiveData<Boolean>(false)
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
@@ -59,7 +57,7 @@ class HemoCubeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         initViews()
         observeViewModel()
-//        checkAndStartProcess()
+        checkAndStartProcess()
     }
 
     private fun initViews() {
@@ -80,22 +78,10 @@ class HemoCubeFragment : Fragment() {
         binding.btnSubmit.isEnabled = false
         binding.btnSubmit.isClickable = false
 
-
-        binding.btnSamplestart.setOnClickListener {
-            startSampleProcess()
-            it.visibility = View.GONE
-        }
-
-        binding.btnPlacebuffer.setOnClickListener {
-            checkAndStartProcess()
-            it.visibility = View.GONE
-        }
-
         binding.btnKit.setOnClickListener {
             if (isTestOngoing) {
                 val title = "WARNING"
-                val message =
+                val message = "There is a on going test, do you want to stop it"
-                    "There is a on going test, do you want to stop it. if Yes please disconnect the device and connect it again, once you reached to kitDetails Screen"
                 val negativeText = getString(R.string.no)
                 val positiveText = "Yes"
 
@@ -116,11 +102,6 @@ class HemoCubeFragment : Fragment() {
                             (activity as HemocubeActivity).finish()
                         }
                     })
-            } else {
-                resetKitCount()
-                val intent = Intent(context, KitScanActivity::class.java)
-                startActivity(intent)
-                (activity as HemocubeActivity).finish()
             }
         }
     }
@@ -169,7 +150,7 @@ class HemoCubeFragment : Fragment() {
 
         hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
             currentDeviceData = it
-//            showToast(calculateRatio(0.17).toString())
+            showToast(calculateRatio(0.17).toString())
 
         }
 
@@ -180,12 +161,9 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
         }
-        startListening.observe(viewLifecycleOwner) {
+    }
-            if (it) {
+
-                lifecycleScope.launch {
+    private fun checkAndStartProcess() {
-                    delay(1000)
-                    if (binding.tvSubtitle4.text.toString().isEmpty()) {
-                        (activity as HemocubeActivity).reconnectDevice()
         if (isBufferValueAvailable()) {
             showBufferAlertDialog()
         } else {
@@ -193,19 +171,6 @@ class HemoCubeFragment : Fragment() {
             startBufferProcess()
         }
     }
-                }
-            }
-        }
-    }
-
-    private fun checkAndStartProcess() {
-//        if (isBufferValueAvailable()) {
-//            showBufferAlertDialog()
-//        } else {
-        listenToHemoCube()
-        startBufferProcess()
-//        }
-    }
 
     private fun isBufferValueAvailable(): Boolean {
         return if (sharedPreferences.getString(
@@ -253,9 +218,6 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.progressBar.postValue(true)
 
         val fullReadOutput = StringBuilder()
-        startListening.postValue(true)
-
-        try {
         (activity as HemocubeActivity).mService.listenToHemoCube(object : UsbServiceListener {
             override fun onUsbRead(data: ByteArray?) {
                 data?.let {
@@ -269,9 +231,6 @@ class HemoCubeFragment : Fragment() {
                 hemoCubeViewModel.progressBar.postValue(false)
             }
         })
-        } catch (e: Exception) {
-            showToast("test is going on")
-        }
     }
 
     private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
@@ -283,14 +242,7 @@ class HemoCubeFragment : Fragment() {
         resultData += fullReadOutput.toString()
 
         when {
-            stringData.contains("ERROR 500") -> showError500Dialog()
+            stringData.contains("#Buffer Completed") -> showStartSampleDialog()
-            stringData.contains("ERROR 501") -> showError501Dialog()
-            stringData.contains("#Buffer Completed") ->
-                activity?.runOnUiThread {
-                    binding.btnSamplestart.visibility = View.VISIBLE
-                    binding.btnSamplestart.isClickable = true
-                }
-
             stringData.contains("#Sample Completed") -> {
                 activity?.runOnUiThread {
                     binding.btnSubmit.isEnabled = true
@@ -318,70 +270,6 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
-
-    private fun showError() {
-        activity?.runOnUiThread {
-            UIUtils.createAlertDialog(requireContext(),
-                "Device Error",
-                "Something is wrong with the device, please disconnect and reconnect the device and test the user again",
-                getString(R.string.noo),
-                "Yes",
-                object : MyDialogListener {
-                    override fun onClickNegativeButton() {}
-
-                    override fun onClickPositiveButton() {
-                        startActivity(Intent(requireActivity(), DashboardActivity::class.java))
-                    }
-                })
-        }
-    }
-
-
-    private fun showError500Dialog() {
-        UIUtils.createAlertDialog(requireContext(),
-            "BUFFER ERROR",
-            "Do you want to continue with existing buffer?",
-            getString(R.string.noo),
-            "Yes",
-            object : MyDialogListener {
-                override fun onClickNegativeButton() {}
-
-                override fun onClickPositiveButton() {
-                    listenToHemoCube()
-                    startBufferProcess()
-                }
-            })
-    }
-
-    fun handleBackButtonPress() {
-        if (isTestOngoing) {
-            // 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("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 showError501Dialog() {
-        UIUtils.createAlertDialog(requireContext(),
-            "SAMPLE ERROR",
-            "Do you want to continue with Sample?",
-            getString(R.string.noo),
-            "Yes",
-            object : MyDialogListener {
-                override fun onClickNegativeButton() {}
-
-                override fun onClickPositiveButton() {
-                    listenToHemoCube()
-                    startSampleProcess()
-                }
-            })
-    }
-
     private fun showStartSampleDialog() {
         activity?.runOnUiThread {
             UIUtils.createAlertDialog(requireContext(),
@@ -393,7 +281,7 @@ class HemoCubeFragment : Fragment() {
                     override fun onClickNegativeButton() {}
 
                     override fun onClickPositiveButton() {
-                        startSampleProcess()
+
                     }
                 })
         }
@@ -402,45 +290,146 @@ class HemoCubeFragment : Fragment() {
     private fun handleValidResult(validString: String, fullReadOutput: String) {
         try {
             val result = validString.split(" ")
-            if (result.size == 8) {
+            if (result.size != 8) return
+
             val deviceSerialNo = result[2]
-                val led1BufferForDevice = if (isUsingExistingBuffer) {
+            val led1BufferForDevice =
-                    sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")?.toDoubleOrNull()
+                getLedBufferValue(isUsingExistingBuffer, Constants.BUFFER_VALUE_1, result[3])
-                } else {
+            val led2BufferForDevice =
-                    result[3].toDoubleOrNull()
+                getLedBufferValue(isUsingExistingBuffer, Constants.BUFFER_VALUE_2, result[4])
-                }
-                val led2BufferForDevice = if (isUsingExistingBuffer) {
-                    sharedPreferences.getString(Constants.BUFFER_VALUE_2, "")?.toDoubleOrNull()
-                } else {
-                    result[4].toDoubleOrNull()
-                }
             val version = BuildConfig.VERSION_NAME
             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 led1Average = calculateAverage(led1BufferForDevice, led1Sample)
+            val led2Average = calculateAverage(led2BufferForDevice, led2Sample)
             val deviceRatio = led1Average / led2Average
-//                if (led1BufferForDevice!! > 20000 && led1BufferForDevice < 24000 && led2BufferForDevice!! > 20000 && led2BufferForDevice < 24000) {
+            val calculatedRatio = calculateRatio(deviceRatio)
-//                    if (led1Sample!! < led1BufferForDevice && led1Sample < 24000 && led2Sample!! < led2BufferForDevice && led2Sample < 24000) {
+            val isBufferValid = validateBuffer(led1BufferForDevice, led2BufferForDevice)
-//                        if (deviceRatio < 0.08) {
+            val isSampleValid =
-//                            if (deviceRatio > 1.07) {
+                validateSample(led1Sample, led1BufferForDevice, led2Sample, led2BufferForDevice)
-//
+            val isCalculatedRatioValid = validateCalculatedRatio(deviceRatio)
-//                            }
+
-//                        }
+            when {
-//                    }
+                !isBufferValid -> showError(
-//                }
+                    "Buffer error",
+                    "Check for Empty curved, disconnected and reconnect the device, and please retest this sample again with a new blank"
+                )
+
+                !isSampleValid -> showError(
+                    "Sample error",
+                    "Check for Empty curved, disconnected and reconnect the device, and please retest this sample again with a new blank"
+                )
+
+                !validateBloodVolume(led1Average, led2Average) -> {
+                    showError(
+                        "Low Blood Volume",
+                        "Please retest this sample with a higher volume of blood"
+                    )
+                }
+
+                !validateHighBloodVolume(led1Average, led2Average) -> {
+                    showError(
+                        "High Blood Volume",
+                        "Please retest this sample by diluting the sample in the buffer"
+                    )
+                }
+
+                !isCalculatedRatioValid -> showError(
+                    "calculated Ratio error",
+                    "Check for Empty curved, disconnected and reconnect the device, and please retest this sample again with a new blank"
+                )
+
+                else -> processValidData(
+                    deviceSerialNo,
+                    led1BufferForDevice,
+                    led2BufferForDevice,
+                    version,
+                    led1Sample,
+                    led2Sample,
+                    led1Average,
+                    led2Average,
+                    deviceRatio,
+                    fullReadOutput,
+                    calculatedRatio
+                )
+            }
+
+        } catch (_: Exception) {
+            // handle exception or log it if necessary
+        }
+    }
+
+    private fun getLedBufferValue(
+        usingExistingBuffer: Boolean, bufferConstant: String, resultValue: String
+    ): Double? {
+        return if (usingExistingBuffer) {
+            sharedPreferences.getString(bufferConstant, "")?.toDoubleOrNull()
+        } else {
+            resultValue.toDoubleOrNull()
+        }
+    }
+
+    private fun calculateAverage(bufferForDevice: Double?, sample: Double?): Double {
+        return log10(bufferForDevice?.div(sample ?: 1.0) ?: 0.0)
+    }
+
+    private fun validateBuffer(led1Buffer: Double?, led2Buffer: Double?): Boolean {
+        return led1Buffer!! in 20001.0..23999.0 && led2Buffer!! in 20001.0..23999.0
+    }
+
+    private fun validateSample(
+        sample1: Double?, buffer1: Double?, sample2: Double?, buffer2: Double?
+    ): Boolean {
+        return sample1 != null && sample1 < buffer1!! && sample1 < 24000 && sample2 != null && sample2 < buffer2!! && sample2 < 24000
+    }
+
+    private fun validateBloodVolume(average1: Double, average2: Double): Boolean {
+        return average1 > 0.08 && average2 > 0.08
+    }
+
+    private fun validateCalculatedRatio(deviceRatio: Double): Boolean {
+        return deviceRatio > 0.08 && deviceRatio < 0.3
+    }
+
+    private fun validateHighBloodVolume(average1: Double, average2: Double): Boolean {
+        return average1 < 1.07 && average2 < 1.07
+    }
+
+    private fun showError(title: String, message: String) {
+        customErrorDialogBox(title, message)
+    }
+
+    private fun processValidData(
+        deviceId: String,
+        led1Buffer: Double?,
+        led2Buffer: Double?,
+        appVersion: String,
+        led1Sample: Double?,
+        led2Sample: Double?,
+        led1Average: Double,
+        led2Average: Double,
+        deviceRatio: Double,
+        resultData: String,
+        calculatedRatio: Double
+    ) {
+        val threshold =
+            if ((activity as HemocubeActivity).bloodCollectingMethod == Constants.FINGER_PRICK_BLOOD) 0.05 else 0.06
+
+        if (led1Average > threshold) {
             DataHolder.hemoCubeTestData?.apply {
-                    deviceId = deviceSerialNo
+                this.deviceId = deviceId
-                    led1Buffer = led1BufferForDevice
+                this.led1Buffer = led1Buffer
-                    led2Buffer = led2BufferForDevice
+                this.led2Buffer = led2Buffer
-                    appVersion = version
+                this.appVersion = appVersion
                 this.led1Sample = led1Sample
                 this.led2Sample = led2Sample
                 this.led1Average = led1Average
                 this.led2Average = led2Average
                 this.deviceRatio = deviceRatio
-//                    this.calculatedRatio = calculateRatio(deviceRatio)
+                this.calculatedRatio = calculatedRatio
-                    this.resultData = fullReadOutput
+                this.resultData = resultData
+
                 if (!isBufferValueAvailable()) {
                     with(sharedPreferences.edit()) {
                         putString(Constants.BUFFER_VALUE_1, led1Buffer.toString())
@@ -448,23 +437,41 @@ class HemoCubeFragment : Fragment() {
                         apply()
                     }
                 }
-                    activity?.runOnUiThread {
-                        binding.progressBar.visibility = View.VISIBLE
-                    }
                 hemoCubeViewModel.uploadHemoCubeResultToDatabase(
                     isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
                 )
             }
+        } else {
+            showError(
+                "Low Blood Volume",
+                "Please repeat the test with 10 µl of blood added to 1 ml of buffer"
+            )
+        }
     }
 
-        } catch (_: Exception) {
+    private fun customErrorDialogBox(title: String, message: String) {
-            Toast.makeText(
+        activity?.runOnUiThread {
-                requireContext(),
+            MaterialAlertDialogBuilder(requireContext()).setTitle(title).setMessage(message)
-                "Error while processing device data",
+                .setPositiveButton("OK") { dialog, _ ->
-                Toast.LENGTH_SHORT
+                    if (title == "Buffer error" || title == "Sample error") {
-            ).show()
+                        with(sharedPreferences.edit()) {
+                            putString(Constants.BUFFER_VALUE_1, "")
+                            putString(Constants.BUFFER_VALUE_2, "")
+                            apply()
+                        }
+                        finishTestingActivity()
+                    } else {
+                        finishTestingActivity()
+                    }
+                    dialog.dismiss()
+                }.show()
+        }
     }
 
+    private fun finishTestingActivity() {
+        val i = Intent(requireContext().applicationContext, DashboardActivity::class.java)
+        startActivity(i)
+        (activity as HemocubeActivity).finish()
     }
 
     private fun showToast(message: String) {
@@ -510,11 +517,11 @@ class HemoCubeFragment : Fragment() {
             })
     }
 
-//    private fun calculateRatio(ratio: Double): Double {
+    private fun calculateRatio(ratio: Double): Double {
-//        val coefficient1 = currentDeviceData?.coefficients?.get(0) ?: 0.0
+        val coefficient1 = currentDeviceData?.coefficients?.get(0) ?: 0.0
-//        val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 0.0
+        val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 0.0
-//        return coefficient1 * ratio + coefficient2
+        return coefficient1 * ratio + coefficient2
-//    }
+    }
 
     private fun parseResult(frames: List<String>): String {
         val lines = mutableListOf<String>()

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

@@ -14,6 +14,7 @@ import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.data.repository.DatabaseRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -33,8 +34,7 @@ class HemoCubeViewModel @Inject constructor(
     val progressBar = MutableLiveData(false)
     val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
     val messages = MutableLiveData<String>()
-    private val sharedPreference: SharedPreferences =
+    private val sharedPreference: SharedPreferences = context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
-        context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
 
     // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
 
@@ -53,10 +53,8 @@ class HemoCubeViewModel @Inject constructor(
 
             try {
                 if (isOnline) {
-                    parseData()
                     addResultTestToDb()
                 } else {
-                    parseData()
                     testDetails?.testTime = SimpleDateFormat(
                         "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                     ).format(Calendar.getInstance().time)
@@ -72,7 +70,7 @@ class HemoCubeViewModel @Inject constructor(
         deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
     }
 
-    private fun parseData() {
+    private fun addResultTestToDb() {
         testDetails?.deviceRatio = DataHolder.hemocubeResult
         testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
         testDetails?.location = DataHolder.location
@@ -81,8 +79,7 @@ class HemoCubeViewModel @Inject constructor(
         ).format(Calendar.getInstance().time)
         testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion
         testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId
-        testDetails?.deviceSerialNumber =
+        testDetails?.deviceSerialNumber = sharedPreference.getString(Constants.USER_ID, "").toString()
-            sharedPreference.getString(Constants.USER_ID, "").toString()
         testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
         testDetails?.led1Buffer = DataHolder.hemoCubeTestData?.led1Buffer
         testDetails?.led2Buffer = DataHolder.hemoCubeTestData?.led2Buffer
@@ -92,9 +89,7 @@ class HemoCubeViewModel @Inject constructor(
         testDetails?.led2Average = DataHolder.hemoCubeTestData?.led2Average
         testDetails?.deviceRatio = DataHolder.hemoCubeTestData?.deviceRatio
         testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio
-    }
 
-    private fun addResultTestToDb() {
         viewModelScope.launch {
             try {
                 testDetails!!.reportUploadTime = SimpleDateFormat(
@@ -105,7 +100,7 @@ class HemoCubeViewModel @Inject constructor(
                     is Response.Success -> {
                         val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
                         with(sharedPreference.edit()) {
-                            putInt(Constants.KIT_COUNT, kitCount.plus(1))
+                            putInt(Constants.KIT_COUNT, kitCount.plus(1) ?: 0)
                             apply()
                         }
                         Log.i("Testdb", "Data uploaded to Firestore successfully")
@@ -113,9 +108,14 @@ class HemoCubeViewModel @Inject constructor(
                     }
 
                     is Response.Error -> {
-                        Log.e("Testdb", "Error uploading data to Firestore: $response")
+                        Log.e("Testdb", "Error uploading data to Firestore: ${response}")
                         fireBaseUpload.postValue("Error")
                     }
+
+                    else -> {
+                        Log.e("Testdb", "Unknown response from repository: $response")
+                        fireBaseUpload.postValue("Unknown")
+                    }
                 }
             } catch (e: Exception) {
                 Log.e("Testdb", "Exception during data upload: ${e.message}")
@@ -132,7 +132,6 @@ class HemoCubeViewModel @Inject constructor(
             when (repository.addTestToDatabase(userData)) {
                 is Response.Success -> {
                     fireBaseUpload.postValue("Success")
-                    deleteById(userData._id)
                 }
 
                 else -> {}

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

@@ -29,7 +29,7 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
 
 @AndroidEntryPoint
-open class HemocubeActivity : AppCompatActivity() {
+class HemocubeActivity : AppCompatActivity() {
     private lateinit var binding: ActivityHemocubeBinding
     private val viewModel by viewModels<HemoCubeViewModel>()
     private var myMenu: Menu? = null
@@ -40,6 +40,8 @@ open class HemocubeActivity : AppCompatActivity() {
 
     private val TAG = "HemoCube"
 
+    var bloodCollectingMethod = ""
+
     private val broadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
 
@@ -77,6 +79,7 @@ open class HemocubeActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityHemocubeBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        bloodCollectingMethod = intent.getStringExtra(Constants.BLOOD_COLLECTING_METHOD).toString()
         setSupportActionBar(binding.myToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         setupListener()
@@ -97,7 +100,7 @@ open class HemocubeActivity : AppCompatActivity() {
         }
     }
 
-    open fun connectUsb(permissionGranted: Boolean) {
+    private fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
         val availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager)
@@ -118,13 +121,15 @@ open class HemocubeActivity : AppCompatActivity() {
 
 
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent
+        val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+            PendingIntent.getBroadcast(
-            mPendingIntent = PendingIntent.getBroadcast(
+                this,
-                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
+                0,
+                Intent(Constants.HOMOCUBE_USB_PERMISSION),
+                PendingIntent.FLAG_MUTABLE
             )
         } else {
-            mPendingIntent = PendingIntent.getBroadcast(
+            PendingIntent.getBroadcast(
                 this,
                 0,
                 Intent(Constants.HOMOCUBE_USB_PERMISSION),
@@ -137,39 +142,24 @@ open class HemocubeActivity : AppCompatActivity() {
         manager.requestPermission(device, mPendingIntent)
     }
 
-    fun setupService() {
+    private fun setupService() {
         val intent = Intent(this, UsbService::class.java)
+//        startService(intent)
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
-    open fun reconnectDevice() {
-        mService.disconnect()
-        unbindService(connection)
-        viewModel.isServiceConnected = false
-        connectUsb(true)
-    }
-
     private fun moveToNext() {
-        if (supportFragmentManager.isDestroyed) return
+        if (supportFragmentManager.isDestroyed)
+            return
 
-        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeFragment())
+        supportFragmentManager.beginTransaction()
-            .commit()
+            .replace(binding.fghemocube.id, HemoCubeFragment()).commit()
     }
 
-
-    override fun onBackPressed() {
-        val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
-        if (fragment is HemoCubeFragment) {
-            fragment.handleBackButtonPress()
-        } else {
-            super.onBackPressed()
-        }
-    }
-
-
     fun onErrorReported(msg: String) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
-        if (!isFinishing) onBackPressed()
+        if (!isFinishing)
+            onBackPressed()
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {

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

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.example.hpostesting.presentation.BloodCollectingMethodActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:theme="@style/Theme.HPOS.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/Theme.HPOS.PopupOverlay" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <TextView
+        android:id="@+id/tv_title"
+        style="@style/title1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/select_blood_collecting_method"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/app_bar_layout" />
+
+    <RadioGroup
+        android:id="@+id/bloodTypeRadioGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title">
+
+        <RadioButton
+            android:id="@+id/venousBloodRadioButton"
+            style="@style/title1_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/venous_blood" />
+
+        <RadioButton
+            android:id="@+id/fingerPrickBloodRadioButton"
+            style="@style/title1_1"
+            android:checked="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/finger_prick_blood" />
+
+    </RadioGroup>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_go"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="24dp"
+        android:text="@string/go"
+        app:cornerRadius="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/bloodTypeRadioGroup" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".presentation.KitScanActivity">
+    tools:context="com.example.hpostesting.presentation.KitScanActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"

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

@@ -58,40 +58,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
 
-
-
-
-        <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/til_blood_group" />
-
-
-
-        <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:id="@+id/btn_submit"
             android:layout_width="wrap_content"
@@ -103,7 +69,8 @@
             android:textColor="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_samplestart" />
+            app:layout_constraintTop_toBottomOf="@id/til_blood_group" />
+
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/til_blood_group"

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

@@ -112,8 +112,6 @@
     <string name="sickle_cert">Sickle Cert</string>
     <string name="sickle_find">Sickle Find</string>
     <string name="submit">Submit</string>
-    <string name="place_buffer">Start Buffer</string>
-    <string name="Start_Sample">Start Sample</string>
     <string name="new_kit">New Kit</string>
     <string name="new_buffer">New Buffer</string>
     <string name="name_error_2">Invalid character, Allowed characters are Letters, Numbers and ( ) _ - , . only</string>
@@ -192,5 +190,8 @@
     <string name="test_completed">Test Completed</string>
     <string name="select_blood_group">Select Blood Group</string>
     <string name="all_registered_user_are_tested_successfully">All registered user are tested successfully</string>
+    <string name="venous_blood">Venous Blood</string>
+    <string name="finger_prick_blood">Finger Prick Blood</string>
+    <string name="select_blood_collecting_method">Select blood collecting method</string>
 
 </resources>