Edit README.md

NetworkStatusLiveData.kt has been removed
2025-01-29 11:02:47 +00:00 · 2025-01-29 11:01:52 +00:00 · 2025-01-29 15:39:47 +05:30 · 2025-01-29 15:39:29 +05:30 · 2025-01-28 17:12:06 +05:30 · 2025-01-28 16:12:21 +05:30
87 changed files with 2902 additions and 1095 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"
+  
+  # Keystore credentials stored as GitLab CI/CD variables
+  KEYSTORE_PASSWORD: $KS_PASSWORD
+  KEY_ALIAS: $KS_ALIAS
+  KEY_PASSWORD: $KS_KEY_PASSWORD

-# Packages installation before running script
 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
@@ -78,8 +45,68 @@ assembleDebug:
  artifacts:
    paths:
      - app/build/outputs/
+      
+# 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

-# Run all tests, if any fails, interrupt the pipeline(fail it)
 debugTests:
  needs: [lintDebug, assembleDebug]
  interruptible: true
@@ -98,4 +125,4 @@ publishTestResults:
  artifacts:
    when: always
    reports:
-      junit: app/build/test-results/testDebugUnitTest/*.xml
+      junit: app/build/test-results/testDebugUnitTest/*.xml
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
+# This version has the new network checker implemented 
+## current version : 2.1.131-network

 ### 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"
-        minSdk 21
+        applicationId "in.sminnovations.hpostesting.server"
+        minSdk 30
        targetSdk 34
-        versionCode 125
-        versionName "2.1.125"
-
+        versionCode 133
+        versionName "2.1.131"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

@@ -30,6 +30,7 @@ android {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
        }
    }
    compileOptions {
@@ -89,7 +90,6 @@ dependencies {
    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta12")
    implementation 'androidx.preference:preference-ktx:1.2.1'
    implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'com.google.android.play:core:1.10.3'
    implementation 'io.nats:jnats:2.11.4'


@@ -121,10 +121,9 @@ dependencies {

    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
    implementation 'com.opencsv:opencsv:5.9'
-    implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
+    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'

@@ -164,7 +163,7 @@ dependencies {
    implementation("androidx.work:work-runtime-ktx:2.9.0")

    // implementation("io.nats:jnats:2.11.2")
-    implementation 'com.google.android.play:core:1.10.3'
+//    implementation 'com.google.android.play:core:1.10.3'

    implementation fileTree(dir: 'libs', include: ['*.aar'])
    implementation 'io.nats:jnats:2.11.4'
--- 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": []
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:243503501547:android:e1bb0f338c8448dd7feeae",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hposregistration.iocl"
-        }
-      },
-      "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": []
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
        }
      }
    }
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -4,17 +4,34 @@
    "type": "APK",
    "kind": "Directory"
  },
-  "applicationId": "in.sminnovations.hpostesting.iocl",
+  "applicationId": "in.sminnovations.hpostesting.dev",
  "variantName": "release",
  "elements": [
    {
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 125,
-      "versionName": "2.1.125",
+      "versionCode": 127,
+      "versionName": "2.1.127",
      "outputFile": "app-release.apk"
    }
  ],
-  "elementType": "File"
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/app-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/app-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 21
 }
--- 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"
@@ -38,7 +44,7 @@
        android:theme="@style/Theme.HPOSTesting"
        tools:targetApi="31">
        <activity
-            android:name="com.example.hpostesting.presentation.dashboard.UpdateValuesActivity"
+            android:name="com.example.hpostesting.presentation.main_base.UpdateValuesActivity"
            android:exported="false"
            android:screenOrientation="portrait"/>

@@ -56,7 +62,7 @@
        </service>

        <activity
-            android:name="com.example.hpostesting.presentation.dashboard.ui.PasswordResetActivity"
+            android:name="com.example.hpostesting.presentation.main_base.ui.PasswordResetActivity"
            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
@@ -68,19 +74,23 @@
            android:exported="false"
            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
-            android:name="com.example.hpostesting.presentation.hemocube.DigitalCardActivity"
+            android:name="com.example.hpostesting.presentation.trueheme_test.DigitalCardActivity"
            android:exported="false" />
        <activity
            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"
            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.jig.JigActivity"
-            android:exported="false"
+            android:exported="true"
            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity"
@@ -96,7 +106,7 @@
            android:screenOrientation="portrait"
            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
-            android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
+            android:name="com.example.hpostesting.presentation.trueheme_test.TrueHemeTestActivity"
            android:exported="false"
            android:noHistory="true"
            android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
@@ -123,8 +133,8 @@
            android:noHistory="true"
            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
-            android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
-            android:exported="false"
+            android:name="com.example.hpostesting.presentation.main_base.DashboardActivity"
+            android:exported="true"
            android:label="@string/title_activity_dashboard"
            android:screenOrientation="portrait"
            android:theme="@style/Theme.HPOS.NoActionBar"
@@ -166,7 +176,7 @@
        </activity>
        <activity
            android:name="com.example.hpostesting.presentation.testRight.TestRightActivity"
-            android:exported="false"
+            android:exported="true"
            android:noHistory="true"
            android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
            android:theme="@style/Theme.HPOS.NoActionBar"
--- a/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt
+++ b/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt
@@ -14,25 +14,29 @@
 package com.example.hpostesting

 import android.app.Application
+import com.example.hpostesting.firebase.FirebaseManager
 import com.google.firebase.firestore.FirebaseFirestore
 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.getCurrentFirestore()
        firestore.firestoreSettings = firestoreSettings
    }
 }
--- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
@@ -16,7 +16,7 @@ package com.example.hpostesting.data.constant
 object Constants {
    const val CENTER_NAME =""
    const val DISTRICT =""
-    const val FLAGS_ENABLED = false//testing flag disable then pass buffer and sample checks
+    const val BUFFER_FLAGS_ENABLED = true//testing flag disable then pass buffer and sample checks
    const val ABS_FLAGS_ENABLED = false
    const val IP_ADDRESS="ip_address"
    const val QUICK_CAPTURE="quick_capture"
@@ -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

@@ -1582,26 +1583,31 @@ object Constants {
            listOf(0.0, 0.0)
        )
    )
-    //Hemocube for 10mm
-    const val positiveBoderLine10mm1 = 1.3
-    const val positiveBoderLine10mm2 = 1.66
-    const val negativeBoderLine10mm1 = 2.0
-    const val negativeBoderLine10mm2 = 2.4
-    const val normalMin10mm = 0.1
+    //Trueheme for 10mm
+    //Before changing below values review before
+    //classification borderline metric
+    const val positiveBoderLineMetricCheck10mmMin = 1.3
+    const val positiveBoderLineMetricCheck10mmMax = 1.66
+    const val negativeBoderLineMetricCheck10mmMin = 2.0
+    const val negativeBoderLineMetricCheck10mmMax = 2.4
+    //classification device ratio
+    const val normalMin10mm = 0.07
    const val normalMax10mm = 0.23
    const val negativeBorderlineMin10mm = 0.23
-    const val negativeBorderlineMax10mm = 0.25
-    const val sickleCellTraitMin10mm = 0.25
+    const val negativeBorderlineMax10mm = 0.27
+    const val sickleCellTraitMin10mm = 0.27
    const val sickleCellTraitMax10mm = 0.31
-    const val positiveForSickleCellMin10mm = 0.31
-    const val positiveForSickleCellMax10mm = 0.43
-    const val sickleCellDiseaseMin10mm = 0.43
+    const val positiveBoderlineMin10mm = 0.31
+    const val positiveBoderlineMax10mm = 0.39
+    const val sickleCellDiseaseMin10mm = 0.39
    const val sickleCellDiseaseMax10mm = 0.7
-    //Hemocube for 2mm
-    const val positiveBoderLine2mm1 = 0.8
-    const val positiveBoderLine2mm2 = 1.1
-    const val negativeBoderLine2mm1 = 1.5
-    const val negativeBoderLine2mm2 = 1.9
+    //Trueheme for 2mm
+    //classification borderline metric
+    const val positiveBoderLineMetricCheck2mmMin = 0.8
+    const val positiveBoderLineMetricCheck2mmMax = 1.1
+    const val negativeBoderLineMetricCheck2mmMin = 1.5
+    const val negativeBoderLineMetricCheck2mmMax = 1.9
+    //classification device ratio
    const val normalMin2mm = 0.1
    const val normalMax2mm = 0.23
    const val negativeBorderlineMin2mm = 0.23
@@ -1622,6 +1628,12 @@ object Constants {
    const val min10mmLed2 = 0.05
    const val max10mmLed2 = 0.41

+    //Check used in handling the buffer values on buffer complete
+    const val bufferMinLed1 = 21000.00
+    const val bufferMaxLed1 = 23000.00
+    const val bufferMinLed2 = 17000.00
+    const val bufferMaxLed2 = 19000.00
+

    //    val STATICID = listOf(
 //        "FACTORY",
--- 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,12 +38,14 @@ 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 = ""
    var quickCapture:Boolean = false
    var location: UserData.Location? = null
-    var ipAddress: String =""
+    var ipAddress: String ="0.0"
    var testExp: Boolean = true
    var hemocubeResult: Double? = null
 }
--- a/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
@@ -26,13 +26,17 @@ enum class TestStatus(val code: Double) {
    TEMPERATURE_CHECK(4.7),
    CUVETTE_ABSENT(4.8),
    CUVETTE_PRESENT(4.9),
+    CUVETTE_ABSENTR(5.1),
+    CUVETTE_PRESENTR(5.2),
    CUVETTE_ABSENTS(7.7),
    CUVETTE_PRESENTS(7.8),
-    BUFFER_STARTED(5.1),
-    BUFFER_COMPLETED(5.2),
+    BUFFER_STARTED(5.4),
+    BUFFER_COMPLETED(5.5),
    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 = 35,
+    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 = "",
@@ -110,5 +110,6 @@ data class HemoCubeTestData(
    var cuvetteSize: String? = "",
    var district: String? = "",
    var centerName: String? = "",
-    var ipAddress:String?= ""
+    var ipAddress:String?= "",
+    var configUpdatedRecent: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,6 +14,9 @@
 package com.example.hpostesting.data.repository

 import android.net.Uri
+import android.os.Build
+import android.util.Log
+import androidx.annotation.RequiresApi
 import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
@@ -37,17 +40,18 @@ 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.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
 import java.io.File
 import java.net.ConnectException
 import java.net.SocketTimeoutException
+import java.time.LocalTime
 import javax.inject.Inject
 import javax.inject.Named

@@ -55,11 +59,30 @@ 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.getCurrentFirestore()

+    private val localStg: FirebaseStorage
+        get() = firebaseManager.getCurrentStorage()
+
+
+
+//    // Example function to add data to Firestore , like the basic data as test data
+//    @RequiresApi(Build.VERSION_CODES.O)
+//    fun addtodb(data: String) {
+//        val date = LocalTime.now()
+//        localdb.collection("BasicData")
+//            .add(mapOf("data $date" to data))
+//            .addOnSuccessListener {
+//                Log.d("UPLOAD", "Data uploaded successfully ${localdb.app.name}")
+//            }
+//            .addOnFailureListener { exception ->
+//                Log.d("UPLOAD", "Failed to upload data: ${exception.message}  ${localdb.app.name}")
+//            }
+//    }
    private suspend fun <T : Any> safeApiCall(apiCall: suspend () -> T): Result<T> {
        return try {
            val response = apiCall.invoke()
@@ -108,13 +131,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 +145,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 +160,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 +170,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 +181,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 +195,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 +206,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 +219,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 +237,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 +247,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 +260,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 +270,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 +285,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/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,14 @@ 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.NetworkMonitor
+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 +111,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 +240,12 @@ object AppModule {
    fun provideUsbServiceListener(context: Context): UsbServiceListener {
        return UsbServiceListenerImpl(context)
    }
+
+    @Provides
+    @Singleton
+    fun provideNetworkMonitor(@ApplicationContext context: Context): NetworkMonitor {
+        return NetworkMonitor(context)
+    }
+
+
 }
--- 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,153 @@
+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.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+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)
+
+    private var currentFirestore: FirebaseFirestore = FirebaseFirestore.getInstance()
+    private 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 getCurrentFirestore(): FirebaseFirestore = currentFirestore
+    fun getCurrentStorage(): 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())
+}
+@OptIn(DelicateCoroutinesApi::class)
+fun delayedRestart(context: Context) {
+    GlobalScope.launch(Dispatchers.Main) {
+        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/presentation/dashboard/ItemClickListener.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ItemClickListener.kt
@@ -1,3 +1,4 @@
+package com.example.hpostesting.firebase
 /*
 * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
 * // Notice: All information contained herein is, and remains
@@ -10,9 +11,11 @@
 * // 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
+)

-package com.example.hpostesting.presentation.dashboard
-
-interface ItemClickListener {
-    fun onClick(pos: Int)
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
@@ -19,18 +19,17 @@ 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.LanguageManager
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
+import com.example.hpostesting.data.model.test.TestType
+import com.example.hpostesting.presentation.main_base.DashboardActivity
+import com.example.hpostesting.presentation.hb_test.HBTestActivity
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestActivity
 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
@@ -48,10 +47,9 @@ 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 TAG = "KitScanActivity"
    private lateinit var binding: ActivityKitScanBinding

@@ -134,6 +132,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        sharedPreference = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
        setContentView(binding.root)
        binding.toolbar.title = "Kit Serial Number"
+        fromWhere = intent.getStringExtra("fromWhere").toString()
        val maxTest = if(sharedPreference.getString(Constants.CUVETTE_SIZE, "10mm").toString() == "2mm"){
            Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE
        }else{
@@ -142,19 +141,22 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        val time = timeDifference(sharedPreference.getString(Constants.KIT_TIME, "").toString())
        val kitNum = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
       // Toast.makeText(this@KitScanActivity,"Test MAx time"+ time+"-Test count-"+kitNum,Toast.LENGTH_SHORT).show()
-
-        if (DataHolder.sampleReadCounter <= maxTest && kitNum != "" && time < Constants.MAX_KIT_TIME) {
+        if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
            moveToNext()
-        } else {
-            Toast.makeText(this@KitScanActivity, "Limit Reached, Use New KIT for testing", Toast.LENGTH_SHORT).show()
-            DataHolder.sampleReadCounter = 0
-            DataHolder.kitSerial = ""
+        }else{
+            if (DataHolder.sampleReadCounter <= maxTest && kitNum != "" && time < Constants.MAX_KIT_TIME) {
+                moveToNext()
+            } else {
+                Toast.makeText(this@KitScanActivity, "Limit Reached, Use New KIT for testing", Toast.LENGTH_SHORT).show()
+                DataHolder.sampleReadCounter = 0
+                DataHolder.kitSerial = ""

-            with(sharedPreference.edit()) {
-                putString(Constants.KIT_NUMBER, "")
-                putString(Constants.BUFFER_VALUE_1, "")
-                putString(Constants.BUFFER_VALUE_2, "")
-                apply()
+                with(sharedPreference.edit()) {
+                    putString(Constants.KIT_NUMBER, "")
+                    putString(Constants.BUFFER_VALUE_1, "")
+                    putString(Constants.BUFFER_VALUE_2, "")
+                    apply()
+                }
            }
        }

@@ -363,22 +365,28 @@ 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 -> {
+                            val i = Intent(applicationContext, TrueHemeTestActivity::class.java)
+                            startActivity(i)
+                        }

-        DataHolder.deviceType.observe(this) { deviceType ->
-            when (deviceType) {
-                Constants.DEVICE_TYPE_HEMOCUBE -> {
-                    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_TEST_RIGHT -> {
-                    val i = Intent(applicationContext, TestRightActivity::class.java)
-                    startActivity(i)
-                }
-
-                Constants.DEVICE_TYPE_TRUEHEME -> {
-                    val i = Intent(applicationContext, HemocubeActivity::class.java)
-                    startActivity(i)
+                        Constants.DEVICE_TYPE_TRUEHEME -> {
+                            val i = Intent(applicationContext, TrueHemeTestActivity::class.java)
+                            startActivity(i)
+                        }
+                    }
                }
            }
        }
--- 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,12 +31,11 @@ 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.example.hpostesting.presentation.main_base.DashboardActivity
 import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationCallback
 import com.google.android.gms.location.LocationRequest
@@ -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)
@@ -111,12 +117,13 @@ 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 checkAndUpdateUsbConnection() {
        val availableDrivers = UsbSerialProber.getDefaultProber()
            .findAllDrivers(getSystemService(Context.USB_SERVICE) as UsbManager)
@@ -220,6 +227,7 @@ class MainActivity : AppCompatActivity() {
        binding.cvItem1.setOnClickListener {
            DataHolder.selectedTestType = TestType.SICKLECERT
            val i = Intent(applicationContext, KitScanActivity::class.java)
+            i.putExtra("fromWhere","Main")
            startActivity(i)
            finish()
        }
@@ -227,6 +235,14 @@ class MainActivity : AppCompatActivity() {
        binding.cvItem2.setOnClickListener {
            DataHolder.selectedTestType = TestType.SICKLEFIND
            val i = Intent(applicationContext, KitScanActivity::class.java)
+            i.putExtra("fromWhere","Main")
+            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()
        }
--- a/app/src/main/java/com/example/hpostesting/presentation/SplashActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/SplashActivity.kt
@@ -28,7 +28,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.main_base.DashboardActivity
 import com.example.hpostesting.util.MyUtils
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivitySplashBinding
--- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
@@ -29,7 +29,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
 import com.google.firebase.firestore.FirebaseFirestore
@@ -42,7 +42,7 @@ import java.util.Locale

 class UserListAdapter(
    private val context: Context,
-    private val hemoCubeViewModel: HemoCubeViewModel,
+    private val trueHemeTestViewModel: TrueHemeTestViewModel,
    options: FirestoreRecyclerOptions<UserData>,
    private val view: View,
    private val batLevel: Int,
--- a/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt
@@ -31,7 +31,7 @@ import androidx.fragment.app.Fragment
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestActivity
 import `in`.sminnovations.hpostesting.databinding.FragmentAssuranceControlsBinding
 import java.time.Instant

@@ -259,7 +259,7 @@ class AssuranceControlsFragment : Fragment() {
                apply()
            }

-            val i = Intent(requireContext(), HemocubeActivity::class.java)
+            val i = Intent(requireContext(), TrueHemeTestActivity::class.java)
            startActivity(i)
        }
    }
--- a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt
@@ -29,8 +29,8 @@ import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.main_base.DashboardActivity
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.R
@@ -44,7 +44,7 @@ import kotlin.math.log10
 class HemoCubeBufferCheckFragment : Fragment() {

    private lateinit var binding: FragmentHemoCubeReferenceBinding
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private val trueHemeTestViewModel: TrueHemeTestViewModel by activityViewModels()
    private lateinit var sharedPreferences: SharedPreferences
    private var currentDeviceData: DeviceData? = null
    private var resultData: String = ""
@@ -123,13 +123,13 @@ class HemoCubeBufferCheckFragment : Fragment() {
    }

    private fun observeViewModel() {
-        hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
+        trueHemeTestViewModel.deviceData.observe(viewLifecycleOwner) {
            currentDeviceData = it
        }

-        hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
+        trueHemeTestViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
            if (isNetworkAvailable) {
-                hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
+                trueHemeTestViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
            } else {
                Toast.makeText(
                    requireContext(), R.string.internt_not, Toast.LENGTH_SHORT
@@ -137,7 +137,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
            }
            isOnline = isNetworkAvailable
        }
-        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
+        trueHemeTestViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
            if (result == "Success") {
                showToast(R.string.kit_uploaded)
            }
@@ -152,11 +152,11 @@ class HemoCubeBufferCheckFragment : Fragment() {
            binding.progressBar.visibility = View.GONE
        }

-        hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
+        trueHemeTestViewModel.messages.observe(viewLifecycleOwner) {
            binding.tvSubtitle4.text = it
        }

-        hemoCubeViewModel.deviceMessages.observe(viewLifecycleOwner) {
+        trueHemeTestViewModel.deviceMessages.observe(viewLifecycleOwner) {
            binding.tvDeviceMessages.text = it
        }
    }
@@ -192,7 +192,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
        }

        resultData += stringData
-        hemoCubeViewModel.deviceMessages.postValue(resultData)
+        trueHemeTestViewModel.deviceMessages.postValue(resultData)

        when {
            stringData.contains("SN") -> {
@@ -209,11 +209,11 @@ class HemoCubeBufferCheckFragment : Fragment() {
                    binding.tvSubtitle4.visibility = View.VISIBLE
                    binding.btnPlacebuffer.visibility = View.VISIBLE
                }
-                hemoCubeViewModel.messages.postValue("Start")
+                trueHemeTestViewModel.messages.postValue("Start")
            }

            stringData.contains("#BS") -> {
-                hemoCubeViewModel.messages.postValue("Buffer Started")
+                trueHemeTestViewModel.messages.postValue("Buffer Started")
            }

            stringData.contains("#BC") -> {
@@ -232,7 +232,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
            }

            stringData.contains("#SC") -> {
-                hemoCubeViewModel.messages.postValue("Sample Completed \nGathering data")
+                trueHemeTestViewModel.messages.postValue("Sample Completed \nGathering data")
                fetchResult()
            }

@@ -351,7 +351,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
            }

            val prdClassification = absorbanceBasedClassification(_predictedDenovixRatio)
-            hemoCubeViewModel.messages.postValue(prdClassification)
+            trueHemeTestViewModel.messages.postValue(prdClassification)

            val bufferData = BufferCheckData(
                _id = UUID.randomUUID().toString(),
@@ -385,15 +385,15 @@ class HemoCubeBufferCheckFragment : Fragment() {
                testTime = SimpleDateFormat(
                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                ).format(Calendar.getInstance().time),
-                batteryLevel = hemoCubeViewModel.getBatteryLevel().toString(),
-                batteryCapacity = hemoCubeViewModel.getBatteryCapacity(requireContext()).toString(),
-                batteryMaxCapacity = hemoCubeViewModel.getBatteryMaxCapacity(requireContext())
+                batteryLevel = trueHemeTestViewModel.getBatteryLevel().toString(),
+                batteryCapacity = trueHemeTestViewModel.getBatteryCapacity(requireContext()).toString(),
+                batteryMaxCapacity = trueHemeTestViewModel.getBatteryMaxCapacity(requireContext())
                    .toString(),
-                batteryTemperature = hemoCubeViewModel.getBatteryTemperature().toString(),
-                batteryVoltage = hemoCubeViewModel.getBatteryVoltage(requireContext()).toString()
+                batteryTemperature = trueHemeTestViewModel.getBatteryTemperature().toString(),
+                batteryVoltage = trueHemeTestViewModel.getBatteryVoltage(requireContext()).toString()
            )

-            hemoCubeViewModel.uploadHemoCubeResultToDatabaseForBufferCheck(isOnline, bufferData)
+            trueHemeTestViewModel.uploadHemoCubeResultToDatabaseForBufferCheck(isOnline, bufferData)
        } catch (e: Exception) {
            Toast.makeText(
                requireContext(), "Error while processing device data", Toast.LENGTH_SHORT
@@ -404,7 +404,7 @@ class HemoCubeBufferCheckFragment : Fragment() {

    private fun findResult(calculatedRatio: Double?): String {
        try {
-            hemoCubeViewModel.messages.postValue("result classification")
+            trueHemeTestViewModel.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"
@@ -426,7 +426,7 @@ class HemoCubeBufferCheckFragment : Fragment() {

    private fun absorbanceBasedClassification(predictedDenovixRatio: Double?): String {
        try {
-            hemoCubeViewModel.messages.postValue("result classification")
+            trueHemeTestViewModel.messages.postValue("result classification")
            if (predictedDenovixRatio != null) {
                if (predictedDenovixRatio in 0.0..0.16) return "Kit Passed"
                if (predictedDenovixRatio in 0.16..0.165) return "Kit Passed"
@@ -482,20 +482,20 @@ class HemoCubeBufferCheckFragment : Fragment() {
    }

    private fun getDeviceInfo() {
-        hemoCubeViewModel.progressBar.postValue(true)
+        trueHemeTestViewModel.progressBar.postValue(true)
        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(
            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {
                    data?.let {
                        val stringData = String(it)
-                        hemoCubeViewModel.messages.postValue(stringData)
+                        trueHemeTestViewModel.messages.postValue(stringData)
                        binding.tvSubtitle4.text = stringData
                    }
                }

                override fun onUsbError(e: Exception?) {
-                    hemoCubeViewModel.progressBar.postValue(false)
+                    trueHemeTestViewModel.progressBar.postValue(false)
                }
            })
    }
--- a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemocubeBufferCheckActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemocubeBufferCheckActivity.kt
@@ -36,7 +36,7 @@ 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.LanguageManager
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -47,7 +47,7 @@ import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
@AndroidEntryPoint
 open class HemocubeBufferCheckActivity : AppCompatActivity() {
    private lateinit var binding: ActivityHemocubeBinding
-    private val viewModel by viewModels<HemoCubeViewModel>()
+    private val viewModel by viewModels<TrueHemeTestViewModel>()
    private var myMenu: Menu? = null

    private lateinit var mDriver: UsbSerialDriver
--- a/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt
@@ -31,7 +31,7 @@ import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.calibration.CalibrationData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.main_base.DashboardActivity
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentCalibrationBinding
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt
@@ -1,171 +0,0 @@
-/*
- * // 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.dashboard
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-import androidx.preference.ListPreference
-import androidx.preference.Preference
-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 `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
-
-private var isLanguageChanged = false
-
-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)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME,""))
-
-        selectedItem = sharedPreferences.getString(Constants.CUVETTE_SIZE,"10mm").toString()
-
-        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
-            ).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"){
-            pos = 0
-        }else{
-            pos = 1
-        }
-
-        binding.spinnerCuvette.adapter = adapter
-        binding.spinnerCuvette.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                // Handle item selection here
-                selectedItem = values[position]
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                // Do nothing here
-            }
-        }
-        binding.spinnerCuvette.setSelection(pos)
-        binding.btnAddSize.setOnClickListener {
-            with(sharedPreferences.edit()) {
-                putString(Constants.CUVETTE_SIZE, selectedItem)
-                apply()
-            }
-            Toast.makeText(requireContext(), "Selected cuvette size: $selectedItem", Toast.LENGTH_SHORT).show()
-        }
-
-        childFragmentManager.beginTransaction().replace(binding.container.id,PrefsFragment()).commit()
-    }
-}
-class PrefsFragment: PreferenceFragmentCompat(){
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
-
-        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")
-
-        languagePreference.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()) + " ]"
-
-        preferenceScreen.addPreference(languagePreference)
-        preferenceScreen.addPreference(appVersionPreference)
-        setPreferenceScreen(preferenceScreen)
-        if (isLanguageChanged) {
-            Toast.makeText(requireContext(), R.string.language_update, Toast.LENGTH_SHORT).show()
-        }
-
-    }
-    private fun updateLanguage(context: Context, languageCode: String) {
-        LanguageManager.persistLanguagePreference(context, languageCode)
-        LanguageManager.setLocale(context, languageCode)
-        requireActivity().recreate() // Recreate activity to apply language changes
-        isLanguageChanged = true
-    }
-    private fun getAppVersion(context: Context): String {
-        return try {
-            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-            pInfo.versionName
-        } catch (e: PackageManager.NameNotFoundException) {
-            "N/A"
-        }
-    }
-
-    private fun getAppEnvironment(context: Context): String {
-        return try {
-            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-            pInfo.packageName.substringAfterLast('.')
-        } catch (e: PackageManager.NameNotFoundException) {
-            "N/A"
-        }
-    }
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/gallery/GalleryViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/gallery/GalleryViewModel.kt
@@ -1,26 +0,0 @@
-/*
- * // 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.dashboard.ui.gallery
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-
-class mGalleryViewModel : ViewModel() {
-
-    private val _text = MutableLiveData<String>().apply {
-        value = "This is gallery Fragment"
-    }
-    val text: LiveData<String> = _text
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/slideshow/SlideshowViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/slideshow/SlideshowViewModel.kt
@@ -1,26 +0,0 @@
-/*
- * // 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.dashboard.ui.slideshow
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-
-class SlideshowViewModel : ViewModel() {
-
-    private val _text = MutableLiveData<String>().apply {
-        value = "This is slideshow Fragment"
-    }
-    val text: LiveData<String> = _text
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt
@@ -26,14 +26,14 @@ import androidx.lifecycle.MutableLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDeviceBinding

 class DeviceFragment : Fragment() {
    private lateinit var binding: FragmentDeviceBinding
-    private val deviceViewModel: HemoCubeViewModel by activityViewModels()
+    private val deviceViewModel: TrueHemeTestViewModel by activityViewModels()
    private lateinit var sharedPreferences: SharedPreferences
    private var deviceId = ""
    private var startListening = MutableLiveData(false)
--- 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
@@ -34,13 +33,11 @@ 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.main_base.DashboardActivity
 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 = ""
@@ -248,11 +245,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/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,399 @@
+/*
+ * // 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.diagnostics.DiagnosticsData
+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.FragmentAutoDacBinding
+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?) {
+                }
+
+                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?) {
+                }
+
+                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?) {
+                }
+
+                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,87 @@
+/*
+ * // 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 -> {}
+                }
+            } catch (e: Exception) {
+                fireBaseUpload.postValue("Error")
+            }
+        }
+    }
+    fun addAutoDacDataToDb(data: DiagnosticsData) {
+        viewModelScope.launch {
+            try {
+                when (val response = 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/main_base/AboutFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/AboutFragment.kt
@@ -11,29 +11,14 @@
 * // from ShanMukha Innovations Pvt. Ltd.
 */

-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base

-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 `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/main_base/ActivitiesFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/ActivitiesFragment.kt
@@ -11,32 +11,28 @@
 * // from ShanMukha Innovations Pvt. Ltd.
 */

-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base

 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 com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 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
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private val trueHemeTestViewModel: TrueHemeTestViewModel by activityViewModels()
    private lateinit var adapter: OfflineUserListAdapter

    override fun onCreateView(
@@ -50,9 +46,15 @@ class ActivitiesFragment : Fragment() {
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)

-        hemoCubeViewModel.allPendingUserToUpload.observe(viewLifecycleOwner) { userData ->
+        trueHemeTestViewModel.allPendingUserToUpload.observe(viewLifecycleOwner) { userData ->

            if (userData.isNotEmpty()) {
+                userData.forEach { user ->
+                    if((isBetween15And30Minutes(user.incubationTime) > 30 || isBetween15And30Minutes(user.incubationTime) < 0 ) && user.testStatus == false){
+                        trueHemeTestViewModel.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/main_base/AppVersionTapManage.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/AppVersionTapManage.kt
@@ -0,0 +1,18 @@
+package com.example.hpostesting.presentation.main_base
+
+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/main_base/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/HomeFragment.kt
@@ -11,7 +11,7 @@
 * // from ShanMukha Innovations Pvt. Ltd.
 */

-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base

 import android.annotation.SuppressLint
 import android.app.AlertDialog
@@ -24,11 +24,12 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
 import android.net.Uri
 import android.os.BatteryManager
 import android.os.Build
 import android.os.Bundle
-import android.os.Environment
 import android.provider.Settings
 import android.util.Base64
 import android.util.Log
@@ -41,6 +42,7 @@ import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.DataHolder
@@ -57,7 +59,7 @@ import com.example.hpostesting.presentation.KitScanActivity
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.adapter.UserListAdapter
 import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.presentation.testRight.TestRightViewModel
 import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
 import com.example.hpostesting.presentation.utils.UsbServiceListener
@@ -71,10 +73,9 @@ import com.google.firebase.perf.ktx.performance
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
-import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import okhttp3.ResponseBody
 import org.json.JSONObject
 import java.io.BufferedOutputStream
@@ -88,7 +89,6 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
-import java.util.Scanner
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import kotlin.properties.Delegates
@@ -100,12 +100,12 @@ class HomeFragment : Fragment() {
    private var downloadId: Long = 0
    private lateinit var binding: FragmentHomeBinding
    private val viewModel: TestRightViewModel by activityViewModels()
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private val trueHemeTestViewModel: TrueHemeTestViewModel by activityViewModels()
    private lateinit var rvAdapter: UserListAdapter
    private var batLevel: Int =
        0 // Initialize with a default value, or obtain the actual battery level
    private lateinit var adapter: OfflineUserListAdapter
-    private val homeViewModel: HemoCubeViewModel by activityViewModels()
+    private val homeViewModel: TrueHemeTestViewModel by activityViewModels()
    private var isTokenAvailable by Delegates.notNull<Boolean>()
    private var natsToken: String = ""
    private var deviceId: String = ""
@@ -138,7 +138,8 @@ class HomeFragment : Fragment() {
        viewModel.allUserData.observe(viewLifecycleOwner) { userData ->
            deleteIncompleteRegistrations(userData)
        }
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
+       // getLocationIP()
+        trueHemeTestViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
            deleteHemoCubeIncompleteRegistrations(userData)
            if (userData.isNotEmpty()) {
                val userList = mutableListOf<HemoCubeTestData>()
@@ -169,11 +170,12 @@ class HomeFragment : Fragment() {
 //        }


-        hemoCubeViewModel.fireBaseBulkUpload.observe(viewLifecycleOwner) { result ->
+        trueHemeTestViewModel.fireBaseBulkUpload.observe(viewLifecycleOwner) { result ->
            if (result == "Success") {
                Toast.makeText(
                    requireContext(), R.string.test_upload, Toast.LENGTH_SHORT
                ).show()
+                trueHemeTestViewModel.fireBaseBulkUpload.postValue("Done")
            }
            if (result == "Error") {
                Toast.makeText(requireContext(), R.string.test_upload_failed, Toast.LENGTH_SHORT)
@@ -191,26 +193,27 @@ class HomeFragment : Fragment() {
 //        binding.uploadData.setOnClickListener {
 ////            showUploadDialog(requireContext())
 //        }
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
-            if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
-                val btnSaveLocalVisibility =
-                    if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE
-                binding.downloadCSV.visibility = btnSaveLocalVisibility
-                binding.downloadCSV.setOnClickListener {
-                    if (btnSaveLocalVisibility == View.VISIBLE) {
-                        // Execute the action when the button is visible (testStatus is true for at least one user)
-                        showDownloadDialog(requireContext())
-                    } else {
-                        // Handle the case when the button is not visible
-                        Toast.makeText(
-                            requireContext(),
-                            "No test details stored locally",
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    }
+        trueHemeTestViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
+//            if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+//
+//            }else{
+//                binding.downloadCSV.visibility = View.GONE
+//            }
+            val btnSaveLocalVisibility =
+                if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE
+            binding.downloadCSV.visibility = btnSaveLocalVisibility
+            binding.downloadCSV.setOnClickListener {
+                if (btnSaveLocalVisibility == View.VISIBLE) {
+                    // Execute the action when the button is visible (testStatus is true for at least one user)
+                    showDownloadDialog(requireContext())
+                } else {
+                    // Handle the case when the button is not visible
+                    Toast.makeText(
+                        requireContext(),
+                        "No test details stored locally",
+                        Toast.LENGTH_SHORT
+                    ).show()
                }
-            }else{
-                binding.downloadCSV.visibility = View.GONE
            }
        }

@@ -232,7 +235,10 @@ class HomeFragment : Fragment() {
 //                putInt(Constants.KIT_COUNT, 0)
 //                apply()
 //            }
-            startActivity(Intent(requireContext(), KitScanActivity::class.java))
+            DataHolder.selectedTest = null
+            val intent = Intent(requireContext(), KitScanActivity::class.java)
+            intent.putExtra("fromWhere","Home")
+            startActivity(intent)
           // requireActivity().finish()
        }
        binding.btnQuickCapture.setOnClickListener {
@@ -256,10 +262,43 @@ class HomeFragment : Fragment() {
        checkNetworkStatus()

    }
+//    private fun getLocationIP() {
+//        try {
+//            if (isInternetAvailable(requireContext())) {
+//                getPublicIpAddr { ipAddress ->
+//                    if (ipAddress != "fail") {
+//                        DataHolder.ipAddress = ipAddress
+//                        with(sharedPreference.edit()) {
+//                            putString(Constants.IP_ADDRESS, ipAddress)
+//                            apply()
+//                        }
+//                    } else {
+//                        Log.e("Home", "Failed to get public IP address")
+//                    }
+//                }
+//            } else {
+//                Log.e("Home", "Internet is not available")
+//            }
+//        } catch (e: UnknownHostException) {
+//            Log.e("Home", "UnknownHostException: Unable to resolve host. Network might be unavailable or DNS server is not reachable", e)
+//        } catch (e: Exception) {
+//            Log.e("Home", "Network Problem", e)
+//        }
+//    }
+
    @RequiresApi(Build.VERSION_CODES.P)
    private fun checkNetworkStatus() {
-        hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isConnected ->
+        trueHemeTestViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isConnected ->
           // Toast.makeText(requireContext(),"connected"+isConnected+wasConnected, Toast.LENGTH_SHORT).show()
+            if(isConnected){
+                binding.tvTitleNoInternet.text = "Please enter the user id and select blood group to start the test."
+                binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.internet))
+                binding.internetNotAvailableCL.visibility = View.VISIBLE
+            }else{
+                binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.off))
+                binding.tvTitleNoInternet.text = getString(R.string.internet_not_available_please_enter_the_user_id_manually)
+                binding.internetNotAvailableCL.visibility = View.VISIBLE
+            }
            if (isConnected != wasConnected) {
                if (isConnected) {
                    binding.tvTitleNoInternet.text = "Please enter the user id and select blood group to start the test."
@@ -339,9 +378,11 @@ class HomeFragment : Fragment() {

                                }*/
                    if(Constants.MOLBIO_INTEGRATION){
-                        hemoCubeViewModel.sendDataToMolbio()
+                        trueHemeTestViewModel.sendDataToMolbio()
+                    }
+                    if(Constants.FIREBASE_INTEGRATION) {
+                        trueHemeTestViewModel.sendDataToFirebase()
                    }
-                    hemoCubeViewModel.sendDataToFirebase()

                } else {
                    binding.tvTitleNoInternet.text = getString(R.string.internet_not_available_please_enter_the_user_id_manually)
@@ -372,7 +413,8 @@ class HomeFragment : Fragment() {
        var userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
        deviceId = sharedPreference.getString(Constants.DEVICE_ID, "").toString()

-        val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+       // val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+        val target = File(requireContext().getExternalFilesDir(null), "HPOSDocuments")
        val file = File(target, "credentials.txt")      //this file contains userID and password to communicate with API.

        if (userID.isNotEmpty() && password.isNotEmpty()) {
@@ -392,7 +434,7 @@ class HomeFragment : Fragment() {
                   // hemoCubeViewModel.login(createLoginRequestData(userID, password))
                    //hemoCubeViewModel.startPeriodicCheckUpdate()
                }else{
-                    hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
+                    trueHemeTestViewModel.checkUpdate(createCheckUpdateRequestData())
                }
                //isTokenAvailable = true
               // hemoCubeViewModel.startPeriodicCheckUpdate()
@@ -418,7 +460,7 @@ class HomeFragment : Fragment() {
                    callLogin(userID, password)
                    //hemoCubeViewModel.login(createLoginRequestData(userID, password))
                }else{
-                    hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
+                    trueHemeTestViewModel.checkUpdate(createCheckUpdateRequestData())
                }
            }
        } else {
@@ -429,7 +471,7 @@ class HomeFragment : Fragment() {
            ).show()
        }

-        hemoCubeViewModel.loginResponse.observe(viewLifecycleOwner) { response ->
+        trueHemeTestViewModel.loginResponse.observe(viewLifecycleOwner) { response ->
            when (response) {
                is Result.Success -> {
                    updateTokens(response)
@@ -460,14 +502,14 @@ class HomeFragment : Fragment() {
            }
        }

-        hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
+        trueHemeTestViewModel.resultUpload.observe(viewLifecycleOwner) {
            when (it) {
                is Result.Success -> {

                    Log.d("success,", "uploded")
                    it.data.data?.forEach { id ->
                        id.rawData?.let { it1 ->
-                            hemoCubeViewModel.updateMolbioFlag(
+                            trueHemeTestViewModel.updateMolbioFlag(
                                it1._id
                            )
                        }
@@ -494,7 +536,7 @@ class HomeFragment : Fragment() {
            }
        }

-        hemoCubeViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
+        trueHemeTestViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
            when (response) {
                is Result.Success -> {
 //                    Toast.makeText(
@@ -524,7 +566,7 @@ class HomeFragment : Fragment() {
            }
        }

-        hemoCubeViewModel.checkUpdate.observe(viewLifecycleOwner) { response ->
+        trueHemeTestViewModel.checkUpdate.observe(viewLifecycleOwner) { response ->
            when (response) {
                is Result.Success -> {
                    val updatedversion = response.data.data?.version.toString()
@@ -550,7 +592,7 @@ class HomeFragment : Fragment() {
                    Log.d("versionnow", currentversion.toString())
                    Log.d("versionnow", updatedversion.toString())
                    if (updatedversion > currentversion.toString()) {
-                        hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
+                        trueHemeTestViewModel.deviceUpdate(createDeviceUpdateRequestData())
                        Toast.makeText(
                            activity,
                            "new version ${response.data.data?.version} Available",
@@ -586,7 +628,7 @@ class HomeFragment : Fragment() {
            }
        }

-        hemoCubeViewModel.downloadcertificate.observe(viewLifecycleOwner) { response ->
+        trueHemeTestViewModel.downloadcertificate.observe(viewLifecycleOwner) { response ->
            when (response) {
                is Result.Success -> {
                    val url = response.data
@@ -672,9 +714,10 @@ class HomeFragment : Fragment() {
            requireActivity().packageName, 0
        )
        val version = pInfo.versionName
-        var labname = sharedPreference.getString(Constants.LABNAME,"")
+        val labname = sharedPreference.getString(Constants.CENTER_NAME,"")
+        val ip = sharedPreference.getString(Constants.IP_ADDRESS,"")
        return LoginRequest(
-            location = DataHolder.ipAddress, password = password, serialNumber = userID, username = userID, version = version, lab = labname
+            location = ip, password = password, serialNumber = userID, username = userID, version = version, lab = labname
        )
    }
    private fun createCheckUpdateRequestData(): CheckUpdateRequest {
@@ -753,17 +796,72 @@ class HomeFragment : Fragment() {
    private fun setUserId() {
        binding.btnSubmit.setOnClickListener {
            val userId = binding.userId.text.toString()
-            val bloodGroup = binding.etBloodGroup.text
-            if (userId.length >= 10 && !bloodGroup.equals("Select Blood Group") || !bloodGroup.isNullOrBlank()) {
-                hemoCubeViewModel.addUser(
-                    HemoCubeTestData(
-                        _id = userId,
-                        bloodGroup = bloodGroup.toString(),
-                        incubationTime = SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                        ).format(Calendar.getInstance().time).toString()
-                    )
-                )
+            DataHolder.sampleId = userId
+            val age = binding.age.text.toString()
+            DataHolder.age = age
+            val bloodGroup = binding.etBloodGroup.text.toString()
+            DataHolder.bloodGroup = bloodGroup
+
+//            if (userId.length >= 5 && bloodGroup != "Select Blood Group") {
+//                DataHolder.selectedTest = UserData(
+//                    _id = userId,
+//                    bloodGroup = bloodGroup,
+//                    incubationTime = SimpleDateFormat(
+//                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+//                        ).format(Calendar.getInstance().time).toString()
+//                )
+//                findNavController().navigate(R.id.action_nav_home_to_mainActivity)
+            if (userId.length >= 5 && bloodGroup.isNotEmpty() && age.isNotEmpty()) {
+                lifecycleScope.launch {
+                    // Add user first, ensuring it's done before fetching the user
+                    withContext(Dispatchers.IO) {
+                        trueHemeTestViewModel.addUser(
+                            HemoCubeTestData(
+                                _id = userId,
+                                age = age,
+                                bloodGroup = bloodGroup,
+                                incubationTime = SimpleDateFormat(
+                                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                                ).format(Calendar.getInstance().time).toString()
+                            )
+                        )
+                    }
+
+                    // Now fetch the user after the addUser operation is complete
+                    val user = withContext(Dispatchers.IO) {
+                        trueHemeTestViewModel.hemoCubeDao.getUserByID(userId)
+                    }
+
+                    user?.let {
+                        DataHolder.selectedTest = UserData(
+                            sampleid = it.sampleid,
+                            _id = it._id,
+                            age = it.age,
+                            bloodGroup = it.bloodGroup,
+                            incubationTime = SimpleDateFormat(
+                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                            ).format(Calendar.getInstance().time).toString()
+                        )
+                        findNavController().navigate(R.id.action_nav_home_to_mainActivity)
+                    } ?: run {
+                        Log.e("Error", "User not found")
+                    }
+                }
+
+//                hemoCubeViewModel.addUser(
+//                    HemoCubeTestData(
+//                        _id = userId,
+//                        bloodGroup = bloodGroup.toString(),
+//                        incubationTime = SimpleDateFormat(
+//                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+//                        ).format(Calendar.getInstance().time).toString()
+//                    )
+//                )
+                Toast.makeText(requireContext(), "Successfully added- $userId", Toast.LENGTH_SHORT).show()
+                binding.userId.setText("")
+                binding.age.setText("")
+                binding.etBloodGroup.setText("")
+
 //                val userData = UserData(_id = userId)
 //                DataHolder.selectedTest = userData
 //                findNavController().navigate(R.id.action_nav_home_to_mainActivity)
@@ -853,7 +951,7 @@ class HomeFragment : Fragment() {
            rvAdapter = view?.let {
                UserListAdapter(
                    requireContext(),
-                    hemoCubeViewModel,
+                    trueHemeTestViewModel,
                    recyclerViewOptions,
                    it,
                    batLevel,
@@ -922,7 +1020,7 @@ class HomeFragment : Fragment() {
        rvAdapter = view?.let {
            UserListAdapter(
                requireContext(),
-                hemoCubeViewModel,
+                trueHemeTestViewModel,
                recyclerViewOptions,
                it,
                batLevel,
@@ -998,7 +1096,7 @@ class HomeFragment : Fragment() {
    }

    private fun checkUnprocessedCSVData() {
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+        trueHemeTestViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
            if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
                val downloadDataVisibility =
                    if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.VISIBLE else View.GONE
@@ -1119,7 +1217,7 @@ class HomeFragment : Fragment() {

    private fun downloadLocalDBData(dialog: DialogInterface) {
        var csvDownloaded = false
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+        trueHemeTestViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->

 //
 //            userDataList.forEach { userData ->
@@ -1158,7 +1256,7 @@ class HomeFragment : Fragment() {

                    if (downloadList.isNotEmpty()) {
                        // Call ViewModel function to create CSV with filtered data
-                        hemoCubeViewModel.createCSV(downloadList, requireContext())
+                        trueHemeTestViewModel.createCSV(downloadList, requireContext())
                        csvDownloaded = true
                        Toast.makeText(
                            requireContext(),
@@ -1190,19 +1288,19 @@ class HomeFragment : Fragment() {
    private fun deleteHemoCubeIncompleteRegistrations(userDataList: List<HemoCubeTestData>) {
        userDataList.forEach { userData ->
            if (userData._id.isEmpty()) {
-                hemoCubeViewModel.deleteById(userData._id)
+                trueHemeTestViewModel.deleteById(userData._id)
            }
        }
    }

    override fun onDestroyView() {
        super.onDestroyView()
-        hemoCubeViewModel.networkStatusLiveData.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.allKitTestData.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.allUserData.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.uploadLogs.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.checkUpdate.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.downloadcertificate.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.networkStatusLiveData.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.allKitTestData.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.allUserData.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.uploadLogs.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.checkUpdate.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.downloadcertificate.removeObservers(viewLifecycleOwner)
    }

    private fun downloadCsv() {
@@ -1509,34 +1607,64 @@ class HomeFragment : Fragment() {
        super.onDestroy()

    }
-    @OptIn(DelicateCoroutinesApi::class)
    private fun getPublicIpAddr(callback: (String) -> Unit) {
-        try {
-            GlobalScope.launch(Dispatchers.IO) {
+        lifecycleScope.launch(Dispatchers.IO) {
+            try {
                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()
-                            Log.d("ipaddress",DataHolder.ipAddress)
+                        val inputStream = conn.inputStream
+                        val ipAddress = inputStream.bufferedReader().use { it.readText() }
+                        inputStream.close()
+                        withContext(Dispatchers.Main) {
                            callback(ipAddress)
-                        }else{
+                        }
+                    } else {
+                        withContext(Dispatchers.Main) {
                            callback("fail")
                        }
                    }
                } finally {
                    conn.disconnect()
                }
+            } catch (e: Exception) {
+                Log.e("getPublicIpAddr", e.toString())
+                withContext(Dispatchers.Main) {
+                    callback("fail")
+                }
            }
-        }catch (e: Exception){
-            Log.e("home",e.toString())
-            callback("fail")
        }
    }
+//    @OptIn(DelicateCoroutinesApi::class)
+//    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()
+//                            Log.d("ipaddress",DataHolder.ipAddress)
+//                            callback(ipAddress)
+//                        }else{
+//                            callback("fail")
+//                        }
+//                    }
+//                } finally {
+//                    conn.disconnect()
+//                }
+//            }
+//        }catch (e: Exception){
+//            Log.e("home",e.toString())
+//            callback("fail")
+//        }
+//    }

    private fun callLogin(userID: String, password: String) {
        if(DataHolder.ipAddress == "0.0"){
@@ -1548,10 +1676,10 @@ class HomeFragment : Fragment() {
                        apply()
                    }
                }
-                hemoCubeViewModel.login(createLoginRequestData(userID, password))
+                trueHemeTestViewModel.login(createLoginRequestData(userID, password))
            }
        }else{
-            hemoCubeViewModel.login(createLoginRequestData(userID, password))
+            trueHemeTestViewModel.login(createLoginRequestData(userID, password))
        }
    }
    private fun timeDifference(createdAt: String): Long {
@@ -1568,7 +1696,24 @@ class HomeFragment : Fragment() {

        return diffMillis / (60 * 1000)  // Convert milliseconds to minutes
    }
-
+    private fun isInternetAvailable(context: Context): Boolean {
+        val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val network = connectivityManager.activeNetwork ?: return false
+            val activeNetwork = connectivityManager.getNetworkCapabilities(network) ?: return false
+            return when {
+                activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
+                activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
+                activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
+                else -> false
+            }
+        } else {
+            @Suppress("DEPRECATION")
+            val networkInfo = connectivityManager.activeNetworkInfo ?: return false
+            @Suppress("DEPRECATION")
+            return networkInfo.isConnected
+        }
+    }


 }
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
@@ -11,7 +11,7 @@
 * // from ShanMukha Innovations Pvt. Ltd.
 */

-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base

 import android.annotation.SuppressLint
 import android.content.Context
@@ -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,25 +32,22 @@ 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.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.data.repository.DatabaseRepository
+import com.example.hpostesting.firebase.FirebaseManager
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 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 dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.BuildConfig
 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 onMessageReceived(topic: String, message: String)
@@ -64,7 +60,8 @@ open interface IDataCollector: NatsMessageCallback {

@AndroidEntryPoint
 class DashboardActivity : AppCompatActivity(), IDataCollector {
-
+    @Inject
+    lateinit var databaseRepository: DatabaseRepository
    val TAG = "DashboardActivity"
    private var isRegistered = false
    private lateinit var appBarConfiguration: AppBarConfiguration
@@ -72,9 +69,10 @@ 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()
+    private val hemocubeViewModel: TrueHemeTestViewModel by viewModels()

    override fun attachBaseContext(newBase: Context?) {
        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
@@ -82,6 +80,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        super.attachBaseContext(newBase)
    }

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

@@ -91,12 +90,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()
        }
@@ -105,7 +107,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


@@ -127,8 +129,8 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
                    input.copyTo(output)
                }
            }
-
        }
+
        hemocubeViewModel.deviceUpdateheader.observe(this){
            val apkFile = File(getExternalFilesDir("Downloads"), "update.apk")
            val expectedChecksum = it.get("Checksum") // Provide your expected checksum here
@@ -163,6 +165,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)
@@ -288,6 +296,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        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/GalleryFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/GalleryFragment.kt
@@ -11,7 +11,7 @@
 * // from ShanMukha Innovations Pvt. Ltd.
 */

-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base

 import android.annotation.SuppressLint
 import android.content.ComponentName
@@ -28,16 +28,16 @@ import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.presentation.autodac.AutoDacActivity
 import com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity
 import com.example.hpostesting.presentation.calibration.CalibrationActivity
-import com.example.hpostesting.presentation.dashboard.ui.PasswordResetActivity
+import com.example.hpostesting.presentation.main_base.ui.PasswordResetActivity
 import com.example.hpostesting.presentation.deviceinfo.DeviceActivity
 import com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity
 import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.presentation.usb_teminal.UsbTerminalActivity
 import `in`.sminnovations.hpostesting.databinding.FragmentGalleryBinding


-class GalleryFragment : Fragment() {
+class PanelFragment : Fragment() {

    private var _binding: FragmentGalleryBinding? = null
    private lateinit var sharedPreferences: SharedPreferences
@@ -49,7 +49,7 @@ class GalleryFragment : Fragment() {

    private lateinit var sharedPreference: SharedPreferences

-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private val trueHemeTestViewModel: TrueHemeTestViewModel by activityViewModels()

    @SuppressLint("SetTextI18n")
    override fun onCreateView(
--- a/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt
@@ -0,0 +1,277 @@
+/*
+ * // 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.main_base
+
+import android.app.AlertDialog
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.preference.ListPreference
+import androidx.preference.Preference
+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.repository.DatabaseRepository
+import com.example.hpostesting.firebase.FirebaseConfig
+import com.example.hpostesting.firebase.FirebaseManager
+import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
+
+private var isLanguageChanged = false
+
+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)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME, ""))
+
+        selectedItem = sharedPreferences.getString(Constants.CUVETTE_SIZE, "10mm").toString()
+        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
+            ).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") {
+            pos = 0
+        } else {
+            pos = 1
+        }
+
+        binding.spinnerCuvette.adapter = adapter
+        binding.spinnerCuvette.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    parent: AdapterView<*>?, view: View?, position: Int, id: Long
+                ) {
+                    // Handle item selection here
+                    selectedItem = values[position]
+                }
+
+                override fun onNothingSelected(parent: AdapterView<*>?) {
+                    // Do nothing here
+                }
+            }
+        binding.spinnerCuvette.setSelection(pos)
+        binding.btnAddSize.setOnClickListener {
+            with(sharedPreferences.edit()) {
+                putString(Constants.CUVETTE_SIZE, selectedItem)
+                apply()
+            }
+            Toast.makeText(
+                requireContext(), "Selected cuvette size: $selectedItem", Toast.LENGTH_SHORT
+            ).show()
+        }
+
+        childFragmentManager.beginTransaction().replace(binding.container.id, PrefsFragment())
+            .commit()
+    }
+}
+
+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
+
+        // 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)
+
+            onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val languageCode = newValue as String
+                updateLanguage(requireContext(), languageCode)
+                true
+            }
+        }
+        preferenceScreen.addPreference(languagePreference)
+
+        val appVersionPreference = Preference(requireContext()).apply {
+            title = "App Version"
+            summary =
+                getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext())  +"->"+currentServer+"]"
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_info_24)
+
+            setOnPreferenceClickListener {
+                if ((sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN")) {
+                    tapManager.registerTap {
+                        if (!isServerSelectionVisible) {
+                            showServerSelection()
+                        }
+                    }
+                } else {
+
+                }
+                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()
+        isLanguageChanged = true
+    }
+
+    private fun getAppVersion(context: Context): String {
+        return try {
+            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            pInfo.versionName
+        } catch (e: PackageManager.NameNotFoundException) {
+            "N/A"
+        }
+    }
+
+    private fun getAppEnvironment(context: Context): String {
+        return try {
+            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            pInfo.packageName.substringAfterLast('.')
+        } catch (e: PackageManager.NameNotFoundException) {
+            "N/A"
+        }
+    }
+}
+
+
--- a/app/src/main/java/com/example/hpostesting/presentation/main_base/UpdateValuesActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/UpdateValuesActivity.kt
@@ -11,18 +11,13 @@
 * // from ShanMukha Innovations Pvt. Ltd.
 */

-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base

 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.example.hpostesting.data.constant.Constants
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
 import `in`.sminnovations.hpostesting.databinding.ActivityUpdateValuesBinding

 class UpdateValuesActivity : AppCompatActivity() {
--- a/app/src/main/java/com/example/hpostesting/presentation/main_base/ui/LoginFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/ui/LoginFragment.kt
@@ -11,7 +11,7 @@
 * // from ShanMukha Innovations Pvt. Ltd.
 */

-package com.example.hpostesting.presentation.dashboard.ui
+package com.example.hpostesting.presentation.main_base.ui

 import com.example.hpostesting.util.SecureStorage
 import android.accounts.Account
@@ -30,6 +30,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
@@ -75,21 +76,35 @@ class LoginFragment : Fragment() {
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
        init()
-        if(isInternetAvailable()){
-            getPublicIpAddr { ipAddress ->
-                DataHolder.ipAddress = ipAddress
-            }
-            Log.d("ipaddress",DataHolder.ipAddress)
-        }

+//        if(isInternetAvailable()){
+//            getPublicIpAddr { ipAddress ->
+//                DataHolder.ipAddress = ipAddress
+//            }
+//            Log.d("ipaddress",DataHolder.ipAddress)
+//        }
+        setupAutoCompleteTextView()
        //checkLocation()
    }
+    override fun onResume() {
+        super.onResume()
+        setupAutoCompleteTextView()
+    }
+    private fun setupAutoCompleteTextView() {
+        val districts = resources.getStringArray(R.array.district)
+        val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, districts)
+        binding.etDistrict.setAdapter(adapter)
+
+        // Only set the default text if it's empty to avoid resetting user selection
+        if (binding.etDistrict.text.isEmpty()) {
+            binding.etDistrict.setText("Other", false)
+        }
+    }
    private fun init() {
        if (isUserLoggedIn()) {
            navigateToHomeFragment()
            return
        }
-
        binding.btnLogin.setOnClickListener {
         //   Toast.makeText(requireContext(), "$latitude/$longitude",Toast.LENGTH_SHORT).show()
            val loginId = binding.loginId.text.toString().trim()
--- a/app/src/main/java/com/example/hpostesting/presentation/main_base/ui/PasswordResetActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/ui/PasswordResetActivity.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.presentation.dashboard.ui
+package com.example.hpostesting.presentation.main_base.ui

 import com.example.hpostesting.util.SecureStorage
 import android.os.Bundle
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
@@ -13,7 +13,7 @@

 package com.example.hpostesting.presentation.testRight

-import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.main_base.DashboardActivity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -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/testRight/TestRightViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt
@@ -19,7 +19,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.util.NetworkStatusLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.UserDao
 import com.example.hpostesting.data.model.CalculationVariableForTest
@@ -36,6 +35,7 @@ import com.example.hpostesting.domain.SaveRawDataTest
 import com.example.hpostesting.domain.SickleFindResultCaluculationWithMaxImpl
 import com.example.hpostesting.domain.TestRightResultCalculation
 import com.example.hpostesting.util.MyUtils
+import com.example.hpostesting.util.NetworkMonitor
 import com.google.firebase.storage.FirebaseStorage
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
@@ -55,10 +55,10 @@ class TestRightViewModel @Inject constructor(
    private val saveRawDataTest: SaveRawDataTest,
    private val repository: DatabaseRepository,
    private val userDao: UserDao,
+    networkMonitor: NetworkMonitor,
    context: Context?
 ) : ViewModel() {

-
    var isServiceConnected = false
    val progressBar = MutableLiveData(false)

@@ -69,9 +69,8 @@ class TestRightViewModel @Inject constructor(

    var testDetails = DataHolder.selectedTest

-    private val _networkStatusLiveData = context?.let { NetworkStatusLiveData(it) }
-    val networkStatusLiveData: NetworkStatusLiveData?
-        get() = _networkStatusLiveData
+    private var _networkStatusLiveData = networkMonitor.isConnected
+    val networkStatusLiveData = _networkStatusLiveData

    val allUserData = userDao.getAll()

@@ -82,6 +81,11 @@ class TestRightViewModel @Inject constructor(

    val calculationVariableList = ArrayList<CalculationVariableForTest>()

+    init {
+        networkMonitor.startMonitoring()
+        _networkStatusLiveData = networkMonitor.isConnected
+    }
+
    fun mapDeviceConstants(string: String) {
        if (string.isNotEmpty()) {
            val listOfStrings = string.split(",")
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeActivity.kt
@@ -36,8 +36,8 @@ 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.LanguageManager
-import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestFragment
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -48,7 +48,7 @@ import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
@AndroidEntryPoint
 class TrueHemeActivity : AppCompatActivity() {
    private lateinit var binding: ActivityHemocubeBinding
-    private val viewModel by viewModels<HemoCubeViewModel>()
+    private val viewModel by viewModels<TrueHemeTestViewModel>()
    private var myMenu: Menu? = null

    private lateinit var mDriver: UsbSerialDriver
@@ -177,14 +177,14 @@ class TrueHemeActivity : AppCompatActivity() {
    private fun moveToNext() {
        if (supportFragmentManager.isDestroyed) return

-        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeFragment())
+        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, TrueHemeTestFragment())
            .commit()
    }


    override fun onBackPressed() {
        val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
-        if (fragment is HemoCubeFragment) {
+        if (fragment is TrueHemeTestFragment) {
            fragment.handleBackButtonPress()
        } else {
            super.onBackPressed()
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeFragment.kt
@@ -36,8 +36,8 @@ import com.example.hpostesting.data.model.TestState
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
+import com.example.hpostesting.presentation.main_base.DashboardActivity
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import com.google.firebase.crashlytics.ktx.crashlytics
@@ -336,7 +336,7 @@ class TrueHemeFragment : Fragment() {
        startListening.postValue(true)

        try {
-            (activity as HemocubeActivity).mService.listenToHemoCube(object : UsbServiceListener {
+            (activity as TrueHemeTestActivity).mService.listenToHemoCube(object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {
                    data?.let {
                        val stringData = String(it)
@@ -357,7 +357,7 @@ class TrueHemeFragment : Fragment() {

    private fun getDeviceInfo() {
        hemoCubeViewModel.progressBar.postValue(true)
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {
@@ -1067,7 +1067,7 @@ class TrueHemeFragment : Fragment() {
            binding.btnPlacebuffer.visibility = View.GONE
        }

-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
            HemoCubeCommands.START_BUFFER_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {}
@@ -1081,7 +1081,7 @@ class TrueHemeFragment : Fragment() {
    private fun startSampleProcess() {
        hemoCubeViewModel.progressBar.postValue(true)

-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
            HemoCubeCommands.START_SAMPLE,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {}
@@ -1095,7 +1095,7 @@ class TrueHemeFragment : Fragment() {
    private fun sendFirstGainCommand() {
        hemoCubeViewModel.progressBar.postValue(true)

-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
            HemoCubeCommands.FIRST_GAIN_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {}
@@ -1109,7 +1109,7 @@ class TrueHemeFragment : Fragment() {
    private fun sendSecondGainCommand() {
        hemoCubeViewModel.progressBar.postValue(true)

-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
            HemoCubeCommands.SECOND_GAIN_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {}
@@ -1123,7 +1123,7 @@ class TrueHemeFragment : Fragment() {
    private fun sendThirdGainCommand() {
        hemoCubeViewModel.progressBar.postValue(true)

-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
            HemoCubeCommands.THIRD_GAIN_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {}
@@ -1137,7 +1137,7 @@ class TrueHemeFragment : Fragment() {
    private fun sendForthGainCommand() {
        hemoCubeViewModel.progressBar.postValue(true)

-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
            HemoCubeCommands.FORTH_GAIN_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {}
@@ -1151,7 +1151,7 @@ class TrueHemeFragment : Fragment() {
    private fun fetchResult() {
        hemoCubeViewModel.progressBar.postValue(true)

-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
            HemoCubeCommands.PRINT_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {}
@@ -1170,7 +1170,7 @@ class TrueHemeFragment : Fragment() {

    private fun reconnect() {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            (activity as HemocubeActivity).reconnectDevice()
+            (activity as TrueHemeTestActivity).reconnectDevice()
        }
    }
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.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
@@ -46,10 +43,12 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 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.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.NetworkMonitor
+import com.example.hpostesting.util.Result
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -70,20 +69,22 @@ class TrueHemeViewModel @Inject constructor(
    private val repository: Repository,
    private val logFileManager: LogFileManager,
    private val localFileDataSource: LocalFileDataSource,
+    networkMonitor: NetworkMonitor,
    context: Context,
 ) : ViewModel() {
    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)
+    private val sharedPreference = context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)

    private val workManager = WorkManager.getInstance(context)
-
-//    init {
-//        startPeriodicCheckUpdate()
-//    }
+    //    init {
+    //        startPeriodicCheckUpdate()
+    //    }
+    init {
+        networkMonitor.startMonitoring()
+    }

    val loginResponse = MutableLiveData<Result<LoginResponse>>()

@@ -97,7 +98,7 @@ class TrueHemeViewModel @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 = networkMonitor.isConnected
    val allUserData = hemoCubeDao.getAll()
    val allKitTestData = hemoCubeBufferDao.getAll()
    val deviceData = MutableLiveData<DeviceData?>()
@@ -181,7 +182,7 @@ class TrueHemeViewModel @Inject constructor(
        val logFile = logFileManager.createLogFile().let { file ->
            val requestBody = file?.asRequestBody("multipart/form-data".toMediaTypeOrNull())
            val multipartFile =
-                requestBody?.let { MultipartBody.Part.createFormData("logFile", file?.name, it) }
+                requestBody?.let { MultipartBody.Part.createFormData("logFile", file.name, it) }
            multipartFile?.let { partFile ->
                repository.uploadLogs(partFile).let { result ->
                    uploadLogs.postValue(result)
@@ -193,37 +194,35 @@ class TrueHemeViewModel @Inject constructor(
    fun uploadHemoCubeResultToDatabaseForBufferCheck(
        isOnline: Boolean,
        bufferCheckData: BufferCheckData,
-    ) =
-        viewModelScope.launch {
-            if (isOnline) {
-                try {
-                    when (val response =
-                        repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
-                        is Response.Success -> {
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
-                            fireBaseUpload.postValue("Success")
-                            bufferCheckData.localFlag = true
-                            hemoCubeBufferDao.insertAll(bufferCheckData)
-                        }
-
-                        is Response.Error -> {
-                            Log.e("Testdb", "Error uploading data to Firestore: $response")
-                            fireBaseUpload.postValue("Error")
-                            bufferCheckData.localFlag = true
-                            hemoCubeBufferDao.insertAll(bufferCheckData)
-                        }
-
-                        else -> {}
+    ) = viewModelScope.launch {
+        if (isOnline) {
+            try {
+                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
+                    is Response.Success -> {
+                        Log.i("Testdb", "Data uploaded to Firestore successfully")
+                        fireBaseUpload.postValue("Success")
+                        bufferCheckData.localFlag = true
+                        hemoCubeBufferDao.insertAll(bufferCheckData)
                    }
-                } catch (e: Exception) {
-                    Log.e("Testdb", "Exception during data upload: ${e.message}")
-                    fireBaseUpload.postValue("Error")
+
+                    is Response.Error -> {
+                        Log.e("Testdb", "Error uploading data to Firestore: $response")
+                        fireBaseUpload.postValue("Error")
+                        bufferCheckData.localFlag = true
+                        hemoCubeBufferDao.insertAll(bufferCheckData)
+                    }
+
+                    else -> {}
                }
-            } else {
-                hemoCubeBufferDao.insertAll(bufferCheckData)
-                fireBaseUpload.postValue("Local")
+            } catch (e: Exception) {
+                Log.e("Testdb", "Exception during data upload: ${e.message}")
+                fireBaseUpload.postValue("Error")
            }
+        } else {
+            hemoCubeBufferDao.insertAll(bufferCheckData)
+            fireBaseUpload.postValue("Local")
        }
+    }

    fun bulkAddResultKitTestToDb(bufferCheckData: BufferCheckData) {
        viewModelScope.launch {
@@ -287,7 +286,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()
@@ -396,8 +395,7 @@ class TrueHemeViewModel @Inject constructor(
        viewModelScope.launch {
            try {

-                when (val response =
-                    repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
+                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
                    is Response.Success -> {
                        Log.i("Testdb", "Data uploaded to Firestore successfully")
                        fireBaseUpload.postValue("Success")
@@ -415,10 +413,9 @@ class TrueHemeViewModel @Inject constructor(
        }
    }

-    private fun updateBufferLocalFlag(bufferId: String) =
-        viewModelScope.launch {
-            hemoCubeBufferDao.updateFieldById(id = bufferId, true)
-        }
+    private fun updateBufferLocalFlag(bufferId: String) = viewModelScope.launch {
+        hemoCubeBufferDao.updateFieldById(id = bufferId, true)
+    }

    fun getLocalUserDataForCsv(context: Context): Boolean {
        val localUserDataLiveData: LiveData<List<HemoCubeTestData>> = hemoCubeDao.getAll()
@@ -434,7 +431,7 @@ class TrueHemeViewModel @Inject constructor(
                            userData._id,
                            userData.name,
                            userData.bloodGroup,
-                            userData.birthYear,
+                            userData.age,
                            userData.classificationResult,
                            userData.testTime.toString(),
                            userData.userImageURL
@@ -455,16 +452,12 @@ class TrueHemeViewModel @Inject constructor(

    fun getBatteryLevel(): Float? {
        val batteryPct: Float? = batteryStatus?.let { intent ->
-            val level: Int =
-                intent.getIntExtra(
-                    BatteryManager.EXTRA_LEVEL,
-                    -1
-                )
-            val scale: Int =
-                intent.getIntExtra(
-                    BatteryManager.EXTRA_SCALE,
-                    -1
-                )
+            val level: Int = intent.getIntExtra(
+                BatteryManager.EXTRA_LEVEL, -1
+            )
+            val scale: Int = intent.getIntExtra(
+                BatteryManager.EXTRA_SCALE, -1
+            )
            level * 100 / scale.toFloat()
        }

@@ -474,8 +467,7 @@ class TrueHemeViewModel @Inject constructor(
    fun getBatteryTemperature(): Float? {
        val batteryTemp: Float? = batteryStatus?.let { intent ->
            val temperature = intent.getIntExtra(
-                BatteryManager.EXTRA_TEMPERATURE,
-                0
+                BatteryManager.EXTRA_TEMPERATURE, 0
            )
            temperature.toFloat() / 10
        }
@@ -484,14 +476,11 @@ class TrueHemeViewModel @Inject constructor(
    }

    fun getBatteryVoltage(context: Context): Float {
-        val batteryIntent =
-            context.registerReceiver(
-                null,
-                IntentFilter(Intent.ACTION_BATTERY_CHANGED)
-            )
+        val batteryIntent = context.registerReceiver(
+            null, IntentFilter(Intent.ACTION_BATTERY_CHANGED)
+        )
        val voltage = batteryIntent?.getIntExtra(
-            BatteryManager.EXTRA_VOLTAGE,
-            0
+            BatteryManager.EXTRA_VOLTAGE, 0
        ) ?: 0

        // milli-volts to volts
@@ -500,8 +489,7 @@ class TrueHemeViewModel @Inject constructor(


    fun getBatteryCapacity(context: Context): Int {
-        val batteryManager =
-            context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
        val currentCapacity =
            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)

@@ -510,8 +498,7 @@ class TrueHemeViewModel @Inject constructor(

    fun getBatteryMaxCapacity(context: Context): Float {
        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-        val designCapacity =
-            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+        val designCapacity = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
        val currentCapacity =
            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)

@@ -528,8 +515,7 @@ class TrueHemeViewModel @Inject constructor(
                hemoCubeTestData.forEach { data ->
                    data.localFlag = true
                    hemoCubeDao.updateCSVFieldById(
-                        data._id,
-                        true
+                        data._id, true
                    )
                }
            }
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/DigitalCardActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/DigitalCardActivity.kt
@@ -11,7 +11,7 @@
 * // from ShanMukha Innovations Pvt. Ltd.
 */

-package com.example.hpostesting.presentation.hemocube
+package com.example.hpostesting.presentation.trueheme_test

 import android.content.Context
 import android.os.Bundle
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/DigitalCardFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/DigitalCardFragment.kt
@@ -11,7 +11,7 @@
 * // from ShanMukha Innovations Pvt. Ltd.
 */

-package com.example.hpostesting.presentation.hemocube
+package com.example.hpostesting.presentation.trueheme_test

 import android.annotation.SuppressLint
 import android.content.Context
@@ -33,7 +33,7 @@ import java.util.Locale

 class DigitalCardFragment : Fragment() {
    private lateinit var binding: FragmentDigitalCardBinding
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private val trueHemeTestViewModel: TrueHemeTestViewModel by activityViewModels()
    private lateinit var sharedPreferences: SharedPreferences
    private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()

@@ -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/trueheme_test/TrueHemeTestActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestActivity.kt
@@ -11,7 +11,7 @@
 * // from ShanMukha Innovations Pvt. Ltd.
 */

-package com.example.hpostesting.presentation.hemocube
+package com.example.hpostesting.presentation.trueheme_test

 import android.annotation.SuppressLint
 import android.app.PendingIntent
@@ -21,6 +21,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.ServiceConnection
+import android.content.SharedPreferences
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
@@ -35,8 +36,8 @@ import androidx.annotation.RequiresApi
 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.LanguageManager
 import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
@@ -46,11 +47,11 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding

@AndroidEntryPoint
-open class HemocubeActivity : AppCompatActivity() {
+open class TrueHemeTestActivity : AppCompatActivity() {
    private lateinit var binding: ActivityHemocubeBinding
-    private val viewModel by viewModels<HemoCubeViewModel>()
+    private val viewModel by viewModels<TrueHemeTestViewModel>()
    private var myMenu: Menu? = null
-
+    lateinit var sharedPreferences: SharedPreferences
    private lateinit var mDriver: UsbSerialDriver
    private var mConnection: UsbDeviceConnection? = null
    lateinit var mService: UsbService
@@ -191,7 +192,7 @@ open class HemocubeActivity : AppCompatActivity() {
    private fun moveToNext() {
        if (supportFragmentManager.isDestroyed) return

-        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeFragment())
+        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, TrueHemeTestFragment())
            .commit()
    }

@@ -206,7 +207,7 @@ open class HemocubeActivity : AppCompatActivity() {
 //    }
 override fun onBackPressed() {
    val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
-    if (fragment is HemoCubeFragment) {
+    if (fragment is TrueHemeTestFragment) {
        if (fragment.handleBackButtonPress()) {
            // If the fragment handled the back press, return to avoid calling super.onBackPressed
            return
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestFragment.kt
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestViewModel.kt
@@ -11,7 +11,7 @@
 * // from ShanMukha Innovations Pvt. Ltd.
 */

-package com.example.hpostesting.presentation.hemocube
+package com.example.hpostesting.presentation.trueheme_test

 import android.content.Context
 import android.content.Intent
@@ -27,7 +27,6 @@ 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.dao.HemoCubeBufferDao
@@ -50,6 +49,7 @@ 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.NetworkMonitor
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -66,14 +66,16 @@ import javax.inject.Inject

@Suppress("MemberVisibilityCanBePrivate")
@HiltViewModel
-class HemoCubeViewModel @Inject constructor(
-    private val hemoCubeDao: HemoCubeDao,
+class TrueHemeTestViewModel @Inject constructor(
+    val hemoCubeDao: HemoCubeDao,
    private val hemoCubeBufferDao: HemoCubeBufferDao,
    private val repository: Repository,
    private val logFileManager: LogFileManager,
    private val localFileDataSource: LocalFileDataSource,
+    networkMonitor: NetworkMonitor,
    context: Context,
 ) : ViewModel() {
+    private var testUpload: Boolean = false
    var isServiceConnected = false
    val progressBar = MutableLiveData(false)
    private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
@@ -86,6 +88,9 @@ class HemoCubeViewModel @Inject constructor(
 //    init {
 //        startPeriodicCheckUpdate()
 //    }
+    init {
+        networkMonitor.startMonitoring()
+    }

    val loginResponse = MutableLiveData<Result<LoginResponse>>()

@@ -102,7 +107,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 =networkMonitor.isConnected
    val allUserData = hemoCubeDao.getAll()
    val allLocalData = hemoCubeDao.getAll()
    val allPendingUserToUpload = hemoCubeDao.getPendingUser()
@@ -132,20 +137,84 @@ class HemoCubeViewModel @Inject constructor(
        try {
            if (isOnline) {
                parseData()
-                addResultTestToDb(quickCapture)
+                //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()
                ).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(
+                "yyyy-MM-dd HH:mm:ss", 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,16 +290,20 @@ 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")
                }
            }
@@ -248,7 +321,12 @@ class HemoCubeViewModel @Inject constructor(
                }
            }
        }
-
+        if(testUpload){
+            fireBaseBulkUpload.postValue("Success")
+        }
+//        else{
+//            fireBaseBulkUpload.postValue("Error")
+//        }
    }


@@ -399,7 +477,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()
@@ -428,6 +506,7 @@ class HemoCubeViewModel @Inject constructor(
        viewModelScope.launch {
            try {
                testDetails!!.quickCapture = quickCapture
+                testDetails.testStatus = true
                testDetails.reportUploadTime = SimpleDateFormat(
                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                ).format(Calendar.getInstance().time)
@@ -460,6 +539,7 @@ class HemoCubeViewModel @Inject constructor(
                }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))
@@ -467,7 +547,7 @@ class HemoCubeViewModel @Inject constructor(
                            }
                            Log.i("Testdb", "Data uploaded to Firestore successfully")
                            fireBaseUpload.postValue("Success")
-                            testDetails.localFlag = true
+
                            if (Constants.MOLBIO_INTEGRATION) {
                                // Sanitize testDetails before using it in the API call
                                val sanitizedTestDetails = sanitizeDoubleValues(testDetails)
@@ -519,13 +599,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
                }
            }
        }
@@ -590,6 +670,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()
@@ -605,7 +689,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/utils/NatsManager.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/utils/NatsManager.kt
@@ -18,7 +18,7 @@ import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.main_base.DashboardActivity
 import io.nats.client.AuthHandler
 import io.nats.client.Connection
 import io.nats.client.Message
--- a/app/src/main/java/com/example/hpostesting/util/NetworkChecker.kt
+++ b/app/src/main/java/com/example/hpostesting/util/NetworkChecker.kt
@@ -0,0 +1,99 @@
+package com.example.hpostesting.util
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import java.net.HttpURLConnection
+import java.net.URL
+import javax.inject.Inject
+import javax.inject.Singleton
+
+
+@Singleton
+class NetworkMonitor @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+
+    private val connectivityManager =
+        context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+    private val _isConnected = MutableLiveData(false)
+    val isConnected: LiveData<Boolean> get() = _isConnected
+
+    private val networkScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
+        override fun onAvailable(network: Network) {
+            performPingCheck()
+        }
+
+        override fun onLost(network: Network) {
+            _isConnected.postValue(false)
+        }
+
+        override fun onCapabilitiesChanged(
+            network: Network, networkCapabilities: NetworkCapabilities
+        ) {
+            // Recheck connectivity when capabilities change (e.g., network becomes validated)
+            performPingCheck()
+        }
+    }
+
+    fun startMonitoring() {
+        // Check initial connectivity status
+        val network = connectivityManager.activeNetwork
+        val capabilities = connectivityManager.getNetworkCapabilities(network)
+        val isInitiallyConnected = capabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) == true
+
+        if (isInitiallyConnected) {
+            performPingCheck()
+        } else {
+            _isConnected.postValue(false)
+        }
+
+        val networkRequest =
+            NetworkRequest.Builder().addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                .build()
+
+        connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
+    }
+
+    fun stopMonitoring() {   // never needed to call
+        try {
+            connectivityManager.unregisterNetworkCallback(networkCallback)
+        } catch (_: IllegalArgumentException) {
+            // Ignore if callback was not registered
+        }
+        networkScope.cancel()
+    }
+
+    private fun performPingCheck() {
+        networkScope.launch {
+            try {
+                val url = URL("https://www.google.com")
+                val connection = url.openConnection() as HttpURLConnection
+                connection.connectTimeout = 2000
+                connection.readTimeout = 2000
+                connection.setRequestProperty("Connection", "close")
+                connection.connect()
+
+                // Consider any 2xx response as successful
+                val isReachable = connection.responseCode in 200..299
+                _isConnected.postValue(isReachable)
+                connection.disconnect()
+            } catch (e: Exception) {
+                _isConnected.postValue(false)
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/example/hpostesting/util/NetworkStatusLiveData.kt
+++ b/app/src/main/java/com/example/hpostesting/util/NetworkStatusLiveData.kt
@@ -1,75 +0,0 @@
-/*
- * // 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.util
-
-
-import android.content.Context
-import android.net.ConnectivityManager
-import android.net.Network
-import android.net.NetworkCapabilities
-import android.net.NetworkRequest
-import android.os.Build
-import androidx.annotation.RequiresApi
-import androidx.lifecycle.LiveData
-
-class NetworkStatusLiveData(context: Context) : LiveData<Boolean>() {
-
-    private val connectivityManager: ConnectivityManager =
-        context.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
-        override fun onAvailable(network: Network) {
-            postValue(true)
-        }
-
-        override fun onLost(network: Network) {
-            postValue(false)
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    override fun onActive() {
-        super.onActive()
-        postValue(isNetworkAvailable())
-        registerNetworkCallback()
-    }
-
-    override fun onInactive() {
-        super.onInactive()
-        unregisterNetworkCallback()
-    }
-
-    private fun registerNetworkCallback() {
-        val networkRequest = NetworkRequest.Builder()
-            .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
-            .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
-            .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
-            .build()
-
-        connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
-    }
-
-    private fun unregisterNetworkCallback() {
-        connectivityManager.unregisterNetworkCallback(networkCallback)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun isNetworkAvailable(): Boolean {
-        val network = connectivityManager.activeNetwork
-        val networkCapabilities = connectivityManager.getNetworkCapabilities(network)
-        return networkCapabilities != null &&
-                networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
-                networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-    }
-}
--- 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/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -133,6 +133,7 @@
            android:id="@+id/cv_item3"
            android:layout_width="128dp"
            android:layout_height="128dp"
+            android:visibility="gone"
            android:layout_marginTop="32dp"
            android:layout_marginStart="16dp"
            app:cardElevation="8dp"
--- a/app/src/main/res/layout/fragment_digital_card.xml
+++ b/app/src/main/res/layout/fragment_digital_card.xml
@@ -19,7 +19,7 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.example.hpostesting.presentation.hemocube.DigitalCardFragment">
+    tools:context="com.example.hpostesting.presentation.trueheme_test.DigitalCardFragment">

    <androidx.cardview.widget.CardView
        android:id="@+id/userCard"
--- a/app/src/main/res/layout/fragment_gallery.xml
+++ b/app/src/main/res/layout/fragment_gallery.xml
@@ -22,7 +22,7 @@
    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        tools:context="com.example.hpostesting.presentation.dashboard.GalleryFragment">
+        tools:context="com.example.hpostesting.presentation.main_base.PanelFragment">

    <TextView
        android:id="@+id/tv_subtitle4"
@@ -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_hemo_cube_reference.xml
+++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
@@ -14,13 +14,29 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.example.hpostesting.presentation.hemocube.HemoCubeFragment">
+    tools:context="com.example.hpostesting.presentation.trueheme_test.TrueHemeTestFragment">

        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_parent"
            android:layout_width="match_parent"
            android:layout_height="match_parent">
-
+            <Button
+                android:id="@+id/btn_placeRefreshbuffer"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="5dp"
+                android:layout_marginTop="3dp"
+                android:layout_marginEnd="3dp"
+                android:textSize="14sp"
+                android:visibility="gone"
+                android:clickable="false"
+                android:text="Refresh \nbuffer"
+                android:textColor="@color/white"
+                android:backgroundTint="@color/brightGreen"
+                app:cornerRadius="16dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                />
            <TextView
                android:id="@+id/tv_title"
                style="@style/title1"
--- 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,7 +132,7 @@
            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"
@@ -143,6 +163,7 @@
            android:id="@+id/rv_order_offline"
            android:layout_width="0dp"
            android:layout_height="0dp"
+            android:visibility="gone"
            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
--- 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_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -16,7 +16,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context="com.example.hpostesting.presentation.dashboard.ui.LoginFragment">
+    tools:context="com.example.hpostesting.presentation.main_base.ui.LoginFragment">


    <ScrollView
@@ -130,9 +130,7 @@
                    android:layout_height="wrap_content"
                    android:hint="@string/district"
                    android:inputType="none"
-                    android:text="Mysuru"
-                    android:labelFor="@id/til_district"
-                    app:simpleItems="@array/district" />
+                     />

            </com.google.android.material.textfield.TextInputLayout>
            <com.google.android.material.textfield.TextInputLayout
--- 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/fragment_slideshow.xml
+++ b/app/src/main/res/layout/fragment_slideshow.xml
@@ -15,7 +15,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.example.hpostesting.presentation.dashboard.SlideshowFragment">
+    tools:context="com.example.hpostesting.presentation.main_base.SlideshowFragment">
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/cl_parent"
        android:layout_width="match_parent"
@@ -86,16 +86,14 @@
            android:text="@string/add"
            app:cornerRadius="16dp"
            app:layout_constraintBottom_toBottomOf="@id/spinnerCuvette"
-
            app:layout_constraintStart_toEndOf="@id/spinnerCuvette"
            app:layout_constraintTop_toTopOf="@id/spinnerCuvette" />

-
        <FrameLayout
            android:id="@+id/container"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@+id/spinnerCuvette"
+            app:layout_constraintTop_toBottomOf="@+id/btn_add_size"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            android:layout_marginTop="10dp"/>
--- 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/navigation/dashboard_navigation.xml
+++ b/app/src/main/res/navigation/dashboard_navigation.xml
@@ -20,7 +20,7 @@

    <fragment
        android:id="@+id/nav_home"
-        android:name="com.example.hpostesting.presentation.dashboard.HomeFragment"
+        android:name="com.example.hpostesting.presentation.main_base.HomeFragment"
        android:label="@string/menu_home"
        app:popUpToInclusive="true"
        app:popUpTo="@id/nav_home"
@@ -36,23 +36,23 @@

    <fragment
        android:id="@+id/nav_profile"
-        android:name="com.example.hpostesting.presentation.dashboard.GalleryFragment"
+        android:name="com.example.hpostesting.presentation.main_base.PanelFragment"
        android:label="@string/profile"
        tools:layout="@layout/fragment_gallery" />

    <fragment
        android:id="@+id/nav_settings"
-        android:name="com.example.hpostesting.presentation.dashboard.SlideshowFragment"
+        android:name="com.example.hpostesting.presentation.main_base.SlideshowFragment"
        android:label="@string/action_settings"
        tools:layout="@layout/fragment_slideshow" />
    <fragment
        android:id="@+id/nav_about"
-        android:name="com.example.hpostesting.presentation.dashboard.AboutFragment"
+        android:name="com.example.hpostesting.presentation.main_base.AboutFragment"
        android:label="@string/action_about"
        tools:layout="@layout/fragment_about" />
    <fragment
        android:id="@+id/nav_activity"
-        android:name="com.example.hpostesting.presentation.dashboard.ActivitiesFragment"
+        android:name="com.example.hpostesting.presentation.main_base.ActivitiesFragment"
        android:label="@string/action_activity"
        tools:layout="@layout/fragment_activities" />
    <activity
@@ -61,7 +61,7 @@
        android:label="MainActivity" />
    <fragment
        android:id="@+id/loginFragment"
-        android:name="com.example.hpostesting.presentation.dashboard.ui.LoginFragment"
+        android:name="com.example.hpostesting.presentation.main_base.ui.LoginFragment"
        android:label="@string/login"
        tools:layout="@layout/fragment_login" >
    <action
--- a/app/src/main/res/navigation/navigation_graph.xml
+++ b/app/src/main/res/navigation/navigation_graph.xml
@@ -20,7 +20,7 @@

    <fragment
        android:id="@+id/hemoCubeFragment"
-        android:name="com.example.hpostesting.presentation.hemocube.HemoCubeFragment"
+        android:name="com.example.hpostesting.presentation.trueheme_test.TrueHemeTestFragment"
        android:label="fragment_hemo_cube_reference"
        tools:layout="@layout/fragment_hemo_cube_reference" >
        <action
@@ -29,7 +29,7 @@
    </fragment>
    <fragment
        android:id="@+id/digitalCardFragment"
-        android:name="com.example.hpostesting.presentation.hemocube.DigitalCardFragment"
+        android:name="com.example.hpostesting.presentation.trueheme_test.DigitalCardFragment"
        android:label="fragment_digital_card"
        tools:layout="@layout/fragment_digital_card" />
 </navigation>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -305,4 +305,7 @@
    <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>
+
 </resources>
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -304,6 +304,9 @@
    <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>
+
    <!-- 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>
@@ -204,7 +204,7 @@
    <string name="user_id">User ID</string>
    <string name="aadhar_id">Aadhar ID</string>
    <string name="internet_not_available_please_enter_the_user_id_manually">Internet not available, please enter the user ID and blood group manually</string>
-    <string name="user_id_error_message">User ID should be 18 digits and please select the blood group</string>
+    <string name="user_id_error_message">Sample ID Length should be greater then 5 and please select the blood group</string>
    <string name="upload_db_registration_title">Upload DB Tests</string>
    <string name="upload_db_registration_message">Do you want to upload the local DB tests to the cloud?</string>
    <string name="upload">Upload</string>
@@ -305,4 +305,7 @@
    <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>
+
 </resources>
--- a/app/src/test/java/com/example/hpostesting/AutoDacViewModelTest.kt
+++ b/app/src/test/java/com/example/hpostesting/AutoDacViewModelTest.kt
@@ -16,12 +16,12 @@ package com.example.hpostesting
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.example.hpostesting.util.NetworkStatusLiveData
 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.repository.Repository
 import com.example.hpostesting.presentation.autodac.AutoDacViewModel
+import com.example.hpostesting.util.NetworkMonitor
 import io.mockk.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -43,7 +43,7 @@ class AutoDacViewModelTest {
    private val repository = mockk<Repository>()
    private val context = mockk<Context>()
    private val sharedPreferences = mockk<SharedPreferences>()
-    private val networkStatusLiveData = mockk<NetworkStatusLiveData>()
+    private val networkStatusLiveData = mockk<NetworkMonitor>()

    @Before
    fun setup() {
@@ -54,7 +54,7 @@ class AutoDacViewModelTest {
        every { context.getSystemService(any()) } returns networkStatusLiveData

        // Mocking the NetworkStatusLiveData
-        every { networkStatusLiveData.observe(any(), any()) } just Runs
+        every { networkStatusLiveData.startMonitoring() } just Runs

        every { hemoCubeDao.getAll() } returns mockk()
 //        every { repository.addDiagnostics(any()) } returns Response.Success(Unit)
--- a/app/src/test/java/com/example/hpostesting/HemocubeViewModelTest.kt
+++ b/app/src/test/java/com/example/hpostesting/HemocubeViewModelTest.kt
@@ -20,7 +20,7 @@ import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.login.LoginResponse
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.LogFileManager
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.util.TestCoroutineRule
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -59,7 +59,7 @@ class HemocubeViewModelTest {
    @MockK(relaxed = true)
    lateinit var observer: Observer<Result<LoginResponse>>

-    private lateinit var viewModel: HemoCubeViewModel
+    private lateinit var viewModel: TrueHemeTestViewModel

    @Before
    fun setup() {
--- a/app/src/test/java/com/example/hpostesting/TrueHemeTestFragmentTest.kt
+++ b/app/src/test/java/com/example/hpostesting/TrueHemeTestFragmentTest.kt
@@ -14,7 +14,7 @@
 package com.example.hpostesting

 import android.content.SharedPreferences
-import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestFragment
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertNull
 import org.junit.Before
@@ -24,17 +24,17 @@ import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.MockitoAnnotations

-class HemoCubeFragmentTest {
+class TrueHemeTestFragmentTest {

    @Mock
    private lateinit var mockSharedPreferences: SharedPreferences

-    private lateinit var hemoCubeFragment: HemoCubeFragment
+    private lateinit var trueHemeTestFragment: TrueHemeTestFragment

    @Before
    fun setUp() {
        MockitoAnnotations.initMocks(this)
-        hemoCubeFragment = HemoCubeFragment()
+        trueHemeTestFragment = TrueHemeTestFragment()
    }

    @Test
@@ -48,7 +48,7 @@ class HemoCubeFragmentTest {
        ).thenReturn("dummy_value")

        // Act
-        val deviceId = hemoCubeFragment.extractV2HardwareId("SNS HPP1-9000 SNE")
+        val deviceId = trueHemeTestFragment.extractV2HardwareId("SNS HPP1-9000 SNE")

        // Assert
        assertEquals("HPP1-9000", deviceId)
@@ -81,11 +81,11 @@ class HemoCubeFragmentTest {
        val readingsPerSample = 1

        // Act
-        val result = hemoCubeFragment.allReadingsComplete(repeatReadingCount, readingsPerSample)
+        val result = trueHemeTestFragment.allReadingsComplete(repeatReadingCount, readingsPerSample)

        // Assert
        assertEquals(true, result)
-        assertEquals(hemoCubeFragment.allReadingsComplete(0, 1), false)
+        assertEquals(trueHemeTestFragment.allReadingsComplete(0, 1), false)
    }

    @Test
@@ -94,7 +94,7 @@ class HemoCubeFragmentTest {
        val input = "Some text SN ABC123 some more text"

        // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
+        val result = trueHemeTestFragment.extractV1HardwareId(input)

        // Assert
        assertEquals("ABC123", result)
@@ -106,7 +106,7 @@ class HemoCubeFragmentTest {
        val input = "Some text without SN"

        // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
+        val result = trueHemeTestFragment.extractV1HardwareId(input)

        // Assert
        assertNull(result)
@@ -118,7 +118,7 @@ class HemoCubeFragmentTest {
        val input = ""

        // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
+        val result = trueHemeTestFragment.extractV1HardwareId(input)

        // Assert
        assertNull(result)
@@ -130,7 +130,7 @@ class HemoCubeFragmentTest {
        val input: String? = null

        // Act
-        val result = input?.let { hemoCubeFragment.extractV1HardwareId(it) }
+        val result = input?.let { trueHemeTestFragment.extractV1HardwareId(it) }

        // Assert
        assertNull(result)
@@ -158,7 +158,7 @@ class HemoCubeFragmentTest {
        """.trimIndent()

        // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
+        val result = trueHemeTestFragment.extractV1HardwareId(input)

        // Assert
        assertEquals("HCV-000-3001", result)
@@ -170,7 +170,7 @@ class HemoCubeFragmentTest {
        val input = "SNS ABC123 SNE"

        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)

        // Assert
        assertEquals("ABC123", result)
@@ -182,7 +182,7 @@ class HemoCubeFragmentTest {
        val input = "No hardware ID in this input"

        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)

        // Assert
        assertNull(result)
@@ -194,7 +194,7 @@ class HemoCubeFragmentTest {
        val input = "SNS   XYZ789    SNE"

        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)

        // Assert
        assertEquals("XYZ789", result)
@@ -218,7 +218,7 @@ class HemoCubeFragmentTest {
                "REND\n"

        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)

        // Assert
        assertEquals("HCV-000-3013", result)
@@ -241,7 +241,7 @@ class HemoCubeFragmentTest {
                "REND\n"

        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)

        // Assert
        assertEquals("HPP1-4001", result)
@@ -264,7 +264,7 @@ class HemoCubeFragmentTest {
                "REND\n"

        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)

        // Assert
        assertEquals("HPP1-000-4001", result)
@@ -287,7 +287,7 @@ class HemoCubeFragmentTest {
                "REND\n"

        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)

        // Assert
        assertEquals("HPP-000-4001", result)
@@ -310,7 +310,7 @@ class HemoCubeFragmentTest {
                "REND\n"

        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)

        // Assert
        assertEquals("HPP-000-5001", result)
@@ -318,111 +318,123 @@ class HemoCubeFragmentTest {

    @Test
    fun testDeviceRatioClassificationNormalWithStartRange() {
-        val ratio = 0.16
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val ratio = 0.08
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
        assertEquals("Normal", result)
    }

    @Test
    fun testDeviceRatioClassificationNormal() {
        val ratio = 0.22
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
        assertEquals("Normal", result)
    }

    @Test
    fun testDeviceRatioClassificationNegativeBorderline() {
        val ratio = 0.235
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
+        assertEquals("Negative Borderline", result)
+    }
+    @Test
+    fun testDeviceRatioClassificationNegativeBorderlineUpperBound() {
+        val ratio = 0.265
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
        assertEquals("Negative Borderline", result)
    }

    @Test
    fun testDeviceRatioClassificationSickleCellTraitLowerBound() {
-        val ratio = 0.251
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val ratio = 0.271
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
        assertEquals("Sickle Cell Trait", result)
    }

    @Test
    fun testDeviceRatioClassificationSickleCellTraitUpperBound() {
        val ratio = 0.309
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
        assertEquals("Sickle Cell Trait", result)
    }

    @Test
    fun testDeviceRatioClassificationPositiveForSickleCell() {
+        val ratio = 0.312
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
+        assertEquals("Positive for Sickle Cell. HPLC for Confirmation", result)
+    }
+    @Test
+    fun testDeviceRatioClassificationPositiveForSickleCellUpperBound() {
        val ratio = 0.39
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
        assertEquals("Positive for Sickle Cell. HPLC for Confirmation", result)
    }

    @Test
    fun testDeviceRatioClassificationSickleCellDiseaseLowerBound() {
        val ratio = 0.391
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
-        assertEquals("Positive for Sickle Cell. HPLC for Confirmation", result)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
+        assertEquals("Sickle Cell Disease", result)
    }

    @Test
    fun testDeviceRatioClassificationSickleCellDisease() {
-        val ratio = 0.45
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val ratio = 0.691
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
        assertEquals("Sickle Cell Disease", result)
    }

    @Test
    fun testDeviceRatioClassificationInvalid() {
        val ratio: Double? = null
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
        assertEquals("Invalid", result)
    }

    @Test
    fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineNormal() {
        val result =
-            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.5)
+            trueHemeTestFragment.findResultWithAdditionalMethods("10mm",0.5, "Negative Borderline", 2.5)
        assertEquals("Normal", result)
    }

    @Test
    fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellTrait1() {
        val result =
-            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.2)
-        assertEquals("Negative borderline. Confirm with HPLC", result)
+            trueHemeTestFragment.findResultWithAdditionalMethods("10mm",0.5, "Negative Borderline", 2.2)
+        assertEquals("Normal", result)
    }

    @Test
    fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellTrait2() {
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(
-            0.5,
+        val result = trueHemeTestFragment.findResultWithAdditionalMethods(
+            "10mm",0.5,
            "Positive for Sickle Cell. HPLC for Confirmation",
            1.4
        )
-        assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
+        assertEquals("Sickle Cell Trait", result)
    }

    @Test
    fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellDisease() {
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(
-            0.5,
+        val result = trueHemeTestFragment.findResultWithAdditionalMethods(
+            "10mm",0.5,
            "Positive for Sickle Cell. HPLC for Confirmation",
            1.33
        )
-        assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
+        assertEquals("Sickle Cell Trait", result)
    }

    @Test
    fun findResultWithAdditionalMethods_NormalDeviceRatio_ReturnsNormalBelowSlopeRatioThreshold() {
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 30.0)
+        val result = trueHemeTestFragment.findResultWithAdditionalMethods("10mm",0.5, "Normal", 30.0)
        assertEquals("Normal", result)
    }

    @Test
    fun findResultWithAdditionalMethods_NBL_ReturnsNBL() {
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(
-            0.5,
+        val result = trueHemeTestFragment.findResultWithAdditionalMethods(
+            "10mm",0.5,
            "Negative Borderline, Repeat Test",
            70.0
        )
@@ -432,14 +444,14 @@ class HemoCubeFragmentTest {
    @Test
    fun findResultWithAdditionalMethods_SCT_ReturnsSCT() {
        val result =
-            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Trait", 70.0)
+            trueHemeTestFragment.findResultWithAdditionalMethods("10mm",0.5, "Sickle Cell Trait", 70.0)
        assertEquals("Sickle Cell Trait", result)
    }

    @Test
    fun findResultWithAdditionalMethods_PBL_ReturnsPBL() {
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(
-            0.5,
+        val result = trueHemeTestFragment.findResultWithAdditionalMethods(
+            "10mm",0.5,
            "Positive for Sickle Cell. HPLC for Confirmation",
            1.67
        )
@@ -449,7 +461,7 @@ class HemoCubeFragmentTest {
    @Test
    fun findResultWithAdditionalMethods_SCD_ReturnsSCD() {
        val result =
-            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Disease", 70.0)
+            trueHemeTestFragment.findResultWithAdditionalMethods("10mm",0.5, "Sickle Cell Disease", 70.0)
        assertEquals("Sickle Cell Disease", result)
    }

@@ -461,7 +473,7 @@ class HemoCubeFragmentTest {
        val led2Average = 0.2

        // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+        val result = trueHemeTestFragment.reclassifyWithBorderlineMethod2(
            deviceRatio,
            deviceRatioClass,
            led2Average
@@ -479,7 +491,7 @@ class HemoCubeFragmentTest {
        val led2Average = 0.14

        // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+        val result = trueHemeTestFragment.reclassifyWithBorderlineMethod2(
            deviceRatio,
            deviceRatioClass,
            led2Average
@@ -497,7 +509,7 @@ class HemoCubeFragmentTest {
        val led2Average = 0.18

        // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+        val result = trueHemeTestFragment.reclassifyWithBorderlineMethod2(
            deviceRatio,
            deviceRatioClass,
            led2Average
@@ -515,7 +527,7 @@ class HemoCubeFragmentTest {
        val led2Average = 0.195

        // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+        val result = trueHemeTestFragment.reclassifyWithBorderlineMethod2(
            deviceRatio,
            deviceRatioClass,
            led2Average
@@ -533,7 +545,7 @@ class HemoCubeFragmentTest {
        val led2Average = 0.189

        // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+        val result = trueHemeTestFragment.reclassifyWithBorderlineMethod2(
            deviceRatio,
            deviceRatioClass,
            led2Average
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
        kotlin_version = '1.8.21'
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.android.tools.build:gradle:8.4.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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
Author	SHA1	Message	Date
Sathwik C S	0b268dda47	Edit README.md	2025-01-29 11:02:47 +00:00
Sathwik C S	d9777edf02	Edit README.md	2025-01-29 11:01:52 +00:00
sathwikcs	238424ad89	NetworkStatusLiveData.kt has been removed	2025-01-29 15:39:47 +05:30
sathwikcs	c1f02c878c	updated the NetworkChecker.kt	2025-01-29 15:39:29 +05:30
sathwikcs	b344dbcb69	updated the test case	2025-01-28 17:12:06 +05:30
sathwikcs	af7b426416	Merge remote-tracking branch 'origin/dev-server-2.1.131-network' into dev-server-2.1.131-network	2025-01-28 16:12:21 +05:30
sathwikcs	07abfcce6c	updated build.gradle to make the api 31 as the min sdk from 21 -> 30 as device targets api 31	2025-01-28 16:12:00 +05:30
sathwikcs	2c62cc11ba	updated build.gradle to make the api 31 as the min sdk from 21 -> 30 as device targets api 31	2025-01-28 16:11:42 +05:30
sathwikcs	312e2da79a	TrueHemeViewmodel to fit new network Checker	2025-01-28 16:10:40 +05:30
sathwikcs	9768a0a835	updated TrueHeme TestViewmodel.kt NetworkChecker.kt	2025-01-28 16:08:29 +05:30
sathwikcs	db7aba4549	updated NetworkChecker.kt	2025-01-28 16:07:27 +05:30
sathwikcs	302239d191	Network Checker updated in TestRightViewModel	2025-01-28 12:50:14 +05:30
sathwikcs	cc1ae1ff82	Network Checker updated in NetworkStatusLiveData.kt	2025-01-28 12:49:06 +05:30
sathwikcs	d420a42fcc	Network Checker	2025-01-28 12:47:39 +05:30
sathwikcs	21b3960ca9	Merge remote-tracking branch 'origin/dev-server-2.1.130-review-retryUsb' into dev-server-2.1.130-review-retryUsb	2025-01-22 15:00:55 +05:30
chandrashekhar reddy	9183216cfe	app version 131, remote config removed,default classification values updated	2025-01-17 17:27:50 +05:30
chandrashekhar reddy	a72bd3d59e	app version 130.2, default remote config values updated	2025-01-13 16:49:21 +05:30
chandrashekhar reddy	54be3a1037	app version 130.1, without borderline classification and buffer limit	2024-12-31 15:10:53 +05:30
chandrashekhar reddy	69055b5498	app version 130, without borderline classification	2024-12-30 12:00:39 +05:30
chandrashekhar reddy	7dde6bf976	app version 130, without borderline classification	2024-12-30 11:42:04 +05:30
chandrashekhar reddy	ee0f1d748a	Merge remote-tracking branch 'origin/dev-server-2.1.130' into dev-server-2.1.130	2024-12-30 11:36:57 +05:30
chandrashekhar reddy	d32e7b6cbb	app version 130, without borderline classification	2024-12-30 11:36:08 +05:30
Chandrashekhar Reddy	d306d0b9fa	Update .gitlab-ci.yml file	2024-10-16 09:23:33 +00:00
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
chandrashekhar reddy	2512556e8a	127 version, pipeline fixed	2024-08-24 11:24:16 +05:30
chandrashekhar reddy	4c1429f3cb	127 version, updated the normal threshold	2024-08-22 18:59:25 +05:30
chandrashekhar reddy	d0f33582df	127 version, updated the normal threshold	2024-08-22 18:57:23 +05:30
chandrashekhar reddy	6be6a65e95	127 version, refresh buffer separated, added buffer flag, added remote config to manage threshold, remove cards direct test can be performed	2024-08-09 12:02:13 +05:30
chandrashekhar reddy	b32c5e29d0	127 version, refresh buffer separated, added buffer flag, added remote config to manage threshold	2024-08-03 22:33:34 +05:30
chandrashekhar reddy	453af33baa	125 version, net kit button issue resolved	2024-07-25 12:49:54 +05:30
chandrashekhar reddy	dd345a1b31	new 125 version, changes in HemoCubeFragment Ip address in home, led1Average at line 1004 change if condition, in home download csv for all.	2024-07-15 20:29:39 +05:30
chandrashekhar reddy	ba52efc670	new 125 version, changes in HemoCubeFragment Ip address in home, led1Average at line 1004 change if condition, in home download csv for all.	2024-07-15 15:15:58 +05:30
chandrashekhar reddy	eb60025add	new 125 version, changes in HemoCubeFragment Ip address in home, led1Average at line 1004 change if condition, in home download csv for all.	2024-07-15 15:07:42 +05:30
chandrashekhar reddy	5e1283873d	new 125 version, changes in HemoCubeFragment Ip address in home, led1Average at line 1004 change if condition, in home download csv for all.	2024-07-15 14:44:19 +05:30