changes Ui and attributes of panel, auto DAC, Calibration and device Diagnostics screens.

chenges buttons and text inputs attributes.
2024-03-28 16:29:55 +05:30 · 2024-03-25 12:40:59 +05:30 · 2024-03-19 18:08:46 +05:30 · 2024-03-18 16:24:37 +05:30 · 2024-03-07 16:14:56 +05:30 · 2024-03-06 17:40:31 +05:30
349 changed files with 3463 additions and 12567 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,63 @@
+# 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: "34"
-  ANDROID_BUILD_TOOLS: "33.0.2"
-  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

+  # ANDROID_COMPILE_SDK is the version of Android you're compiling with.
+  # It should match compileSdkVersion.
+  ANDROID_COMPILE_SDK: "34"
+
+  # ANDROID_BUILD_TOOLS is the version of the Android build tools you are using.
+  # It should match buildToolsVersion.
+  ANDROID_BUILD_TOOLS: "33.0.2"
+
+  # It's what version of the command line tools we're going to download from the official site.
+  # Official Site-> https://developer.android.com/studio/index.html
+  # There, look down below at the cli tools only, sdk tools package is of format:
+  #        commandlinetools-os_type-ANDROID_SDK_TOOLS_latest.zip
+  # when the script was last modified for latest compileSdkVersion, it was which is written down below
+  ANDROID_SDK_TOOLS: "9477386"
+
+# Packages installation before running script
 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
@@ -37,6 +69,7 @@ lintDebug:
    expose_as: "lint-report"
    when: always

+# Make Project
 assembleDebug:
  interruptible: true
  stage: build
@@ -45,68 +78,8 @@ 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
@@ -125,4 +98,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
@@ -2,4 +2,3 @@
 ### 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.server"
+        applicationId "in.sminnovations.hpostesting.dev"
        minSdk 21
        targetSdk 34
-        versionCode 130
-        versionName "2.1.130"
+        versionCode 114
+        versionName "2.1.114"
+
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

@@ -62,7 +62,6 @@ android {

 dependencies {
    implementation "com.google.dagger:hilt-android:2.46"
-    implementation 'androidx.activity:activity:1.8.0'
    kapt "com.google.dagger:hilt-android-compiler:2.46"

    implementation 'androidx.core:core-ktx:1.12.0'
@@ -76,7 +75,6 @@ dependencies {
    implementation platform('com.google.firebase:firebase-bom:32.1.0')
    implementation("com.google.firebase:firebase-perf-ktx")
    implementation("com.google.firebase:firebase-crashlytics-ktx")
-    implementation("com.google.firebase:firebase-config-ktx")
    implementation("com.google.firebase:firebase-analytics-ktx")
    implementation 'com.google.firebase:firebase-firestore-ktx'
    implementation 'com.google.firebase:firebase-auth-ktx'
@@ -90,6 +88,7 @@ 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,9 +120,10 @@ 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.8.0'
+    implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'

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

@@ -137,7 +137,6 @@ dependencies {
    implementation "androidx.room:room-ktx:2.6.1"
    implementation "androidx.room:room-runtime:2.6.1"
    kapt ("androidx.room:room-compiler:2.6.1")
-    implementation "net.zetetic:android-database-sqlcipher:4.4.0"

    //image
    implementation 'com.github.bumptech.glide:glide:4.13.2'
@@ -163,12 +162,9 @@ 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'
-    implementation 'org.apache.commons:commons-math3:3.6.1'
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.17'
-    implementation 'androidx.security:security-crypto:1.1.0-alpha03'

 }
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -7,9 +7,178 @@
  "client": [
    {
      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f6fd45e2f6a63aef6c6471",
+        "mobilesdk_app_id": "1:650071678820:android:f1435a1c07f710036c6471",
        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting.server"
+          "package_name": "com.example.hposconsentform"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:650071678820:android:7865bef608cdee6f6c6471",
+        "android_client_info": {
+          "package_name": "com.smi.counselling"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:650071678820:android:2925e9ce3417d2386c6471",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hemocube"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "650071678820-srhm9spm9hjn4frcd3r6o02gdhdbtd15.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.sminnovations.hemocube",
+            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
+          }
+        },
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hposregistration"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "650071678820-70kp5jvjda4r5diqch2kn4lc40p4f42g.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.sminnovations.hposregistration",
+            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
+          }
+        },
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hpostesting"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "650071678820-l87dnr0bdj95get0khgnvfv2an1k6ogq.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.sminnovations.hpostesting",
+            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
+          }
+        },
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:650071678820:android:a53292637abb7c0d6c6471",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hpostesting.dev"
        }
      },
      "oauth_client": [
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -4,34 +4,17 @@
    "type": "APK",
    "kind": "Directory"
  },
-  "applicationId": "in.sminnovations.hpostesting.dev",
+  "applicationId": "in.sminnovations.hpostesting.quality",
  "variantName": "release",
  "elements": [
    {
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 127,
-      "versionName": "2.1.127",
+      "versionCode": 101,
+      "versionName": "2.1.101",
      "outputFile": "app-release.apk"
    }
  ],
-  "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
+  "elementType": "File"
 }
--- a/app/src/androidTest/java/com/example/hpostesting/AssuranceControlsActivityTest.kt
+++ b/app/src/androidTest/java/com/example/hpostesting/AssuranceControlsActivityTest.kt
@@ -1,16 +1,3 @@
-/*
- * // 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

 import androidx.test.core.app.ActivityScenario
--- a/app/src/androidTest/java/com/example/hpostesting/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/hpostesting/ExampleInstrumentedTest.kt
@@ -1,16 +1,3 @@
-/*
- * // 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

 import androidx.test.ext.junit.runners.AndroidJUnit4
--- a/app/src/debug/res/drawable/downloads.xml
+++ b/app/src/debug/res/drawable/downloads.xml
@@ -1,16 +1,3 @@
-<!--
-  ~ // 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.
-  -->
-
 <vector android:height="24dp" android:tint="@color/primary"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,13 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

-    <uses-permission
-        android:name="android.permission.AUTHENTICATE_ACCOUNTS"
-        android:maxSdkVersion="22" />
    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
    <uses-permission
        android:name="android.permission.BATTERY_STATS"
        tools:ignore="ProtectedPermissions" />
@@ -25,12 +23,6 @@

    <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,41 +30,13 @@
        android:fullBackupContent="@xml/backup_rules"
        android:icon="@mipmap/hpos_icon"
        android:label="@string/app_name"
-        android:largeHeap="true"
        android:roundIcon="@mipmap/hpos_icon_round"
        android:supportsRtl="true"
        android:theme="@style/Theme.HPOSTesting"
        tools:targetApi="31">
-        <activity
-            android:name="com.example.hpostesting.presentation.dashboard.UpdateValuesActivity"
-            android:exported="false"
-            android:screenOrientation="portrait"/>
-
-        <service
-            android:name="com.example.hpostesting.util.MyAuthenticatorService"
-            android:exported="true"
-            android:permission="android.permission.BIND_AUTOFILL_SERVICE">
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator" />
-        </service>
-
-        <activity
-            android:name="com.example.hpostesting.presentation.dashboard.ui.PasswordResetActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="com.example.hpostesting.presentation.usb_teminal.UsbTerminalActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
        <activity
            android:name="com.example.hpostesting.presentation.deviceinfo.DeviceActivity"
-            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
+            android:exported="false" />
        <activity
            android:name="com.example.hpostesting.presentation.hemocube.DigitalCardActivity"
            android:exported="false" />
@@ -80,10 +44,6 @@
            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"
@@ -99,20 +59,21 @@
        <activity
            android:name="com.example.hpostesting.presentation.calibration.CalibrationActivity"
            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
+            android:theme="@style/Theme.HPOS.NoActionBar"/>
+
        <activity
            android:name="com.example.hpostesting.presentation.assurance.AssuranceControlsActivity"
            android:exported="false"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
+            android:theme="@style/Theme.HPOS.NoActionBar"/>
+
        <activity
            android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
            android:exported="false"
            android:noHistory="true"
            android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
-            android:screenOrientation="portrait"
            android:theme="@style/Theme.HPOS.NoActionBar"
            android:windowSoftInputMode="adjustPan" />
+
        <activity
            android:name="com.example.hpostesting.presentation.trueheme.TrueHemeActivity"
            android:exported="false"
@@ -120,6 +81,7 @@
            android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
            android:theme="@style/Theme.HPOS.NoActionBar"
            android:windowSoftInputMode="adjustPan" />
+
        <activity
            android:name="com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity"
            android:exported="false"
@@ -134,25 +96,24 @@
            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
-            android:exported="true"
-            android:permission=""
+            android:exported="false"
            android:label="@string/title_activity_dashboard"
-            android:screenOrientation="portrait"
            android:theme="@style/Theme.HPOS.NoActionBar"
+            android:screenOrientation="portrait"
            tools:ignore="AppLinkUrlError,MissingClass">
+
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
-
                <category android:name="android.intent.category.DEFAULT" />
-
                <data android:scheme="content" />
                <data android:scheme="file" />
                <data android:mimeType="application/vnd.android.package-archive" />
            </intent-filter>
        </activity>

+
        <service
-            android:name="com.example.hpostesting.util.UsbService"
+            android:name="com.example.hpostesting.presentation.testRight.UsbService"
            android:enabled="true"
            android:exported="false" />

@@ -162,24 +123,14 @@
            android:noHistory="true"
            android:theme="@style/AppTheme.NoActionBar">
            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.HOME" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.MONKEY" />
-                <category android:name="android.intent.category.LAUNCHER_APP" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>
        </activity>
        <activity
            android:name="com.example.hpostesting.presentation.testRight.TestRightActivity"
-            android:exported="true"
+            android:exported="false"
            android:noHistory="true"
-            android:permission=""
            android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
            android:theme="@style/Theme.HPOS.NoActionBar"
            android:windowSoftInputMode="adjustPan">
@@ -196,8 +147,6 @@
        <activity
            android:name="com.example.hpostesting.presentation.MainActivity"
            android:exported="true"
-            android:permission=""
-            android:screenOrientation="portrait"
            android:theme="@style/AppTheme.NoActionBar">
            <intent-filter>
                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
@@ -211,7 +160,8 @@
            android:name="com.journeyapps.barcodescanner.CaptureActivity"
            android:screenOrientation="portrait"
            android:stateNotNeeded="true"
-            tools:replace="android:screenOrientation" /> <!-- ${applicationId} -->
+            tools:replace="android:screenOrientation" />
+<!--        ${applicationId}-->
        <provider
            android:name="androidx.core.content.FileProvider"
            android:authorities="${applicationId}.fileprovider"
@@ -221,6 +171,7 @@
                android:name="android.support.FILE_PROVIDER_PATHS"
                android:resource="@xml/file_paths" />
        </provider>
+
    </application>

 </manifest>
--- a/app/src/main/assets/app.properties
+++ b/app/src/main/assets/app.properties
@@ -1,14 +1 @@
-#
-# // 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.
-#
-
 BASE_URL= https://datacollection.micropcr.com/api/
--- a/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt
+++ b/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt
@@ -1,41 +1,25 @@
-/*
- * // 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

 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() {
-    @Inject
-    lateinit var firebaseManager: FirebaseManager
+    val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
    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 = firebaseManager.getCurrentFirestoreF()
+        val firestore = FirebaseFirestore.getInstance()
        firestore.firestoreSettings = firestoreSettings
    }
 }
--- a/app/src/main/java/com/example/hpostesting/data/CsvWriter.kt
+++ b/app/src/main/java/com/example/hpostesting/data/CsvWriter.kt
@@ -1,17 +1,4 @@
-/*
- * // 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
+package com.example.hpostesting.data

 import android.content.Context
 import android.os.Environment
--- a/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
@@ -1,17 +1,4 @@
-/*
- * // 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.data.constant
+package com.example.hpostesting.data

 import androidx.lifecycle.MutableLiveData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
@@ -21,14 +8,12 @@ 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
    var isAppFolderCreated = false
    var appFolderPath = ""
    var isReferenceTaken = false
-    var isToken = false
    var sampleReadCounter = 0

    var deviceConstant: TestRightDeviceConstants? = null
@@ -38,14 +23,8 @@ object DataHolder {
    val intensityReferenceArray = ArrayList<Double>()
    var selectedTest: UserData? = null
    var hemoCubeTestData: HemoCubeTestData? = null
-    var bloodGroup: String = "Unknown"
-    var age = "0"
    var kitSerial: String = ""
-    var centerName: String = ""
-    var district: String = ""
-    var quickCapture:Boolean = false
    var location: UserData.Location? = null
-    var ipAddress: String ="0.0"
    var testExp: Boolean = true
    var hemocubeResult: Double? = null
 }
--- a/app/src/main/java/com/example/hpostesting/data/InternetConnectionLiveData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/InternetConnectionLiveData.kt
@@ -1,17 +1,4 @@
-/*
- * // 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
+package com.example.hpostesting.data


 import android.content.Context
--- a/app/src/main/java/com/example/hpostesting/data/PreferenceUtility.kt
+++ b/app/src/main/java/com/example/hpostesting/data/PreferenceUtility.kt
@@ -1,17 +1,4 @@
-/*
- * // 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
+package com.example.hpostesting.data

 import android.content.Context
 import android.content.SharedPreferences
--- a/app/src/main/java/com/example/hpostesting/data/Result.kt
+++ b/app/src/main/java/com/example/hpostesting/data/Result.kt
@@ -0,0 +1,7 @@
+package com.example.hpostesting.data
+
+sealed class Result<out T : Any> {
+    data class Success<out T : Any>(val data: T) : Result<T>()
+    data class Error(val exception: Exception) : Result<Nothing>()
+    class Loading<T : Any> : Result<T>()
+}
--- a/app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt
+++ b/app/src/main/java/com/example/hpostesting/data/api/MolbioAuthApi.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.api

 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
--- a/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt
+++ b/app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.api

 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
@@ -23,7 +10,6 @@ import com.example.hpostesting.data.model.updates.CheckUpdateResponse
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import okhttp3.MultipartBody
 import okhttp3.ResponseBody
-import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Multipart
@@ -46,7 +32,7 @@ interface MolbioResultApi {
    @POST("deviceService/device/getUpdate")
    suspend fun deviceUpdate(
        @Body deviceUpdateRequest: DeviceUpdateRequest,
-    ): Response<ResponseBody>
+    ): ResponseBody

    @GET("deviceService/device/getClientCertificate")
    suspend fun downloadClientCertificate(
--- a/app/src/main/java/com/example/hpostesting/data/api/PropertyProvider.kt
+++ b/app/src/main/java/com/example/hpostesting/data/api/PropertyProvider.kt
@@ -0,0 +1,13 @@
+package com.example.hpostesting.data.api
+
+import com.example.hpostesting.data.constant.HemoCubeCommands
+import com.example.hpostesting.presentation.UsbServiceListener
+
+interface PropertyProvider {
+
+    fun getProperty(key: String): String
+}
+
+interface DeviceCommunicationHandler {
+    fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener)
+}
--- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
@@ -1,35 +1,14 @@
-/*
- * // 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.data.constant

 object Constants {
-    const val CENTER_NAME =""
-    const val DISTRICT =""
-    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"
-    const val KIT_TIME = "kit_time"
    const val ACTION_USB_PERMISSION = "shanmukha.in.sickle_cell.USB_PERMISSION"
    const val HEMOCUBE_USB_PERMISSION = "shanmukha.in.sickle_cell_homocube.USB_PERMISSION"
-    const val passphrase = "smi_#@sql"
+
    const val BASE_URL = "www.google.com"
    const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb"
    const val ABHA_APP_PACKAGE = "in.ndhm.phr"

    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"
@@ -45,8 +24,7 @@ object Constants {

    const val TEST_RIGHT_TOTAL_PIXEL = 3694

-    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 34
-    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM = 9
+    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 40

    const val RANGE_IN_RESULT_CALCULATIONS = 10

@@ -77,7 +55,6 @@ object Constants {
    const val USER_ID = "usernameId"

    const val QUICK_CAPTURE_SOLUTION = "SOLUTION"
-    const val QUICK_CAPTURE_FOR_ADMIN = "ADMIN"
    const val QUICK_CAPTURE_CONCENTRATION = "CONCENTRATION"
    const val QUICK_CAPTURE_VOLUME = "VOLUME"
    const val QUICK_CAPTURE_READING_PER_SAMPLE = "READING_PER_SAMPLE"
@@ -87,16 +64,168 @@ object Constants {
    // jig
    const val NAVIGATE_TO_TEST_JIG_DIRECTLY = false

-    //update values of abs
-    const val ABS2LED1MMLL = "ABS2LED1MMLL"
-    const val ABS2LED1MMUL = "ABS2LED1MMUL"
-    const val ABS2LED2MMLL = "ABS2LED2MMLL"
-    const val ABS2LED2MMUL = "ABS2LED2MMUL"
+    val STATICID = listOf(
+        "FACTORY",
+        "ADMIN",
+        "PQUSER",
+        "QCUSER",
+        "VIZ-1000-0004",
+        "VIZ-1000-0005",
+        "VIZ-1000-0006",
+        "HC-V1-001",
+        "HC-V1-002",
+        "HC-V1-003",
+        "HC-V1-004",
+        "HC-V1-005",
+        "HC-V1-006",
+        "HC-V1-007",
+        "HC-V1-008",
+        "HC-V1-009",
+        "HC-V1-010",
+        "HC-V1-011",
+        "HC-V1-012",
+        "HC-V1-013",
+        "HC-V1-014",
+        "HC-V1-015",
+        "HC-V1-016",
+        "HC-V1-017",
+        "HC-V1-018",
+        "HC-V1-019",
+        "HC-V1-020",
+        "HCV-000-1015",
+        "HCV-000-3002",
+        "HCV-000-3003",
+        "HCV-000-3004",
+        "HCV-000-3005",
+        "HCV-000-3006",
+        "HCV-000-3007",
+        "HCV-000-3008",
+        "HCV-000-3009",
+        "HCV-000-3010",
+        "HCV-000-3011",
+        "HCV-000-3012",
+        "HCV-000-3013",
+        "HCV-000-3014",
+        "HCV-000-3015",
+        "HCV-000-3016",
+        "HCV-000-3017",
+        "HCV-000-3018",
+        "HCV-000-3019",
+        "HCV-000-3020",
+        "HCV-000-3021",
+        "HCV-000-3022",
+        "HCV-000-3023",
+        "HCV-000-3024",
+        "HCV-000-3025",
+        "HCV-000-3026",
+        "HCV-000-3027",
+        "HCV-000-3028",
+        "HCV-000-3029",
+        "HCV-000-3030",
+        "HPP1-0124-0001",
+        "HPP1-0124-0002",
+        "HPP1-0124-0003",
+        "HPP1-0124-0004",
+        "HPP1-0124-0005",
+        "HPP1-0124-0006",
+        "HPP1-0124-0007",
+        "HPP1-0124-0008",
+        "HPP1-0124-0009",
+        "HPP1-0124-0010",
+        "HPP1-0124-0011",
+        "HPP1-0124-0012",
+        "HPP1-0124-0013",
+        "HPP1-0124-0014",
+        "HPP1-0124-0015",
+        "HPP1-0124-0016",
+        "HPP1-0124-0017",
+        "HPP1-0124-0018",
+        "HPP1-0124-0019",
+        "HPP1-0124-0020",
+        "HPP1-0124-0021",
+        "HPP1-0124-0022",
+        "HPP1-0124-0023",
+        "HPP1-0124-0024",
+        "HPP1-0124-0025",
+        "HPP1-0124-0026",
+        "HPP1-0124-0027",
+        "HPP1-0124-0028",
+        "HPP1-0124-0029",
+        "HPP1-0124-0030",
+        "HPP1-0124-0031",
+        "HPP1-0124-0032",
+        "HPP1-0124-0033",
+        "HPP1-0124-0034",
+        "HPP1-0124-0035",
+        "HPP1-0124-0036",
+        "HPP1-0124-0037",
+        "HPP1-0124-0038",
+        "HPP1-0124-0039",
+        "HPP1-0124-0040",
+        "HPP1-0124-0041",
+        "HPP1-0124-0042",
+        "HPP1-0124-0043",
+        "HPP1-0124-0044",
+        "HPP1-0124-0045",
+        "HPP1-0124-0046",
+        "HPP1-0124-0047",
+        "HPP1-0124-0048",
+        "HPP1-0124-0049",
+        "HPP1-0124-0050",
+        "HCV-001-0001",
+        "HCV-001-0002",
+        "HCV-001-0003",
+        "HCV-001-0004",
+        "HCV-001-0005",
+        "HCV-001-0006",
+        "HCV-001-0007",
+        "HCV-001-0008",
+        "HCV-001-0009",
+        "HCV-001-0010",
+        "HCV-001-0011",
+        "HCV-001-0012",
+        "HCV-001-0013",
+        "HCV-001-0014",
+        "HCV-001-0015",
+        "HCV-001-0016",
+        "HCV-001-0017",
+        "HCV-001-0018",
+        "HCV-001-0019",
+        "HCV-001-0020",
+        "HCV-001-0021",
+        "HCV-001-0022",
+        "HCV-001-0023",
+        "HCV-001-0024",
+        "HCV-001-0025",
+        "HCV-001-0026",
+        "HCV-001-0027",
+        "HCV-001-0028",
+        "HCV-001-0029",
+        "HCV-001-0030",
+        "HCV-001-0031",
+        "HCV-001-0032",
+        "HCV-001-0033",
+        "HCV-001-0034",
+        "HCV-001-0003",
+        "HCV-001-0035",
+        "HCV-001-0036",
+        "HCV-001-0037",
+        "HCV-001-0038",
+        "HCV-001-0039",
+        "HCV-001-0040",
+        "HCV-001-0041",
+        "HCV-001-0042",
+        "HCV-001-0043",
+        "HCV-001-0044",
+        "HCV-001-0045",
+        "HCV-001-0046",
+        "HCV-001-0047",
+        "HCV-001-0048",
+        "HCV-001-0049",
+        "HCV-001-0050",
+    )

-    const val ABS10LED1MMLL = "ABS10LED1MMLL"
-    const val ABS10LED1MMUL = "ABS10LED1MMUL"
-    const val ABS10LED2MMLL = "ABS10LED2MMLL"
-    const val ABS10LED2MMUL = "ABS10LED2MMUL"
+    const val password = "SMI@12345"

    const val KIT_NUMBER = "KitNumber"
    const val KIT_COUNT = "KitCount"
@@ -106,10 +235,7 @@ object Constants {
    const val BUFFER_VALUE_3 = "BufferValue3"
    const val BUFFER_VALUE_4 = "BufferValue4"
    const val DEVICE_ID = "DEVICE_ID"
-    const val LABNAME = "LAB_NAME"
-    const val CUVETTE_SIZE = "CUVETTE_SIZE"
-    const val LAST_UPDATED = "LAST_UPDATED"
-    const val IS_TOKEN_AVAILABLE = "IS_TOKEN_AVAILABLE"
+
    const val BUFFER_LED_LOWER_BOUND = 21000
    const val BUFFER_LED_UPPER_BOUND = 23500

@@ -1086,8 +1212,7 @@ object Constants {
    )

    const val INCUBATION_TIME_MIN = 0
-    const val INCUBATION_TIME_MAX = 300
-    const val MAX_KIT_TIME = 240
+    const val INCUBATION_TIME_MAX = 1400
    const val BATTERY_LEVEL_MIN = Int.MIN_VALUE

    const val PQ_MODE = true
@@ -1584,48 +1709,5 @@ 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.07
-    const val normalMax10mm = 0.23
-    const val negativeBorderlineMin10mm = 0.23
-    const val negativeBorderlineMax10mm = 0.27
-    const val sickleCellTraitMin10mm = 0.27
-    const val sickleCellTraitMax10mm = 0.31
-    const val positiveForSickleCellMin10mm = 0.31
-    const val positiveForSickleCellMax10mm = 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
-    const val normalMin2mm = 0.1
-    const val normalMax2mm = 0.23
-    const val negativeBorderlineMin2mm = 0.23
-    const val negativeBorderlineMax2mm = 0.25
-    const val sickleCellTraitMin2mm = 0.25
-    const val sickleCellTraitMax2mm = 0.31
-    const val positiveForSickleCellMin2mm = 0.31
-    const val positiveForSickleCellMax2mm = 0.45
-    const val sickleCellDiseaseMin2mm = 0.45
-    const val sickleCellDiseaseMax2mm = 0.7

-    const val min2mmLed1 = 0.34
-    const val max2mmLed1 = 1.48
-    const val min2mmLed2 = 0.04
-    const val max2mmLed2 = 0.33
-    const val min10mmLed1 = 0.22
-    const val max10mmLed1 = 1.12
-    const val min10mmLed2 = 0.05
-    const val max10mmLed2 = 0.41
-
-    const val bufferMinLed1 = 21000.00
-    const val bufferMaxLed1 = 23000.00
-    const val bufferMinLed2 = 17000.00
-    const val bufferMaxLed2 = 19000.00
 }
--- a/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.constant

 enum class HemoCubeCommands(val command: String) {
@@ -28,7 +15,4 @@ enum class HemoCubeCommands(val command: String) {
    SECOND_GAIN_COMMAND("U\r"),
    THIRD_GAIN_COMMAND("V\r"),
    FORTH_GAIN_COMMAND("W\r"),
-    CHECK_CUVETTE_COMMAND("L\r"),
-    CHECK_TEMP_COMMAND("A\r"),
-    J_COMMAND("J\r"),
 }
--- a/app/src/main/java/com/example/hpostesting/data/constant/LanguageManager.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/LanguageManager.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.constant

 import android.content.Context
--- a/app/src/main/java/com/example/hpostesting/data/constant/TestRightCommands.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/TestRightCommands.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.constant

 enum class TestRightCommands(val command: String) {
--- a/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.constant

 enum class TestStatus(val code: Double) {
@@ -23,20 +10,11 @@ enum class TestStatus(val code: Double) {
    FIRST_EMPTY_AIR_READING_PRINT_COMPLETED(4.4),
    EPROM_ADC_RETRIEVAL_STARTED(4.5),
    EPROM_ADC_RETRIEVAL_COMPLETED(4.6),
-    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.4),
-    BUFFER_COMPLETED(5.5),
+    BUFFER_STARTED(4.7),
+    BUFFER_COMPLETED(5.0),
    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/Converters.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/Converters.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao

 import androidx.room.TypeConverter
--- a/app/src/main/java/com/example/hpostesting/data/dao/DeviceDao.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/DeviceDao.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao

 import androidx.lifecycle.LiveData
--- a/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeBufferDao.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeBufferDao.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao

 import androidx.lifecycle.LiveData
--- a/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao

 import androidx.lifecycle.LiveData
@@ -18,7 +5,6 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Update
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
@Dao
@@ -26,12 +12,6 @@ interface HemoCubeDao {
    @Query("SELECT * from hemo_cube_test_table")
    fun getAll(): LiveData<List<HemoCubeTestData>>

-    @Query("SELECT * from hemo_cube_test_table WHERE molbioFlag=0")
-    fun getMolbioPending(): List<HemoCubeTestData>
-
-    @Query("SELECT * from hemo_cube_test_table WHERE localFlag=0")
-    fun getFirebasePending():List<HemoCubeTestData>
-
    @Insert(onConflict = OnConflictStrategy.REPLACE)
    suspend fun insertAll(hemoCubeTestData: HemoCubeTestData)

@@ -40,8 +20,7 @@ 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)

@@ -51,11 +30,7 @@ interface HemoCubeDao {
    @Query("UPDATE hemo_cube_test_table SET isCSVCreated = :newValue WHERE _id = :id")
    suspend fun updateCSVFieldById(id: String, newValue: Boolean)

-    @Query("SELECT * from hemo_cube_test_table WHERE localFlag = 0")
-    fun getPendingUser(): LiveData<List<HemoCubeTestData>>
-
-    @Update
-    suspend fun updateTest(hemoCubeTestData: HemoCubeTestData)
-
+    @Query("SELECT * from hemo_cube_test_table WHERE molbioFlag = :status")
+    suspend fun getPendingUser(status: Boolean): List<HemoCubeTestData>

 }
--- a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao

 import androidx.room.Database
@@ -23,7 +10,7 @@ import com.example.hpostesting.data.model.patient.UserData

@Database(
    entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
-    version = 38,
+    version = 27,
    exportSchema = false
 )
@TypeConverters(Converters::class)
--- a/app/src/main/java/com/example/hpostesting/data/dao/UserDao.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/UserDao.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.dao

 import androidx.lifecycle.LiveData
--- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt
+++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.datasource

 import com.example.hpostesting.data.model.patient.HemoCubeTestData
@@ -24,6 +11,4 @@ interface LocalFileDataSource {
    fun exportDataToCSV(
        fileName: String, dataList: List<HemoCubeTestData>,
    ): Boolean
-    fun backUpDataToCSV(fileName: String, dataList: List<HemoCubeTestData>)
-
 }
--- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.datasource

 import android.os.Environment
@@ -54,7 +41,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
                "name",
                "incubationTime",
                "bloodGroup",
-                "age", // Include other fields from the data class
+                "birthYear", // Include other fields from the data class
                "state",
                "abhaId",
                "userImageURL",
@@ -102,15 +89,14 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
            )
            csvWriter.writeNext(header)

-            // Filter and write data rows where testStatus is true
-            val filteredDataList = dataList.filter { it.testStatus == true }
-            for (data in filteredDataList) {
+            // Write data rows
+            for (data in dataList) {
                val row = arrayOf(
                    data._id,
                    data.name,
                    data.incubationTime,
                    data.bloodGroup,
-                    data.age, // Include other fields similarly
+                    data.birthYear, // Include other fields similarly
                    data.state,
                    data.abhaId,
                    data.userImageURL,
@@ -166,127 +152,6 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
        }
    }

-    override fun backUpDataToCSV(fileName: String, dataList: List<HemoCubeTestData>) {
-        try {
-            val filePath = File(getExternalStorageDirectory(), fileName)
-            val writer = FileWriter(filePath)
-            val csvWriter = CSVWriter(writer)
-            // Write CSV header
-            val header = arrayOf(
-                "_id",
-                "name",
-                "incubationTime",
-                "bloodGroup",
-                "age", // Include other fields from the data class
-                "state",
-                "abhaId",
-                "userImageURL",
-                "location",
-                "reportUploadTime",
-                "testType",
-                "testTime",
-                "testStatus",
-                "gender",
-                "localFlag", // Add more fields as necessary
-                "deviceId",
-                "appVersion",
-                "deviceSerialNumber",
-                "deviceType",
-                "kitSerial",
-                "resultData",
-                "led1Buffer",
-                "led2Buffer",
-                "led3Buffer",
-                "led4Buffer",
-                "led1Sample",
-                "led2Sample",
-                "led3Sample",
-                "led4Sample",
-                "led1Average",
-                "led2Average",
-                "led3Average",
-                "led4Average",
-                "abs1",
-                "abs2",
-                "abs3",
-                "abs4",
-                "deviceRatio",
-                "calculatedRatio",
-                "predictedDenovixRatio",
-                "coefficients",
-                "classificationResult",
-                "prdClassification",
-                "errorMessages",
-                "batteryLevel",
-                "batteryCapacity",
-                "batteryMaxCapacity",
-                "batteryTemperature",
-                "batteryVoltage"
-            )
-            csvWriter.writeNext(header)
-
-            // Filter and write data rows where testStatus is true
-            val filteredDataList = dataList.filter { it.testStatus == true }
-            for (data in filteredDataList) {
-                val row = arrayOf(
-                    data._id,
-                    data.name,
-                    data.incubationTime,
-                    data.bloodGroup,
-                    data.age, // Include other fields similarly
-                    data.state,
-                    data.abhaId,
-                    data.userImageURL,
-                    data.location?.toString(),
-                    data.reportUploadTime ?: "",
-                    data.testType ?: "",
-                    data.testTime ?: "",
-                    data.testStatus?.toString() ?: "",
-                    data.gender,
-                    data.localFlag.toString(),
-                    data.deviceId ?: "",
-                    data.appVersion ?: "",
-                    data.deviceSerialNumber,
-                    data.deviceType,
-                    data.kitSerial,
-                    data.resultData,
-                    data.led1Buffer?.toString() ?: "",
-                    data.led2Buffer?.toString() ?: "",
-                    data.led3Buffer?.toString() ?: "",
-                    data.led4Buffer?.toString() ?: "",
-                    data.led1Sample?.toString() ?: "",
-                    data.led2Sample?.toString() ?: "",
-                    data.led3Sample?.toString() ?: "",
-                    data.led4Sample?.toString() ?: "",
-                    data.led1Average?.toString() ?: "",
-                    data.led2Average?.toString() ?: "",
-                    data.led3Average?.toString() ?: "",
-                    data.led4Average?.toString() ?: "",
-                    data.abs1?.toString() ?: "",
-                    data.abs2?.toString() ?: "",
-                    data.abs3?.toString() ?: "",
-                    data.abs4?.toString() ?: "",
-                    data.deviceRatio?.toString() ?: "",
-                    data.calculatedRatio?.toString() ?: "",
-                    data.predictedDenovixRatio?.toString() ?: "",
-                    data.coefficients ?: "",
-                    data.classificationResult,
-                    data.prdClassification,
-                    data.errorMessages,
-                    data.batteryLevel,
-                    data.batteryCapacity,
-                    data.batteryMaxCapacity,
-                    data.batteryTemperature,
-                    data.batteryVoltage
-                )
-                csvWriter.writeNext(row)
-            }
-            writer.close()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
-    }
-
    private fun getExternalStorageDirectory(): File {
        val folder = File(Environment.getExternalStorageDirectory(), "HposFolder")

--- a/app/src/main/java/com/example/hpostesting/data/model/AadharCard.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/AadharCard.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model


--- a/app/src/main/java/com/example/hpostesting/data/model/CalculationVariableForTest.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/CalculationVariableForTest.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model

 data class CalculationVariableForTest(
--- a/app/src/main/java/com/example/hpostesting/data/model/ErrorMessage.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/ErrorMessage.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model

 data class ErrorMessage (
--- a/app/src/main/java/com/example/hpostesting/data/model/Location.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/Location.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model

 data class Location(
--- a/app/src/main/java/com/example/hpostesting/data/model/PatientData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/PatientData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model

 import com.example.hpostesting.data.model.test.TestRightResultType
--- a/app/src/main/java/com/example/hpostesting/data/model/PendingUploads.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/PendingUploads.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model

 import java.util.Calendar
--- a/app/src/main/java/com/example/hpostesting/data/model/Response.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/Response.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model

 sealed class Response<out R> {
--- a/app/src/main/java/com/example/hpostesting/data/model/TestState.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/TestState.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model

 import com.example.hpostesting.data.constant.Constants
--- a/app/src/main/java/com/example/hpostesting/data/model/calibration/CalibrationData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/calibration/CalibrationData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.calibration

 data class CalibrationData (
--- a/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/AdditionalDetails.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/AdditionalDetails.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.devicediagnostics

 data class AdditionalDetails(
--- a/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.devicediagnostics

 data class DeviceDiagnosticsData(
--- a/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsRequest.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsRequest.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.devicediagnostics

 data class DeviceDiagnosticsRequest(
--- a/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsResponse.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsResponse.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.devicediagnostics

 import com.google.gson.annotations.SerializedName
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Credentials.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision

 data class Credentials(
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/Device.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision

 data class Device(
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision

 data class DeviceProvisionData(
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionRequest.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision

 data class DeviceProvisionRequest(
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceProvisionResponse.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision

 import com.google.gson.annotations.SerializedName
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceType.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision

 data class DeviceType(
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/DeviceUser.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision

 data class DeviceUser(
--- a/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/ProvisionData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/deviceprovision/ProvisionData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.deviceprovision

 data class ProvisionData(
--- a/app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.diagnostics

 data class DiagnosticsData(
--- a/app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.jig

 data class JigData(
--- a/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.log

 data class UploadLogsData(
--- a/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/log/UploadLogsResponse.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.log

 import com.google.gson.annotations.SerializedName
--- a/app/src/main/java/com/example/hpostesting/data/model/login/Device.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/Device.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login

 data class Device(
--- a/app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/DeviceType.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login

 data class DeviceType(
--- a/app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/DeviceUser.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login

 data class DeviceUser(
--- a/app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/LoginData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login

 data class LoginData(
--- a/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login

 data class LoginRequest(
--- a/app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/login/LoginResponse.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.login

 import com.google.gson.annotations.SerializedName
--- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.molbioresult

 import com.example.hpostesting.data.model.patient.HemoCubeTestData
--- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.molbioresult

 import com.example.hpostesting.data.model.patient.HemoCubeTestData
--- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultRequest.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.molbioresult

 data class MolbioV2ResultRequest(
--- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultResponse.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.molbioresult

 import com.google.gson.annotations.SerializedName
--- a/app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/molbioresult/RawData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.molbioresult

 import com.example.hpostesting.data.model.patient.UserData
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/BufferCheckData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/patient/BufferCheckData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.patient

 import androidx.room.Entity
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/DeviceData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/patient/DeviceData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.patient

 import androidx.room.Entity
--- 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
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.patient

 import androidx.room.Entity
@@ -18,13 +5,12 @@ import androidx.room.PrimaryKey

@Entity(tableName = "hemo_cube_test_table")
 data class HemoCubeTestData(
-    @PrimaryKey(autoGenerate = true)
-    var sampleid: Int = 0,
+    @PrimaryKey
    var _id: String = "",
    var name: String = "",
    var incubationTime: String = "",
    var bloodGroup: String = "",
-    var age: String = "",
+    var birthYear: String = "",
    var state: String = "",
    var abhaId: String = "",
    var userImageURL: String = "",
@@ -103,13 +89,6 @@ data class HemoCubeTestData(
    var quickCapture: Boolean = false,
    var solution: String? = "",
    var concentration: String? = "",
-    var filter: String? = "",
    var volume: String? = "",
    var isCSVCreated: Boolean = false,
-    var labName: String? = "",
-    var cuvetteSize: String? = "",
-    var district: String? = "",
-    var centerName: String? = "",
-    var ipAddress:String?= "",
-    var configUpdatedRecent:String?= ""
 )
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/PatientData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/patient/PatientData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.patient

 import java.util.Date
--- 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
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.patient

 import androidx.room.Entity
@@ -24,7 +11,7 @@ data class UserData(
    var name: String = "",
    var incubationTime: String = "",
    var gender: String = "",
-    var age: String = "",
+    var birthYear: String = "",
    var abhaId: String = "",
    var bloodGroup: String = "",
    var userImageURL: String = "",
@@ -43,7 +30,6 @@ data class UserData(
    var result: TestRightResultType? = null,
    var resultRatio: Double? = null,
    var prdClassification: String = "",
-    var sampleid: Int = 0
 ) {
    enum class Gender {
        MALE,
@@ -60,10 +46,8 @@ data class UserData(
 fun UserData.toHemoCubeTestData() = HemoCubeTestData(
    _id = _id,
    name = name,
-    sampleid = sampleid,
    bloodGroup = bloodGroup,
-    incubationTime = incubationTime,
-    age = age,
+    birthYear = birthYear,
    gender = gender,
    state = state,
    abhaId = abhaId,
--- a/app/src/main/java/com/example/hpostesting/data/model/test/TestRightCalculationData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/test/TestRightCalculationData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.test

 data class TestRightCalculationData(
--- a/app/src/main/java/com/example/hpostesting/data/model/test/TestRightDeviceConstants.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/test/TestRightDeviceConstants.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.test

 data class TestRightDeviceConstants(
--- a/app/src/main/java/com/example/hpostesting/data/model/test/TestRightResultType.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/test/TestRightResultType.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.test

 enum class TestRightResultType {
--- 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
@@ -1,20 +1,6 @@
-/*
- * // 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.data.model.test

 enum class TestType {
    SICKLECERT,
-    SICKLEFIND,
-    HB_EST
+    SICKLEFIND
 }
--- a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.updates

 data class CheckUpdateData(
--- a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateRequest.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.updates

 data class CheckUpdateRequest(
--- a/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/updates/CheckUpdateResponse.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.updates

 import com.google.gson.annotations.SerializedName
--- a/app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/updates/DeviceUpdateRequest.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.data.model.updates

 data class DeviceUpdateRequest(
--- a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
@@ -1,19 +1,7 @@
-/*
- * // 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.data.repository

 import android.net.Uri
+import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.model.PendingUploads
@@ -36,12 +24,11 @@ import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.CheckUpdateResponse
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
-import com.example.hpostesting.firebase.FirebaseManager
-import com.example.hpostesting.util.Result
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
-import com.google.firebase.storage.FirebaseStorage
+import com.google.firebase.storage.ktx.storage
 import kotlinx.coroutines.tasks.await
 import okhttp3.MultipartBody
 import okhttp3.ResponseBody
@@ -55,15 +42,10 @@ 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 localdb: FirebaseFirestore
-        get() = firebaseManager.getCurrentFirestoreF()
-
-    private val localStg: FirebaseStorage
-        get() = firebaseManager.getCurrentStorageF()
-
+    private val db: FirebaseFirestore = Firebase.firestore
+    private val storage = Firebase.storage

    private suspend fun <T : Any> safeApiCall(apiCall: suspend () -> T): Result<T> {
        return try {
@@ -94,8 +76,8 @@ class DatabaseRepository @Inject constructor(
        return safeApiCall { molbioResultApi.checkUpdate(checkUpdateRequest) }
    }

-    override suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): retrofit2.Response<ResponseBody> {
-        return molbioResultApi.deviceUpdate(deviceUpdateRequest)
+    override suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody> {
+        return safeApiCall { molbioResultApi.deviceUpdate(deviceUpdateRequest) }
    }

    override suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse> {
@@ -113,36 +95,39 @@ class DatabaseRepository @Inject constructor(
    override suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
        return try {
            val userdata =
-                localdb.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
            if (userdata.documents.isNotEmpty()) {
                userdata.documents.forEach {
-                    localdb.collection("patientData").document(it.id).update("testStatus", true)
+                    db.collection("patientData").document(it.id).update("testStatus", true)
                }
            }
-            localdb.collection("testData").add(data).await()
+            db.collection("testData").add(data).await()
            Response.Success(data._id)
        } catch (e: Exception) {
            Response.Error(e)
        }
    }
-    override suspend fun addQcTestToDatabase(data: HemoCubeTestData?): Response<String> {
-        return try {
-
-            localdb.collection("qcData").add(data!!).await()
-            Response.Success(data._id)
-
-        } catch (e: Exception) {
-            Response.Error(e)
-        }
-    }

    override suspend fun addTestToDatabase(data: UserData?): Response<String> {
-        TODO("Not yet implemented")
+        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("testData").add(data).await()
+            Response.Success(data._id)
+        } catch (e: Exception) {
+            Firebase.crashlytics.recordException(e)
+            Response.Error(e)
+        }
    }

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

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

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

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

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

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

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

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

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

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

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

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

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

    override suspend fun uploadDeviceId(data: DeviceData): Response<String>? {
        return try {
-            localdb.collection("devices").add(data!!).await()
+            db.collection("devices").add(data!!).await()
            Response.Success(data.deviceId)
        } catch (e: Exception) {
            Firebase.crashlytics.recordException(e)
@@ -263,22 +247,4 @@ class DatabaseRepository @Inject constructor(
    override fun <UserData> addTestToDatabase(testDetails: UserData): Any {
        TODO("Not yet implemented")
    }
-
-    override suspend fun addTestToDatabasefornew(data: HemoCubeTestData?): Response<String> {
-            return try {
-                val userdata =
-                    localdb.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
-                if (userdata.documents.isNotEmpty()) {
-                    userdata.documents.forEach {
-                        localdb.collection("patientData").document(it.id).update("testStatus", true)
-                    }
-                }
-                localdb.collection("testData").add(data).await()
-                Response.Success(data._id)
-            } catch (e: Exception) {
-                Firebase.crashlytics.recordException(e)
-                Response.Error(e)
-            }
-        }
-
 }
--- a/app/src/main/java/com/example/hpostesting/data/repository/LocalFileRepository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/LocalFileRepository.kt
@@ -1,19 +1,12 @@
-/*
- * // 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.data.repository

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

 class LocalFileRepository(private val localFileDataSource: LocalFileDataSource) {
    fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>) =
--- a/app/src/main/java/com/example/hpostesting/data/repository/Repository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/Repository.kt
@@ -1,19 +1,6 @@
-/*
- * // 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.data.repository

-import com.example.hpostesting.util.Result
+import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
@@ -38,8 +25,6 @@ import okhttp3.ResponseBody

 interface Repository {
    suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String>
-    suspend fun addQcTestToDatabase(data: HemoCubeTestData?): Response<String>
-    suspend fun addTestToDatabasefornew(data: HemoCubeTestData?): Response<String>

    suspend fun addTestToDatabase(data: UserData?): Response<String>

@@ -65,7 +50,7 @@ interface Repository {

    suspend fun checkUpdate(checkUpdateRequest: CheckUpdateRequest): Result<CheckUpdateResponse>

-    suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): retrofit2.Response<ResponseBody>
+    suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody>
    suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse>
    suspend fun downloadClientCertificate(): Result<ResponseBody>
    suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse>
--- a/app/src/main/java/com/example/hpostesting/domain/AuthInterceptor.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/AuthInterceptor.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.domain

 import android.content.SharedPreferences
--- a/app/src/main/java/com/example/hpostesting/domain/CheckUpdateWorker.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/CheckUpdateWorker.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.domain

 import android.content.Context
--- a/app/src/main/java/com/example/hpostesting/domain/LogFileManager.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/LogFileManager.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.domain

 import android.content.Context
--- a/app/src/main/java/com/example/hpostesting/domain/LogFileManagerImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/LogFileManagerImpl.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.domain

 import android.content.Context
@@ -44,6 +31,7 @@ class LogFileManagerImpl @Inject constructor(private val context: Context) : Log

            file
        } catch (e: IOException) {
+//            Log.e("LogFileManager", "Error creating log file: ${e.message}")
            null
        }
    }
--- a/app/src/main/java/com/example/hpostesting/domain/ResultCalculationWithMaxImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/ResultCalculationWithMaxImpl.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.domain

 import com.example.hpostesting.data.constant.Constants
@@ -38,21 +25,17 @@ class ResultCalculationWithMaxImpl : TestRightResultCalculation {
        var wavelengthOfAbsorbanceTwo = 0.0

        for (each in wavelengthToAbsorbance) {
-            when {
-                each[0] >= startWavelengthOne && each[0] < endWavelengthOne -> {
-                    if (each[1] > maxAbsorbanceAtOne) {
-                        maxAbsorbanceAtOne = each[1]
-                        wavelengthOfAbsorbanceOne = each[0]
-                    }
+            if (each[0] >= startWavelengthOne && each[0] < endWavelengthOne) {
+                if (each[1] > maxAbsorbanceAtOne) {
+                    maxAbsorbanceAtOne = each[1]
+                    wavelengthOfAbsorbanceOne = each[0]
                }
            }
-            when {
-                each[0] >= startWavelengthTwo && each[0] < endWavelengthTwo -> {
-        //                maxAbsorbanceAtTwo = max(maxAbsorbanceAtTwo, each[1])
-                    if (each[1] > maxAbsorbanceAtTwo) {
-                        maxAbsorbanceAtTwo = each[1]
-                        wavelengthOfAbsorbanceTwo = each[0]
-                    }
+            if (each[0] >= startWavelengthTwo && each[0] < endWavelengthTwo) {
+//                maxAbsorbanceAtTwo = max(maxAbsorbanceAtTwo, each[1])
+                if (each[1] > maxAbsorbanceAtTwo) {
+                    maxAbsorbanceAtTwo = each[1]
+                    wavelengthOfAbsorbanceTwo = each[0]
                }
            }
        }
@@ -74,32 +57,26 @@ class ResultCalculationWithMaxImpl : TestRightResultCalculation {
            val value = absorbanceAtWaveTwo / absorbanceAtWaveOne
            testRightCalculationData.ratioValue = value

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

--- a/app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/SaveRawData.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.domain

 import android.util.Log
@@ -27,6 +14,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
    fun saveCsv(folderPath: String, fileName: String, matrix: ArrayList<ArrayList<Double>>) {
 //        try {
        val fullPath = "$folderPath/$fileName"
+//            val writer = CSVWriter(FileWriter(fullPath))

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

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

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

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

 import com.example.hpostesting.data.repository.LocalFileRepository
@@ -24,6 +11,7 @@ class SaveRawDataTest(private val localFileRepository: LocalFileRepository) {

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

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

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

        val filePath = folderPath + fileName
        var stringToWrite = ""
--- a/app/src/main/java/com/example/hpostesting/domain/SickleFindResultCaluculationWithMaxImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/SickleFindResultCaluculationWithMaxImpl.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.domain

 import com.example.hpostesting.data.constant.Constants
@@ -38,21 +25,17 @@ class SickleFindResultCaluculationWithMaxImpl : TestRightResultCalculation{
        var wavelengthOfAbsorbanceTwo = 0.0

        for (each in wavelengthToAbsorbance) {
-            when {
-                each[0] >= startWavelengthOne && each[0] < endWavelengthOne -> {
-                    if (each[1] > maxAbsorbanceAtOne) {
-                        maxAbsorbanceAtOne = each[1]
-                        wavelengthOfAbsorbanceOne = each[0]
-                    }
+            if (each[0] >= startWavelengthOne && each[0] < endWavelengthOne) {
+                if (each[1] > maxAbsorbanceAtOne) {
+                    maxAbsorbanceAtOne = each[1]
+                    wavelengthOfAbsorbanceOne = each[0]
                }
            }
-            when {
-                each[0] >= startWavelengthTwo && each[0] < endWavelengthTwo -> {
-        //                maxAbsorbanceAtTwo = max(maxAbsorbanceAtTwo, each[1])
-                    if (each[1] > maxAbsorbanceAtTwo) {
-                        maxAbsorbanceAtTwo = each[1]
-                        wavelengthOfAbsorbanceTwo = each[0]
-                    }
+            if (each[0] >= startWavelengthTwo && each[0] < endWavelengthTwo) {
+//                maxAbsorbanceAtTwo = max(maxAbsorbanceAtTwo, each[1])
+                if (each[1] > maxAbsorbanceAtTwo) {
+                    maxAbsorbanceAtTwo = each[1]
+                    wavelengthOfAbsorbanceTwo = each[0]
                }
            }
        }
@@ -74,22 +57,18 @@ class SickleFindResultCaluculationWithMaxImpl : TestRightResultCalculation{
            val value = absorbanceAtWaveTwo / absorbanceAtWaveOne
            testRightCalculationData.ratioValue = value

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

--- a/app/src/main/java/com/example/hpostesting/domain/TestRightResultCalculation.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/TestRightResultCalculation.kt
@@ -1,16 +1,3 @@
-/*
- * // 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.domain

 import com.example.hpostesting.data.model.test.TestRightCalculationData
--- a/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
@@ -1,17 +1,4 @@
-/*
- * // 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.di
+package com.example.hpostesting.domain.di

 import android.app.Application
 import android.content.Context
@@ -20,7 +7,7 @@ import android.content.res.AssetManager
 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.data.api.PropertyProvider
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
@@ -35,20 +22,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.PropertyProvider
+import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.UsbServiceListenerImpl
 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
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import net.sqlcipher.database.SQLiteDatabase
-import net.sqlcipher.database.SupportFactory
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
@@ -63,12 +44,9 @@ object AppModule {
    @Provides
    @Singleton
    fun provideMyDatabase(@ApplicationContext context: Context): MyDatabase {
-        val passphraseBytes: ByteArray = SQLiteDatabase.getBytes(Constants.passphrase.toCharArray())
-        val factory = SupportFactory(passphraseBytes)
-
        return Room.databaseBuilder(
            context, MyDatabase::class.java, "my_database"
-        ).openHelperFactory(factory).fallbackToDestructiveMigration().build()
+        ).fallbackToDestructiveMigration().build()
    }

    @Provides
@@ -110,52 +88,22 @@ 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(
-            firebaseManager = firebaseManager,
-            molbioAuthApi = molbioAuthApi,
-            molbioResultApi = molbioResultApi
-        )
+        return DatabaseRepository(molbioAuthApi = molbioAuthApi, molbioResultApi = molbioResultApi)
    }

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

    @Provides
@@ -199,7 +147,7 @@ object AppModule {
    @Provides
    @Singleton
    fun provideRetrofit(
-        propertyProvider: PropertyProvider, @Named("Auth") client: OkHttpClient
+        propertyProvider: PropertyProvider,@Named("Auth") client: OkHttpClient
    ): Retrofit {
        return Retrofit.Builder().baseUrl(propertyProvider.getProperty("BASE_URL")).client(client)
            .addConverterFactory(GsonConverterFactory.create()).build()
@@ -239,9 +187,4 @@ object AppModule {
    fun provideUsbServiceListener(context: Context): UsbServiceListener {
        return UsbServiceListenerImpl(context)
    }
-
-
-
-
-
 }
--- a/app/src/main/java/com/example/hpostesting/encryption/Encryption.kt
+++ b/app/src/main/java/com/example/hpostesting/encryption/Encryption.kt
@@ -1,83 +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.encryption
-
-import android.util.Base64
-import java.security.SecureRandom
-import javax.crypto.Cipher
-import javax.crypto.SecretKeyFactory
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.PBEKeySpec
-import javax.crypto.spec.SecretKeySpec
-
-object Encryption {
-    //private const val AES_MODE = "AES/CBC/PKCS5Padding"
-    private const val AES_MODE= "AES/GCM/NoPadding"
-    private const val KEY_SPEC_ALGORITHM = "PBKDF2WithHmacSHA1"
-    private const val SALT = "Bigtec"
-    private const val ITERATION_COUNT = 10000
-    private const val KEY_LENGTH = 256
-    private val FIXED_IV = byteArrayOf(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15)
-
-    fun encrypt(textToEncrypt: String, password: String): String {
-        val salt = ByteArray(16)
-        SecureRandom().nextBytes(salt)
-        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
-        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
-        val tmp = factory.generateSecret(spec)
-        val key = SecretKeySpec(tmp.encoded, "AES")
-        val cipher = Cipher.getInstance(AES_MODE)
-        cipher.init(Cipher.ENCRYPT_MODE, key, IvParameterSpec(FIXED_IV))
-        val encryptedBytes = cipher.doFinal(textToEncrypt.toByteArray(Charsets.UTF_8))
-        return Base64.encodeToString(salt + encryptedBytes, Base64.NO_WRAP)
-    }
-
-    fun decrypt(encryptedText: String, password: String): String {
-        val salt = encryptedText.substring(0, 24).toByteArray()
-        val encryptedBytes = Base64.decode(encryptedText.substring(24), Base64.NO_WRAP)
-        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
-        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
-        val tmp = factory.generateSecret(spec)
-        val key = SecretKeySpec(tmp.encoded, "AES")
-        val cipher = Cipher.getInstance(AES_MODE)
-        cipher.init(Cipher.DECRYPT_MODE, key, IvParameterSpec(FIXED_IV))
-        val decryptedBytes = cipher.doFinal(encryptedBytes)
-        return String(decryptedBytes, Charsets.UTF_8)
-    }
-//    fun encrypt(textToEncrypt: String, password: String): String {
-//        val salt = SALT.toByteArray()
-//        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
-//        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
-//        val tmp = factory.generateSecret(spec)
-//        val key = SecretKeySpec(tmp.encoded, "AES")
-//        val cipher = Cipher.getInstance(AES_MODE)
-//        cipher.init(Cipher.ENCRYPT_MODE, key, IvParameterSpec(FIXED_IV))
-//        val encryptedBytes = cipher.doFinal(textToEncrypt.toByteArray(Charsets.UTF_8))
-//        return Base64.encodeToString(encryptedBytes, Base64.NO_WRAP)
-//    }
-//
-//    fun decrypt(encryptedText: String, password: String): String {
-//        val salt = SALT.toByteArray()
-//        val encryptedBytes = Base64.decode(encryptedText, Base64.NO_WRAP)
-//        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
-//        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
-//        val tmp = factory.generateSecret(spec)
-//        val key = SecretKeySpec(tmp.encoded, "AES")
-//        val cipher = Cipher.getInstance(AES_MODE)
-//        cipher.init(Cipher.DECRYPT_MODE, key, IvParameterSpec(FIXED_IV))
-//        val decryptedBytes = cipher.doFinal(encryptedBytes)
-//        return String(decryptedBytes, Charsets.UTF_8)
-//    }
-
-}
--- a/app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt
+++ b/app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt
@@ -1,156 +0,0 @@
-package com.example.hpostesting.firebase
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-import android.content.Context
-import android.content.Intent
-import android.os.Process
-import com.google.firebase.FirebaseApp
-import com.google.firebase.FirebaseOptions
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.storage.FirebaseStorage
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-class FirebaseManager @Inject constructor(private val context: Context) {
-
-    private val sharedPreferences =
-        context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)
-
-    var currentFirestore: FirebaseFirestore = FirebaseFirestore.getInstance()
-    var currentStorage: FirebaseStorage = FirebaseStorage.getInstance()
-    var updateStatus = false
-
-    private val defaultServers = listOf(
-        // i have it in different place look down
-        firebaseConfig1, firebaseConfig2, firebaseConfig3,
-    )
-
-    init {
-        val lastSelectedServer = getLastSelectedServer()
-        switchServer(lastSelectedServer)
-    }
-
-    fun getCurrentFirestoreF(): FirebaseFirestore = currentFirestore
-    fun getCurrentStorageF(): FirebaseStorage = currentStorage
-
-    fun switchServer(firebaseConfig: FirebaseConfig) {
-        saveSelectedServer(firebaseConfig)
-        val firebaseApp = getOrInitializeFirebaseApp(firebaseConfig)
-        currentFirestore = FirebaseFirestore.getInstance(firebaseApp)
-        currentStorage = FirebaseStorage.getInstance(firebaseApp)
-        updateStatus = true
-
-    }
-
-    private fun getOrInitializeFirebaseApp(firebaseConfig: FirebaseConfig): FirebaseApp {
-        val existingApp = FirebaseApp.getApps(context).find { it.name == firebaseConfig.serverName }
-
-        return if (existingApp != null) {
-
-            existingApp
-        } else {
-
-            val options = FirebaseOptions.Builder().setProjectId(firebaseConfig.projectId)
-                .setApplicationId(firebaseConfig.appId).setApiKey(firebaseConfig.apiKey)
-                .setStorageBucket(firebaseConfig.storageBucket).build()
-
-            FirebaseApp.initializeApp(context, options, firebaseConfig.serverName)
-        }
-    }
-
-    private fun saveSelectedServer(firebaseConfig: FirebaseConfig) {
-        with(sharedPreferences.edit()) {
-            putString("selectedServerName", firebaseConfig.serverName)
-            putString("projectId", firebaseConfig.projectId)
-            putString("appId", firebaseConfig.appId)
-            putString("apiKey", firebaseConfig.apiKey)
-            putString("storageBucket", firebaseConfig.storageBucket)
-            apply()
-        }
-
-    }
-
-    fun restartApp() {
-        if (updateStatus) {
-            updateStatus = false
-            delayedRestart(context)
-        }
-    }
-
-    fun getLastSelectedServer(): FirebaseConfig {
-        val selectedServerName =
-            sharedPreferences.getString("selectedServerName", defaultServers.first().serverName)
-        val projectId = sharedPreferences.getString("projectId", defaultServers.first().projectId)
-        val appId = sharedPreferences.getString("appId", defaultServers.first().appId)
-        val apiKey = sharedPreferences.getString("apiKey", defaultServers.first().apiKey)
-        val storageBucket =
-            sharedPreferences.getString("storageBucket", defaultServers.first().storageBucket)
-
-        return FirebaseConfig(
-            serverName = selectedServerName ?: defaultServers.first().serverName,
-            projectId = projectId ?: defaultServers.first().projectId,
-            appId = appId ?: defaultServers.first().appId,
-            apiKey = apiKey ?: defaultServers.first().apiKey,
-            storageBucket = storageBucket ?: defaultServers.first().storageBucket
-        )
-    }
-
-    fun getAvailableServers(): List<FirebaseConfig> {
-        return defaultServers
-    }
-}
-
-fun restartApp(context: Context) {
-    val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
-    intent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-    context.startActivity(intent)
-    Process.killProcess(Process.myPid())
-}
-fun delayedRestart(
-    context: Context,
-    coroutineScope: CoroutineScope = CoroutineScope(Dispatchers.Main),
-    dispatcher: CoroutineDispatcher = Dispatchers.Main
-) {
-    coroutineScope.launch(dispatcher) {
-        delay(5000L)
-        restartApp(context)
-    }
-}
-
-private val firebaseConfig1 = FirebaseConfig(
-    serverName = "dev",
-    apiKey = "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I",
-    appId = "1:650071678820:android:a53292637abb7c0d6c6471",
-    projectId = "hpos-af3cc",
-    storageBucket = "hpos-af3cc.appspot.com"
-)
-
-private val firebaseConfig2 = FirebaseConfig(
-    serverName = "qc-qa",
-    apiKey = "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs",
-    appId = "1:1004619739289:android:3dbcefb10ea99654e5c808",
-    projectId = "hpos-qa",
-    storageBucket = "hpos-qa.appspot.com"
-)
-
-private val firebaseConfig3 = FirebaseConfig(
-    serverName = "prod",
-    apiKey = "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38",
-    appId = "1:121176529204:android:a7bc0842f61e5095bbed61",
-    projectId = "hpos-preprod",
-    storageBucket = "hpos-preprod.appspot.com"
-)
--- a/app/src/main/java/com/example/hpostesting/firebase/dataClass.kt
+++ b/app/src/main/java/com/example/hpostesting/firebase/dataClass.kt
@@ -1,21 +0,0 @@
-package com.example.hpostesting.firebase
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-data class FirebaseConfig(
-    val serverName: String,
-    val apiKey: String,
-    val appId: String,
-    val projectId: String,
-    val storageBucket: String
-)
-
--- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
@@ -1,16 +1,3 @@
-/*
- * // 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

 import android.content.Context
@@ -19,19 +6,21 @@ 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.DataHolder
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.data.model.test.TestType
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.hb_test.HBTestActivity
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import com.example.hpostesting.presentation.testRight.TestRightActivity
+import com.google.android.material.snackbar.Snackbar
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanIntentResult
+import com.journeyapps.barcodescanner.ScanOptions
 import com.zebra.barcode.sdk.sms.ConfigurationUpdateEvent
 import com.zebra.scannercontrol.DCSSDKDefs
 import com.zebra.scannercontrol.DCSSDKDefs.DCSSDK_COMMAND_OPCODE
@@ -42,15 +31,9 @@ import com.zebra.scannercontrol.IDcsSdkApiDelegate
 import com.zebra.scannercontrol.SDKHandler
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityKitScanBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Date
-import java.util.Locale

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

@@ -71,24 +54,8 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        }
    }

-    private fun processScannedData(contents: String) {//edited auto selection of cuvette size
-        if(contents.contains(forD35)){
-            with(sharedPreference.edit()) {
-                putString(Constants.CUVETTE_SIZE, "2mm")
-                apply()
-            }
-            Toast.makeText(this, "Selected cuvette size: 2mm", Toast.LENGTH_SHORT).show()
-            binding.nameEditText.setText(contents)
-        }else if(contents.contains(forD10)){
-            with(sharedPreference.edit()) {
-                putString(Constants.CUVETTE_SIZE, "10mm")
-                apply()
-            }
-            Toast.makeText(this, "Selected cuvette size: 10mm", Toast.LENGTH_SHORT).show()
-            binding.nameEditText.setText(contents)
-        }else{
-            Toast.makeText(this, R.string.invalid_kit, Toast.LENGTH_LONG).show()
-        }
+    private fun processScannedData(contents: String) {
+        binding.nameEditText.setText(contents)
    }

    override fun attachBaseContext(newBase: Context?) {
@@ -98,51 +65,33 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
    }


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

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

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

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


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

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

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

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

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

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

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -150,30 +99,10 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        binding = ActivityKitScanBinding.inflate(layoutInflater)
        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{
-            Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM
-        }
-        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 (DataHolder.sampleReadCounter <= Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE && DataHolder.isReferenceTaken) {
+            DataHolder.selectedTest!!.kitSerial = DataHolder.kitSerial
            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()
-            }
        }

 //        if (checkHemoCubeKitData()) {
@@ -190,31 +119,35 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 //            }
 //        }

-//        try {
-//            if (checkHemoCubeKitData()) {
-//                DataHolder.selectedTest!!.kitSerial =
-//                    sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-//                moveToNext()
-//            } else {
-//                // Handle the case when checkHemoCubeKitData() returns false
-//                with(sharedPreference.edit()) {
-//                    putString(Constants.KIT_NUMBER, "")
-//                    putInt(Constants.KIT_COUNT, 0)
-//                    putString(Constants.BUFFER_VALUE_1, "")
-//                    putString(Constants.BUFFER_VALUE_2, "")
-//                    apply()
-//                }
-//            }
-//        } catch (e: NullPointerException) {
-//            // Handle the NullPointerException here
-//            e.printStackTrace() // You can log the exception for debugging
-//            FirebaseCrashlytics.getInstance().recordException(e)
-//            val errorMessage = "An error occurred: ${e.message}"
-//            val rootView = findViewById<View>(android.R.id.content)
-//            Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
-//            // Optionally, show a user-friendly error message to the user
-//            // Toast.makeText(applicationContext, "An error occurred", Toast.LENGTH_SHORT).show()
-//        }
+        try {
+            if (checkHemoCubeKitData()) {
+                DataHolder.selectedTest!!.kitSerial =
+                    sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
+                moveToNext()
+            } else {
+                // Handle the case when checkHemoCubeKitData() returns false
+                with(sharedPreference.edit()) {
+                    putString(Constants.KIT_NUMBER, "")
+                    putInt(Constants.KIT_COUNT, 0)
+                    putString(Constants.BUFFER_VALUE_1, "")
+                    putString(Constants.BUFFER_VALUE_2, "")
+                    apply()
+                }
+            }
+        } catch (e: NullPointerException) {
+            // Handle the NullPointerException here
+            e.printStackTrace() // You can log the exception for debugging
+            FirebaseCrashlytics.getInstance().recordException(e)
+            val errorMessage = "An error occurred: ${e.message}"
+            val rootView = findViewById<View>(android.R.id.content)
+            Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
+            // Optionally, show a user-friendly error message to the user
+            // Toast.makeText(applicationContext, "An error occurred", Toast.LENGTH_SHORT).show()
+        }
+
+
+        binding.nameEditText.setText("SMI/SC/")
+
        setSupportActionBar(binding.toolbar)

        binding.btnScanNow.setOnClickListener {
@@ -225,39 +158,20 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        binding.btnGo.setOnClickListener {
            val serialNumber = binding.nameEditText.text.toString().trim()
            if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
-                if(serialNumber.contains(forD35)){
-                    with(sharedPreference.edit()) {
-                        putString(Constants.CUVETTE_SIZE, "2mm")
-                        apply()
-                    }
-                    Toast.makeText(this, "Selected cuvette size: 2mm", Toast.LENGTH_SHORT).show()
-                }else if(serialNumber.contains(forD10)){
-                    with(sharedPreference.edit()) {
-                        putString(Constants.CUVETTE_SIZE, "10mm")
-                        apply()
-                    }
-                    Toast.makeText(this, "Selected cuvette size: 10mm", Toast.LENGTH_SHORT).show()
-                }
-                val kitTime = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                ).format(Calendar.getInstance().time).toString()
                if (DataHolder.selectedTest == null) {
                    with(sharedPreference.edit()) {
                        putString(
                            Constants.KIT_NUMBER, binding.nameEditText.text.toString()
                        )
-                        putString(Constants.BUFFER_VALUE_1, "")
-                        putString(Constants.BUFFER_VALUE_2, "")
-                        putString(Constants.KIT_TIME, kitTime)
                        putInt(Constants.KIT_COUNT, 1)
                        apply()
                    }
-                    DataHolder.kitSerial = binding.nameEditText.text.toString()
                    Toast.makeText(
                        applicationContext,
                        R.string.kit_updated,
                        Toast.LENGTH_SHORT
                    ).show()
+
                    val i = Intent(applicationContext, DashboardActivity::class.java)
                    startActivity(i)
                    finish()
@@ -265,9 +179,6 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
                    DataHolder.kitSerial = binding.nameEditText.text.toString()
                    DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
                    with(sharedPreference.edit()) {
-                        putString(Constants.BUFFER_VALUE_1, "")
-                        putString(Constants.BUFFER_VALUE_2, "")
-                        putString(Constants.KIT_TIME, kitTime)
                        putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
                        putInt(Constants.KIT_COUNT, 1)
                        apply()
@@ -278,21 +189,21 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
                Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
                return@setOnClickListener
            }
-//            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(
-//                    serialNumber
-//                )
-//            ) {
-//                DataHolder.kitSerial = binding.nameEditText.text.toString()
-//                DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
-//                with(sharedPreference.edit()) {
-//                    putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
-//                    putInt(Constants.KIT_COUNT, 1)
-//                    apply()
-//                }
-//                moveToNext()
-//            } else {
-//                Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
-//            }
+            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(
+                    serialNumber
+                )
+            ) {
+                DataHolder.kitSerial = binding.nameEditText.text.toString()
+                DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
+                with(sharedPreference.edit()) {
+                    putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
+                    putInt(Constants.KIT_COUNT, 1)
+                    apply()
+                }
+                moveToNext()
+            } else {
+                Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
+            }
        }

        //Setting up the SDK handler
@@ -304,11 +215,11 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {

        //deciding what kind of notifications we want to receive. Explained more in the function
        //first we use bitmapping to set these values into the notifications_mask.
-        var notificationsMask = 0
+        var notifications_mask = 0
        // We would like to subscribe to all barcode events
-        notificationsMask =
-            notificationsMask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
-        sdkHandler!!.dcssdkSubsribeForEvents(notificationsMask)
+        notifications_mask =
+            notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
+        sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
        mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
        Log.e("scannersize", sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
        if (mScannerInfoList.isNotEmpty()) {
@@ -350,100 +261,76 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        val result = String(barcodeData!!)
        Log.d("BARCODE", result)
        runOnUiThread {
-            Editable.Factory.getInstance().newEditable(result)
-            processScannedData(result)
-           // binding.nameEditText.text = editableResult
+            val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
+            binding.nameEditText.text = editableResult
        }
    }

-//    private fun checkHemoCubeKitData(): Boolean {
-//        return sharedPreference.getString(Constants.KIT_NUMBER, "")
-//            ?.isNotBlank() == true && sharedPreference.getInt(
-//            Constants.KIT_COUNT, 0
-//        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < Constants.KIT_CAPACITY
-//    }
+    private fun checkHemoCubeKitData(): Boolean {
+        return sharedPreference.getString(Constants.KIT_NUMBER, "")
+            ?.isNotBlank() == true && sharedPreference.getInt(
+            Constants.KIT_COUNT, 0
+        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < Constants.KIT_CAPACITY
+    }

    private fun isSerialValid(s: String): Boolean {
-        if (s.contains(forD35)) {
-            if(s.length != 17){
-                binding.nameEditText.error = "Invalid Kit Serial Number, correct example SMI/SC/000/00/000"
-                return false
-            }
-        }else if(s.contains(forD10)){
-            if(s.length != 27){
-                binding.nameEditText.error = "Invalid Kit Serial Number, correct example SMI/SC-2-D10/000000/000/000"
-                return false
-            }
-        }else{
+        if (s.length != 17) {
+            binding.nameEditText.error = getString(R.string.invalid_kit)
            return false
        }
        return true
    }

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

-//    private fun startScanningNow() {
-//        val options = ScanOptions()
-//        options.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
-//        options.setPrompt("Scan a barcode")
-//        options.setCameraId(0) // Use a specific camera of the device
-//
-//        options.setBeepEnabled(true)
-//        options.setBarcodeImageEnabled(true)
-//
-//        options.setPrompt("Start Scanning")
-//        options.setOrientationLocked(false)
-////        options.setTimeout(10000) // in ms
-//
-//        barcodeLauncher.launch(options)
-//    }
-//
-//    private fun checkDataNotNull(): Boolean {
-//        return if (DataHolder.selectedTest?._id == null) {
-//            Toast.makeText(
-//                applicationContext, R.string.select_patient, Toast.LENGTH_SHORT
-//            ).show()
-//
-//            val i = Intent(applicationContext, DashboardActivity::class.java)
-//            startActivity(i)
-//
-//            false
-//        } else {
-//            true
-//        }
-//    }
-    private fun timeDifference(createdAt: String): Long {
-        val currentTime = Calendar.getInstance().time
-        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+    private fun startScanningNow() {
+        val options = ScanOptions()
+        options.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
+        options.setPrompt("Scan a barcode")
+        options.setCameraId(0) // Use a specific camera of the device

-        val createdAtDate: Date = if (createdAt.isEmpty()) {
-            currentTime
+        options.setBeepEnabled(true)
+        options.setBarcodeImageEnabled(true)
+
+        options.setPrompt("Start Scanning")
+        options.setOrientationLocked(false)
+//        options.setTimeout(10000) // in ms
+
+        barcodeLauncher.launch(options)
+    }
+
+    private fun checkDataNotNull(): Boolean {
+        return if (DataHolder.selectedTest?._id == null) {
+            Toast.makeText(
+                applicationContext, R.string.select_patient, Toast.LENGTH_SHORT
+            ).show()
+
+            val i = Intent(applicationContext, DashboardActivity::class.java)
+            startActivity(i)
+
+            false
        } else {
-            formatter.parse(createdAt) ?: currentTime
+            true
        }
-
-        val diffMillis = currentTime.time - createdAtDate.time
-
-        return diffMillis / (60 * 1000)  // Convert milliseconds to minutes
    }
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
@@ -1,16 +1,3 @@
-/*
- * // 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

 import android.Manifest
@@ -18,7 +5,6 @@ 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
@@ -31,9 +17,10 @@ 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.DataHolder
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestType
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.android.gms.location.FusedLocationProviderClient
@@ -48,12 +35,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,32 +60,26 @@ 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 ->
-//                    DataHolder.location =
-//                        UserData.Location(location.latitude, location.longitude)
-//                    DataHolder.selectedTest?.location =
-//                        UserData.Location(location.latitude, location.longitude)
+                    DataHolder.location =
+                        UserData.Location(location.latitude, location.longitude)
+                    DataHolder.selectedTest?.location =
+                        UserData.Location(location.latitude, location.longitude)
                    Log.i("Location", DataHolder.location.toString())
                }
            }
        }
+
        val usbFilter = IntentFilter().apply {
            addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
            addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED)
@@ -117,22 +98,15 @@ class MainActivity : AppCompatActivity() {
            }
        }

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

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

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

+                    device.productId == 8963 && device.vendorId == 1659 -> {
+                        binding.cvItem1.visibility = View.VISIBLE
+                        binding.cvItem3.visibility = View.VISIBLE
+                        binding.cvItem2.visibility = View.GONE
+                        binding.cvItem4.visibility = View.GONE
+                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
+                        Constants.DEVICE_TYPE_HEMOCUBE
+                    }
+
+                    device.productId == 4614 && device.vendorId == 7111 -> {
+                        binding.cvItem1.visibility = View.VISIBLE
+                        binding.cvItem3.visibility = View.VISIBLE
+                        binding.cvItem2.visibility = View.GONE
+                        binding.cvItem4.visibility = View.GONE
+                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
+                        Constants.DEVICE_TYPE_HEMOCUBE
+                    }
+
                    device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> {
                        Log.d(
                            TAG,
@@ -200,7 +207,6 @@ class MainActivity : AppCompatActivity() {
        binding.cvItem1.setOnClickListener {
            DataHolder.selectedTestType = TestType.SICKLECERT
            val i = Intent(applicationContext, KitScanActivity::class.java)
-            i.putExtra("fromWhere","Main")
            startActivity(i)
            finish()
        }
@@ -208,14 +214,6 @@ 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()
        }
@@ -303,14 +301,14 @@ class MainActivity : AppCompatActivity() {
        fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
            location?.let {
                if (DataHolder.selectedTest != null) {
-//                    DataHolder.selectedTest!!.location =
-//                        UserData.Location(location.latitude, location.longitude)
+                    DataHolder.selectedTest!!.location =
+                        UserData.Location(location.latitude, location.longitude)
                } else {
                    startActivity(Intent(this, DashboardActivity::class.java))
                    finish()
                }
-//                DataHolder.location =
-//                    UserData.Location(location.latitude, location.longitude)
+                DataHolder.location =
+                    UserData.Location(location.latitude, location.longitude)
            } ?: run {
                requestLocationUpdates()
            }
--- a/app/src/main/java/com/example/hpostesting/presentation/MainViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/MainViewModel.kt
@@ -0,0 +1,7 @@
+package com.example.hpostesting.presentation
+
+import androidx.lifecycle.ViewModel
+
+class MainViewModel : ViewModel() {
+
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
tanx	304f413364	changes Ui and attributes of panel, auto DAC, Calibration and device Diagnostics screens.	2024-03-28 16:29:55 +05:30
tanx	f1b03c93a2	chenges buttons and text inputs attributes.	2024-03-25 12:40:59 +05:30
tanx	dded6976f6	chenges buttons and text inputs attributes.	2024-03-19 18:08:46 +05:30
tanx	b1d10d5403	created new drawable and changed all buttons style	2024-03-18 16:24:37 +05:30
tanx	9cf7fae2ec	changed normal FAB to extended FAB	2024-03-07 16:14:56 +05:30
tanx	ef419d8a71	Changed Nav header color at all places. nav header text color changed. text alignment.	2024-03-06 17:40:31 +05:30
tanx	3317df4f70	Updated scanner icon. Changed header color. Fixed letter casing.	2024-03-04 12:33:10 +05:30
tanx	6bdd1da9da	icon aspect ratio changed in nav_header_dashboard.xml	2024-03-02 13:51:01 +05:30