Update .gitlab-ci.yml file

new branch for review, refactored the code
rename of the branch
2024-12-16 07:43:49 +00:00 · 2024-12-13 12:10:51 +05:30 · 2024-10-15 15:56:03 +05:30 · 2024-10-15 15:04:39 +05:30 · 2024-10-09 16:55:44 +05:30 · 2024-10-09 15:06:05 +05:30
81 changed files with 3778 additions and 2391 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,63 +1,31 @@
-# This file is a template, and might need editing before it works on your project.
-# To contribute improvements to CI/CD templates, please follow the Development guide at:
-# https://docs.gitlab.com/ee/development/cicd/templates.html
-# This specific template is located at:
-# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Android.gitlab-ci.yml
-
-# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny
-# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template.
-
 image: eclipse-temurin:17-jdk-jammy

 variables:
-
-  # ANDROID_COMPILE_SDK is the version of Android you're compiling with.
-  # It should match compileSdkVersion.
  ANDROID_COMPILE_SDK: "34"
-
-  # ANDROID_BUILD_TOOLS is the version of the Android build tools you are using.
-  # It should match buildToolsVersion.
  ANDROID_BUILD_TOOLS: "33.0.2"
-
-  # It's what version of the command line tools we're going to download from the official site.
-  # Official Site-> https://developer.android.com/studio/index.html
-  # There, look down below at the cli tools only, sdk tools package is of format:
-  #        commandlinetools-os_type-ANDROID_SDK_TOOLS_latest.zip
-  # when the script was last modified for latest compileSdkVersion, it was which is written down below
  ANDROID_SDK_TOOLS: "9477386"
  
-# Packages installation before running script
+  # Keystore credentials stored as GitLab CI/CD variables
+  KEYSTORE_PASSWORD: $KS_PASSWORD
+  KEY_ALIAS: $KS_ALIAS
+  KEY_PASSWORD: $KS_KEY_PASSWORD
+
 before_script:
  - apt-get --quiet update --yes
  - apt-get --quiet install --yes wget unzip
-
-  # Setup path as android_home for moving/exporting the downloaded sdk into it
  - export ANDROID_HOME="${PWD}/android-sdk-root"
-  # Create a new directory at specified location
  - install -d $ANDROID_HOME
-  # Here we are installing androidSDK tools from official source,
-  # (the key thing here is the url from where you are downloading these sdk tool for command line, so please do note this url pattern there and here as well)
-  # after that unzipping those tools and
-  # then running a series of SDK manager commands to install necessary android SDK packages that'll allow the app to build
  - wget --no-verbose --output-document=$ANDROID_HOME/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip
  - unzip -q -d "$ANDROID_HOME/cmdline-tools" "$ANDROID_HOME/cmdline-tools.zip"
  - mv -T "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/tools"
  - export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/cmdline-tools/tools/bin
-
-  # Nothing fancy here, just checking sdkManager version
  - sdkmanager --version
-
-  # use yes to accept all licenses
  - yes | sdkmanager --licenses > /dev/null || true
  - sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}"
  - sdkmanager "platform-tools"
  - sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
-
-  # Not necessary, but just for surity
  - chmod +x ./gradlew

-# Basic android and gradle stuff
-# Check linting
 lintDebug:
  interruptible: true
  stage: build
@@ -69,7 +37,6 @@ lintDebug:
    expose_as: "lint-report"
    when: always

-# Make Project
 assembleDebug:
  interruptible: true
  stage: build
@@ -79,7 +46,67 @@ assembleDebug:
    paths:
      - app/build/outputs/
      
-# Run all tests, if any fails, interrupt the pipeline(fail it)
+# Job for building signed release APK for tags containing "release" on any branch
+assembleRelease:
+  stage: build
+  script:
+    - |
+      if [[ "$CI_COMMIT_TAG" =~ release ]]; then
+        echo "Decoding keystore file from Base64"
+        
+        # Debug: Print the first few characters of BASE64_KEYSTORE
+        echo "First 20 characters of BASE64_KEYSTORE: ${BASE64_KEYSTORE:0:20}..."
+        
+        # Check if BASE64_KEYSTORE is a file path
+        if [[ "$BASE64_KEYSTORE" == /* ]] && [[ -f "$BASE64_KEYSTORE" ]]; then
+          echo "BASE64_KEYSTORE appears to be a file path. Reading content..."
+          BASE64_CONTENT=$(cat "$BASE64_KEYSTORE")
+        else
+          echo "BASE64_KEYSTORE is not a file path. Using as-is."
+          BASE64_CONTENT="$BASE64_KEYSTORE"
+        fi
+        
+        # Remove any potential whitespace or newline characters
+        CLEANED_KEYSTORE=$(echo "$BASE64_CONTENT" | tr -d '[:space:]')
+        
+        # Attempt to decode and save to a file
+        if echo "$CLEANED_KEYSTORE" | base64 -d > "$CI_PROJECT_DIR/app/keystore.jks" 2>/tmp/base64_error; then
+          echo "Keystore file decoded successfully"
+        else
+          echo "Error decoding keystore file:"
+          cat /tmp/base64_error
+          echo "First 20 characters of cleaned content: ${CLEANED_KEYSTORE:0:20}..."
+          exit 1
+        fi
+        
+        # Check if the keystore file was created and has content
+        if [ -s "$CI_PROJECT_DIR/app/keystore.jks" ]; then
+          echo "Keystore file created successfully"
+          # Print file size for verification
+          ls -l "$CI_PROJECT_DIR/app/keystore.jks"
+        else
+          echo "Error: Keystore file is empty or not created"
+          exit 1
+        fi
+        
+        echo "Building signed release APK"
+        ./gradlew assembleRelease \
+          -Pandroid.injected.signing.store.file="$CI_PROJECT_DIR/app/keystore.jks" \
+          -Pandroid.injected.signing.store.password="$KEYSTORE_PASSWORD" \
+          -Pandroid.injected.signing.key.alias="$KEY_ALIAS" \
+          -Pandroid.injected.signing.key.password="$KEY_PASSWORD"
+      else
+        echo "Tag '$CI_COMMIT_TAG' does not contain 'release'. Skipping release build."
+      fi
+  artifacts:
+    paths:
+      - app/build/outputs/
+    expire_in: never
+  rules:
+    - if: $CI_COMMIT_TAG =~ /release/
+      when: always
+    - when: never
+
 debugTests:
  needs: [lintDebug, assembleDebug]
  interruptible: true
--- a/README.md
+++ b/README.md
@@ -2,3 +2,4 @@
 ### Release key

 	key0: prime24
+        
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,13 +15,13 @@ android {
    namespace 'in.sminnovations.hpostesting'

    // dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production
+    // server -> for server switching for internal test
    defaultConfig {
-        applicationId "in.sminnovations.hpostesting.iocl"
+        applicationId "in.sminnovations.hpostesting.server"
        minSdk 21
        targetSdk 34
-        versionCode 127
-        versionName "2.1.127"
-
+        versionCode 130
+        versionName "2.1.130"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

@@ -124,7 +124,6 @@ dependencies {
    implementation 'com.github.mik3y:usb-serial-for-android:3.8.0'

    implementation "androidx.fragment:fragment-ktx:1.6.2"
-
    // CSV read, write
    implementation 'com.opencsv:opencsv:5.9'

--- a/app/google-services.json
+++ b/app/google-services.json
@@ -1,64 +1,36 @@
 {
  "project_info": {
-    "project_number": "243503501547",
-    "project_id": "iocl-iisc-hpos",
-    "storage_bucket": "iocl-iisc-hpos.appspot.com"
+    "project_number": "650071678820",
+    "project_id": "hpos-af3cc",
+    "storage_bucket": "hpos-af3cc.appspot.com"
  },
  "client": [
    {
      "client_info": {
-        "mobilesdk_app_id": "1:243503501547:android:f17de652a3524d047feeae",
+        "mobilesdk_app_id": "1:650071678820:android:f6fd45e2f6a63aef6c6471",
        "android_client_info": {
-          "package_name": "com.iocl_iisc.hposqc"
+          "package_name": "in.sminnovations.hpostesting.server"
        }
      },
-      "oauth_client": [],
+      "oauth_client": [
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
      "api_key": [
        {
-          "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k"
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
        }
      ],
      "services": {
        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
-    },
+          "other_platform_oauth_client": [
            {
-      "client_info": {
-        "mobilesdk_app_id": "1:243503501547:android:e1bb0f338c8448dd7feeae",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hposregistration.iocl"
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
            }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:243503501547:android:18b8b33b2dc3776d7feeae",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting.iocl"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
+          ]
        }
      }
    }
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -4,15 +4,15 @@
    "type": "APK",
    "kind": "Directory"
  },
-  "applicationId": "in.sminnovations.hpostesting.iocl",
+  "applicationId": "in.sminnovations.hpostesting.dev",
  "variantName": "release",
  "elements": [
    {
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 128,
-      "versionName": "2.1.128",
+      "versionCode": 127,
+      "versionName": "2.1.127",
      "outputFile": "app-release.apk"
    }
  ],
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,6 +25,12 @@

    <uses-permission android:name="android.permission.USB_PERMISSION" />

+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.ACCOUNT_MANAGER"
+        tools:ignore="ProtectedPermissions" />
+
+
    <application
        android:name="com.example.hpostesting.HPOSTestingApplication"
        android:allowBackup="true"
@@ -74,6 +80,10 @@
            android:name="com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity"
            android:exported="false"
            android:theme="@style/Theme.HPOS.NoActionBar" />
+        <activity
+            android:name="com.example.hpostesting.presentation.hb_test.HBTestActivity"
+            android:exported="false"
+            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.autodac.AutoDacActivity"
            android:exported="false"
@@ -124,7 +134,8 @@
            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
-            android:exported="false"
+            android:exported="true"
+            android:permission=""
            android:label="@string/title_activity_dashboard"
            android:screenOrientation="portrait"
            android:theme="@style/Theme.HPOS.NoActionBar"
@@ -166,8 +177,9 @@
        </activity>
        <activity
            android:name="com.example.hpostesting.presentation.testRight.TestRightActivity"
-            android:exported="false"
+            android:exported="true"
            android:noHistory="true"
+            android:permission=""
            android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
            android:theme="@style/Theme.HPOS.NoActionBar"
            android:windowSoftInputMode="adjustPan">
@@ -184,6 +196,7 @@
        <activity
            android:name="com.example.hpostesting.presentation.MainActivity"
            android:exported="true"
+            android:permission=""
            android:screenOrientation="portrait"
            android:theme="@style/AppTheme.NoActionBar">
            <intent-filter>
--- a/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt
+++ b/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt
@@ -14,25 +14,28 @@
 package com.example.hpostesting

 import android.app.Application
-import com.google.firebase.firestore.FirebaseFirestore
+import com.example.hpostesting.firebase.FirebaseManager
 import com.google.firebase.firestore.FirebaseFirestoreSettings
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import javax.inject.Inject

@HiltAndroidApp
 class HPOSTestingApplication : Application() {
-    val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
+    @Inject
+    lateinit var firebaseManager: FirebaseManager
    override fun onCreate() {
        super.onCreate()
        val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+        // You can now use firebaseManager here after Hilt injects it
        val firestoreSettings = FirebaseFirestoreSettings.Builder()
            .setPersistenceEnabled(true) // Enable offline persistence if needed
            .build()

-        val firestore = FirebaseFirestore.getInstance()
+        val firestore = firebaseManager.getCurrentFirestoreF()
        firestore.firestoreSettings = firestoreSettings
    }
 }
--- a/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt
+++ b/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt
@@ -43,10 +43,6 @@ interface MolbioResultApi {
        @Body checkUpdateRequest: CheckUpdateRequest,
    ): CheckUpdateResponse

-//    @POST("deviceService/device/getUpdate")
-//    suspend fun deviceUpdate(
-//        @Body deviceUpdateRequest: DeviceUpdateRequest,
-//    ): ResponseBody
    @POST("deviceService/device/getUpdate")
    suspend fun deviceUpdate(
        @Body deviceUpdateRequest: DeviceUpdateRequest,
--- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
@@ -28,7 +28,8 @@ object Constants {
    const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb"
    const val ABHA_APP_PACKAGE = "in.ndhm.phr"

-    const val MOLBIO_INTEGRATION = true
+    const val MOLBIO_INTEGRATION = false
+    const val FIREBASE_INTEGRATION = true
    const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
    const val deviceProvisionPassword = "f2ab0e7f9d69"
    const val DEVICE_ID_API = "deviceIDAPI"
@@ -44,8 +45,8 @@ object Constants {

    const val TEST_RIGHT_TOTAL_PIXEL = 3694

-    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 35
-    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM = 10
+    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 34
+    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM = 9

    const val RANGE_IN_RESULT_CALCULATIONS = 10

@@ -1627,177 +1628,4 @@ object Constants {
    const val bufferMaxLed1 = 23000.00
    const val bufferMinLed2 = 17000.00
    const val bufferMaxLed2 = 19000.00
-
-
-    //    val STATICID = listOf(
-//        "FACTORY",
-//        "ADMIN",
-//        "PQUSER",
-//        "QCUSER",
-//        "VIZ-1000-0004",
-//        "VIZ-1000-0005",
-//        "VIZ-1000-0006",
-//        "HC-V1-001",
-//        "HC-V1-002",
-//        "HC-V1-003",
-//        "HC-V1-004",
-//        "HC-V1-005",
-//        "HC-V1-006",
-//        "HC-V1-007",
-//        "HC-V1-008",
-//        "HC-V1-009",
-//        "HC-V1-010",
-//        "HC-V1-011",
-//        "HC-V1-012",
-//        "HC-V1-013",
-//        "HC-V1-014",
-//        "HC-V1-015",
-//        "HC-V1-016",
-//        "HC-V1-017",
-//        "HC-V1-018",
-//        "HC-V1-019",
-//        "HC-V1-020",
-//        "HCV-000-1015",
-//        "HCV-000-3002",
-//        "HCV-000-3003",
-//        "HCV-000-3004",
-//        "HCV-000-3005",
-//        "HCV-000-3006",
-//        "HCV-000-3007",
-//        "HCV-000-3008",
-//        "HCV-000-3009",
-//        "HCV-000-3010",
-//        "HCV-000-3011",
-//        "HCV-000-3012",
-//        "HCV-000-3013",
-//        "HCV-000-3014",
-//        "HCV-000-3015",
-//        "HCV-000-3016",
-//        "HCV-000-3017",
-//        "HCV-000-3018",
-//        "HCV-000-3019",
-//        "HCV-000-3020",
-//        "HCV-000-3021",
-//        "HCV-000-3022",
-//        "HCV-000-3023",
-//        "HCV-000-3024",
-//        "HCV-000-3025",
-//        "HCV-000-3026",
-//        "HCV-000-3027",
-//        "HCV-000-3028",
-//        "HCV-000-3029",
-//        "HCV-000-3030",
-//        "HPP1-0124-0001",
-//        "HPP1-0124-0002",
-//        "HPP1-0124-0003",
-//        "HPP1-0124-0004",
-//        "HPP1-0124-0005",
-//        "HPP1-0124-0006",
-//        "HPP1-0124-0007",
-//        "HPP1-0124-0008",
-//        "HPP1-0124-0009",
-//        "HPP1-0124-0010",
-//        "HPP1-0124-0011",
-//        "HPP1-0124-0012",
-//        "HPP1-0124-0013",
-//        "HPP1-0124-0014",
-//        "HPP1-0124-0015",
-//        "HPP1-0124-0016",
-//        "HPP1-0124-0017",
-//        "HPP1-0124-0018",
-//        "HPP1-0124-0019",
-//        "HPP1-0124-0020",
-//        "HPP1-0124-0021",
-//        "HPP1-0124-0022",
-//        "HPP1-0124-0023",
-//        "HPP1-0124-0024",
-//        "HPP1-0124-0025",
-//        "HPP1-0124-0026",
-//        "HPP1-0124-0027",
-//        "HPP1-0124-0028",
-//        "HPP1-0124-0029",
-//        "HPP1-0124-0030",
-//        "HPP1-0124-0031",
-//        "HPP1-0124-0032",
-//        "HPP1-0124-0033",
-//        "HPP1-0124-0034",
-//        "HPP1-0124-0035",
-//        "HPP1-0124-0036",
-//        "HPP1-0124-0037",
-//        "HPP1-0124-0038",
-//        "HPP1-0124-0039",
-//        "HPP1-0124-0040",
-//        "HPP1-0124-0041",
-//        "HPP1-0124-0042",
-//        "HPP1-0124-0043",
-//        "HPP1-0124-0044",
-//        "HPP1-0124-0045",
-//        "HPP1-0124-0046",
-//        "HPP1-0124-0047",
-//        "HPP1-0124-0048",
-//        "HPP1-0124-0049",
-//        "HPP1-0124-0050",
-//        "HCV-001-0001",
-//        "HCV-001-0002",
-//        "HCV-001-0003",
-//        "HCV-001-0004",
-//        "HCV-001-0005",
-//        "HCV-001-0006",
-//        "HCV-001-0007",
-//        "HCV-001-0008",
-//        "HCV-001-0009",
-//        "HCV-001-0010",
-//        "HCV-001-0011",
-//        "HCV-001-0012",
-//        "HCV-001-0013",
-//        "HCV-001-0014",
-//        "HCV-001-0015",
-//        "HCV-001-0016",
-//        "HCV-001-0017",
-//        "HCV-001-0018",
-//        "HCV-001-0019",
-//        "HCV-001-0020",
-//        "HCV-001-0021",
-//        "HCV-001-0022",
-//        "HCV-001-0023",
-//        "HCV-001-0024",
-//        "HCV-001-0025",
-//        "HCV-001-0026",
-//        "HCV-001-0027",
-//        "HCV-001-0028",
-//        "HCV-001-0029",
-//        "HCV-001-0030",
-//        "HCV-001-0031",
-//        "HCV-001-0032",
-//        "HCV-001-0033",
-//        "HCV-001-0034",
-//        "HCV-001-0003",
-//        "HCV-001-0035",
-//        "HCV-001-0036",
-//        "HCV-001-0037",
-//        "HCV-001-0038",
-//        "HCV-001-0039",
-//        "HCV-001-0040",
-//        "HCV-001-0041",
-//        "HCV-001-0042",
-//        "HCV-001-0043",
-//        "HCV-001-0044",
-//        "HCV-001-0045",
-//        "HCV-001-0046",
-//        "HCV-001-0047",
-//        "HCV-001-0048",
-//        "HCV-001-0049",
-//        "HCV-001-0050",
-//        "HCV-000-6001",
-//        "HCV-000-6002",
-//        "HCV-000-6003",
-//        "HCV-000-6004",
-//        "HCV-000-6005",
-//        "HCV-000-6006",
-//        "HCV-000-6007",
-//        "HCV-000-6008",
-//        "HCV-000-6009",
-//        "HCV-000-6010",
-//    )
-//
 }
--- a/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
@@ -21,6 +21,7 @@ import com.example.hpostesting.data.model.test.TestType

 object DataHolder {

+    var sampleId: String = "sampleId"
    var selectedTestType: TestType = TestType.SICKLECERT
    val usbConnected = MutableLiveData(true)
    var mobileUniqueId: String? = null
@@ -37,6 +38,8 @@ object DataHolder {
    val intensityReferenceArray = ArrayList<Double>()
    var selectedTest: UserData? = null
    var hemoCubeTestData: HemoCubeTestData? = null
+    var bloodGroup: String = "Unknown"
+    var age = "0"
    var kitSerial: String = ""
    var centerName: String = ""
    var district: String = ""
--- a/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
@@ -35,6 +35,8 @@ enum class TestStatus(val code: Double) {
    BUFFER_PRINT_STARTED(6.0),
    BUFFER_PRINT_COMPLETED(7.0),
    SAMPLE_STARTED(8.0),
+    CUVETTE_ABSENTT(30.2),
+    CUVETTE_PRESENTT(30.1),
    SAMPLE_COMPLETED(9.0),
    SAMPLE_PRINT_STARTED(10.0),
    SAMPLE_PRINT_COMPLETED(11.0),
--- a/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt
@@ -40,7 +40,8 @@ interface HemoCubeDao {

    @Query("DELETE FROM hemo_cube_test_table WHERE _id = :id")
    suspend fun deleteById(id: String)
-
+    @Query("DELETE FROM hemo_cube_test_table WHERE testStatus = 0")
+    suspend fun deleteByStatus()
    @Query("UPDATE hemo_cube_test_table SET localFlag = :newValue WHERE _id = :id")
    suspend fun updateFieldById(id: String, newValue: Boolean)

--- a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
@@ -23,7 +23,7 @@ import com.example.hpostesting.data.model.patient.UserData

@Database(
    entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
-    version = 36,
+    version = 38,
    exportSchema = false
 )
@TypeConverters(Converters::class)
--- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt
@@ -54,7 +54,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
                "name",
                "incubationTime",
                "bloodGroup",
-                "birthYear", // Include other fields from the data class
+                "age", // Include other fields from the data class
                "state",
                "abhaId",
                "userImageURL",
@@ -110,7 +110,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
                    data.name,
                    data.incubationTime,
                    data.bloodGroup,
-                    data.birthYear, // Include other fields similarly
+                    data.age, // Include other fields similarly
                    data.state,
                    data.abhaId,
                    data.userImageURL,
@@ -177,7 +177,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
                "name",
                "incubationTime",
                "bloodGroup",
-                "birthYear", // Include other fields from the data class
+                "age", // Include other fields from the data class
                "state",
                "abhaId",
                "userImageURL",
@@ -233,7 +233,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
                    data.name,
                    data.incubationTime,
                    data.bloodGroup,
-                    data.birthYear, // Include other fields similarly
+                    data.age, // Include other fields similarly
                    data.state,
                    data.abhaId,
                    data.userImageURL,
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
@@ -24,7 +24,7 @@ data class HemoCubeTestData(
    var name: String = "",
    var incubationTime: String = "",
    var bloodGroup: String = "",
-    var birthYear: String = "",
+    var age: String = "",
    var state: String = "",
    var abhaId: String = "",
    var userImageURL: String = "",
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt
@@ -24,7 +24,7 @@ data class UserData(
    var name: String = "",
    var incubationTime: String = "",
    var gender: String = "",
-    var birthYear: String = "",
+    var age: String = "",
    var abhaId: String = "",
    var bloodGroup: String = "",
    var userImageURL: String = "",
@@ -63,7 +63,7 @@ fun UserData.toHemoCubeTestData() = HemoCubeTestData(
    sampleid = sampleid,
    bloodGroup = bloodGroup,
    incubationTime = incubationTime,
-    birthYear = birthYear,
+    age = age,
    gender = gender,
    state = state,
    abhaId = abhaId,
--- a/app/src/main/java/com/example/hpostesting/data/model/test/TestType.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/test/TestType.kt
@@ -15,5 +15,6 @@ package com.example.hpostesting.data.model.test

 enum class TestType {
    SICKLECERT,
-    SICKLEFIND
+    SICKLEFIND,
+    HB_EST
 }
--- a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
@@ -14,7 +14,6 @@
 package com.example.hpostesting.data.repository

 import android.net.Uri
-import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.model.PendingUploads
@@ -37,11 +36,12 @@ import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.CheckUpdateResponse
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
+import com.example.hpostesting.firebase.FirebaseManager
+import com.example.hpostesting.util.Result
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
-import com.google.firebase.storage.ktx.storage
+import com.google.firebase.storage.FirebaseStorage
 import kotlinx.coroutines.tasks.await
 import okhttp3.MultipartBody
 import okhttp3.ResponseBody
@@ -55,10 +55,15 @@ class NetworkException(message: String, cause: Throwable) : Exception(message, c
 class DatabaseRepository @Inject constructor(
    @Named("Auth") private val molbioAuthApi: MolbioAuthApi,
    private val molbioResultApi: MolbioResultApi,
+    private val firebaseManager: FirebaseManager,
 ) : Repository {

-    private val db: FirebaseFirestore = Firebase.firestore
-    private val storage = Firebase.storage
+    private val localdb: FirebaseFirestore
+        get() = firebaseManager.getCurrentFirestoreF()
+
+    private val localStg: FirebaseStorage
+        get() = firebaseManager.getCurrentStorageF()
+

    private suspend fun <T : Any> safeApiCall(apiCall: suspend () -> T): Result<T> {
        return try {
@@ -108,13 +113,13 @@ class DatabaseRepository @Inject constructor(
    override suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
        return try {
            val userdata =
-                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+                localdb.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
            if (userdata.documents.isNotEmpty()) {
                userdata.documents.forEach {
-                    db.collection("patientData").document(it.id).update("testStatus", true)
+                    localdb.collection("patientData").document(it.id).update("testStatus", true)
                }
            }
-            db.collection("testData").add(data).await()
+            localdb.collection("testData").add(data).await()
            Response.Success(data._id)
        } catch (e: Exception) {
            Response.Error(e)
@@ -122,15 +127,10 @@ class DatabaseRepository @Inject constructor(
    }
    override suspend fun addQcTestToDatabase(data: HemoCubeTestData?): Response<String> {
        return try {
-            val userdata =
-                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
-            if (userdata.documents.isNotEmpty()) {
-                userdata.documents.forEach {
-                    db.collection("patientData").document(it.id).update("testStatus", true)
-                }
-            }
-            db.collection("qcData").add(data).await()
+
+            localdb.collection("qcData").add(data!!).await()
            Response.Success(data._id)
+
        } catch (e: Exception) {
            Response.Error(e)
        }
@@ -142,7 +142,7 @@ class DatabaseRepository @Inject constructor(

    override suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String> {
        return try {
-            db.collection("buffers").add(data!!).await()
+            localdb.collection("buffers").add(data!!).await()
            Response.Success(data.kitno)
        } catch (e: Exception) {
            Firebase.crashlytics.recordException(e)
@@ -152,7 +152,7 @@ class DatabaseRepository @Inject constructor(

    override suspend fun addDiagnostics(data: DiagnosticsData?): Response<String> {
        return try {
-            db.collection("diagnostics").add(data!!).await()
+            localdb.collection("diagnostics").add(data!!).await()
            Response.Success(data.deviceId)
        } catch (e: Exception) {
            Firebase.crashlytics.recordException(e)
@@ -163,7 +163,7 @@ class DatabaseRepository @Inject constructor(

    override suspend fun addTestJigData(data: JigData?): Response<String> {
        return try {
-            db.collection("jigs").add(data!!).await()
+            localdb.collection("jigs").add(data!!).await()
            Response.Success(data.deviceId)
        } catch (e: Exception) {
            Firebase.crashlytics.recordException(e)
@@ -177,7 +177,7 @@ class DatabaseRepository @Inject constructor(
        try {

            val file = Uri.fromFile(File(filePath))
-            val riversRef = storage.reference.child("$patientID/${file.lastPathSegment}")
+            val riversRef = localStg.reference.child("$patientID/${file.lastPathSegment}")
            riversRef.putFile(file).await()
            return Response.Success(true)
        } catch (e: Exception) {
@@ -188,7 +188,7 @@ class DatabaseRepository @Inject constructor(

    suspend fun addToPendingQueue(pendingUploads: PendingUploads): Response<Boolean> {
        return try {
-            db.collection("pendingUploads").document(pendingUploads.pendingId).set(pendingUploads)
+            localdb.collection("pendingUploads").document(pendingUploads.pendingId).set(pendingUploads)
                .await()

            Response.Success(true)
@@ -201,7 +201,7 @@ class DatabaseRepository @Inject constructor(
    suspend fun getAllFromPendingQueue(): List<PendingUploads> {
        val pendingList = mutableListOf<PendingUploads>()
        return try {
-            val querySnapshot = db.collection("pendingUploads").orderBy("timeAdded").get().await()
+            val querySnapshot = localdb.collection("pendingUploads").orderBy("timeAdded").get().await()

            for (doc in querySnapshot.documents) {
                val pendingFile = doc.toObject(PendingUploads::class.java)
@@ -219,7 +219,7 @@ class DatabaseRepository @Inject constructor(

    suspend fun removeFromPendingQueue(fileName: String): Response<Boolean> {
        return try {
-            db.collection("pendingUploads").document(fileName).delete().await()
+            localdb.collection("pendingUploads").document(fileName).delete().await()

            Response.Success(true)
        } catch (e: Exception) {
@@ -229,11 +229,11 @@ class DatabaseRepository @Inject constructor(
    }

    suspend fun getDeviceData(): List<DeviceData> {
-        return db.collection("devices").get().await().toObjects(DeviceData::class.java)
+        return localdb.collection("devices").get().await().toObjects(DeviceData::class.java)
    }

    override suspend fun getDeviceDataById(deviceId: String): DeviceData? {
-        val querySnapshot = db.collection("devices").get().await()
+        val querySnapshot = localdb.collection("devices").get().await()
        val allDeviceDataList = querySnapshot.toObjects(DeviceData::class.java)

        // Find the DeviceData object with the specified deviceId
@@ -242,7 +242,7 @@ class DatabaseRepository @Inject constructor(

    override suspend fun getDeviceResponse(data: DeviceData?): Response<String> {
        return try {
-            db.collection("devices").add(data!!).await()
+            localdb.collection("devices").add(data!!).await()
            Response.Success(data.deviceProvisionResponse)
        } catch (e: Exception) {
            Firebase.crashlytics.recordException(e)
@@ -252,7 +252,7 @@ class DatabaseRepository @Inject constructor(

    override suspend fun uploadDeviceId(data: DeviceData): Response<String>? {
        return try {
-            db.collection("devices").add(data!!).await()
+            localdb.collection("devices").add(data!!).await()
            Response.Success(data.deviceId)
        } catch (e: Exception) {
            Firebase.crashlytics.recordException(e)
@@ -267,13 +267,13 @@ class DatabaseRepository @Inject constructor(
    override suspend fun addTestToDatabasefornew(data: HemoCubeTestData?): Response<String> {
            return try {
                val userdata =
-                    db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+                    localdb.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
                if (userdata.documents.isNotEmpty()) {
                    userdata.documents.forEach {
-                        db.collection("patientData").document(it.id).update("testStatus", true)
+                        localdb.collection("patientData").document(it.id).update("testStatus", true)
                    }
                }
-                db.collection("testData").add(data).await()
+                localdb.collection("testData").add(data).await()
                Response.Success(data._id)
            } catch (e: Exception) {
                Firebase.crashlytics.recordException(e)
--- a/app/src/main/java/com/example/hpostesting/data/repository/LocalFileRepository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/LocalFileRepository.kt
@@ -13,13 +13,7 @@

 package com.example.hpostesting.data.repository

-import android.os.Environment
 import com.example.hpostesting.data.datasource.LocalFileDataSource
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.opencsv.CSVWriter
-import java.io.File
-import java.io.FileWriter
-import java.io.IOException

 class LocalFileRepository(private val localFileDataSource: LocalFileDataSource) {
    fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>) =
--- a/app/src/main/java/com/example/hpostesting/di/AppModule.kt
+++ b/app/src/main/java/com/example/hpostesting/di/AppModule.kt
@@ -21,7 +21,6 @@ import androidx.room.Room
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.util.PropertyProvider
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
@@ -36,9 +35,13 @@ import com.example.hpostesting.domain.LogFileManager
 import com.example.hpostesting.domain.LogFileManagerImpl
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
+import com.example.hpostesting.firebase.FirebaseManager
 import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.utils.UsbServiceListenerImpl
+import com.example.hpostesting.util.PropertyProvider
 import com.example.hpostesting.util.PropertyProviderImpl
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.storage.FirebaseStorage
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -107,22 +110,52 @@ object AppModule {
        return SaveRawDataTest(repository)
    }

+    @Provides
+    @Singleton
+    fun provideFirebaseFirestore(): FirebaseFirestore {
+        return FirebaseFirestore.getInstance()
+    }
+
+    @Provides
+    @Singleton
+    fun provideFirebaseStorage(): FirebaseStorage {
+        return FirebaseStorage.getInstance()
+    }
+
+    @Provides
+    @Singleton
+    fun provideFirebaseManager(
+        @ApplicationContext context: Context,
+    ): FirebaseManager {
+        return FirebaseManager(context)
+    }
+
    @Provides
    @Singleton
    fun provideDatabaseRepository(
+        firebaseManager: FirebaseManager,
        @Named("Auth") molbioAuthApi: MolbioAuthApi,
        molbioResultApi: MolbioResultApi
    ): DatabaseRepository {
-        return DatabaseRepository(molbioAuthApi = molbioAuthApi, molbioResultApi = molbioResultApi)
+        return DatabaseRepository(
+            firebaseManager = firebaseManager,
+            molbioAuthApi = molbioAuthApi,
+            molbioResultApi = molbioResultApi
+        )
    }

    @Provides
    @Singleton
    fun provideRepository(
+        firebaseManager: FirebaseManager,
        @Named("Auth") molbioAuthApi: MolbioAuthApi,
        molbioResultApi: MolbioResultApi
    ): Repository {
-        return DatabaseRepository(molbioAuthApi, molbioResultApi)
+        return DatabaseRepository(
+            firebaseManager = firebaseManager,
+            molbioAuthApi = molbioAuthApi,
+            molbioResultApi = molbioResultApi
+        )
    }

    @Provides
@@ -206,4 +239,9 @@ object AppModule {
    fun provideUsbServiceListener(context: Context): UsbServiceListener {
        return UsbServiceListenerImpl(context)
    }
+
+
+
+
+
 }
--- a/app/src/main/java/com/example/hpostesting/domain/LogFileManagerImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/LogFileManagerImpl.kt
@@ -44,7 +44,6 @@ class LogFileManagerImpl @Inject constructor(private val context: Context) : Log

            file
        } catch (e: IOException) {
-//            Log.e("LogFileManager", "Error creating log file: ${e.message}")
            null
        }
    }
--- a/app/src/main/java/com/example/hpostesting/domain/ResultCalculationWithMaxImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/ResultCalculationWithMaxImpl.kt
@@ -38,20 +38,24 @@ class ResultCalculationWithMaxImpl : TestRightResultCalculation {
        var wavelengthOfAbsorbanceTwo = 0.0

        for (each in wavelengthToAbsorbance) {
-            if (each[0] >= startWavelengthOne && each[0] < endWavelengthOne) {
+            when {
+                each[0] >= startWavelengthOne && each[0] < endWavelengthOne -> {
                    if (each[1] > maxAbsorbanceAtOne) {
                        maxAbsorbanceAtOne = each[1]
                        wavelengthOfAbsorbanceOne = each[0]
                    }
                }
-            if (each[0] >= startWavelengthTwo && each[0] < endWavelengthTwo) {
-//                maxAbsorbanceAtTwo = max(maxAbsorbanceAtTwo, each[1])
+            }
+            when {
+                each[0] >= startWavelengthTwo && each[0] < endWavelengthTwo -> {
+        //                maxAbsorbanceAtTwo = max(maxAbsorbanceAtTwo, each[1])
                    if (each[1] > maxAbsorbanceAtTwo) {
                        maxAbsorbanceAtTwo = each[1]
                        wavelengthOfAbsorbanceTwo = each[0]
                    }
                }
            }
+        }

        testRightCalculationData.absorbanceOne = maxAbsorbanceAtOne
        testRightCalculationData.wavelengthOfAbsorbanceOne = wavelengthOfAbsorbanceOne
@@ -70,28 +74,34 @@ class ResultCalculationWithMaxImpl : TestRightResultCalculation {
            val value = absorbanceAtWaveTwo / absorbanceAtWaveOne
            testRightCalculationData.ratioValue = value

-            if (value <= 0.29) {
+            when {
+                value <= 0.29 -> {
                    testRightCalculationData.ratioMinRange = 0.0
                    testRightCalculationData.ratioMaxRange = 0.29
                    return TestRightResultType.NORMAL
-            } else if (value > 0.29 && value <= 0.32) {
+                }
+                value > 0.29 && value <= 0.32 -> {
                    testRightCalculationData.ratioMinRange = 0.29
                    testRightCalculationData.ratioMaxRange = 0.32
                    return TestRightResultType.NEGATIVEBORDERLINE
-            } else if (value > 0.32 && value <= 0.50) {
+                }
+                value > 0.32 && value <= 0.50 -> {
                    testRightCalculationData.ratioMinRange = 0.32
                    testRightCalculationData.ratioMaxRange = 0.50
                    return TestRightResultType.SICKLECELLTRAIT
-            } else if (value > 0.50 && value <= 0.55) {
+                }
+                value > 0.50 && value <= 0.55 -> {
                    testRightCalculationData.ratioMinRange = 0.50
                    testRightCalculationData.ratioMaxRange = 0.55
                    return TestRightResultType.POSITIVEBORDERLINE
-            }else if (value > 0.55) {
+                }
+                value > 0.55 -> {
                    testRightCalculationData.ratioMinRange = 0.55
                    testRightCalculationData.ratioMaxRange = 999.0
                    return TestRightResultType.SICKLECELLDISEASE
                }
            }
+        }

        return TestRightResultType.UNDEFINED
    }
--- a/app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt
@@ -27,7 +27,6 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
    fun saveCsv(folderPath: String, fileName: String, matrix: ArrayList<ArrayList<Double>>) {
 //        try {
        val fullPath = "$folderPath/$fileName"
-//            val writer = CSVWriter(FileWriter(fullPath))

        sort(matrix) { one: ArrayList<Double>, two: ArrayList<Double> ->
            one[0].compareTo(two[0])
@@ -39,7 +38,6 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
        for (eachRow in matrix) {

            if (eachRow[0] >= Constants.MIN_WAVELENGTH_RANGE_TO_RECORD && eachRow[0] < Constants.MAX_WAVELENGTH_RANGE_TO_RECORD + 1) {
-//            val rowContent = arrayOf(String.format("%.3f", eachRow[0]), String.format("%.3f", eachRow[1]))
                val rowContent =
                    arrayOf(
                        String.format("%.10f", eachRow[0]),
@@ -50,22 +48,9 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
        }

        localFileRepository.saveCsvToDisk(fullPath, content)
-//            writer.writeAll(content) // data is adding to csv
-//            writer.close()
-
-//        } catch (e: Exception) {
-//            Log.e(TAG, e.toString())
-//        }
    }

    fun saveLog(folderPath: String, fileName: String, calculationData: TestRightCalculationData) {
-//        val fileObj = File(folderPath, fileName)
-//        val writer = FileWriter(fileObj)
-
-//        writer.append(getLogStringFromObj(calculationData))
-//        writer.flush()
-//        writer.close()
-
        val fullPath = folderPath + fileName
        localFileRepository.saveTextToDisk(fullPath, getLogStringFromObj(calculationData))
    }
@@ -113,13 +98,6 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
        calculationData: TestRightCalculationData,
        testDetails: UserData?,
    ) {
-//        val fileObj = File(folderPath, fileName)
-//        val writer = FileWriter(fileObj)
-
-//        writer.append(getLogStringFromObjWithPatientData(calculationData, patientData))
-//        writer.flush()
-//        writer.close()
-
        val fullPath = folderPath + fileName
        localFileRepository.saveTextToDisk(
            fullPath,
--- a/app/src/main/java/com/example/hpostesting/domain/SaveRawDataTest.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/SaveRawDataTest.kt
@@ -24,7 +24,6 @@ class SaveRawDataTest(private val localFileRepository: LocalFileRepository) {

 //        try {
            val fullPath = "$folderPath/$fileName"
-//            val writer = CSVWriter(FileWriter(fullPath))
            val content = ArrayList<Array<String>>()

            // Header
@@ -53,19 +52,6 @@ class SaveRawDataTest(private val localFileRepository: LocalFileRepository) {
    }

    fun saveLog(folderPath: String, fileName: String, isReference: Boolean, fullString: String) {
-//        val fileObj = File(folderPath, fileName)
-
-//        Log.d(TAG, "$folderPath --- $fileName")
-//        val writer = FileWriter(fileObj)
-
-//        if (isReference)
-//            writer.append("\nREFERENCE OUTPUT\n")
-//        else
-//            writer.append("\nSAMPLE OUTPUT\n")
-//
-//        writer.append(fullString)
-//        writer.flush()
-//        writer.close()

        val filePath = folderPath + fileName
        var stringToWrite = ""
--- a/app/src/main/java/com/example/hpostesting/domain/SickleFindResultCaluculationWithMaxImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/SickleFindResultCaluculationWithMaxImpl.kt
@@ -38,20 +38,24 @@ class SickleFindResultCaluculationWithMaxImpl : TestRightResultCalculation{
        var wavelengthOfAbsorbanceTwo = 0.0

        for (each in wavelengthToAbsorbance) {
-            if (each[0] >= startWavelengthOne && each[0] < endWavelengthOne) {
+            when {
+                each[0] >= startWavelengthOne && each[0] < endWavelengthOne -> {
                    if (each[1] > maxAbsorbanceAtOne) {
                        maxAbsorbanceAtOne = each[1]
                        wavelengthOfAbsorbanceOne = each[0]
                    }
                }
-            if (each[0] >= startWavelengthTwo && each[0] < endWavelengthTwo) {
-//                maxAbsorbanceAtTwo = max(maxAbsorbanceAtTwo, each[1])
+            }
+            when {
+                each[0] >= startWavelengthTwo && each[0] < endWavelengthTwo -> {
+        //                maxAbsorbanceAtTwo = max(maxAbsorbanceAtTwo, each[1])
                    if (each[1] > maxAbsorbanceAtTwo) {
                        maxAbsorbanceAtTwo = each[1]
                        wavelengthOfAbsorbanceTwo = each[0]
                    }
                }
            }
+        }

        testRightCalculationData.absorbanceOne = maxAbsorbanceAtOne
        testRightCalculationData.wavelengthOfAbsorbanceOne = wavelengthOfAbsorbanceOne
@@ -70,20 +74,24 @@ class SickleFindResultCaluculationWithMaxImpl : TestRightResultCalculation{
            val value = absorbanceAtWaveTwo / absorbanceAtWaveOne
            testRightCalculationData.ratioValue = value

-            if (value < 0.30 || value == 0.0) {
+            when {
+                value < 0.30 || value == 0.0 -> {
                    testRightCalculationData.ratioMinRange = 0.0
                    testRightCalculationData.ratioMaxRange = 0.30
                    return TestRightResultType.NORMAL
-            } else if (value >= 0.30 && value < 0.31) {
+                }
+                value >= 0.30 && value < 0.31 -> {
                    testRightCalculationData.ratioMinRange = 0.30
                    testRightCalculationData.ratioMaxRange = 0.31
                    return TestRightResultType.UNDEFINED
-            } else if (value >= 0.31) {
+                }
+                value >= 0.31 -> {
                    testRightCalculationData.ratioMinRange = 0.31
                    testRightCalculationData.ratioMaxRange = 999.0
                    return TestRightResultType.SICKLECELLDISEASE
                }
            }
+        }

        return TestRightResultType.UNDEFINED
    }
--- a/app/src/main/java/com/example/hpostesting/encryption/Encryption.kt
+++ b/app/src/main/java/com/example/hpostesting/encryption/Encryption.kt
@@ -14,6 +14,7 @@
 package com.example.hpostesting.encryption

 import android.util.Base64
+import java.security.SecureRandom
 import javax.crypto.Cipher
 import javax.crypto.SecretKeyFactory
 import javax.crypto.spec.IvParameterSpec
@@ -21,7 +22,8 @@ import javax.crypto.spec.PBEKeySpec
 import javax.crypto.spec.SecretKeySpec

 object Encryption {
-    private const val AES_MODE = "AES/CBC/PKCS5Padding"
+    //private const val AES_MODE = "AES/CBC/PKCS5Padding"
+    private const val AES_MODE= "AES/GCM/NoPadding"
    private const val KEY_SPEC_ALGORITHM = "PBKDF2WithHmacSHA1"
    private const val SALT = "Bigtec"
    private const val ITERATION_COUNT = 10000
@@ -29,7 +31,8 @@ object Encryption {
    private val FIXED_IV = byteArrayOf(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15)

    fun encrypt(textToEncrypt: String, password: String): String {
-        val salt = SALT.toByteArray()
+        val salt = ByteArray(16)
+        SecureRandom().nextBytes(salt)
        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
        val tmp = factory.generateSecret(spec)
@@ -37,12 +40,12 @@ object Encryption {
        val cipher = Cipher.getInstance(AES_MODE)
        cipher.init(Cipher.ENCRYPT_MODE, key, IvParameterSpec(FIXED_IV))
        val encryptedBytes = cipher.doFinal(textToEncrypt.toByteArray(Charsets.UTF_8))
-        return Base64.encodeToString(encryptedBytes, Base64.NO_WRAP)
+        return Base64.encodeToString(salt + encryptedBytes, Base64.NO_WRAP)
    }

    fun decrypt(encryptedText: String, password: String): String {
-        val salt = SALT.toByteArray()
-        val encryptedBytes = Base64.decode(encryptedText, Base64.NO_WRAP)
+        val salt = encryptedText.substring(0, 24).toByteArray()
+        val encryptedBytes = Base64.decode(encryptedText.substring(24), Base64.NO_WRAP)
        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
        val tmp = factory.generateSecret(spec)
@@ -52,4 +55,29 @@ object Encryption {
        val decryptedBytes = cipher.doFinal(encryptedBytes)
        return String(decryptedBytes, Charsets.UTF_8)
    }
+//    fun encrypt(textToEncrypt: String, password: String): String {
+//        val salt = SALT.toByteArray()
+//        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
+//        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
+//        val tmp = factory.generateSecret(spec)
+//        val key = SecretKeySpec(tmp.encoded, "AES")
+//        val cipher = Cipher.getInstance(AES_MODE)
+//        cipher.init(Cipher.ENCRYPT_MODE, key, IvParameterSpec(FIXED_IV))
+//        val encryptedBytes = cipher.doFinal(textToEncrypt.toByteArray(Charsets.UTF_8))
+//        return Base64.encodeToString(encryptedBytes, Base64.NO_WRAP)
+//    }
+//
+//    fun decrypt(encryptedText: String, password: String): String {
+//        val salt = SALT.toByteArray()
+//        val encryptedBytes = Base64.decode(encryptedText, Base64.NO_WRAP)
+//        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
+//        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
+//        val tmp = factory.generateSecret(spec)
+//        val key = SecretKeySpec(tmp.encoded, "AES")
+//        val cipher = Cipher.getInstance(AES_MODE)
+//        cipher.init(Cipher.DECRYPT_MODE, key, IvParameterSpec(FIXED_IV))
+//        val decryptedBytes = cipher.doFinal(encryptedBytes)
+//        return String(decryptedBytes, Charsets.UTF_8)
+//    }
+
 }
--- a/app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt
+++ b/app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt
@@ -0,0 +1,156 @@
+package com.example.hpostesting.firebase
+/*
+ * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
+ * // Notice: All information contained herein is, and remains
+ * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
+ * // if any. The intellectual and technical concepts contained
+ * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
+ * // and its suppliers and may be covered by Indian and Foreign Patents,
+ * // patents in process, and are protected by trade secret or copyright law.
+ * // Dissemination of this information or reproduction of this material
+ * // is strictly forbidden unless prior written permission is obtained
+ * // from ShanMukha Innovations Pvt. Ltd.
+ */
+import android.content.Context
+import android.content.Intent
+import android.os.Process
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.storage.FirebaseStorage
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+class FirebaseManager @Inject constructor(private val context: Context) {
+
+    private val sharedPreferences =
+        context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)
+
+    var currentFirestore: FirebaseFirestore = FirebaseFirestore.getInstance()
+    var currentStorage: FirebaseStorage = FirebaseStorage.getInstance()
+    var updateStatus = false
+
+    private val defaultServers = listOf(
+        // i have it in different place look down
+        firebaseConfig1, firebaseConfig2, firebaseConfig3,
+    )
+
+    init {
+        val lastSelectedServer = getLastSelectedServer()
+        switchServer(lastSelectedServer)
+    }
+
+    fun getCurrentFirestoreF(): FirebaseFirestore = currentFirestore
+    fun getCurrentStorageF(): FirebaseStorage = currentStorage
+
+    fun switchServer(firebaseConfig: FirebaseConfig) {
+        saveSelectedServer(firebaseConfig)
+        val firebaseApp = getOrInitializeFirebaseApp(firebaseConfig)
+        currentFirestore = FirebaseFirestore.getInstance(firebaseApp)
+        currentStorage = FirebaseStorage.getInstance(firebaseApp)
+        updateStatus = true
+
+    }
+
+    private fun getOrInitializeFirebaseApp(firebaseConfig: FirebaseConfig): FirebaseApp {
+        val existingApp = FirebaseApp.getApps(context).find { it.name == firebaseConfig.serverName }
+
+        return if (existingApp != null) {
+
+            existingApp
+        } else {
+
+            val options = FirebaseOptions.Builder().setProjectId(firebaseConfig.projectId)
+                .setApplicationId(firebaseConfig.appId).setApiKey(firebaseConfig.apiKey)
+                .setStorageBucket(firebaseConfig.storageBucket).build()
+
+            FirebaseApp.initializeApp(context, options, firebaseConfig.serverName)
+        }
+    }
+
+    private fun saveSelectedServer(firebaseConfig: FirebaseConfig) {
+        with(sharedPreferences.edit()) {
+            putString("selectedServerName", firebaseConfig.serverName)
+            putString("projectId", firebaseConfig.projectId)
+            putString("appId", firebaseConfig.appId)
+            putString("apiKey", firebaseConfig.apiKey)
+            putString("storageBucket", firebaseConfig.storageBucket)
+            apply()
+        }
+
+    }
+
+    fun restartApp() {
+        if (updateStatus) {
+            updateStatus = false
+            delayedRestart(context)
+        }
+    }
+
+    fun getLastSelectedServer(): FirebaseConfig {
+        val selectedServerName =
+            sharedPreferences.getString("selectedServerName", defaultServers.first().serverName)
+        val projectId = sharedPreferences.getString("projectId", defaultServers.first().projectId)
+        val appId = sharedPreferences.getString("appId", defaultServers.first().appId)
+        val apiKey = sharedPreferences.getString("apiKey", defaultServers.first().apiKey)
+        val storageBucket =
+            sharedPreferences.getString("storageBucket", defaultServers.first().storageBucket)
+
+        return FirebaseConfig(
+            serverName = selectedServerName ?: defaultServers.first().serverName,
+            projectId = projectId ?: defaultServers.first().projectId,
+            appId = appId ?: defaultServers.first().appId,
+            apiKey = apiKey ?: defaultServers.first().apiKey,
+            storageBucket = storageBucket ?: defaultServers.first().storageBucket
+        )
+    }
+
+    fun getAvailableServers(): List<FirebaseConfig> {
+        return defaultServers
+    }
+}
+
+fun restartApp(context: Context) {
+    val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+    intent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
+    context.startActivity(intent)
+    Process.killProcess(Process.myPid())
+}
+fun delayedRestart(
+    context: Context,
+    coroutineScope: CoroutineScope = CoroutineScope(Dispatchers.Main),
+    dispatcher: CoroutineDispatcher = Dispatchers.Main
+) {
+    coroutineScope.launch(dispatcher) {
+        delay(5000L)
+        restartApp(context)
+    }
+}
+
+private val firebaseConfig1 = FirebaseConfig(
+    serverName = "dev",
+    apiKey = "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I",
+    appId = "1:650071678820:android:a53292637abb7c0d6c6471",
+    projectId = "hpos-af3cc",
+    storageBucket = "hpos-af3cc.appspot.com"
+)
+
+private val firebaseConfig2 = FirebaseConfig(
+    serverName = "qc-qa",
+    apiKey = "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs",
+    appId = "1:1004619739289:android:3dbcefb10ea99654e5c808",
+    projectId = "hpos-qa",
+    storageBucket = "hpos-qa.appspot.com"
+)
+
+private val firebaseConfig3 = FirebaseConfig(
+    serverName = "prod",
+    apiKey = "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38",
+    appId = "1:121176529204:android:a7bc0842f61e5095bbed61",
+    projectId = "hpos-preprod",
+    storageBucket = "hpos-preprod.appspot.com"
+)
--- a/app/src/main/java/com/example/hpostesting/firebase/dataClass.kt
+++ b/app/src/main/java/com/example/hpostesting/firebase/dataClass.kt
@@ -0,0 +1,21 @@
+package com.example.hpostesting.firebase
+/*
+ * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
+ * // Notice: All information contained herein is, and remains
+ * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
+ * // if any. The intellectual and technical concepts contained
+ * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
+ * // and its suppliers and may be covered by Indian and Foreign Patents,
+ * // patents in process, and are protected by trade secret or copyright law.
+ * // Dissemination of this information or reproduction of this material
+ * // is strictly forbidden unless prior written permission is obtained
+ * // from ShanMukha Innovations Pvt. Ltd.
+ */
+data class FirebaseConfig(
+    val serverName: String,
+    val apiKey: String,
+    val appId: String,
+    val projectId: String,
+    val storageBucket: String
+)
+
--- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
@@ -19,21 +19,19 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import android.text.Editable
 import android.util.Log
-import android.view.View
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.data.model.test.TestType
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.hb_test.HBTestActivity
 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
 import com.journeyapps.barcodescanner.ScanIntentResult
-import com.journeyapps.barcodescanner.ScanOptions
 import com.zebra.barcode.sdk.sms.ConfigurationUpdateEvent
 import com.zebra.scannercontrol.DCSSDKDefs
 import com.zebra.scannercontrol.DCSSDKDefs.DCSSDK_COMMAND_OPCODE
@@ -48,10 +46,11 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
-import kotlin.math.max

 class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
    private var fromWhere = "Home"
+    private val forD10 = "SMI/SC-2-D10/"
+    private val forD35 = "SMI/SC/"
    private val TAG = "KitScanActivity"
    private lateinit var binding: ActivityKitScanBinding

@@ -73,14 +72,14 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
    }

    private fun processScannedData(contents: String) {//edited auto selection of cuvette size
-        if(contents.contains("SMI/SC/")){
+        if(contents.contains(forD35)){
            with(sharedPreference.edit()) {
                putString(Constants.CUVETTE_SIZE, "2mm")
                apply()
            }
            Toast.makeText(this, "Selected cuvette size: 2mm", Toast.LENGTH_SHORT).show()
            binding.nameEditText.setText(contents)
-        }else if(contents.contains("SMI/SC-2-D10/")){
+        }else if(contents.contains(forD10)){
            with(sharedPreference.edit()) {
                putString(Constants.CUVETTE_SIZE, "10mm")
                apply()
@@ -99,33 +98,51 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
    }


-    override fun dcssdkEventScannerAppeared(dcsScannerInfo: DCSScannerInfo?) {}
+    override fun dcssdkEventScannerAppeared(dcsScannerInfo: DCSScannerInfo?) {
+        //nothing
+    }

-    override fun dcssdkEventScannerDisappeared(i: Int) {}
+    override fun dcssdkEventScannerDisappeared(i: Int) {
+        //nothing
+    }

-    override fun dcssdkEventCommunicationSessionEstablished(dcsScannerInfo: DCSScannerInfo?) {}
+    override fun dcssdkEventCommunicationSessionEstablished(dcsScannerInfo: DCSScannerInfo?) {
+        //nothing
+    }

-    override fun dcssdkEventCommunicationSessionTerminated(i: Int) {}
+    override fun dcssdkEventCommunicationSessionTerminated(i: Int) {
+        //nothing
+    }
 //    override fun dcssdkEventBarcode(p0: ByteArray?, p1: Int, p2: Int) {
-//        TODO("Not yet implemented")
 //    }


-    override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {}
+    override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {
+        //nothing
+    }

-    override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {}
+    override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {
+        //nothing
+    }

-    override fun dcssdkEventBinaryData(bytes: ByteArray?, i: Int) {}
+    override fun dcssdkEventBinaryData(bytes: ByteArray?, i: Int) {
+        //nothing
+    }

-    override fun dcssdkEventFirmwareUpdate(firmwareUpdateEvent: FirmwareUpdateEvent?) {}
+    override fun dcssdkEventFirmwareUpdate(firmwareUpdateEvent: FirmwareUpdateEvent?) {
+        //nothing
+    }

    override fun dcssdkEventAuxScannerAppeared(
        dcsScannerInfo: DCSScannerInfo?,
        dcsScannerInfo1: DCSScannerInfo?,
    ) {
+        //nothing
    }

-    override fun dcssdkEventConfigurationUpdate(configurationUpdateEvent: ConfigurationUpdateEvent?) {}
+    override fun dcssdkEventConfigurationUpdate(configurationUpdateEvent: ConfigurationUpdateEvent?) {
+        //nothing
+    }

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -208,13 +225,13 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        binding.btnGo.setOnClickListener {
            val serialNumber = binding.nameEditText.text.toString().trim()
            if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
-                if(serialNumber.contains("SMI/SC/")){
+                if(serialNumber.contains(forD35)){
                    with(sharedPreference.edit()) {
                        putString(Constants.CUVETTE_SIZE, "2mm")
                        apply()
                    }
                    Toast.makeText(this, "Selected cuvette size: 2mm", Toast.LENGTH_SHORT).show()
-                }else if(serialNumber.contains("SMI/SC-2-D10/")){
+                }else if(serialNumber.contains(forD10)){
                    with(sharedPreference.edit()) {
                        putString(Constants.CUVETTE_SIZE, "10mm")
                        apply()
@@ -287,11 +304,11 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {

        //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.
-        var notifications_mask = 0
+        var notificationsMask = 0
        // We would like to subscribe to all barcode events
-        notifications_mask =
-            notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
-        sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
+        notificationsMask =
+            notificationsMask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
+        sdkHandler!!.dcssdkSubsribeForEvents(notificationsMask)
        mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
        Log.e("scannersize", sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
        if (mScannerInfoList.isNotEmpty()) {
@@ -333,7 +350,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        val result = String(barcodeData!!)
        Log.d("BARCODE", result)
        runOnUiThread {
-            val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
+            Editable.Factory.getInstance().newEditable(result)
            processScannedData(result)
           // binding.nameEditText.text = editableResult
        }
@@ -347,12 +364,12 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 //    }

    private fun isSerialValid(s: String): Boolean {
-        if (s.contains("SMI/SC/")) {
+        if (s.contains(forD35)) {
            if(s.length != 17){
                binding.nameEditText.error = "Invalid Kit Serial Number, correct example SMI/SC/000/00/000"
                return false
            }
-        }else if(s.contains("SMI/SC-2-D10/")){
+        }else if(s.contains(forD10)){
            if(s.length != 27){
                binding.nameEditText.error = "Invalid Kit Serial Number, correct example SMI/SC-2-D10/000000/000/000"
                return false
@@ -365,57 +382,56 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {

    private fun moveToNext() {
        if(fromWhere == "Main"){
+            if(DataHolder.selectedTestType == TestType.HB_EST){
+                val i = Intent(applicationContext, HBTestActivity::class.java)
+                startActivity(i)
+            }else{
                DataHolder.deviceType.observe(this) { deviceType ->
                    when (deviceType) {
-                    Constants.DEVICE_TYPE_HEMOCUBE -> {
+                        Constants.DEVICE_TYPE_HEMOCUBE ,Constants.DEVICE_TYPE_TRUEHEME -> {
                            val i = Intent(applicationContext, HemocubeActivity::class.java)
                            startActivity(i)
                        }
-
                        Constants.DEVICE_TYPE_TEST_RIGHT -> {
                            val i = Intent(applicationContext, TestRightActivity::class.java)
                            startActivity(i)
                        }
-
-                    Constants.DEVICE_TYPE_TRUEHEME -> {
-                        val i = Intent(applicationContext, HemocubeActivity::class.java)
-                        startActivity(i)
                    }
                }
            }
        }
    }

-    private fun startScanningNow() {
-        val options = ScanOptions()
-        options.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
-        options.setPrompt("Scan a barcode")
-        options.setCameraId(0) // Use a specific camera of the device
-
-        options.setBeepEnabled(true)
-        options.setBarcodeImageEnabled(true)
-
-        options.setPrompt("Start Scanning")
-        options.setOrientationLocked(false)
-//        options.setTimeout(10000) // in ms
-
-        barcodeLauncher.launch(options)
-    }
-
-    private fun checkDataNotNull(): Boolean {
-        return if (DataHolder.selectedTest?._id == null) {
-            Toast.makeText(
-                applicationContext, R.string.select_patient, Toast.LENGTH_SHORT
-            ).show()
-
-            val i = Intent(applicationContext, DashboardActivity::class.java)
-            startActivity(i)
-
-            false
-        } else {
-            true
-        }
-    }
+//    private fun startScanningNow() {
+//        val options = ScanOptions()
+//        options.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
+//        options.setPrompt("Scan a barcode")
+//        options.setCameraId(0) // Use a specific camera of the device
+//
+//        options.setBeepEnabled(true)
+//        options.setBarcodeImageEnabled(true)
+//
+//        options.setPrompt("Start Scanning")
+//        options.setOrientationLocked(false)
+////        options.setTimeout(10000) // in ms
+//
+//        barcodeLauncher.launch(options)
+//    }
+//
+//    private fun checkDataNotNull(): Boolean {
+//        return if (DataHolder.selectedTest?._id == null) {
+//            Toast.makeText(
+//                applicationContext, R.string.select_patient, Toast.LENGTH_SHORT
+//            ).show()
+//
+//            val i = Intent(applicationContext, DashboardActivity::class.java)
+//            startActivity(i)
+//
+//            false
+//        } else {
+//            true
+//        }
+//    }
    private fun timeDifference(createdAt: String): Long {
        val currentTime = Calendar.getInstance().time
        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
--- a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
@@ -18,6 +18,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.hardware.usb.UsbManager
 import android.location.Location
@@ -30,10 +31,9 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
-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.FusedLocationProviderClient
@@ -48,12 +48,12 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityMainBinding

 class MainActivity : AppCompatActivity() {
-
    private lateinit var binding: ActivityMainBinding
    private var myMenu: Menu? = null
    private val TAG = "MainActivity"
    private lateinit var fusedLocationClient: FusedLocationProviderClient
    private lateinit var locationCallback: LocationCallback
+    private lateinit var sharedPreference: SharedPreferences

    private val usbReceiver = object : BroadcastReceiver() {
        override fun onReceive(context: Context?, intent: Intent) {
@@ -73,14 +73,21 @@ class MainActivity : AppCompatActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
+        sharedPreference = getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+
        binding = ActivityMainBinding.inflate(layoutInflater)
        setContentView(binding.root)
        binding.myToolbar.title = "Test Type"
        setSupportActionBar(binding.myToolbar)
-
+        if ((sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN")) {
+            binding.cvItem3.visibility = View.VISIBLE
+        }else{
+            binding.cvItem3.visibility = View.GONE
+        }
        setupListeners()
        fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
        getLocation()
+
        locationCallback = object : LocationCallback() {
            override fun onLocationResult(locationResult: LocationResult) {
                locationResult.lastLocation?.let { location ->
@@ -92,7 +99,6 @@ class MainActivity : AppCompatActivity() {
                }
            }
        }
-
        val usbFilter = IntentFilter().apply {
            addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
            addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED)
@@ -103,7 +109,7 @@ class MainActivity : AppCompatActivity() {
            with(binding) {
                if (deviceType == Constants.DEVICE_TYPE_HEMOCUBE) {
                    cvItem1.visibility = View.VISIBLE
-                    cvItem3.visibility = View.GONE
+                    cvItem3.visibility = View.VISIBLE
                    cvItem2.visibility = View.GONE
                    cvItem4.visibility = View.GONE
                }
@@ -111,15 +117,22 @@ class MainActivity : AppCompatActivity() {
            }
        }

-        if (DataHolder.selectedTest == null) {
-            startActivity(Intent(this, DashboardActivity::class.java))
-            finish()
+//        if (DataHolder.selectedTest == null) {
+//            startActivity(Intent(this, DashboardActivity::class.java))
+//            finish()
+//        }
    }
+    private fun changeUI(){
+        binding.cvItem1.visibility = View.VISIBLE
+        binding.cvItem3.visibility = View.VISIBLE
+        binding.cvItem2.visibility = View.GONE
+        binding.cvItem4.visibility = View.GONE
    }

    private fun checkAndUpdateUsbConnection() {
        val availableDrivers = UsbSerialProber.getDefaultProber()
            .findAllDrivers(getSystemService(Context.USB_SERVICE) as UsbManager)
+            .toList()

        val deviceType = when {
            availableDrivers.isNotEmpty() -> {
@@ -130,51 +143,18 @@ class MainActivity : AppCompatActivity() {
                    Toast.LENGTH_SHORT
                ).show()
                when {
-                    device.productId == Constants.HOMO_CUBE_ID && device.vendorId == Constants.VENDOR_ID -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.GONE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
+                    (device.productId == Constants.HOMO_CUBE_ID && device.vendorId == Constants.VENDOR_ID) || (device.productId == Constants.HEMO_CUBE_V2_PRODUCT_ID && device.vendorId == Constants.HEMO_CUBE_V2_VENDOR_ID) -> {
+                        changeUI()
                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
                        Constants.DEVICE_TYPE_HEMOCUBE
                    }

-                    device.productId == Constants.HEMO_CUBE_V2_PRODUCT_ID && device.vendorId == Constants.HEMO_CUBE_V2_VENDOR_ID -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.GONE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
-                    }
-
-                    device.productId == 24577 && device.vendorId == 1027 -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.GONE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
+                    (device.productId == 24577 && device.vendorId == 1027) || (device.productId == 8963 && device.vendorId == 1659) || (device.productId == 4614 && device.vendorId == 7111) -> {
+                        changeUI()
                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_TRUEHEME)
                        Constants.DEVICE_TYPE_TRUEHEME
                    }

-                    device.productId == 8963 && device.vendorId == 1659 -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.GONE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
-                    }
-
-                    device.productId == 4614 && device.vendorId == 7111 -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.GONE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
-                    }
-
                    device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> {
                        Log.d(
                            TAG,
@@ -232,6 +212,13 @@ class MainActivity : AppCompatActivity() {
            startActivity(i)
            finish()
        }
+        binding.cvItem3.setOnClickListener {
+            DataHolder.selectedTestType = TestType.HB_EST
+            val i = Intent(applicationContext, KitScanActivity::class.java)
+            i.putExtra("fromWhere","Main")
+            startActivity(i)
+            finish()
+        }

        DataHolder.usbConnected.observe(this) {
            if (it) {
--- a/app/src/main/java/com/example/hpostesting/presentation/SplashActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/SplashActivity.kt
@@ -93,7 +93,7 @@ class SplashActivity : AppCompatActivity() {
            handlePermissionsResult(true)
        } else {
            val requestPermissionLauncher =
-                registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { _ ->
                    if (Environment.isExternalStorageManager()) {
                        handlePermissionsResult(true)
                    } else {
--- a/app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt
@@ -15,18 +15,17 @@ package com.example.hpostesting.presentation.adapter

 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.Resources
-import android.provider.ContactsContract.Data
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.AsyncListDiffer
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 import `in`.sminnovations.hpostesting.R
@@ -72,76 +71,95 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int,p
    @SuppressLint("SetTextI18n")
    override fun onBindViewHolder(holder: OfflineUserListViewHolder, position: Int) {
        val userList = differ.currentList[position]
+        updateHolderBinding(holder, userList)
+    }
+    private fun formatTime(incubationTime: String): String {
+        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+        val incubationTimeDate = formatter.parse(incubationTime)!!
+        val timeFormatter = SimpleDateFormat("HH:mm:ss", Locale.getDefault())
+        return "Time: ${isBetween15And30Minutes(incubationTime)} \n Started at: ${timeFormatter.format(incubationTimeDate)}"
+    }
+    private fun getSampleIdText(userList: HemoCubeTestData): String {
+        return "Sample ID: ${userList._id}"
+    }
+
+    private fun getBloodGroupText(userList: HemoCubeTestData): String {
+        return "Blood group: ${userList.bloodGroup}"
+    }
+
+    private fun getTestStatusText(userList: HemoCubeTestData): String {
+        return if (userList.testStatus!!) {
+            view.context.getString(R.string.test_concluded)
+        } else {
+            view.context.getString(R.string.test_pending)
+        }
+    }
+    private fun updateHolderBinding(holder: OfflineUserListViewHolder, userList: HemoCubeTestData) {
        holder.binding.apply {
-            userID.text = "Sample ID: ${userList._id}"
-            bloodGroup.text = "Blood group: ${userList.bloodGroup}"
-            time.text = "Time: ${isBetween15And30Minutes(userList.incubationTime)} \n Started at: ${
-                SimpleDateFormat("HH:mm:ss").format(
-                    SimpleDateFormat(
-                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                    ).parse(userList.incubationTime)!!
-                )
-            }"
-
-            if (userList.testStatus!!) {
-                teststatus.text = view.context.getString(R.string.test_concluded)
-
-            } else {
-                teststatus.text = view.context.getString(R.string.test_pending)
+            updateBasicUserInfo(this, userList)
+            if (fromWhere == "Home") {
+                setupUserCardClickListener(userCard, userList)
            }
-            if(fromWhere == "Home") {
+        }
+    }
+
+    private fun updateBasicUserInfo(binding: OfflineUserListViewBinding, userList: HemoCubeTestData) {
+        binding.apply {
+            userID.text = getSampleIdText(userList)
+            bloodGroup.text = getBloodGroupText(userList)
+            time.text = formatTime(userList.incubationTime)
+            teststatus.text = getTestStatusText(userList)
+        }
+    }
+
+    private fun setupUserCardClickListener(userCard: View, userList: HemoCubeTestData) {
        userCard.setOnClickListener {
-                    if (false) {
-                        Toast.makeText(
-                            view.context,
-                            view.context.getString(R.string.low_battery_warning),
-                            Toast.LENGTH_SHORT
-                        ).show()
-                        return@setOnClickListener
+            when {
+                isLowBattery(userList.batteryLevel) -> showToast(R.string.low_battery_warning)
+                isTestAlreadyCompleted(userList.testStatus) -> showToast(R.string.test_already_conducted)
+                else -> handleIncubationCheck(userList)
            }
-                    if (userList.testStatus != null) {
-                        if (userList.testStatus!!) {
+        }
+    }
+
+    private fun isLowBattery(batteryLevel: String): Boolean =
+        batteryLevel < "20"
+
+    private fun isTestAlreadyCompleted(testStatus: Boolean?): Boolean =
+        testStatus == true
+
+    private fun handleIncubationCheck(userList: HemoCubeTestData) {
+        if (userList.incubationTime.isEmpty()) {
+            showToast(R.string.incubation_not_started)
+            return
+        }
+
+        val incubationMinutes = isBetween15And30Minutes(userList.incubationTime)
+        when {
+            incubationMinutes < Constants.INCUBATION_TIME_MIN ->
+                showToast(R.string.incubation_not_completed)
+            incubationMinutes > Constants.INCUBATION_TIME_MAX ->
+                showToast(R.string.incubation_crossed_30_minutes)
+            else -> navigateToMainActivity(userList)
+        }
+    }
+
+    private fun showToast(@StringRes messageResId: Int) {
        Toast.makeText(
            view.context,
-                                view.context.getString(R.string.test_already_conducted),
+            view.context.getString(messageResId),
            Toast.LENGTH_SHORT
        ).show()
-                        } else {
-                            if (userList.incubationTime != "") {
-                                if (isBetween15And30Minutes(userList.incubationTime) < Constants.INCUBATION_TIME_MIN) {
-                                    Toast.makeText(
-                                        view.context,
-                                        view.context.getString(R.string.incubation_not_completed),
-                                        Toast.LENGTH_SHORT
-                                    ).show()
-                                } else if (isBetween15And30Minutes(userList.incubationTime) > Constants.INCUBATION_TIME_MAX) {
-                                    Toast.makeText(
-                                        view.context,
-                                        view.context.getString(R.string.incubation_crossed_30_minutes),
-                                        Toast.LENGTH_SHORT
-                                    ).show()
-                                } else {
+    }
+
+    private fun navigateToMainActivity(userList: HemoCubeTestData) {
        DataHolder.selectedTest = UserData(
            sampleid = userList.sampleid,
            _id = userList._id,
            bloodGroup = userList.bloodGroup,
            incubationTime = userList.incubationTime
        )
-                                    view.findNavController()
-                                            .navigate(R.id.action_nav_home_to_mainActivity)
-                                }
-                            } else {
-                                Toast.makeText(
-                                    view.context,
-                                    view.context.getString(R.string.incubation_not_started),
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        }
-                    }
-                }
-            }
-        }
+        view.findNavController().navigate(R.id.action_nav_home_to_mainActivity)
    }

    private fun isBetween15And30Minutes(createdAt: String): Long {
@@ -155,19 +173,19 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int,p
        return diffMillis / (60 * 1000)
    }

-    private fun showWarningToast(resId: Int) {
-        val contextToUse = view.context ?: return
-
-        val message = try {
-            contextToUse.getString(resId)
-        } catch (e: Resources.NotFoundException) {
-            "Resource not found for ID: $resId"
-        }
-
-        Toast.makeText(
-            contextToUse,
-            message,
-            Toast.LENGTH_SHORT
-        ).show()
-    }
+//    private fun showWarningToast(resId: Int) {
+//        val contextToUse = view.context ?: return
+//
+//        val message = try {
+//            contextToUse.getString(resId)
+//        } catch (e: Resources.NotFoundException) {
+//            "Resource not found for ID: $resId"
+//        }
+//
+//        Toast.makeText(
+//            contextToUse,
+//            message,
+//            Toast.LENGTH_SHORT
+//        ).show()
+//    }
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
@@ -33,6 +33,7 @@ import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
 import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.QuerySnapshot
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.UserItemViewBinding
 import java.text.SimpleDateFormat
@@ -61,115 +62,121 @@ class UserListAdapter(
    @SuppressLint("SetTextI18n")
    override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) {
        holder.binding.apply {
+            setupUserInfo(this, model)
+            setupBloodGroupButton(this, model)
+            setupTestStatusAndImage(this, model)
+            setupStartIncubationButton(this)
+            setupUserCardClickListener(this, model)
+        }
+    }
+
+    private fun setupUserInfo(binding: UserItemViewBinding, model: UserData) {
+        binding.apply {
            userName.text = "Name: ${model.name}"
+            if (model.incubationTime.isEmpty()) {
                userId.text = "User ID:${model._id}"
-            if (model.incubationTime == "") {
                btnBlood.visibility = View.VISIBLE
            } else {
-                userId.text =
-                    "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)} \n Started at: ${
-                        SimpleDateFormat("HH:mm:ss").format(
-                            SimpleDateFormat(
-                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                            ).parse(model.incubationTime)!!
+                val timeFormatted = SimpleDateFormat("HH:mm:ss").format(
+                    SimpleDateFormat(context.resources.getString(R.string.DateTimeFormat), Locale.getDefault())
+                        .parse(model.incubationTime)!!
                )
-                    }"
+                userId.text = "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)} \n Started at: $timeFormatted"
                btnBlood.visibility = View.GONE
            }
-
-
-            Glide.with(view).load(model.userImageURL).into(userImage)
-            if (model.testStatus!!) {
-                teststatus.text = view.context.getString(R.string.test_concluded)
-
-            } else {
-                teststatus.text = view.context.getString(R.string.test_pending)
+        }
    }

-            holder.binding.btnBlood.setOnClickListener {
-                val view: View? = requireActivity.currentFocus
+    private fun setupTestStatusAndImage(binding: UserItemViewBinding, model: UserData) {
+        binding.apply {
+            Glide.with(view).load(model.userImageURL).into(userImage)
+            teststatus.text = if (model.testStatus!!) {
+                view.context.getString(R.string.test_concluded)
+            } else {
+                view.context.getString(R.string.test_pending)
+            }
+        }
+    }

-                // on below line checking if view is not null.
-                if (view != null) {
-                    // on below line we are creating a variable
-                    // for input manager and initializing it.
+    private fun setupBloodGroupButton(binding: UserItemViewBinding, model: UserData) {
+        binding.btnBlood.setOnClickListener {
+            hideKeyboard()
+            showBloodGroupDialog(model, binding)
+        }
+    }
+
+    private fun hideKeyboard() {
+        val view: View? = requireActivity.currentFocus
+        view?.let {
            val inputMethodManager =
                context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
-
-                    // on below line hiding our keyboard.
-                    inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
+            inputMethodManager.hideSoftInputFromWindow(it.windowToken, 0)
+        }
    }
-                val inflater = LayoutInflater.from(context)
-                val dialogView = inflater.inflate(R.layout.dialog_custom, null)

+    private fun showBloodGroupDialog(model: UserData, binding: UserItemViewBinding) {
+        val dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_custom, null)
        val builder = AlertDialog.Builder(context)
            .setView(dialogView)
            .setTitle(R.string.blood_group)

-                val etBloodGroup =
-                    dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
-
-                builder.setPositiveButton(R.string.ok) { dialog, which ->
-                    val bloodGroup = etBloodGroup.text.toString()
-                    if (bloodGroup.equals("Select Blood Group") || bloodGroup.equals("ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ") || bloodGroup.isNullOrBlank()) {
-                        if (view != null) {
-                            etBloodGroup.error = view.context.getString(R.string.blood_group_error)
+        val etBloodGroup = dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
+        setupDialogButtons(builder, etBloodGroup, model, binding)
    }
-                        if (view != null) {
+
+    private fun setupDialogButtons(
+        builder: AlertDialog.Builder,
+        etBloodGroup: AutoCompleteTextView,
+        model: UserData,
+        binding: UserItemViewBinding
+    ) {
+        builder.setPositiveButton(R.string.ok) { _, _ ->
+            handleBloodGroupSelection(etBloodGroup, model, binding)
+        }
+
+        builder.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+        builder.create().show()
+    }
+
+    private fun handleBloodGroupSelection(
+        etBloodGroup: AutoCompleteTextView,
+        model: UserData,
+        binding: UserItemViewBinding
+    ) {
+        val bloodGroup = etBloodGroup.text.toString()
+        if (isInvalidBloodGroup(bloodGroup)) {
+            showBloodGroupError(etBloodGroup)
+            return
+        }
+        updateBloodGroupInFirestore(bloodGroup, model, binding)
+    }
+
+    private fun isInvalidBloodGroup(bloodGroup: String): Boolean {
+        return bloodGroup == "Select Blood Group" ||
+                bloodGroup == "ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ" ||
+                bloodGroup.isBlank()
+    }
+
+    private fun showBloodGroupError(etBloodGroup: AutoCompleteTextView) {
+        etBloodGroup.error = view.context.getString(R.string.blood_group_error)
        Toast.makeText(
            context,
            view.context.getString(R.string.blood_group_toast),
            Toast.LENGTH_SHORT
        ).show()
    }
-                    } else {
-                        // Check if hemoCubeViewModel and testDetails are not null
-                        val db: FirebaseFirestore = FirebaseFirestore.getInstance()

+    private fun updateBloodGroupInFirestore(
+        bloodGroup: String,
+        model: UserData,
+        binding: UserItemViewBinding
+    ) {
+        val db = FirebaseFirestore.getInstance()
        db.collection("patientData")
            .whereEqualTo("_id", model._id)
            .get()
            .addOnSuccessListener { userdata ->
-                                try {
-                                    val document = userdata.documents[0]
-                                    db.collection("patientData")
-                                        .document(document.id)
-                                        .update(
-                                            "bloodGroup", bloodGroup,
-                                            "incubationTime", SimpleDateFormat(
-                                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                                            ).format(Calendar.getInstance().time).toString()
-                                        )
-                                        .addOnSuccessListener {
-                                            if (view != null) {
-                                                Toast.makeText(
-                                                    view.context,
-                                                    context?.getString(R.string.blood_group_updated_successfully),
-                                                    Toast.LENGTH_SHORT
-                                                ).show()
-                                            }
-                                            btnBlood.visibility = View.GONE
-                                        }
-                                        .addOnFailureListener { e ->
-                                            if (view != null) {
-                                                Toast.makeText(
-                                                    view.context,
-                                                    context?.getString(R.string.failed_to_update_blood_group),
-                                                    Toast.LENGTH_SHORT
-                                                ).show()
-                                            }
-                                        }
-                                } catch (e: IndexOutOfBoundsException) {
-                                    // Handle the case where no documents are found for the specified ID
-                                    if (view != null) {
-                                        Toast.makeText(
-                                            view.context,
-                                            context?.getString(R.string.no_user_data_found),
-                                            Toast.LENGTH_SHORT
-                                        ).show()
-                                    }
-                                }
-
+                handleFirestoreUpdate(userdata, bloodGroup, binding)
            }
            .addOnFailureListener { e ->
                Toast.makeText(
@@ -179,18 +186,60 @@ class UserListAdapter(
                ).show()
            }
    }
-                    // Handle the selected blood group here
+
+    private fun handleFirestoreUpdate(
+        userdata: QuerySnapshot,
+        bloodGroup: String,
+        binding: UserItemViewBinding
+    ) {
+        try {
+            val document = userdata.documents[0]
+            updateDocument(document.id, bloodGroup, binding)
+        } catch (e: IndexOutOfBoundsException) {
+            Toast.makeText(
+                view.context,
+                context.getString(R.string.no_user_data_found),
+                Toast.LENGTH_SHORT
+            ).show()
+        }
    }

-                builder.setNegativeButton(R.string.cancel) { dialog, which ->
-                    dialog.dismiss()
+    private fun updateDocument(
+        documentId: String,
+        bloodGroup: String,
+        binding: UserItemViewBinding
+    ) {
+        FirebaseFirestore.getInstance().collection("patientData")
+            .document(documentId)
+            .update(
+                "bloodGroup", bloodGroup,
+                "incubationTime", getCurrentTimeFormatted()
+            )
+            .addOnSuccessListener {
+                Toast.makeText(
+                    view.context,
+                    context.getString(R.string.blood_group_updated_successfully),
+                    Toast.LENGTH_SHORT
+                ).show()
+                binding.btnBlood.visibility = View.GONE
+            }
+            .addOnFailureListener {
+                Toast.makeText(
+                    view.context,
+                    context.getString(R.string.failed_to_update_blood_group),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
    }

-                val alertDialog = builder.create()
-                alertDialog.show()
+    private fun getCurrentTimeFormatted(): String {
+        return SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+            .format(Calendar.getInstance().time)
    }

-            btnStartIncubation.setOnClickListener {
+    private fun setupStartIncubationButton(binding: UserItemViewBinding) {
+        // Commented code preserved as per requirement
+        binding.btnStartIncubation.setOnClickListener {
 //            it.visibility = View.GONE
 //            Firebase.firestore.collection("patientData").whereEqualTo("_id", model._id).get()
 //                .addOnSuccessListener { data ->
@@ -211,62 +260,76 @@ class UserListAdapter(
 //                    }
 //                }
        }
-            userCard.setOnClickListener {
-                if (false) {
-                    Toast.makeText(
-                        view.context,
-                        context?.getString(R.string.low_battery_warning),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    return@setOnClickListener
    }
-                if (model.testStatus != null) {
-                    if (model.testStatus!!) {
-                        Toast.makeText(
-                            view.context,
-                            context?.getString(R.string.test_already_conducted),
-                            Toast.LENGTH_SHORT
-                        ).show()
+
+    private fun setupUserCardClickListener(binding: UserItemViewBinding, model: UserData) {
+        binding.userCard.setOnClickListener {
+            model.testStatus?.let { testStatus ->
+                if (testStatus) {
+                    showTestAlreadyConductedMessage()
                } else {
-                        if (model.incubationTime != "") {
-                            if (isBetween15And30Minutes(model.incubationTime) < -15000) {
+                    handleIncubationTimeCheck(model)
+                }
+            }
+        }
+    }
+
+    private fun showTestAlreadyConductedMessage() {
        Toast.makeText(
            view.context,
-                                    context?.getString(R.string.incubation_not_completed),
+            context.getString(R.string.test_already_conducted),
            Toast.LENGTH_SHORT
        ).show()
-                            } else if (isBetween15And30Minutes(model.incubationTime) > 300000) {
+    }
+
+    private fun handleIncubationTimeCheck(model: UserData) {
+        if (model.incubationTime.isEmpty()) {
+            showIncubationNotStartedMessage()
+            return
+        }
+
+        val incubationTime = isBetween15And30Minutes(model.incubationTime)
+        when {
+            incubationTime < -15000 -> showIncubationNotCompletedMessage()
+            incubationTime > 300000 -> showIncubationCrossedMessage()
+            else -> navigateToMainActivity(model)
+        }
+    }
+
+    private fun showIncubationNotStartedMessage() {
        Toast.makeText(
            view.context,
-                                    context?.getString(R.string.incubation_crossed_30_minutes),
+            context.getString(R.string.incubation_not_started),
            Toast.LENGTH_SHORT
        ).show()
-                            } else {
+    }
+
+    private fun showIncubationNotCompletedMessage() {
+        Toast.makeText(
+            view.context,
+            context.getString(R.string.incubation_not_completed),
+            Toast.LENGTH_SHORT
+        ).show()
+    }
+
+    private fun showIncubationCrossedMessage() {
+        Toast.makeText(
+            view.context,
+            context.getString(R.string.incubation_crossed_30_minutes),
+            Toast.LENGTH_SHORT
+        ).show()
+    }
+
+    private fun navigateToMainActivity(model: UserData) {
        DataHolder.selectedTest = model
-                                view.findNavController()
-                                    .navigate(R.id.action_nav_home_to_mainActivity)
-                            }
-                        } else {
-                            Toast.makeText(
-                                view.context,
-                                context?.getString(R.string.incubation_not_started),
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
-                    }
-                }
-            }
-        }
+        view.findNavController().navigate(R.id.action_nav_home_to_mainActivity)
    }

    private fun isBetween15And30Minutes(createdAt: String): Long {
        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
        val createdAtDate: Date = formatter.parse(createdAt)!!
-
        val currentTime = Calendar.getInstance().time
-
        val diffMillis = currentTime.time - createdAtDate.time
-
        return diffMillis / (60 * 1000)
    }
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt
@@ -36,231 +36,274 @@ import `in`.sminnovations.hpostesting.databinding.FragmentAssuranceControlsBindi
 import java.time.Instant

 class AssuranceControlsFragment : Fragment() {
-    lateinit var binding: FragmentAssuranceControlsBinding
+    private val selectConcentration = "Select concentration"
+    private val selectSolution = "Select solution"
+    private lateinit var binding: FragmentAssuranceControlsBinding
    private lateinit var sharedPreferences: SharedPreferences

    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
    ): View {
        binding = FragmentAssuranceControlsBinding.inflate(inflater, container, false)
-        sharedPreferences =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
-        DataHolder.hemoCubeTestData!!.solution = ""
-        DataHolder.hemoCubeTestData!!.volume = ""
+        initializeSharedPreferences()
+        resetTestData()
        return binding.root
    }

+    private fun initializeSharedPreferences() {
+        sharedPreferences = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+    }
+
+    private fun resetTestData() {
+        DataHolder.hemoCubeTestData?.apply {
+            solution = ""
+            volume = ""
+        }
+    }
+
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
        initViews()
    }

    private fun initViews() {
-//        binding.btnSubmit.visibility = View.GONE
-        val solutionSpinner: Spinner = binding.spinnerSolutions
-        val solutionOptions = arrayOf("Select solution", "Tartrazine", "Acid Red","Sickle-Cert-Buffer", "1 Abs Holo Filter", "0.25 Abs Holo Filter", "Air Blank")
-        val solutionAdapter =
-            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
-        solutionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        solutionSpinner.adapter = solutionAdapter
-        solutionSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long,
-            ) {
-                val selectedSolution: String = solutionOptions[position]
-                if (selectedSolution != "Select solution") {
-                    DataHolder.hemoCubeTestData!!.solution = selectedSolution
+        setupSolutionSpinner()
+        setupConcentrationSpinner()
+        setupVolumeSpinner()
+        setupAdminSpinner()
+        loadSavedValues()
+        setupSubmitButton()
+    }

-                    // Update visibility and name based on selected solution
-                    if(selectedSolution == "Tartrazine" || selectedSolution == "Acid Red"){
-                        activity?.runOnUiThread {
-                            binding.spinnerConcentration.visibility = View.VISIBLE
-                            // Ensure the name is updated only after concentration is selected.
-                            // You might need to adjust this logic based on how and when you want to update the name.
-                            // For now, it simply shows that the visibility is being handled.
-                        }
-                    } else {
-                        activity?.runOnUiThread {
-                            binding.spinnerConcentration.visibility = View.GONE
-                        }
-                    }
-                } else {
-                    activity?.runOnUiThread {
-                        binding.spinnerConcentration.visibility = View.GONE
-                    }
+    private fun setupSolutionSpinner() {
+        val solutionOptions = getSolutionOptions()
+        val solutionAdapter = createSpinnerAdapter(solutionOptions)
+        binding.spinnerSolutions.apply {
+            adapter = solutionAdapter
+            onItemSelectedListener = createSolutionSelectionListener(solutionOptions)
        }
    }

-            override fun onNothingSelected(parent: AdapterView<*>?) {
-            }
-        }
-
-        val concentrationSpinner: Spinner = binding.spinnerConcentration
-        val concentrationOptions = arrayOf(
-            "Select concentration",
-            "65umol",
-            "45umol",
-            "22.5umol",
-            "12.25umol",
-            "6.125umol",
-            "75umol",
-            "50umol",
-            "25umol",
-            "12.5umol",
-            "6.25umol"
+    private fun getSolutionOptions() = arrayOf(
+        selectSolution, "Tartrazine", "Acid Red", "Sickle-Cert-Buffer",
+        "1 Abs Holo Filter", "0.25 Abs Holo Filter", "Air Blank"
    )
-        val concentrationAdapter =
-            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, concentrationOptions)
-        concentrationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        concentrationSpinner.adapter = concentrationAdapter
-        concentrationSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+
+    private fun createSolutionSelectionListener(solutionOptions: Array<String>) =
+        object : AdapterView.OnItemSelectedListener {
            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long,
+                parent: AdapterView<*>?, view: View?, position: Int, id: Long
            ) {
-                val selectedValue: String = concentrationOptions[position]
-                if (!selectedValue.equals("Select concentration")) {
-                    DataHolder.hemoCubeTestData!!.concentration = selectedValue
+                handleSolutionSelection(solutionOptions[position])
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                //Nothing
+            }
+        }
+
+    private fun handleSolutionSelection(selectedSolution: String) {
+        if (selectedSolution != selectSolution) {
+            DataHolder.hemoCubeTestData?.solution = selectedSolution
+            updateConcentrationSpinnerVisibility(selectedSolution)
+        } else {
+            activity?.runOnUiThread {
+                binding.spinnerConcentration.visibility = View.GONE
+            }
+        }
+    }
+
+    private fun updateConcentrationSpinnerVisibility(selectedSolution: String) {
+        val shouldShowConcentration = selectedSolution in listOf("Tartrazine", "Acid Red")
+        activity?.runOnUiThread {
+            binding.spinnerConcentration.visibility =
+                if (shouldShowConcentration) View.VISIBLE else View.GONE
+        }
+    }
+
+    private fun setupConcentrationSpinner() {
+        val concentrationOptions = getConcentrationOptions()
+        val concentrationAdapter = createSpinnerAdapter(concentrationOptions)
+        binding.spinnerConcentration.apply {
+            adapter = concentrationAdapter
+            onItemSelectedListener = createConcentrationSelectionListener(concentrationOptions)
+        }
+    }
+
+    private fun getConcentrationOptions() = arrayOf(
+        selectConcentration, "65umol", "45umol", "22.5umol", "12.25umol",
+        "6.125umol", "75umol", "50umol", "25umol", "12.5umol", "6.25umol"
+    )
+
+    private fun createConcentrationSelectionListener(concentrationOptions: Array<String>) =
+        object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?, view: View?, position: Int, id: Long
+            ) {
+                val selectedValue = concentrationOptions[position]
+                if (selectedValue != selectConcentration) {
+                    DataHolder.hemoCubeTestData?.concentration = selectedValue
                }
            }

            override fun onNothingSelected(parent: AdapterView<*>?) {
+                //Nothing
            }
        }

-        val volumeSpinner: Spinner = binding.spinnerVolume
-        val volumeOptions = arrayOf("Select volume", "1uml", "2uml", "4uml", "4.5uml", "5uml")
-        val volumeAdapter =
-            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, volumeOptions)
-        volumeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        volumeSpinner.adapter = volumeAdapter
-        volumeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long,
-            ) {
-                val selectedValue: String = volumeOptions[position]
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
+    private fun setupVolumeSpinner() {
+        val volumeOptions = getVolumeOptions()
+        val volumeAdapter = createSpinnerAdapter(volumeOptions)
+        binding.spinnerVolume.apply {
+            adapter = volumeAdapter
+            onItemSelectedListener = createVolumeSelectionListener(volumeOptions)
        }
    }

+    private fun getVolumeOptions() =
+        arrayOf("Select volume", "1uml", "2uml", "4uml", "4.5uml", "5uml")

-        val adminspinner: Spinner = binding.spinnerAdmin
-        val adminOptions = arrayOf("Select options", "Sickle-Cert-Buffer", "1 Abs Holo Filter", "0.25 Abs Holo Filter", "Air Blank")
-        val adminAdapter =
-            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, adminOptions)
-        adminAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        adminspinner.adapter =adminAdapter
-        adminspinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long,
-            ) {
-                val selectedValue: String = adminOptions[position]
-
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
+    private fun setupAdminSpinner() {
+        val adminOptions = getAdminOptions()
+        val adminAdapter = createSpinnerAdapter(adminOptions)
+        binding.spinnerAdmin.apply {
+            adapter = adminAdapter
+            onItemSelectedListener = createAdminSelectionListener(adminOptions)
        }
    }
-        // load saved values
-        val savedSolution =
-            sharedPreferences.getString(Constants.QUICK_CAPTURE_SOLUTION, "").toString()
-        val solutionPosition = getPositionOfValue(savedSolution, solutionOptions.toList())
-        solutionSpinner.setSelection(solutionPosition)

-        val savedConcentration =
-            sharedPreferences.getString(Constants.QUICK_CAPTURE_CONCENTRATION, "").toString()
-        val concentrationPosition =
-            getPositionOfValue(savedConcentration, concentrationOptions.toList())
-        concentrationSpinner.setSelection(concentrationPosition)
+    private fun getAdminOptions() = arrayOf(
+        "Select options", "Sickle-Cert-Buffer", "1 Abs Holo Filter",
+        "0.25 Abs Holo Filter", "Air Blank"
+    )

-        val savedVolume = sharedPreferences.getString(Constants.QUICK_CAPTURE_VOLUME, "").toString()
-        val volumePosition = getPositionOfValue(savedVolume, volumeOptions.toList())
-        volumeSpinner.setSelection(volumePosition)
+    private fun createSpinnerAdapter(options: Array<String>): ArrayAdapter<String> {
+        return ArrayAdapter(requireContext(), R.layout.simple_spinner_item, options).apply {
+            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        }
+    }

+    private fun loadSavedValues() {
+        loadSpinnerValue(Constants.QUICK_CAPTURE_SOLUTION, getSolutionOptions(), binding.spinnerSolutions)
+        loadSpinnerValue(Constants.QUICK_CAPTURE_CONCENTRATION, getConcentrationOptions(), binding.spinnerConcentration)
+        loadSpinnerValue(Constants.QUICK_CAPTURE_VOLUME, getVolumeOptions(), binding.spinnerVolume)
+        loadSpinnerValue(Constants.QUICK_CAPTURE_FOR_ADMIN, getAdminOptions(), binding.spinnerAdmin)
+    }

-        val foradmin =
-            sharedPreferences.getString(Constants.QUICK_CAPTURE_FOR_ADMIN, "").toString()
-        val adminPosition = getPositionOfValue(foradmin, adminOptions.toList())
-        adminspinner.setSelection(adminPosition)
+    private fun loadSpinnerValue(key: String, options: Array<String>, spinner: Spinner) {
+        val savedValue = sharedPreferences.getString(key, "").toString()
+        val position = getPositionOfValue(savedValue, options.toList())
+        spinner.setSelection(position)
+    }

+    private fun setupSubmitButton() {
        binding.btnSubmit.setOnClickListener {
+            if (!validateSelections()) return@setOnClickListener
+            updateTestData()
+            savePreferences()
+            navigateToHemocubeActivity()
+        }
+    }
+
+    private fun validateSelections(): Boolean {
        val selectedSolution = binding.spinnerSolutions.selectedItem.toString()
        val selectedConcentration = binding.spinnerConcentration.selectedItem.toString()
-            val selectedadminOption = binding.spinnerAdmin.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
-            }else{
-                DataHolder.hemoCubeTestData!!.name = selectedSolution
+        if (selectedSolution == selectSolution) {
+            showToast("Please select a solution")
+            return false
        }

-            if (selectedConcentration == "Select concentration" && binding.spinnerConcentration.isVisible) {
-                Toast.makeText(requireContext(), "Please select a concentration", Toast.LENGTH_LONG).show()
-                return@setOnClickListener // Prevent further execution
-            }else if(binding.spinnerConcentration.isVisible){
-                DataHolder.hemoCubeTestData!!.name = "$selectedSolution $selectedConcentration"
-            }else{
-                DataHolder.hemoCubeTestData!!.name = selectedSolution
+        if (selectedConcentration == selectConcentration && binding.spinnerConcentration.isVisible) {
+            showToast("Please select a concentration")
+            return false
        }

-
-
-
-            if (selectedadminOption == "Select options" && binding.spinnerAdmin.isVisible) {
-                Toast.makeText(requireContext(), "Please select a option", Toast.LENGTH_LONG).show()
-                return@setOnClickListener // Prevent further execution
+        if (selectedAdminOption == "Select options" && binding.spinnerAdmin.isVisible) {
+            showToast("Please select a option")
+            return false
        }
-            DataHolder.hemoCubeTestData!!.quickCapture = true
+
+        return true
+    }
+
+    private fun showToast(message: String) {
+        Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show()
+    }
+
+    private fun updateTestData() {
+        DataHolder.hemoCubeTestData?.apply {
+            quickCapture = true
+            _id = generateTestId()
+            solution = binding.spinnerSolutions.selectedItem.toString()
+            concentration = binding.spinnerConcentration.selectedItem.toString()
+            filter = binding.spinnerAdmin.selectedItem.toString()
+            name = determineTestName()
+        }
+
+        DataHolder.selectedTest = UserData().apply {
+            _id = DataHolder.hemoCubeTestData?._id.toString()
+            name = DataHolder.hemoCubeTestData?.name.toString()
+        }
+    }
+
+    private fun generateTestId(): String {
        val currentUnixTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            Instant.now().epochSecond
        } else {
            ""
        }
-            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") && binding.spinnerAdmin.isVisible){
-//                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
-
-            with(sharedPreferences.edit()) {
-                putString(Constants.QUICK_CAPTURE_SOLUTION, DataHolder.hemoCubeTestData!!.solution)
-                putString(
-                    Constants.QUICK_CAPTURE_CONCENTRATION,
-                    DataHolder.hemoCubeTestData!!.concentration
-                )
-                putString(Constants.QUICK_CAPTURE_VOLUME, DataHolder.hemoCubeTestData!!.volume)
-                putString(Constants.QUICK_CAPTURE_FOR_ADMIN, DataHolder.hemoCubeTestData!!.filter)
-                apply()
+        return "${currentUnixTime}SMI"
    }

-            val i = Intent(requireContext(), HemocubeActivity::class.java)
-            startActivity(i)
+    private fun determineTestName(): String {
+        val solution = binding.spinnerSolutions.selectedItem.toString()
+        return if (binding.spinnerConcentration.isVisible) {
+            "$solution ${binding.spinnerConcentration.selectedItem}"
+        } else {
+            solution
+        }
+    }
+
+    private fun savePreferences() {
+        with(sharedPreferences.edit()) {
+            putString(Constants.QUICK_CAPTURE_SOLUTION, DataHolder.hemoCubeTestData?.solution)
+            putString(Constants.QUICK_CAPTURE_CONCENTRATION, DataHolder.hemoCubeTestData?.concentration)
+            putString(Constants.QUICK_CAPTURE_VOLUME, DataHolder.hemoCubeTestData?.volume)
+            putString(Constants.QUICK_CAPTURE_FOR_ADMIN, DataHolder.hemoCubeTestData?.filter)
+            apply()
+        }
+    }
+
+    private fun navigateToHemocubeActivity() {
+        val intent = Intent(requireContext(), HemocubeActivity::class.java)
+        startActivity(intent)
+    }
+
+    private fun createVolumeSelectionListener(volumeOptions: Array<String>) =
+        object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?, view: View?, position: Int, id: Long
+            ) {
+                volumeOptions[position]
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                //Nothing
+            }
+        }
+
+    private fun createAdminSelectionListener(adminOptions: Array<String>) =
+        object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?, view: View?, position: Int, id: Long
+            ) {
+                adminOptions[position]
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                //Nothing
            }
        }

@@ -272,7 +315,6 @@ class AssuranceControlsFragment : Fragment() {
                }
            }
        }
-
        return 0
    }
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt
@@ -44,74 +44,101 @@ class AutoDacFragment : Fragment() {
    private lateinit var sharedPreferences: SharedPreferences
    private var currentDeviceData: DeviceData? = null
    private var resultData: String = ""
- //   private val messages = MutableLiveData<String>()
    private var startListening = MutableLiveData(false)

    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
    ): View {
        binding = FragmentAutoDacBinding.inflate(inflater, container, false)
-        sharedPreferences =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        initSharedPreferences()
        return binding.root
    }

+    private fun initSharedPreferences() {
+        sharedPreferences = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+    }
+
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
        initViews()
-        observeViewModel()
+        setupObservers()
    }

    private fun initViews() {
-        binding.btnSubmit.visibility = View.GONE
+        setupInitialViewState()
+        setupClickListeners()
+        setupAdminControls()
        listenToHemoCube()
        getDeviceId()
-        binding.tvSubtitle4.movementMethod = ScrollingMovementMethod()
-        binding.btnSubmit.setOnClickListener {
+    }
+
+    private fun setupInitialViewState() {
+        binding.apply {
+            btnSubmit.visibility = View.GONE
+            tvSubtitle4.movementMethod = ScrollingMovementMethod()
+        }
+    }
+
+    private fun setupClickListeners() {
+        binding.apply {
+            btnSubmit.setOnClickListener {
                resultData += "Calibrating the device...\n"
                autoDacViewModel.messages.postValue(resultData)
                testStatusCode = 0.5
-            binding.btnSubmit.visibility = View.GONE
-            runJCommand()
+                btnSubmit.visibility = View.GONE
+                sendHemoCubeCommand(HemoCubeCommands.J_COMMAND)
            }
-        binding.btnReadDac.setOnClickListener {
+            btnReadDac.setOnClickListener {
                readClick = true
-            binding.btnReadDac.visibility = View.GONE
-            runECommand()
+                btnReadDac.visibility = View.GONE
+                sendHemoCubeCommand(HemoCubeCommands.LOAD_DAC_VALUES)
+            }
        }
-        if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
-            binding.btnReadDac.visibility = View.VISIBLE
-        }else{
-            binding.btnReadDac.visibility = View.GONE
    }

+    private fun setupAdminControls() {
+        binding.btnReadDac.visibility =
+            if (isAdminUser()) View.VISIBLE else View.GONE
    }

-    private fun observeViewModel() {
+    private fun isAdminUser(): Boolean =
+        sharedPreferences.getString(Constants.USER_ID, "") == "ADMIN"

-        autoDacViewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
+    private fun setupObservers() {
+        with(autoDacViewModel) {
+            deviceData.observe(viewLifecycleOwner) { currentDeviceData = it }
+            messages.observe(viewLifecycleOwner) { binding.tvSubtitle4.text = it }
+            fireBaseUpload.observe(viewLifecycleOwner) { handleFirebaseUploadResult(it) }
+        }
    }

-        autoDacViewModel.messages.observe(viewLifecycleOwner) {
-            binding.tvSubtitle4.text = it
+    private fun handleFirebaseUploadResult(result: String) {
+        when (result) {
+            "Success" -> showToast("Auto Dac data uploaded successfully")
+            "Local" -> showToast("Auto Dac uploading failed, note it down manually")
        }
-
-        autoDacViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                showToast("Auto Dac data uploaded successfully")
-            }
-            if (result == "Local") {
-                showToast("Auto Dac uploading failed, note it down manually")
-            }
-
        binding.progressBar.visibility = View.GONE
    }
+
+    private fun sendHemoCubeCommand(
+        command: HemoCubeCommands,
+        listener: UsbServiceListener = defaultUsbListener()
+    ) {
+        autoDacViewModel.progressBar.postValue(true)
+        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(command, listener)
+    }
+
+    private fun defaultUsbListener() = object : UsbServiceListener {
+        override fun onUsbRead(data: ByteArray?) {
+            //Nothing
+        }
+        override fun onUsbError(e: Exception?) {
+            autoDacViewModel.progressBar.postValue(false)
+        }
    }

    private fun getDeviceId() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
+        sendHemoCubeCommand(
            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {
@@ -125,258 +152,144 @@ class AutoDacFragment : Fragment() {
                override fun onUsbError(e: Exception?) {
                    autoDacViewModel.progressBar.postValue(false)
                }
-            })
            }
-    private fun runJCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.J_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runDCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.DIAGNOSTICS_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runCCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.AUTO_DAC_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runGCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.SET_AUTO_DAC_TO_EPROM_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runECommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.LOAD_DAC_VALUES,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-
-    private fun setAutoDacValuesCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.SET_AUTO_DAC_TO_EPROM_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun readCurrentDACValuesCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.READ_DAC_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
+        )
    }

    private fun listenToHemoCube() {
-
-        val fullReadOutput = StringBuilder()
        startListening.postValue(true)
-
        try {
-            (activity as AutoDacActivity).mService.listenToHemoCube(object :
-                UsbServiceListener {
+            (activity as AutoDacActivity).mService.listenToHemoCube(
+                object : UsbServiceListener {
                    override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        fullReadOutput.append(stringData)
+                        data?.let { handleHemoCubeData(String(it)) }
+                    }
+
+                    override fun onUsbError(e: Exception?) {
+                        autoDacViewModel.progressBar.postValue(false)
+                    }
+                }
+            )
+        } catch (e: Exception) {
+            Firebase.crashlytics.recordException(e)
+        }
+    }
+
+    private fun handleHemoCubeData(stringData: String) {
        resultData += stringData
-                        if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+        if (isAdminUser()) {
            autoDacViewModel.messages.postValue(resultData)
        }
-                       // binding.tvSubtitle4.text = resultData
-                        if (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()
-//                                }
+
+        when {
+            stringData.contains("SN") -> handleSerialNumber(stringData)
+            resultData.contains("#JC") && testStatusCode < 1.0 -> handleJCommandResponse()
+            resultData.contains("#DC") && testStatusCode < 1.2 -> handleDCommandResponse()
+            resultData.contains("#GC") && testStatusCode < 1.6 -> handleGCommandResponse()
+            resultData.contains("#EC") && testStatusCode < 1.8 -> handleECommandResponse()
+            resultData.contains("#EC") && readClick && testStatusCode < 2.1 -> handleReadClickResponse()
+            resultData.contains("#CC") && testStatusCode < 1.4 -> handleCCommandResponse()
+            resultData.contains("#WC") -> showToast("DAC Values saved to EPROM")
+        }
+    }
+
+    private fun handleSerialNumber(stringData: String) {
+        stringData.split(" ").getOrNull(1)?.trim()?.let { _ ->
+            // Commented as per original code
+            // saveHardwareId(hardwareId)
        }
        activity?.runOnUiThread {
            binding.btnSubmit.visibility = View.VISIBLE
        }
    }
-                    }
-                    if (resultData.contains("#JC") && testStatusCode < 1.0) {
+
+    private fun handleJCommandResponse() {
        testStatusCode = 1.1
-                        runDCommand()
+        sendHemoCubeCommand(HemoCubeCommands.DIAGNOSTICS_COMMAND)
    }
-                    if (resultData.contains("#DC") && testStatusCode < 1.2) {
+
+    private fun handleDCommandResponse() {
        testStatusCode = 1.3
-                        if(validateDacValues()){
-                            if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+        if (validateDacValues()) {
+            val message = if (isAdminUser()) {
                resultData += "Calibrating the device, Please wait...\n"
-                            }else{
-                                resultData = "Calibrating the device, Please wait...\n"
+                resultData
+            } else {
+                "Calibrating the device, Please wait...\n"
            }
-                            autoDacViewModel.messages.postValue(resultData)
-                            runCCommand()
-                        }else{
+            autoDacViewModel.messages.postValue(message)
+            sendHemoCubeCommand(HemoCubeCommands.AUTO_DAC_COMMAND)
+        } else {
+            handleCalibrationFailure()
+        }
+    }
+
+    private fun handleCalibrationFailure() {
        activity?.runOnUiThread {
-                                if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+            val message = if (isAdminUser()) {
                resultData += "Calibration failed!\nContact us for help at support@sminnovations.in"
-                                }else{
-                                    resultData = "Calibration failed!\nContact us for help at support@sminnovations.in"
+                resultData
+            } else {
+                "Calibration failed!\nContact us for help at support@sminnovations.in"
            }
-                                autoDacViewModel.messages.postValue(resultData)
+            autoDacViewModel.messages.postValue(message)
            binding.btnReadDac.visibility = View.GONE
        }
    }
-                    }
-                    if (resultData.contains("#GC") && testStatusCode < 1.6) {
+
+    private fun handleGCommandResponse() {
        testStatusCode = 1.7
-                        runECommand()
+        sendHemoCubeCommand(HemoCubeCommands.LOAD_DAC_VALUES)
    }
-                    if (resultData.contains("#EC") && testStatusCode < 1.8) {
+
+    private fun handleECommandResponse() {
        testStatusCode = 1.9
-                        if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+        val message = if (isAdminUser()) {
            resultData += "Calibration Completed\n"
-                        }else{
-                            resultData = "Calibration Completed\n"
+            resultData
+        } else {
+            "Calibration Completed\n"
        }
-                        autoDacViewModel.messages.postValue(resultData)
+        autoDacViewModel.messages.postValue(message)
        activity?.runOnUiThread {
-                            Toast.makeText(requireActivity(), "Calibration completed", Toast.LENGTH_LONG).show()
+            showToast("Calibration completed")
            binding.ivCheck.visibility = View.VISIBLE
        }
    }
-                    if (resultData.contains("#EC") && readClick && testStatusCode < 2.1) {
+
+    private fun handleReadClickResponse() {
        testStatusCode = 2.2
-                        readCurrentDACValuesCommand()
+        sendHemoCubeCommand(HemoCubeCommands.READ_DAC_COMMAND)
    }
-                    if (resultData.contains("#CC") && testStatusCode < 1.4) {
+
+    private fun handleCCommandResponse() {
        testStatusCode = 1.5
-                        setAutoDacValuesCommand()
+        sendHemoCubeCommand(HemoCubeCommands.SET_AUTO_DAC_TO_EPROM_COMMAND)
+        uploadAutoDacData()
+    }
+
+    private fun uploadAutoDacData() {
        autoDacViewModel.addAutoDacDataToDb(
            DiagnosticsData(
-                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
-                                    .toString(),
-                                devicePassword = sharedPreferences.getString(
-                                    Constants.DEVICE_PASSWORD_API,
-                                    ""
-                                ).toString(),
-                                deviceNatsToken = sharedPreferences.getString(
-                                    Constants.NATS_TOKEN,
-                                    ""
-                                ).toString(),
-                                accessToken = sharedPreferences.getString(
-                                    Constants.ACCESS_TOKEN,
-                                    ""
-                                ).toString(),
+                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
+                devicePassword = sharedPreferences.getString(Constants.DEVICE_PASSWORD_API, "").toString(),
+                deviceNatsToken = sharedPreferences.getString(Constants.NATS_TOKEN, "").toString(),
+                accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString(),
                deviceData = resultData,
-                                runTime = SimpleDateFormat(
-                                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                                ).format(Calendar.getInstance().time)
+                runTime = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+                    .format(Calendar.getInstance().time)
            )
        )
-
    }

-                    if (resultData.contains("#WC")) {
-                        showToast("DAC Values saved to EPROM")
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-    fun extractSubstring(input: String): String {
-        val regex = "#CS(.*?)#CC".toRegex()
-        val matchResult = regex.find(input)
-        return matchResult?.groups?.get(1)?.value?.trim() ?: ""
-    }
    private fun validateDacValues(): Boolean {
        val pattern = Regex("(LED:\\d+)__DAC:(\\d+)__ADC:(\\d+)")
-        val matches = pattern.findAll(resultData)
-        for (match in matches) {
-            val ledName = match.groupValues[1]
+        return pattern.findAll(resultData).none { match ->
            val xValue = match.groupValues[2].toDouble()
            val yValue = match.groupValues[3].toDouble()
-
-            if(xValue == 3200.0){
-                if(yValue < 500.0){
-                    return false
+            xValue == 3200.0 && yValue < 500.0
        }
    }
-        }
-        return true
-    }
-
-    fun parseData(inputData: List<String>): List<Pair<String, String>> {
-        val pattern = Regex("([A-Z]+)\\s(\\d+)")
-        val parsedData = mutableListOf<Pair<String, String>>()
-
-        for (item in inputData) {
-            val matchResult = pattern.find(item)
-            if (matchResult != null) {
-                val (letters, numbers) = matchResult.destructured
-                parsedData.add(Pair(letters, numbers))
-            }
-        }
-
-        return parsedData
-    }

    private fun showToast(message: String) {
        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
--- a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacViewModel.kt
@@ -45,7 +45,7 @@ class AutoDacViewModel @Inject constructor(
    fun addAutoDacDataToDb(data: DiagnosticsData) {
        viewModelScope.launch {
            try {
-                when (val response = repository.addDiagnostics(data)) {
+                when (repository.addDiagnostics(data)) {
                    is Response.Success -> {
                        fireBaseUpload.postValue("Success")
                    }
--- a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt
@@ -42,7 +42,7 @@ import java.util.UUID
 import kotlin.math.log10

 class HemoCubeBufferCheckFragment : Fragment() {
-
+    private val kitFailed = "Kit Failed"
    private lateinit var binding: FragmentHemoCubeReferenceBinding
    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
    private lateinit var sharedPreferences: SharedPreferences
@@ -178,6 +178,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
                }

                override fun onUsbError(e: Exception?) {
+                    //nothing
                }
            })
        } catch (e: Exception) {
@@ -402,27 +403,27 @@ class HemoCubeBufferCheckFragment : Fragment() {
        }
    }

-    private fun findResult(calculatedRatio: Double?): String {
-        try {
-            hemoCubeViewModel.messages.postValue("result classification")
-            if (calculatedRatio != null) {
-                if (calculatedRatio < 0.05) return "Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume"
-                if (calculatedRatio in 0.05..0.155) return "Normal"
-                if (calculatedRatio in 0.155..0.175) return "Negative Borderline. Repeat Test"
-                if (calculatedRatio in 0.175..0.22) return "Sickle Cell Trait"
-                if (calculatedRatio in 0.22..0.25) return "Positive for Sickle Cell. HPLC for Confirmation"
-                if (calculatedRatio in 0.25..0.35) return "Sickle Cell Disease"
-                if (calculatedRatio > 0.35) return "Inconclusive. Repeat with test with lower volume of blood"
-            } else {
-                return "INVALID"
-            }
-        } catch (e: Exception) {
-            showToast(R.string.error_classification)
-            Firebase.crashlytics.recordException(e)
-            return "ERROR"
-        }
-        return "INVALID"
-    }
+//    private fun findResult(calculatedRatio: Double?): String {
+//        try {
+//            hemoCubeViewModel.messages.postValue("result classification")
+//            if (calculatedRatio != null) {
+//                if (calculatedRatio < 0.05) return "Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume"
+//                if (calculatedRatio in 0.05..0.155) return "Normal"
+//                if (calculatedRatio in 0.155..0.175) return "Negative Borderline. Repeat Test"
+//                if (calculatedRatio in 0.175..0.22) return "Sickle Cell Trait"
+//                if (calculatedRatio in 0.22..0.25) return "Positive for Sickle Cell. HPLC for Confirmation"
+//                if (calculatedRatio in 0.25..0.35) return "Sickle Cell Disease"
+//                if (calculatedRatio > 0.35) return "Inconclusive. Repeat with test with lower volume of blood"
+//            } else {
+//                return "INVALID"
+//            }
+//        } catch (e: Exception) {
+//            showToast(R.string.error_classification)
+//            Firebase.crashlytics.recordException(e)
+//            return "ERROR"
+//        }
+//        return "INVALID"
+//    }

    private fun absorbanceBasedClassification(predictedDenovixRatio: Double?): String {
        try {
@@ -430,9 +431,9 @@ class HemoCubeBufferCheckFragment : Fragment() {
            if (predictedDenovixRatio != null) {
                if (predictedDenovixRatio in 0.0..0.16) return "Kit Passed"
                if (predictedDenovixRatio in 0.16..0.165) return "Kit Passed"
-                if (predictedDenovixRatio in 0.165..0.235) return "Kit Failed"
-                if (predictedDenovixRatio in 0.235..0.24) return "Kit Failed"
-                if (predictedDenovixRatio in 0.24..1.0) return "Kit Failed"
+                if (predictedDenovixRatio in 0.165..0.235) return kitFailed
+                if (predictedDenovixRatio in 0.235..0.24) return kitFailed
+                if (predictedDenovixRatio in 0.24..1.0) return kitFailed
            } else {
                return "INVALID"
            }
@@ -460,9 +461,12 @@ class HemoCubeBufferCheckFragment : Fragment() {

        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_BUFFER_COMMAND,
            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }

                override fun onUsbError(e: Exception?) {
+                    //nothing
                }
            })
    }
@@ -474,9 +478,12 @@ class HemoCubeBufferCheckFragment : Fragment() {

        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_SAMPLE,
            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }

                override fun onUsbError(e: Exception?) {
+                    //nothing
                }
            })
    }
@@ -504,18 +511,21 @@ class HemoCubeBufferCheckFragment : Fragment() {

        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.PRINT_COMMAND,
            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }

                override fun onUsbError(e: Exception?) {
+                    //nothing
                }
            })
    }
-
-    private fun calculateRatio(ratio: Double): Double {
-        val coefficient1 = currentDeviceData?.coefficients?.get(0) ?: 0.0
-        val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 1.0
-        return coefficient1 * ratio + coefficient2
-    }
+//
+//    private fun calculateRatio(ratio: Double): Double {
+//        val coefficient1 = currentDeviceData?.coefficients?.get(0) ?: 0.0
+//        val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 1.0
+//        return coefficient1 * ratio + coefficient2
+//    }

    private fun isSerialValid(s: String): Boolean {
        if (s.length != 17) {
--- a/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt
@@ -75,9 +75,11 @@ class CalibrationFragment : Fragment() {
        val etLed1Slope = binding.etLed1Slope
        etLed1Slope.addTextChangedListener(object : TextWatcher {
            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                //nothing
            }

            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                //nothing
            }

            override fun afterTextChanged(s: Editable?) {
@@ -87,9 +89,11 @@ class CalibrationFragment : Fragment() {
        val etLed1Intercept = binding.etLed1Intercept
        etLed1Intercept.addTextChangedListener(object : TextWatcher {
            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                //nothing
            }

            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                //nothing
            }

            override fun afterTextChanged(s: Editable?) {
@@ -100,9 +104,11 @@ class CalibrationFragment : Fragment() {
        val etLed2Slope = binding.etLed2Slope
        etLed2Slope.addTextChangedListener(object : TextWatcher {
            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                //nothing
            }

            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                //nothing
            }

            override fun afterTextChanged(s: Editable?) {
@@ -112,9 +118,11 @@ class CalibrationFragment : Fragment() {
        val etLed2Intercept = binding.etLed2Intercept
        etLed2Intercept.addTextChangedListener(object : TextWatcher {
            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                //nothing
            }

            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                //nothing
            }

            override fun afterTextChanged(s: Editable?) {
@@ -125,9 +133,11 @@ class CalibrationFragment : Fragment() {
        val etLed3Slope = binding.etLed3Slope
        etLed3Slope.addTextChangedListener(object : TextWatcher {
            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                //nothing
            }

            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                //nothing
            }

            override fun afterTextChanged(s: Editable?) {
@@ -137,9 +147,11 @@ class CalibrationFragment : Fragment() {
        val etLed3Intercept = binding.etLed3Intercept
        etLed3Intercept.addTextChangedListener(object : TextWatcher {
            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                //nothing
            }

            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                //nothing
            }

            override fun afterTextChanged(s: Editable?) {
@@ -150,9 +162,11 @@ class CalibrationFragment : Fragment() {
        val etLed4Slope = binding.etLed4Slope
        etLed4Slope.addTextChangedListener(object : TextWatcher {
            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                //nothing
            }

            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                //nothing
            }

            override fun afterTextChanged(s: Editable?) {
@@ -162,9 +176,11 @@ class CalibrationFragment : Fragment() {
        val etLed4Intercept = binding.etLed4Intercept
        etLed4Intercept.addTextChangedListener(object : TextWatcher {
            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                //nothing
            }

            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                //nothing
            }

            override fun afterTextChanged(s: Editable?) {
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/AboutFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/AboutFragment.kt
@@ -13,27 +13,12 @@

 package com.example.hpostesting.presentation.dashboard

-import android.content.Context
-import android.content.SharedPreferences
-import android.os.BatteryManager
 import android.os.Bundle
-import android.util.Log
-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.constant.Constants
-import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
-import com.example.hpostesting.presentation.adapter.UserListAdapter
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.testRight.TestRightViewModel
-import `in`.sminnovations.hpostesting.R
+import androidx.fragment.app.Fragment
 import `in`.sminnovations.hpostesting.databinding.FragmentAboutBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentActivitiesBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding

 class AboutFragment : Fragment() {
    private lateinit var binding: FragmentAboutBinding
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt
@@ -14,25 +14,21 @@
 package com.example.hpostesting.presentation.dashboard

 import android.content.Context
-import android.content.SharedPreferences
 import android.os.BatteryManager
 import android.os.Bundle
 import android.util.Log
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
-import com.example.hpostesting.presentation.adapter.UserListAdapter
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.testRight.TestRightViewModel
-import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentActivitiesBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale

 class ActivitiesFragment : Fragment() {
    private lateinit var binding: FragmentActivitiesBinding
@@ -53,6 +49,12 @@ class ActivitiesFragment : Fragment() {
        hemoCubeViewModel.allPendingUserToUpload.observe(viewLifecycleOwner) { userData ->

            if (userData.isNotEmpty()) {
+                userData.forEach { user ->
+                    if((isBetween15And30Minutes(user.incubationTime) > 30 || isBetween15And30Minutes(user.incubationTime) < 0 ) && user.testStatus == false){
+                        hemoCubeViewModel.deleteByStatus()
+                    }
+                }
+
                binding.rvOrderOffline.visibility = View.VISIBLE
                binding.noDataText.visibility = View.GONE
                val bm =
@@ -68,5 +70,16 @@ class ActivitiesFragment : Fragment() {
            }
        }
    }
+    private fun isBetween15And30Minutes(createdAt: String): Long {
+        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+        val createdAtDate: Date = formatter.parse(createdAt)!!
+
+        val currentTime = Calendar.getInstance().time
+
+        val diffMillis = currentTime.time - createdAtDate.time
+
+        return diffMillis / (60 * 1000)
+    }
+

 }
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/AppVersionTapManage.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/AppVersionTapManage.kt
@@ -0,0 +1,18 @@
+package com.example.hpostesting.presentation.dashboard
+
+class AppVersionTapManager {
+
+    private var tapCount = 0
+    private val maxTapCount = 5
+
+    fun registerTap(onMaxTapsReached: () -> Unit) {
+        tapCount++
+        if (tapCount >= maxTapCount) {
+            onMaxTapsReached()
+            reset()
+        }
+    }
+    private fun reset() {
+        tapCount = 0
+    }
+}
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
@@ -23,7 +23,6 @@ import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
-import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.FileProvider
@@ -33,19 +32,15 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
-import com.example.hpostesting.presentation.utils.NatsManager
+import com.example.hpostesting.data.repository.DatabaseRepository
+import com.example.hpostesting.firebase.FirebaseManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.jig.JigActivity
+import com.example.hpostesting.presentation.utils.NatsManager
 import com.google.android.material.navigation.NavigationView
-import com.google.firebase.appdistribution.FirebaseAppDistribution
-import com.google.firebase.appdistribution.FirebaseAppDistributionException
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.ktx.remoteConfig
@@ -56,8 +51,9 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
 import java.io.File
 import java.security.MessageDigest
+import javax.inject.Inject

-interface NatsMessageCallback {
+fun interface NatsMessageCallback {
    fun onMessageReceived(topic: String, message: String)
 }

@@ -68,6 +64,8 @@ open interface IDataCollector: NatsMessageCallback {

@AndroidEntryPoint
 class DashboardActivity : AppCompatActivity(), IDataCollector {
+    @Inject
+    lateinit var databaseRepository: DatabaseRepository
    private val remoteConfig: FirebaseRemoteConfig = Firebase.remoteConfig
    val TAG = "DashboardActivity"
    private var isRegistered = false
@@ -76,8 +74,8 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
    lateinit var sharedPreferences: SharedPreferences
    var responses: String = ""
    lateinit var nats: NatsManager
+
    private var downloadId: Long = 0
-    // TODO: Remove hemocube viewmodel
    private val hemocubeViewModel: HemoCubeViewModel by viewModels()

    override fun attachBaseContext(newBase: Context?) {
@@ -86,6 +84,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        super.attachBaseContext(newBase)
    }

+
    override fun onMessageReceived(topic: String, message: String) {
        // Handle incoming messages from NATS

@@ -95,11 +94,15 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
    @SuppressLint("SetWorldReadable")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
+        val firebaseManager = FirebaseManager(this)
        binding = ActivityDashboardBinding.inflate(layoutInflater)
        sharedPreferences = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
        setContentView(binding.root)
        setSupportActionBar(binding.appBarDashboard.toolbar)
        nats = NatsManager(this)
+
+        val currentServer = firebaseManager.getLastSelectedServer().serverName
+
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            nats.connect()
        }
@@ -108,7 +111,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        Log.d("DashboardActivity", "Saved Kit Serial: $savedKitSerial")
      //  Toast.makeText(this, "Saved Kit Serial: $savedKitSerial", Toast.LENGTH_SHORT).show()

-        val versionName =  getAppVersion(this@DashboardActivity) + " [ " + getAppEnvironment(this@DashboardActivity) + " ]"
+        val versionName =  getAppVersion(this@DashboardActivity) + " [ " + getAppEnvironment(this@DashboardActivity) +"->"+currentServer+"]"
        binding.appBarDashboard.versionName.text = versionName


@@ -206,7 +209,10 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {

            var apk = it
            val file = File(getExternalFilesDir("Downloads"), "update.apk")
-            file.setReadable(true, false)
+            val isReadable = file.setReadable(true, false)
+            if (!isReadable) {
+                Log.w(TAG, "Failed to set file readable")
+            }

            // Write APK to file
            apk.byteStream().use { input ->
@@ -250,6 +256,12 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {



+//    fun sendData(data:String){  this was used to send the basic data for server validation
+//        databaseRepository.addtodb(data)
+//        Toast.makeText(this, "data uploaded", Toast.LENGTH_SHORT).show()
+//    }
+
+
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        // Inflate the menu; this adds items to the action bar if it is present.
        menuInflater.inflate(R.menu.dashboard, menu)
@@ -280,7 +292,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        return actualChecksum.equals(expectedChecksum, ignoreCase = true)
    }
    private fun installApk(file: File) {
-        val pInfo = baseContext.packageManager.getPackageInfo(baseContext.packageName, 0)
+        baseContext.packageManager.getPackageInfo(baseContext.packageName, 0)
        val uri: Uri = FileProvider.getUriForFile(
            this,
            "${BuildConfig.APPLICATION_ID}.fileprovider",
@@ -366,15 +378,16 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
 //        }
    }

-    private fun createDeviceUpdateRequestData(): DeviceUpdateRequest {
-        return DeviceUpdateRequest(
-            serial_no = sharedPreferences.getString(Constants.DEVICE_ID, "")
-        )
-    }
+//    private fun createDeviceUpdateRequestData(): DeviceUpdateRequest {
+//        return DeviceUpdateRequest(
+//            serial_no = sharedPreferences.getString(Constants.DEVICE_ID, "")
+//        )
+//    }
    private fun getAppVersion(context: Context): String {
        return try {
            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
            pInfo.versionName
+
        } catch (e: PackageManager.NameNotFoundException) {
            "N/A"
        }
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt
@@ -13,6 +13,7 @@

 package com.example.hpostesting.presentation.dashboard

+import android.app.AlertDialog
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
@@ -23,7 +24,7 @@ import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.preference.ListPreference
 import androidx.preference.Preference
@@ -31,65 +32,65 @@ import androidx.preference.PreferenceFragmentCompat
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.data.model.TestState
-import com.example.hpostesting.data.model.patient.toHemoCubeTestData
+import com.example.hpostesting.data.repository.DatabaseRepository
+import com.example.hpostesting.firebase.FirebaseConfig
+import com.example.hpostesting.firebase.FirebaseManager
 import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
 import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding

 private var isLanguageChanged = false

-class SlideshowFragment : Fragment(){
+class SlideshowFragment : Fragment() {
    private var selectedItem = "10mm"
    private val values = arrayOf("10mm", "2mm")
    private lateinit var binding: FragmentSlideshowBinding
    private lateinit var sharedPreferences: SharedPreferences
+
    override fun onCreateView(
        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
    ): View {
        binding = FragmentSlideshowBinding.inflate(inflater, container, false)
-        sharedPreferences =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        sharedPreferences = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
        return binding.root
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)

-        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME,""))
+        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME, ""))

-        selectedItem = sharedPreferences.getString(Constants.CUVETTE_SIZE,"10mm").toString()
-        val time = sharedPreferences.getString(Constants.LAST_UPDATED,"NA").toString()
+        selectedItem = sharedPreferences.getString(Constants.CUVETTE_SIZE, "10mm").toString()
+        val time = sharedPreferences.getString(Constants.LAST_UPDATED, "NA").toString()
        binding.lastUpdated.text = "Last updated config: $time"
        binding.btnGo.setOnClickListener {
            var labname = binding.nameEditText.text.toString()
            DataHolder.hemoCubeTestData?.apply {
                this.labName = labname
            }
-
            with(sharedPreferences.edit()) {
                putString(Constants.LABNAME, labname)
                apply()
            }

            Toast.makeText(
-                requireContext(),
-                "Lab Name is Added successfully.",
-                Toast.LENGTH_SHORT
+                requireContext(), "Lab Name is Added successfully.", Toast.LENGTH_SHORT
            ).show()
        }
        val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, values)
        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
        val pos: Int
-        if(selectedItem == "10mm"){
+        if (selectedItem == "10mm") {
            pos = 0
-        }else{
+        } else {
            pos = 1
        }

        binding.spinnerCuvette.adapter = adapter
-        binding.spinnerCuvette.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        binding.spinnerCuvette.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    parent: AdapterView<*>?, view: View?, position: Int, id: Long
+                ) {
                    // Handle item selection here
                    selectedItem = values[position]
                }
@@ -104,54 +105,158 @@ class SlideshowFragment : Fragment(){
                putString(Constants.CUVETTE_SIZE, selectedItem)
                apply()
            }
-            Toast.makeText(requireContext(), "Selected cuvette size: $selectedItem", Toast.LENGTH_SHORT).show()
+            Toast.makeText(
+                requireContext(), "Selected cuvette size: $selectedItem", Toast.LENGTH_SHORT
+            ).show()
        }

-        childFragmentManager.beginTransaction().replace(binding.container.id,PrefsFragment()).commit()
+        childFragmentManager.beginTransaction().replace(binding.container.id, PrefsFragment())
+            .commit()
    }
 }
-class PrefsFragment: PreferenceFragmentCompat(){
+
+class PrefsFragment : PreferenceFragmentCompat(){
+    private lateinit var tapManager: AppVersionTapManager
+    private var isServerSelectionVisible = false
+    private lateinit var serverPreference: Preference
+    private lateinit var currentServerPreference: Preference
+    lateinit var firebaseManager: FirebaseManager
+    lateinit var databaseRepository: DatabaseRepository
+
    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+         firebaseManager = FirebaseManager(requireContext())
+        databaseRepository = (activity as DashboardActivity).databaseRepository
+
+        tapManager = AppVersionTapManager()
+        val sharedPreference =
+            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
        val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
+        val currentServer = firebaseManager.getLastSelectedServer().serverName

-        val languagePreference = ListPreference(requireContext())
-        languagePreference.key = "language_preference"
-        languagePreference.title = getString(R.string.app_language)
-        languagePreference.summary = getString(R.string.select_language)
-        languagePreference.entries = arrayOf("English", "Kannada", "Hindi")
-        languagePreference.entryValues = arrayOf("en", "kn", "hi")
-        languagePreference.setDefaultValue("en")
+        // Language Preference
+        val languagePreference = ListPreference(requireContext()).apply {
+            key = "language_preference"
+            title = getString(R.string.app_language)
+            summary = getString(R.string.select_language)
+            entries = arrayOf("English", "Kannada", "Hindi")
+            entryValues = arrayOf("en", "kn", "hi")
+            setDefaultValue("en")
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_translate_24)

-        languagePreference.onPreferenceChangeListener =
-            Preference.OnPreferenceChangeListener { _, newValue ->
+            onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
                val languageCode = newValue as String
                updateLanguage(requireContext(), languageCode)
                true
            }
-
+        }
        preferenceScreen.addPreference(languagePreference)
-        setPreferenceScreen(preferenceScreen)

-        // App Version Preference
-        val appVersionPreference = Preference(requireContext())
-        appVersionPreference.title = "App Version"
-        appVersionPreference.summary =
-            getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
+        val appVersionPreference = Preference(requireContext()).apply {
+            title = "App Version"
+            summary =
+                getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext())  +"->"+currentServer+"]"
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_info_24)

-        preferenceScreen.addPreference(languagePreference)
+            setOnPreferenceClickListener {
+                if ((sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN")) {
+                    tapManager.registerTap {
+                        if (!isServerSelectionVisible) {
+                            showServerSelection()
+                        }
+                    }
+                } else {
+                    //nothing
+                }
+                true
+            }
+
+        }
        preferenceScreen.addPreference(appVersionPreference)
+
+
+        currentServerPreference = Preference(requireContext()).apply {
+            key = "current_server_preference"
+            title = "Current Server"
+            summary = "No server selected"
+            isVisible = false
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_done_24)
+
+            setOnPreferenceClickListener {
+//                (activity as? DashboardActivity)?.sendData("hello test data")
+//                Toast.makeText(context, "data sent", Toast.LENGTH_SHORT).show()  this was used to send the basic data as test data
+            true
+            }
+        }
+        preferenceScreen.addPreference(currentServerPreference)
        setPreferenceScreen(preferenceScreen)
+
        if (isLanguageChanged) {
            Toast.makeText(requireContext(), R.string.language_update, Toast.LENGTH_SHORT).show()
        }
+    }
+
+
+    private fun showServerSelection() {
+        val currentServer = firebaseManager.getLastSelectedServer().serverName
+        serverPreference = Preference(requireContext()).apply {
+            title = "Select Server"
+            summary = "Choose your server"
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_sync_24)
+            setOnPreferenceClickListener {
+                showServerSelectionDialog()
+                true
+            }
+        }
+
+
+
+        preferenceScreen.addPreference(serverPreference)
+        currentServerPreference.isVisible = true
+        currentServerPreference.summary = "Current Server: $currentServer"
+
+        Toast.makeText(requireContext(), "Server selection now available", Toast.LENGTH_SHORT).show()
+    }
+
+    private fun showServerSelectionDialog() {
+        val servers = firebaseManager.getAvailableServers()
+
+        val serverNames = servers.map { it.serverName }.toTypedArray()
+        val builder = AlertDialog.Builder(requireContext())
+        builder.setTitle("Select Server")
+            .setItems(serverNames) { _, which ->
+                val selectedServer = servers[which]
+
+                switchFirebaseServer(selectedServer)
+            }
+            .setNegativeButton("Cancel", null)
+            .show()
+    }
+
+
+    private fun switchFirebaseServer(firebaseConfig: FirebaseConfig) {
+        firebaseManager.switchServer(firebaseConfig)
+        Toast.makeText(requireContext(), "Switched to ${firebaseConfig.serverName}, Please wait for few seconds", Toast.LENGTH_SHORT).show()
+        Toast.makeText(requireContext(), "Restart needed restarting the app", Toast.LENGTH_SHORT).show()
+        firebaseManager.restartApp()
+        currentServerPreference.summary = "Current Server: ${firebaseConfig.serverName}"

    }
+
+
+//    private fun switchCurrentServer(serverCode: String) {
+//        Toast.makeText(requireContext(), "Switched to server: $serverCode", Toast.LENGTH_SHORT)
+//            .show()
+//        currentServerPreference.summary = "Current Server: $serverCode"
+//
+//    }
+
    private fun updateLanguage(context: Context, languageCode: String) {
        LanguageManager.persistLanguagePreference(context, languageCode)
        LanguageManager.setLocale(context, languageCode)
-        requireActivity().recreate() // Recreate activity to apply language changes
+        requireActivity().recreate()
        isLanguageChanged = true
    }
+
    private fun getAppVersion(context: Context): String {
        return try {
            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
@@ -170,3 +275,5 @@ class PrefsFragment: PreferenceFragmentCompat(){
        }
    }
 }
+
+
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt
@@ -13,17 +13,10 @@

 package com.example.hpostesting.presentation.dashboard.ui

-import com.example.hpostesting.util.SecureStorage
 import android.accounts.Account
 import android.accounts.AccountManager
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
-import android.location.Location
-import android.location.LocationListener
-import android.location.LocationManager
-import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
@@ -38,14 +31,9 @@ import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.util.AppInitializer
+import com.example.hpostesting.util.SecureStorage
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentLoginBinding
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import java.net.HttpURLConnection
-import java.net.URL
-import java.util.Scanner


 class LoginFragment : Fragment() {
@@ -210,106 +198,108 @@ class LoginFragment : Fragment() {
    }

    /** Check if we can get our location  */
-    @SuppressLint("MissingPermission")
-    fun checkLocation() {
-        // Get the location manager
-        val locationManager = requireActivity().getSystemService(Context.LOCATION_SERVICE) as LocationManager
-        val locationProviderWifi = LocationManager.NETWORK_PROVIDER
-        val locationProviderGPS = LocationManager.GPS_PROVIDER
-        val locationListenerNetwork: LocationListener
-        val locationListenerGPS: LocationListener
-        var gps_enabled = false
-        var network_enabled = false
-
-        //check wifi
-        val connectivityManager = requireActivity().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        val mWifi = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI)
-        if (mWifi!!.isConnected) {
-            Log.d(TAG, "Wifi connected")
-        }
-
-        //check gps and wifi availability
-        try {
-            gps_enabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
-        } catch (ex: Exception) {
-        }
-        try {
-            network_enabled = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
-        } catch (ex: Exception) {
-        }
-        if (!gps_enabled) {
-            Log.d(TAG, "GPS: Missing")
-        }else{
-//            getPublicIpAddr { ipAddress ->
-//                // Do something with the ipAddress
-//                Log.d(TAG, "GPS: PRESENT"+ipAddress)
+   // @SuppressLint("MissingPermission")
+//    fun checkLocation() {
+//        // Get the location manager
+//        val locationManager = requireActivity().getSystemService(Context.LOCATION_SERVICE) as LocationManager
+//        val locationProviderWifi = LocationManager.NETWORK_PROVIDER
+//        val locationProviderGPS = LocationManager.GPS_PROVIDER
+//        val locationListenerNetwork: LocationListener
+//        val locationListenerGPS: LocationListener
+//        var gps_enabled = false
+//        var network_enabled = false
+//
+//        //check wifi
+//        val connectivityManager = requireActivity().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+//        val mWifi = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI)
+//        if (mWifi!!.isConnected) {
+//            Log.d(TAG, "Wifi connected")
+//        }
+//
+//        //check gps and wifi availability
+//        try {
+//            gps_enabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
+//        } catch (ex: Exception) {
+//            //nothing
+//        }
+//        try {
+//            network_enabled = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
+//        } catch (ex: Exception) {
+//            //nothing
+//        }
+//        if (!gps_enabled) {
+//            Log.d(TAG, "GPS: Missing")
+//        }else{
+////            getPublicIpAddr { ipAddress ->
+////                // Do something with the ipAddress
+////                Log.d(TAG, "GPS: PRESENT"+ipAddress)
+////            }
+//        }
+//        if (!network_enabled) {
+//            Log.d(TAG, "Network: Missing")
+//        }
+//
+//        /* Location change listeners */try {
+//            Log.d(TAG, "GPS: PRESENT TRy")
+//            // Define a listener that responds to gps location updates
+//            locationListenerGPS = object : LocationListener {
+//                override fun onLocationChanged(location: Location) {
+//                    Log.d(TAG, "GPS: PRESENT loc")
+//                    Log.d(
+//                        TAG,
+//                        "GPS: Latitude: " + location.latitude + ", Longitude = " + location.longitude
+//                    )
+//                }
+//
+//                override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
+//                    Log.d(TAG, "GP location found 1")
+//                }
+//
+//                override fun onProviderEnabled(provider: String) {
+//                    Log.d(TAG, "GP location found 2")
+//                }
+//
+//                override fun onProviderDisabled(provider: String) {
+//                    Log.d(TAG, "GP location found 3")
+//                }
+//            }
+//            locationManager.requestLocationUpdates(locationProviderGPS, 0, 0f, locationListenerGPS)
+//            Log.d(TAG, "GPS: PRESENT Req")
+//        } catch (e: Exception) {
+//            Log.e(TAG, "Location Exception: " + e.message)
+//        }
+//        try {
+//            // Define a listener that responds to wifi location updates
+//            locationListenerNetwork = object : LocationListener {
+//                override fun onLocationChanged(location: Location) {
+//                    Log.d(
+//                        TAG,
+//                        "NW: Latitude: " + location.latitude + ", Longitude = " + location.longitude
+//                    )
+//                }
+//
+//                override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
+//                    Log.d(TAG, "location found 1")
+//                }
+//
+//                override fun onProviderEnabled(provider: String) {
+//                    Log.d(TAG, "location found 2")
+//                }
+//
+//                override fun onProviderDisabled(provider: String) {
+//                    Log.d(TAG, "location found 3")
+//                }
+//            }
+//            locationManager.requestLocationUpdates(
+//                locationProviderWifi,
+//                0,
+//                0f,
+//                locationListenerNetwork
+//            )
+//        } catch (e: Exception) {
+//            Log.e(TAG, "NW Location Exception: " + e.message)
+//        }
 //    }
-        }
-        if (!network_enabled) {
-            Log.d(TAG, "Network: Missing")
-        }
-
-        /* Location change listeners */try {
-            Log.d(TAG, "GPS: PRESENT TRy")
-            // Define a listener that responds to gps location updates
-            locationListenerGPS = object : LocationListener {
-                override fun onLocationChanged(location: Location) {
-                    Log.d(TAG, "GPS: PRESENT loc")
-                    Log.d(
-                        TAG,
-                        "GPS: Latitude: " + location.latitude + ", Longitude = " + location.longitude
-                    )
-                }
-
-                override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
-                    Log.d(TAG, "GP location found 1")
-                }
-
-                override fun onProviderEnabled(provider: String) {
-                    Log.d(TAG, "GP location found 2")
-                }
-
-                override fun onProviderDisabled(provider: String) {
-                    Log.d(TAG, "GP location found 3")
-                }
-            }
-            locationManager.requestLocationUpdates(locationProviderGPS, 0, 0f, locationListenerGPS)
-            Log.d(TAG, "GPS: PRESENT Req")
-        } catch (e: Exception) {
-            Log.e(TAG, "Location Exception: " + e.message)
-        }
-        try {
-            // Define a listener that responds to wifi location updates
-            locationListenerNetwork = object : LocationListener {
-                override fun onLocationChanged(location: Location) {
-                    Log.d(
-                        TAG,
-                        "NW: Latitude: " + location.latitude + ", Longitude = " + location.longitude
-                    )
-                }
-
-                override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
-                    Log.d(TAG, "location found 1")
-                }
-
-                override fun onProviderEnabled(provider: String) {
-                    Log.d(TAG, "location found 2")
-                }
-
-                override fun onProviderDisabled(provider: String) {
-                    Log.d(TAG, "location found 3")
-                }
-            }
-            locationManager.requestLocationUpdates(
-                locationProviderWifi,
-                0,
-                0f,
-                locationListenerNetwork
-            )
-        } catch (e: Exception) {
-            Log.e(TAG, "NW Location Exception: " + e.message)
-        }
-    }
 //    fun getPublicIpAddr(callback: (String) -> Unit) {
 //        GlobalScope.launch(Dispatchers.IO) {
 //            val url = URL("https://api.ipify.org")
@@ -329,40 +319,40 @@ class LoginFragment : Fragment() {
 //            }
 //        }
 //    }
-private fun getPublicIpAddr(callback: (String) -> Unit) {
-    try {
-        GlobalScope.launch(Dispatchers.IO) {
-            val url = URL("https://api.ipify.org")
-            val conn = url.openConnection() as HttpURLConnection
-            try {
-                conn.connect()
-                if (conn.responseCode == HttpURLConnection.HTTP_OK) {
-                    val scanner = Scanner(conn.inputStream)
-                    scanner.useDelimiter("\\A")
-                    if (scanner.hasNext()) {
-                        val ipAddress = scanner.next()
-                        callback(ipAddress)
-                    }
-                }
-            } finally {
-                conn.disconnect()
-            }
-        }
-    }catch (e: Exception){
-        Log.e(TAG,e.toString())
-    }
-}
-    @SuppressLint("NewApi")
-    private fun isInternetAvailable(): Boolean {
-        val connectivityManager = requireActivity().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        val network = connectivityManager.activeNetwork ?: return false
-        val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
-        return networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-    }
-
-    private fun checkUserName(userName: String): Boolean {
-    return userName.isNotEmpty() && userName.length >= 3
-}
+//private fun getPublicIpAddr(callback: (String) -> Unit) {
+//    try {
+//        GlobalScope.launch(Dispatchers.IO) {
+//            val url = URL("https://api.ipify.org")
+//            val conn = url.openConnection() as HttpURLConnection
+//            try {
+//                conn.connect()
+//                if (conn.responseCode == HttpURLConnection.HTTP_OK) {
+//                    val scanner = Scanner(conn.inputStream)
+//                    scanner.useDelimiter("\\A")
+//                    if (scanner.hasNext()) {
+//                        val ipAddress = scanner.next()
+//                        callback(ipAddress)
+//                    }
+//                }
+//            } finally {
+//                conn.disconnect()
+//            }
+//        }
+//    }catch (e: Exception){
+//        Log.e(TAG,e.toString())
+//    }
+//}
+//    @SuppressLint("NewApi")
+//    private fun isInternetAvailable(): Boolean {
+//        val connectivityManager = requireActivity().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+//        val network = connectivityManager.activeNetwork ?: return false
+//        val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
+//        return networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+//    }
+//
+//    private fun checkUserName(userName: String): Boolean {
+//    return userName.isNotEmpty() && userName.length >= 3
+//}

    private fun checkCenterName(centerName: String): Boolean {
        return centerName.isNotEmpty() && centerName.length >= 3
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceActivity.kt
@@ -29,14 +29,13 @@ import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
 import android.view.Menu
-import android.view.MenuItem
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt
@@ -89,6 +89,7 @@ class DeviceFragment : Fragment() {
            object : UsbServiceListener {
                @SuppressLint("SetTextI18n")
                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
                }

                override fun onUsbError(e: Exception?) {
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt
@@ -17,7 +17,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.os.Environment
 import android.provider.Settings
 import android.util.Log
 import android.view.LayoutInflater
@@ -27,20 +26,18 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.encryption.Encryption
-import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.google.android.gms.ads.identifier.AdvertisingIdClient
+import com.example.hpostesting.presentation.utils.UsbServiceListener
+import com.example.hpostesting.util.Result
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDeviceProvisionBinding
 import java.io.File
-import java.io.FileOutputStream

 class DeviceProvisionFragment : Fragment() {
    private var resultData: String = ""
@@ -175,7 +172,9 @@ class DeviceProvisionFragment : Fragment() {
                    binding.btnSubmit.visibility = View.GONE
                }

-                else -> {}
+                else -> {
+                    //Nothing
+                }
            }
        }
        viewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
@@ -193,8 +192,12 @@ class DeviceProvisionFragment : Fragment() {
        (activity as DeviceProvisionActivity).mService.sendAndListenToHemoCube(
            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
-                override fun onUsbError(e: Exception?) {}
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }
+                override fun onUsbError(e: Exception?) {
+                    //nothing
+                }
            })
    }

@@ -214,7 +217,9 @@ class DeviceProvisionFragment : Fragment() {
                    }
                }

-                override fun onUsbError(e: Exception?) {}
+                override fun onUsbError(e: Exception?) {
+                    //nothing
+                }
            })
        } catch (e: Exception) {
            Firebase.crashlytics.recordException(e)
@@ -248,11 +253,15 @@ class DeviceProvisionFragment : Fragment() {

    private fun encryptAndSaveToFile(username: String, password: String) {
        val messageToEncrypt = "$username\n$password"
-        val encryptionKey =
-            Settings.Secure.getString(context?.contentResolver, Settings.Secure.ANDROID_ID)
+        val encryptionKey = Settings.Secure.getString(requireContext().contentResolver, Settings.Secure.ANDROID_ID)
        val encryptedString = Encryption.encrypt(messageToEncrypt, encryptionKey)
        Log.d("DEVICE ID/encryptionKey", encryptionKey)
-        val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+        val target = File(requireContext().getExternalFilesDir(null), "HPOSDocuments")
+        if (!target.exists()) {
+            target.mkdirs()  // Create the directory if it doesn't exist
+        }
+
+       // val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
        val file = File(target, "credentials.txt")

        if (!file.exists()) {
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionViewModel.kt
@@ -59,7 +59,7 @@ class DeviceProvisionViewModel @Inject constructor(
    fun addDeviceProvisionDataToDb(data: DeviceData) {
        viewModelScope.launch {
            try {
-                when (val response = repository.getDeviceResponse(data)) {
+                when (repository.getDeviceResponse(data)) {
                    is Response.Success -> {
 //                        Log.i("Testdb", "Data uploaded to Firestore successfully")
                        fireBaseUpload.postValue("Successfully device response uploaded to firebase")
@@ -70,7 +70,9 @@ class DeviceProvisionViewModel @Inject constructor(
                        fireBaseUpload.postValue("Error")
                    }

-                    else -> {}
+                    else -> {
+                        //nothing
+                    }
                }
            } catch (e: Exception) {
 //                Log.e("Testdb", "Exception during data upload: ${e.message}")
--- a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt
@@ -103,10 +103,10 @@ class DiagnosticsFragment : Fragment() {

            val additionalDetails = AdditionalDetails(
                batteryLevel = batteryLevel,
-                batteryCapacity = batteryCapacity!!,
-                batteryMaxCapacity = batteryMaxCapacity!!,
+                batteryCapacity = batteryCapacity,
+                batteryMaxCapacity = batteryMaxCapacity,
                batteryTemperature = batteryTemperature,
-                batteryVoltage = batteryVoltage!!
+                batteryVoltage = batteryVoltage
            )
            if(Constants.MOLBIO_INTEGRATION){
                diagnosticsViewModel.deviceDiagnostics(
@@ -149,7 +149,7 @@ class DiagnosticsFragment : Fragment() {

                        response.data.data?.let { diagnosticsData ->

-                            val batteryLevel = diagnosticsData.additionalDetails?.batteryLevel
+                            diagnosticsData.additionalDetails?.batteryLevel

                        }
                    } else {
@@ -169,9 +169,12 @@ class DiagnosticsFragment : Fragment() {
                    ).show()
                }
                is Result.Loading -> {
+                    //nothing
                }

-                else -> {}
+                else -> {
+                   // nothing
+                }
            }
        }

@@ -203,6 +206,7 @@ class DiagnosticsFragment : Fragment() {
            HemoCubeCommands.DIAGNOSTICS_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
                }

                override fun onUsbError(e: Exception?) {
@@ -216,6 +220,7 @@ class DiagnosticsFragment : Fragment() {
            HemoCubeCommands.READ_DAC_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
                }

                override fun onUsbError(e: Exception?) {
@@ -229,6 +234,7 @@ class DiagnosticsFragment : Fragment() {
            HemoCubeCommands.LOAD_DAC_VALUES,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
                }

                override fun onUsbError(e: Exception?) {
@@ -380,11 +386,9 @@ class DiagnosticsFragment : Fragment() {
            if (!ledDataMap.containsKey(ledName)) {
                ledDataMap[ledName] = mutableListOf()
            }
-            if ((ledDataMap[ledName]?.size ?: 0) < 7) {
-                if(xValue != 0.0){
+            if ((ledDataMap[ledName]?.size ?: 0) < 7 && xValue != 0.0) {
                ledDataMap[ledName]?.add(xValue to yValue)
            }
-            }
            //  ledDataMap[ledName]?.add(xValue to yValue)
        }
 //        var valuesAdded = 0 // Track the number of values added
--- a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsViewModel.kt
@@ -46,7 +46,7 @@ class DiagnosticsViewModel @Inject constructor(
    fun addDiagnosticsDataToDb(data: DiagnosticsData) {
        viewModelScope.launch {
            try {
-                when (val response = repository.addDiagnostics(data)) {
+                when (repository.addDiagnostics(data)) {
                    is Response.Success -> {
 //                        Log.i("Testdb", "Data uploaded to Firestore successfully")
                        fireBaseUpload.postValue("Success")
@@ -57,7 +57,9 @@ class DiagnosticsViewModel @Inject constructor(
                        fireBaseUpload.postValue("Error")
                    }

-                    else -> {}
+                    else -> {
+                        //nothing
+                    }
                }
            } catch (e: Exception) {
 //                Log.e("Testdb", "Exception during data upload: ${e.message}")
--- a/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestActivity.kt
@@ -0,0 +1,207 @@
+/*
+ * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
+ * // Notice: All information contained herein is, and remains
+ * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
+ * // if any. The intellectual and technical concepts contained
+ * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
+ * // and its suppliers and may be covered by Indian and Foreign Patents,
+ * // patents in process, and are protected by trade secret or copyright law.
+ * // Dissemination of this information or reproduction of this material
+ * // is strictly forbidden unless prior written permission is obtained
+ * // from ShanMukha Innovations Pvt. Ltd.
+ */
+
+package com.example.hpostesting.presentation.hb_test
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.ServiceConnection
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbDeviceConnection
+import android.hardware.usb.UsbManager
+import android.os.Bundle
+import android.os.IBinder
+import android.util.Log
+import android.view.Menu
+import android.widget.Toast
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.core.view.get
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.data.repository.DatabaseRepository
+import com.example.hpostesting.firebase.FirebaseManager
+import com.example.hpostesting.util.UsbService
+import com.hoho.android.usbserial.driver.UsbSerialDriver
+import com.hoho.android.usbserial.driver.UsbSerialProber
+import dagger.hilt.android.AndroidEntryPoint
+import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.ActivityHbTestBinding
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class HBTestActivity : AppCompatActivity() {
+
+    @Inject
+    lateinit var databaseRepository: DatabaseRepository
+    private lateinit var binding: ActivityHbTestBinding
+    val viewModel: HBTestViewModel by viewModels()
+    private var myMenu: Menu? = null
+
+    private lateinit var mDriver: UsbSerialDriver
+    private var mConnection: UsbDeviceConnection? = null
+    lateinit var mService: UsbService
+
+    private val TAG = "HemoCube"
+
+    private val broadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+
+            synchronized(this) {
+                val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
+
+                if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
+                    device?.apply {
+                        connectUsb(true)
+                        DataHolder.usbConnected.postValue(true)
+                    }
+                } else {
+                    onErrorReported("permission denied for device")
+                    DataHolder.usbConnected.postValue(true)
+                }
+            }
+        }
+    }
+
+    private val connection = object : ServiceConnection {
+        override fun onServiceConnected(className: ComponentName, service: IBinder) {
+            val binder = service as UsbService.UsbServiceBinder
+            mService = binder.getService()
+            viewModel.isServiceConnected = true
+            mConnection.let { mService.connect(mDriver, mConnection!!) }
+            moveToNext()
+        }
+
+        override fun onServiceDisconnected(arg0: ComponentName) {
+            viewModel.isServiceConnected = false
+        }
+    }
+
+    override fun attachBaseContext(newBase: Context?) {
+        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
+        LanguageManager.setLocale(newBase, languageCode)
+        super.attachBaseContext(newBase)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val firebaseManager = FirebaseManager(this)
+        val lastSelectedServer = firebaseManager.getLastSelectedServer()
+//        switchFirebaseServer(lastSelectedServer)
+        Log.d("CURRENT SERVR......","server : ${lastSelectedServer.serverName}")
+        binding = ActivityHbTestBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+//        setSupportActionBar(binding.myToolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        setupListener()
+        connectUsb(false)
+
+    }
+//    private fun switchFirebaseServer(config: FirebaseConfig) {
+//        val (newFirestore, newStorage) = firebaseManager.switchFirestoreServer(config)
+//        databaseRepository.switchServer(newFirestore, newStorage)
+////        Toast.makeText(this, "server switched", Toast.LENGTH_SHORT).show()// Update repository with new Firestore and Storage
+//    }
+    private fun setupListener() {
+        DataHolder.usbConnected.observe(this) {
+            Log.d("USB OBSERVE", "HemoCube called -> $it")
+            if (it) {
+                myMenu?.get(0)?.icon =
+                    ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_24)
+            } else {
+                myMenu?.get(0)?.icon =
+                    ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_off_24)
+                Toast.makeText(this, "Device is Disconnected", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+    open 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)
+
+        if (availableDrivers.isEmpty()) {
+            onErrorReported("No Device is Connected")
+        } else {
+            mDriver = availableDrivers[0]
+            mConnection = manager.openDevice(mDriver.device)
+
+            if (mConnection == null) {
+                requestUserPermission(manager, mDriver.device)
+            } else {
+                setupService()
+            }
+        }
+    }
+
+    fun onErrorReported(msg: String) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
+        if (!isFinishing) onBackPressed()
+    }
+
+
+    private fun moveToNext() {
+        if (supportFragmentManager.isDestroyed) return
+
+        supportFragmentManager.beginTransaction().replace(binding.fgHbTest.id, HBTestFragment())
+            .commit()
+    }
+
+    @SuppressLint("MutableImplicitPendingIntent")
+    private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
+        val mPendingIntent: PendingIntent
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+            mPendingIntent = PendingIntent.getBroadcast(
+                this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
+            )
+        } else {
+            mPendingIntent = PendingIntent.getBroadcast(
+                this,
+                0,
+                Intent(Constants.HEMOCUBE_USB_PERMISSION),
+                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+            )
+        }
+
+        val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
+        registerReceiver(broadcastReceiver, filter)
+        manager.requestPermission(device, mPendingIntent)
+    }
+
+    fun setupService() {
+        val intent = Intent(this, UsbService::class.java)
+        bindService(intent, connection, Context.BIND_AUTO_CREATE)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.my_menu, menu)
+        return true
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (viewModel.isServiceConnected) {
+            mService.disconnect()
+            unbindService(connection)
+            viewModel.isServiceConnected = false
+        }
+    }
+}
--- a/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestFragment.kt
@@ -0,0 +1,400 @@
+/*
+ * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
+ * // Notice: All information contained herein is, and remains
+ * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
+ * // if any. The intellectual and technical concepts contained
+ * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
+ * // and its suppliers and may be covered by Indian and Foreign Patents,
+ * // patents in process, and are protected by trade secret or copyright law.
+ * // Dissemination of this information or reproduction of this material
+ * // is strictly forbidden unless prior written permission is obtained
+ * // from ShanMukha Innovations Pvt. Ltd.
+ */
+
+package com.example.hpostesting.presentation.hb_test
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.text.method.ScrollingMovementMethod
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.MutableLiveData
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.data.constant.HemoCubeCommands
+import com.example.hpostesting.data.model.patient.DeviceData
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.presentation.utils.UsbServiceListener
+import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.ktx.Firebase
+import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentHbTestBinding
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
+import kotlin.math.log10
+
+class HBTestFragment : Fragment() {
+    private var isUsingExistingBuffer = false
+    private var led1Average = 0.0
+    private var led3Average = 0.0
+    private var led2Average = 0.0
+    private var led4Average = 0.0
+    private var led1SampleForDevice = 0.0
+    private var led2SampleForDevice = 0.0
+    private var led3SampleForDevice = 0.0
+    private var led4SampleForDevice = 0.0
+    private var led1BufferForDevice = 0.0
+    private var led2BufferForDevice = 0.0
+    private var led3BufferForDevice = 0.0
+    private var led4BufferForDevice = 0.0
+    private var x = 0.0
+    private var deviceId = ""
+    private var hbEst = 0.0
+    private var testStatusCode = 0.0
+    private var testDetails: HemoCubeTestData = HemoCubeTestData()
+    private lateinit var binding: FragmentHbTestBinding
+    private val hBTestViewModel: HBTestViewModel by activityViewModels()
+    private lateinit var sharedPreferences: SharedPreferences
+    private var currentDeviceData: DeviceData? = null
+    private var resultData: String = ""
+ //   private val messages = MutableLiveData<String>()
+    private var startListening = MutableLiveData(false)
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+    ): View {
+        binding = FragmentHbTestBinding.inflate(inflater, container, false)
+        sharedPreferences =
+            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initViews()
+        observeViewModel()
+    }
+
+    private fun initViews() {
+        binding.btnSubmit.visibility = View.GONE
+        listenToHemoCube()
+        getDeviceId()
+        binding.tvSubtitle4.movementMethod = ScrollingMovementMethod()
+        binding.btnSubmit.setOnClickListener {
+            hBTestViewModel.messages.postValue(resultData)
+            binding.btnSubmit.visibility = View.GONE
+            testDetails.localFlag = false
+            testDetails.testStatus = true
+            testDetails.deviceId = deviceId
+            testDetails._id = DataHolder.sampleId
+            testDetails.kitSerial = DataHolder.kitSerial
+            testDetails.classificationResult = "HB: $hbEst"
+            testDetails.hb3 = x
+            testDetails.hb4 = hbEst
+            testDetails.age = DataHolder.age
+            testDetails.bloodGroup = DataHolder.bloodGroup
+            testDetails.led1Buffer = led1BufferForDevice
+            testDetails.led2Buffer = led2BufferForDevice
+            testDetails.led3Buffer = led3BufferForDevice
+            testDetails.led4Buffer = led4BufferForDevice
+            testDetails.led1Sample = led1SampleForDevice
+            testDetails.led2Sample = led2SampleForDevice
+            testDetails.led3Sample = led3SampleForDevice
+            testDetails.led4Sample = led4SampleForDevice
+            testDetails.led1Average = led1Average
+            testDetails.led2Average = led2Average
+            testDetails.led3Average = led3Average
+            testDetails.led4Average = led4Average
+            testDetails.testType = "HB Est"
+            testDetails.testTime = SimpleDateFormat(
+                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+            ).format(Calendar.getInstance().time)
+            hBTestViewModel.uploadFirebaseQc(testDetails)
+        }
+        binding.btnBuffer.setOnClickListener {
+            binding.btnBuffer.visibility = View.GONE
+            binding.btnSample.isEnabled = false
+            binding.btnSample.isClickable = false
+            hBTestViewModel.messages.postValue("Buffer Started")
+            runBCommand()
+        }
+        binding.btnSample.setOnClickListener {
+            hBTestViewModel.messages.postValue("Sample Started")
+            binding.btnSample.visibility = View.GONE
+            binding.btnBuffer.visibility = View.GONE
+            runSCommand()
+        }
+        if (isBufferValueAvailable()) {
+            isUsingExistingBuffer = true
+            binding.btnBuffer.text = "Refresh Buffer"
+            binding.btnSample.isEnabled = true
+            binding.btnSample.isClickable = true
+        }else{
+            binding.btnBuffer.text = "Start Buffer"
+            binding.btnSample.isEnabled = false
+            binding.btnSample.isClickable = false
+        }
+
+    }
+
+    private fun observeViewModel() {
+
+        hBTestViewModel.deviceData.observe(viewLifecycleOwner) {
+            currentDeviceData = it
+        }
+
+        hBTestViewModel.messages.observe(viewLifecycleOwner) {
+            binding.tvSubtitle4.text = it
+        }
+
+        hBTestViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
+            if (result == "Success") {
+                showToast("Data uploaded successfully")
+                requireActivity().finish()
+            }
+            if (result == "Local") {
+                showToast("Data uploading failed, note it down manually")
+            }
+
+            binding.progressBar.visibility = View.GONE
+        }
+    }
+
+    private fun getDeviceId() {
+        hBTestViewModel.progressBar.postValue(true)
+        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
+            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {
+                    data?.let {
+                        val stringData = String(it)
+                        //deviceId = stringData
+                        hBTestViewModel.messages.postValue(stringData)
+                        binding.tvSubtitle4.text = stringData
+                    }
+                }
+
+                override fun onUsbError(e: Exception?) {
+                    hBTestViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+    private fun runBCommand() {
+        hBTestViewModel.progressBar.postValue(true)
+        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
+            HemoCubeCommands.START_BUFFER_COMMAND,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }
+
+                override fun onUsbError(e: Exception?) {
+                    hBTestViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+    private fun runSCommand() {
+        hBTestViewModel.progressBar.postValue(true)
+        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
+            HemoCubeCommands.START_SAMPLE,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }
+
+                override fun onUsbError(e: Exception?) {
+                    hBTestViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+    private fun runPCommand() {
+        hBTestViewModel.progressBar.postValue(true)
+        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
+            HemoCubeCommands.PRINT_COMMAND,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }
+
+                override fun onUsbError(e: Exception?) {
+                    hBTestViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+    fun extractV2HardwareId(input: String): String? {
+        val pattern = Regex("SNS\\s*(.*?)\\s*SNE")
+        val matchResult: MatchResult? = pattern.find(input)
+
+        return matchResult?.groups?.get(1)?.value
+    }
+
+    private fun listenToHemoCube() {
+
+        val fullReadOutput = StringBuilder()
+        startListening.postValue(true)
+
+        try {
+            (activity as HBTestActivity).mService.listenToHemoCube(object :
+                UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {
+                    data?.let {
+                        val stringData = String(it)
+                        fullReadOutput.append(stringData)
+                        resultData += stringData
+                        hBTestViewModel.messages.postValue(resultData)
+                       // binding.tvSubtitle4.text = resultData
+                        if (stringData.contains("SNE")) {
+                            val slData = stringData.split(" ")
+                            if (slData.size > 1) {
+                                ///val hardwareId = slData[1].trim()
+                                deviceId = extractV2HardwareId(resultData).toString()
+                                hBTestViewModel.messages.postValue("Place buffer and click below button to start test")
+//                                with(sharedPreferences.edit()) {
+//                                    putString(Constants.DEVICE_ID, hardwareId)
+//                                    apply()
+//                                }
+                            }
+                            activity?.runOnUiThread {
+                                binding.btnBuffer.visibility = View.VISIBLE
+                            }
+                        }
+                    }
+                    if (resultData.contains("#BC") && testStatusCode < 1.0) {
+                        testStatusCode = 1.1
+                        resultData += getString(R.string.buffer_completed)
+                        hBTestViewModel.messages.postValue(resultData)
+                        activity?.runOnUiThread {
+                            binding.btnSample.visibility = View.VISIBLE
+                            binding.btnSample.isEnabled = true
+                            binding.btnSample.isClickable = true
+                        }
+                    }
+
+                    if (resultData.contains("#SC") && testStatusCode < 1.3) {
+                        testStatusCode = 1.4
+                        resultData +=getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data)
+                        hBTestViewModel.messages.postValue(resultData)
+                        activity?.runOnUiThread {
+                            binding.btnSubmit.visibility = View.VISIBLE
+                            runPCommand()
+                        }
+                    }
+
+                    if (resultData.contains("REND") && testStatusCode < 1.5) {
+                        testStatusCode = 1.6
+                        runResult()
+                    }
+                }
+
+                override fun onUsbError(e: Exception?) {
+                    hBTestViewModel.progressBar.postValue(false)
+                }
+            })
+        } catch (e: Exception) {
+            Firebase.crashlytics.recordException(e)
+        }
+    }
+
+    private fun runResult() {
+        resultData += "\nFetching results...\n"
+        hBTestViewModel.messages.postValue(resultData)
+
+        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 {
+            bufferIntensity.toDoubleOrNull()!!
+        }
+
+        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()!!
+        }
+
+
+        led1SampleForDevice = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
+        led2SampleForDevice = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
+        led3SampleForDevice = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
+        led4SampleForDevice = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
+
+        led1Average = log10(led1BufferForDevice.div(led1SampleForDevice))
+        led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
+        led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
+        led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
+
+        x = led1Average - led3Average
+
+        hbEst = (7.347 * x * x) + (12.704 * x) + 0.9033
+
+        resultData +="\n Result: HB EST: $hbEst"
+        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()
+            }
+        }
+        hBTestViewModel.messages.postValue(resultData)
+    }
+
+
+
+    private fun showToast(message: String) {
+        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
+    }
+    private fun isBufferValueAvailable(): Boolean {
+        return try {
+            if (sharedPreferences.getString(
+                    Constants.BUFFER_VALUE_1, ""
+                ) != "" && sharedPreferences.getString(Constants.BUFFER_VALUE_2, "") != ""
+                && sharedPreferences.getString(Constants.BUFFER_VALUE_3, "") != ""
+                && sharedPreferences.getString(Constants.BUFFER_VALUE_4, "") != ""
+            ) {
+                sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")
+                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
+                    Constants.BUFFER_VALUE_2,
+                    ""
+                )
+                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
+                    Constants.BUFFER_VALUE_3,
+                    ""
+                )
+                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
+                    Constants.BUFFER_VALUE_4,
+                    ""
+                )
+                    ?.toDouble()!! > 0.0
+            } else {
+                false
+            }
+        } catch (e: Exception) {
+            showToast("error_exist")
+            false
+        }
+    }
+}
--- a/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestViewModel.kt
@@ -0,0 +1,89 @@
+/*
+ * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
+ * // Notice: All information contained herein is, and remains
+ * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
+ * // if any. The intellectual and technical concepts contained
+ * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
+ * // and its suppliers and may be covered by Indian and Foreign Patents,
+ * // patents in process, and are protected by trade secret or copyright law.
+ * // Dissemination of this information or reproduction of this material
+ * // is strictly forbidden unless prior written permission is obtained
+ * // from ShanMukha Innovations Pvt. Ltd.
+ */
+
+package com.example.hpostesting.presentation.hb_test
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.hpostesting.data.dao.HemoCubeDao
+import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
+import com.example.hpostesting.data.model.patient.DeviceData
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.repository.Repository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class HBTestViewModel @Inject constructor(
+    private val hemoCubeDao: HemoCubeDao,
+    private val repository: Repository,
+    context: Context,
+) : ViewModel() {
+    var isServiceConnected = false
+    val progressBar = MutableLiveData(false)
+    val messages = MutableLiveData<String>()
+    private val sharedPreference: SharedPreferences =
+        context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+
+    val deviceData = MutableLiveData<DeviceData?>()
+    val fireBaseUpload = MutableLiveData<String>()
+    fun uploadFirebaseQc(testDetails: HemoCubeTestData){
+        viewModelScope.launch {
+            try {
+                when (val response = repository.addTestToDatabase(testDetails)) {
+                    is Response.Success -> {
+                        Log.i("Testdb", "Data uploaded to Firestore successfully")
+                        fireBaseUpload.postValue("Success")
+                        testDetails.localFlag = true
+                        hemoCubeDao.updateTest(testDetails)
+                    }
+
+                    is Response.Error -> {
+                        Log.e("Testdb", "Error uploading data to Firestore: $response")
+                        fireBaseUpload.postValue("Error")
+                        hemoCubeDao.updateTest(testDetails)
+                    }
+
+                    else -> {
+                        //nothing
+                    }
+                }
+            } catch (e: Exception) {
+                fireBaseUpload.postValue("Error")
+            }
+        }
+    }
+    fun addAutoDacDataToDb(data: DiagnosticsData) {
+        viewModelScope.launch {
+            try {
+                when (repository.addDiagnostics(data)) {
+                    is Response.Success -> {
+                        fireBaseUpload.postValue("Success")
+                    }
+
+                    is Response.Error -> {
+                        fireBaseUpload.postValue("Error")
+                    }
+                }
+            } catch (e: Exception) {
+                fireBaseUpload.postValue("Error")
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt
@@ -57,7 +57,7 @@ class DigitalCardFragment : Fragment() {
            binding.progressBar.visibility = View.VISIBLE
        }
        Log.d("DigitalCardFragment", "Name: ${DataHolder.hemoCubeTestData?.name}")
-        Log.d("DigitalCardFragment", "DOB: ${testDetails?.birthYear}")
+        Log.d("DigitalCardFragment", "DOB: ${testDetails?.age}")
        Log.d("DigitalCardFragment", "Gender: ${testDetails?.gender}")
        Log.d("DigitalCardFragment", "State: ${testDetails?.state}")
        Log.d("DigitalCardFragment", "ABHA ID: ${testDetails?.abhaId}")
@@ -67,7 +67,7 @@ class DigitalCardFragment : Fragment() {
        activity?.runOnUiThread {
            binding.progressBar.visibility = View.GONE
            binding.name.text = "Name: ${DataHolder.hemoCubeTestData?.name}"
-            binding.dob.text = "DOB: ${testDetails?.birthYear}"
+            binding.dob.text = "DOB: ${testDetails?.age}"
            binding.gender.text = "Gender: ${testDetails?.gender}"
            binding.State.text = "State: ${testDetails?.state}"
            binding.abhaid.text = "ABHA ID: ${testDetails?.abhaId}"
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -52,6 +52,11 @@ import kotlin.random.Random

@Suppress("MemberVisibilityCanBePrivate")
 class HemoCubeFragment : Fragment() {
+    private val sickleCellDisease = "Sickle Cell Disease"
+    private val regEx = "\\s+(?=LB|LS)"
+    private val sickleCellTrait = "Sickle Cell Trait"
+    private val positiveBoderLine = "Positive for Sickle Cell. HPLC for Confirmation"
+    private val negativeBorderLine = "Negative Borderline"
    private var positiveBoderLine10mm1=Constants.positiveBoderLine10mm1
    private var positiveBoderLine10mm2=Constants.positiveBoderLine10mm2
    private var negativeBoderLine10mm1=Constants.negativeBoderLine10mm1
@@ -87,6 +92,8 @@ class HemoCubeFragment : Fragment() {
    private var checkCuvette = false
    private var checkRefreshCuvette = false
    private var checkCuvetteSam = false
+    private var checkSubmit = false
+    private var submitClick = false
    private var sampleClick = false
    private var refreshClick = false
    private lateinit var binding: FragmentHemoCubeReferenceBinding
@@ -182,6 +189,22 @@ class HemoCubeFragment : Fragment() {
        binding.tvSubtitle4.movementMethod = ScrollingMovementMethod()
        binding.tvDeviceMessages.movementMethod = ScrollingMovementMethod()
        binding.btnSubmit.setOnClickListener {
+//            with(sharedPreferences.edit()) {
+//                putBoolean(Constants.QUICK_CAPTURE, false)
+//                apply()
+//            }
+//            if(DataHolder.hemoCubeTestData!!.classificationResult != "Invalid"){
+//                DataHolder.sampleReadCounter++
+//            }
+//            binding.btnSubmit.isEnabled = false
+//            binding.btnSubmit.isClickable = false
+//            activity?.runOnUiThread {
+//                Log.d("HemoCubeFragment","Test Process completed, result saved")
+//                binding.progressBar.visibility = View.VISIBLE
+//                binding.btnSubmit.visibility = View.GONE
+//            }
+            submitClick = true
+            if(checkSubmit){
                with(sharedPreferences.edit()) {
                    putBoolean(Constants.QUICK_CAPTURE, false)
                    apply()
@@ -199,6 +222,11 @@ class HemoCubeFragment : Fragment() {
                hemoCubeViewModel.uploadHemoCubeResultToDatabase(
                    isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, ""),quickCapture
                )
+            }else{
+                checkCuvettePresence()
+                binding.btnSubmit.isEnabled = true
+                binding.btnSubmit.isClickable = true
+            }
        }

        binding.tvTitle2.visibility = View.GONE
@@ -311,7 +339,7 @@ class HemoCubeFragment : Fragment() {
        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
            if (result == "Success") {
                uploadedToCloud = true
-                var accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString()
+                //var accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString()
                showToast(R.string.test_upload)
                if (Constants.MOLBIO_INTEGRATION) {
                    hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
@@ -343,7 +371,9 @@ class HemoCubeFragment : Fragment() {
                                handleReadingFinish()
                            }

-                            else -> {}
+                            else -> {
+                                //nothing
+                            }
                        }
                    }
                } else {
@@ -371,7 +401,7 @@ class HemoCubeFragment : Fragment() {
        hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
            apply {
                DataHolder.hemoCubeTestData?.let {
-                    currentDeviceData?.coefficients?.let { coefficients ->
+                    currentDeviceData?.coefficients?.let { _ ->
 //                        val coefficient1 = coefficients[0]
 //                        val coefficient2 = coefficients[1]
 //                        val result = coefficient1 * coefficient2
@@ -457,32 +487,32 @@ class HemoCubeFragment : Fragment() {
        }
    }

-    private fun showBufferAlertDialog() {
-        val title = "WARNING"
-        val message = getString(R.string.do_exist)
-        val negativeText = getString(R.string.no)
-        val positiveText = getString(R.string.yes)
-
-        UIUtils.createAlertDialog(requireContext(),
-            title,
-            message,
-            negativeText,
-            positiveText,
-            object : MyDialogListener {
-                override fun onClickNegativeButton() {
-                    startBufferProcess()
-                }
-
-                override fun onClickPositiveButton() {
-                    activity?.runOnUiThread {
-//                        binding.btnPlacebuffer.visibility = View.GONE
-                        binding.btnSamplestart.visibility = View.VISIBLE
-                        binding.tvSubtitle4.text = getString(R.string.place_sample)
-                    }
-                    //isUsingExistingBuffer = true
-                }
-            })
-    }
+//    private fun showBufferAlertDialog() {
+//        val title = "WARNING"
+//        val message = getString(R.string.do_exist)
+//        val negativeText = getString(R.string.no)
+//        val positiveText = getString(R.string.yes)
+//
+//        UIUtils.createAlertDialog(requireContext(),
+//            title,
+//            message,
+//            negativeText,
+//            positiveText,
+//            object : MyDialogListener {
+//                override fun onClickNegativeButton() {
+//                    startBufferProcess()
+//                }
+//
+//                override fun onClickPositiveButton() {
+//                    activity?.runOnUiThread {
+////                        binding.btnPlacebuffer.visibility = View.GONE
+//                        binding.btnSamplestart.visibility = View.VISIBLE
+//                        binding.tvSubtitle4.text = getString(R.string.place_sample)
+//                    }
+//                    //isUsingExistingBuffer = true
+//                }
+//            })
+//    }

    private fun listenToHemoCube() {
        DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData()
@@ -536,6 +566,7 @@ class HemoCubeFragment : Fragment() {
            HemoCubeCommands.LOAD_DAC_VALUES,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
                }

                override fun onUsbError(e: Exception?) {
@@ -664,6 +695,22 @@ class HemoCubeFragment : Fragment() {
                }
                showRetryButtonForCuvette()
            }
+            resultData.contains("#CIN") && this.submitClick && this.testStatusCode < TestStatus.CUVETTE_PRESENTT.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_presentt))
+                this.testStatusCode = TestStatus.CUVETTE_PRESENTT.code
+                activity?.runOnUiThread {
+                    binding.testing.visibility = View.GONE
+                }
+            }
+            resultData.contains("#AIN") && this.submitClick && this.testStatusCode <= TestStatus.CUVETTE_ABSENTT.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absentt))
+                this.testStatusCode = TestStatus.CUVETTE_ABSENTT.code
+                activity?.runOnUiThread {
+                    checkSubmit = true
+                    binding.testing.visibility = View.GONE
+                }
+            }
+
            resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.code -> {
                hemoCubeViewModel.messages.postValue(getString(R.string.buffer_started))
                this.testStatusCode = TestStatus.BUFFER_STARTED.code
@@ -815,7 +862,7 @@ class HemoCubeFragment : Fragment() {
                this.testStatusCode = TestStatus.FIRST_GAIN_PRINT_COMPLETED.code
                hemoCubeViewModel.messages.postValue("First air reading completed")

-                val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
+                val resultLines = currentResultData.split(regEx.toRegex())
                DataHolder.hemoCubeTestData?.apply {
                    led1Air1 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                    led2Air1 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
@@ -833,7 +880,7 @@ class HemoCubeFragment : Fragment() {
                this.testStatusCode = TestStatus.SECOND_EMPTY_AIR_PRINT_COMPLETED.code
                hemoCubeViewModel.messages.postValue("Second air reading completed")

-                val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
+                val resultLines = currentResultData.split(regEx.toRegex())
                DataHolder.hemoCubeTestData?.apply {
                    led1Air2 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                    led2Air2 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
@@ -851,7 +898,7 @@ class HemoCubeFragment : Fragment() {
                this.testStatusCode = TestStatus.FIRST_GAIN_PRINT_COMPLETED.code
                hemoCubeViewModel.messages.postValue("1.3X gain data gathered")

-                val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
+                val resultLines = currentResultData.split(regEx.toRegex())
                DataHolder.hemoCubeTestData?.apply {
                    led1Gain1 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                    led2Gain1 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
@@ -870,7 +917,7 @@ class HemoCubeFragment : Fragment() {
                this.testStatusCode = TestStatus.SECOND_GAIN_PRINT_COMPLETED.code
                hemoCubeViewModel.messages.postValue("2X gain data gathered")

-                val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
+                val resultLines = currentResultData.split(regEx.toRegex())
                DataHolder.hemoCubeTestData?.apply {
                    led1Gain2 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                    led2Gain2 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
@@ -889,7 +936,7 @@ class HemoCubeFragment : Fragment() {
                this.testStatusCode = TestStatus.FORTH_GAIN_PRINT_COMPLETED.code
                hemoCubeViewModel.messages.postValue("7.6X gain data gathered")

-                val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
+                val resultLines = currentResultData.split(regEx.toRegex())
                DataHolder.hemoCubeTestData?.apply {
                    led1Gain4 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
                    led2Gain4 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
@@ -967,7 +1014,7 @@ class HemoCubeFragment : Fragment() {
            getString(R.string.data_collected_processing_data)
        )

-        val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
+        val resultLines = currentResultData.split(regEx.toRegex())
        var bufferIntensity = resultLines[1].split(' ')[1].trim()
        led1BufferForDevice = if (isUsingExistingBuffer) {
            sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")?.toDoubleOrNull()!!
@@ -1249,13 +1296,13 @@ class HemoCubeFragment : Fragment() {
            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(0)?.get(1)
            fittedAbs4 = gradient?.times(led4Average)?.plus(constant!!)!!

-            val slope1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(0)
-            val intercept1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(1)
-            val calculatedHb1 = (led1Average - intercept1!!) / slope1!!
+           // val slope1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(0)
+           // val intercept1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(1)
+            //val calculatedHb1 = (led1Average - intercept1!!) / slope1!!

-            val slope2 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(0)
-            val intercept = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(1)
-            val calculatedHb2 = (led2Average - intercept!!) / slope2!!
+           // val slope2 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(0)
+           // val intercept = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(1)
+            //val calculatedHb2 = (led2Average - intercept!!) / slope2!!

            val slope3 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(2)?.get(0)
            val intercept3 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(2)?.get(1)
@@ -1399,13 +1446,13 @@ class HemoCubeFragment : Fragment() {
    fun reclassifyWithBorderlineMethod2(deviceRatio: Double?, deviceRatioClass: String?, led2Average: Double?): String {
        try {
            if (deviceRatio != null && led2Average != null) {
-                if (deviceRatioClass == "Negative Borderline") {
+                if (deviceRatioClass == negativeBorderLine) {
                    return if (led2Average >= 0.15)
                        "Borderline. Normal"
                    else
                        "Borderline. Sickle Cell Trait"
                }
-                if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
+                if (deviceRatioClass == positiveBoderLine) {
                    return if (led2Average >= 0.19)
                        "Borderline. Sickle Cell Trait"
                    else
@@ -1428,45 +1475,61 @@ class HemoCubeFragment : Fragment() {
 //            hemoCubeViewModel.messages.postValue("post classification checks")
            if (deviceRatio != null && borderlineMetric != null) {
                if(cuvetteSize == "10mm"){
-                    if (deviceRatioClass == "Negative Borderline") {
-                        if (borderlineMetric < negativeBoderLine10mm1){//1.34
-                            return "Sickle Cell Trait"
-                        }else if(borderlineMetric > negativeBoderLine10mm2){
+                    if (deviceRatioClass == negativeBorderLine) {
+                        when {
+                            borderlineMetric < negativeBoderLine10mm1 -> {//1.34
+                                return sickleCellTrait
+                            }
+                            borderlineMetric > negativeBoderLine10mm2 -> {
                                return "Normal"
-                        }else if(borderlineMetric > negativeBoderLine10mm1 && borderlineMetric < negativeBoderLine10mm2){
+                            }
+                            borderlineMetric > negativeBoderLine10mm1 && borderlineMetric < negativeBoderLine10mm2 -> {
                                return "Negative borderline. Confirm with HPLC"
                            }
                        }
-                    if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
-                        if (borderlineMetric < positiveBoderLine10mm1){//1.34
-                            return "Sickle Cell Disease"
-                        }else if(borderlineMetric > positiveBoderLine10mm2){
-                            return "Sickle Cell Trait"
-                        }else if(borderlineMetric > positiveBoderLine10mm1 && borderlineMetric < positiveBoderLine10mm2){
+                    }
+                    if (deviceRatioClass == positiveBoderLine) {
+                        when {
+                            borderlineMetric < positiveBoderLine10mm1 -> {//1.34
+                                return sickleCellDisease
+                            }
+                            borderlineMetric > positiveBoderLine10mm2 -> {
+                                return sickleCellTrait
+                            }
+                            borderlineMetric > positiveBoderLine10mm1 && borderlineMetric < positiveBoderLine10mm2 -> {
                                return "Positive for Sickle Cell. Confirm with HPLC"
                            }
                        }
+                    }
                }else if(cuvetteSize == "2mm"){
-                    if (deviceRatioClass == "Negative Borderline") {
-                        if (borderlineMetric < negativeBoderLine2mm1){//1.34
-                            return "Sickle Cell Trait"
-                        }else if(borderlineMetric > negativeBoderLine2mm2){
+                    if (deviceRatioClass == negativeBorderLine) {
+                        when {
+                            borderlineMetric < negativeBoderLine2mm1 -> {//1.34
+                                return sickleCellTrait
+                            }
+                            borderlineMetric > negativeBoderLine2mm2 -> {
                                return "Normal"
-                        }else if(borderlineMetric > negativeBoderLine2mm1 && borderlineMetric < negativeBoderLine2mm2){
+                            }
+                            borderlineMetric > negativeBoderLine2mm1 && borderlineMetric < negativeBoderLine2mm2 -> {
                                return "Negative borderline. Confirm with HPLC"
                            }
                        }
-                    if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
-                        if (borderlineMetric < positiveBoderLine2mm1){//1.34
-                            return "Sickle Cell Disease"
-                        }else if(borderlineMetric > positiveBoderLine2mm2){
-                            return "Sickle Cell Trait"
-                        }else if(borderlineMetric > positiveBoderLine2mm1 && borderlineMetric < positiveBoderLine2mm2){
+                    }
+                    if (deviceRatioClass == positiveBoderLine) {
+                        when {
+                            borderlineMetric < positiveBoderLine2mm1 -> {//1.34
+                                return sickleCellDisease
+                            }
+                            borderlineMetric > positiveBoderLine2mm2 -> {
+                                return sickleCellTrait
+                            }
+                            borderlineMetric > positiveBoderLine2mm1 && borderlineMetric < positiveBoderLine2mm2 -> {
                                return "Positive for Sickle Cell. Confirm with HPLC"
                            }
                        }
                    }
                }
+            }
        } catch (e: Exception) {
            handleException(e)
            return "Error"
@@ -1483,13 +1546,13 @@ class HemoCubeFragment : Fragment() {
                    return "Normal"
                }
                if (roundedRatio in 0.237..0.242)
-                    return "Negative Borderline"
+                    return negativeBorderLine
                if (roundedRatio in 0.242..0.318)
-                    return "Sickle Cell Trait"
+                    return sickleCellTrait
                if (roundedRatio >= 0.318 && roundedRatio < 0.356)
-                    return "Positive for Sickle Cell. HPLC for Confirmation"
+                    return positiveBoderLine
                if (roundedRatio in 0.356..0.7)
-                    return "Sickle Cell Disease"
+                    return sickleCellDisease
            } else {
                return "Invalid"
            }
@@ -1509,16 +1572,16 @@ class HemoCubeFragment : Fragment() {
                        return "Normal"
                    }
                    if (ratio in negativeBorderlineMin10mm..negativeBorderlineMax10mm){
-                        return "Negative Borderline"
+                        return negativeBorderLine
                    }
                    if (ratio in sickleCellTraitMin10mm..sickleCellTraitMax10mm){
-                        return "Sickle Cell Trait"
+                        return sickleCellTrait
                    }
                    if (ratio in positiveForSickleCellMin10mm..positiveForSickleCellMax10mm){//0.36
-                        return "Positive for Sickle Cell. HPLC for Confirmation"
+                        return positiveBoderLine
                    }
                    if (ratio in sickleCellDiseaseMin10mm..sickleCellDiseaseMax10mm){
-                        return "Sickle Cell Disease"
+                        return sickleCellDisease
                    }
                }else if(cuvetteSize == "2mm"){
                    if (ratio in normalMin2mm..normalMax2mm) {
@@ -1526,16 +1589,16 @@ class HemoCubeFragment : Fragment() {
                        return "Normal"
                    }
                    if (ratio in negativeBorderlineMin2mm..negativeBorderlineMax2mm){
-                        return "Negative Borderline"
+                        return negativeBorderLine
                    }
                    if (ratio in sickleCellTraitMin2mm..sickleCellTraitMax2mm){
-                        return "Sickle Cell Trait"
+                        return sickleCellTrait
                    }
                    if (ratio in positiveForSickleCellMin2mm..positiveForSickleCellMax2mm){//0.36
-                        return "Positive for Sickle Cell. HPLC for Confirmation"
+                        return positiveBoderLine
                    }
                    if (ratio in sickleCellDiseaseMin2mm..sickleCellDiseaseMax2mm){
-                        return "Sickle Cell Disease"
+                        return sickleCellDisease
                    }
                }

@@ -1635,7 +1698,9 @@ class HemoCubeFragment : Fragment() {

        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.CHECK_CUVETTE_COMMAND,
            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }

                override fun onUsbError(e: Exception?) {
                    hemoCubeViewModel.progressBar.postValue(false)
@@ -1649,7 +1714,9 @@ class HemoCubeFragment : Fragment() {
 //        }
        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_BUFFER_COMMAND,
            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }

                override fun onUsbError(e: Exception?) {
                    hemoCubeViewModel.progressBar.postValue(false)
@@ -1662,7 +1729,9 @@ class HemoCubeFragment : Fragment() {

            (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_SAMPLE,
                object : UsbServiceListener {
-                    override fun onUsbRead(data: ByteArray?) {}
+                    override fun onUsbRead(data: ByteArray?) {
+                        //nothing
+                    }

                    override fun onUsbError(e: Exception?) {
                        hemoCubeViewModel.progressBar.postValue(false)
@@ -1676,7 +1745,9 @@ class HemoCubeFragment : Fragment() {

        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.FIRST_GAIN_COMMAND,
            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }

                override fun onUsbError(e: Exception?) {
                    hemoCubeViewModel.progressBar.postValue(false)
@@ -1689,7 +1760,9 @@ class HemoCubeFragment : Fragment() {

        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.SECOND_GAIN_COMMAND,
            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }

                override fun onUsbError(e: Exception?) {
                    hemoCubeViewModel.progressBar.postValue(false)
@@ -1697,25 +1770,29 @@ class HemoCubeFragment : Fragment() {
            })
    }

-    private fun sendThirdGainCommand() {
-        hemoCubeViewModel.progressBar.postValue(true)
-
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.THIRD_GAIN_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
-
-                override fun onUsbError(e: Exception?) {
-                    hemoCubeViewModel.progressBar.postValue(false)
-                }
-            })
-    }
+//    private fun sendThirdGainCommand() {
+//        hemoCubeViewModel.progressBar.postValue(true)
+//
+//        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.THIRD_GAIN_COMMAND,
+//            object : UsbServiceListener {
+//                override fun onUsbRead(data: ByteArray?) {
+//                    //nothing
+//                }
+//
+//                override fun onUsbError(e: Exception?) {
+//                    hemoCubeViewModel.progressBar.postValue(false)
+//                }
+//            })
+//    }

    private fun sendForthGainCommand() {
        hemoCubeViewModel.progressBar.postValue(true)

        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.FORTH_GAIN_COMMAND,
            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }

                override fun onUsbError(e: Exception?) {
                    hemoCubeViewModel.progressBar.postValue(false)
@@ -1727,7 +1804,9 @@ class HemoCubeFragment : Fragment() {

        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.CHECK_TEMP_COMMAND,
            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }

                override fun onUsbError(e: Exception?) {
                    hemoCubeViewModel.progressBar.postValue(false)
@@ -1739,7 +1818,9 @@ class HemoCubeFragment : Fragment() {

        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.PRINT_COMMAND,
            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
+                }

                override fun onUsbError(e: Exception?) {
                    hemoCubeViewModel.progressBar.postValue(false)
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
@@ -25,11 +25,8 @@ import androidx.lifecycle.viewModelScope
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import com.example.hpostesting.util.CsvWriter
-import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.util.NetworkStatusLiveData
-import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.datasource.LocalFileDataSource
@@ -50,7 +47,11 @@ import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.CheckUpdateWorker
 import com.example.hpostesting.domain.LogFileManager
+import com.example.hpostesting.util.CsvWriter
+import com.example.hpostesting.util.NetworkStatusLiveData
+import com.example.hpostesting.util.Result
 import dagger.hilt.android.lifecycle.HiltViewModel
+import `in`.sminnovations.hpostesting.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import okhttp3.Headers
@@ -67,21 +68,23 @@ import javax.inject.Inject
@Suppress("MemberVisibilityCanBePrivate")
@HiltViewModel
 class HemoCubeViewModel @Inject constructor(
-    private val hemoCubeDao: HemoCubeDao,
+    val hemoCubeDao: HemoCubeDao,
    private val hemoCubeBufferDao: HemoCubeBufferDao,
    private val repository: Repository,
    private val logFileManager: LogFileManager,
    private val localFileDataSource: LocalFileDataSource,
-    context: Context,
+    private val contextV: Context
 ) : ViewModel() {
+    private val successMsg = "Data uploaded to Firestore successfully"
+    private var testUpload: Boolean = false
    var isServiceConnected = false
    val progressBar = MutableLiveData(false)
    private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
    val messages = MutableLiveData<String>()
    private val sharedPreference =
-        context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        contextV.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)

-    private val workManager = WorkManager.getInstance(context)
+    private val workManager = WorkManager.getInstance(contextV)

 //    init {
 //        startPeriodicCheckUpdate()
@@ -102,7 +105,7 @@ class HemoCubeViewModel @Inject constructor(

    // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)

-    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    private val _networkStatusLiveData = NetworkStatusLiveData(contextV)
    val allUserData = hemoCubeDao.getAll()
    val allLocalData = hemoCubeDao.getAll()
    val allPendingUserToUpload = hemoCubeDao.getPendingUser()
@@ -118,7 +121,7 @@ class HemoCubeViewModel @Inject constructor(

    private val batteryStatus: Intent? =
        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
-            context.registerReceiver(null, ifilter)
+            contextV.registerReceiver(null, ifilter)
        }

    fun uploadHemoCubeResultToDatabase(
@@ -132,20 +135,84 @@ class HemoCubeViewModel @Inject constructor(
        try {
            if (isOnline) {
                parseData()
+                //addResultTestToDb(quickCapture)
+                if(Constants.FIREBASE_INTEGRATION){
                    addResultTestToDb(quickCapture)
+                }else{
+                    uploadToMolbio()
+                }
+
            } else {
                parseData()
-                addResultTestToDb(quickCapture)
+                val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
+                with(sharedPreference.edit()) {
+                    putInt(Constants.KIT_COUNT, kitCount.plus(1))
+                    apply()
+                }
+                //  addResultTestToDb(quickCapture,isOnline)
                testDetails?.testTime = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                    contextV.resources.getString(R.string.DateTimeFormat), Locale.getDefault()
                ).format(Calendar.getInstance().time)
+                testDetails?.localFlag = false
                hemoCubeDao.updateTest(testDetails!!)
                fireBaseUpload.postValue("Local")
+
+//                parseData()
+//                addResultTestToDb(quickCapture)
+//                testDetails?.testTime = SimpleDateFormat(
+//                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+//                ).format(Calendar.getInstance().time)
+//                hemoCubeDao.updateTest(testDetails!!)
+//                fireBaseUpload.postValue("Local")
            }
        } catch (e: Exception) {
            Log.e("Testdb", "Upload failed: ${e.message}")
        }
    }
+    fun uploadToMolbio(){
+        if (Constants.MOLBIO_INTEGRATION) {
+            testDetails!!.testStatus = true
+            testDetails.localFlag = true
+            val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
+            with(sharedPreference.edit()) {
+                putInt(Constants.KIT_COUNT, kitCount.plus(1))
+                apply()
+            }
+            fireBaseUpload.postValue("Success")
+            testDetails.reportUploadTime = SimpleDateFormat(
+                contextV.resources.getString(R.string.DateTimeFormat), Locale.getDefault()
+            ).format(Calendar.getInstance().time)
+            val currentTimeFormatted = SimpleDateFormat(
+                "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
+                Locale.getDefault()
+            ).format(Calendar.getInstance().time)
+            // Sanitize testDetails before using it in the API call
+            val sanitizedTestDetails = sanitizeDoubleValues(testDetails)
+
+            // Now, use sanitizedTestDetails for the API call
+            uploadResult(
+                MolbioV2ResultRequest(
+                    mutableListOf(
+                        MolbioV2Result(
+                            rawData = sanitizedTestDetails,
+                            analysisId = sanitizedTestDetails._id,
+                            analysisDate = currentTimeFormatted,
+                            analysisStatus = sanitizedTestDetails.classificationResult,
+                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[sanitizedTestDetails.deviceId]?.toString(),
+                            interpretation = sanitizedTestDetails.classificationResult,
+                            testId = sanitizedTestDetails._id,
+                            testTime = currentTimeFormatted,
+                            collectionTime = currentTimeFormatted,
+                            expiryTime = currentTimeFormatted,
+                        )
+                    )
+                )
+            )
+            viewModelScope.launch {
+                hemoCubeDao.updateTest(testDetails)
+            }
+        }
+    }

    fun login(loginRequest: LoginRequest) = viewModelScope.launch {
        loginResponse.postValue(Result.Loading())
@@ -221,34 +288,40 @@ class HemoCubeViewModel @Inject constructor(
                is Result.Success -> {
                    it.data.data?.forEach { id ->
                        id.rawData?.let { it1 ->
+                            updateLocalFlag(it1._id)
                            updateMolbioFlag(
                                it1._id
                            )
                        }
                    }
+                    fireBaseBulkUpload.postValue("Success")
                }
                is Result.Error -> {
+                    fireBaseBulkUpload.postValue("Error")
                    Log.d("result","result upload error")
                }
                else -> {
+                    fireBaseBulkUpload.postValue("Error")
                    Log.d("result","result upload else")
                }
            }
        }
    }

-
-    fun sendDataToFirebase() = viewModelScope.launch ( Dispatchers.IO ) {
+    fun sendDataToFirebase() = viewModelScope.launch (Dispatchers.IO) {
        val pendingData = hemoCubeDao.getFirebasePending()
        pendingData.forEach{
                userData ->
-            if (userData != null) {
            if (!userData.localFlag && userData.testStatus == true) {
                bulkAddResultTestToDb(userData)
            }
        }
+        if(testUpload){
+            fireBaseBulkUpload.postValue("Success")
        }
-
+//        else{
+//            fireBaseBulkUpload.postValue("Error")
+//        }
    }


@@ -287,7 +360,7 @@ class HemoCubeViewModel @Inject constructor(

    fun uploadLogs() = viewModelScope.launch {
        uploadLogs.postValue(Result.Loading())
-        val logFile = logFileManager.createLogFile().let { file ->
+        logFileManager.createLogFile().let { file ->
            val requestBody = file?.asRequestBody("multipart/form-data".toMediaTypeOrNull())
            val multipartFile =
                requestBody?.let { MultipartBody.Part.createFormData("logFile", file?.name, it) }
@@ -312,7 +385,7 @@ class HemoCubeViewModel @Inject constructor(
                    when (val response =
                        repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
                        is Response.Success -> {
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
+                            Log.i("Testdb", successMsg)
                            fireBaseUpload.postValue("Success")
                            bufferCheckData.localFlag = true
                            hemoCubeBufferDao.insertAll(bufferCheckData)
@@ -324,8 +397,6 @@ class HemoCubeViewModel @Inject constructor(
                            bufferCheckData.localFlag = true
                            hemoCubeBufferDao.insertAll(bufferCheckData)
                        }
-
-                        else -> {}
                    }
                } catch (e: Exception) {
                    Log.e("Testdb", "Exception during data upload: ${e.message}")
@@ -340,7 +411,7 @@ class HemoCubeViewModel @Inject constructor(
    fun bulkAddResultKitTestToDb(bufferCheckData: BufferCheckData) {
        viewModelScope.launch {
            bufferCheckData.reportUploadTime = SimpleDateFormat(
-                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                contextV.resources.getString(R.string.DateTimeFormat), Locale.getDefault()
            ).format(Calendar.getInstance().time)
            when (repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
                is Response.Success -> {
@@ -369,7 +440,7 @@ class HemoCubeViewModel @Inject constructor(
        testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
        testDetails?.location = DataHolder.location
        testDetails?.testTime = SimpleDateFormat(
-            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+            contextV.resources.getString(R.string.DateTimeFormat), Locale.getDefault()
        ).format(Calendar.getInstance().time)
        testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion
        testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId
@@ -399,7 +470,7 @@ class HemoCubeViewModel @Inject constructor(
        testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
        testDetails?.incubationTime = DataHolder.hemoCubeTestData?.incubationTime.toString()
        testDetails?.name = DataHolder.hemoCubeTestData?.name.toString()
-        testDetails?.birthYear = DataHolder.hemoCubeTestData?.birthYear.toString()
+        testDetails?.age = DataHolder.hemoCubeTestData?.age.toString()
        testDetails?.userImageURL = DataHolder.hemoCubeTestData?.userImageURL.toString()
        testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
        testDetails?.prdClassification = DataHolder.hemoCubeTestData?.prdClassification.toString()
@@ -429,11 +500,12 @@ class HemoCubeViewModel @Inject constructor(
        viewModelScope.launch {
            try {
                testDetails!!.quickCapture = quickCapture
+                testDetails.testStatus = true
                testDetails.reportUploadTime = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                    contextV.resources.getString(R.string.DateTimeFormat), Locale.getDefault()
                ).format(Calendar.getInstance().time)
                val currentTimeFormatted = SimpleDateFormat(
-                    "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
+                    contextV.resources.getString(R.string.DateTimeFormat),
                    Locale.getDefault()
                ).format(Calendar.getInstance().time)
                if(quickCapture){
@@ -444,7 +516,7 @@ class HemoCubeViewModel @Inject constructor(
                                putInt(Constants.KIT_COUNT, kitCount.plus(1))
                                apply()
                            }
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
+                            Log.i("Testdb", successMsg)
                            fireBaseUpload.postValue("Success")
                            testDetails.localFlag = true
                            hemoCubeDao.updateTest(testDetails)
@@ -456,19 +528,22 @@ class HemoCubeViewModel @Inject constructor(
                            hemoCubeDao.updateTest(testDetails)
                        }

-                        else -> {}
+                        else -> {
+                            //nothing
+                        }
                    }
                }else{
                    when (val response = repository.addTestToDatabase(testDetails)) {
                        is Response.Success -> {
+                            testDetails.localFlag = true
                            val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
                            with(sharedPreference.edit()) {
                                putInt(Constants.KIT_COUNT, kitCount.plus(1))
                                apply()
                            }
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
+                            Log.i("Testdb", successMsg)
                            fireBaseUpload.postValue("Success")
-                            testDetails.localFlag = true
+
                            if (Constants.MOLBIO_INTEGRATION) {
                                // Sanitize testDetails before using it in the API call
                                val sanitizedTestDetails = sanitizeDoubleValues(testDetails)
@@ -501,8 +576,6 @@ class HemoCubeViewModel @Inject constructor(
                            fireBaseUpload.postValue("Error")
                            hemoCubeDao.updateTest(testDetails)
                        }
-
-                        else -> {}
                    }
                }

@@ -520,13 +593,13 @@ class HemoCubeViewModel @Inject constructor(
            ).format(Calendar.getInstance().time)
            when (repository.addTestToDatabase(userData)) {
                is Response.Success -> {
-                    fireBaseBulkUpload.postValue("Success")
+                    testUpload = true
                    userData.localFlag = true
                    updateLocalFlag(userData._id)
                }

                else -> {
-                    fireBaseBulkUpload.postValue("Error")
+                    testUpload = false
                }
            }
        }
@@ -569,7 +642,7 @@ class HemoCubeViewModel @Inject constructor(
                when (val response =
                    repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
                    is Response.Success -> {
-                        Log.i("Testdb", "Data uploaded to Firestore successfully")
+                        Log.i("Testdb", successMsg)
                        fireBaseUpload.postValue("Success")
                    }

@@ -577,8 +650,6 @@ class HemoCubeViewModel @Inject constructor(
                        Log.e("Testdb", "Error uploading data to Firestore: $response")
                        fireBaseUpload.postValue("Error")
                    }
-
-                    else -> {}
                }
            } catch (e: Exception) {
                Log.e("Testdb", "Exception during data upload: ${e.message}")
@@ -591,6 +662,10 @@ class HemoCubeViewModel @Inject constructor(
        viewModelScope.launch {
            hemoCubeBufferDao.updateFieldById(id = bufferId, true)
        }
+    fun deleteByStatus() = viewModelScope.launch {
+        hemoCubeDao.deleteByStatus()
+    }
+

    fun getLocalUserDataForCsv(context: Context): Boolean {
        val localUserDataLiveData: LiveData<List<HemoCubeTestData>> = hemoCubeDao.getAll()
@@ -606,7 +681,7 @@ class HemoCubeViewModel @Inject constructor(
                            userData._id,
                            userData.name,
                            userData.bloodGroup,
-                            userData.birthYear,
+                            userData.age,
                            userData.classificationResult,
                            userData.testTime.toString(),
                            userData.userImageURL
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt
@@ -304,12 +304,10 @@ open class HemocubeActivity : AppCompatActivity() {
 //    }
 override fun onBackPressed() {
    val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
-    if (fragment is HemoCubeFragment) {
-        if (fragment.handleBackButtonPress()) {
+    if (fragment is HemoCubeFragment && fragment.handleBackButtonPress()) {
        // If the fragment handled the back press, return to avoid calling super.onBackPressed
        return
    }
-    }
    // If the fragment did not handle the back press, call the superclass method
    super.onBackPressed()
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
@@ -112,14 +112,14 @@ class TestRightResults : Fragment() {
    }

    private fun updateResults() {
-        if (viewModel.testDetails?.name == "" && viewModel.testDetails?.birthYear == "") {
+        if (viewModel.testDetails?.name == "" && viewModel.testDetails?.age == "") {
            binding.tvName.visibility = View.GONE
            binding.tvAge.visibility = View.GONE
        } else {
            binding.tvName.text = getString(R.string.name_in_textview, viewModel.testDetails?.name)
            binding.tvAge.text = getString(
                R.string.age_in_textview,
-                viewModel.testDetails?.birthYear?.toInt()?.calculateAgeFromYOB().toString()
+                viewModel.testDetails?.age?.toInt()?.calculateAgeFromYOB().toString()
            )
        }

--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt
@@ -287,7 +287,7 @@ class TrueHemeViewModel @Inject constructor(
        testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
        testDetails?.incubationTime = DataHolder.hemoCubeTestData?.incubationTime.toString()
        testDetails?.name = DataHolder.hemoCubeTestData?.name.toString()
-        testDetails?.birthYear = DataHolder.hemoCubeTestData?.birthYear.toString()
+        testDetails?.age = DataHolder.hemoCubeTestData?.age.toString()
        testDetails?.userImageURL = DataHolder.hemoCubeTestData?.userImageURL.toString()
        testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
        testDetails?.prdClassification = DataHolder.hemoCubeTestData?.prdClassification.toString()
@@ -434,7 +434,7 @@ class TrueHemeViewModel @Inject constructor(
                            userData._id,
                            userData.name,
                            userData.bloodGroup,
-                            userData.birthYear,
+                            userData.age,
                            userData.classificationResult,
                            userData.testTime.toString(),
                            userData.userImageURL
--- a/app/src/main/java/com/example/hpostesting/presentation/usb_teminal/UsbTerminalFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/usb_teminal/UsbTerminalFragment.kt
@@ -68,6 +68,7 @@ class UsbTerminalFragment : Fragment() {
            command,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {
+                    //nothing
                }

                override fun onUsbError(e: Exception?) {
--- a/app/src/main/java/com/example/hpostesting/presentation/utils/DeviceCommunicationHandler.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/utils/DeviceCommunicationHandler.kt
@@ -15,6 +15,6 @@ package com.example.hpostesting.presentation.utils

 import com.example.hpostesting.data.constant.HemoCubeCommands

-interface DeviceCommunicationHandler {
+fun interface DeviceCommunicationHandler {
    fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener)
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/utils/NatsManager.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/utils/NatsManager.kt
@@ -26,16 +26,9 @@ import io.nats.client.NKey
 import io.nats.client.Nats
 import io.nats.client.Options
 import io.nats.client.support.SSLUtils
-import java.io.FileInputStream
 import java.io.IOException
 import java.nio.charset.StandardCharsets
 import java.security.GeneralSecurityException
-import java.security.KeyStore
-import java.security.SecureRandom
-import java.security.cert.CertificateFactory
-import javax.net.ssl.KeyManagerFactory
-import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManagerFactory


 class NatsManager(datacollector: DashboardActivity) {
@@ -46,41 +39,41 @@ class NatsManager(datacollector: DashboardActivity) {
    var connect = false
    var sharedPreferences = datacollector.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)

-    private fun createSSLContext(): SSLContext {
-        val keyStorePassword = "prime24".toCharArray() // Change as necessary
-        val clientCertPath = "/storage/sdcard0/Download/client.p12"
-
-        // Load client certificate and key
-        val keyStore = KeyStore.getInstance("PKCS12")
-        FileInputStream(clientCertPath).use { keyStoreInputStream ->
-            keyStore.load(keyStoreInputStream, keyStorePassword)
-        }
-        val caCertPath =
-            "/storage/sdcard0/Android/data/in.sminnovations.hpostesting.quality/files/NATS/clientCertificate/client-cert.pem"
-        val caCert = FileInputStream(caCertPath).use { inputStream ->
-            val certificateFactory = CertificateFactory.getInstance("X.509")
-            certificateFactory.generateCertificate(inputStream)
-        }
-
-        val trustStore = KeyStore.getInstance(KeyStore.getDefaultType()).apply {
-            load(null, null) // Initialize the keystore
-            setCertificateEntry("caCert", caCert) // Add the CA certificate
-        }
-
-        // Initialize key manager factory
-        val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
-        kmf.init(keyStore, keyStorePassword)
-
-        // Initialize trust manager factory
-        val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-        tmf.init(trustStore)
-
-        // Initialize SSLContext
-        val sslContext = SSLContext.getInstance("TLS")
-        sslContext.init(kmf.keyManagers, tmf.trustManagers, SecureRandom())
-
-        return sslContext
-    }
+//    private fun createSSLContext(): SSLContext {
+//        val keyStorePassword = "prime24".toCharArray() // Change as necessary
+//        val clientCertPath = "/storage/sdcard0/Download/client.p12"
+//
+//        // Load client certificate and key
+//        val keyStore = KeyStore.getInstance("PKCS12")
+//        FileInputStream(clientCertPath).use { keyStoreInputStream ->
+//            keyStore.load(keyStoreInputStream, keyStorePassword)
+//        }
+//        val caCertPath =
+//            "/storage/sdcard0/Android/data/in.sminnovations.hpostesting.quality/files/NATS/clientCertificate/client-cert.pem"
+//        val caCert = FileInputStream(caCertPath).use { inputStream ->
+//            val certificateFactory = CertificateFactory.getInstance("X.509")
+//            certificateFactory.generateCertificate(inputStream)
+//        }
+//
+//        val trustStore = KeyStore.getInstance(KeyStore.getDefaultType()).apply {
+//            load(null, null) // Initialize the keystore
+//            setCertificateEntry("caCert", caCert) // Add the CA certificate
+//        }
+//
+//        // Initialize key manager factory
+//        val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
+//        kmf.init(keyStore, keyStorePassword)
+//
+//        // Initialize trust manager factory
+//        val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+//        tmf.init(trustStore)
+//
+//        // Initialize SSLContext
+//        val sslContext = SSLContext.getInstance("TLS")
+//        sslContext.init(kmf.keyManagers, tmf.trustManagers, SecureRandom())
+//
+//        return sslContext
+//    }

    @RequiresApi(Build.VERSION_CODES.O)
    fun connect() {
--- a/app/src/main/res/drawable/baseline_cloud_24.xml
+++ b/app/src/main/res/drawable/baseline_cloud_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/baseline_cloud_done_24.xml
+++ b/app/src/main/res/drawable/baseline_cloud_done_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM10,17l-3.5,-3.5 1.41,-1.41L10,14.17 15.18,9l1.41,1.41L10,17z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/baseline_cloud_sync_24.xml
+++ b/app/src/main/res/drawable/baseline_cloud_sync_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M21.5,14.98c-0.02,0 -0.03,0 -0.05,0.01C21.2,13.3 19.76,12 18,12c-1.4,0 -2.6,0.83 -3.16,2.02C13.26,14.1 12,15.4 12,17c0,1.66 1.34,3 3,3l6.5,-0.02c1.38,0 2.5,-1.12 2.5,-2.5S22.88,14.98 21.5,14.98zM10,4.26v2.09C7.67,7.18 6,9.39 6,12c0,1.77 0.78,3.34 2,4.44V14h2v6H4v-2h2.73C5.06,16.54 4,14.4 4,12C4,8.27 6.55,5.15 10,4.26zM20,6h-2.73c1.43,1.26 2.41,3.01 2.66,5l-2.02,0C17.68,9.64 16.98,8.45 16,7.56V10h-2V4h6V6z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/baseline_info_24.xml
+++ b/app/src/main/res/drawable/baseline_info_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+    
+</vector>
--- a/app/src/main/res/drawable/baseline_translate_24.xml
+++ b/app/src/main/res/drawable/baseline_translate_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
+    
+</vector>
--- a/app/src/main/res/layout/activity_hb_test.xml
+++ b/app/src/main/res/layout/activity_hb_test.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
+  ~ // Notice: All information contained herein is, and remains
+  ~ // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
+  ~ // if any. The intellectual and technical concepts contained
+  ~ // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
+  ~ // and its suppliers and may be covered by Indian and Foreign Patents,
+  ~ // patents in process, and are protected by trade secret or copyright law.
+  ~ // Dissemination of this information or reproduction of this material
+  ~ // is strictly forbidden unless prior written permission is obtained
+  ~ // from ShanMukha Innovations Pvt. Ltd.
+  -->
+
+<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">
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <!--        <androidx.appcompat.widget.Toolbar-->
+        <!--            android:id="@+id/my_toolbar"-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="?attr/actionBarSize"-->
+        <!--            android:background="?attr/colorPrimary"-->
+        <!--            app:titleTextColor="#FFFFFF"-->
+        <!--            android:elevation="4dp"-->
+        <!--            app:menu="@menu/my_menu"-->
+        <!--            android:theme="@style/ToolbarTheme"-->
+        <!--            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintTop_toTopOf="parent"/>-->
+
+        <FrameLayout
+            android:id="@+id/fg_hb_test"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            >
+
+        </FrameLayout>
+
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
--- a/app/src/main/res/layout/activity_kit_scan.xml
+++ b/app/src/main/res/layout/activity_kit_scan.xml
@@ -45,6 +45,7 @@
        android:layout_marginHorizontal="24dp"
        android:layout_marginTop="16dp"
        android:text="@string/scan_qr_code_of_the_kit"
+        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/app_bar_layout" />

@@ -58,6 +59,7 @@
        android:textColor="@color/black"
        app:backgroundTint="@color/blue_app_light"
        app:cornerRadius="100dp"
+        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/tv_title" />

--- a/app/src/main/res/layout/fragment_gallery.xml
+++ b/app/src/main/res/layout/fragment_gallery.xml
@@ -165,7 +165,7 @@
            app:cornerRadius="16dp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
+            app:layout_constraintTop_toBottomOf="@id/btn_reset_password" />
    <com.google.android.material.button.MaterialButton
        android:id="@+id/btn_firefox"
        android:layout_width="match_parent"
--- a/app/src/main/res/layout/fragment_hb_test.xml
+++ b/app/src/main/res/layout/fragment_hb_test.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
+  ~ // Notice: All information contained herein is, and remains
+  ~ // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
+  ~ // if any. The intellectual and technical concepts contained
+  ~ // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
+  ~ // and its suppliers and may be covered by Indian and Foreign Patents,
+  ~ // patents in process, and are protected by trade secret or copyright law.
+  ~ // Dissemination of this information or reproduction of this material
+  ~ // is strictly forbidden unless prior written permission is obtained
+  ~ // from ShanMukha Innovations Pvt. Ltd.
+  -->
+
+<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.autodac.AutoDacFragment">
+
+
+    <!--        <TextView-->
+    <!--            android:id="@+id/tv_title"-->
+    <!--            style="@style/title1"-->
+    <!--            android:layout_width="wrap_content"-->
+    <!--            android:layout_height="wrap_content"-->
+    <!--            android:layout_marginHorizontal="24dp"-->
+    <!--            android:text="@string/diagnostics"-->
+    <!--            android:layout_marginTop="16dp"-->
+    <!--            app:layout_constraintStart_toStartOf="parent"-->
+    <!--            app:layout_constraintTop_toTopOf="parent" />-->
+
+    <TextView
+        android:id="@+id/tv_subtitle2"
+        style="@style/title2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="16dp"
+        android:textSize="22sp"
+        android:textStyle="bold"
+        android:text="HB Test"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_subtitle3"
+        style="@style/title2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
+
+    <TextView
+        android:id="@+id/tv_subtitle4"
+        style="@style/title1_1"
+        android:layout_width="0dp"
+        android:layout_height="320dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="16dp"
+        android:gravity="center"
+        android:scrollbars="vertical"
+        android:text="Start"
+        android:textColor="@color/black"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
+
+
+    <Button
+        android:id="@+id/btn_buffer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="24dp"
+        android:clickable="false"
+        android:gravity="center"
+        android:text="Buffer Start"
+        android:textColor="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
+
+    <Button
+        android:id="@+id/btn_sample"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="15dp"
+        android:clickable="false"
+        android:gravity="center"
+        android:visibility="visible"
+        android:text="Sample Start"
+        android:textColor="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_buffer" />
+    <Button
+        android:id="@+id/btn_submit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="24dp"
+        android:clickable="false"
+        android:gravity="center"
+        android:visibility="gone"
+        android:text="Submit"
+        android:textColor="@color/white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_sample" />
+
+    <!--        <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>-->
+
+    <ImageView
+        android:id="@+id/iv_check"
+        android:visibility="gone"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginTop="40dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/check"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+
+    <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>
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -101,6 +101,26 @@
                android:inputType="textCapCharacters"
                android:hint="@string/sample_id" />

+        </com.google.android.material.textfield.TextInputLayout>
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/til_age"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:layout_marginHorizontal="24dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/til_name">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/age"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:maxLength="2"
+                android:inputType="number"
+                android:hint="@string/age" />
+
        </com.google.android.material.textfield.TextInputLayout>

        <com.google.android.material.textfield.TextInputLayout
@@ -112,13 +132,13 @@
            android:layout_marginTop="24dp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/til_name">
+            app:layout_constraintTop_toBottomOf="@+id/til_age">

            <AutoCompleteTextView
                android:id="@+id/et_blood_group"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:text="@string/select_blood_group"
+                android:hint="@string/select_blood_group"
                android:inputType="none"
                android:labelFor="@id/til_blood_group"
                app:simpleItems="@array/blood_group" />
--- a/app/src/main/res/layout/fragment_jig.xml
+++ b/app/src/main/res/layout/fragment_jig.xml
@@ -76,6 +76,7 @@
        android:textColor="@color/black"
        app:backgroundTint="@color/blue_app_light"
        app:cornerRadius="100dp"
+        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/tv_title" />

@@ -103,9 +104,9 @@
        android:clickable="false"
        android:gravity="center"
        android:text="Refresh"
-        android:visibility="visible"
        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="@id/btn_scan_now"
+        android:visibility="visible"
+        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/btn_scan_now" />

--- a/app/src/main/res/layout/fragment_register_one_create_abha.xml
+++ b/app/src/main/res/layout/fragment_register_one_create_abha.xml
@@ -53,6 +53,7 @@
            android:textColor="@color/black"
            app:backgroundTint="@color/blue_app_light"
            app:cornerRadius="100dp"
+            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/tv_title2" />

--- a/app/src/main/res/layout/server_selector_drop_down.xml
+++ b/app/src/main/res/layout/server_selector_drop_down.xml
@@ -0,0 +1,38 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- RadioGroup to select servers -->
+    <RadioGroup
+        android:id="@+id/radioGroupServers"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:orientation="vertical">
+
+        <!-- Radio Buttons for each server option -->
+        <RadioButton
+            android:id="@+id/radioButtonInternal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Internal" />
+
+        <RadioButton
+            android:id="@+id/radioButtonClinical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Clinical" />
+
+        <RadioButton
+            android:id="@+id/radioButtonCustomer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Customer" />
+
+    </RadioGroup>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -305,4 +305,8 @@
    <string name="quick_capture">Quick Capture</string>
    <string name="reset_password_for_this_device">Reset password for this device</string>
    <string name="calibrate_device">Calibrate the device</string>
+    <string name="cuvette_presentt">Cuvette Present , Please Remove Cuvette And Try Again</string>
+    <string name="cuvette_absentt">Cuvette Absent,Now You Can Submit</string>
+    <string name="DateTimeFormat">yyyy-MM-dd HH:mm:ss</string>
+
 </resources>
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -213,7 +213,7 @@
    <string name="start_incubation">ಇನ್ಕ್ಯುಬೇಷನ್ ಪ್ರಾರಂಭಿಸಿ</string>
    <string name="check_buffer">ಬಫರ್ ಚೆಕ್ ಮಾಡಿ</string>
    <!-- Kannada Translations -->
-    <string name="low_battery_warning">ಬ್ಯಾಟರಿ ಸ್ತರ 40% ಕ್ಕಿಂತ ಕಡಿಮೆಯಾಗಿದೆ, ಟೆಸ್ಟ್ ಮುಂದುವರಿಸಲು ದಯವಿಟ್ಟು  ಡಿವೈಸ  ಚಾರ್ಜ್ ಮಾಡಿ</string>
+    <string name="low_battery_warning">ಬ್ಯಾಟರಿ ಸ್ತರ 20% ಕ್ಕಿಂತ ಕಡಿಮೆಯಾಗಿದೆ, ಟೆಸ್ಟ್ ಮುಂದುವರಿಸಲು ದಯವಿಟ್ಟು  ಡಿವೈಸ  ಚಾರ್ಜ್ ಮಾಡಿ</string>
    <string name="test_already_conducted">ಈ ಬಳಕೆದಾರನ ಮೇಲೆ ಟೆಸ್ಟ್  ಮುಗಿದಿದೆ </string>
    <string name="incubation_not_completed">15 ನಿಮಿಷಗಳ ಇನ್ಕ್ಯೂಬೇಷನ್ ಇನ್ನು   ಪೂರ್ತಿ ಆಗಿಲ್ಲ್ಲ</string>
    <string name="incubation_crossed_30_minutes">ಇನ್ಕ್ಯೂಬೇಷನ್ 30 ನಿಮಿಷಗಳನ್ನು ದಾಟಿದೆ, ಇನ್ನೊಮ್ಮೆ ಇನ್ಕ್ಯೂಬೇಷನ್ ಮಾಡಬೇಕಾಗಿದೆ</string>
@@ -304,6 +304,10 @@
    <string name="quick_capture">ತ್ವರಿತ ಕ್ಯಾಪ್ಚರ್</string>
    <string name="reset_password_for_this_device">ಈ ಸಾಧನಕ್ಕಾಗಿ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಮರುಹೊಂದಿಸಿ</string>
    <string name="calibrate_device">ಸಾಧನವನ್ನು ಮಾಪನಾಂಕ ಮಾಡಿ</string>
+    <string name="cuvette_presentt">Cuvette Present , Please Remove Cuvette And Try Again</string>
+    <string name="cuvette_absentt">Cuvette Absent,Now You Can Submit</string>
+    <string name="DateTimeFormat">yyyy-MM-dd HH:mm:ss</string>
+
    <!-- Add translations for other strings -->

 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -87,7 +87,7 @@
    <string name="acquire">Acquire</string>
    <string name="enter_patient_details">Enter Patient Details</string>
    <string name="patient_name">Patient Name</string>
-    <string name="age">Age in years</string>
+    <string name="age">Age</string>
    <string name="gender">Gender</string>
    <string name="name_error">Name can\'t be empty</string>
    <string name="age_error">Age can\'t be empty</string>
@@ -219,7 +219,7 @@
    <string name="all_registered_user_are_tested_successfully">All registered user are tested successfully</string>
    <string name="start_incubation">Incubate</string>
    <string name="check_buffer">Check Buffer</string>
-    <string name="low_battery_warning">Battery level is low than 40%, please charge the device to continue testing</string>
+    <string name="low_battery_warning">Battery level is low than 20%, please charge the device to continue testing</string>
    <string name="test_already_conducted">Test has been already conducted for this user</string>
    <string name="incubation_not_completed">Incubation has not completed 15 minutes</string>
    <string name="incubation_crossed_30_minutes">Incubation crossed 30 minutes, need to repeat the incubation</string>
@@ -305,4 +305,8 @@
    <string name="quick_capture">Quick Capture</string>
    <string name="reset_password_for_this_device">Reset password for this device</string>
    <string name="calibrate_device">Calibrate Device</string>
+    <string name="cuvette_presentt">Cuvette Present , Please Remove Cuvette And Try Again</string>
+    <string name="cuvette_absentt">Cuvette Absent,Now You Can Submit</string>
+    <string name="DateTimeFormat">yyyy-MM-dd HH:mm:ss</string>
+
 </resources>
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
        kotlin_version = '1.8.21'
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.5.0'
        classpath 'com.google.gms:google-services:4.4.1'
        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.1.0'
    }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -14,6 +14,6 @@
 #Mon Mar 04 17:08:24 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
Author	SHA1	Message	Date
Sathwik C S	67d98b1b27	Update .gitlab-ci.yml file	2024-12-16 07:43:49 +00:00
chandrashekhar reddy	0886f000bf	new branch for review, refactored the code	2024-12-13 12:10:51 +05:30
chandrashekhar reddy	8e074e01c9	rename of the branch	2024-10-15 15:56:03 +05:30
chandrashekhar reddy	6b0c81213e	rename of the branch	2024-10-15 15:04:39 +05:30
sathwikcs	51480393da	optimised the unnecessary code in json added sever info in home fragment removed basic data test	2024-10-09 16:55:44 +05:30
chandrashekhar reddy	d9221a3bb6	Submit button check in HemoCubeFragment	2024-10-09 15:06:05 +05:30
sathwikcs	569155d193	Server switching is implemented pipeline fixed version 2.1.128	2024-10-08 17:19:38 +05:30
sathwikcs	ad029e4cce	Server switching is implemented version 2.1.128	2024-10-08 17:03:32 +05:30
sathwikcs	31654be3bb	Server switching is implemented version 2.1.128	2024-10-08 16:53:44 +05:30
sathwikcs	738375afc5	Server switching is implemented version 2.1.128	2024-10-08 16:44:43 +05:30
chandrashekhar reddy	e77b4d9a23	Changes in 127, added HBTest screen option	2024-09-17 12:47:53 +05:30
chandrashekhar reddy	cf429b4fc3	Changes in 127, added HBTest screen option	2024-09-11 17:11:53 +05:30
chandrashekhar reddy	30df9732a7	127 version with all updates, credential.txt file location changed, Ui updated.	2024-09-10 11:43:48 +05:30
chandrashekhar reddy	a1ce200ad8	127 version with all updates, credential.txt file location changed, Ui updated.	2024-09-10 11:37:00 +05:30