kit scan qr code scanning is added, some issues are still resolving only

app/build.gradle

@@ -129,7 +129,7 @@ dependencies {
 
     // Barcode scanner
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
-
+    implementation 'com.github.yuriy-budiyev:code-scanner:2.3.0'
     // Google ML Kit using play services
     implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
 

app/src/main/AndroidManifest.xml

@@ -6,14 +6,15 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-
     <uses-permission
         android:name="android.permission.BATTERY_STATS"
         tools:ignore="ProtectedPermissions" />
-
-    <uses-feature android:name="android.hardware.camera" />
-
     <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -25,16 +26,19 @@
 
     <application
         android:name="com.example.hpostesting.HPOSTestingApplication"
-        android:largeHeap="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/hpos_icon"
         android:label="@string/app_name"
+        android:largeHeap="true"
         android:roundIcon="@mipmap/hpos_icon_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.HPOSTesting"
         tools:targetApi="31">
+        <activity
+            android:name="com.example.hpostesting.presentation.ScannerKitActvity"
+            android:exported="false" />
         <activity
             android:name="com.example.hpostesting.presentation.deviceinfo.DeviceActivity"
             android:exported="false" />
@@ -60,23 +64,20 @@
         <activity
             android:name="com.example.hpostesting.presentation.calibration.CalibrationActivity"
             android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar"/>
+            android:theme="@style/Theme.HPOS.NoActionBar" />
-
         <activity
             android:name="com.example.hpostesting.presentation.assurance.AssuranceControlsActivity"
             android:exported="false"
             android:screenOrientation="portrait"
-            android:theme="@style/Theme.HPOS.NoActionBar"/>
+            android:theme="@style/Theme.HPOS.NoActionBar" />
-
         <activity
             android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
             android:exported="false"
             android:noHistory="true"
-            android:screenOrientation="portrait"
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.HPOS.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
-
         <activity
             android:name="com.example.hpostesting.presentation.trueheme.TrueHemeActivity"
             android:exported="false"
@@ -84,7 +85,6 @@
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
             android:theme="@style/Theme.HPOS.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
-
         <activity
             android:name="com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity"
             android:exported="false"
@@ -94,27 +94,29 @@
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name="com.example.hpostesting.presentation.KitScanActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
             android:exported="false"
             android:noHistory="true"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
+            android:theme="@style/Theme.HPOS.NoActionBar"
+            android:windowSoftInputMode="stateHidden" />
         <activity
             android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
             android:exported="false"
             android:label="@string/title_activity_dashboard"
-            android:theme="@style/Theme.HPOS.NoActionBar"
             android:screenOrientation="portrait"
+            android:theme="@style/Theme.HPOS.NoActionBar"
             tools:ignore="AppLinkUrlError,MissingClass">
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:scheme="content" />
                 <data android:scheme="file" />
                 <data android:mimeType="application/vnd.android.package-archive" />
             </intent-filter>
         </activity>
 
-
         <service
             android:name="com.example.hpostesting.util.UsbService"
             android:enabled="true"
@@ -126,8 +128,9 @@
             android:noHistory="true"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER"/>
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
@@ -164,8 +167,7 @@
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="portrait"
             android:stateNotNeeded="true"
-            tools:replace="android:screenOrientation" />
+            tools:replace="android:screenOrientation" /> <!-- ${applicationId} -->
-<!--        ${applicationId}-->
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
@@ -175,7 +177,6 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
-
     </application>
 
 </manifest>

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

@@ -38,6 +38,7 @@ object Constants {
     const val DEVICE_TYPE_HEMOCUBE = "HEMOCUBE"
     const val DEVICE_TYPE_TEST_RIGHT = "TEST_RIGHT"
     const val DEVICE_TYPE_TRUEHEME = "TRUEHEME"
+    const val DEVICE_VERSION_TYPE = "V0"
 
     const val DEVICE_VENDOR_ID = 1027
     const val HOMO_CUBE_ID = 29987

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

@@ -1,5 +1,6 @@
 package com.example.hpostesting.presentation
 
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -9,6 +10,7 @@ import android.util.Log
 import android.view.View
 import android.widget.EditText
 import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
@@ -32,7 +34,7 @@ import com.zebra.scannercontrol.SDKHandler
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityKitScanBinding
 
-class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
+class KitScanActivity : AppCompatActivity() {
 
     private val TAG = "KitScanActivity"
     private lateinit var binding: ActivityKitScanBinding
@@ -42,22 +44,36 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
     var sdkHandler: SDKHandler? = null
     var editBarcode: EditText? = null
     var mScannerInfoList = ArrayList<DCSScannerInfo>()
+    companion object {
+        const val QR_REQUEST_CODE = 1
+    }
+//    private val barcodeLauncher = registerForActivityResult(
+//        ScanContract()
+//    ) { result: ScanIntentResult ->
+//        Log.d(TAG, result.contents)
+//        if (result.contents.isNullOrEmpty()) {
+//            Toast.makeText(this, R.string.cancelled_unable_scan, Toast.LENGTH_LONG).show()
+//        } else {
+//            Log.d(TAG, result.contents)
+//            processScannedData(result.contents)
+//        }
+//    }
+//
+//    private fun processScannedData(contents: String) {
+//        binding.nameEditText.setText(contents)
+//    }
 
-    private val barcodeLauncher = registerForActivityResult(
+    // In your calling activity
-        ScanContract()
+    var resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-    ) { result: ScanIntentResult ->
+        if (result.resultCode == Activity.RESULT_OK) {    // Handle the result
-        if (result.contents.isNullOrEmpty()) {
+            val qrCode = result.data?.getStringExtra("QRCode")
-            Toast.makeText(this, R.string.cancelled_unable_scan, Toast.LENGTH_LONG).show()
+            Toast.makeText(this, "scanned kit text:$qrCode",
-        } else {
+                Toast.LENGTH_LONG).show()
-            Log.d(TAG, result.contents)
+//                val editText = findViewById<com.google.android.material.textfield.TextInputEditText>(R.id.name_edit_text)
-            processScannedData(result.contents)
+            binding.nameEditText.setText(qrCode)
+            // Use data to retrieve extra
         }
     }
-
-    private fun processScannedData(contents: String) {
-        binding.nameEditText.setText(contents)
-    }
-
     override fun attachBaseContext(newBase: Context?) {
         val languageCode = LanguageManager.getSavedLanguage(newBase!!)
         LanguageManager.setLocale(newBase, languageCode)
@@ -65,33 +81,33 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
     }
 
 
-    override fun dcssdkEventScannerAppeared(dcsScannerInfo: DCSScannerInfo?) {}
+//    override fun dcssdkEventScannerAppeared(dcsScannerInfo: DCSScannerInfo?) {}
-
+//
-    override fun dcssdkEventScannerDisappeared(i: Int) {}
+//    override fun dcssdkEventScannerDisappeared(i: Int) {}
-
+//
-    override fun dcssdkEventCommunicationSessionEstablished(dcsScannerInfo: DCSScannerInfo?) {}
+//    override fun dcssdkEventCommunicationSessionEstablished(dcsScannerInfo: DCSScannerInfo?) {}
-
+//
-    override fun dcssdkEventCommunicationSessionTerminated(i: Int) {}
+//    override fun dcssdkEventCommunicationSessionTerminated(i: Int) {}
-//    override fun dcssdkEventBarcode(p0: ByteArray?, p1: Int, p2: Int) {
+////    override fun dcssdkEventBarcode(p0: ByteArray?, p1: Int, p2: Int) {
-//        TODO("Not yet implemented")
+////        TODO("Not yet implemented")
+////    }
+//
+//
+//    override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {}
+//
+//    override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {}
+//
+//    override fun dcssdkEventBinaryData(bytes: ByteArray?, i: Int) {}
+//
+//    override fun dcssdkEventFirmwareUpdate(firmwareUpdateEvent: FirmwareUpdateEvent?) {}
+//
+//    override fun dcssdkEventAuxScannerAppeared(
+//        dcsScannerInfo: DCSScannerInfo?,
+//        dcsScannerInfo1: DCSScannerInfo?,
+//    ) {
 //    }
-
+//
-
+//    override fun dcssdkEventConfigurationUpdate(configurationUpdateEvent: ConfigurationUpdateEvent?) {}
-    override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventBinaryData(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventFirmwareUpdate(firmwareUpdateEvent: FirmwareUpdateEvent?) {}
-
-    override fun dcssdkEventAuxScannerAppeared(
-        dcsScannerInfo: DCSScannerInfo?,
-        dcsScannerInfo1: DCSScannerInfo?,
-    ) {
-    }
-
-    override fun dcssdkEventConfigurationUpdate(configurationUpdateEvent: ConfigurationUpdateEvent?) {}
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -151,8 +167,9 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         setSupportActionBar(binding.toolbar)
 
         binding.btnScanNow.setOnClickListener {
-//            startScanningNow()
+//            startForResult.launch(Intent(this, ScannerKitActvity::class.java))
-            pullTrigger()
+            val intent = Intent(this, ScannerKitActvity::class.java)
+            resultLauncher.launch(intent)
         }
 
         binding.btnGo.setOnClickListener {
@@ -207,26 +224,26 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         }
 
         //Setting up the SDK handler
-        sdkHandler = SDKHandler(this)
+//        sdkHandler = SDKHandler(this)
-        //Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications.
+//        //Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications.
-        sdkHandler!!.dcssdkSetDelegate(this)
+//        sdkHandler!!.dcssdkSetDelegate(this)
-        //this command is telling the sdk that we're going to be connecting to the scanner via USB
+//        //this command is telling the sdk that we're going to be connecting to the scanner via USB
-        sdkHandler!!.dcssdkSetOperationalMode(DCSSDKDefs.DCSSDK_MODE.DCSSDK_OPMODE_SNAPI)
+//        sdkHandler!!.dcssdkSetOperationalMode(DCSSDKDefs.DCSSDK_MODE.DCSSDK_OPMODE_SNAPI)
-
+//
-        //deciding what kind of notifications we want to receive. Explained more in the function
+//        //deciding what kind of notifications we want to receive. Explained more in the function
-        //first we use bitmapping to set these values into the notifications_mask.
+//        //first we use bitmapping to set these values into the notifications_mask.
-        var notifications_mask = 0
+//        var notifications_mask = 0
-        // We would like to subscribe to all barcode events
+//        // We would like to subscribe to all barcode events
-        notifications_mask =
+//        notifications_mask =
-            notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
+//            notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
-        sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
+//        sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
-        mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
+//        mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
-        Log.e("scannersize", sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
+//        Log.e("scannersize", sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
-        if (mScannerInfoList.isNotEmpty()) {
+//        if (mScannerInfoList.isNotEmpty()) {
-            sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
+//            sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
-        } else {
+//        } else {
-            Toast.makeText(this,"Scanner Is not available In this device", Toast.LENGTH_LONG).show()
+//            Toast.makeText(this,"Scanner Is not available In this device", Toast.LENGTH_LONG).show()
-        }
+//        }
     }
 
     private fun pullTrigger() {
@@ -257,14 +274,14 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
     }
 
     //this function is called if barcode is detected.
-    override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) {
+//    override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) {
-        val result = String(barcodeData!!)
+//        val result = String(barcodeData!!)
-        Log.d("BARCODE", result)
+//        Log.d("BARCODE", result)
-        runOnUiThread {
+//        runOnUiThread {
-            val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
+//            val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
-            binding.nameEditText.text = editableResult
+//            binding.nameEditText.text = editableResult
-        }
+//        }
-    }
+//    }
 
     private fun checkHemoCubeKitData(): Boolean {
         return sharedPreference.getString(Constants.KIT_NUMBER, "")
@@ -303,21 +320,21 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         }
     }
 
-    private fun startScanningNow() {
+//    private fun startScanningNow() {
-        val options = ScanOptions()
+//        val options = ScanOptions()
-        options.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
+//        options.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
-        options.setPrompt("Scan a barcode")
+//        options.setPrompt("Scan a barcode")
-        options.setCameraId(0) // Use a specific camera of the device
+//        options.setCameraId(0) // Use a specific camera of the device
-
+//
-        options.setBeepEnabled(true)
+//        options.setBeepEnabled(true)
-        options.setBarcodeImageEnabled(true)
+//        options.setBarcodeImageEnabled(true)
-
+//
-        options.setPrompt("Start Scanning")
+//        options.setPrompt("Start Scanning")
-        options.setOrientationLocked(false)
+//        options.setOrientationLocked(false)
-//        options.setTimeout(10000) // in ms
+////        options.setTimeout(10000) // in ms
-
+//
-        barcodeLauncher.launch(options)
+//        barcodeLauncher.launch(options)
-    }
+//    }
 
     private fun checkDataNotNull(): Boolean {
         return if (DataHolder.selectedTest?._id == null) {
@@ -333,4 +350,13 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
             true
         }
     }
+
+//    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+//        super.onActivityResult(requestCode, resultCode, data)
+//        if (requestCode == QR_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
+//            val qrCode = data?.getStringExtra("QRCode")
+////                val editText = findViewById<com.google.android.material.textfield.TextInputEditText>(R.id.name_edit_text)
+//                binding.nameEditText.setText(qrCode)
+//            }
+//    }
 }

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

@@ -0,0 +1,73 @@
+package com.example.hpostesting.presentation
+
+import android.app.Activity
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.widget.Toast
+import com.budiyev.android.codescanner.AutoFocusMode
+import com.budiyev.android.codescanner.CodeScanner
+import com.budiyev.android.codescanner.CodeScannerView
+import com.budiyev.android.codescanner.DecodeCallback
+import com.budiyev.android.codescanner.ErrorCallback
+import com.budiyev.android.codescanner.ScanMode
+import `in`.sminnovations.hpostesting.R
+
+class ScannerKitActvity : AppCompatActivity() {
+    private lateinit var codeScanner: CodeScanner
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_scanner_kit_actvity)
+        val scannerView = findViewById<CodeScannerView>(R.id.scanner_view)
+
+        codeScanner = CodeScanner(this, scannerView)
+
+        // Parameters (default values)
+        codeScanner.camera = CodeScanner.CAMERA_BACK // or CAMERA_FRONT or specific camera id
+        codeScanner.formats = CodeScanner.ALL_FORMATS // list of type BarcodeFormat,
+        // ex. listOf(BarcodeFormat.QR_CODE)
+        codeScanner.autoFocusMode = AutoFocusMode.SAFE // or CONTINUOUS
+        codeScanner.scanMode = ScanMode.SINGLE // or CONTINUOUS or PREVIEW
+        codeScanner.isAutoFocusEnabled = true // Whether to enable auto focus or not
+        codeScanner.isFlashEnabled = false // Whether to enable flash or not
+
+        // Callbacks
+        codeScanner.decodeCallback = DecodeCallback {
+            runOnUiThread {
+                Toast.makeText(this, "scanned text: ${it.text}",
+                    Toast.LENGTH_LONG).show()
+            }
+            val resultIntent = Intent()
+            resultIntent.putExtra("QRCode", it.text)
+            setResult(Activity.RESULT_OK, resultIntent)
+
+
+        }
+        codeScanner.errorCallback = ErrorCallback { // or ErrorCallback.SUPPRESS
+            runOnUiThread {
+                Toast.makeText(this, "Camera initialization error: ${it.message}",
+                    Toast.LENGTH_LONG).show()
+            }
+        }
+
+        scannerView.setOnClickListener {
+            codeScanner.startPreview()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        codeScanner.startPreview()
+    }
+
+    override fun onPause() {
+        codeScanner.releaseResources()
+        super.onPause()
+    }
+
+    override fun onBackPressed() {
+        // You can do additional work here before calling super
+        super.onBackPressed() // This calls finish() behind the scenes for you
+    }
+
+}

app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt

@@ -168,23 +168,33 @@ class AssuranceControlsFragment : Fragment() {
         binding.btnSubmit.setOnClickListener {
             val selectedSolution = binding.spinnerSolutions.selectedItem.toString()
             val selectedConcentration = binding.spinnerConcentration.selectedItem.toString()
-            val selectedadminOption = binding.spinnerAdmin.selectedItem.toString()
 
-            // Check if any of the selections are default values
-//            if (selectedSolution == "Select solution") {
-//                Toast.makeText(requireContext(), "Please select a solution", Toast.LENGTH_LONG).show()
-//                return@setOnClickListener // Prevent further execution
-//            }
-//
-//            if (selectedConcentration == "Select concentration") {
-//                Toast.makeText(requireContext(), "Please select a concentration", Toast.LENGTH_LONG).show()
-//                return@setOnClickListener // Prevent further execution
-//            }
 
-            if (selectedadminOption == "Select options") {
+//             Check if any of the selections are default values
-                Toast.makeText(requireContext(), "Please select a option", Toast.LENGTH_LONG).show()
+            if (selectedSolution == "Select solution") {
+                Toast.makeText(requireContext(), "Please select a solution", Toast.LENGTH_LONG).show()
                 return@setOnClickListener // Prevent further execution
             }
+
+            if (selectedConcentration == "Select concentration") {
+                Toast.makeText(requireContext(), "Please select a concentration", Toast.LENGTH_LONG).show()
+                return@setOnClickListener // Prevent further execution
+            }
+            //for vizagh
+//            val selectedadminOption = binding.spinnerAdmin.selectedItem.toString()
+//            if (selectedadminOption == "Select options") {
+//                Toast.makeText(requireContext(), "Please select a option", Toast.LENGTH_LONG).show()
+//                return@setOnClickListener // Prevent further execution
+//            }
+//            DataHolder.hemoCubeTestData!!.filter = binding.spinnerAdmin.selectedItem.toString()
+//            if(binding.spinnerAdmin.selectedItem.toString().equals("Select options")){
+//                Toast.makeText(requireContext(), "Please select a option", Toast.LENGTH_LONG).show()
+//            }else {
+//                DataHolder.hemoCubeTestData!!.name = DataHolder.hemoCubeTestData!!.filter.toString()
+//            }
+
+
+
             DataHolder.hemoCubeTestData!!.quickCapture = true
             val currentUnixTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 Instant.now().epochSecond
@@ -194,18 +204,14 @@ class AssuranceControlsFragment : Fragment() {
             DataHolder.hemoCubeTestData!!._id = currentUnixTime.toString() + "SMI"
             DataHolder.hemoCubeTestData!!.solution = binding.spinnerSolutions.selectedItem.toString()
             DataHolder.hemoCubeTestData!!.concentration = binding.spinnerConcentration.selectedItem.toString()
-            DataHolder.hemoCubeTestData!!.filter = binding.spinnerAdmin.selectedItem.toString()
-            if(binding.spinnerAdmin.selectedItem.toString().equals("Select options")){
-                Toast.makeText(requireContext(), "Please select a option", Toast.LENGTH_LONG).show()
-            }else {
-                DataHolder.hemoCubeTestData!!.name = DataHolder.hemoCubeTestData!!.filter.toString()
-            }
 
 
 
             DataHolder.selectedTest = UserData()
             DataHolder.selectedTest?._id = DataHolder.hemoCubeTestData!!._id
             DataHolder.selectedTest?.name = DataHolder.hemoCubeTestData!!.name
+            DataHolder.selectedTest?.name = binding.spinnerSolutions.selectedItem.toString() + " " +binding.spinnerConcentration.selectedItem.toString()
+
 
             with(sharedPreferences.edit()) {
                 putString(Constants.QUICK_CAPTURE_SOLUTION, DataHolder.hemoCubeTestData!!.solution)

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

@@ -289,7 +289,7 @@ class HomeFragment : Fragment() {
                 apply()
             }
             startActivity(Intent(requireContext(), KitScanActivity::class.java))
-            requireActivity().finish()
+//            requireActivity().finish()
         }
 
 
@@ -300,7 +300,7 @@ class HomeFragment : Fragment() {
                 apply()
             }
             startActivity(Intent(requireContext(), KitScanActivity::class.java))
-            requireActivity().finish()
+//            requireActivity().finish()
         }
         binding.btnQuickCapture.setOnClickListener {
             DataHolder.hemoCubeTestData = HemoCubeTestData()

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

@@ -38,6 +38,7 @@ import kotlin.math.log10
 class HemoCubeFragment : Fragment() {
     private var checkCuvette = false
     private var checkCuvetteSam = false
+    private var borderlineMetric = 0.0
     private var sampleClick = false
     private lateinit var binding: FragmentHemoCubeReferenceBinding
     private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
@@ -120,12 +121,12 @@ class HemoCubeFragment : Fragment() {
         binding.tvSubtitle4.text = "Config"
 
 
-        if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
+        if (isBufferValueAvailable()) {
             binding.btnPlacebuffer.apply {
                 setBackgroundColor(Color.GREEN) // Set button background color to green
                 text = "Fresh Buffer" // Change button text to "Buffer Exists"
             }
-        }else if(!isBufferValueAvailable() || Constants.BLANK_EVERY_TEST){
+        }else{
             binding.btnPlacebuffer.apply {
                 setBackgroundColor(Color.RED) // Set button background color to green
                 text = "No Buffer" // Change button text to "Buffer Exists"
@@ -135,23 +136,23 @@ class HemoCubeFragment : Fragment() {
 
         binding.btnSamplestart.setOnClickListener {
             sampleClick = true
-            if(checkCuvetteSam){
+           // if(checkCuvetteSam){
                 activity?.runOnUiThread {
                     binding.tvSubtitle4.visibility = View.VISIBLE
 //                binding.tvSubtitle4.text = "Sample Started"
                 }
                 startSampleProcess()
 //                it.visibility = View.GONE
-            }else{
+//            }else{
-                checkCuvettePresence()
+//                checkCuvettePresence()
-            }
+//            }
         }
         binding.btnRetryCheckCuvette.setOnClickListener {
 
             checkCuvettePresence()
         }
         binding.btnPlacebuffer.setOnClickListener {
-            if(checkCuvette){
+          //  if(checkCuvette){
 
                 startBufferProcess()
 //                if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
@@ -166,9 +167,9 @@ class HemoCubeFragment : Fragment() {
 
 //                    it.visibility = View.GONE
 //                }
-            }else{
+//            }else{
-                checkCuvettePresence()
+//                checkCuvettePresence()
-            }
+//            }
 
         }
 
@@ -869,12 +870,16 @@ class HemoCubeFragment : Fragment() {
             val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
             val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
             //used for latest trueheme and v1
-//            val deviceRatio = led2Average / led1Average
+            val deviceRatio: Double
-//            val borderlineMetric = (led1Average - led2Average) / deviceRatio
+            if(Constants.DEVICE_VERSION_TYPE == "V0"){
-            //used for latest v0 devices
+                //used for latest v0 devices
-            val deviceRatio = led4Average / led1Average
+                 deviceRatio = led4Average / led1Average
-            val borderlineMetric = (led1Average - led4Average) / deviceRatio
+                borderlineMetric = (led1Average - led4Average) / deviceRatio
 
+            }else {
+                 deviceRatio = led2Average / led1Average
+                 borderlineMetric = (led1Average - led2Average) / deviceRatio
+            }
             if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
                     ?.get(0)!!
                 || led2BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(

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

@@ -3,8 +3,7 @@
     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"
+    android:layout_height="match_parent">
-    tools:context=".presentation.KitScanActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.budiyev.android.codescanner.CodeScannerView
+        android:id="@+id/scanner_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:autoFocusButtonColor="@android:color/white"
+        app:autoFocusButtonVisible="true"
+        app:flashButtonColor="@android:color/white"
+        app:flashButtonVisible="true"
+        app:frameColor="@android:color/white"
+        app:frameCornersSize="50dp"
+        app:frameCornersRadius="0dp"
+        app:frameAspectRatioWidth="1"
+        app:frameAspectRatioHeight="1"
+        app:frameSize="0.75"
+        app:frameThickness="2dp"
+        app:frameVerticalBias="0.5"
+        app:maskColor="#77000000"/>
+</FrameLayout>

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

@@ -0,0 +1,9 @@
+<?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.ScannerKitActvity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -39,7 +39,7 @@
     <Spinner
         android:id="@+id/spinner_solutions"
         android:layout_width="0dp"
-        android:visibility="gone"
+        android:visibility="visible"
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
         android:background="@drawable/spinner_border"
@@ -51,7 +51,7 @@
     <Spinner
         android:id="@+id/spinner_concentration"
         android:layout_width="0dp"
-        android:visibility="gone"
+        android:visibility="visible"
         android:layout_height="wrap_content"
         android:layout_marginTop="48dp"
         android:background="@drawable/spinner_border"
@@ -65,7 +65,7 @@
     <Spinner
         android:id="@+id/spinner_admin"
         android:layout_width="0dp"
-        android:visibility="visible"
+        android:visibility="gone"
         android:layout_height="wrap_content"
         android:layout_marginTop="52dp"
         android:background="@drawable/spinner_border"

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.budiyev.android.codescanner.CodeScannerView
+        android:id="@+id/scanner_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:autoFocusButtonColor="@android:color/white"
+        app:autoFocusButtonVisible="true"
+        app:flashButtonColor="@android:color/white"
+        app:flashButtonVisible="true"
+        app:frameColor="@android:color/white"
+        app:frameCornersSize="50dp"
+        app:frameCornersRadius="0dp"
+        app:frameAspectRatioWidth="1"
+        app:frameAspectRatioHeight="1"
+        app:frameSize="0.75"
+        app:frameThickness="2dp"
+        app:frameVerticalBias="0.5"
+        app:maskColor="#77000000"/>
+</FrameLayout>