Changes on labels added for Refresh Buffer and Cuvette Absent

If the entered kit number is valid, the application shall proceed with the intended operation.
provide a clear indication that the application is in offline mode.

.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

README.md

@@ -2,4 +2,3 @@
 ### Release key
 
 	key0: prime24
-        

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 132
+        versionCode 122
-        versionName "2.1.130.2"
+        versionName "2.1.122"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -76,7 +76,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 +89,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 +121,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'
 
@@ -163,12 +164,10 @@ 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'
 
 }

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": [

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,
+      "versionCode": 101,
-      "versionName": "2.1.127",
+      "versionName": "2.1.101",
       "outputFile": "app-release.apk"
     }
   ],
-  "elementType": "File",
+  "elementType": "File"
-  "baselineProfiles": [
-    {
-      "minApi": 28,
-      "maxApi": 30,
-      "baselineProfiles": [
-        "baselineProfiles/1/app-release.dm"
-      ]
-    },
-    {
-      "minApi": 31,
-      "maxApi": 2147483647,
-      "baselineProfiles": [
-        "baselineProfiles/0/app-release.dm"
-      ]
-    }
-  ],
-  "minSdkVersionForDexing": 21
 }

app/src/main/AndroidManifest.xml

@@ -2,9 +2,6 @@
 <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" />
@@ -25,12 +22,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"
@@ -43,36 +34,13 @@
         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"
-            android:screenOrientation="portrait" />
+            android:exported="false" />
         <activity
             android:name="com.example.hpostesting.presentation.deviceinfo.DeviceActivity"
-            android:exported="false"
+            android:exported="false" />
-            android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
             android:name="com.example.hpostesting.presentation.hemocube.DigitalCardActivity"
             android:exported="false" />
@@ -80,17 +48,13 @@
             android:name="com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity"
             android:exported="false"
             android:theme="@style/Theme.HPOS.NoActionBar" />
-        <activity
-            android:name="com.example.hpostesting.presentation.hb_test.HBTestActivity"
-            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
             android:name="com.example.hpostesting.presentation.autodac.AutoDacActivity"
             android:exported="false"
             android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
             android:name="com.example.hpostesting.presentation.jig.JigActivity"
-            android:exported="true"
+            android:exported="false"
             android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
             android:name="com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity"
@@ -134,11 +98,12 @@
             android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
             android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
-            android:exported="true"
+            android:exported="false"
             android:label="@string/title_activity_dashboard"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.HPOS.NoActionBar"
             tools:ignore="AppLinkUrlError,MissingClass">
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -160,14 +125,13 @@
             android:exported="true"
             android:noHistory="true"
             android:theme="@style/AppTheme.NoActionBar">
-            <intent-filter>
+<!--            <intent-filter>-->
-                <action android:name="android.intent.action.MAIN" />
+<!--                <action android:name="android.intent.action.MAIN" />-->
-
+<!--                <category android:name="android.intent.category.HOME" />-->
-                <category android:name="android.intent.category.HOME" />
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
-                <category android:name="android.intent.category.DEFAULT" />
+<!--                <category android:name="android.intent.category.MONKEY"/>-->
-                <category android:name="android.intent.category.MONKEY" />
+<!--                <category android:name="android.intent.category.LAUNCHER_APP" />-->
-                <category android:name="android.intent.category.LAUNCHER_APP" />
+<!--            </intent-filter>-->
-            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -176,7 +140,7 @@
         </activity>
         <activity
             android:name="com.example.hpostesting.presentation.testRight.TestRightActivity"
-            android:exported="true"
+            android:exported="false"
             android:noHistory="true"
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
             android:theme="@style/Theme.HPOS.NoActionBar"

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

@@ -14,29 +14,25 @@
 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
+    val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    lateinit var firebaseManager: FirebaseManager
+
     override fun onCreate() {
         super.onCreate()
         val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
-        // You can now use firebaseManager here after Hilt injects it
         val firestoreSettings = FirebaseFirestoreSettings.Builder()
             .setPersistenceEnabled(true) // Enable offline persistence if needed
             .build()
 
-        val firestore = firebaseManager.getCurrentFirestore()
+        val firestore = FirebaseFirestore.getInstance()
         firestore.firestoreSettings = firestoreSettings
     }
 }

app/src/main/java/com/example/hpostesting/data/api/MolbioResultApi.kt

@@ -43,10 +43,6 @@ interface MolbioResultApi {
         @Body checkUpdateRequest: CheckUpdateRequest,
     ): CheckUpdateResponse
 
-//    @POST("deviceService/device/getUpdate")
-//    suspend fun deviceUpdate(
-//        @Body deviceUpdateRequest: DeviceUpdateRequest,
-//    ): ResponseBody
     @POST("deviceService/device/getUpdate")
     suspend fun deviceUpdate(
         @Body deviceUpdateRequest: DeviceUpdateRequest,

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

@@ -14,13 +14,6 @@
 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"
@@ -28,8 +21,8 @@ object Constants {
     const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb"
     const val ABHA_APP_PACKAGE = "in.ndhm.phr"
 
-    const val MOLBIO_INTEGRATION = false
+    const val MOLBIO_INTEGRATION = true
-    const val FIREBASE_INTEGRATION = true
+    const val FIREBASE_INTEGRATION = false
     const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
     const val deviceProvisionPassword = "f2ab0e7f9d69"
     const val DEVICE_ID_API = "deviceIDAPI"
@@ -45,8 +38,7 @@ object Constants {
 
     const val TEST_RIGHT_TOTAL_PIXEL = 3694
 
-    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 34
+    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 40
-    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM = 9
 
     const val RANGE_IN_RESULT_CALCULATIONS = 10
 
@@ -87,16 +79,178 @@ object Constants {
     // jig
     const val NAVIGATE_TO_TEST_JIG_DIRECTLY = false
 
-    //update values of abs
+    val STATICID = listOf(
-    const val ABS2LED1MMLL = "ABS2LED1MMLL"
+        "FACTORY",
-    const val ABS2LED1MMUL = "ABS2LED1MMUL"
+        "ADMIN",
-    const val ABS2LED2MMLL = "ABS2LED2MMLL"
+        "PQUSER",
-    const val ABS2LED2MMUL = "ABS2LED2MMUL"
+        "QCUSER",
+        "VIZ-1000-0004",
+        "VIZ-1000-0005",
+        "VIZ-1000-0006",
+        "HC-V1-001",
+        "HC-V1-002",
+        "HC-V1-003",
+        "HC-V1-004",
+        "HC-V1-005",
+        "HC-V1-006",
+        "HC-V1-007",
+        "HC-V1-008",
+        "HC-V1-009",
+        "HC-V1-010",
+        "HC-V1-011",
+        "HC-V1-012",
+        "HC-V1-013",
+        "HC-V1-014",
+        "HC-V1-015",
+        "HC-V1-016",
+        "HC-V1-017",
+        "HC-V1-018",
+        "HC-V1-019",
+        "HC-V1-020",
+        "HCV-000-1015",
+        "HCV-000-3002",
+        "HCV-000-3003",
+        "HCV-000-3004",
+        "HCV-000-3005",
+        "HCV-000-3006",
+        "HCV-000-3007",
+        "HCV-000-3008",
+        "HCV-000-3009",
+        "HCV-000-3010",
+        "HCV-000-3011",
+        "HCV-000-3012",
+        "HCV-000-3013",
+        "HCV-000-3014",
+        "HCV-000-3015",
+        "HCV-000-3016",
+        "HCV-000-3017",
+        "HCV-000-3018",
+        "HCV-000-3019",
+        "HCV-000-3020",
+        "HCV-000-3021",
+        "HCV-000-3022",
+        "HCV-000-3023",
+        "HCV-000-3024",
+        "HCV-000-3025",
+        "HCV-000-3026",
+        "HCV-000-3027",
+        "HCV-000-3028",
+        "HCV-000-3029",
+        "HCV-000-3030",
+        "HPP1-0124-0001",
+        "HPP1-0124-0002",
+        "HPP1-0124-0003",
+        "HPP1-0124-0004",
+        "HPP1-0124-0005",
+        "HPP1-0124-0006",
+        "HPP1-0124-0007",
+        "HPP1-0124-0008",
+        "HPP1-0124-0009",
+        "HPP1-0124-0010",
+        "HPP1-0124-0011",
+        "HPP1-0124-0012",
+        "HPP1-0124-0013",
+        "HPP1-0124-0014",
+        "HPP1-0124-0015",
+        "HPP1-0124-0016",
+        "HPP1-0124-0017",
+        "HPP1-0124-0018",
+        "HPP1-0124-0019",
+        "HPP1-0124-0020",
+        "HPP1-0124-0021",
+        "HPP1-0124-0022",
+        "HPP1-0124-0023",
+        "HPP1-0124-0024",
+        "HPP1-0124-0025",
+        "HPP1-0124-0026",
+        "HPP1-0124-0027",
+        "HPP1-0124-0028",
+        "HPP1-0124-0029",
+        "HPP1-0124-0030",
+        "HPP1-0124-0031",
+        "HPP1-0124-0032",
+        "HPP1-0124-0033",
+        "HPP1-0124-0034",
+        "HPP1-0124-0035",
+        "HPP1-0124-0036",
+        "HPP1-0124-0037",
+        "HPP1-0124-0038",
+        "HPP1-0124-0039",
+        "HPP1-0124-0040",
+        "HPP1-0124-0041",
+        "HPP1-0124-0042",
+        "HPP1-0124-0043",
+        "HPP1-0124-0044",
+        "HPP1-0124-0045",
+        "HPP1-0124-0046",
+        "HPP1-0124-0047",
+        "HPP1-0124-0048",
+        "HPP1-0124-0049",
+        "HPP1-0124-0050",
+        "HCV-001-0001",
+        "HCV-001-0002",
+        "HCV-001-0003",
+        "HCV-001-0004",
+        "HCV-001-0005",
+        "HCV-001-0006",
+        "HCV-001-0007",
+        "HCV-001-0008",
+        "HCV-001-0009",
+        "HCV-001-0010",
+        "HCV-001-0011",
+        "HCV-001-0012",
+        "HCV-001-0013",
+        "HCV-001-0014",
+        "HCV-001-0015",
+        "HCV-001-0016",
+        "HCV-001-0017",
+        "HCV-001-0018",
+        "HCV-001-0019",
+        "HCV-001-0020",
+        "HCV-001-0021",
+        "HCV-001-0022",
+        "HCV-001-0023",
+        "HCV-001-0024",
+        "HCV-001-0025",
+        "HCV-001-0026",
+        "HCV-001-0027",
+        "HCV-001-0028",
+        "HCV-001-0029",
+        "HCV-001-0030",
+        "HCV-001-0031",
+        "HCV-001-0032",
+        "HCV-001-0033",
+        "HCV-001-0034",
+        "HCV-001-0003",
+        "HCV-001-0035",
+        "HCV-001-0036",
+        "HCV-001-0037",
+        "HCV-001-0038",
+        "HCV-001-0039",
+        "HCV-001-0040",
+        "HCV-001-0041",
+        "HCV-001-0042",
+        "HCV-001-0043",
+        "HCV-001-0044",
+        "HCV-001-0045",
+        "HCV-001-0046",
+        "HCV-001-0047",
+        "HCV-001-0048",
+        "HCV-001-0049",
+        "HCV-001-0050",
+        "HCV-000-6001",
+        "HCV-000-6002",
+        "HCV-000-6003",
+        "HCV-000-6004",
+        "HCV-000-6005",
+        "HCV-000-6006",
+        "HCV-000-6007",
+        "HCV-000-6008",
+        "HCV-000-6009",
+        "HCV-000-6010",
+    )
 
-    const val ABS10LED1MMLL = "ABS10LED1MMLL"
+    const val password = "SMI@12345"
-    const val ABS10LED1MMUL = "ABS10LED1MMUL"
-    const val ABS10LED2MMLL = "ABS10LED2MMLL"
-    const val ABS10LED2MMUL = "ABS10LED2MMUL"
 
     const val KIT_NUMBER = "KitNumber"
     const val KIT_COUNT = "KitCount"
@@ -107,8 +261,7 @@ object Constants {
     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,14 +1239,13 @@ object Constants {
     )
 
     const val INCUBATION_TIME_MIN = 0
-    const val INCUBATION_TIME_MAX = 300
+    const val INCUBATION_TIME_MAX = 1400
-    const val MAX_KIT_TIME = 240
     const val BATTERY_LEVEL_MIN = Int.MIN_VALUE
 
     const val PQ_MODE = true
     const val READINGS_PER_SAMPLE = 1
 
-    const val MINIMUM_BATTERY_LEVEL = 0
+    const val MINIMUM_BATTERY_LEVEL = 40F
 
     val BUFFER_INTENSITY_THRESHOLDS: Map<String, List<List<Int>>> = mapOf<String, List<List<Int>>>(
         "HCV-000-3001" to listOf(
@@ -1584,221 +1736,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
-
-
-    //    val STATICID = listOf(
-//        "FACTORY",
-//        "ADMIN",
-//        "PQUSER",
-//        "QCUSER",
-//        "VIZ-1000-0004",
-//        "VIZ-1000-0005",
-//        "VIZ-1000-0006",
-//        "HC-V1-001",
-//        "HC-V1-002",
-//        "HC-V1-003",
-//        "HC-V1-004",
-//        "HC-V1-005",
-//        "HC-V1-006",
-//        "HC-V1-007",
-//        "HC-V1-008",
-//        "HC-V1-009",
-//        "HC-V1-010",
-//        "HC-V1-011",
-//        "HC-V1-012",
-//        "HC-V1-013",
-//        "HC-V1-014",
-//        "HC-V1-015",
-//        "HC-V1-016",
-//        "HC-V1-017",
-//        "HC-V1-018",
-//        "HC-V1-019",
-//        "HC-V1-020",
-//        "HCV-000-1015",
-//        "HCV-000-3002",
-//        "HCV-000-3003",
-//        "HCV-000-3004",
-//        "HCV-000-3005",
-//        "HCV-000-3006",
-//        "HCV-000-3007",
-//        "HCV-000-3008",
-//        "HCV-000-3009",
-//        "HCV-000-3010",
-//        "HCV-000-3011",
-//        "HCV-000-3012",
-//        "HCV-000-3013",
-//        "HCV-000-3014",
-//        "HCV-000-3015",
-//        "HCV-000-3016",
-//        "HCV-000-3017",
-//        "HCV-000-3018",
-//        "HCV-000-3019",
-//        "HCV-000-3020",
-//        "HCV-000-3021",
-//        "HCV-000-3022",
-//        "HCV-000-3023",
-//        "HCV-000-3024",
-//        "HCV-000-3025",
-//        "HCV-000-3026",
-//        "HCV-000-3027",
-//        "HCV-000-3028",
-//        "HCV-000-3029",
-//        "HCV-000-3030",
-//        "HPP1-0124-0001",
-//        "HPP1-0124-0002",
-//        "HPP1-0124-0003",
-//        "HPP1-0124-0004",
-//        "HPP1-0124-0005",
-//        "HPP1-0124-0006",
-//        "HPP1-0124-0007",
-//        "HPP1-0124-0008",
-//        "HPP1-0124-0009",
-//        "HPP1-0124-0010",
-//        "HPP1-0124-0011",
-//        "HPP1-0124-0012",
-//        "HPP1-0124-0013",
-//        "HPP1-0124-0014",
-//        "HPP1-0124-0015",
-//        "HPP1-0124-0016",
-//        "HPP1-0124-0017",
-//        "HPP1-0124-0018",
-//        "HPP1-0124-0019",
-//        "HPP1-0124-0020",
-//        "HPP1-0124-0021",
-//        "HPP1-0124-0022",
-//        "HPP1-0124-0023",
-//        "HPP1-0124-0024",
-//        "HPP1-0124-0025",
-//        "HPP1-0124-0026",
-//        "HPP1-0124-0027",
-//        "HPP1-0124-0028",
-//        "HPP1-0124-0029",
-//        "HPP1-0124-0030",
-//        "HPP1-0124-0031",
-//        "HPP1-0124-0032",
-//        "HPP1-0124-0033",
-//        "HPP1-0124-0034",
-//        "HPP1-0124-0035",
-//        "HPP1-0124-0036",
-//        "HPP1-0124-0037",
-//        "HPP1-0124-0038",
-//        "HPP1-0124-0039",
-//        "HPP1-0124-0040",
-//        "HPP1-0124-0041",
-//        "HPP1-0124-0042",
-//        "HPP1-0124-0043",
-//        "HPP1-0124-0044",
-//        "HPP1-0124-0045",
-//        "HPP1-0124-0046",
-//        "HPP1-0124-0047",
-//        "HPP1-0124-0048",
-//        "HPP1-0124-0049",
-//        "HPP1-0124-0050",
-//        "HCV-001-0001",
-//        "HCV-001-0002",
-//        "HCV-001-0003",
-//        "HCV-001-0004",
-//        "HCV-001-0005",
-//        "HCV-001-0006",
-//        "HCV-001-0007",
-//        "HCV-001-0008",
-//        "HCV-001-0009",
-//        "HCV-001-0010",
-//        "HCV-001-0011",
-//        "HCV-001-0012",
-//        "HCV-001-0013",
-//        "HCV-001-0014",
-//        "HCV-001-0015",
-//        "HCV-001-0016",
-//        "HCV-001-0017",
-//        "HCV-001-0018",
-//        "HCV-001-0019",
-//        "HCV-001-0020",
-//        "HCV-001-0021",
-//        "HCV-001-0022",
-//        "HCV-001-0023",
-//        "HCV-001-0024",
-//        "HCV-001-0025",
-//        "HCV-001-0026",
-//        "HCV-001-0027",
-//        "HCV-001-0028",
-//        "HCV-001-0029",
-//        "HCV-001-0030",
-//        "HCV-001-0031",
-//        "HCV-001-0032",
-//        "HCV-001-0033",
-//        "HCV-001-0034",
-//        "HCV-001-0003",
-//        "HCV-001-0035",
-//        "HCV-001-0036",
-//        "HCV-001-0037",
-//        "HCV-001-0038",
-//        "HCV-001-0039",
-//        "HCV-001-0040",
-//        "HCV-001-0041",
-//        "HCV-001-0042",
-//        "HCV-001-0043",
-//        "HCV-001-0044",
-//        "HCV-001-0045",
-//        "HCV-001-0046",
-//        "HCV-001-0047",
-//        "HCV-001-0048",
-//        "HCV-001-0049",
-//        "HCV-001-0050",
-//        "HCV-000-6001",
-//        "HCV-000-6002",
-//        "HCV-000-6003",
-//        "HCV-000-6004",
-//        "HCV-000-6005",
-//        "HCV-000-6006",
-//        "HCV-000-6007",
-//        "HCV-000-6008",
-//        "HCV-000-6009",
-//        "HCV-000-6010",
-//    )
-//
 }

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

@@ -21,14 +21,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 +36,9 @@ 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 ipAddress: String = "0.0"
     var testExp: Boolean = true
     var hemocubeResult: Double? = null
 }

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

@@ -30,5 +30,4 @@ enum class HemoCubeCommands(val command: String) {
     FORTH_GAIN_COMMAND("W\r"),
     CHECK_CUVETTE_COMMAND("L\r"),
     CHECK_TEMP_COMMAND("A\r"),
-    J_COMMAND("J\r"),
 }

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

@@ -26,17 +26,13 @@ enum class TestStatus(val code: Double) {
     TEMPERATURE_CHECK(4.7),
     CUVETTE_ABSENT(4.8),
     CUVETTE_PRESENT(4.9),
-    CUVETTE_ABSENTR(5.1),
-    CUVETTE_PRESENTR(5.2),
     CUVETTE_ABSENTS(7.7),
     CUVETTE_PRESENTS(7.8),
-    BUFFER_STARTED(5.4),
+    BUFFER_STARTED(5.1),
-    BUFFER_COMPLETED(5.5),
+    BUFFER_COMPLETED(5.2),
     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),

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

@@ -40,8 +40,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 +50,8 @@ 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")
+    @Query("SELECT * from hemo_cube_test_table WHERE molbioFlag = 0")
     fun getPendingUser(): LiveData<List<HemoCubeTestData>>
-
     @Update
     suspend fun updateTest(hemoCubeTestData: HemoCubeTestData)
-
-
 }

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

@@ -19,11 +19,12 @@ import androidx.room.TypeConverters
 import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.MolbioHemocubeData
 import com.example.hpostesting.data.model.patient.UserData
 
 @Database(
-    entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
+    entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class,MolbioHemocubeData::class],
-    version = 38,
+    version = 34,
     exportSchema = false
 )
 @TypeConverters(Converters::class)
@@ -31,4 +32,5 @@ abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao
     abstract fun hemoCubeDao(): HemoCubeDao
     abstract fun hemoCubeBufferDao(): HemoCubeBufferDao
+
 }

app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt

@@ -54,7 +54,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",
@@ -110,7 +110,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
                     data.name,
                     data.incubationTime,
                     data.bloodGroup,
-                    data.age, // Include other fields similarly
+                    data.birthYear, // Include other fields similarly
                     data.state,
                     data.abhaId,
                     data.userImageURL,
@@ -177,7 +177,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",
@@ -233,7 +233,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
                     data.name,
                     data.incubationTime,
                     data.bloodGroup,
-                    data.age, // Include other fields similarly
+                    data.birthYear, // Include other fields similarly
                     data.state,
                     data.abhaId,
                     data.userImageURL,

app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2Result.kt

@@ -14,15 +14,16 @@
 package com.example.hpostesting.data.model.molbioresult
 
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.MolbioHemocubeData
 
 data class MolbioV2Result(
-    val age: Int? = 31,
+//    val age: Int? = 31,
     val analysisDate: String? = "2024-02-08 16:33:56",
     val analysisId: String? = "",
     val analysisStatus: String? = "",
     val analysisType: String? = "HPOS",
     val analysisTypeMethod: String? = "",
-    val bloodGroup: String? = "",
+//    val bloodGroup: String? = "",
     val coefficients: List<Int>? = listOf(22, 22),
     val collectionLocation: List<Any>? = listOf(),
     val collectionTime: String? = "2024-02-08 16:33:56",
@@ -30,12 +31,12 @@ data class MolbioV2Result(
     val curveFitting: String? = "Linear",
     val deviceName: String? = "HPOS",
     val expiryTime: String? = "2024-02-08 16:33:56",
-    val gender: String? = "",
+//    val gender: String? = "",
     val interpretation: String? = "",
     val `operator`: String? = "",
     val patientId: Int? = 4545,
     val pregnancy: Boolean? = false,
-    val rawData: HemoCubeTestData? = HemoCubeTestData(),
+    val rawData: MolbioHemocubeData? = HemoCubeTestData().MolbioHemocubeData(),
     val recommendation: String? = "NA",
     val sampleId: String? = "",
     val sampleType: String? = "",

app/src/main/java/com/example/hpostesting/data/model/molbioresult/MolbioV2ResultData.kt

@@ -14,14 +14,15 @@
 package com.example.hpostesting.data.model.molbioresult
 
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.MolbioHemocubeData
 
 data class MolbioV2ResultData(
-    val age: Int? = 0,
+//    val age: Int? = 0,
     val analysisDate: String? = "2024-02-08 16:33:56",
     val analysisStatus: String? = "",
     val analysisType: String? = "",
     val analysisTypeMethod: String? = "",
-    val bloodGroup: String? = "",
+//    val bloodGroup: String? = "",
     val coefficients: List<Int>? = listOf(),
     val collectionLocation: List<Any>? = listOf(),
     val collectionTime: String? = "2024-02-08 16:33:56",
@@ -31,13 +32,13 @@ data class MolbioV2ResultData(
     val curveFitting: String? = "",
     val deviceId: Int? = 0,
     val expiryTime: String? = "2024-02-08 16:33:56",
-    val gender: String? = "",
+//    val gender: String? = "",
     val id: Int? = 0,
     val interpretation: String? = "",
     val `operator`: String? = "",
     val patientId: Int? = 0,
     val pregnancy: Boolean? = false,
-    val rawData: HemoCubeTestData? = HemoCubeTestData(),
+    val rawData: MolbioHemocubeData? = HemoCubeTestData().MolbioHemocubeData(),
     val recommendation: String? = "",
     val sampleId: String? = "",
     val sampleType: String? = "",

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

@@ -24,7 +24,7 @@ data class HemoCubeTestData(
     var name: String = "",
     var incubationTime: String = "",
     var bloodGroup: String = "",
-    var age: String = "",
+    var birthYear: String = "",
     var state: String = "",
     var abhaId: String = "",
     var userImageURL: String = "",
@@ -106,10 +106,91 @@ data class HemoCubeTestData(
     var filter: String? = "",
     var volume: String? = "",
     var isCSVCreated: Boolean = false,
-    var labName: String? = "",
+    var labName: String? = ""
-    var cuvetteSize: String? = "",
+)
-    var district: String? = "",
+
-    var centerName: String? = "",
+fun HemoCubeTestData.MolbioHemocubeData() = MolbioHemocubeData(
-    var ipAddress:String?= "",
+    sampleid = sampleid,
-    var configUpdatedRecent:String?= ""
+    _id = _id,
+    name = name,
+    incubationTime = incubationTime,
+    state = state,
+    location = location,
+    reportUploadTime = reportUploadTime,
+    testType = testType,
+    testTime = testTime,
+    testStatus = testStatus,
+    localFlag = localFlag,
+    deviceId = deviceId,
+    appVersion = appVersion,
+    deviceSerialNumber = deviceSerialNumber,
+    deviceType = deviceType,
+    kitSerial = kitSerial,
+    resultData = resultData,
+    led1Buffer = led1Buffer,
+    led2Buffer = led2Buffer,
+    led3Buffer = led3Buffer,
+    led4Buffer = led4Buffer,
+    led1Sample = led1Sample,
+    led2Sample = led2Sample,
+    led3Sample = led3Sample,
+    led4Sample = led4Sample,
+    led1Average = led1Average,
+    led2Average = led2Average,
+    led3Average = led3Average,
+    led4Average = led4Average,
+    abs1 = abs1,
+    abs2 = abs2,
+    abs3 = abs3,
+    abs4 = abs4,
+    hb3 = hb3,
+    hb4 = hb4,
+    led1Gain1 = led1Gain1,
+    led2Gain1 = led2Gain1,
+    led3Gain1 = led3Gain1,
+    led4Gain1 = led4Gain1,
+    led1Gain2 = led1Gain2,
+    led2Gain2 = led2Gain2,
+    led3Gain2 = led3Gain2,
+    led4Gain2 = led4Gain2,
+    led1Gain3 = led1Gain3,
+    led2Gain3 = led2Gain3,
+    led3Gain3 = led3Gain3,
+    led4Gain3 = led4Gain3,
+    led1Gain4 = led1Gain4,
+    led2Gain4 = led2Gain4,
+    led3Gain4 = led3Gain4,
+    led4Gain4 = led4Gain4,
+    led1Air1 = led1Air1,
+    led2Air1 = led2Air1,
+    led3Air1 = led3Air1,
+    led4Air1 = led4Air1,
+    led1Air2 = led1Air2,
+    led2Air2 = led2Air2,
+    led3Air2 = led3Air2,
+    led4Air2 = led4Air2,
+    deviceRatio = deviceRatio,
+    calculatedRatio = calculatedRatio,
+    predictedDenovixRatio = predictedDenovixRatio,
+    slopeRatio = slopeRatio,
+    coefficients = coefficients,
+    classificationResult = classificationResult,
+    prdClassification = prdClassification,
+    deviceRatioClass = deviceRatioClass,
+    slopeRatioClass = slopeRatioClass,
+    borderlineMethod2Class = borderlineMethod2Class,
+    errorMessages = errorMessages,
+    batteryLevel = batteryLevel,
+    batteryCapacity = batteryCapacity,
+    batteryMaxCapacity = batteryMaxCapacity,
+    batteryTemperature = batteryTemperature,
+    batteryVoltage = batteryVoltage,
+    molbioFlag = molbioFlag,
+    quickCapture = quickCapture,
+    solution = solution,
+    concentration = concentration,
+    filter = filter,
+    volume = volume,
+    isCSVCreated = isCSVCreated,
+    labName = labName
 )

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

@@ -0,0 +1,93 @@
+package com.example.hpostesting.data.model.patient
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "molbio_hemo_cube_test_table")
+data class MolbioHemocubeData(
+@PrimaryKey(autoGenerate = true)
+var sampleid: Int = 0,
+var _id: String = "",
+var name: String = "",
+var incubationTime: String = "",
+var state: String = "",
+var location: UserData.Location? = null,
+var reportUploadTime: String? = "",
+var testType: String? = "HEMOCUBE",
+var testTime: String? = "",
+var testStatus: Boolean? = false,
+var localFlag: Boolean = false,
+var deviceId: String? = "",
+var appVersion: String? = "",
+var deviceSerialNumber: String = "",
+var deviceType: String = "HEMOCUBE",
+var kitSerial: String = "",
+var resultData: String = "",
+var led1Buffer: Double? = null,
+var led2Buffer: Double? = null,
+var led3Buffer: Double? = null,
+var led4Buffer: Double? = null,
+var led1Sample: Double? = null,
+var led2Sample: Double? = null,
+var led3Sample: Double? = null,
+var led4Sample: Double? = null,
+var led1Average: Double? = null,
+var led2Average: Double? = null,
+var led3Average: Double? = null,
+var led4Average: Double? = null,
+var abs1: Double? = null,
+var abs2: Double? = null,
+var abs3: Double? = null,
+var abs4: Double? = null,
+var hb3: Double? = null,
+var hb4: Double? = null,
+var led1Gain1: Double? = null,
+var led2Gain1: Double? = null,
+var led3Gain1: Double? = null,
+var led4Gain1: Double? = null,
+var led1Gain2: Double? = null,
+var led2Gain2: Double? = null,
+var led3Gain2: Double? = null,
+var led4Gain2: Double? = null,
+var led1Gain3: Double? = null,
+var led2Gain3: Double? = null,
+var led3Gain3: Double? = null,
+var led4Gain3: Double? = null,
+var led1Gain4: Double? = null,
+var led2Gain4: Double? = null,
+var led3Gain4: Double? = null,
+var led4Gain4: Double? = null,
+var led1Air1: Double? = null,
+var led2Air1: Double? = null,
+var led3Air1: Double? = null,
+var led4Air1: Double? = null,
+var led1Air2: Double? = null,
+var led2Air2: Double? = null,
+var led3Air2: Double? = null,
+var led4Air2: Double? = null,
+var deviceRatio: Double? = null,
+var calculatedRatio: Double? = null,
+var predictedDenovixRatio: Double? = null,
+var slopeRatio: Double? = null,
+var coefficients: String? = "",
+var classificationResult: String = "",
+var prdClassification: String = "",
+var deviceRatioClass: String = "",
+var slopeRatioClass: String = "",
+var borderlineMethod2Class: String = "",
+var errorMessages: String = "",
+var batteryLevel: String = "",
+var batteryCapacity: String = "",
+var batteryMaxCapacity: String = "",
+var batteryTemperature: String = "",
+var batteryVoltage: String = "",
+var molbioFlag: Boolean = false,
+var quickCapture: Boolean = false,
+var solution: String? = "",
+var concentration: String? = "",
+var filter: String? = "",
+var volume: String? = "",
+var isCSVCreated: Boolean = false,
+var labName: String? = ""
+)
+

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

@@ -24,7 +24,7 @@ data class UserData(
     var name: String = "",
     var incubationTime: String = "",
     var gender: String = "",
-    var age: String = "",
+    var birthYear: String = "",
     var abhaId: String = "",
     var bloodGroup: String = "",
     var userImageURL: String = "",
@@ -60,10 +60,10 @@ data class UserData(
 fun UserData.toHemoCubeTestData() = HemoCubeTestData(
     _id = _id,
     name = name,
-    sampleid = sampleid,
     bloodGroup = bloodGroup,
+    sampleid = sampleid,
     incubationTime = incubationTime,
-    age = age,
+    birthYear = birthYear,
     gender = gender,
     state = state,
     abhaId = abhaId,

app/src/main/java/com/example/hpostesting/data/model/test/TestType.kt

@@ -15,6 +15,5 @@ package com.example.hpostesting.data.model.test
 
 enum class TestType {
     SICKLECERT,
-    SICKLEFIND,
+    SICKLEFIND
-    HB_EST
 }

app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt

@@ -14,9 +14,6 @@
 package com.example.hpostesting.data.repository
 
 import android.net.Uri
-import android.os.Build
-import android.util.Log
-import androidx.annotation.RequiresApi
 import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
@@ -40,53 +37,37 @@ import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.CheckUpdateResponse
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
-import com.example.hpostesting.firebase.FirebaseManager
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
-import com.google.firebase.storage.FirebaseStorage
+import com.google.firebase.storage.ktx.storage
 import kotlinx.coroutines.tasks.await
 import okhttp3.MultipartBody
 import okhttp3.ResponseBody
+import retrofit2.HttpException
 import java.io.File
 import java.net.ConnectException
 import java.net.SocketTimeoutException
-import java.time.LocalTime
 import javax.inject.Inject
 import javax.inject.Named
 
 class NetworkException(message: String, cause: Throwable) : Exception(message, cause)
+class ValidationException(message: String) : Exception(message)
 class DatabaseRepository @Inject constructor(
     @Named("Auth") private val molbioAuthApi: MolbioAuthApi,
     private val molbioResultApi: MolbioResultApi,
-    private val firebaseManager: FirebaseManager,
 ) : Repository {
 
-    private val localdb: FirebaseFirestore
+    private val db: FirebaseFirestore = Firebase.firestore
-        get() = firebaseManager.getCurrentFirestore()
+    private val storage = Firebase.storage
 
-    private val localStg: FirebaseStorage
-        get() = firebaseManager.getCurrentStorage()
-
-
-
-//    // Example function to add data to Firestore , like the basic data as test data
-//    @RequiresApi(Build.VERSION_CODES.O)
-//    fun addtodb(data: String) {
-//        val date = LocalTime.now()
-//        localdb.collection("BasicData")
-//            .add(mapOf("data $date" to data))
-//            .addOnSuccessListener {
-//                Log.d("UPLOAD", "Data uploaded successfully ${localdb.app.name}")
-//            }
-//            .addOnFailureListener { exception ->
-//                Log.d("UPLOAD", "Failed to upload data: ${exception.message}  ${localdb.app.name}")
-//            }
-//    }
     private suspend fun <T : Any> safeApiCall(apiCall: suspend () -> T): Result<T> {
         return try {
             val response = apiCall.invoke()
             Result.Success(response)
+        }catch (e: HttpException) {
+            Result.Error(ValidationException("Device Already Registered  /"+e.message))
         } catch (e: SocketTimeoutException) {
             Result.Error(NetworkException("Network timeout", e))
         } catch (e: ConnectException) {
@@ -131,28 +112,18 @@ 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")
@@ -160,7 +131,7 @@ class DatabaseRepository @Inject constructor(
 
     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)
@@ -170,7 +141,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)
@@ -178,10 +149,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)
@@ -195,7 +165,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) {
@@ -206,7 +176,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)
@@ -219,7 +189,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)
@@ -237,7 +207,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) {
@@ -247,11 +217,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
@@ -260,7 +230,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)
@@ -270,7 +240,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)
@@ -285,13 +255,13 @@ class DatabaseRepository @Inject constructor(
     override suspend fun addTestToDatabasefornew(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) {
                 Firebase.crashlytics.recordException(e)

app/src/main/java/com/example/hpostesting/data/repository/Repository.kt

@@ -38,7 +38,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>

app/src/main/java/com/example/hpostesting/di/AppModule.kt

@@ -35,13 +35,10 @@ import com.example.hpostesting.domain.LogFileManager
 import com.example.hpostesting.domain.LogFileManagerImpl
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.firebase.FirebaseManager
 import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.utils.UsbServiceListenerImpl
 import com.example.hpostesting.util.PropertyProvider
 import com.example.hpostesting.util.PropertyProviderImpl
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.storage.FirebaseStorage
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -56,6 +53,7 @@ import java.util.concurrent.TimeUnit
 import javax.inject.Named
 import javax.inject.Singleton
 
+
 @Module
 @InstallIn(SingletonComponent::class)
 object AppModule {
@@ -110,52 +108,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(
+        return DatabaseRepository(molbioAuthApi = molbioAuthApi, molbioResultApi = molbioResultApi)
-            firebaseManager = firebaseManager,
-            molbioAuthApi = molbioAuthApi,
-            molbioResultApi = molbioResultApi
-        )
     }
 
     @Provides
     @Singleton
     fun provideRepository(
-        firebaseManager: FirebaseManager,
         @Named("Auth") molbioAuthApi: MolbioAuthApi,
         molbioResultApi: MolbioResultApi
     ): Repository {
-        return DatabaseRepository(
+        return DatabaseRepository(molbioAuthApi, molbioResultApi)
-            firebaseManager = firebaseManager,
-            molbioAuthApi = molbioAuthApi,
-            molbioResultApi = molbioResultApi
-        )
     }
 
     @Provides
@@ -239,9 +207,4 @@ object AppModule {
     fun provideUsbServiceListener(context: Context): UsbServiceListener {
         return UsbServiceListenerImpl(context)
     }
-
-
-
-
-
 }

app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt

@@ -1,153 +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.DelicateCoroutinesApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-class FirebaseManager @Inject constructor(private val context: Context) {
-
-    private val sharedPreferences =
-        context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)
-
-    private var currentFirestore: FirebaseFirestore = FirebaseFirestore.getInstance()
-    private var currentStorage: FirebaseStorage = FirebaseStorage.getInstance()
-    var updateStatus = false
-
-    private val defaultServers = listOf(
-        // i have it in different place look down
-        firebaseConfig1, firebaseConfig2, firebaseConfig3,
-    )
-
-    init {
-        val lastSelectedServer = getLastSelectedServer()
-        switchServer(lastSelectedServer)
-    }
-
-    fun getCurrentFirestore(): FirebaseFirestore = currentFirestore
-    fun getCurrentStorage(): FirebaseStorage = currentStorage
-
-    fun switchServer(firebaseConfig: FirebaseConfig) {
-        saveSelectedServer(firebaseConfig)
-        val firebaseApp = getOrInitializeFirebaseApp(firebaseConfig)
-        currentFirestore = FirebaseFirestore.getInstance(firebaseApp)
-        currentStorage = FirebaseStorage.getInstance(firebaseApp)
-        updateStatus = true
-
-    }
-
-    private fun getOrInitializeFirebaseApp(firebaseConfig: FirebaseConfig): FirebaseApp {
-        val existingApp = FirebaseApp.getApps(context).find { it.name == firebaseConfig.serverName }
-
-        return if (existingApp != null) {
-
-            existingApp
-        } else {
-
-            val options = FirebaseOptions.Builder().setProjectId(firebaseConfig.projectId)
-                .setApplicationId(firebaseConfig.appId).setApiKey(firebaseConfig.apiKey)
-                .setStorageBucket(firebaseConfig.storageBucket).build()
-
-            FirebaseApp.initializeApp(context, options, firebaseConfig.serverName)
-        }
-    }
-
-    private fun saveSelectedServer(firebaseConfig: FirebaseConfig) {
-        with(sharedPreferences.edit()) {
-            putString("selectedServerName", firebaseConfig.serverName)
-            putString("projectId", firebaseConfig.projectId)
-            putString("appId", firebaseConfig.appId)
-            putString("apiKey", firebaseConfig.apiKey)
-            putString("storageBucket", firebaseConfig.storageBucket)
-            apply()
-        }
-
-    }
-
-    fun restartApp() {
-        if (updateStatus) {
-            updateStatus = false
-            delayedRestart(context)
-        }
-    }
-
-    fun getLastSelectedServer(): FirebaseConfig {
-        val selectedServerName =
-            sharedPreferences.getString("selectedServerName", defaultServers.first().serverName)
-        val projectId = sharedPreferences.getString("projectId", defaultServers.first().projectId)
-        val appId = sharedPreferences.getString("appId", defaultServers.first().appId)
-        val apiKey = sharedPreferences.getString("apiKey", defaultServers.first().apiKey)
-        val storageBucket =
-            sharedPreferences.getString("storageBucket", defaultServers.first().storageBucket)
-
-        return FirebaseConfig(
-            serverName = selectedServerName ?: defaultServers.first().serverName,
-            projectId = projectId ?: defaultServers.first().projectId,
-            appId = appId ?: defaultServers.first().appId,
-            apiKey = apiKey ?: defaultServers.first().apiKey,
-            storageBucket = storageBucket ?: defaultServers.first().storageBucket
-        )
-    }
-
-    fun getAvailableServers(): List<FirebaseConfig> {
-        return defaultServers
-    }
-}
-
-fun restartApp(context: Context) {
-    val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
-    intent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-    context.startActivity(intent)
-    Process.killProcess(Process.myPid())
-}
-@OptIn(DelicateCoroutinesApi::class)
-fun delayedRestart(context: Context) {
-    GlobalScope.launch(Dispatchers.Main) {
-        delay(5000L)
-        restartApp(context)
-    }
-}
-
-private val firebaseConfig1 = FirebaseConfig(
-    serverName = "dev",
-    apiKey = "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I",
-    appId = "1:650071678820:android:a53292637abb7c0d6c6471",
-    projectId = "hpos-af3cc",
-    storageBucket = "hpos-af3cc.appspot.com"
-)
-
-private val firebaseConfig2 = FirebaseConfig(
-    serverName = "qc-qa",
-    apiKey = "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs",
-    appId = "1:1004619739289:android:3dbcefb10ea99654e5c808",
-    projectId = "hpos-qa",
-    storageBucket = "hpos-qa.appspot.com"
-)
-
-private val firebaseConfig3 = FirebaseConfig(
-    serverName = "prod",
-    apiKey = "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38",
-    appId = "1:121176529204:android:a7bc0842f61e5095bbed61",
-    projectId = "hpos-preprod",
-    storageBucket = "hpos-preprod.appspot.com"
-)

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
-)
-

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

@@ -26,9 +26,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.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
@@ -46,14 +44,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
-import kotlin.math.max
 
 class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
-    private var fromWhere = "Home"
+
     private val TAG = "KitScanActivity"
     private lateinit var binding: ActivityKitScanBinding
 
@@ -74,24 +67,8 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         }
     }
 
-    private fun processScannedData(contents: String) {//edited auto selection of cuvette size
+    private fun processScannedData(contents: String) {
-        if(contents.contains("SMI/SC/")){
+        binding.nameEditText.setText(contents)
-            with(sharedPreference.edit()) {
-                putString(Constants.CUVETTE_SIZE, "2mm")
-                apply()
-            }
-            Toast.makeText(this, "Selected cuvette size: 2mm", Toast.LENGTH_SHORT).show()
-            binding.nameEditText.setText(contents)
-        }else if(contents.contains("SMI/SC-2-D10/")){
-            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()
-        }
     }
 
     override fun attachBaseContext(newBase: Context?) {
@@ -135,33 +112,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 (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
-            moveToNext()
-        }else{
-            if (DataHolder.sampleReadCounter <= maxTest && kitNum != "" && time < Constants.MAX_KIT_TIME) {
-                moveToNext()
-            } else {
-                Toast.makeText(this@KitScanActivity, "Limit Reached, Use New KIT for testing", Toast.LENGTH_SHORT).show()
-                DataHolder.sampleReadCounter = 0
-                DataHolder.kitSerial = ""
 
-                with(sharedPreference.edit()) {
+        if (DataHolder.sampleReadCounter <= Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE && DataHolder.isReferenceTaken) {
-                    putString(Constants.KIT_NUMBER, "")
+            DataHolder.selectedTest!!.kitSerial = DataHolder.kitSerial
-                    putString(Constants.BUFFER_VALUE_1, "")
+            moveToNext()
-                    putString(Constants.BUFFER_VALUE_2, "")
-                    apply()
-                }
-            }
         }
 
 //        if (checkHemoCubeKitData()) {
@@ -178,31 +132,35 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 //            }
 //        }
 
-//        try {
+        try {
-//            if (checkHemoCubeKitData()) {
+            if (checkHemoCubeKitData()) {
-//                DataHolder.selectedTest!!.kitSerial =
+                DataHolder.selectedTest!!.kitSerial =
-//                    sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
+                    sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-//                moveToNext()
+                moveToNext()
-//            } else {
+            } else {
-//                // Handle the case when checkHemoCubeKitData() returns false
+                // Handle the case when checkHemoCubeKitData() returns false
-//                with(sharedPreference.edit()) {
+                with(sharedPreference.edit()) {
-//                    putString(Constants.KIT_NUMBER, "")
+                    putString(Constants.KIT_NUMBER, "")
-//                    putInt(Constants.KIT_COUNT, 0)
+                    putInt(Constants.KIT_COUNT, 0)
-//                    putString(Constants.BUFFER_VALUE_1, "")
+                    putString(Constants.BUFFER_VALUE_1, "")
-//                    putString(Constants.BUFFER_VALUE_2, "")
+                    putString(Constants.BUFFER_VALUE_2, "")
-//                    apply()
+                    apply()
-//                }
+                }
-//            }
+            }
-//        } catch (e: NullPointerException) {
+        } catch (e: NullPointerException) {
-//            // Handle the NullPointerException here
+            // Handle the NullPointerException here
-//            e.printStackTrace() // You can log the exception for debugging
+            e.printStackTrace() // You can log the exception for debugging
-//            FirebaseCrashlytics.getInstance().recordException(e)
+            FirebaseCrashlytics.getInstance().recordException(e)
-//            val errorMessage = "An error occurred: ${e.message}"
+            val errorMessage = "An error occurred: ${e.message}"
-//            val rootView = findViewById<View>(android.R.id.content)
+            val rootView = findViewById<View>(android.R.id.content)
-//            Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
+            Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
-//            // Optionally, show a user-friendly error message to the user
+            // Optionally, show a user-friendly error message to the user
-//            // Toast.makeText(applicationContext, "An error occurred", Toast.LENGTH_SHORT).show()
+            // Toast.makeText(applicationContext, "An error occurred", Toast.LENGTH_SHORT).show()
-//        }
+        }
+
+
+        binding.nameEditText.setText("SMI/SC/")
+
         setSupportActionBar(binding.toolbar)
 
         binding.btnScanNow.setOnClickListener {
@@ -213,39 +171,26 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
             if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
-                if(serialNumber.contains("SMI/SC/")){
+
-                    with(sharedPreference.edit()) {
+                Toast.makeText(
-                        putString(Constants.CUVETTE_SIZE, "2mm")
+                    applicationContext,
-                        apply()
+                    R.string.kit_update,
-                    }
+                    Toast.LENGTH_LONG
-                    Toast.makeText(this, "Selected cuvette size: 2mm", Toast.LENGTH_SHORT).show()
+                ).show()
-                }else if(serialNumber.contains("SMI/SC-2-D10/")){
-                    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()
@@ -253,9 +198,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()
@@ -266,21 +208,21 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
                 Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
                 return@setOnClickListener
             }
-//            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(
+            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(
-//                    serialNumber
+                    serialNumber
-//                )
+                )
-//            ) {
+            ) {
-//                DataHolder.kitSerial = binding.nameEditText.text.toString()
+                DataHolder.kitSerial = binding.nameEditText.text.toString()
-//                DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
+                DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
-//                with(sharedPreference.edit()) {
+                with(sharedPreference.edit()) {
-//                    putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
+                    putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
-//                    putInt(Constants.KIT_COUNT, 1)
+                    putInt(Constants.KIT_COUNT, 1)
-//                    apply()
+                    apply()
-//                }
+                }
-//                moveToNext()
+                moveToNext()
-//            } else {
+            } else {
-//                Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
+                Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
-//            }
+            }
         }
 
         //Setting up the SDK handler
@@ -339,58 +281,42 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         Log.d("BARCODE", result)
         runOnUiThread {
             val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
-            processScannedData(result)
+            binding.nameEditText.text = editableResult
-           // binding.nameEditText.text = editableResult
         }
     }
 
-//    private fun checkHemoCubeKitData(): Boolean {
+    private fun checkHemoCubeKitData(): Boolean {
-//        return sharedPreference.getString(Constants.KIT_NUMBER, "")
+        return sharedPreference.getString(Constants.KIT_NUMBER, "")
-//            ?.isNotBlank() == true && sharedPreference.getInt(
+            ?.isNotBlank() == true && sharedPreference.getInt(
-//            Constants.KIT_COUNT, 0
+            Constants.KIT_COUNT, 0
-//        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < Constants.KIT_CAPACITY
+        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < Constants.KIT_CAPACITY
-//    }
+    }
 
     private fun isSerialValid(s: String): Boolean {
-        if (s.contains("SMI/SC/")) {
+        if (s.length != 17) {
-            if(s.length != 17){
+            binding.nameEditText.error = getString(R.string.invalid_kit)
-                binding.nameEditText.error = "Invalid Kit Serial Number, correct example SMI/SC/000/00/000"
-                return false
-            }
-        }else if(s.contains("SMI/SC-2-D10/")){
-            if(s.length != 27){
-                binding.nameEditText.error = "Invalid Kit Serial Number, correct example SMI/SC-2-D10/000000/000/000"
-                return false
-            }
-        }else{
             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 -> {
-                            val i = Intent(applicationContext, HemocubeActivity::class.java)
-                            startActivity(i)
-                        }
 
-                        Constants.DEVICE_TYPE_TEST_RIGHT -> {
+        DataHolder.deviceType.observe(this) { deviceType ->
-                            val i = Intent(applicationContext, TestRightActivity::class.java)
+            when (deviceType) {
-                            startActivity(i)
+                Constants.DEVICE_TYPE_HEMOCUBE -> {
-                        }
+                    val i = Intent(applicationContext, HemocubeActivity::class.java)
+                    startActivity(i)
+                }
 
-                        Constants.DEVICE_TYPE_TRUEHEME -> {
+                Constants.DEVICE_TYPE_TEST_RIGHT -> {
-                            val i = Intent(applicationContext, HemocubeActivity::class.java)
+                    val i = Intent(applicationContext, TestRightActivity::class.java)
-                            startActivity(i)
+                    startActivity(i)
-                        }
+                }
-                    }
+
+                Constants.DEVICE_TYPE_TRUEHEME -> {
+                    val i = Intent(applicationContext, HemocubeActivity::class.java)
+                    startActivity(i)
                 }
             }
         }
@@ -426,18 +352,4 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
             true
         }
     }
-    private fun timeDifference(createdAt: String): Long {
-        val currentTime = Calendar.getInstance().time
-        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-
-        val createdAtDate: Date = if (createdAt.isEmpty()) {
-            currentTime
-        } else {
-            formatter.parse(createdAt) ?: currentTime
-        }
-
-        val diffMillis = currentTime.time - createdAtDate.time
-
-        return diffMillis / (60 * 1000)  // Convert milliseconds to minutes
-    }
 }

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

@@ -18,7 +18,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 +30,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.constant.Constants
 import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestType
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.android.gms.location.FusedLocationProviderClient
@@ -48,12 +48,12 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
+
     private lateinit var binding: ActivityMainBinding
     private var myMenu: Menu? = null
     private val TAG = "MainActivity"
     private lateinit var fusedLocationClient: FusedLocationProviderClient
     private lateinit var locationCallback: LocationCallback
-    private lateinit var sharedPreference: SharedPreferences
 
     private val usbReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent) {
@@ -73,21 +73,14 @@ 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 ->
@@ -99,6 +92,7 @@ class MainActivity : AppCompatActivity() {
                 }
             }
         }
+
         val usbFilter = IntentFilter().apply {
             addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
             addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED)
@@ -117,13 +111,12 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-//        if (DataHolder.selectedTest == null) {
+        if (DataHolder.selectedTest == null) {
-//            startActivity(Intent(this, DashboardActivity::class.java))
+            startActivity(Intent(this, DashboardActivity::class.java))
-//            finish()
+            finish()
-//        }
+        }
     }
 
-
     private fun checkAndUpdateUsbConnection() {
         val availableDrivers = UsbSerialProber.getDefaultProber()
             .findAllDrivers(getSystemService(Context.USB_SERVICE) as UsbManager)
@@ -227,7 +220,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()
         }
@@ -235,14 +227,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()
         }

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

@@ -14,6 +14,7 @@
 package com.example.hpostesting.presentation
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -33,6 +34,7 @@ import com.example.hpostesting.util.MyUtils
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivitySplashBinding
 
+@SuppressLint("CustomSplashScreen")
 class SplashActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivitySplashBinding
@@ -64,6 +66,7 @@ class SplashActivity : AppCompatActivity() {
         requestPermissions()
     }
 
+    @SuppressLint("HardwareIds")
     private fun setupStaticConstants() {
         DataHolder.mobileUniqueId =
             Settings.Secure.getString(

app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt

@@ -15,8 +15,10 @@ package com.example.hpostesting.presentation.adapter
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.content.res.Resources
-import android.provider.ContactsContract.Data
+import android.os.BatteryManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -36,7 +38,7 @@ import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 
-class OfflineUserListAdapter(private val view: View, private val batLevel: Int,private val fromWhere:String) :
+class OfflineUserListAdapter(private val view: View, private val batLevel: Int, private val fromWhere:String) :
     RecyclerView.Adapter<OfflineUserListAdapter.OfflineUserListViewHolder>() {
 
     inner class OfflineUserListViewHolder(val binding: OfflineUserListViewBinding) :
@@ -73,7 +75,7 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int,p
     override fun onBindViewHolder(holder: OfflineUserListViewHolder, position: Int) {
         val userList = differ.currentList[position]
         holder.binding.apply {
-            userID.text = "Sample ID: ${userList._id}"
+            userID.text = "User ID: ${userList._id}"
             bloodGroup.text = "Blood group: ${userList.bloodGroup}"
             time.text = "Time: ${isBetween15And30Minutes(userList.incubationTime)} \n Started at: ${
                 SimpleDateFormat("HH:mm:ss").format(
@@ -89,9 +91,11 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int,p
             } else {
                 teststatus.text = view.context.getString(R.string.test_pending)
             }
-            if(fromWhere == "Home") {
+            if(fromWhere == "Home"){
                 userCard.setOnClickListener {
-                    if (false) {
+                    var batLevel = 50F
+                    batLevel = getBatteryLevel()!!.toFloat()
+                    if (batLevel < Constants.MINIMUM_BATTERY_LEVEL) {
                         Toast.makeText(
                             view.context,
                             view.context.getString(R.string.low_battery_warning),
@@ -114,22 +118,23 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int,p
                                         view.context.getString(R.string.incubation_not_completed),
                                         Toast.LENGTH_SHORT
                                     ).show()
-                                } else if (isBetween15And30Minutes(userList.incubationTime) > Constants.INCUBATION_TIME_MAX) {
+                                } else
-                                    Toast.makeText(
+                                    if (isBetween15And30Minutes(userList.incubationTime) > Constants.INCUBATION_TIME_MAX) {
-                                        view.context,
+                                        Toast.makeText(
-                                        view.context.getString(R.string.incubation_crossed_30_minutes),
+                                            view.context,
-                                        Toast.LENGTH_SHORT
+                                            view.context.getString(R.string.incubation_crossed_30_minutes),
-                                    ).show()
+                                            Toast.LENGTH_SHORT
-                                } else {
+                                        ).show()
-                                    DataHolder.selectedTest = UserData(
+                                    } else {
+                                        DataHolder.selectedTest = UserData(
                                             sampleid = userList.sampleid,
                                             _id = userList._id,
                                             bloodGroup = userList.bloodGroup,
                                             incubationTime = userList.incubationTime
-                                    )
+                                        )
-                                    view.findNavController()
+                                        view.findNavController()
                                             .navigate(R.id.action_nav_home_to_mainActivity)
-                                }
+                                    }
                             } else {
                                 Toast.makeText(
                                     view.context,
@@ -141,6 +146,8 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int,p
                     }
                 }
             }
+
+
         }
     }
 
@@ -170,4 +177,25 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int,p
             Toast.LENGTH_SHORT
         ).show()
     }
+    fun getBatteryLevel(): Float? {
+        val batteryPct: Float? = batteryStatus?.let { intent ->
+            val level: Int =
+                intent.getIntExtra(
+                    BatteryManager.EXTRA_LEVEL,
+                    -1
+                )
+            val scale: Int =
+                intent.getIntExtra(
+                    BatteryManager.EXTRA_SCALE,
+                    -1
+                )
+            level * 100 / scale.toFloat()
+        }
+
+        return batteryPct
+    }
+    private val batteryStatus: Intent? =
+        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
+            view.context.registerReceiver(null, ifilter)
+        }
 }

app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt

@@ -41,6 +41,7 @@ import java.util.Date
 import java.util.Locale
 
 class UserListAdapter(
+
     private val context: Context,
     private val hemoCubeViewModel: HemoCubeViewModel,
     options: FirestoreRecyclerOptions<UserData>,

app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt

@@ -16,7 +16,6 @@ package com.example.hpostesting.presentation.autodac
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.text.method.ScrollingMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -37,14 +36,13 @@ import java.util.Calendar
 import java.util.Locale
 
 class AutoDacFragment : Fragment() {
-    private var readClick = false
+
-    private var testStatusCode = 0.0
     private lateinit var binding: FragmentAutoDacBinding
     private val autoDacViewModel: AutoDacViewModel by activityViewModels()
     private lateinit var sharedPreferences: SharedPreferences
     private var currentDeviceData: DeviceData? = null
     private var resultData: String = ""
- //   private val messages = MutableLiveData<String>()
+    private val messages = MutableLiveData<String>()
     private var startListening = MutableLiveData(false)
 
     override fun onCreateView(
@@ -66,25 +64,14 @@ class AutoDacFragment : Fragment() {
         binding.btnSubmit.visibility = View.GONE
         listenToHemoCube()
         getDeviceId()
-        binding.tvSubtitle4.movementMethod = ScrollingMovementMethod()
         binding.btnSubmit.setOnClickListener {
-            resultData += "Calibrating the device...\n"
-            autoDacViewModel.messages.postValue(resultData)
-            testStatusCode = 0.5
             binding.btnSubmit.visibility = View.GONE
-            runJCommand()
+            runAutoDacCommand()
         }
         binding.btnReadDac.setOnClickListener {
-            readClick = true
             binding.btnReadDac.visibility = View.GONE
-            runECommand()
+            readCurrentDACValuesCommand()
         }
-        if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
-            binding.btnReadDac.visibility = View.VISIBLE
-        }else{
-            binding.btnReadDac.visibility = View.GONE
-        }
-
     }
 
     private fun observeViewModel() {
@@ -93,7 +80,7 @@ class AutoDacFragment : Fragment() {
             currentDeviceData = it
         }
 
-        autoDacViewModel.messages.observe(viewLifecycleOwner) {
+        messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
         }
 
@@ -127,33 +114,8 @@ class AutoDacFragment : Fragment() {
                 }
             })
     }
-    private fun runJCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.J_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
 
-                override fun onUsbError(e: Exception?) {
+    private fun runAutoDacCommand() {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runDCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.DIAGNOSTICS_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runCCommand() {
         autoDacViewModel.progressBar.postValue(true)
         (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
             HemoCubeCommands.AUTO_DAC_COMMAND,
@@ -166,33 +128,6 @@ class AutoDacFragment : Fragment() {
                 }
             })
     }
-    private fun runGCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.SET_AUTO_DAC_TO_EPROM_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runECommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.LOAD_DAC_VALUES,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
 
     private fun setAutoDacValuesCommand() {
         autoDacViewModel.progressBar.postValue(true)
@@ -233,12 +168,10 @@ class AutoDacFragment : Fragment() {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val stringData = String(it)
+                        autoDacViewModel.messages.postValue(stringData)
                         fullReadOutput.append(stringData)
                         resultData += stringData
-                        if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+                        binding.tvSubtitle4.text = resultData
-                            autoDacViewModel.messages.postValue(resultData)
-                        }
-                       // binding.tvSubtitle4.text = resultData
                         if (stringData.contains("SN")) {
                             val slData = stringData.split(" ")
                             if (slData.size > 1) {
@@ -253,56 +186,10 @@ class AutoDacFragment : Fragment() {
                             }
                         }
                     }
-                    if (resultData.contains("#JC") && testStatusCode < 1.0) {
+
-                        testStatusCode = 1.1
+                    if (resultData.contains("#CC")) {
-                        runDCommand()
-                    }
-                    if (resultData.contains("#DC") && testStatusCode < 1.2) {
-                        testStatusCode = 1.3
-                        if(validateDacValues()){
-                            if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
-                                resultData += "Calibrating the device, Please wait...\n"
-                            }else{
-                                resultData = "Calibrating the device, Please wait...\n"
-                            }
-                            autoDacViewModel.messages.postValue(resultData)
-                            runCCommand()
-                        }else{
-                            activity?.runOnUiThread {
-                                if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
-                                    resultData += "Calibration failed!\nContact us for help at support@sminnovations.in"
-                                }else{
-                                    resultData = "Calibration failed!\nContact us for help at support@sminnovations.in"
-                                }
-                                autoDacViewModel.messages.postValue(resultData)
-                                binding.btnReadDac.visibility = View.GONE
-                            }
-                        }
-                    }
-                    if (resultData.contains("#GC") && testStatusCode < 1.6) {
-                        testStatusCode = 1.7
-                        runECommand()
-                    }
-                    if (resultData.contains("#EC") && testStatusCode < 1.8) {
-                        testStatusCode = 1.9
-                        if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
-                            resultData += "Calibration Completed\n"
-                        }else{
-                            resultData = "Calibration Completed\n"
-                        }
-                        autoDacViewModel.messages.postValue(resultData)
-                        activity?.runOnUiThread {
-                            Toast.makeText(requireActivity(), "Calibration completed", Toast.LENGTH_LONG).show()
-                            binding.ivCheck.visibility = View.VISIBLE
-                        }
-                    }
-                    if (resultData.contains("#EC") && readClick && testStatusCode < 2.1) {
-                        testStatusCode = 2.2
-                        readCurrentDACValuesCommand()
-                    }
-                    if (resultData.contains("#CC") && testStatusCode < 1.4) {
-                        testStatusCode = 1.5
                         setAutoDacValuesCommand()
+
                         autoDacViewModel.addAutoDacDataToDb(
                             DiagnosticsData(
                                 deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
@@ -325,7 +212,9 @@ class AutoDacFragment : Fragment() {
                                 ).format(Calendar.getInstance().time)
                             )
                         )
-
+                        activity?.runOnUiThread {
+                            binding.ivCheck.visibility = View.VISIBLE
+                        }
                     }
 
                     if (resultData.contains("#WC")) {
@@ -341,27 +230,6 @@ class AutoDacFragment : Fragment() {
             Firebase.crashlytics.recordException(e)
         }
     }
-    fun extractSubstring(input: String): String {
-        val regex = "#CS(.*?)#CC".toRegex()
-        val matchResult = regex.find(input)
-        return matchResult?.groups?.get(1)?.value?.trim() ?: ""
-    }
-    private fun validateDacValues(): Boolean {
-        val pattern = Regex("(LED:\\d+)__DAC:(\\d+)__ADC:(\\d+)")
-        val matches = pattern.findAll(resultData)
-        for (match in matches) {
-            val ledName = match.groupValues[1]
-            val xValue = match.groupValues[2].toDouble()
-            val yValue = match.groupValues[3].toDouble()
-
-            if(xValue == 3200.0){
-                if(yValue < 500.0){
-                    return false
-                }
-            }
-        }
-        return true
-    }
 
     fun parseData(inputData: List<String>): List<Pair<String, String>> {
         val pattern = Regex("([A-Z]+)\\s(\\d+)")

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

@@ -13,27 +13,14 @@
 
 package com.example.hpostesting.presentation.dashboard
 
-import android.content.Context
+import android.content.Intent
-import android.content.SharedPreferences
+import android.net.Uri
-import android.os.BatteryManager
 import android.os.Bundle
-import android.util.Log
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.Fragment
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
-import com.example.hpostesting.presentation.adapter.UserListAdapter
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.testRight.TestRightViewModel
-import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentAboutBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentActivitiesBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
 
 class AboutFragment : Fragment() {
     private lateinit var binding: FragmentAboutBinding
@@ -47,14 +34,13 @@ class AboutFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
 //        binding.linkClick.setOnClickListener {
 //            val url = "https://sminnovations.in/"
 //            val intent = Intent(Intent.ACTION_VIEW)
 //            intent.data = Uri.parse(url)
 //            startActivity(intent)
 //        }
-
-
     }
 
 }

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

@@ -25,10 +25,6 @@ import androidx.fragment.app.activityViewModels
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import `in`.sminnovations.hpostesting.databinding.FragmentActivitiesBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Date
-import java.util.Locale
 
 class ActivitiesFragment : Fragment() {
     private lateinit var binding: FragmentActivitiesBinding
@@ -49,12 +45,6 @@ class ActivitiesFragment : Fragment() {
         hemoCubeViewModel.allPendingUserToUpload.observe(viewLifecycleOwner) { userData ->
 
             if (userData.isNotEmpty()) {
-                userData.forEach { user ->
-                    if((isBetween15And30Minutes(user.incubationTime) > 30 || isBetween15And30Minutes(user.incubationTime) < 0 ) && user.testStatus == false){
-                        hemoCubeViewModel.deleteByStatus()
-                    }
-                }
-
                 binding.rvOrderOffline.visibility = View.VISIBLE
                 binding.noDataText.visibility = View.GONE
                 val bm =
@@ -70,16 +60,5 @@ class ActivitiesFragment : Fragment() {
             }
         }
     }
-    private fun isBetween15And30Minutes(createdAt: String): Long {
-        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-        val createdAtDate: Date = formatter.parse(createdAt)!!
-
-        val currentTime = Calendar.getInstance().time
-
-        val diffMillis = currentTime.time - createdAtDate.time
-
-        return diffMillis / (60 * 1000)
-    }
-
 
 }

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

@@ -1,18 +0,0 @@
-package com.example.hpostesting.presentation.dashboard
-
-class AppVersionTapManager {
-
-    private var tapCount = 0
-    private val maxTapCount = 5
-
-    fun registerTap(onMaxTapsReached: () -> Unit) {
-        tapCount++
-        if (tapCount >= maxTapCount) {
-            onMaxTapsReached()
-            reset()
-        }
-    }
-    private fun reset() {
-        tapCount = 0
-    }
-}

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

@@ -33,26 +33,25 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
-import com.example.hpostesting.data.repository.DatabaseRepository
+import com.example.hpostesting.presentation.utils.NatsManager
-import com.example.hpostesting.firebase.FirebaseManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.jig.JigActivity
-import com.example.hpostesting.presentation.utils.NatsManager
 import com.google.android.material.navigation.NavigationView
-import com.google.firebase.ktx.Firebase
+import com.google.firebase.appdistribution.FirebaseAppDistribution
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.google.firebase.appdistribution.FirebaseAppDistributionException
-import com.google.firebase.remoteconfig.ktx.remoteConfig
+import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.BuildConfig
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
 import java.io.File
 import java.security.MessageDigest
-import javax.inject.Inject
 
 interface NatsMessageCallback {
     fun onMessageReceived(topic: String, message: String)
@@ -65,9 +64,7 @@ open interface IDataCollector: NatsMessageCallback {
 
 @AndroidEntryPoint
 class DashboardActivity : AppCompatActivity(), IDataCollector {
-    @Inject
+
-    lateinit var databaseRepository: DatabaseRepository
-    private val remoteConfig: FirebaseRemoteConfig = Firebase.remoteConfig
     val TAG = "DashboardActivity"
     private var isRegistered = false
     private lateinit var appBarConfiguration: AppBarConfiguration
@@ -75,18 +72,16 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     lateinit var sharedPreferences: SharedPreferences
     var responses: String = ""
     lateinit var nats: NatsManager
-
     private var downloadId: Long = 0
     // TODO: Remove hemocube viewmodel
     private val hemocubeViewModel: HemoCubeViewModel by viewModels()
-
+    private lateinit var sharedPreference: SharedPreferences
     override fun attachBaseContext(newBase: Context?) {
         val languageCode = LanguageManager.getSavedLanguage(newBase!!)
         LanguageManager.setLocale(newBase, languageCode)
         super.attachBaseContext(newBase)
     }
 
-
     override fun onMessageReceived(topic: String, message: String) {
         // Handle incoming messages from NATS
 
@@ -96,24 +91,16 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     @SuppressLint("SetWorldReadable")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val firebaseManager = FirebaseManager(this)
+
         binding = ActivityDashboardBinding.inflate(layoutInflater)
         sharedPreferences = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         setContentView(binding.root)
         setSupportActionBar(binding.appBarDashboard.toolbar)
         nats = NatsManager(this)
-
-        val currentServer = firebaseManager.getLastSelectedServer().serverName
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             nats.connect()
         }
-        val savedKitSerial = sharedPreferences.getString(Constants.KIT_NUMBER, "")
+        val versionName =  getAppVersion(this@DashboardActivity) + " [ " + getAppEnvironment(this@DashboardActivity) + " ]"
-
-        Log.d("DashboardActivity", "Saved Kit Serial: $savedKitSerial")
-      //  Toast.makeText(this, "Saved Kit Serial: $savedKitSerial", Toast.LENGTH_SHORT).show()
-
-        val versionName =  getAppVersion(this@DashboardActivity) + " [ " + getAppEnvironment(this@DashboardActivity) +"->"+currentServer+"]"
         binding.appBarDashboard.versionName.text = versionName
 
 
@@ -122,90 +109,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         nats.sub("server.hpos.${deviceId}.ping")
         nats.pub("server.hpos.${deviceId}.ping", "THIS IS A TEST MSG")
 
-        val configSettings = remoteConfigSettings {
-            minimumFetchIntervalInSeconds = 3600
-        }
-        remoteConfig.setConfigSettingsAsync(configSettings)
-        remoteConfig.setDefaultsAsync(R.xml.remote_config_defaults)
-
-        remoteConfig.fetchAndActivate()
-            .addOnCompleteListener(this) { task ->
-                if (task.isSuccessful) {
-                    val normalMin2mm = remoteConfig.getDouble("normalMin2mm")
-                    val normalMax2mm = remoteConfig.getDouble("normalMax2mm")
-                    val negativeBorderlineMin2mm = remoteConfig.getDouble("negativeBorderlineMin2mm")
-                    val negativeBorderlineMax2mm = remoteConfig.getDouble("negativeBorderlineMax2mm")
-                    val positiveForSickleCellMin2mm = remoteConfig.getDouble("positiveForSickleCellMin2mm")
-                    val positiveForSickleCellMax2mm = remoteConfig.getDouble("positiveForSickleCellMax2mm")
-                    val sickleCellTraitMin2mm = remoteConfig.getDouble("sickleCellTraitMin2mm")
-                    val sickleCellTraitMax2mm = remoteConfig.getDouble("sickleCellTraitMax2mm")
-                    val sickleCellDiseaseMin2mm = remoteConfig.getDouble("sickleCellDiseaseMin2mm")
-                    val sickleCellDiseaseMax2mm = remoteConfig.getDouble("sickleCellDiseaseMax2mm")
-                    val positiveBoderLine2mm1 = remoteConfig.getDouble("positiveBoderLine2mm1")
-                    val positiveBoderLine2mm2 = remoteConfig.getDouble("positiveBoderLine2mm2")
-                    val negativeBoderLine2mm1 = remoteConfig.getDouble("negativeBoderLine2mm1")
-                    val negativeBoderLine2mm2 = remoteConfig.getDouble("negativeBoderLine2mm2")
-
-                    val normalMin10mm = remoteConfig.getDouble("normalMin10mm")
-                    val normalMax10mm = remoteConfig.getDouble("normalMax10mm")
-                    val negativeBorderlineMin10mm = remoteConfig.getDouble("negativeBorderlineMin10mm")
-                    val negativeBorderlineMax10mm = remoteConfig.getDouble("negativeBorderlineMax10mm")
-                    val positiveForSickleCellMin10mm = remoteConfig.getDouble("positiveForSickleCellMin10mm")
-                    val positiveForSickleCellMax10mm = remoteConfig.getDouble("positiveForSickleCellMax10mm")
-                    val sickleCellTraitMin10mm = remoteConfig.getDouble("sickleCellTraitMin10mm")
-                    val sickleCellTraitMax10mm = remoteConfig.getDouble("sickleCellTraitMax10mm")
-                    val sickleCellDiseaseMin10mm = remoteConfig.getDouble("sickleCellDiseaseMin10mm")
-                    val sickleCellDiseaseMax10mm = remoteConfig.getDouble("sickleCellDiseaseMax10mm")
-                    val positiveBoderLine10mm1 = remoteConfig.getDouble("positiveBoderLine10mm1")
-                    val positiveBoderLine10mm2 = remoteConfig.getDouble("positiveBoderLine10mm2")
-                    val negativeBoderLine10mm1 = remoteConfig.getDouble("negativeBoderLine10mm1")
-                    val negativeBoderLine10mm2 = remoteConfig.getDouble("negativeBoderLine10mm2")
-
-                    val bufferMinLed1 = remoteConfig.getDouble("bufferMinLed1")
-                    val bufferMaxLed1 = remoteConfig.getDouble("bufferMaxLed1")
-                    val bufferMinLed2 = remoteConfig.getDouble("bufferMinLed2")
-                    val bufferMaxLed2 = remoteConfig.getDouble("bufferMaxLed2")
-                    with(sharedPreferences.edit()) {
-                        putString("bufferMinLed1", bufferMinLed1.toString())
-                        putString("bufferMaxLed1", bufferMaxLed1.toString())
-                        putString("bufferMinLed2", bufferMinLed2.toString())
-                        putString("bufferMaxLed2", bufferMaxLed2.toString())//buffer
-                        putString("normalMin2mm", normalMin2mm.toString())//2mm
-                        putString("normalMax2mm", normalMax2mm.toString())
-                        putString("negativeBorderlineMin2mm", negativeBorderlineMin2mm.toString())
-                        putString("negativeBorderlineMax2mm", negativeBorderlineMax2mm.toString())
-                        putString("positiveForSickleCellMin2mm", positiveForSickleCellMin2mm.toString())
-                        putString("positiveForSickleCellMax2mm", positiveForSickleCellMax2mm.toString())
-                        putString("sickleCellTraitMin2mm", sickleCellTraitMin2mm.toString())
-                        putString("sickleCellTraitMax2mm", sickleCellTraitMax2mm.toString())
-                        putString("sickleCellDiseaseMin2mm", sickleCellDiseaseMin2mm.toString())
-                        putString("sickleCellDiseaseMax2mm", sickleCellDiseaseMax2mm.toString())
-                        putString("positiveBoderLine2mm1", positiveBoderLine2mm1.toString())
-                        putString("positiveBoderLine2mm2", positiveBoderLine2mm2.toString())
-                        putString("negativeBoderLine2mm1", negativeBoderLine2mm1.toString())
-                        putString("negativeBoderLine2mm2", negativeBoderLine2mm2.toString())//2mm
-                        putString("normalMin10mm", normalMin10mm.toString())//10mm
-                        putString("normalMax10mm", normalMax10mm.toString())
-                        putString("negativeBorderlineMin10mm", negativeBorderlineMin10mm.toString())
-                        putString("negativeBorderlineMax10mm", negativeBorderlineMax10mm.toString())
-                        putString("positiveForSickleCellMin10mm", positiveForSickleCellMin10mm.toString())
-                        putString("positiveForSickleCellMax10mm", positiveForSickleCellMax10mm.toString())
-                        putString("sickleCellTraitMin10mm", sickleCellTraitMin10mm.toString())
-                        putString("sickleCellTraitMax10mm", sickleCellTraitMax10mm.toString())
-                        putString("sickleCellDiseaseMin10mm", sickleCellDiseaseMin10mm.toString())
-                        putString("sickleCellDiseaseMax10mm", sickleCellDiseaseMax10mm.toString())
-                        putString("positiveBoderLine10mm1", positiveBoderLine10mm1.toString())
-                        putString("positiveBoderLine10mm2", positiveBoderLine10mm2.toString())
-                        putString("negativeBoderLine10mm1", negativeBoderLine10mm1.toString())
-                        putString("negativeBoderLine10mm2", negativeBoderLine10mm2.toString())//10mm
-                        apply()
-                    }
-                    Log.d(TAG, "Config params updated")
-                } else {
-                    Log.d(TAG, "Config params Fetch failed")
-                }
-            }
-
         hemocubeViewModel.deviceUpdate.observe(this) {
             Log.d("DashboardLogs",it.toString())
 
@@ -219,8 +122,8 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
                     input.copyTo(output)
                 }
             }
-        }
 
+        }
         hemocubeViewModel.deviceUpdateheader.observe(this){
             val apkFile = File(getExternalFilesDir("Downloads"), "update.apk")
             val expectedChecksum = it.get("Checksum") // Provide your expected checksum here
@@ -255,12 +158,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
 
 
 
-//    fun sendData(data:String){  this was used to send the basic data for server validation
-//        databaseRepository.addtodb(data)
-//        Toast.makeText(this, "data uploaded", Toast.LENGTH_SHORT).show()
-//    }
-
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         // Inflate the menu; this adds items to the action bar if it is present.
         menuInflater.inflate(R.menu.dashboard, menu)
@@ -326,41 +223,41 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     override fun onResume() {
         super.onResume()
 
-//        val firebaseAppDistribution = FirebaseAppDistribution.getInstance()
+        val firebaseAppDistribution = FirebaseAppDistribution.getInstance()
-//        firebaseAppDistribution.updateIfNewReleaseAvailable()
+        firebaseAppDistribution.updateIfNewReleaseAvailable()
-//            .addOnProgressListener { updateProgress ->
+            .addOnProgressListener { updateProgress ->
-//
+
-//                if (updateProgress.apkBytesDownloaded > 0) {
+                if (updateProgress.apkBytesDownloaded > 0) {
-//                    Toast.makeText(
+                    Toast.makeText(
-//                        this,
+                        this,
-//                        "${updateProgress.updateStatus}. ${updateProgress.apkBytesDownloaded / 1048576} /${updateProgress.apkFileTotalBytes / 1048576} MB",
+                        "${updateProgress.updateStatus}. ${updateProgress.apkBytesDownloaded / 1048576} /${updateProgress.apkFileTotalBytes / 1048576} MB",
-//                        Toast.LENGTH_SHORT
+                        Toast.LENGTH_SHORT
-//                    ).show()
+                    ).show()
-//                }
+                }
-//            }
+            }
-//            .addOnFailureListener { e ->
+            .addOnFailureListener { e ->
-//                // (Optional) Handle errors.
+                // (Optional) Handle errors.
-//                if (e is FirebaseAppDistributionException) {
+                if (e is FirebaseAppDistributionException) {
-//                    when (e.errorCode) {
+                    when (e.errorCode) {
-//                        FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> {
+                        FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> {
-//                            // SDK did nothing. This is expected when building for Play.
+                            // SDK did nothing. This is expected when building for Play.
-//                        }
+                        }
-//
+
-//                        else -> {
+                        else -> {
-//                            // Handle other errors.
+                            // Handle other errors.
-//                            Toast.makeText(
+                            Toast.makeText(
-//                                this,
+                                this,
-//                                "AppDistribution error, status: ${e.errorCode}",
+                                "AppDistribution error, status: ${e.errorCode}",
-//                                Toast.LENGTH_SHORT
+                                Toast.LENGTH_SHORT
-//                            ).show()
+                            ).show()
-//                        }
+                        }
-//                    }
+                    }
-//                    FirebaseCrashlytics.getInstance().recordException(e)
+                    FirebaseCrashlytics.getInstance().recordException(e)
-//                }
+                }
-//            }
+            }
-//            .addOnSuccessListener {
+            .addOnSuccessListener {
-////                Toast.makeText(this, "App Update: Success!", Toast.LENGTH_SHORT).show()
+//                Toast.makeText(this, "App Update: Success!", Toast.LENGTH_SHORT).show()
-//            }
+            }
     }
 
     override fun setConnect(connect: Boolean) {
@@ -379,14 +276,13 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
 
     private fun createDeviceUpdateRequestData(): DeviceUpdateRequest {
         return DeviceUpdateRequest(
-            serial_no = sharedPreferences.getString(Constants.DEVICE_ID, "")
+            serial_no = sharedPreference.getString(Constants.DEVICE_ID, "")
         )
     }
     private fun getAppVersion(context: Context): String {
         return try {
             val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
             pInfo.versionName
-
         } catch (e: PackageManager.NameNotFoundException) {
             "N/A"
         }

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

@@ -28,7 +28,6 @@ import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.presentation.autodac.AutoDacActivity
 import com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity
 import com.example.hpostesting.presentation.calibration.CalibrationActivity
-import com.example.hpostesting.presentation.dashboard.ui.PasswordResetActivity
 import com.example.hpostesting.presentation.deviceinfo.DeviceActivity
 import com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity
 import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
@@ -87,12 +86,9 @@ class GalleryFragment : Fragment() {
             binding.btnUsbTerminal.visibility = View.VISIBLE
             binding.btnSubmit.visibility = View.VISIBLE
             binding.btnDeviceInfo.visibility = View.VISIBLE
-            binding.btnResetPassword.visibility = View.VISIBLE
-            binding.btnUpdateValues.visibility = View.VISIBLE
         }else{
-            binding.btnResetPassword.visibility = View.GONE
             binding.btnDeviceProvision.visibility = View.GONE
-            binding.btnAutoDac.visibility = View.VISIBLE
+            binding.btnAutoDac.visibility = View.GONE
             binding.btnDeviceProvision.visibility = View.GONE
             binding.btnDiagnostics.visibility = View.VISIBLE
             binding.btnFiles.visibility = View.GONE
@@ -101,18 +97,11 @@ class GalleryFragment : Fragment() {
             binding.btnUsbTerminal.visibility = View.GONE
             binding.btnSubmit.visibility = View.GONE
             binding.btnDeviceInfo.visibility = View.VISIBLE
-            binding.btnUpdateValues.visibility = View.GONE
         }
 
-        binding.btnResetPassword.setOnClickListener{
-            startActivity(Intent(requireContext(), PasswordResetActivity::class.java))
-        }
         binding.btnDeviceProvision.setOnClickListener {
             startActivity(Intent(requireContext(), DeviceProvisionActivity::class.java))
         }
-        binding.btnUpdateValues.setOnClickListener {
-            startActivity(Intent(requireContext(), UpdateValuesActivity::class.java))
-        }
         binding.btnUsbTerminal.setOnClickListener {
             startActivity(Intent(requireContext(), UsbTerminalActivity::class.java))
         }

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

@@ -24,14 +24,12 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
-import android.net.ConnectivityManager
+import android.health.connect.datatypes.units.Length
-import android.net.NetworkCapabilities
 import android.net.Uri
 import android.os.BatteryManager
 import android.os.Build
 import android.os.Bundle
 import android.os.Environment
-import android.provider.ContactsContract.Data
 import android.provider.Settings
 import android.util.Base64
 import android.util.Log
@@ -40,12 +38,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.annotation.RequiresApi
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.DataHolder
@@ -60,25 +55,20 @@ import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.encryption.Encryption
 import com.example.hpostesting.presentation.KitScanActivity
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
-import com.example.hpostesting.presentation.adapter.UserListAdapter
 import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.TestRightViewModel
 import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
 import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.util.Result
-import com.firebase.ui.firestore.FirestoreRecyclerOptions
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
-import com.google.firebase.perf.ktx.performance
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import okhttp3.ResponseBody
 import org.json.JSONObject
 import java.io.BufferedOutputStream
@@ -90,8 +80,8 @@ import java.net.URL
 import java.nio.charset.Charset
 import java.text.SimpleDateFormat
 import java.util.Calendar
-import java.util.Date
 import java.util.Locale
+import java.util.Scanner
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import kotlin.properties.Delegates
@@ -104,9 +94,8 @@ class HomeFragment : Fragment() {
     private lateinit var binding: FragmentHomeBinding
     private val viewModel: TestRightViewModel by activityViewModels()
     private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
-    private lateinit var rvAdapter: UserListAdapter
+   // private lateinit var rvAdapter: UserListAdapter
-    private var batLevel: Int =
+    private var batLevel: Int = 0 // Initialize with a default value, or obtain the actual battery level
-        0 // Initialize with a default value, or obtain the actual battery level
     private lateinit var adapter: OfflineUserListAdapter
     private val homeViewModel: HemoCubeViewModel by activityViewModels()
     private var isTokenAvailable by Delegates.notNull<Boolean>()
@@ -137,11 +126,10 @@ class HomeFragment : Fragment() {
 
         getDeviceId()
         checkUnprocessedCSVData()
-        //checkForUpdate()
+       // checkForUpdate()
         viewModel.allUserData.observe(viewLifecycleOwner) { userData ->
             deleteIncompleteRegistrations(userData)
         }
-       // getLocationIP()
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
             deleteHemoCubeIncompleteRegistrations(userData)
             if (userData.isNotEmpty()) {
@@ -152,10 +140,6 @@ class HomeFragment : Fragment() {
                     }else if(it.testStatus == true){
                         userList.removeAll(userData)
                     }
-
-                    if (timeDifference(it.incubationTime) >= 50){
-                        userList.removeAll(userData)
-                    }
                 }
                 val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
                 val batLevel: Int = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
@@ -178,78 +162,68 @@ class HomeFragment : Fragment() {
                 Toast.makeText(
                     requireContext(), R.string.test_upload, Toast.LENGTH_SHORT
                 ).show()
-                hemoCubeViewModel.fireBaseBulkUpload.postValue("Done")
             }
             if (result == "Error") {
                 Toast.makeText(requireContext(), R.string.test_upload_failed, Toast.LENGTH_SHORT)
                     .show()
             }
         }
-//        binding.btnLogout.setOnClickListener {
+        binding.btnLogout.setOnClickListener {
-//            logoutUser(requireContext())
+            logoutUser(requireContext())
-//        }
+        }
 
         binding.btnLogout1.setOnClickListener {
             logoutUser(requireContext())
         }
 
-//        binding.uploadData.setOnClickListener {
+        binding.uploadData.setOnClickListener {
-////            showUploadDialog(requireContext())
+//            showUploadDialog(requireContext())
-//        }
+        }
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
-//            if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+            if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
-//
+                val btnSaveLocalVisibility =
-//            }else{
+                    if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE
-//                binding.downloadCSV.visibility = View.GONE
+                binding.downloadCSV.visibility = btnSaveLocalVisibility
-//            }
+                binding.downloadCSV.setOnClickListener {
-            val btnSaveLocalVisibility =
+                    if (btnSaveLocalVisibility == View.VISIBLE) {
-                if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE
+                        // Execute the action when the button is visible (testStatus is true for at least one user)
-            binding.downloadCSV.visibility = btnSaveLocalVisibility
+                        showDownloadDialog(requireContext())
-            binding.downloadCSV.setOnClickListener {
+                    } else {
-                if (btnSaveLocalVisibility == View.VISIBLE) {
+                        // Handle the case when the button is not visible
-                    // Execute the action when the button is visible (testStatus is true for at least one user)
+                        Toast.makeText(
-                    showDownloadDialog(requireContext())
+                            requireContext(),
-                } else {
+                            "No test details stored locally",
-                    // Handle the case when the button is not visible
+                            Toast.LENGTH_SHORT
-                    Toast.makeText(
+                        ).show()
-                        requireContext(),
+                    }
-                        "No test details stored locally",
-                        Toast.LENGTH_SHORT
-                    ).show()
                 }
+            }else{
+                binding.downloadCSV.visibility = View.GONE
             }
         }
 
 
-//        binding.btnNewKit.setOnClickListener {
+        binding.btnNewKit.setOnClickListener {
-//            with(sharedPreference.edit()) {
+            with(sharedPreference.edit()) {
-//                putString(Constants.KIT_NUMBER, "")
+                putString(Constants.KIT_NUMBER, "")
-//                putInt(Constants.KIT_COUNT, 0)
+                putInt(Constants.KIT_COUNT, 0)
-//                apply()
+                apply()
-//            }
+            }
-//            startActivity(Intent(requireContext(), KitScanActivity::class.java))
+            startActivity(Intent(requireContext(), KitScanActivity::class.java))
-//           // requireActivity().finish()
+           // requireActivity().finish()
-//        }
+        }
 
 
         binding.btnNewKitoffline.setOnClickListener {
-//            with(sharedPreference.edit()) {
-//                putString(Constants.KIT_NUMBER, "")
-//                putInt(Constants.KIT_COUNT, 0)
-//                apply()
-//            }
-            DataHolder.selectedTest = null
-            val intent = Intent(requireContext(), KitScanActivity::class.java)
-            intent.putExtra("fromWhere","Home")
-            startActivity(intent)
-           // requireActivity().finish()
-        }
-        binding.btnQuickCapture.setOnClickListener {
             with(sharedPreference.edit()) {
-                putBoolean(Constants.QUICK_CAPTURE, true)
+                putString(Constants.KIT_NUMBER, "")
+                putInt(Constants.KIT_COUNT, 0)
                 apply()
             }
-            DataHolder.quickCapture = true
+            startActivity(Intent(requireContext(), KitScanActivity::class.java))
+          //  requireActivity().finish()
+        }
+        binding.btnQuickCapture.setOnClickListener {
             DataHolder.hemoCubeTestData = HemoCubeTestData()
 
             val i = Intent(
@@ -265,57 +239,24 @@ class HomeFragment : Fragment() {
         checkNetworkStatus()
 
     }
-//    private fun getLocationIP() {
-//        try {
-//            if (isInternetAvailable(requireContext())) {
-//                getPublicIpAddr { ipAddress ->
-//                    if (ipAddress != "fail") {
-//                        DataHolder.ipAddress = ipAddress
-//                        with(sharedPreference.edit()) {
-//                            putString(Constants.IP_ADDRESS, ipAddress)
-//                            apply()
-//                        }
-//                    } else {
-//                        Log.e("Home", "Failed to get public IP address")
-//                    }
-//                }
-//            } else {
-//                Log.e("Home", "Internet is not available")
-//            }
-//        } catch (e: UnknownHostException) {
-//            Log.e("Home", "UnknownHostException: Unable to resolve host. Network might be unavailable or DNS server is not reachable", e)
-//        } catch (e: Exception) {
-//            Log.e("Home", "Network Problem", e)
-//        }
-//    }
 
     @RequiresApi(Build.VERSION_CODES.P)
     private fun checkNetworkStatus() {
         hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isConnected ->
            // Toast.makeText(requireContext(),"connected"+isConnected+wasConnected, Toast.LENGTH_SHORT).show()
-            if(isConnected){
-                binding.tvTitleNoInternet.text = "Please enter the user id and select blood group to start the test."
-                binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.internet))
-                binding.internetNotAvailableCL.visibility = View.VISIBLE
-            }else{
-                binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.off))
-                binding.tvTitleNoInternet.text = getString(R.string.internet_not_available_please_enter_the_user_id_manually)
-                binding.internetNotAvailableCL.visibility = View.VISIBLE
-            }
             if (isConnected != wasConnected) {
                 if (isConnected) {
-                    binding.tvTitleNoInternet.text = "Please enter the user id and select blood group to start the test."
+                    binding.internetAvailableCL.visibility = View.VISIBLE
-                    //binding.internetAvailableCL.visibility = View.VISIBLE
+                    binding.internetNotAvailableCL.visibility = View.GONE
-                    binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.internet))
+                    binding.pendingTest.visibility = View.VISIBLE
-                    binding.internetNotAvailableCL.visibility = View.VISIBLE
-                    binding.pendingTest.visibility = View.GONE
-                    setUserId()
                    // loadUserData()
-                   // setSearch()
+                    //setSearch()
-                    //checkForLocalDBData()
+                    checkForLocalDBData()
+
                     if (Constants.MOLBIO_INTEGRATION) {
                         checkForTokenAndUpdate()
                     }
+
                     // Now re-subscribe to allUserData
                     /*                hemoCubeViewModel.allLocalData.observe(viewLifecycleOwner) { originalUserDataList ->
 
@@ -380,27 +321,21 @@ class HomeFragment : Fragment() {
                                     }
 
                                 }*/
-                    if(Constants.MOLBIO_INTEGRATION){
+                    hemoCubeViewModel.sendDataToMolbio()
-                        hemoCubeViewModel.sendDataToMolbio()
+                    if(Constants.FIREBASE_INTEGRATION){
-                    }
-                    if(Constants.FIREBASE_INTEGRATION) {
                         hemoCubeViewModel.sendDataToFirebase()
                     }
-
                 } else {
-                    binding.tvTitleNoInternet.text = getString(R.string.internet_not_available_please_enter_the_user_id_manually)
+                    binding.internetAvailableCL.visibility = View.GONE
-                    // binding.internetAvailableCL.visibility = View.GONE
-                    binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.off))
                     binding.pendingTest.visibility = View.GONE
                     binding.internetNotAvailableCL.visibility = View.VISIBLE
+                    Toast.makeText(requireContext(),R.string.internet_not_available_please_enter_the_user_id_manually,Toast.LENGTH_LONG).show()
                     setUserId()
                 }
                 wasConnected = isConnected
             }else{
                 if(!wasConnected){
-                    binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.off))
+                    binding.internetAvailableCL.visibility = View.GONE
-                    binding.tvTitleNoInternet.text = getString(R.string.internet_not_available_please_enter_the_user_id_manually)
-                    //  binding.internetAvailableCL.visibility = View.GONE
                     binding.pendingTest.visibility = View.GONE
                     binding.internetNotAvailableCL.visibility = View.VISIBLE
                     setUserId()
@@ -416,8 +351,7 @@ class HomeFragment : Fragment() {
         var userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
         deviceId = sharedPreference.getString(Constants.DEVICE_ID, "").toString()
 
-       // val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+        val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
-        val target = File(requireContext().getExternalFilesDir(null), "HPOSDocuments")
         val file = File(target, "credentials.txt")      //this file contains userID and password to communicate with API.
 
         if (userID.isNotEmpty() && password.isNotEmpty()) {
@@ -425,7 +359,8 @@ class HomeFragment : Fragment() {
             if (!isTokenAvailable) {
                 Log.d("istoken1", isTokenAvailable.toString())
                 callLogin(userID, password)
-               // hemoCubeViewModel.login(createLoginRequestData(userID, password))
+
+
 
                 //isTokenAvailable = true
 
@@ -442,9 +377,9 @@ class HomeFragment : Fragment() {
                 //isTokenAvailable = true
                // hemoCubeViewModel.startPeriodicCheckUpdate()
             }
-        } else if (userID == "deviceIDAPI" && password == "devicePasswordAPI" && deviceId.isNotEmpty()) {
+        } else if (userID == "" && password == "" && deviceId.isNotEmpty()) {
             fetchDeviceCredentials()
-        } else if (file.exists()) {// change back without!
+        } else if (file.exists()) {
             val encryptedString = file.readText()
             val encryptionKey =
                 Settings.Secure.getString(context?.contentResolver, Settings.Secure.ANDROID_ID)
@@ -452,7 +387,14 @@ class HomeFragment : Fragment() {
             val credentials = decryptedMessage.split("\n")
             userID = credentials[0]
             password = credentials[1]
-            Toast.makeText(context, "DECRYPTED: $credentials", Toast.LENGTH_SHORT).show()
+            deviceId = credentials[0]
+
+            with(sharedPreference.edit()) {
+                putString(Constants.DEVICE_ID_API, credentials[0])
+                putString(Constants.DEVICE_PASSWORD_API, credentials[1])
+                apply()
+            }
+           // Toast.makeText(context, "DECRYPTED: $credentials", Toast.LENGTH_SHORT).show()
             if (!isTokenAvailable) {
                 callLogin(userID, password)
                 //hemoCubeViewModel.login(createLoginRequestData(userID, password))
@@ -461,7 +403,7 @@ class HomeFragment : Fragment() {
                 //hemoCubeViewModel.startPeriodicCheckUpdate()
                 if (isTokenExpired(accessToken)) {
                     callLogin(userID, password)
-                    //hemoCubeViewModel.login(createLoginRequestData(userID, password))
+                   // hemoCubeViewModel.login(createLoginRequestData(userID, password))
                 }else{
                     hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
                 }
@@ -573,6 +515,10 @@ class HomeFragment : Fragment() {
             when (response) {
                 is Result.Success -> {
                     val updatedversion = response.data.data?.version.toString()
+                    with(sharedPreference.edit()) {
+                        putString("version", response.data.data?.version)
+                        apply()
+                    }
                     val currentversion =
                         context?.let { ctx ->
                             val packageInfo = ctx.packageManager.getPackageInfo(ctx.packageName, 0)
@@ -602,6 +548,7 @@ class HomeFragment : Fragment() {
                             Toast.LENGTH_LONG
                         )
                             .show()
+
                     } else {
                         Toast.makeText(
                             activity,
@@ -632,6 +579,8 @@ class HomeFragment : Fragment() {
         }
 
         hemoCubeViewModel.downloadcertificate.observe(viewLifecycleOwner) { response ->
+            // Check if more than a year has passed since the last download (365 days * 24 hours * 60 minutes * 60 seconds * 1000 milliseconds)
+
             when (response) {
                 is Result.Success -> {
                     val url = response.data
@@ -640,7 +589,6 @@ class HomeFragment : Fragment() {
                     val fileName = "nats_certificate.zip"
                     val unzipDirectoryPath =
                         requireContext().getExternalFilesDir(null)?.absolutePath + "/$downloadDirectory"
-
                     // Check if the directory with extracted files exists.
                     val directory = File(unzipDirectoryPath)
                     if (directory.exists() && directory.isDirectory) {
@@ -653,9 +601,23 @@ class HomeFragment : Fragment() {
                         ).show()
                         return@observe
                     }
-                    val file = downloadFile(url, requireContext(), fileName, downloadDirectory)
+                    val sharedPreferences = requireContext().getSharedPreferences("NATSCertificatePrefs", Context.MODE_PRIVATE)
+                    val lastDownloadTime = sharedPreferences.getLong("lastDownloadTime", 0)
+                    val currentTime = System.currentTimeMillis()
+
+                    if (currentTime - lastDownloadTime < 365L * 24 * 60 * 60 * 1000) {
+                        Toast.makeText(requireContext(), "NATS certificate download is not required yet.", Toast.LENGTH_SHORT).show()
+                        return@observe
+                    }else{
+                        val file = downloadFile(url, requireContext(), fileName, downloadDirectory)
+                        unzip(file.absolutePath, unzipDirectoryPath)
+                        val sharedPreferences = requireContext().getSharedPreferences("NATSCertificatePrefs", Context.MODE_PRIVATE)
+                        sharedPreferences.edit().apply {
+                            putLong("lastDownloadTime", System.currentTimeMillis())
+                            apply()
+                        }
+                    }
 
-                    unzip(file.absolutePath, unzipDirectoryPath)
                 }
 
                 is Result.Error -> {
@@ -680,6 +642,19 @@ class HomeFragment : Fragment() {
 
     }
 
+    private fun callLogin(userID: String, password: String) {
+        if(DataHolder.ipAddress == "0.0"){
+            getPublicIpAddr { ipAddress ->
+                if(ipAddress != "fail"){
+                    DataHolder.ipAddress = ipAddress
+                }
+                hemoCubeViewModel.login(createLoginRequestData(userID, password))
+            }
+        }else{
+            hemoCubeViewModel.login(createLoginRequestData(userID, password))
+        }
+    }
+
 
     private fun isTokenExpired(token: String): Boolean {
         if (token.isNotEmpty()) {
@@ -713,16 +688,17 @@ class HomeFragment : Fragment() {
     }
 
     private fun createLoginRequestData(userID: String, password: String): LoginRequest {
+
         val pInfo = requireActivity().packageManager.getPackageInfo(
             requireActivity().packageName, 0
         )
         val version = pInfo.versionName
-        val labname = sharedPreference.getString(Constants.CENTER_NAME,"")
+        var labname = sharedPreference.getString(Constants.LABNAME,"")
-        val ip = sharedPreference.getString(Constants.IP_ADDRESS,"")
         return LoginRequest(
-            location = ip, password = password, serialNumber = userID, username = userID, version = version, lab = labname
+              password = password, serialNumber = userID, username = userID, version = version, lab = labname,location = DataHolder.ipAddress.toString()
         )
-    }
+    }//latitude = DataHolder.location!!.latitude.toString(), longitude = DataHolder.location!!.longitude.toString(), location = DataHolder.location.toString()
+
     private fun createCheckUpdateRequestData(): CheckUpdateRequest {
         val pInfo = requireActivity().packageManager.getPackageInfo(
             requireActivity().packageName, 0
@@ -735,7 +711,7 @@ class HomeFragment : Fragment() {
 
     private fun createDeviceUpdateRequestData(): DeviceUpdateRequest {
         return DeviceUpdateRequest(
-            serial_no = sharedPreference.getString(Constants.DEVICE_ID, "")
+            serial_no = deviceId
         )
     }
 
@@ -799,72 +775,17 @@ class HomeFragment : Fragment() {
     private fun setUserId() {
         binding.btnSubmit.setOnClickListener {
             val userId = binding.userId.text.toString()
-            DataHolder.sampleId = userId
+            val bloodGroup = binding.etBloodGroup.text
-            val age = binding.age.text.toString()
+            if (userId.length >= 10 && !bloodGroup.equals("Select Blood Group") || !bloodGroup.isNullOrBlank()) {
-            DataHolder.age = age
+                hemoCubeViewModel.addUser(
-            val bloodGroup = binding.etBloodGroup.text.toString()
+                    HemoCubeTestData(
-            DataHolder.bloodGroup = bloodGroup
+                        _id = userId,
-
+                        bloodGroup = bloodGroup.toString(),
-//            if (userId.length >= 5 && bloodGroup != "Select Blood Group") {
+                        incubationTime = SimpleDateFormat(
-//                DataHolder.selectedTest = UserData(
+                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-//                    _id = userId,
+                        ).format(Calendar.getInstance().time).toString()
-//                    bloodGroup = bloodGroup,
+                    )
-//                    incubationTime = SimpleDateFormat(
+                )
-//                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-//                        ).format(Calendar.getInstance().time).toString()
-//                )
-//                findNavController().navigate(R.id.action_nav_home_to_mainActivity)
-            if (userId.length >= 5 && bloodGroup.isNotEmpty() && age.isNotEmpty()) {
-                lifecycleScope.launch {
-                    // Add user first, ensuring it's done before fetching the user
-                    withContext(Dispatchers.IO) {
-                        hemoCubeViewModel.addUser(
-                            HemoCubeTestData(
-                                _id = userId,
-                                age = age,
-                                bloodGroup = bloodGroup,
-                                incubationTime = SimpleDateFormat(
-                                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                                ).format(Calendar.getInstance().time).toString()
-                            )
-                        )
-                    }
-
-                    // Now fetch the user after the addUser operation is complete
-                    val user = withContext(Dispatchers.IO) {
-                        hemoCubeViewModel.hemoCubeDao.getUserByID(userId)
-                    }
-
-                    user?.let {
-                        DataHolder.selectedTest = UserData(
-                            sampleid = it.sampleid,
-                            _id = it._id,
-                            age = it.age,
-                            bloodGroup = it.bloodGroup,
-                            incubationTime = SimpleDateFormat(
-                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                            ).format(Calendar.getInstance().time).toString()
-                        )
-                        findNavController().navigate(R.id.action_nav_home_to_mainActivity)
-                    } ?: run {
-                        Log.e("Error", "User not found")
-                    }
-                }
-
-//                hemoCubeViewModel.addUser(
-//                    HemoCubeTestData(
-//                        _id = userId,
-//                        bloodGroup = bloodGroup.toString(),
-//                        incubationTime = SimpleDateFormat(
-//                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-//                        ).format(Calendar.getInstance().time).toString()
-//                    )
-//                )
-                Toast.makeText(requireContext(), "Successfully added- $userId", Toast.LENGTH_SHORT).show()
-                binding.userId.setText("")
-                binding.age.setText("")
-                binding.etBloodGroup.setText("")
-
 //                val userData = UserData(_id = userId)
 //                DataHolder.selectedTest = userData
 //                findNavController().navigate(R.id.action_nav_home_to_mainActivity)
@@ -928,46 +849,46 @@ class HomeFragment : Fragment() {
     }
 
 
-    private fun loadUserData() {
+//    private fun loadUserData() {
-        try {
+//        try {
-            val dateFormat = SimpleDateFormat("yyyy-MM-dd")
+//            val dateFormat = SimpleDateFormat("yyyy-MM-dd")
-            val currentDate = Date()
+//            val currentDate = Date()
-            val formattedDate = dateFormat.format(currentDate)
+//            val formattedDate = dateFormat.format(currentDate)
-            val query = Firebase.firestore.collection("patientData")
+//            val query = Firebase.firestore.collection("patientData")
-                .whereGreaterThanOrEqualTo("createdAt", formattedDate)
+//                .whereGreaterThanOrEqualTo("createdAt", formattedDate)
-                .orderBy("createdAt", Query.Direction.DESCENDING)
+//                .orderBy("createdAt", Query.Direction.DESCENDING)
-//        val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false)
+////        val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false)
-            query.get().addOnSuccessListener {
+//            query.get().addOnSuccessListener {
-                if (it.documents.isEmpty()) {
+//                if (it.documents.isEmpty()) {
-                    binding.pendingTest.visibility = View.VISIBLE
+//                    binding.pendingTest.visibility = View.VISIBLE
-                } else {
+//                } else {
-                    binding.pendingTest.visibility = View.GONE
+//                    binding.pendingTest.visibility = View.GONE
-                }
+//                }
-            }
+//            }
-            val recyclerViewOptions =
+//            val recyclerViewOptions =
-                FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
+//                FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
-                    .build()
+//                    .build()
-
+//
-            val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
+//            val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
-            val batLevel: Int = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+//            val batLevel: Int = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-
+//
-            rvAdapter = view?.let {
+//            rvAdapter = view?.let {
-                UserListAdapter(
+//                UserListAdapter(
-                    requireContext(),
+//                    requireContext(),
-                    hemoCubeViewModel,
+//                    hemoCubeViewModel,
-                    recyclerViewOptions,
+//                    recyclerViewOptions,
-                    it,
+//                    it,
-                    batLevel,
+//                    batLevel,
-                    requireActivity()
+//                    requireActivity()
-                )
+//                )
-            }!!
+//            }!!
-          //  binding.rvOrder.adapter = rvAdapter
+//            binding.rvOrder.adapter = rvAdapter
-
+//
-            rvAdapter.startListening()
+//            rvAdapter.startListening()
-        } catch (e: Exception) {
+//        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
+//            Firebase.crashlytics.recordException(e)
-        }
+//        }
-    }
+//    }
 
     private fun saveUserId(userId: String) {
         with(sharedPreference.edit()) {
@@ -993,48 +914,48 @@ class HomeFragment : Fragment() {
         dialog.show()
     }
 
-    private fun getData(search: String?, field: String) {
+//    private fun getData(search: String?, field: String) {
-        val userSearchTrace = Firebase.performance.newTrace("user_search_trace")
+//        val userSearchTrace = Firebase.performance.newTrace("user_search_trace")
-        userSearchTrace.start()
+//        userSearchTrace.start()
-
+//
-        search?.replaceFirstChar {
+//        search?.replaceFirstChar {
-            if (search.lowercase()
+//            if (search.lowercase()
-                    .startsWith(it.lowercase())
+//                    .startsWith(it.lowercase())
-            ) it.titlecase(Locale.getDefault()) else it.toString()
+//            ) it.titlecase(Locale.getDefault()) else it.toString()
-
+//
-        }
+//        }
-        val currentDate = Date()
+//        val currentDate = Date()
-        val dateFormat = SimpleDateFormat("yyyyMMdd")
+//        val dateFormat = SimpleDateFormat("yyyyMMdd")
-        val partition = dateFormat.format(currentDate)
+//        val partition = dateFormat.format(currentDate)
-        val searchTerm = partition + search
+//        val searchTerm = partition + search
-        val searchField = field + "Search"
+//        val searchField = field + "Search"
-        val query =
+//        val query =
-            Firebase.firestore.collection("patientData").orderBy(searchField).startAt(searchTerm)
+//            Firebase.firestore.collection("patientData").orderBy(searchField).startAt(searchTerm)
-                .endAt(searchTerm + "\uf8ff")
+//                .endAt(searchTerm + "\uf8ff")
-        query.get().addOnSuccessListener {
+//        query.get().addOnSuccessListener {
-            userSearchTrace.stop()
+//            userSearchTrace.stop()
-        }
+//        }
-        val recyclerViewOptions =
+//        val recyclerViewOptions =
-            FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
+//            FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
-                .build()
+//                .build()
-        val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
+//        val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
-        batLevel = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+//        batLevel = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-
+//
-        rvAdapter = view?.let {
+//        rvAdapter = view?.let {
-            UserListAdapter(
+//            UserListAdapter(
-                requireContext(),
+//                requireContext(),
-                hemoCubeViewModel,
+//                hemoCubeViewModel,
-                recyclerViewOptions,
+//                recyclerViewOptions,
-                it,
+//                it,
-                batLevel,
+//                batLevel,
-                requireActivity()
+//                requireActivity()
-            )
+//            )
-        }!!
+//        }!!
-      //  binding.rvOrder.adapter = rvAdapter
+//        binding.rvOrder.adapter = rvAdapter
-        rvAdapter.startListening()
+//        rvAdapter.startListening()
-
+//
-        userSearchTrace.stop()
+//        userSearchTrace.stop()
-    }
+//    }
 
 //    private fun setSearch() {
 //        binding.searchProduct.setOnQueryTextListener(object :
@@ -1048,9 +969,7 @@ class HomeFragment : Fragment() {
 //                        else -> null
 //                    }
 //
-//                    field?.let {
+//                    field?.let { getData(query, it) }
-//                    //getData(query, it) }
-//                    }
 //                    false
 //
 //                } else {
@@ -1067,12 +986,10 @@ class HomeFragment : Fragment() {
 //                        binding.aadharIdRadioButton.isChecked -> "aadharId"
 //                        else -> null
 //                    }
-//                    field?.let {
+//                    field?.let { getData(query, it) }
-//                        //getData(query, it)
-//                    }
 //                    false
 //                } else {
-//                   // loadUserData()
+//                  //  loadUserData()
 //                    false
 //                }
 //            }
@@ -1091,11 +1008,11 @@ class HomeFragment : Fragment() {
 //            binding.uploadData.visibility = uploadDataVisibility
 //        }
 
-       // hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { bufferData ->
+        hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { bufferData ->
-         //   val uploadDataVisibility =
+            val uploadDataVisibility =
-         //       if (bufferData.any { !it.localFlag }) View.VISIBLE else View.GONE
+                if (bufferData.any { !it.localFlag }) View.VISIBLE else View.GONE
-           // binding.uploadData.visibility = uploadDataVisibility
+            binding.uploadData.visibility = uploadDataVisibility
-       // }
+        }
     }
 
     private fun checkUnprocessedCSVData() {
@@ -1207,15 +1124,15 @@ class HomeFragment : Fragment() {
 //            dialog.dismiss()
 //        }
 
-//        hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { kitDataList ->
+        hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { kitDataList ->
-//            kitDataList.forEach { userData ->
+            kitDataList.forEach { userData ->
-//                if (!userData.localFlag) {
+                if (!userData.localFlag) {
-//                    userData.localFlag = true
+                    userData.localFlag = true
-//                    hemoCubeViewModel.bulkAddResultKitTestToDb(userData)
+                    hemoCubeViewModel.bulkAddResultKitTestToDb(userData)
-//                }
+                }
-//            }
+            }
-//            dialog.dismiss()
+            dialog.dismiss()
-//        }
+        }
     }
 
     private fun downloadLocalDBData(dialog: DialogInterface) {
@@ -1299,11 +1216,7 @@ class HomeFragment : Fragment() {
     override fun onDestroyView() {
         super.onDestroyView()
         hemoCubeViewModel.networkStatusLiveData.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.allKitTestData.removeObservers(viewLifecycleOwner)
+
-        hemoCubeViewModel.allUserData.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.uploadLogs.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.checkUpdate.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.downloadcertificate.removeObservers(viewLifecycleOwner)
     }
 
     private fun downloadCsv() {
@@ -1611,110 +1524,30 @@ class HomeFragment : Fragment() {
 
     }
     private fun getPublicIpAddr(callback: (String) -> Unit) {
-        lifecycleScope.launch(Dispatchers.IO) {
+        try {
-            try {
+            GlobalScope.launch(Dispatchers.IO) {
                 val url = URL("https://api.ipify.org")
                 val conn = url.openConnection() as HttpURLConnection
                 try {
                     conn.connect()
                     if (conn.responseCode == HttpURLConnection.HTTP_OK) {
-                        val inputStream = conn.inputStream
+                        val scanner = Scanner(conn.inputStream)
-                        val ipAddress = inputStream.bufferedReader().use { it.readText() }
+                        scanner.useDelimiter("\\A")
-                        inputStream.close()
+                        if (scanner.hasNext()) {
-                        withContext(Dispatchers.Main) {
+                            val ipAddress = scanner.next()
+                            Log.d("ipaddress",DataHolder.ipAddress)
                             callback(ipAddress)
-                        }
+                        }else{
-                    } else {
-                        withContext(Dispatchers.Main) {
                             callback("fail")
                         }
                     }
                 } finally {
                     conn.disconnect()
                 }
-            } catch (e: Exception) {
-                Log.e("getPublicIpAddr", e.toString())
-                withContext(Dispatchers.Main) {
-                    callback("fail")
-                }
             }
-        }
+        }catch (e: Exception){
-    }
+            Log.e("home",e.toString())
-//    @OptIn(DelicateCoroutinesApi::class)
+            callback("fail")
-//    private fun getPublicIpAddr(callback: (String) -> Unit) {
-//        try {
-//            GlobalScope.launch(Dispatchers.IO) {
-//                val url = URL("https://api.ipify.org")
-//                val conn = url.openConnection() as HttpURLConnection
-//                try {
-//                    conn.connect()
-//                    if (conn.responseCode == HttpURLConnection.HTTP_OK) {
-//                        val scanner = Scanner(conn.inputStream)
-//                        scanner.useDelimiter("\\A")
-//                        if (scanner.hasNext()) {
-//                            val ipAddress = scanner.next()
-//                            Log.d("ipaddress",DataHolder.ipAddress)
-//                            callback(ipAddress)
-//                        }else{
-//                            callback("fail")
-//                        }
-//                    }
-//                } finally {
-//                    conn.disconnect()
-//                }
-//            }
-//        }catch (e: Exception){
-//            Log.e("home",e.toString())
-//            callback("fail")
-//        }
-//    }
-
-    private fun callLogin(userID: String, password: String) {
-        if(DataHolder.ipAddress == "0.0"){
-            getPublicIpAddr { ipAddress ->
-                if(ipAddress != "fail"){
-                    DataHolder.ipAddress = ipAddress
-                    with(sharedPreference.edit()) {
-                        putString(Constants.IP_ADDRESS, ipAddress)
-                        apply()
-                    }
-                }
-                hemoCubeViewModel.login(createLoginRequestData(userID, password))
-            }
-        }else{
-            hemoCubeViewModel.login(createLoginRequestData(userID, password))
-        }
-    }
-    private fun timeDifference(createdAt: String): Long {
-        val currentTime = Calendar.getInstance().time
-        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-
-        val createdAtDate: Date = if (createdAt.isEmpty()) {
-            currentTime
-        } else {
-            formatter.parse(createdAt) ?: currentTime
-        }
-
-        val diffMillis = currentTime.time - createdAtDate.time
-
-        return diffMillis / (60 * 1000)  // Convert milliseconds to minutes
-    }
-    private fun isInternetAvailable(context: Context): Boolean {
-        val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            val network = connectivityManager.activeNetwork ?: return false
-            val activeNetwork = connectivityManager.getNetworkCapabilities(network) ?: return false
-            return when {
-                activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
-                activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
-                activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
-                else -> false
-            }
-        } else {
-            @Suppress("DEPRECATION")
-            val networkInfo = connectivityManager.activeNetworkInfo ?: return false
-            @Suppress("DEPRECATION")
-            return networkInfo.isConnected
         }
     }
 

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

@@ -13,7 +13,6 @@
 
 package com.example.hpostesting.presentation.dashboard
 
-import android.app.AlertDialog
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
@@ -21,10 +20,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
 import android.widget.Toast
-import androidx.core.content.ContextCompat
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.preference.ListPreference
 import androidx.preference.Preference
@@ -32,231 +29,94 @@ import androidx.preference.PreferenceFragmentCompat
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.data.repository.DatabaseRepository
+import com.example.hpostesting.data.model.TestState
-import com.example.hpostesting.firebase.FirebaseConfig
+import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.firebase.FirebaseManager
 import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
 import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
 
 private var isLanguageChanged = false
 
-class SlideshowFragment : Fragment() {
+class SlideshowFragment : Fragment(){
-    private var selectedItem = "10mm"
-    private val values = arrayOf("10mm", "2mm")
     private lateinit var binding: FragmentSlideshowBinding
     private lateinit var sharedPreferences: SharedPreferences
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
     ): View {
         binding = FragmentSlideshowBinding.inflate(inflater, container, false)
-        sharedPreferences = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        sharedPreferences =
+            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME, ""))
+        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME,""))
+
 
-        selectedItem = sharedPreferences.getString(Constants.CUVETTE_SIZE, "10mm").toString()
-        val time = sharedPreferences.getString(Constants.LAST_UPDATED, "NA").toString()
-        binding.lastUpdated.text = "Last updated config: $time"
         binding.btnGo.setOnClickListener {
             var labname = binding.nameEditText.text.toString()
             DataHolder.hemoCubeTestData?.apply {
                 this.labName = labname
             }
+
             with(sharedPreferences.edit()) {
                 putString(Constants.LABNAME, labname)
                 apply()
             }
 
             Toast.makeText(
-                requireContext(), "Lab Name is Added successfully.", Toast.LENGTH_SHORT
+                requireContext(),
+                "Lab Name is Added successfully.",
+                Toast.LENGTH_SHORT
             ).show()
         }
-        val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, values)
+        childFragmentManager.beginTransaction().replace(binding.container.id,PrefsFragment()).commit()
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        val pos: Int
-        if (selectedItem == "10mm") {
-            pos = 0
-        } else {
-            pos = 1
-        }
-
-        binding.spinnerCuvette.adapter = adapter
-        binding.spinnerCuvette.onItemSelectedListener =
-            object : AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(
-                    parent: AdapterView<*>?, view: View?, position: Int, id: Long
-                ) {
-                    // Handle item selection here
-                    selectedItem = values[position]
-                }
-
-                override fun onNothingSelected(parent: AdapterView<*>?) {
-                    // Do nothing here
-                }
-            }
-        binding.spinnerCuvette.setSelection(pos)
-        binding.btnAddSize.setOnClickListener {
-            with(sharedPreferences.edit()) {
-                putString(Constants.CUVETTE_SIZE, selectedItem)
-                apply()
-            }
-            Toast.makeText(
-                requireContext(), "Selected cuvette size: $selectedItem", Toast.LENGTH_SHORT
-            ).show()
-        }
-
-        childFragmentManager.beginTransaction().replace(binding.container.id, PrefsFragment())
-            .commit()
     }
 }
-
+class PrefsFragment: PreferenceFragmentCompat(){
-class PrefsFragment : PreferenceFragmentCompat(){
-    private lateinit var tapManager: AppVersionTapManager
-    private var isServerSelectionVisible = false
-    private lateinit var serverPreference: Preference
-    private lateinit var currentServerPreference: Preference
-    lateinit var firebaseManager: FirebaseManager
-    lateinit var databaseRepository: DatabaseRepository
-
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-         firebaseManager = FirebaseManager(requireContext())
-        databaseRepository = (activity as DashboardActivity).databaseRepository
-
-        tapManager = AppVersionTapManager()
-        val sharedPreference =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
-        val currentServer = firebaseManager.getLastSelectedServer().serverName
 
-        // Language Preference
+        val languagePreference = ListPreference(requireContext())
-        val languagePreference = ListPreference(requireContext()).apply {
+        languagePreference.key = "language_preference"
-            key = "language_preference"
+        languagePreference.title = getString(R.string.app_language)
-            title = getString(R.string.app_language)
+        languagePreference.summary = getString(R.string.select_language)
-            summary = getString(R.string.select_language)
+        languagePreference.entries = arrayOf("English", "Kannada", "Hindi")
-            entries = arrayOf("English", "Kannada", "Hindi")
+        languagePreference.entryValues = arrayOf("en", "kn", "hi")
-            entryValues = arrayOf("en", "kn", "hi")
+        languagePreference.setDefaultValue("en")
-            setDefaultValue("en")
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_translate_24)
 
-            onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+        languagePreference.onPreferenceChangeListener =
+            Preference.OnPreferenceChangeListener { _, newValue ->
                 val languageCode = newValue as String
                 updateLanguage(requireContext(), languageCode)
                 true
             }
-        }
+
         preferenceScreen.addPreference(languagePreference)
-
-        val appVersionPreference = Preference(requireContext()).apply {
-            title = "App Version"
-            summary =
-                getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext())  +"->"+currentServer+"]"
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_info_24)
-
-            setOnPreferenceClickListener {
-                if ((sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN")) {
-                    tapManager.registerTap {
-                        if (!isServerSelectionVisible) {
-                            showServerSelection()
-                        }
-                    }
-                } else {
-
-                }
-                true
-            }
-
-        }
-        preferenceScreen.addPreference(appVersionPreference)
-
-
-        currentServerPreference = Preference(requireContext()).apply {
-            key = "current_server_preference"
-            title = "Current Server"
-            summary = "No server selected"
-            isVisible = false
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_done_24)
-
-            setOnPreferenceClickListener {
-//                (activity as? DashboardActivity)?.sendData("hello test data")
-//                Toast.makeText(context, "data sent", Toast.LENGTH_SHORT).show()  this was used to send the basic data as test data
-            true
-            }
-        }
-        preferenceScreen.addPreference(currentServerPreference)
         setPreferenceScreen(preferenceScreen)
 
+        // App Version Preference
+        val appVersionPreference = Preference(requireContext())
+        appVersionPreference.title = "App Version"
+        appVersionPreference.summary =
+            getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
+
+        preferenceScreen.addPreference(languagePreference)
+        preferenceScreen.addPreference(appVersionPreference)
+        setPreferenceScreen(preferenceScreen)
         if (isLanguageChanged) {
             Toast.makeText(requireContext(), R.string.language_update, Toast.LENGTH_SHORT).show()
         }
-    }
-
-
-    private fun showServerSelection() {
-        val currentServer = firebaseManager.getLastSelectedServer().serverName
-        serverPreference = Preference(requireContext()).apply {
-            title = "Select Server"
-            summary = "Choose your server"
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_sync_24)
-            setOnPreferenceClickListener {
-                showServerSelectionDialog()
-                true
-            }
-        }
-
-
-
-        preferenceScreen.addPreference(serverPreference)
-        currentServerPreference.isVisible = true
-        currentServerPreference.summary = "Current Server: $currentServer"
-
-        Toast.makeText(requireContext(), "Server selection now available", Toast.LENGTH_SHORT).show()
-    }
-
-    private fun showServerSelectionDialog() {
-        val servers = firebaseManager.getAvailableServers()
-
-        val serverNames = servers.map { it.serverName }.toTypedArray()
-        val builder = AlertDialog.Builder(requireContext())
-        builder.setTitle("Select Server")
-            .setItems(serverNames) { _, which ->
-                val selectedServer = servers[which]
-
-                switchFirebaseServer(selectedServer)
-            }
-            .setNegativeButton("Cancel", null)
-            .show()
-    }
-
-
-    private fun switchFirebaseServer(firebaseConfig: FirebaseConfig) {
-        firebaseManager.switchServer(firebaseConfig)
-        Toast.makeText(requireContext(), "Switched to ${firebaseConfig.serverName}, Please wait for few seconds", Toast.LENGTH_SHORT).show()
-        Toast.makeText(requireContext(), "Restart needed restarting the app", Toast.LENGTH_SHORT).show()
-        firebaseManager.restartApp()
-        currentServerPreference.summary = "Current Server: ${firebaseConfig.serverName}"
 
     }
-
-
-    private fun switchCurrentServer(serverCode: String) {
-        Toast.makeText(requireContext(), "Switched to server: $serverCode", Toast.LENGTH_SHORT)
-            .show()
-        currentServerPreference.summary = "Current Server: $serverCode"
-
-    }
-
     private fun updateLanguage(context: Context, languageCode: String) {
         LanguageManager.persistLanguagePreference(context, languageCode)
         LanguageManager.setLocale(context, languageCode)
-        requireActivity().recreate()
+        requireActivity().recreate() // Recreate activity to apply language changes
         isLanguageChanged = true
     }
-
     private fun getAppVersion(context: Context): String {
         return try {
             val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
@@ -274,6 +134,4 @@ class PrefsFragment : PreferenceFragmentCompat(){
             "N/A"
         }
     }
-}
+}
-
-

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

@@ -1,50 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.presentation.dashboard
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import com.example.hpostesting.data.constant.Constants
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
-import `in`.sminnovations.hpostesting.databinding.ActivityUpdateValuesBinding
-
-class UpdateValuesActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityUpdateValuesBinding
-    lateinit var sharedPreferences: SharedPreferences
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityUpdateValuesBinding.inflate(layoutInflater)
-        sharedPreferences = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-        setContentView(binding.root)
-        binding.btnSubmit.setOnClickListener {
-            saveStringToPreferences(Constants.ABS2LED1MMLL, binding.et2mmled1Ll.text.toString())
-            saveStringToPreferences(Constants.ABS2LED1MMUL, binding.et2mmled1Ul.text.toString())
-            saveStringToPreferences(Constants.ABS2LED2MMLL, binding.et2mmled2Ll.text.toString())
-            saveStringToPreferences(Constants.ABS2LED2MMUL, binding.et2mmled2Ul.text.toString())
-            saveStringToPreferences(Constants.ABS10LED1MMLL, binding.et10mmled1Ll.text.toString())
-            saveStringToPreferences(Constants.ABS10LED1MMUL, binding.et10mmled1Ul.text.toString())
-            saveStringToPreferences(Constants.ABS10LED2MMLL, binding.et10mmled2Ll.text.toString())
-            saveStringToPreferences(Constants.ABS10LED2MMUL, binding.et10mmled2Ul.text.toString())
-        }
-    }
-    private fun saveStringToPreferences(key: String, value: String) {
-        sharedPreferences.edit().putString(key, value).apply()
-    }
-}

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

@@ -13,15 +13,9 @@
 
 package com.example.hpostesting.presentation.dashboard.ui
 
-import com.example.hpostesting.util.SecureStorage
-import android.accounts.Account
-import android.accounts.AccountManager
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
-import android.location.Location
-import android.location.LocationListener
-import android.location.LocationManager
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Build
@@ -30,14 +24,15 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.util.AppInitializer
+import com.example.hpostesting.data.model.login.LoginRequest
+import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentLoginBinding
 import kotlinx.coroutines.Dispatchers
@@ -49,14 +44,15 @@ import java.util.Scanner
 
 
 class LoginFragment : Fragment() {
-    var latitude = 0.0
+    private val LOCATION_PERMISSION_REQUEST_CODE = 1001
-    var longitude = 0.0
+  //  private lateinit var locationManager: LocationManager
-    private lateinit var accountManager: AccountManager
+ //   var latitude = 0.0
-    private lateinit var secureStorage: SecureStorage
+  //  var longitude = 0.0
     var TAG = "LoginFragmentCheck"
     private var _binding: FragmentLoginBinding? = null
     private val binding get() = _binding!!
     private lateinit var sharedPreference: SharedPreferences
+    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?,
@@ -64,11 +60,6 @@ class LoginFragment : Fragment() {
         _binding = FragmentLoginBinding.inflate(inflater, container, false)
         sharedPreference =
             requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-        accountManager = AccountManager.get(requireActivity())
-        secureStorage = SecureStorage(requireActivity())
-
-        // Initialize user roles and credentials if not already done
-        AppInitializer.initialize(requireActivity())
         return binding.root
     }
 
@@ -76,132 +67,107 @@ class LoginFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         init()
-
+        if(isInternetAvailable()){
-//        if(isInternetAvailable()){
+            getPublicIpAddr { ipAddress ->
-//            getPublicIpAddr { ipAddress ->
+                DataHolder.ipAddress = ipAddress
-//                DataHolder.ipAddress = ipAddress
+            }
-//            }
+            Log.d("ipaddress",DataHolder.ipAddress)
-//            Log.d("ipaddress",DataHolder.ipAddress)
-//        }
-        setupAutoCompleteTextView()
-        //checkLocation()
-    }
-    override fun onResume() {
-        super.onResume()
-        setupAutoCompleteTextView()
-    }
-    private fun setupAutoCompleteTextView() {
-        val districts = resources.getStringArray(R.array.district)
-        val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, districts)
-        binding.etDistrict.setAdapter(adapter)
-
-        // Only set the default text if it's empty to avoid resetting user selection
-        if (binding.etDistrict.text.isEmpty()) {
-            binding.etDistrict.setText("Other", false)
         }
+
+//        getPublicIpAddr { ipAddress ->
+//            DataHolder.ipAddress = ipAddress
+//        }
+      //  locationManager = requireActivity().getSystemService(Context.LOCATION_SERVICE) as LocationManager
+
+//        // Check for location permission
+//        if (ContextCompat.checkSelfPermission(requireContext(),
+//                Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(requireContext(),
+//                Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+//            // Permission is not granted, request it
+//            ActivityCompat.requestPermissions(requireActivity(),
+//                arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION,Manifest.permission.ACCESS_FINE_LOCATION),
+//                LOCATION_PERMISSION_REQUEST_CODE)
+//        } else {
+//            // Permission is granted, fetch location
+//            checkLocation()
+//        }
+//
+//        if (isNetworkProviderAvailable()) {
+//            Toast.makeText(requireContext(), "Network provider is available", Toast.LENGTH_SHORT).show()
+//        } else {
+//            Toast.makeText(requireContext(), "Network provider is not available", Toast.LENGTH_SHORT).show()
+//        }
     }
+
+//    private fun isNetworkProviderAvailable(): Boolean {
+//
+//        return locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
+//    }
     private fun init() {
         if (isUserLoggedIn()) {
             navigateToHomeFragment()
             return
         }
+
         binding.btnLogin.setOnClickListener {
          //   Toast.makeText(requireContext(), "$latitude/$longitude",Toast.LENGTH_SHORT).show()
-            val loginId = binding.loginId.text.toString().trim()
+
-            val password = binding.password.text.toString().trim()
+            val loginId = binding.loginId.text.toString()
+            val password = binding.password.text.toString()
 
             if (loginId.isNotBlank() && password.isNotBlank()) {
                 performLogin(loginId, password)
+                var Password = sharedPreference.getString(Constants.DEVICE_PASSWORD_API, "").toString()
+                var UserID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
+                hemoCubeViewModel.login(createLoginRequestData(UserID, Password))
             } else {
                 if (loginId.isBlank()) {
                     binding.loginId.error = R.string.enter_proper_login_id.toString()
-                    Log.d("LoginFragment","enter proper login id")
                 }
                 if (password.isBlank()) {
                     binding.password.error = R.string.enter_proper_password.toString()
-                    Log.d("LoginFragment","enter proper password")
                 }
             }
         }
     }
+    private fun createLoginRequestData(userID: String, password: String): LoginRequest {
 
+        val pInfo = requireActivity().packageManager.getPackageInfo(
+            requireActivity().packageName, 0
+        )
+        val version = pInfo.versionName
+        var labname = sharedPreference.getString(Constants.LABNAME,"")
+        return LoginRequest(
+            password = password, serialNumber = userID, username = userID, version = version, lab = labname,location = DataHolder.ipAddress.toString()
+        )
+    }
     private fun isUserLoggedIn(): Boolean {
         return sharedPreference.getString(Constants.USER_ID, "")?.isNotBlank() == true
     }
 
     private fun navigateToHomeFragment() {
-        Log.d("LoginFragment","Login Successful")
         findNavController().navigate(R.id.action_loginFragment_to_homeFragment)
     }
 
     private fun performLogin(loginId: String, password: String) {
-        if (validateCredentials(loginId, password)) {
+        val matchingId = Constants.STATICID.firstOrNull { it == loginId }
-            addAccount(loginId, password)
+        if (matchingId != null) {
-            val role = getRoleForUser(loginId)
+            if (password == Constants.password) {
-            saveUserId(role)
+                saveUserId(loginId)
-            navigateToHomeFragment()
+                navigateToHomeFragment()
-            return
+                return
-        } else {
+            } else {
-            Toast.makeText(requireActivity(), "Invalid credentials", Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), R.string.wrong_password, Toast.LENGTH_SHORT).show()
+            }
         }
-//        val matchingId = Constants.STATICID.firstOrNull { it == loginId }
+        Toast.makeText(requireContext(), R.string.wrong_user_id, Toast.LENGTH_SHORT).show()
-//        if (matchingId != null) {
-//            if (password == Constants.password) {
-//                saveUserId(loginId)
-//                navigateToHomeFragment()
-//                return
-//            } else {
-//                Log.d("LoginFragment","wrong password")
-//                Toast.makeText(requireContext(), R.string.wrong_password, Toast.LENGTH_SHORT).show()
-//            }
-//        }
-       // Log.d("LoginFragment","wrong password")
-       // Toast.makeText(requireContext(), R.string.wrong_user_id, Toast.LENGTH_SHORT).show()
-    }
-    private fun getRoleForUser(username: String): String {
-        // Replace this with your actual logic to determine the role for the user
-        return when (username) {
-            "FACTORY" -> "FACTORY"
-            "ADMIN" -> "ADMIN"
-            "PQUSER" -> "PQUSER"
-            "QCUSER" -> "QCUSER"
-            else -> "HPOSUSER"
-        }
-    }
-    private fun validateCredentials(username: String, password: String): Boolean {
-        var storedPassword = secureStorage.getPassword()
-//        if (!checkUserName(binding.etName.text.toString())) {
-//            binding.etName.error = "Name field can't be empty or less than 3 characters"
-//            return false
-//        }
-        if (!checkCenterName(binding.centerName.text.toString())) {
-            binding.centerName.error = "Center name can't be empty or less than 3 characters"
-            return false
-        }
-        if(username == "ADMIN"){
-            storedPassword = secureStorage.getAdminPassword()
-        }
-        return storedPassword != null &&
-                password == storedPassword &&
-                (username == "HPOSUSER" || username == "ADMIN" || username == "FACTORY" || username == "PQUSER" || username == "QCUSER")
-    }
-    private fun addAccount(username: String, password: String) {
-        val account = Account(username, "com.example.account")
-        accountManager.addAccountExplicitly(account, password, null)
     }
+
     private fun saveUserId(userId: String) {
         with(sharedPreference.edit()) {
             putString(Constants.USER_ID, userId)
             apply()
         }
-        DataHolder.centerName = binding.centerName.text.toString()
-        DataHolder.district = binding.etDistrict.text.toString()
-        with(sharedPreference.edit()) {
-            putString(Constants.CENTER_NAME, binding.centerName.text.toString().lowercase().trim())
-            putString(Constants.DISTRICT, binding.etDistrict.text.toString())
-            apply()
-        }
-
     }
 
     override fun onDestroyView() {
@@ -210,148 +176,151 @@ class LoginFragment : Fragment() {
     }
 
     /** Check if we can get our location  */
-    @SuppressLint("MissingPermission")
+//    @SuppressLint("MissingPermission")
-    fun checkLocation() {
+//    fun checkLocation() {
-        // Get the location manager
+//
-        val locationManager = requireActivity().getSystemService(Context.LOCATION_SERVICE) as LocationManager
+//        val locationManager = requireActivity().getSystemService(Context.LOCATION_SERVICE) as LocationManager
-        val locationProviderWifi = LocationManager.NETWORK_PROVIDER
+//        val locationProviderWifi = LocationManager.NETWORK_PROVIDER
-        val locationProviderGPS = LocationManager.GPS_PROVIDER
+//        val locationProviderGPS = LocationManager.FUSED_PROVIDER
-        val locationListenerNetwork: LocationListener
+//        val locationListenerNetwork: LocationListener
-        val locationListenerGPS: LocationListener
+//        val locationListenerGPS: LocationListener
-        var gps_enabled = false
+//        var gps_enabled = false
-        var network_enabled = false
+//        var network_enabled = false
-
+//        Log.d(TAG,"PRoveider"+locationManager.allProviders.toString())
-        //check wifi
+//        //check wifi
-        val connectivityManager = requireActivity().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+//
-        val mWifi = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI)
+//        //check wifi
-        if (mWifi!!.isConnected) {
+//        val connectivityManager = requireActivity().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-            Log.d(TAG, "Wifi connected")
+//        val mWifi = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI)
-        }
+//
-
+//        if (mWifi!!.isConnected) {
-        //check gps and wifi availability
+//            Log.d(TAG, "Wifi connected")
-        try {
+//        }
-            gps_enabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
+//
-        } catch (ex: Exception) {
+//        //check gps and wifi availability
-        }
+//
-        try {
+//        //check gps and wifi availability
-            network_enabled = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
+//        try {
-        } catch (ex: Exception) {
+//            gps_enabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
-        }
+//        } catch (ex: java.lang.Exception) {
-        if (!gps_enabled) {
+//        }
-            Log.d(TAG, "GPS: Missing")
+//
-        }else{
+//        try {
-//            getPublicIpAddr { ipAddress ->
+//            network_enabled =
-//                // Do something with the ipAddress
+//                locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
-//                Log.d(TAG, "GPS: PRESENT"+ipAddress)
+//        } catch (ex: java.lang.Exception) {
-//            }
+//        }
-        }
+//
-        if (!network_enabled) {
+//        if (!gps_enabled) {
-            Log.d(TAG, "Network: Missing")
+//            Log.d(TAG, "GPS: Missing")
-        }
+//        }
-
+//        if (!network_enabled) {
-        /* Location change listeners */try {
+//            Log.d(TAG, "Network: Missing")
-            Log.d(TAG, "GPS: PRESENT TRy")
+//        }
-            // Define a listener that responds to gps location updates
+//
-            locationListenerGPS = object : LocationListener {
+//        /* Location change listeners */
-                override fun onLocationChanged(location: Location) {
+//
-                    Log.d(TAG, "GPS: PRESENT loc")
+//        /* Location change listeners */try {
-                    Log.d(
+//            // Define a listener that responds to gps location updates
-                        TAG,
+//            locationListenerGPS = object : LocationListener {
-                        "GPS: Latitude: " + location.latitude + ", Longitude = " + location.longitude
+//                override fun onLocationChanged(location: Location) {
-                    )
+//                    Log.d(
-                }
+//                        TAG,
-
+//                        "GPS: Latitude: " + location.latitude + ", Longitude = " + location.longitude
-                override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
+//                    )
-                    Log.d(TAG, "GP location found 1")
-                }
-
-                override fun onProviderEnabled(provider: String) {
-                    Log.d(TAG, "GP location found 2")
-                }
-
-                override fun onProviderDisabled(provider: String) {
-                    Log.d(TAG, "GP location found 3")
-                }
-            }
-            locationManager.requestLocationUpdates(locationProviderGPS, 0, 0f, locationListenerGPS)
-            Log.d(TAG, "GPS: PRESENT Req")
-        } catch (e: Exception) {
-            Log.e(TAG, "Location Exception: " + e.message)
-        }
-        try {
-            // Define a listener that responds to wifi location updates
-            locationListenerNetwork = object : LocationListener {
-                override fun onLocationChanged(location: Location) {
-                    Log.d(
-                        TAG,
-                        "NW: Latitude: " + location.latitude + ", Longitude = " + location.longitude
-                    )
-                }
-
-                override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
-                    Log.d(TAG, "location found 1")
-                }
-
-                override fun onProviderEnabled(provider: String) {
-                    Log.d(TAG, "location found 2")
-                }
-
-                override fun onProviderDisabled(provider: String) {
-                    Log.d(TAG, "location found 3")
-                }
-            }
-            locationManager.requestLocationUpdates(
-                locationProviderWifi,
-                0,
-                0f,
-                locationListenerNetwork
-            )
-        } catch (e: Exception) {
-            Log.e(TAG, "NW Location Exception: " + e.message)
-        }
-    }
-//    fun getPublicIpAddr(callback: (String) -> Unit) {
-//        GlobalScope.launch(Dispatchers.IO) {
-//            val url = URL("https://api.ipify.org")
-//            val conn = url.openConnection() as HttpURLConnection
-//            try {
-//                conn.connect()
-//                if (conn.responseCode == HttpURLConnection.HTTP_OK) {
-//                    val scanner = Scanner(conn.inputStream)
-//                    scanner.useDelimiter("\\A")
-//                    if (scanner.hasNext()) {
-//                        val ipAddress = scanner.next()
-//                        callback(ipAddress)
-//                    }
 //                }
-//            } finally {
+//
-//                conn.disconnect()
+//                override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
+//                    Log.d(TAG, "GPS location found 1")
+//                }
+//
+//                override fun onProviderEnabled(provider: String) {
+//                    Log.d(TAG, "GPS location found 2")
+//                }
+//
+//                override fun onProviderDisabled(provider: String) {
+//                    Log.d(TAG, "GPS location found 3")
+//                }
+//            }
+//            locationManager.requestLocationUpdates(
+//                locationProviderGPS,
+//                0,
+//                0f,
+//                locationListenerGPS
+//            )
+//        } catch (e: java.lang.Exception) {
+//            Log.e(TAG, "Location Exception GPS: " + e.message)
+//        }
+//
+//        try {
+//            // Define a listener that responds to wifi location updates
+//            locationListenerNetwork = object : LocationListener {
+//                override fun onLocationChanged(location: Location) {
+//                    Log.d(
+//                        TAG,
+//                        "NW: Latitude: " + location.latitude + ", Longitude = " + location.longitude
+//                    )
+//                }
+//
+//                override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
+//                    Log.d(TAG, "location found 1")
+//                }
+//
+//                override fun onProviderEnabled(provider: String) {
+//                    Log.d(TAG, "location found 2")
+//                }
+//
+//                override fun onProviderDisabled(provider: String) {
+//                    Log.d(TAG, "location found 3")
+//                }
+//            }
+//            locationManager.requestLocationUpdates(
+//                locationProviderWifi,
+//                0,
+//                0f,
+//                locationListenerNetwork
+//            )
+//        } catch (e: java.lang.Exception) {
+//            Log.e(TAG, "Location Exception: " + e.message)
+//        }
+//
+//    }
+
+//    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+//        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+//        if (requestCode == LOCATION_PERMISSION_REQUEST_CODE) {
+//            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+//                // Permission granted, fetch location
+//                checkLocation()
+//            } else {
+//                // Permission denied
+//                Toast.makeText(requireContext(), "Location permission denied", Toast.LENGTH_SHORT).show()
 //            }
 //        }
 //    }
-private fun getPublicIpAddr(callback: (String) -> Unit) {
+    private fun getPublicIpAddr(callback: (String) -> Unit) {
-    try {
+        try {
-        GlobalScope.launch(Dispatchers.IO) {
+            GlobalScope.launch(Dispatchers.IO) {
-            val url = URL("https://api.ipify.org")
+                val url = URL("https://api.ipify.org")
-            val conn = url.openConnection() as HttpURLConnection
+                val conn = url.openConnection() as HttpURLConnection
-            try {
+                try {
-                conn.connect()
+                    conn.connect()
-                if (conn.responseCode == HttpURLConnection.HTTP_OK) {
+                    if (conn.responseCode == HttpURLConnection.HTTP_OK) {
-                    val scanner = Scanner(conn.inputStream)
+                        val scanner = Scanner(conn.inputStream)
-                    scanner.useDelimiter("\\A")
+                        scanner.useDelimiter("\\A")
-                    if (scanner.hasNext()) {
+                        if (scanner.hasNext()) {
-                        val ipAddress = scanner.next()
+                            val ipAddress = scanner.next()
-                        callback(ipAddress)
+                            callback(ipAddress)
+                        }
                     }
+                } finally {
+                    conn.disconnect()
                 }
-            } finally {
-                conn.disconnect()
             }
+        }catch (e: Exception){
+            Log.e(TAG,e.toString())
         }
-    }catch (e: Exception){
-        Log.e(TAG,e.toString())
     }
-}
     @SuppressLint("NewApi")
     private fun isInternetAvailable(): Boolean {
         val connectivityManager = requireActivity().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
@@ -359,13 +328,4 @@ private fun getPublicIpAddr(callback: (String) -> Unit) {
         val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
         return networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
     }
-
-    private fun checkUserName(userName: String): Boolean {
-    return userName.isNotEmpty() && userName.length >= 3
-}
-
-    private fun checkCenterName(centerName: String): Boolean {
-        return centerName.isNotEmpty() && centerName.length >= 3
-    }
-
 }

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

@@ -1,42 +0,0 @@
-package com.example.hpostesting.presentation.dashboard.ui
-
-import com.example.hpostesting.util.SecureStorage
-import android.os.Bundle
-import android.widget.Button
-import android.widget.EditText
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import `in`.sminnovations.hpostesting.R
-
-class PasswordResetActivity : AppCompatActivity() {
-
-    private lateinit var editTextNewPassword: EditText
-    private lateinit var buttonResetPassword: Button
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_password_reset)
-
-        editTextNewPassword = findViewById(R.id.editTextNewPassword)
-        buttonResetPassword = findViewById(R.id.buttonResetPassword)
-
-        buttonResetPassword.setOnClickListener {
-            val newPassword = editTextNewPassword.text.toString().trim()
-            if (newPassword.isNotEmpty()) {
-                resetPassword(newPassword)
-            } else {
-                Toast.makeText(this, "Please enter a new password", Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    private fun resetPassword(newPassword: String) {
-        // Implement password reset logic here
-        // For example, you can store the new password securely
-        // and update it in the authentication system
-        val secureStorage = SecureStorage(this)
-        secureStorage.storePassword(newPassword)
-        Toast.makeText(this, "Password reset successfully", Toast.LENGTH_SHORT).show()
-        finish()
-    }
-}

app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceActivity.kt

@@ -29,7 +29,6 @@ import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
 import android.view.Menu
-import android.view.MenuItem
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -106,7 +105,8 @@ class DeviceActivity : AppCompatActivity(), DeviceCommunicationHandler {
         super.onCreate(savedInstanceState)
         binding = ActivityDeviceBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.myToolbar.title = "Device Information"
+//        setSupportActionBar(binding.myToolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
         setupListener()
         connectUsb(false)
     }

app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt

@@ -141,8 +141,7 @@ class DeviceFragment : Fragment() {
                             val lines = resultData.split("\n")
                             var temp = lines[2]
                             val temp1 = resultData.substringAfter("#AS").substringBefore("#AC")
-                            binding.tvSubtitleNew.text =
+                            binding.tvSubtitleNew.text = "Device ID : "+hardwareId+"\nTemperature : $temp\n"+temp1
-                                "Device ID : $hardwareId\nTemperature : $temp\n$temp1"
                         }
 
                     }

app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt

@@ -118,7 +118,12 @@ class DeviceProvisionFragment : Fragment() {
                             )
                             apply()
                         }
-
+                        startActivity(
+                            Intent(
+                                requireContext(),
+                                DashboardActivity::class.java
+                            )
+                        )
                         Toast.makeText(
                             activity, "Device registered successfully", Toast.LENGTH_LONG
                         ).show()
@@ -143,13 +148,7 @@ class DeviceProvisionFragment : Fragment() {
 //                        viewModel.addDeviceId(DeviceData(deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()))
                         Log.e("idpass", response.toString())
                         Log.e("idpass", response.data.data?.credentials?.username.toString())
-                     //   Log.e("idpass", deviceProvisionResponse)
+                        Log.e("idpass", deviceProvisionResponse)
-                        startActivity(
-                            Intent(
-                                requireContext(),
-                                DashboardActivity::class.java
-                            )
-                        )
                     } else {
                         Toast.makeText(
                             activity,
@@ -162,10 +161,11 @@ class DeviceProvisionFragment : Fragment() {
                 }
 
                 is Result.Error -> {
+                    Log.d("deviceProvisionResponse", response.exception.toString())
                     response.exception.let { message ->
                         Toast.makeText(
                             activity,
-                            "An error occurred in device provision: $message",
+                            "An error occurred in device provision: ${message.message}",
                             Toast.LENGTH_LONG
                         ).show()
                     }
@@ -248,15 +248,11 @@ class DeviceProvisionFragment : Fragment() {
 
     private fun encryptAndSaveToFile(username: String, password: String) {
         val messageToEncrypt = "$username\n$password"
-        val encryptionKey = Settings.Secure.getString(requireContext().contentResolver, Settings.Secure.ANDROID_ID)
+        val encryptionKey =
+            Settings.Secure.getString(context?.contentResolver, Settings.Secure.ANDROID_ID)
         val encryptedString = Encryption.encrypt(messageToEncrypt, encryptionKey)
         Log.d("DEVICE ID/encryptionKey", encryptionKey)
-        val target = File(requireContext().getExternalFilesDir(null), "HPOSDocuments")
+        val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
-        if (!target.exists()) {
-            target.mkdirs()  // Create the directory if it doesn't exist
-        }
-
-       // val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
         val file = File(target, "credentials.txt")
 
         if (!file.exists()) {

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt

@@ -30,10 +30,13 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
+import com.example.hpostesting.data.constant.TestStatus
 import com.example.hpostesting.data.model.devicediagnostics.AdditionalDetails
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
+import com.example.hpostesting.presentation.autodac.AutoDacActivity
+import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.util.Result
 import com.example.hpostesting.util.Result.Success
@@ -48,10 +51,10 @@ import java.util.Locale
 
 class DiagnosticsFragment : Fragment() {
     // Initialize variables to store LED DAC values
-    var led1Dac: Double? = null
+    var led1Dac: Int? = null
-    var led2Dac: Double? = null
+    var led2Dac: Int? = null
-    var led3Dac: Double? = null
+    var led3Dac: Int? = null
-    var led4Dac: Double? = null
+    var led4Dac: Int? = null
     private var currentProgress = 0
     private val targetProgress = 95 // Target progress value
     private val delayBetweenIncrements = 1500
@@ -187,8 +190,8 @@ class DiagnosticsFragment : Fragment() {
 //                    data?.let {
 //                        val stringData = String(it)
 //                        diagnosticsViewModel.messages.postValue(stringData)
-                      //  binding.tvSubtitle4.text = stringData
+                    //  binding.tvSubtitle4.text = stringData
-                  //  }
+                    //  }
                 }
 
                 override fun onUsbError(e: Exception?) {
@@ -237,7 +240,7 @@ class DiagnosticsFragment : Fragment() {
             })
     }
 
-        private fun listenToHemoCube() {
+    private fun listenToHemoCube() {
         diagnosticsViewModel.messages.postValue("Place cuvette filled with buffer\n and click on start")
         val fullReadOutput = StringBuilder()
         startListening.postValue(true)
@@ -251,7 +254,7 @@ class DiagnosticsFragment : Fragment() {
                         fullReadOutput.append(stringData)
                         handleUsbData(stringData)
 
-                       // binding.tvSubtitle4.text = resultData
+                        // binding.tvSubtitle4.text = resultData
 
 //                        if (stringData.contains("SN")) {
 //                            val slData = stringData.split(" ")
@@ -316,7 +319,7 @@ class DiagnosticsFragment : Fragment() {
     private fun handleUsbData(stringData: String) {
         resultData += stringData
         if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
-             currentResultData += stringData
+            currentResultData += stringData
         }
 
         when {
@@ -351,7 +354,7 @@ class DiagnosticsFragment : Fragment() {
             (resultData.contains("#RC") && this.testStatusCode < 1.8) -> {
                 this.testStatusCode = 1.9
                 activity?.runOnUiThread {
-                   finalCalculation()
+                    finalCalculation()
                     setProgress(100)
                     binding.progressBarHor.visibility = View.GONE
                     currentResultData += "\nIf you are facing any issues while using the device \n Contact us for help at support@sminnovations.in"
@@ -380,38 +383,11 @@ class DiagnosticsFragment : Fragment() {
             if (!ledDataMap.containsKey(ledName)) {
                 ledDataMap[ledName] = mutableListOf()
             }
-            if ((ledDataMap[ledName]?.size ?: 0) < 7) {
+            if ((ledDataMap[ledName]?.size ?: 0) < 6) {
-                if(xValue != 0.0){
+                ledDataMap[ledName]?.add(xValue to yValue)
-                    ledDataMap[ledName]?.add(xValue to yValue)
-                }
             }
             //  ledDataMap[ledName]?.add(xValue to yValue)
         }
-//        var valuesAdded = 0 // Track the number of values added
-//
-//        for (match in matches) {
-//            val ledName = match.groupValues[1]
-//            val xValue = match.groupValues[2].toDouble()
-//            val yValue = match.groupValues[3].toDouble()
-//
-//            // Add x and y values to the corresponding lists based on the LED name
-//            if (!ledDataMap.containsKey(ledName)) {
-//                ledDataMap[ledName] = mutableListOf()
-//            }
-//
-//            // Check if we have already added one value, then add the next six
-//            if (valuesAdded > 0 && (ledDataMap[ledName]?.size ?: 0) < 6) {
-//                ledDataMap[ledName]?.add(xValue to yValue)
-//            }
-//
-//            // Increase the count of values added
-//            valuesAdded++
-//
-//            // Break the loop if we have added 6 values
-//            if (valuesAdded >= 7) {
-//                break
-//            }
-//        }
 
         // String array to store pass or fail messages for each LED
         val results = mutableListOf<String>()
@@ -425,7 +401,7 @@ class DiagnosticsFragment : Fragment() {
         // Find LED DAC values using regex
         regex.findAll(resultData).forEach {
             val (led, dac) = it.destructured
-            val dacValue = dac.toDouble()
+            val dacValue = dac.toInt()
 
             when (led.toInt()) {
                 1 -> led1Dac = dacValue
@@ -470,20 +446,12 @@ class DiagnosticsFragment : Fragment() {
 // Calculation for ADC value
         val adcValue = when (ledName) {
             "LED:1" -> 22000.0
-            "LED:2"-> 18000.0
+            "LED:2", "LED:3" -> 18000.0
-            "LED:3" -> 18000.0
             "LED:4" -> 22000.0
             else -> 0.0
         }
-        val ledValue = when (ledName) {
-            "LED:1" -> led1Dac
-            "LED:2" -> led2Dac
-            "LED:3" -> led3Dac
-            "LED:4" -> led4Dac
-            else -> 0.0
-        }
         val dacValue = calculateDAC(adcValue, slope, constant)
-        val resultDAC = dacValue - ledValue!!
+        val resultDAC = dacValue - led1Dac!!
         if(resultDAC < 200){
             currentResultData += "$ledName DAC LEVEL PASS (✓)\n"
             println("$ledName DAC LEVEL PASS")
@@ -496,7 +464,7 @@ class DiagnosticsFragment : Fragment() {
         return message
     }
 
-    private fun calculateDAC(adc: Double, slope: Double, constant: Double): Double {
+    fun calculateDAC(adc: Double, slope: Double, constant: Double): Double {
         return (adc - constant) / slope
     }
 

app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsViewModel.kt

@@ -13,6 +13,10 @@
 
 package com.example.hpostesting.presentation.diagnostics
 
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.BatteryManager
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -30,7 +34,7 @@ import javax.inject.Inject
 @HiltViewModel
 class DiagnosticsViewModel @Inject constructor(
     private val repository: Repository,
-//    context: Context,
+    context: Context,
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
@@ -39,10 +43,10 @@ class DiagnosticsViewModel @Inject constructor(
     val deviceData = MutableLiveData<DeviceData?>()
     val fireBaseUpload = MutableLiveData<String>()
     val deviceDiagnosticsResponse = MutableLiveData<Result<DeviceDiagnosticsResponse>>()
-//    private val batteryStatus: Intent? =
+    private val batteryStatus: Intent? =
-//        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
+        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
-//            context.registerReceiver(null, ifilter)
+            context.registerReceiver(null, ifilter)
-//        }
+        }
     fun addDiagnosticsDataToDb(data: DiagnosticsData) {
         viewModelScope.launch {
             try {
@@ -75,71 +79,71 @@ class DiagnosticsViewModel @Inject constructor(
     }
 
 
-//    fun getBatteryLevel(): Float? {
+    fun getBatteryLevel(): Float? {
-//        val batteryPct: Float? = batteryStatus?.let { intent ->
+        val batteryPct: Float? = batteryStatus?.let { intent ->
-//            val level: Int =
+            val level: Int =
-//                intent.getIntExtra(
+                intent.getIntExtra(
-//                    BatteryManager.EXTRA_LEVEL,
+                    BatteryManager.EXTRA_LEVEL,
-//                    -1
+                    -1
-//                )
+                )
-//            val scale: Int =
+            val scale: Int =
-//                intent.getIntExtra(
+                intent.getIntExtra(
-//                    BatteryManager.EXTRA_SCALE,
+                    BatteryManager.EXTRA_SCALE,
-//                    -1
+                    -1
-//                )
+                )
-//            level * 100 / scale.toFloat()
+            level * 100 / scale.toFloat()
-//        }
+        }
-//
+
-//        return batteryPct
+        return batteryPct
-//    }
+    }
-//
+
-//    fun getBatteryTemperature(): Float? {
+    fun getBatteryTemperature(): Float? {
-//        val batteryTemp: Float? = batteryStatus?.let { intent ->
+        val batteryTemp: Float? = batteryStatus?.let { intent ->
-//            val temperature = intent.getIntExtra(
+            val temperature = intent.getIntExtra(
-//                BatteryManager.EXTRA_TEMPERATURE,
+                BatteryManager.EXTRA_TEMPERATURE,
-//                0
+                0
-//            )
+            )
-//            temperature.toFloat() / 10
+            temperature.toFloat() / 10
-//        }
+        }
-//
+
-//        return batteryTemp
+        return batteryTemp
-//    }
+    }
-//
+
-//    fun getBatteryVoltage(context: Context): Float {
+    fun getBatteryVoltage(context: Context): Float {
-//        val batteryIntent =
+        val batteryIntent =
-//            context.registerReceiver(
+            context.registerReceiver(
-//                null,
+                null,
-//                IntentFilter(Intent.ACTION_BATTERY_CHANGED)
+                IntentFilter(Intent.ACTION_BATTERY_CHANGED)
-//            )
+            )
-//        val voltage = batteryIntent?.getIntExtra(
+        val voltage = batteryIntent?.getIntExtra(
-//            BatteryManager.EXTRA_VOLTAGE,
+            BatteryManager.EXTRA_VOLTAGE,
-//            0
+            0
-//        ) ?: 0
+        ) ?: 0
-//
+
-//        // milli-volts to volts
+        // milli-volts to volts
-//        return voltage.toFloat() / 1000
+        return voltage.toFloat() / 1000
-//    }
+    }
-//
+
-//
+
-//    fun getBatteryCapacity(context: Context): Int {
+    fun getBatteryCapacity(context: Context): Int {
-//        val batteryManager =
+        val batteryManager =
-//            context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+            context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-//        val currentCapacity =
+        val currentCapacity =
-//            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
+            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-//
+
-//        return currentCapacity
+        return currentCapacity
-//    }
+    }
-//
+
-//    fun getBatteryMaxCapacity(context: Context): Float {
+    fun getBatteryMaxCapacity(context: Context): Float {
-//        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-//        val designCapacity =
+        val designCapacity =
-//            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-//        val currentCapacity =
+        val currentCapacity =
-//            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
+            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-//
+
-//        // Calculate the estimated maximum battery capacity in mAh
+        // Calculate the estimated maximum battery capacity in mAh
-//        val maxCapacity = currentCapacity.toFloat() / designCapacity.toFloat() * 100
+        val maxCapacity = currentCapacity.toFloat() / designCapacity.toFloat() * 100
-//
+
-//        return maxCapacity
+        return maxCapacity
-//    }
+    }
 }

app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestActivity.kt

@@ -1,207 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.presentation.hb_test
-
-import android.annotation.SuppressLint
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.ServiceConnection
-import android.hardware.usb.UsbDevice
-import android.hardware.usb.UsbDeviceConnection
-import android.hardware.usb.UsbManager
-import android.os.Bundle
-import android.os.IBinder
-import android.util.Log
-import android.view.Menu
-import android.widget.Toast
-import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import androidx.core.view.get
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.firebase.FirebaseManager
-import com.example.hpostesting.util.UsbService
-import com.hoho.android.usbserial.driver.UsbSerialDriver
-import com.hoho.android.usbserial.driver.UsbSerialProber
-import dagger.hilt.android.AndroidEntryPoint
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.ActivityHbTestBinding
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class HBTestActivity : AppCompatActivity() {
-
-    @Inject
-    lateinit var databaseRepository: DatabaseRepository
-    private lateinit var binding: ActivityHbTestBinding
-    val viewModel: HBTestViewModel by viewModels()
-    private var myMenu: Menu? = null
-
-    private lateinit var mDriver: UsbSerialDriver
-    private var mConnection: UsbDeviceConnection? = null
-    lateinit var mService: UsbService
-
-    private val TAG = "HemoCube"
-
-    private val broadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-
-            synchronized(this) {
-                val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
-
-                if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
-                    device?.apply {
-                        connectUsb(true)
-                        DataHolder.usbConnected.postValue(true)
-                    }
-                } else {
-                    onErrorReported("permission denied for device")
-                    DataHolder.usbConnected.postValue(true)
-                }
-            }
-        }
-    }
-
-    private val connection = object : ServiceConnection {
-        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            val binder = service as UsbService.UsbServiceBinder
-            mService = binder.getService()
-            viewModel.isServiceConnected = true
-            mConnection.let { mService.connect(mDriver, mConnection!!) }
-            moveToNext()
-        }
-
-        override fun onServiceDisconnected(arg0: ComponentName) {
-            viewModel.isServiceConnected = false
-        }
-    }
-
-    override fun attachBaseContext(newBase: Context?) {
-        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
-        LanguageManager.setLocale(newBase, languageCode)
-        super.attachBaseContext(newBase)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val firebaseManager = FirebaseManager(this)
-        val lastSelectedServer = firebaseManager.getLastSelectedServer()
-//        switchFirebaseServer(lastSelectedServer)
-        Log.d("CURRENT SERVR......","server : ${lastSelectedServer.serverName}")
-        binding = ActivityHbTestBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-//        setSupportActionBar(binding.myToolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        setupListener()
-        connectUsb(false)
-
-    }
-//    private fun switchFirebaseServer(config: FirebaseConfig) {
-//        val (newFirestore, newStorage) = firebaseManager.switchFirestoreServer(config)
-//        databaseRepository.switchServer(newFirestore, newStorage)
-////        Toast.makeText(this, "server switched", Toast.LENGTH_SHORT).show()// Update repository with new Firestore and Storage
-//    }
-    private fun setupListener() {
-        DataHolder.usbConnected.observe(this) {
-            Log.d("USB OBSERVE", "HemoCube called -> $it")
-            if (it) {
-                myMenu?.get(0)?.icon =
-                    ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_24)
-            } else {
-                myMenu?.get(0)?.icon =
-                    ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_off_24)
-                Toast.makeText(this, "Device is Disconnected", Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    open fun connectUsb(permissionGranted: Boolean) {
-        Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
-        val manager = getSystemService(Context.USB_SERVICE) as UsbManager
-        val availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager)
-
-        if (availableDrivers.isEmpty()) {
-            onErrorReported("No Device is Connected")
-        } else {
-            mDriver = availableDrivers[0]
-            mConnection = manager.openDevice(mDriver.device)
-
-            if (mConnection == null) {
-                requestUserPermission(manager, mDriver.device)
-            } else {
-                setupService()
-            }
-        }
-    }
-
-    fun onErrorReported(msg: String) {
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
-        if (!isFinishing) onBackPressed()
-    }
-
-
-    private fun moveToNext() {
-        if (supportFragmentManager.isDestroyed) return
-
-        supportFragmentManager.beginTransaction().replace(binding.fgHbTest.id, HBTestFragment())
-            .commit()
-    }
-
-    @SuppressLint("MutableImplicitPendingIntent")
-    private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-            )
-        } else {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HEMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
-
-        val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
-        manager.requestPermission(device, mPendingIntent)
-    }
-
-    fun setupService() {
-        val intent = Intent(this, UsbService::class.java)
-        bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.my_menu, menu)
-        return true
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        if (viewModel.isServiceConnected) {
-            mService.disconnect()
-            unbindService(connection)
-            viewModel.isServiceConnected = false
-        }
-    }
-}

app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestFragment.kt

@@ -1,399 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.presentation.hb_test
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.text.method.ScrollingMovementMethod
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.FragmentAutoDacBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentHbTestBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-import kotlin.math.log10
-
-class HBTestFragment : Fragment() {
-    private var isUsingExistingBuffer = false
-    private var led1Average = 0.0
-    private var led3Average = 0.0
-    private var led2Average = 0.0
-    private var led4Average = 0.0
-    private var led1SampleForDevice = 0.0
-    private var led2SampleForDevice = 0.0
-    private var led3SampleForDevice = 0.0
-    private var led4SampleForDevice = 0.0
-    private var led1BufferForDevice = 0.0
-    private var led2BufferForDevice = 0.0
-    private var led3BufferForDevice = 0.0
-    private var led4BufferForDevice = 0.0
-    private var x = 0.0
-    private var deviceId = ""
-    private var hbEst = 0.0
-    private var testStatusCode = 0.0
-    private var testDetails: HemoCubeTestData = HemoCubeTestData()
-    private lateinit var binding: FragmentHbTestBinding
-    private val hBTestViewModel: HBTestViewModel by activityViewModels()
-    private lateinit var sharedPreferences: SharedPreferences
-    private var currentDeviceData: DeviceData? = null
-    private var resultData: String = ""
- //   private val messages = MutableLiveData<String>()
-    private var startListening = MutableLiveData(false)
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
-    ): View {
-        binding = FragmentHbTestBinding.inflate(inflater, container, false)
-        sharedPreferences =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initViews()
-        observeViewModel()
-    }
-
-    private fun initViews() {
-        binding.btnSubmit.visibility = View.GONE
-        listenToHemoCube()
-        getDeviceId()
-        binding.tvSubtitle4.movementMethod = ScrollingMovementMethod()
-        binding.btnSubmit.setOnClickListener {
-            hBTestViewModel.messages.postValue(resultData)
-            binding.btnSubmit.visibility = View.GONE
-            testDetails.localFlag = false
-            testDetails.testStatus = true
-            testDetails.deviceId = deviceId
-            testDetails._id = DataHolder.sampleId
-            testDetails.kitSerial = DataHolder.kitSerial
-            testDetails.classificationResult = "HB: $hbEst"
-            testDetails.hb3 = x
-            testDetails.hb4 = hbEst
-            testDetails.age = DataHolder.age
-            testDetails.bloodGroup = DataHolder.bloodGroup
-            testDetails.led1Buffer = led1BufferForDevice
-            testDetails.led2Buffer = led2BufferForDevice
-            testDetails.led3Buffer = led3BufferForDevice
-            testDetails.led4Buffer = led4BufferForDevice
-            testDetails.led1Sample = led1SampleForDevice
-            testDetails.led2Sample = led2SampleForDevice
-            testDetails.led3Sample = led3SampleForDevice
-            testDetails.led4Sample = led4SampleForDevice
-            testDetails.led1Average = led1Average
-            testDetails.led2Average = led2Average
-            testDetails.led3Average = led3Average
-            testDetails.led4Average = led4Average
-            testDetails.testType = "HB Est"
-            testDetails.testTime = SimpleDateFormat(
-                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-            ).format(Calendar.getInstance().time)
-            hBTestViewModel.uploadFirebaseQc(testDetails)
-        }
-        binding.btnBuffer.setOnClickListener {
-            binding.btnBuffer.visibility = View.GONE
-            binding.btnSample.isEnabled = false
-            binding.btnSample.isClickable = false
-            hBTestViewModel.messages.postValue("Buffer Started")
-            runBCommand()
-        }
-        binding.btnSample.setOnClickListener {
-            hBTestViewModel.messages.postValue("Sample Started")
-            binding.btnSample.visibility = View.GONE
-            binding.btnBuffer.visibility = View.GONE
-            runSCommand()
-        }
-        if (isBufferValueAvailable()) {
-            isUsingExistingBuffer = true
-            binding.btnBuffer.text = "Refresh Buffer"
-            binding.btnSample.isEnabled = true
-            binding.btnSample.isClickable = true
-        }else{
-            binding.btnBuffer.text = "Start Buffer"
-            binding.btnSample.isEnabled = false
-            binding.btnSample.isClickable = false
-        }
-
-    }
-
-    private fun observeViewModel() {
-
-        hBTestViewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-        }
-
-        hBTestViewModel.messages.observe(viewLifecycleOwner) {
-            binding.tvSubtitle4.text = it
-        }
-
-        hBTestViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                showToast("Data uploaded successfully")
-                requireActivity().finish()
-            }
-            if (result == "Local") {
-                showToast("Data uploading failed, note it down manually")
-            }
-
-            binding.progressBar.visibility = View.GONE
-        }
-    }
-
-    private fun getDeviceId() {
-        hBTestViewModel.progressBar.postValue(true)
-        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        //deviceId = stringData
-                        hBTestViewModel.messages.postValue(stringData)
-                        binding.tvSubtitle4.text = stringData
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hBTestViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runBCommand() {
-        hBTestViewModel.progressBar.postValue(true)
-        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.START_BUFFER_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hBTestViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runSCommand() {
-        hBTestViewModel.progressBar.postValue(true)
-        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.START_SAMPLE,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hBTestViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runPCommand() {
-        hBTestViewModel.progressBar.postValue(true)
-        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.PRINT_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hBTestViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    fun extractV2HardwareId(input: String): String? {
-        val pattern = Regex("SNS\\s*(.*?)\\s*SNE")
-        val matchResult: MatchResult? = pattern.find(input)
-
-        return matchResult?.groups?.get(1)?.value
-    }
-
-    private fun listenToHemoCube() {
-
-        val fullReadOutput = StringBuilder()
-        startListening.postValue(true)
-
-        try {
-            (activity as HBTestActivity).mService.listenToHemoCube(object :
-                UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        fullReadOutput.append(stringData)
-                        resultData += stringData
-                        hBTestViewModel.messages.postValue(resultData)
-                       // binding.tvSubtitle4.text = resultData
-                        if (stringData.contains("SNE")) {
-                            val slData = stringData.split(" ")
-                            if (slData.size > 1) {
-                                val hardwareId = slData[1].trim()
-                                deviceId = extractV2HardwareId(resultData).toString()
-                                hBTestViewModel.messages.postValue("Place buffer and click below button to start test")
-//                                with(sharedPreferences.edit()) {
-//                                    putString(Constants.DEVICE_ID, hardwareId)
-//                                    apply()
-//                                }
-                            }
-                            activity?.runOnUiThread {
-                                binding.btnBuffer.visibility = View.VISIBLE
-                            }
-                        }
-                    }
-                    if (resultData.contains("#BC") && testStatusCode < 1.0) {
-                        testStatusCode = 1.1
-                        resultData += getString(R.string.buffer_completed)
-                        hBTestViewModel.messages.postValue(resultData)
-                        activity?.runOnUiThread {
-                            binding.btnSample.visibility = View.VISIBLE
-                            binding.btnSample.isEnabled = true
-                            binding.btnSample.isClickable = true
-                        }
-                    }
-
-                    if (resultData.contains("#SC") && testStatusCode < 1.3) {
-                        testStatusCode = 1.4
-                        resultData +=getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data)
-                        hBTestViewModel.messages.postValue(resultData)
-                        activity?.runOnUiThread {
-                            binding.btnSubmit.visibility = View.VISIBLE
-                            runPCommand()
-                        }
-                    }
-
-                    if (resultData.contains("REND") && testStatusCode < 1.5) {
-                        testStatusCode = 1.6
-                        runResult()
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hBTestViewModel.progressBar.postValue(false)
-                }
-            })
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-
-    private fun runResult() {
-        resultData += "\nFetching results...\n"
-        hBTestViewModel.messages.postValue(resultData)
-
-        val resultLines = resultData.split("\\s+(?=LB|LS)".toRegex())
-        var bufferIntensity = resultLines[1].split(' ')[1].trim()
-        led1BufferForDevice = if (isUsingExistingBuffer) {
-            sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")?.toDoubleOrNull()!!
-        } else {
-            bufferIntensity.toDoubleOrNull()!!
-        }
-
-        bufferIntensity = resultLines[2].split(' ')[1].trim()
-        led2BufferForDevice = if (isUsingExistingBuffer) {
-            sharedPreferences.getString(Constants.BUFFER_VALUE_2, "")?.toDoubleOrNull()!!
-        } else {
-            bufferIntensity.toDoubleOrNull()!!
-        }
-
-        bufferIntensity = resultLines[3].split(' ')[1].trim()
-        led3BufferForDevice = if (isUsingExistingBuffer) {
-            sharedPreferences.getString(Constants.BUFFER_VALUE_3, "")?.toDoubleOrNull()!!
-        } else {
-            bufferIntensity.toDoubleOrNull()!!
-        }
-
-        bufferIntensity = resultLines[4].split(' ')[1].trim()
-        led4BufferForDevice = if (isUsingExistingBuffer) {
-            sharedPreferences.getString(Constants.BUFFER_VALUE_4, "")?.toDoubleOrNull()!!
-        } else {
-            bufferIntensity.toDoubleOrNull()!!
-        }
-
-
-        led1SampleForDevice = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
-        led2SampleForDevice = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
-        led3SampleForDevice = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-        led4SampleForDevice = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
-
-        led1Average = log10(led1BufferForDevice.div(led1SampleForDevice))
-        led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
-        led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
-        led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
-
-        x = led1Average - led3Average
-
-        hbEst = (7.347 * x * x) + (12.704 * x) + 0.9033
-
-        resultData +="\n Result: HB EST: $hbEst"
-        if (!isUsingExistingBuffer) {
-            with(sharedPreferences.edit()) {
-                putString(Constants.BUFFER_VALUE_1, led1BufferForDevice.toString())
-                putString(Constants.BUFFER_VALUE_2, led2BufferForDevice.toString())
-                putString(Constants.BUFFER_VALUE_3, led3BufferForDevice.toString())
-                putString(Constants.BUFFER_VALUE_4, led4BufferForDevice.toString())
-                apply()
-            }
-        }
-        hBTestViewModel.messages.postValue(resultData)
-    }
-
-
-
-    private fun showToast(message: String) {
-        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
-    }
-    private fun isBufferValueAvailable(): Boolean {
-        return try {
-            if (sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_1, ""
-                ) != "" && sharedPreferences.getString(Constants.BUFFER_VALUE_2, "") != ""
-                && sharedPreferences.getString(Constants.BUFFER_VALUE_3, "") != ""
-                && sharedPreferences.getString(Constants.BUFFER_VALUE_4, "") != ""
-            ) {
-                sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")
-                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_2,
-                    ""
-                )
-                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_3,
-                    ""
-                )
-                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_4,
-                    ""
-                )
-                    ?.toDouble()!! > 0.0
-            } else {
-                false
-            }
-        } catch (e: Exception) {
-            showToast("error_exist")
-            false
-        }
-    }
-}

app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestViewModel.kt

@@ -1,87 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.presentation.hb_test
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.util.Log
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.dao.HemoCubeDao
-import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.data.repository.Repository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-class HBTestViewModel @Inject constructor(
-    private val hemoCubeDao: HemoCubeDao,
-    private val repository: Repository,
-    context: Context,
-) : ViewModel() {
-    var isServiceConnected = false
-    val progressBar = MutableLiveData(false)
-    val messages = MutableLiveData<String>()
-    private val sharedPreference: SharedPreferences =
-        context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
-    val deviceData = MutableLiveData<DeviceData?>()
-    val fireBaseUpload = MutableLiveData<String>()
-    fun uploadFirebaseQc(testDetails: HemoCubeTestData){
-        viewModelScope.launch {
-            try {
-                when (val response = repository.addTestToDatabase(testDetails)) {
-                    is Response.Success -> {
-                        Log.i("Testdb", "Data uploaded to Firestore successfully")
-                        fireBaseUpload.postValue("Success")
-                        testDetails.localFlag = true
-                        hemoCubeDao.updateTest(testDetails)
-                    }
-
-                    is Response.Error -> {
-                        Log.e("Testdb", "Error uploading data to Firestore: $response")
-                        fireBaseUpload.postValue("Error")
-                        hemoCubeDao.updateTest(testDetails)
-                    }
-
-                    else -> {}
-                }
-            } catch (e: Exception) {
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
-    fun addAutoDacDataToDb(data: DiagnosticsData) {
-        viewModelScope.launch {
-            try {
-                when (val response = repository.addDiagnostics(data)) {
-                    is Response.Success -> {
-                        fireBaseUpload.postValue("Success")
-                    }
-
-                    is Response.Error -> {
-                        fireBaseUpload.postValue("Error")
-                    }
-                }
-            } catch (e: Exception) {
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
-}

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

@@ -57,7 +57,7 @@ class DigitalCardFragment : Fragment() {
             binding.progressBar.visibility = View.VISIBLE
         }
         Log.d("DigitalCardFragment", "Name: ${DataHolder.hemoCubeTestData?.name}")
-        Log.d("DigitalCardFragment", "DOB: ${testDetails?.age}")
+        Log.d("DigitalCardFragment", "DOB: ${testDetails?.birthYear}")
         Log.d("DigitalCardFragment", "Gender: ${testDetails?.gender}")
         Log.d("DigitalCardFragment", "State: ${testDetails?.state}")
         Log.d("DigitalCardFragment", "ABHA ID: ${testDetails?.abhaId}")
@@ -67,7 +67,7 @@ class DigitalCardFragment : Fragment() {
         activity?.runOnUiThread {
             binding.progressBar.visibility = View.GONE
             binding.name.text = "Name: ${DataHolder.hemoCubeTestData?.name}"
-            binding.dob.text = "DOB: ${testDetails?.age}"
+            binding.dob.text = "DOB: ${testDetails?.birthYear}"
             binding.gender.text = "Gender: ${testDetails?.gender}"
             binding.State.text = "State: ${testDetails?.state}"
             binding.abhaid.text = "ABHA ID: ${testDetails?.abhaId}"

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

@@ -19,7 +19,6 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.Color
 import android.os.Bundle
-import android.text.method.ScrollingMovementMethod
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -48,49 +47,13 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
 import kotlin.math.abs
 import kotlin.math.log10
-import kotlin.random.Random
 
 @Suppress("MemberVisibilityCanBePrivate")
 class HemoCubeFragment : Fragment() {
-    private var positiveBoderLine10mm1=Constants.positiveBoderLine10mm1
-    private var positiveBoderLine10mm2=Constants.positiveBoderLine10mm2
-    private var negativeBoderLine10mm1=Constants.negativeBoderLine10mm1
-    private var negativeBoderLine10mm2=Constants.negativeBoderLine10mm2
-    private var normalMin10mm=Constants.normalMin10mm
-    private var normalMax10mm=Constants.normalMax10mm
-    private var negativeBorderlineMin10mm=Constants.negativeBorderlineMin10mm
-    private var negativeBorderlineMax10mm=Constants.negativeBorderlineMax10mm
-    private var sickleCellTraitMin10mm=Constants.sickleCellTraitMin10mm
-    private var sickleCellTraitMax10mm=Constants.sickleCellTraitMax10mm
-    private var positiveForSickleCellMin10mm=Constants.positiveForSickleCellMin10mm
-    private var positiveForSickleCellMax10mm=Constants.positiveForSickleCellMax10mm
-    private var sickleCellDiseaseMin10mm=Constants.sickleCellDiseaseMin10mm
-    private var sickleCellDiseaseMax10mm=Constants.sickleCellDiseaseMax10mm
-
-    private var positiveBoderLine2mm1=Constants.positiveBoderLine2mm1
-    private var positiveBoderLine2mm2=Constants.positiveBoderLine2mm2
-    private var negativeBoderLine2mm1=Constants.negativeBoderLine2mm1
-    private var negativeBoderLine2mm2=Constants.negativeBoderLine2mm2
-    private var normalMin2mm=Constants.normalMin2mm
-    private var normalMax2mm=Constants.normalMax2mm
-    private var negativeBorderlineMin2mm=Constants.negativeBorderlineMin2mm
-    private var negativeBorderlineMax2mm=Constants.negativeBorderlineMax2mm
-    private var sickleCellTraitMin2mm=Constants.sickleCellTraitMin2mm
-    private var sickleCellTraitMax2mm=Constants.sickleCellTraitMax2mm
-    private var positiveForSickleCellMin2mm=Constants.positiveForSickleCellMin2mm
-    private var positiveForSickleCellMax2mm=Constants.positiveForSickleCellMax2mm
-    private var sickleCellDiseaseMin2mm=Constants.sickleCellDiseaseMin2mm
-    private var sickleCellDiseaseMax2mm=Constants.sickleCellDiseaseMax2mm
-
     private var temperature=""
-    private var cuvetteSize = "10mm"
     private var checkCuvette = false
-    private var checkRefreshCuvette = false
     private var checkCuvetteSam = false
-    private var checkSubmit = false
-    private var submitClick = false
     private var sampleClick = false
-    private var refreshClick = false
     private lateinit var binding: FragmentHemoCubeReferenceBinding
     private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
     private lateinit var sharedPreferences: SharedPreferences
@@ -124,7 +87,6 @@ class HemoCubeFragment : Fragment() {
     private var uploadedToCloud = false
     private var uploadedToMolbio = false
     lateinit var testState: TestState
-    var quickCapture:Boolean = false
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
@@ -133,41 +95,10 @@ class HemoCubeFragment : Fragment() {
         sharedPreferences =
             requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
 
-        cuvetteSize = sharedPreferences.getString(Constants.CUVETTE_SIZE,"10mm").toString()
-        positiveBoderLine10mm1 = sharedPreferences.getString("positiveBoderLine10mm1", Constants.positiveBoderLine10mm1.toString())?.toDoubleOrNull() ?: Constants.positiveBoderLine10mm1
-        positiveBoderLine10mm2 = sharedPreferences.getString("positiveBoderLine10mm2", Constants.positiveBoderLine10mm2.toString())?.toDoubleOrNull() ?: Constants.positiveBoderLine10mm2
-        negativeBoderLine10mm1 = sharedPreferences.getString("negativeBoderLine10mm1", Constants.negativeBoderLine10mm1.toString())?.toDoubleOrNull() ?: Constants.negativeBoderLine10mm1
-        negativeBoderLine10mm2 = sharedPreferences.getString("negativeBoderLine10mm2", Constants.negativeBoderLine10mm2.toString())?.toDoubleOrNull() ?: Constants.negativeBoderLine10mm2
-        normalMin10mm = sharedPreferences.getString("normalMin10mm", Constants.normalMin10mm.toString())?.toDoubleOrNull() ?: Constants.normalMin10mm
-        normalMax10mm = sharedPreferences.getString("normalMax10mm", Constants.normalMax10mm.toString())?.toDoubleOrNull() ?: Constants.normalMax10mm
-        negativeBorderlineMin10mm = sharedPreferences.getString("negativeBorderlineMin10mm", Constants.negativeBorderlineMin10mm.toString())?.toDoubleOrNull() ?: Constants.negativeBorderlineMin10mm
-        negativeBorderlineMax10mm = sharedPreferences.getString("negativeBorderlineMax10mm", Constants.negativeBorderlineMax10mm.toString())?.toDoubleOrNull() ?: Constants.negativeBorderlineMax10mm
-        sickleCellTraitMin10mm = sharedPreferences.getString("sickleCellTraitMin10mm", Constants.sickleCellTraitMin10mm.toString())?.toDoubleOrNull() ?: Constants.sickleCellTraitMin10mm
-        sickleCellTraitMax10mm = sharedPreferences.getString("sickleCellTraitMax10mm", Constants.sickleCellTraitMax10mm.toString())?.toDoubleOrNull() ?: Constants.sickleCellTraitMax10mm
-        positiveForSickleCellMin10mm = sharedPreferences.getString("positiveForSickleCellMin10mm", Constants.positiveForSickleCellMin10mm.toString())?.toDoubleOrNull() ?: Constants.positiveForSickleCellMin10mm
-        positiveForSickleCellMax10mm = sharedPreferences.getString("positiveForSickleCellMax10mm", Constants.positiveForSickleCellMax10mm.toString())?.toDoubleOrNull() ?: Constants.positiveForSickleCellMax10mm
-        sickleCellDiseaseMin10mm = sharedPreferences.getString("sickleCellDiseaseMin10mm", Constants.sickleCellDiseaseMin10mm.toString())?.toDoubleOrNull() ?: Constants.sickleCellDiseaseMin10mm
-        sickleCellDiseaseMax10mm = sharedPreferences.getString("sickleCellDiseaseMax10mm", Constants.sickleCellDiseaseMax10mm.toString())?.toDoubleOrNull() ?: Constants.sickleCellDiseaseMax10mm
-
-        positiveBoderLine2mm1 = sharedPreferences.getString("positiveBoderLine2mm1", Constants.positiveBoderLine2mm1.toString())?.toDoubleOrNull() ?: Constants.positiveBoderLine2mm1
-        positiveBoderLine2mm2 = sharedPreferences.getString("positiveBoderLine2mm2", Constants.positiveBoderLine2mm2.toString())?.toDoubleOrNull() ?: Constants.positiveBoderLine2mm2
-        negativeBoderLine2mm1 = sharedPreferences.getString("negativeBoderLine2mm1", Constants.negativeBoderLine2mm1.toString())?.toDoubleOrNull() ?: Constants.negativeBoderLine2mm1
-        negativeBoderLine2mm2 = sharedPreferences.getString("negativeBoderLine2mm2", Constants.negativeBoderLine2mm2.toString())?.toDoubleOrNull() ?: Constants.negativeBoderLine2mm2
-        normalMin2mm = sharedPreferences.getString("normalMin2mm", Constants.normalMin2mm.toString())?.toDoubleOrNull() ?: Constants.normalMin2mm
-        normalMax2mm = sharedPreferences.getString("normalMax2mm", Constants.normalMax2mm.toString())?.toDoubleOrNull() ?: Constants.normalMax2mm
-        negativeBorderlineMin2mm = sharedPreferences.getString("negativeBorderlineMin2mm", Constants.negativeBorderlineMin2mm.toString())?.toDoubleOrNull() ?: Constants.negativeBorderlineMin2mm
-        negativeBorderlineMax2mm = sharedPreferences.getString("negativeBorderlineMax2mm", Constants.negativeBorderlineMax2mm.toString())?.toDoubleOrNull() ?: Constants.negativeBorderlineMax2mm
-        sickleCellTraitMin2mm = sharedPreferences.getString("sickleCellTraitMin2mm", Constants.sickleCellTraitMin2mm.toString())?.toDoubleOrNull() ?: Constants.sickleCellTraitMin2mm
-        sickleCellTraitMax2mm = sharedPreferences.getString("sickleCellTraitMax2mm", Constants.sickleCellTraitMax2mm.toString())?.toDoubleOrNull() ?: Constants.sickleCellTraitMax2mm
-        positiveForSickleCellMin2mm = sharedPreferences.getString("positiveForSickleCellMin2mm", Constants.positiveForSickleCellMin2mm.toString())?.toDoubleOrNull() ?: Constants.positiveForSickleCellMin2mm
-        positiveForSickleCellMax2mm = sharedPreferences.getString("positiveForSickleCellMax2mm", Constants.positiveForSickleCellMax2mm.toString())?.toDoubleOrNull() ?: Constants.positiveForSickleCellMax2mm
-        sickleCellDiseaseMin2mm = sharedPreferences.getString("sickleCellDiseaseMin2mm", Constants.sickleCellDiseaseMin2mm.toString())?.toDoubleOrNull() ?: Constants.sickleCellDiseaseMin2mm
-        sickleCellDiseaseMax2mm = sharedPreferences.getString("sickleCellDiseaseMax2mm", Constants.sickleCellDiseaseMax2mm.toString())?.toDoubleOrNull() ?: Constants.sickleCellDiseaseMax2mm
-
         testState = TestState(
             testDetails = DataHolder.selectedTest?.toHemoCubeTestData(),
         )
-        quickCapture = sharedPreferences.getBoolean(Constants.QUICK_CAPTURE, false)
+
         return binding.root
     }
 
@@ -181,47 +112,16 @@ class HemoCubeFragment : Fragment() {
 
     @SuppressLint("SetTextI18n")
     private fun initViews() {
-        binding.tvSubtitle4.movementMethod = ScrollingMovementMethod()
-        binding.tvDeviceMessages.movementMethod = ScrollingMovementMethod()
         binding.btnSubmit.setOnClickListener {
-//            with(sharedPreferences.edit()) {
+            binding.btnSubmit.isEnabled = false
-//                putBoolean(Constants.QUICK_CAPTURE, false)
+            binding.btnSubmit.isClickable = false
-//                apply()
+            activity?.runOnUiThread {
-//            }
+                binding.progressBar.visibility = View.VISIBLE
-//            if(DataHolder.hemoCubeTestData!!.classificationResult != "Invalid"){
+                binding.btnSubmit.visibility = View.GONE
-//                DataHolder.sampleReadCounter++
-//            }
-//            binding.btnSubmit.isEnabled = false
-//            binding.btnSubmit.isClickable = false
-//            activity?.runOnUiThread {
-//                Log.d("HemoCubeFragment","Test Process completed, result saved")
-//                binding.progressBar.visibility = View.VISIBLE
-//                binding.btnSubmit.visibility = View.GONE
-//            }
-            submitClick = true
-            if(checkSubmit){
-                with(sharedPreferences.edit()) {
-                    putBoolean(Constants.QUICK_CAPTURE, false)
-                    apply()
-                }
-                if(DataHolder.hemoCubeTestData!!.classificationResult != "Invalid"){
-                    DataHolder.sampleReadCounter++
-                }
-                binding.btnSubmit.isEnabled = false
-                binding.btnSubmit.isClickable = false
-                activity?.runOnUiThread {
-                    Log.d("HemoCubeFragment","Test Process completed, result saved")
-                    binding.progressBar.visibility = View.VISIBLE
-                    binding.btnSubmit.visibility = View.GONE
-                }
-                hemoCubeViewModel.uploadHemoCubeResultToDatabase(
-                    isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, ""),quickCapture
-                )
-            }else{
-                checkCuvettePresence()
-                binding.btnSubmit.isEnabled = true
-                binding.btnSubmit.isClickable = true
             }
+            hemoCubeViewModel.uploadHemoCubeResultToDatabase(
+                isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
+            )
         }
 
         binding.tvTitle2.visibility = View.GONE
@@ -230,40 +130,25 @@ class HemoCubeFragment : Fragment() {
         binding.tvTitle.visibility = View.GONE
         binding.btnGo.visibility = View.GONE
 //        binding.btnPlacebuffer.visibility = View.GONE
-        val cuvetteSize = sharedPreferences.getString(Constants.CUVETTE_SIZE,"10mm")
+
-        val cuvetteText = "Cuvette Size: $cuvetteSize"
+        binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}"
-        binding.tvName.text = "ID: ${testDetails?._id} \n\n $cuvetteText"
         binding.tvSubtitle4.text = "Config"
 
+
         if (isBufferValueAvailable()){
-            hemoCubeViewModel.messages.postValue("Ready to test")
+            binding.btnPlacebuffer.apply {
-            isUsingExistingBuffer = true
+                setBackgroundColor(Color.GREEN) // Set button background color to green
-            binding.btnPlaceRefreshbuffer.visibility = View.VISIBLE
+                text = "Refresh Buffer" // Change button text to "Buffer Exists"
-            binding.btnPlacebuffer.visibility = View.GONE
+            }
-//            binding.btnPlacebuffer.apply {
-//                setBackgroundColor(Color.GREEN) // Set button background color to green
-//                text = "Refresh Buffer" // Change button text to "Buffer Exists"
-//            }
-            binding.btnSamplestart.isClickable = true
-            binding.btnSamplestart.isEnabled = true
         }else{
-            hemoCubeViewModel.messages.postValue("Fresh Kit - Please take Buffer Blank reading")
-            binding.btnPlacebuffer.visibility = View.VISIBLE
-            binding.btnPlaceRefreshbuffer.visibility = View.GONE
             binding.btnPlacebuffer.apply {
                 setBackgroundColor(Color.RED) // Set button background color to green
-                text = "Fresh Buffer" // Change button text to "Buffer Exists"
+                text = "No Buffer" // Change button text to "Buffer Exists"
             }
-            binding.btnSamplestart.isClickable = false
-            binding.btnSamplestart.isEnabled = false
         }
 
 
         binding.btnSamplestart.setOnClickListener {
-            activity?.runOnUiThread {
-                Log.d("HemoCubeFragment","Test Process started, Sample started")
-                binding.testing.visibility = View.VISIBLE
-            }
             sampleClick = true
             if(checkCuvetteSam){
                 activity?.runOnUiThread {
@@ -271,37 +156,16 @@ class HemoCubeFragment : Fragment() {
 //                binding.tvSubtitle4.text = "Sample Started"
                 }
                 startSampleProcess()
-                it.visibility = View.GONE
+//                it.visibility = View.GONE
             }else{
                 checkCuvettePresence()
             }
         }
         binding.btnRetryCheckCuvette.setOnClickListener {
-            Log.d("HemoCubeFragment","Retry Check Cuvette")
+
             checkCuvettePresence()
         }
-        binding.btnPlaceRefreshbuffer.setOnClickListener {
-            activity?.runOnUiThread {
-                Log.d("HemoCubeFragment","Test Process started, reBuffer started")
-                binding.testing.visibility = View.VISIBLE
-            }
-            isUsingExistingBuffer = false
-            refreshClick = true
-            if(checkRefreshCuvette){
-                startBufferProcess()
-                activity?.runOnUiThread {
-                    binding.tvSubtitle4.visibility = View.VISIBLE
-                }
-            }else{
-                checkCuvettePresence()
-            }
-
-        }
         binding.btnPlacebuffer.setOnClickListener {
-            activity?.runOnUiThread {
-                Log.d("HemoCubeFragment","Test Process started, Buffer started")
-                binding.testing.visibility = View.VISIBLE
-            }
             if(checkCuvette){
 
                 startBufferProcess()
@@ -331,50 +195,83 @@ class HemoCubeFragment : Fragment() {
     }
 
     private fun observeViewModel() {
+        if (Constants.MOLBIO_INTEGRATION) {
+            hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
+                when (it) {
+                    is Result.Success -> {
+                        uploadedToMolbio = true
+                        it.data.data?.get(0)?.rawData?.let { it1 ->
+                            hemoCubeViewModel.updateMolbioFlag(
+                                it1._id
+                            )
+                        }
+                        if(!Constants.FIREBASE_INTEGRATION) {
+                            Toast.makeText(
+                                requireContext(),
+                                testDetails?._id + ": id details stored successfully",
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
+                        handleReadingFinish()
+                        hemoCubeViewModel.uploadLogs()
+                        val sharedPreferences = requireContext().getSharedPreferences("NATSCertificatePrefs", Context.MODE_PRIVATE)
+                        val lastDownloadTime = sharedPreferences.getLong("lastDownloadTime", 0)
+                        val currentTime = System.currentTimeMillis()
+                        if (currentTime - lastDownloadTime < 365L * 24 * 60 * 60 * 1000) {
+                            Toast.makeText(requireContext(), "NATS certificate download is not required yet.", Toast.LENGTH_SHORT).show()
+                            return@observe
+                        }else{
+                            hemoCubeViewModel.downloadClientCertificate()
+                        }
+                        activity?.runOnUiThread {
+                            binding.btnSubmit.visibility = View.GONE
+                            val i = Intent(
+                                requireContext().applicationContext, DashboardActivity::class.java
+                            )
+                            startActivity(i)
+                        }
+                    }
+
+                    is Result.Error -> {
+                        binding.btnSubmit.visibility = View.VISIBLE
+                        //Remove this line of code while deploying to IOCL
+                        it.exception.let { message ->
+                            Toast.makeText(
+                                activity,
+                                "$message",
+                                Toast.LENGTH_LONG
+                            )
+                                .show()
+                            Log.d("resultuploadfail1", message.toString())
+                        }
+                        handleReadingFinish()
+                        activity?.runOnUiThread {
+                            binding.btnSubmit.visibility = View.GONE
+                            val i = Intent(
+                                requireContext().applicationContext, DashboardActivity::class.java
+                            )
+                            startActivity(i)
+                        }
+                    }
+
+                    else -> {}
+                }
+            }
+        } else {
+            handleReadingFinish()
+        }
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 uploadedToCloud = true
                 var accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString()
-                showToast(R.string.test_upload)
+//                showToast( R.string.test_upload)
-                if (Constants.MOLBIO_INTEGRATION) {
+                Toast.makeText(requireContext(), testDetails?._id +": id details stored successfully",Toast.LENGTH_LONG).show()
-                    hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
-                        when (it) {
-                            is Result.Success -> {
-                                uploadedToMolbio = true
-                                it.data.data?.get(0)?.rawData?.let { it1 ->
-                                    hemoCubeViewModel.updateMolbioFlag(
-                                        it1._id
-                                    )
-                                }
-                                handleReadingFinish()
-                                hemoCubeViewModel.uploadLogs()
-                                hemoCubeViewModel.downloadClientCertificate()
-                            }
 
-                            is Result.Error -> {
-                                binding.btnSubmit.visibility = View.VISIBLE
-                                //Remove this line of code while deploying to IOCL
-                                it.exception.let { message ->
-                                    Toast.makeText(
-                                        activity,
-                                        "$message",
-                                        Toast.LENGTH_LONG
-                                    )
-                                        .show()
-                                    Log.d("resultuploadfail1", message.toString())
-                                }
-                                handleReadingFinish()
-                            }
 
-                            else -> {}
-                        }
-                    }
-                } else {
-                    handleReadingFinish()
-                }
             }
             if (result == "Local") {
-                showToast(R.string.internt_not_local)
+//                showToast(R.string.internt_not_local)
+                Toast.makeText(requireContext(), testDetails?._id +": id details stored locally, Internet is not Available",Toast.LENGTH_LONG).show()
                 startActivity(Intent(requireActivity(), DashboardActivity::class.java))
             }
             if (result == "Error") {
@@ -502,7 +399,7 @@ class HemoCubeFragment : Fragment() {
                         binding.btnSamplestart.visibility = View.VISIBLE
                         binding.tvSubtitle4.text = getString(R.string.place_sample)
                     }
-                    //isUsingExistingBuffer = true
+                    isUsingExistingBuffer = true
                 }
             })
     }
@@ -599,18 +496,12 @@ class HemoCubeFragment : Fragment() {
                 fetchResult()
             }
 //#EC for v0 and v1 and #RC for v2
-            (resultData.contains("#EC") && this.testStatusCode < TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code) -> {
+            (resultData.contains("#RC") && this.testStatusCode < TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code) -> {
                 this.testStatusCode = TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code
-                //EPROM ADC Loaded
+                hemoCubeViewModel.messages.postValue("Ready to test")//EPROM ADC Loaded
                 //checkCuvettePresence()
                 activity?.runOnUiThread {
-                    if(isBufferValueAvailable()){
+                    binding.btnPlacebuffer.visibility = View.VISIBLE
-                        binding.btnPlaceRefreshbuffer.visibility = View.VISIBLE
-                        binding.btnPlacebuffer.visibility = View.GONE
-                    }else{
-                        binding.btnPlaceRefreshbuffer.visibility = View.GONE
-                        binding.btnPlacebuffer.visibility = View.VISIBLE
-                    }
                     binding.btnSamplestart.visibility = View.VISIBLE
                 }
                 getTemp()
@@ -618,16 +509,14 @@ class HemoCubeFragment : Fragment() {
             (resultData.contains("#AC") && this.testStatusCode < TestStatus.TEMPERATURE_CHECK.code) -> {
                 this.testStatusCode = TestStatus.TEMPERATURE_CHECK.code
                 temperature = resultData.substringAfter("#AS").substringBefore("#AC")
-                //hemoCubeViewModel.messages.postValue("Ready to test \n Temperature : $temperature")
+                hemoCubeViewModel.messages.postValue("Ready to test \n Temperature : $temperature")
             }
             resultData.contains("#CIN") && sampleClick && this.testStatusCode < TestStatus.CUVETTE_PRESENTS.code -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
                 this.testStatusCode = TestStatus.CUVETTE_PRESENTS.code
                 activity?.runOnUiThread {
                     checkCuvetteSam = true
-                    binding.testing.visibility = View.GONE
                     binding.btnRetryCheckCuvette.visibility = View.GONE
-                    binding.btnPlaceRefreshbuffer.visibility = View.GONE
                     binding.btnPlacebuffer.visibility = View.GONE
                     binding.btnSamplestart.visibility = View.VISIBLE
                 }
@@ -635,80 +524,29 @@ class HemoCubeFragment : Fragment() {
             resultData.contains("#AIN") && sampleClick && this.testStatusCode <= TestStatus.CUVETTE_ABSENTS.code -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
                 this.testStatusCode = TestStatus.CUVETTE_ABSENTS.code
-                activity?.runOnUiThread {
-                    binding.testing.visibility = View.GONE
-                }
-                showRetryButtonForCuvette()
-            }
-            resultData.contains("#CIN") && refreshClick && this.testStatusCode < TestStatus.CUVETTE_PRESENTR.code -> {
-            hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
-            this.testStatusCode = TestStatus.CUVETTE_PRESENTR.code
-                activity?.runOnUiThread {
-                checkRefreshCuvette = true
-                binding.testing.visibility = View.GONE
-                binding.btnRetryCheckCuvette.visibility = View.GONE
-                binding.btnPlaceRefreshbuffer.visibility = View.VISIBLE
-                binding.btnPlacebuffer.visibility = View.GONE
-                binding.btnSamplestart.visibility = View.VISIBLE
-                    binding.btnSamplestart.isClickable = false
-                    binding.btnSamplestart.isEnabled = false
-                }
-            }
-            resultData.contains("#AIN") && refreshClick && this.testStatusCode <= TestStatus.CUVETTE_ABSENTR.code -> {
-                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
-                this.testStatusCode = TestStatus.CUVETTE_ABSENTR.code
-                activity?.runOnUiThread {
-                    binding.testing.visibility = View.GONE
-                    binding.btnSamplestart.isClickable = false
-                    binding.btnSamplestart.isEnabled = false
-                }
                 showRetryButtonForCuvette()
             }
+
             resultData.contains("#CIN") && this.testStatusCode < TestStatus.CUVETTE_PRESENT.code -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
                 this.testStatusCode = TestStatus.CUVETTE_PRESENT.code
                 activity?.runOnUiThread {
                     checkCuvette = true
-                    binding.testing.visibility = View.GONE
                     binding.btnRetryCheckCuvette.visibility = View.GONE
                     binding.btnPlacebuffer.visibility = View.VISIBLE
                     binding.btnSamplestart.visibility = View.VISIBLE
-                    binding.btnSamplestart.isClickable = false
-                    binding.btnSamplestart.isEnabled = false
                 }
             }
             resultData.contains("#AIN") && this.testStatusCode <= TestStatus.CUVETTE_ABSENT.code -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
                 this.testStatusCode = TestStatus.CUVETTE_ABSENT.code
-                activity?.runOnUiThread {
-                    binding.testing.visibility = View.GONE
-                    binding.btnSamplestart.isClickable = false
-                    binding.btnSamplestart.isEnabled = false
-                }
                 showRetryButtonForCuvette()
             }
-            resultData.contains("#CIN") && this.submitClick && this.testStatusCode < TestStatus.CUVETTE_PRESENTT.code -> {
-                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_presentt))
-                this.testStatusCode = TestStatus.CUVETTE_PRESENTT.code
-                activity?.runOnUiThread {
-                    binding.testing.visibility = View.GONE
-                }
-            }
-            resultData.contains("#AIN") && this.submitClick && this.testStatusCode <= TestStatus.CUVETTE_ABSENTT.code -> {
-                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absentt))
-                this.testStatusCode = TestStatus.CUVETTE_ABSENTT.code
-                activity?.runOnUiThread {
-                    checkSubmit = true
-                    binding.testing.visibility = View.GONE
-                }
-            }
-
             resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.code -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.buffer_started))
                 this.testStatusCode = TestStatus.BUFFER_STARTED.code
                 activity?.runOnUiThread {
                     binding.btnPlacebuffer.visibility = View.GONE
-                    binding.btnPlaceRefreshbuffer.visibility = View.GONE
                     binding.btnSamplestart.isClickable = false
                     binding.btnSamplestart.isEnabled = false
                 }
@@ -717,53 +555,17 @@ class HemoCubeFragment : Fragment() {
             resultData.contains("#BC") && this.testStatusCode < TestStatus.BUFFER_COMPLETED.code -> {
                 activity?.runOnUiThread {
                     resultData = ""
-                    if(Constants.BUFFER_FLAGS_ENABLED){
-                        fetchResult()
-                    }else{
-                        Log.d("resultDataBC",resultData)
-                        activity?.runOnUiThread {
-                            binding.testing.visibility = View.GONE
-                            binding.tvSubtitle4.text = getString(R.string.buffer_completed)
-                            binding.btnPlaceRefreshbuffer.visibility = View.GONE
-                            binding.btnPlacebuffer.visibility = View.GONE
-                            binding.btnSamplestart.visibility = View.VISIBLE
-                            binding.btnSamplestart.isClickable = true
-                            binding.btnSamplestart.isEnabled = true
-                        }
-                    }
                    // resultData.replace("#AIN","#BAIN",false)
+                    Log.d("resultDataBC",resultData)
+                    binding.tvSubtitle4.text = getString(R.string.buffer_completed)
+//                    binding.btnSamplestart.visibility = View.VISIBLE
+                    binding.btnPlacebuffer.visibility = View.GONE
+                    binding.btnSamplestart.isClickable = true
+                    binding.btnSamplestart.isEnabled = true
                 }
                 this.testStatusCode = TestStatus.BUFFER_COMPLETED.code
 
             }
-            resultData.contains("REND") && this.testStatusCode < TestStatus.BUFFER_PRINT_COMPLETED.code -> {
-                resultData = resultData.replace("REND","Buffer print complete"+ generateTwoDigitRandomNumber())
-                hemoCubeViewModel.deviceMessages.postValue(resultData)
-                if(handleBufferCompleted()){
-                    this.testStatusCode = TestStatus.TEMPERATURE_CHECK.code
-                    activity?.runOnUiThread {
-                        checkCuvette = false
-                        binding.testing.visibility = View.GONE
-                        binding.btnRetryCheckCuvette.visibility = View.GONE
-                        binding.btnPlacebuffer.visibility = View.VISIBLE
-                        binding.btnSamplestart.visibility = View.VISIBLE
-                        binding.btnSamplestart.isClickable = false
-                        binding.btnSamplestart.isEnabled = false
-                    }
-                }else{
-                    this.testStatusCode = TestStatus.BUFFER_PRINT_COMPLETED.code
-                    Log.d("resultDataBC",resultData)
-                    activity?.runOnUiThread {
-                        binding.testing.visibility = View.GONE
-                        binding.tvSubtitle4.text = getString(R.string.buffer_completed)
-//                    binding.btnSamplestart.visibility = View.VISIBLE
-                        binding.btnPlacebuffer.visibility = View.GONE
-                        binding.btnSamplestart.visibility = View.VISIBLE
-                        binding.btnSamplestart.isClickable = true
-                        binding.btnSamplestart.isEnabled = true
-                    }
-                }
-            }
 
             (resultData.contains("#SS") || resultData.contains("#SS1")) && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> {
                 this.testStatusCode = TestStatus.SAMPLE_STARTED.code
@@ -777,20 +579,16 @@ class HemoCubeFragment : Fragment() {
             (resultData.contains("#SC") || resultData.contains("#SC1")) && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
                 this.testStatusCode = TestStatus.SAMPLE_COMPLETED.code
                 activity?.runOnUiThread {
-                    binding.testing.visibility = View.GONE
                     binding.btnSamplestart.visibility = View.GONE
                 }
                 hemoCubeViewModel.messages.postValue(
                     getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data)
                 )
-                currentResultData = ""
                 fetchResult()
+                currentResultData = ""
             }
 
             resultData.contains("ovf") -> {
-                activity?.runOnUiThread {
-                    binding.testing.visibility = View.GONE
-                }
                 hemoCubeViewModel.messages.postValue(
                     getString(R.string.power_bank)
                 )
@@ -843,8 +641,6 @@ class HemoCubeFragment : Fragment() {
             }
 
             resultData.contains("REND") && this.testStatusCode < TestStatus.SAMPLE_PRINT_COMPLETED.code -> {
-                resultData = resultData.replace("REND","Sample print complete"+ generateTwoDigitRandomNumber())
-                hemoCubeViewModel.deviceMessages.postValue(resultData)
                 handleSampleCompleted()
             }
 
@@ -941,41 +737,11 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
-    private fun handleBufferCompleted(): Boolean {
-        val lb1Regex = Regex("""LB1 (\d+\.\d+)""")
-        val lb2Regex = Regex("""LB2 (\d+\.\d+)""")
-
-        val lb1Match = lb1Regex.find(resultData)
-        val lb2Match = lb2Regex.find(resultData)
-
-        val lb1Value = lb1Match!!.groupValues[1].toFloat()
-        val lb2Value = lb2Match!!.groupValues[1].toFloat()
-
-      //  val led1Min = sharedPreferences.getString("bufferMinLed1", "21000.00")?.toDouble()
-        val led1Min = sharedPreferences.getString("bufferMinLed1", Constants.bufferMinLed1.toString())?.toDoubleOrNull() ?: Constants.bufferMinLed1
-        val led1Max = sharedPreferences.getString("bufferMaxLed1", Constants.bufferMaxLed1.toString())?.toDoubleOrNull() ?: Constants.bufferMaxLed1
-
-        val led2Min = sharedPreferences.getString("bufferMinLed2", Constants.bufferMinLed2.toString())?.toDoubleOrNull() ?: Constants.bufferMinLed2
-        val led2Max = sharedPreferences.getString("bufferMaxLed2", Constants.bufferMaxLed2.toString())?.toDoubleOrNull() ?: Constants.bufferMaxLed2
-
-        val isLb1InRange = lb1Value in led1Min..led1Max
-        val isLb2InRange = lb2Value in led2Min..led2Max
-        if(!isLb1InRange || !isLb2InRange){
-            hemoCubeViewModel.messages.postValue("Buffer Reading Out of Range - Please Take Buffer/Blank Reading. If problem persists, Calibrate device")
-            return true
-        }
-
-        Log.d("HemoCube", "LB1 ($lb1Value) is in range LED1 ($led1Min-$led1Max): $isLb1InRange")
-        Log.d("HemoCube", "LB2 ($lb2Value) is in range LED2 ($led2Min-$led2Max): $isLb2InRange")
-        return false
-    }
-
     private fun showRetryButtonForCuvette() {
         activity?.runOnUiThread {
 //            binding.btnPlacebuffer.visibility = View.GONE
             binding.btnRetryCheckCuvette.visibility = View.VISIBLE
             binding.btnPlacebuffer.visibility = View.GONE
-            binding.btnPlaceRefreshbuffer.visibility = View.GONE
             binding.btnSamplestart.visibility = View.GONE
         }
     }
@@ -994,7 +760,7 @@ class HemoCubeFragment : Fragment() {
             }
         } else {
             hemoCubeViewModel.uploadHemoCubeResultToDatabase(
-                isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, ""),false
+                isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
             )
         }
     }
@@ -1006,7 +772,7 @@ class HemoCubeFragment : Fragment() {
             getString(R.string.data_collected_processing_data)
         )
 
-        val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
+        val resultLines = resultData.split("\\s+(?=LB|LS)".toRegex())
         var bufferIntensity = resultLines[1].split(' ')[1].trim()
         led1BufferForDevice = if (isUsingExistingBuffer) {
             sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")?.toDoubleOrNull()!!
@@ -1038,7 +804,12 @@ class HemoCubeFragment : Fragment() {
         led4SampleForDevice =
             resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
         processResult()
-
+        if (Constants.PQ_MODE) {
+            finishReading()
+        } else {
+            sendFirstGainCommand()
+        }
+        currentResultData = ""
     }
 
     fun processV1HardwareId(resultData: String) {
@@ -1133,12 +904,11 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
-    fun handleBackButtonPress(): Boolean {
+    fun handleBackButtonPress() {
-        return if (isTestOngoing) {
+        if (isTestOngoing) {
             showToast(R.string.test_go_noback)
-            true // Indicate that the back press was handled
         } else {
-            false // Indicate that the back press was not handled
+            activity?.onBackPressed()
         }
     }
 
@@ -1151,7 +921,7 @@ class HemoCubeFragment : Fragment() {
                 requireActivity().packageName, 0
             )
             val version = pInfo.versionName
-//absorbance
+
             val led1Average = log10(led1BufferForDevice.div(led1SampleForDevice))
             val led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
             val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
@@ -1159,76 +929,6 @@ class HemoCubeFragment : Fragment() {
             //used for latest trueheme and v1
             val deviceRatio = led2Average / led1Average
             val borderlineMetric = (led1Average - led2Average) / deviceRatio
-//            activity?.runOnUiThread {
-//                Toast.makeText(requireContext(),"count: ${DataHolder.sampleReadCounter}",Toast.LENGTH_LONG).show()
-//            }
-            if(led1Average < 0 || led2Average < 0){
-                hemoCubeViewModel.messages.postValue("Negative Absorbance - Repeat test with reading Buffer first and sample second")
-                this.testStatusCode = TestStatus.BUFFER_PRINT_COMPLETED.code
-                binding.testing.visibility = View.GONE
-                binding.btnPlacebuffer.visibility = View.GONE
-                binding.btnPlaceRefreshbuffer.visibility = View.GONE
-                binding.btnSamplestart.visibility = View.VISIBLE
-                binding.btnSamplestart.isClickable = true
-                binding.btnSamplestart.isEnabled = true
-                return
-            }
-            if(Constants.ABS_FLAGS_ENABLED){
-                val inRange2mmLed1: Boolean
-                val inRange2mmLed2: Boolean
-                val inRange10mmLed1: Boolean
-                val inRange10mmLed2: Boolean
-                val min2mmLed1 = getDoubleFromPreferences(Constants.ABS2LED1MMLL, Constants.min2mmLed1)
-                val max2mmLed1 = getDoubleFromPreferences(Constants.ABS2LED1MMUL, Constants.max2mmLed1)
-                val min2mmLed2 = getDoubleFromPreferences(Constants.ABS2LED2MMLL, Constants.min2mmLed2)
-                val max2mmLed2 = getDoubleFromPreferences(Constants.ABS2LED2MMUL, Constants.max2mmLed2)
-                val min10mmLed1 = getDoubleFromPreferences(Constants.ABS10LED1MMLL, Constants.min10mmLed1)
-                val max10mmLed1 = getDoubleFromPreferences(Constants.ABS10LED1MMUL, Constants.max10mmLed1)
-                val min10mmLed2 = getDoubleFromPreferences(Constants.ABS10LED2MMLL, Constants.min10mmLed2)
-                val max10mmLed2 = getDoubleFromPreferences(Constants.ABS10LED2MMUL, Constants.max10mmLed2)
-                if(led1Average < 0 || led2Average < 0){
-                    hemoCubeViewModel.messages.postValue("Negative Absorbance - Repeat test with reading Buffer first and sample second")
-                    this.testStatusCode = TestStatus.BUFFER_PRINT_COMPLETED.code
-                    binding.testing.visibility = View.GONE
-                    binding.btnPlaceRefreshbuffer.visibility = View.GONE
-                    binding.btnPlacebuffer.visibility = View.GONE
-                    binding.btnSamplestart.visibility = View.VISIBLE
-                    binding.btnSamplestart.isClickable = true
-                    binding.btnSamplestart.isEnabled = true
-                    return
-                }else{
-                    if(cuvetteSize == "10mm"){
-                        inRange10mmLed1 = led1Average in min10mmLed1..max10mmLed1
-                        inRange10mmLed2 = led2Average in min10mmLed2..max10mmLed2
-                        if(!inRange10mmLed1 || !inRange10mmLed2){
-                            hemoCubeViewModel.messages.postValue("Absorbance out-of-Range - Repeat test with adequate blood volume and Incubation time")
-                            this.testStatusCode = TestStatus.BUFFER_PRINT_COMPLETED.code
-                            binding.testing.visibility = View.GONE
-                            binding.btnPlaceRefreshbuffer.visibility = View.GONE
-                            binding.btnPlacebuffer.visibility = View.GONE
-                            binding.btnSamplestart.visibility = View.VISIBLE
-                            binding.btnSamplestart.isClickable = true
-                            binding.btnSamplestart.isEnabled = true
-                            return
-                        }
-                    }else if(cuvetteSize == "2mm"){
-                        inRange2mmLed1 = led1Average in min2mmLed1..max2mmLed1
-                        inRange2mmLed2 = led2Average in min2mmLed2..max2mmLed2
-                        if(!inRange2mmLed1 || !inRange2mmLed2){
-                            hemoCubeViewModel.messages.postValue("Absorbance out-of-Range - Repeat test with adequate blood volume and Incubation time")
-                            this.testStatusCode = TestStatus.BUFFER_PRINT_COMPLETED.code
-                            binding.testing.visibility = View.GONE
-                            binding.btnPlaceRefreshbuffer.visibility = View.GONE
-                            binding.btnPlacebuffer.visibility = View.GONE
-                            binding.btnSamplestart.visibility = View.VISIBLE
-                            binding.btnSamplestart.isClickable = true
-                            binding.btnSamplestart.isEnabled = true
-                            return
-                        }
-                    }
-                }
-            }
-
 
 
             if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
@@ -1353,7 +1053,6 @@ class HemoCubeFragment : Fragment() {
                 led4Buffer = led4BufferForDevice
                 appVersion = version
                 labName = sharedPreferences.getString(Constants.LABNAME,"")
-                cuvetteSize = sharedPreferences.getString(Constants.CUVETTE_SIZE,"")
                 this.led1Sample = led1SampleForDevice
                 this.led2Sample = led2SampleForDevice
                 this.led3Sample = led3SampleForDevice
@@ -1383,16 +1082,11 @@ class HemoCubeFragment : Fragment() {
                     deviceRatioClass,
                     borderlineMetric
                 )
-                Log.d("HemoCubeFragment",this.classificationResult)
                 hemoCubeViewModel.messages.postValue(
                     "${this.classificationResult} \n Device Ratio: ${
                         "%.3f".format(
                             this.deviceRatio
                         )
-                    } : ${
-                        "%.3f".format(
-                            borderlineMetric
-                        )
                     }"
                 )
                 if (DataHolder.hemoCubeTestData?.testType == "HB")
@@ -1426,13 +1120,6 @@ class HemoCubeFragment : Fragment() {
             ).show()
             Firebase.crashlytics.recordException(e)
         }
-
-        if (Constants.PQ_MODE) {
-            finishReading()
-        } else {
-            sendFirstGainCommand()
-        }
-        currentResultData = ""
     }
 
     fun reclassifyWithBorderlineMethod2(deviceRatio: Double?, deviceRatioClass: String?, led2Average: Double?): String {
@@ -1466,44 +1153,17 @@ class HemoCubeFragment : Fragment() {
         try {
 //            hemoCubeViewModel.messages.postValue("post classification checks")
             if (deviceRatio != null && borderlineMetric != null) {
-                if(cuvetteSize == "10mm"){
+                if (deviceRatioClass == "Negative Borderline") {
-                    if (deviceRatioClass == "Negative Borderline") {
+                    return if (borderlineMetric >= 2.4)
-                        if (borderlineMetric < negativeBoderLine10mm1){//2.0
+                        "Borderline. Normal"
-                            return "Sickle Cell Trait"
+                    else
-                        }else if(borderlineMetric > negativeBoderLine10mm1){
+                        "Borderline. Sickle Cell Trait"
-                            return "Normal"
+                }
-                        }else if(borderlineMetric == negativeBoderLine10mm1){//borderlineMetric > negativeBoderLine10mm1 && borderlineMetric < negativeBoderLine10mm2
+                if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
-                            return "Sickle Cell Trait"//"Negative borderline. Confirm with HPLC"
+                    return if (borderlineMetric >= 1.4)//1.34
-                        }
+                        "Borderline. Sickle Cell Trait"
-                    }
+                    else
-                    if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
+                        "Borderline. Sickle Cell Disease"
-                        if (borderlineMetric < positiveBoderLine10mm1){//1.3
-                            return "Sickle Cell Disease"
-                        }else if(borderlineMetric > positiveBoderLine10mm1){
-                            return "Sickle Cell Trait"
-                        }else if(borderlineMetric == positiveBoderLine10mm1){//borderlineMetric > positiveBoderLine10mm1 && borderlineMetric < positiveBoderLine10mm2
-                            return "Sickle Cell Disease"//"Positive for Sickle Cell. Confirm with HPLC"
-                        }
-                    }
-                }else if(cuvetteSize == "2mm"){
-                    if (deviceRatioClass == "Negative Borderline") {
-                        if (borderlineMetric < negativeBoderLine2mm1){//1.34
-                            return "Sickle Cell Trait"
-                        }else if(borderlineMetric > negativeBoderLine2mm2){
-                            return "Normal"
-                        }else if(borderlineMetric > negativeBoderLine2mm1 && borderlineMetric < negativeBoderLine2mm2){
-                            return "Negative borderline. Confirm with HPLC"
-                        }
-                    }
-                    if (deviceRatioClass == "Positive for Sickle Cell. HPLC for Confirmation") {
-                        if (borderlineMetric < positiveBoderLine2mm1){//1.34
-                            return "Sickle Cell Disease"
-                        }else if(borderlineMetric > positiveBoderLine2mm2){
-                            return "Sickle Cell Trait"
-                        }else if(borderlineMetric > positiveBoderLine2mm1 && borderlineMetric < positiveBoderLine2mm2){
-                            return "Positive for Sickle Cell. Confirm with HPLC"
-                        }
-                    }
                 }
             }
         } catch (e: Exception) {
@@ -1542,42 +1202,18 @@ class HemoCubeFragment : Fragment() {
     fun deviceRatioClassification(ratio: Double?): String {
         try {
             if (ratio != null) {
-                if(cuvetteSize == "10mm"){
+                if (ratio in 0.11..0.23) {
-                    if (ratio in normalMin10mm..normalMax10mm) {
 //                    setSubtitleTextColor(R.color.green_2)
-                        return "Normal"
+                    return "Normal"
-                    }
-                    if (ratio in negativeBorderlineMin10mm..negativeBorderlineMax10mm){
-                        return "Negative Borderline"
-                    }
-                    if (ratio in sickleCellTraitMin10mm..sickleCellTraitMax10mm){
-                        return "Sickle Cell Trait"
-                    }
-                    if (ratio in positiveForSickleCellMin10mm..positiveForSickleCellMax10mm){//0.36
-                        return "Positive for Sickle Cell. HPLC for Confirmation"
-                    }
-                    if (ratio in sickleCellDiseaseMin10mm..sickleCellDiseaseMax10mm){
-                        return "Sickle Cell Disease"
-                    }
-                }else if(cuvetteSize == "2mm"){
-                    if (ratio in normalMin2mm..normalMax2mm) {
-//                    setSubtitleTextColor(R.color.green_2)
-                        return "Normal"
-                    }
-                    if (ratio in negativeBorderlineMin2mm..negativeBorderlineMax2mm){
-                        return "Negative Borderline"
-                    }
-                    if (ratio in sickleCellTraitMin2mm..sickleCellTraitMax2mm){
-                        return "Sickle Cell Trait"
-                    }
-                    if (ratio in positiveForSickleCellMin2mm..positiveForSickleCellMax2mm){//0.36
-                        return "Positive for Sickle Cell. HPLC for Confirmation"
-                    }
-                    if (ratio in sickleCellDiseaseMin2mm..sickleCellDiseaseMax2mm){
-                        return "Sickle Cell Disease"
-                    }
                 }
-
+                if (ratio in 0.23..0.25)
+                    return "Negative Borderline"
+                if (ratio in 0.25..0.31)
+                    return "Sickle Cell Trait"
+                if (ratio in 0.31..0.39)//0.36
+                    return "Positive for Sickle Cell. HPLC for Confirmation"
+                if (ratio in 0.39..1.0)
+                    return "Sickle Cell Disease"
             } else {
                 return "Invalid"
             }
@@ -1596,7 +1232,6 @@ class HemoCubeFragment : Fragment() {
 
     fun handleException(e: Exception) {
         showToast(R.string.error_classification)
-        Log.d("HemoCubeFragment",e.toString())
         Firebase.crashlytics.recordException(e)
     }
 
@@ -1791,10 +1426,4 @@ class HemoCubeFragment : Fragment() {
         val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 0.0
         return coefficient1 * ratio + coefficient2
     }
-    fun getDoubleFromPreferences(key: String, defaultValue: Double): Double {
-        return sharedPreferences.getString(key, defaultValue.toString())?.toDouble() ?: defaultValue
-    }
-    private fun generateTwoDigitRandomNumber(): Int {
-        return Random.nextInt(10, 100)
-    }
 }

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

@@ -43,6 +43,7 @@ import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultResponse
 import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.MolbioHemocubeData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.CheckUpdateResponse
@@ -51,6 +52,7 @@ import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.CheckUpdateWorker
 import com.example.hpostesting.domain.LogFileManager
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import okhttp3.Headers
@@ -67,17 +69,17 @@ import javax.inject.Inject
 @Suppress("MemberVisibilityCanBePrivate")
 @HiltViewModel
 class HemoCubeViewModel @Inject constructor(
-    val hemoCubeDao: HemoCubeDao,
+    private val hemoCubeDao: HemoCubeDao,
     private val hemoCubeBufferDao: HemoCubeBufferDao,
     private val repository: Repository,
     private val logFileManager: LogFileManager,
     private val localFileDataSource: LocalFileDataSource,
     context: Context,
 ) : ViewModel() {
-    private var testUpload: Boolean = false
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
     private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
+    private val testDetailsmolbio = DataHolder.hemoCubeTestData?.MolbioHemocubeData()
     val messages = MutableLiveData<String>()
     private val sharedPreference =
         context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
@@ -123,7 +125,7 @@ class HemoCubeViewModel @Inject constructor(
         }
 
     fun uploadHemoCubeResultToDatabase(
-        isOnline: Boolean, testStatus: Boolean, kitSerial: String?,quickCapture:Boolean
+        isOnline: Boolean, testStatus: Boolean, kitSerial: String?,
     ) = viewModelScope.launch {
         if (kitSerial != null) {
             testDetails?.kitSerial = kitSerial
@@ -133,84 +135,19 @@ class HemoCubeViewModel @Inject constructor(
         try {
             if (isOnline) {
                 parseData()
-                //addResultTestToDb(quickCapture)
+                addResultTestToDb()
-                if(Constants.FIREBASE_INTEGRATION){
-                    addResultTestToDb(quickCapture)
-                }else{
-                    uploadToMolbio()
-                }
-
             } else {
                 parseData()
-                val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
-                with(sharedPreference.edit()) {
-                    putInt(Constants.KIT_COUNT, kitCount.plus(1))
-                    apply()
-                }
-                //  addResultTestToDb(quickCapture,isOnline)
                 testDetails?.testTime = SimpleDateFormat(
                     "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                 ).format(Calendar.getInstance().time)
-                testDetails?.localFlag = false
                 hemoCubeDao.updateTest(testDetails!!)
                 fireBaseUpload.postValue("Local")
-
-//                parseData()
-//                addResultTestToDb(quickCapture)
-//                testDetails?.testTime = SimpleDateFormat(
-//                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-//                ).format(Calendar.getInstance().time)
-//                hemoCubeDao.updateTest(testDetails!!)
-//                fireBaseUpload.postValue("Local")
             }
         } catch (e: Exception) {
             Log.e("Testdb", "Upload failed: ${e.message}")
         }
     }
-    fun uploadToMolbio(){
-        if (Constants.MOLBIO_INTEGRATION) {
-            testDetails!!.testStatus = true
-            testDetails.localFlag = true
-            val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
-            with(sharedPreference.edit()) {
-                putInt(Constants.KIT_COUNT, kitCount.plus(1))
-                apply()
-            }
-            fireBaseUpload.postValue("Success")
-            testDetails.reportUploadTime = SimpleDateFormat(
-                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-            ).format(Calendar.getInstance().time)
-            val currentTimeFormatted = SimpleDateFormat(
-                "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
-                Locale.getDefault()
-            ).format(Calendar.getInstance().time)
-            // Sanitize testDetails before using it in the API call
-            val sanitizedTestDetails = sanitizeDoubleValues(testDetails)
-
-            // Now, use sanitizedTestDetails for the API call
-            uploadResult(
-                MolbioV2ResultRequest(
-                    mutableListOf(
-                        MolbioV2Result(
-                            rawData = sanitizedTestDetails,
-                            analysisId = sanitizedTestDetails._id,
-                            analysisDate = currentTimeFormatted,
-                            analysisStatus = sanitizedTestDetails.classificationResult,
-                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[sanitizedTestDetails.deviceId]?.toString(),
-                            interpretation = sanitizedTestDetails.classificationResult,
-                            testId = sanitizedTestDetails._id,
-                            testTime = currentTimeFormatted,
-                            collectionTime = currentTimeFormatted,
-                            expiryTime = currentTimeFormatted,
-                        )
-                    )
-                )
-            )
-            viewModelScope.launch {
-                hemoCubeDao.updateTest(testDetails)
-            }
-        }
-    }
 
     fun login(loginRequest: LoginRequest) = viewModelScope.launch {
         loginResponse.postValue(Result.Loading())
@@ -235,7 +172,7 @@ class HemoCubeViewModel @Inject constructor(
     }
 
 
-    fun sendDataToMolbio() = viewModelScope.launch(Dispatchers.IO) {
+    fun sendDataToMolbio() = viewModelScope.launch(Dispatchers.IO + coroutineExceptionHandler) {
 
         Log.d("molbio","getting in sendMolbio")
         val resultList = MolbioV2ResultRequest(mutableListOf())
@@ -252,7 +189,7 @@ class HemoCubeViewModel @Inject constructor(
                         ?: "defaultThreshold" // Handle possible nulls safely
                 resultList.results?.add(
                     MolbioV2Result(
-                        rawData = userData,
+                        rawData = userData.MolbioHemocubeData(),
                         analysisId = userData._id,
                         analysisDate = currentTimeFormatted,
                         analysisStatus = userData.classificationResult
@@ -286,20 +223,16 @@ class HemoCubeViewModel @Inject constructor(
                 is Result.Success -> {
                     it.data.data?.forEach { id ->
                         id.rawData?.let { it1 ->
-                            updateLocalFlag(it1._id)
                             updateMolbioFlag(
                                 it1._id
                             )
                         }
                     }
-                    fireBaseBulkUpload.postValue("Success")
                 }
                 is Result.Error -> {
-                    fireBaseBulkUpload.postValue("Error")
                     Log.d("result","result upload error")
                 }
                 else -> {
-                    fireBaseBulkUpload.postValue("Error")
                     Log.d("result","result upload else")
                 }
             }
@@ -307,7 +240,7 @@ class HemoCubeViewModel @Inject constructor(
     }
 
 
-    fun sendDataToFirebase() = viewModelScope.launch ( Dispatchers.IO ) {
+    fun sendDataToFirebase() = viewModelScope.launch ( Dispatchers.IO + coroutineExceptionHandler ) {
         val pendingData = hemoCubeDao.getFirebasePending()
         pendingData.forEach{
                 userData ->
@@ -317,12 +250,7 @@ class HemoCubeViewModel @Inject constructor(
                 }
             }
         }
-        if(testUpload){
+
-            fireBaseBulkUpload.postValue("Success")
-        }
-//        else{
-//            fireBaseBulkUpload.postValue("Error")
-//        }
     }
 
 
@@ -339,6 +267,7 @@ class HemoCubeViewModel @Inject constructor(
         repository.deviceUpdate(deviceUpdateRequest).let {
             deviceUpdate.postValue(it.body())
             deviceUpdateheader.postValue(it.headers())
+
         }
     }
 
@@ -473,7 +402,7 @@ class HemoCubeViewModel @Inject constructor(
         testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
         testDetails?.incubationTime = DataHolder.hemoCubeTestData?.incubationTime.toString()
         testDetails?.name = DataHolder.hemoCubeTestData?.name.toString()
-        testDetails?.age = DataHolder.hemoCubeTestData?.age.toString()
+        testDetails?.birthYear = DataHolder.hemoCubeTestData?.birthYear.toString()
         testDetails?.userImageURL = DataHolder.hemoCubeTestData?.userImageURL.toString()
         testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
         testDetails?.prdClassification = DataHolder.hemoCubeTestData?.prdClassification.toString()
@@ -492,96 +421,73 @@ class HemoCubeViewModel @Inject constructor(
         testDetails?.volume = DataHolder.hemoCubeTestData?.volume
         testDetails?.filter = DataHolder.hemoCubeTestData?.filter
         testDetails?.labName = DataHolder.hemoCubeTestData?.labName
-        testDetails?.cuvetteSize = sharedPreference.getString(Constants.CUVETTE_SIZE, "").toString()
+
-        testDetails?.centerName = sharedPreference.getString(Constants.CENTER_NAME, "").toString()
-        testDetails?.district = sharedPreference.getString(Constants.DISTRICT, "").toString()
-        testDetails?.ipAddress = sharedPreference.getString(Constants.IP_ADDRESS, "").toString()
-        testDetails?.configUpdatedRecent = sharedPreference.getString(Constants.LAST_UPDATED, "NA").toString()
     }
 
-    private fun addResultTestToDb(quickCapture: Boolean) {
+    private fun addResultTestToDb() {
         viewModelScope.launch {
             try {
-                testDetails!!.quickCapture = quickCapture
+                testDetails!!.reportUploadTime = SimpleDateFormat(
-                testDetails.testStatus = true
-                testDetails.reportUploadTime = SimpleDateFormat(
                     "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                 ).format(Calendar.getInstance().time)
                 val currentTimeFormatted = SimpleDateFormat(
                     "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
                     Locale.getDefault()
                 ).format(Calendar.getInstance().time)
-                if(quickCapture){
+                if(Constants.FIREBASE_INTEGRATION) {
-                    when (val response = repository.addQcTestToDatabase(testDetails)) {
+                when (val response = repository.addTestToDatabase(testDetails)) {
-                        is Response.Success -> {
+                    is Response.Success -> {
-                            val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
+                        val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
-                            with(sharedPreference.edit()) {
+                        with(sharedPreference.edit()) {
-                                putInt(Constants.KIT_COUNT, kitCount.plus(1))
+                            putInt(Constants.KIT_COUNT, kitCount.plus(1))
-                                apply()
+                            apply()
-                            }
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
-                            fireBaseUpload.postValue("Success")
-                            testDetails.localFlag = true
-                            hemoCubeDao.updateTest(testDetails)
                         }
+                        Log.i("Testdb", "Data uploaded to Firestore successfully")
+                        fireBaseUpload.postValue("Success")
+                        testDetails.localFlag = true
 
-                        is Response.Error -> {
+                        hemoCubeDao.updateTest(testDetails)
-                            Log.e("Testdb", "Error uploading data to Firestore: $response")
-                            fireBaseUpload.postValue("Error")
-                            hemoCubeDao.updateTest(testDetails)
-                        }
-
-                        else -> {}
                     }
-                }else{
-                    when (val response = repository.addTestToDatabase(testDetails)) {
-                        is Response.Success -> {
-                            testDetails.localFlag = true
-                            val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
-                            with(sharedPreference.edit()) {
-                                putInt(Constants.KIT_COUNT, kitCount.plus(1))
-                                apply()
-                            }
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
-                            fireBaseUpload.postValue("Success")
 
-                            if (Constants.MOLBIO_INTEGRATION) {
+                    is Response.Error -> {
-                                // Sanitize testDetails before using it in the API call
+                        Log.e("Testdb", "Error uploading data to Firestore: $response")
-                                val sanitizedTestDetails = sanitizeDoubleValues(testDetails)
+                        fireBaseUpload.postValue("Error")
-
+                        hemoCubeDao.updateTest(testDetails)
-                                // Now, use sanitizedTestDetails for the API call
-                                uploadResult(
-                                    MolbioV2ResultRequest(
-                                        mutableListOf(
-                                            MolbioV2Result(
-                                                rawData = sanitizedTestDetails,
-                                                analysisId = sanitizedTestDetails._id,
-                                                analysisDate = currentTimeFormatted,
-                                                analysisStatus = sanitizedTestDetails.classificationResult,
-                                                thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[sanitizedTestDetails.deviceId]?.toString(),
-                                                interpretation = sanitizedTestDetails.classificationResult,
-                                                testId = sanitizedTestDetails._id,
-                                                testTime = currentTimeFormatted,
-                                                collectionTime = currentTimeFormatted,
-                                                expiryTime = currentTimeFormatted,
-                                            )
-                                        )
-                                    )
-                                )
-                            }
-                            hemoCubeDao.updateTest(testDetails)
-                        }
-
-                        is Response.Error -> {
-                            Log.e("Testdb", "Error uploading data to Firestore: $response")
-                            fireBaseUpload.postValue("Error")
-                            hemoCubeDao.updateTest(testDetails)
-                        }
-
-                        else -> {}
                     }
+
+                    else -> {}
                 }
+                }
+                if (Constants.MOLBIO_INTEGRATION) {
+                    val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
+                    with(sharedPreference.edit()) {
+                        putInt(Constants.KIT_COUNT, kitCount.plus(1))
+                        apply()
+                    }
+                    // Sanitize testDetails before using it in the API call
+                    val sanitizedTestDetails = testDetailsmolbio?.let { sanitizeDoubleValues(it) }
 
+                    // Now, use sanitizedTestDetails for the API call
+                    uploadResult(
+                        MolbioV2ResultRequest(
+                            mutableListOf(
+                                MolbioV2Result(
+                                    rawData = sanitizedTestDetails,
+                                    analysisId = sanitizedTestDetails!!._id,
+                                    analysisDate = currentTimeFormatted,
+                                    analysisStatus = sanitizedTestDetails.classificationResult,
+                                    thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[sanitizedTestDetails.deviceId]?.toString(),
+                                    interpretation = sanitizedTestDetails.classificationResult,
+                                    testId = sanitizedTestDetails._id,
+                                    testTime = currentTimeFormatted,
+                                    collectionTime = currentTimeFormatted,
+                                    expiryTime = currentTimeFormatted,
+                                )
+                            )
+                        )
+                    )
+                    hemoCubeDao.updateTest(testDetails)
+                }
             } catch (e: Exception) {
                 Log.e("Testdb", "Exception during data upload: ${e.message}")
                 fireBaseUpload.postValue("Error")
@@ -596,29 +502,28 @@ class HemoCubeViewModel @Inject constructor(
             ).format(Calendar.getInstance().time)
             when (repository.addTestToDatabase(userData)) {
                 is Response.Success -> {
-                    testUpload = true
+                    fireBaseBulkUpload.postValue("Success")
-                    userData.localFlag = true
                     updateLocalFlag(userData._id)
                 }
 
                 else -> {
-                    testUpload = false
+                    fireBaseBulkUpload.postValue("Error")
                 }
             }
         }
     }
 
-    fun sanitizeDoubleValues(hemoCubeTestData: HemoCubeTestData): HemoCubeTestData {
+    fun sanitizeDoubleValues(molbiohemocubeData: MolbioHemocubeData): MolbioHemocubeData {
-        hemoCubeTestData::class.java.declaredFields.forEach { field ->
+        molbiohemocubeData::class.java.declaredFields.forEach { field ->
             if (field.type == Double::class.javaObjectType || field.type == Double::class.javaPrimitiveType) {
                 field.isAccessible = true
-                val value = field.get(hemoCubeTestData) as Double?
+                val value = field.get(molbiohemocubeData) as Double?
                 if (value != null && (value.isInfinite() || value.isNaN())) {
-                    field.set(hemoCubeTestData, 0.0) // Replace with a suitable default value
+                    field.set(molbiohemocubeData, 0.0) // Replace with a suitable default value
                 }
             }
         }
-        return hemoCubeTestData
+        return molbiohemocubeData
     }
 
     private fun updateLocalFlag(userId: String) = viewModelScope.launch {
@@ -633,6 +538,7 @@ class HemoCubeViewModel @Inject constructor(
         hemoCubeDao.insertAll(userData)
     }
 
+
     fun deleteById(userId: String) = viewModelScope.launch {
         hemoCubeDao.deleteById(id = userId)
     }
@@ -667,10 +573,6 @@ class HemoCubeViewModel @Inject constructor(
         viewModelScope.launch {
             hemoCubeBufferDao.updateFieldById(id = bufferId, true)
         }
-    fun deleteByStatus() = viewModelScope.launch {
-        hemoCubeDao.deleteByStatus()
-    }
-
 
     fun getLocalUserDataForCsv(context: Context): Boolean {
         val localUserDataLiveData: LiveData<List<HemoCubeTestData>> = hemoCubeDao.getAll()
@@ -686,7 +588,7 @@ class HemoCubeViewModel @Inject constructor(
                             userData._id,
                             userData.name,
                             userData.bloodGroup,
-                            userData.age,
+                            userData.birthYear,
                             userData.classificationResult,
                             userData.testTime.toString(),
                             userData.userImageURL
@@ -792,4 +694,7 @@ class HemoCubeViewModel @Inject constructor(
             "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
         ).format(Calendar.getInstance().time)
     }
+    val coroutineExceptionHandler = CoroutineExceptionHandler{_, throwable ->
+        throwable.printStackTrace()
+    }
 }

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

@@ -21,11 +21,9 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.ServiceConnection
-import android.content.SharedPreferences
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
-import android.icu.text.SimpleDateFormat
 import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
@@ -41,25 +39,18 @@ import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.util.UsbService
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
-import com.google.firebase.remoteconfig.ktx.remoteConfig
-import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
-import java.util.Calendar
-import java.util.Locale
 
 @AndroidEntryPoint
 open class HemocubeActivity : AppCompatActivity() {
-    private val remoteConfig: FirebaseRemoteConfig = Firebase.remoteConfig
     private lateinit var binding: ActivityHemocubeBinding
     private val viewModel by viewModels<HemoCubeViewModel>()
     private var myMenu: Menu? = null
-    lateinit var sharedPreferences: SharedPreferences
+
     private lateinit var mDriver: UsbSerialDriver
     private var mConnection: UsbDeviceConnection? = null
     lateinit var mService: UsbService
@@ -79,7 +70,6 @@ open class HemocubeActivity : AppCompatActivity() {
                         DataHolder.usbConnected.postValue(true)
                     }
                 } else {
-                    Log.d("HemoCubeActivity", "permission denied for device")
                     onErrorReported("permission denied for device")
                     DataHolder.usbConnected.postValue(true)
                 }
@@ -117,95 +107,6 @@ open class HemocubeActivity : AppCompatActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         setupListener()
         connectUsb(false)
-        val configSettings = remoteConfigSettings {
-            minimumFetchIntervalInSeconds = 10//3600
-        }
-        sharedPreferences = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-        remoteConfig.setConfigSettingsAsync(configSettings)
-        remoteConfig.setDefaultsAsync(R.xml.remote_config_defaults)
-
-        remoteConfig.fetchAndActivate()
-            .addOnCompleteListener(this) { task ->
-                if (task.isSuccessful) {
-                    val normalMin2mm = remoteConfig.getDouble("normalMin2mm")
-                    val normalMax2mm = remoteConfig.getDouble("normalMax2mm")
-                    val negativeBorderlineMin2mm = remoteConfig.getDouble("negativeBorderlineMin2mm")
-                    val negativeBorderlineMax2mm = remoteConfig.getDouble("negativeBorderlineMax2mm")
-                    val positiveForSickleCellMin2mm = remoteConfig.getDouble("positiveForSickleCellMin2mm")
-                    val positiveForSickleCellMax2mm = remoteConfig.getDouble("positiveForSickleCellMax2mm")
-                    val sickleCellTraitMin2mm = remoteConfig.getDouble("sickleCellTraitMin2mm")
-                    val sickleCellTraitMax2mm = remoteConfig.getDouble("sickleCellTraitMax2mm")
-                    val sickleCellDiseaseMin2mm = remoteConfig.getDouble("sickleCellDiseaseMin2mm")
-                    val sickleCellDiseaseMax2mm = remoteConfig.getDouble("sickleCellDiseaseMax2mm")
-                    val positiveBoderLine2mm1 = remoteConfig.getDouble("positiveBoderLine2mm1")
-                    val positiveBoderLine2mm2 = remoteConfig.getDouble("positiveBoderLine2mm2")
-                    val negativeBoderLine2mm1 = remoteConfig.getDouble("negativeBoderLine2mm1")
-                    val negativeBoderLine2mm2 = remoteConfig.getDouble("negativeBoderLine2mm2")
-
-                    val normalMin10mm = remoteConfig.getDouble("normalMin10mm")
-                    val normalMax10mm = remoteConfig.getDouble("normalMax10mm")
-                    val negativeBorderlineMin10mm = remoteConfig.getDouble("negativeBorderlineMin10mm")
-                    val negativeBorderlineMax10mm = remoteConfig.getDouble("negativeBorderlineMax10mm")
-                    val positiveForSickleCellMin10mm = remoteConfig.getDouble("positiveForSickleCellMin10mm")
-                    val positiveForSickleCellMax10mm = remoteConfig.getDouble("positiveForSickleCellMax10mm")
-                    val sickleCellTraitMin10mm = remoteConfig.getDouble("sickleCellTraitMin10mm")
-                    val sickleCellTraitMax10mm = remoteConfig.getDouble("sickleCellTraitMax10mm")
-                    val sickleCellDiseaseMin10mm = remoteConfig.getDouble("sickleCellDiseaseMin10mm")
-                    val sickleCellDiseaseMax10mm = remoteConfig.getDouble("sickleCellDiseaseMax10mm")
-                    val positiveBoderLine10mm1 = remoteConfig.getDouble("positiveBoderLine10mm1")
-                    val positiveBoderLine10mm2 = remoteConfig.getDouble("positiveBoderLine10mm2")
-                    val negativeBoderLine10mm1 = remoteConfig.getDouble("negativeBoderLine10mm1")
-                    val negativeBoderLine10mm2 = remoteConfig.getDouble("negativeBoderLine10mm2")
-
-                    val bufferMinLed1 = remoteConfig.getDouble("bufferMinLed1")
-                    val bufferMaxLed1 = remoteConfig.getDouble("bufferMaxLed1")
-                    val bufferMinLed2 = remoteConfig.getDouble("bufferMinLed2")
-                    val bufferMaxLed2 = remoteConfig.getDouble("bufferMaxLed2")
-                    val time = SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                        ).format(Calendar.getInstance().time).toString()
-                    with(sharedPreferences.edit()) {
-                        putString(Constants.LAST_UPDATED, time)
-                        putString("bufferMinLed1", bufferMinLed1.toString())
-                        putString("bufferMaxLed1", bufferMaxLed1.toString())
-                        putString("bufferMinLed2", bufferMinLed2.toString())
-                        putString("bufferMaxLed2", bufferMaxLed2.toString())//buffer
-                        putString("normalMin2mm", normalMin2mm.toString())//2mm
-                        putString("normalMax2mm", normalMax2mm.toString())
-                        putString("negativeBorderlineMin2mm", negativeBorderlineMin2mm.toString())
-                        putString("negativeBorderlineMax2mm", negativeBorderlineMax2mm.toString())
-                        putString("positiveForSickleCellMin2mm", positiveForSickleCellMin2mm.toString())
-                        putString("positiveForSickleCellMax2mm", positiveForSickleCellMax2mm.toString())
-                        putString("sickleCellTraitMin2mm", sickleCellTraitMin2mm.toString())
-                        putString("sickleCellTraitMax2mm", sickleCellTraitMax2mm.toString())
-                        putString("sickleCellDiseaseMin2mm", sickleCellDiseaseMin2mm.toString())
-                        putString("sickleCellDiseaseMax2mm", sickleCellDiseaseMax2mm.toString())
-                        putString("positiveBoderLine2mm1", positiveBoderLine2mm1.toString())
-                        putString("positiveBoderLine2mm2", positiveBoderLine2mm2.toString())
-                        putString("negativeBoderLine2mm1", negativeBoderLine2mm1.toString())
-                        putString("negativeBoderLine2mm2", negativeBoderLine2mm2.toString())//2mm
-                        putString("normalMin10mm", normalMin10mm.toString())//10mm
-                        putString("normalMax10mm", normalMax10mm.toString())
-                        putString("negativeBorderlineMin10mm", negativeBorderlineMin10mm.toString())
-                        putString("negativeBorderlineMax10mm", negativeBorderlineMax10mm.toString())
-                        putString("positiveForSickleCellMin10mm", positiveForSickleCellMin10mm.toString())
-                        putString("positiveForSickleCellMax10mm", positiveForSickleCellMax10mm.toString())
-                        putString("sickleCellTraitMin10mm", sickleCellTraitMin10mm.toString())
-                        putString("sickleCellTraitMax10mm", sickleCellTraitMax10mm.toString())
-                        putString("sickleCellDiseaseMin10mm", sickleCellDiseaseMin10mm.toString())
-                        putString("sickleCellDiseaseMax10mm", sickleCellDiseaseMax10mm.toString())
-                        putString("positiveBoderLine10mm1", positiveBoderLine10mm1.toString())
-                        putString("positiveBoderLine10mm2", positiveBoderLine10mm2.toString())
-                        putString("negativeBoderLine10mm1", negativeBoderLine10mm1.toString())
-                        putString("negativeBoderLine10mm2", negativeBoderLine10mm2.toString())//10mm
-                        apply()
-                    }
-                    Toast.makeText(this@HemocubeActivity, "Config params updated", Toast.LENGTH_SHORT).show()
-                    Log.d(TAG, "Config params updated")
-                } else {
-                    Log.d(TAG, "Config params Fetch failed")
-                }
-            }
     }
 
     private fun setupListener() {
@@ -214,12 +115,10 @@ open class HemocubeActivity : AppCompatActivity() {
             if (it) {
                 myMenu?.get(0)?.icon =
                     ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_24)
-                Log.d("HemoCubeActivity", "Device is Connected")
             } else {
                 myMenu?.get(0)?.icon =
                     ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_off_24)
                 Toast.makeText(this, "Device is Disconnected", Toast.LENGTH_SHORT).show()
-                Log.d("HemoCubeActivity", "Device is Disconnected")
             }
         }
     }
@@ -231,10 +130,8 @@ open class HemocubeActivity : AppCompatActivity() {
         val availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager)
 
         if (availableDrivers.isEmpty()) {
-            Log.d("HemoCubeActivity", "No Device is Connected")
             onErrorReported("No Device is Connected")
         } else {
-            Log.d("HemoCubeActivity", "Device available")
             mDriver = availableDrivers[0]
             mConnection = manager.openDevice(mDriver.device)
 
@@ -294,25 +191,14 @@ open class HemocubeActivity : AppCompatActivity() {
     }
 
 
-//    override fun onBackPressed() {
+    override fun onBackPressed() {
-//        val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
+        val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
-//        if (fragment is HemoCubeFragment) {
+        if (fragment is HemoCubeFragment) {
-//            fragment.handleBackButtonPress()
+            fragment.handleBackButtonPress()
-//        } else {
+        } else {
-//            super.onBackPressed()
+            super.onBackPressed()
-//        }
-//    }
-override fun onBackPressed() {
-    val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
-    if (fragment is HemoCubeFragment) {
-        if (fragment.handleBackButtonPress()) {
-            // If the fragment handled the back press, return to avoid calling super.onBackPressed
-            return
         }
     }
-    // If the fragment did not handle the back press, call the superclass method
-    super.onBackPressed()
-}
 
     fun onErrorReported(msg: String) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()

app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt

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

app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt

@@ -485,7 +485,7 @@ class TestRightViewModel @Inject constructor(
 
                     val csvUri = csvUploadTask.storage.downloadUrl.await().toString()
                     val logUri = logUploadTask.storage.downloadUrl.await().toString()
-                 //   val serialNumber = Constants.STATICID.firstOrNull { it == deviceSerialNumber }
+                    val serialNumber = Constants.STATICID.firstOrNull { it == deviceSerialNumber }
                     testDetails?.csvPath = csvUri
                     testDetails?.reportPath = logUri
 

app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt

@@ -43,6 +43,7 @@ import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultResponse
 import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.MolbioHemocubeData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.CheckUpdateResponse
@@ -75,6 +76,7 @@ class TrueHemeViewModel @Inject constructor(
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
     private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
+    private val testDetailsmolbio = DataHolder.hemoCubeTestData?.MolbioHemocubeData()
     val messages = MutableLiveData<String>()
     private val sharedPreference =
         context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
@@ -159,12 +161,12 @@ class TrueHemeViewModel @Inject constructor(
         }
     }
 
-//    fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest) = viewModelScope.launch {
+    fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest) = viewModelScope.launch {
-//        deviceUpdate.postValue(Result.Loading())
+        deviceUpdate.postValue(Result.Loading())
-//        repository.deviceUpdate(deviceUpdateRequest).let {
+        repository.deviceUpdate(deviceUpdateRequest).let {
 //            deviceUpdate.postValue(it)
-//        }
+        }
-//    }
+    }
 
     fun startPeriodicCheckUpdate() {
         val periodicRequest = PeriodicWorkRequestBuilder<CheckUpdateWorker>(
@@ -287,7 +289,7 @@ class TrueHemeViewModel @Inject constructor(
         testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
         testDetails?.incubationTime = DataHolder.hemoCubeTestData?.incubationTime.toString()
         testDetails?.name = DataHolder.hemoCubeTestData?.name.toString()
-        testDetails?.age = DataHolder.hemoCubeTestData?.age.toString()
+        testDetails?.birthYear = DataHolder.hemoCubeTestData?.birthYear.toString()
         testDetails?.userImageURL = DataHolder.hemoCubeTestData?.userImageURL.toString()
         testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
         testDetails?.prdClassification = DataHolder.hemoCubeTestData?.prdClassification.toString()
@@ -321,12 +323,12 @@ class TrueHemeViewModel @Inject constructor(
                         }
                         Log.i("Testdb", "Data uploaded to Firestore successfully")
                         fireBaseUpload.postValue("Success")
-                        testDetails.localFlag = true
+                        testDetailsmolbio!!.localFlag = true
                         uploadResult(
                             MolbioV2ResultRequest(
                                 mutableListOf(
                                     MolbioV2Result(
-                                        rawData = testDetails,
+                                        rawData = testDetailsmolbio,
                                         analysisId = testDetails._id,
                                         analysisDate = testDetails.testTime,
                                         analysisStatus = testDetails.classificationResult,
@@ -434,7 +436,7 @@ class TrueHemeViewModel @Inject constructor(
                             userData._id,
                             userData.name,
                             userData.bloodGroup,
-                            userData.age,
+                            userData.birthYear,
                             userData.classificationResult,
                             userData.testTime.toString(),
                             userData.userImageURL

app/src/main/java/com/example/hpostesting/presentation/utils/NatsManager.kt

@@ -139,7 +139,7 @@ class NatsManager(datacollector: DashboardActivity) {
                 if (nc?.status == Connection.Status.CONNECTED) {
                     Log.d("NATSCONNECTION", "NATS is successfully connected.")
                     nc?.subscribe("device.hpos.${deviceId}.ping")
-                    // Log.d(TAG, "Nats subscribed with ping-"+d)
+                   // Log.d(TAG, "Nats subscribed with ping-"+d)
                     nc?.publish(
                         "server.hpos.${deviceId}.ping",
                         "ALIVE".toByteArray(StandardCharsets.UTF_8)

app/src/main/java/com/example/hpostesting/util/AppInitializer.kt

@@ -1,14 +0,0 @@
-package com.example.hpostesting.util
-
-import android.content.Context
-
-object AppInitializer {
-    fun initialize(context: Context) {
-        val secureStorage = SecureStorage(context)
-        if (secureStorage.getPassword() == null || secureStorage.getAdminPassword() == null) {
-            // Store the shared password securely
-            secureStorage.storePassword("SMI@12345")
-            secureStorage.storeAdminPassword("SMI@Admin$")
-        }
-    }
-}

app/src/main/java/com/example/hpostesting/util/MyAuthenticator.kt

@@ -1,44 +0,0 @@
-package com.example.hpostesting.util
-
-import android.accounts.AbstractAccountAuthenticator
-import android.accounts.Account
-import android.accounts.AccountAuthenticatorResponse
-import android.accounts.NetworkErrorException
-import android.content.Context
-import android.os.Bundle
-
-class MyAuthenticator(context: Context) : AbstractAccountAuthenticator(context) {
-    override fun editProperties(response: AccountAuthenticatorResponse?, accountType: String?): Bundle {
-        throw UnsupportedOperationException()
-    }
-
-    override fun addAccount(response: AccountAuthenticatorResponse?, accountType: String?, authTokenType: String?, requiredFeatures: Array<out String>?, options: Bundle?): Bundle? {
-        // Add your logic to add an account
-        return null
-    }
-
-    override fun confirmCredentials(response: AccountAuthenticatorResponse?, account: Account?, options: Bundle?): Bundle? {
-        // Add your logic to confirm credentials
-        return null
-    }
-
-    override fun getAuthToken(response: AccountAuthenticatorResponse?, account: Account?, authTokenType: String?, options: Bundle?): Bundle? {
-        // Add your logic to get an authentication token
-        return null
-    }
-
-    override fun getAuthTokenLabel(authTokenType: String?): String? {
-        // Label for the auth token type
-        return null
-    }
-
-    override fun updateCredentials(response: AccountAuthenticatorResponse?, account: Account?, authTokenType: String?, options: Bundle?): Bundle? {
-        // Add your logic to update credentials
-        return null
-    }
-
-    override fun hasFeatures(response: AccountAuthenticatorResponse?, account: Account?, features: Array<out String>?): Bundle? {
-        // Add your logic to check for specific account features
-        return null
-    }
-}

app/src/main/java/com/example/hpostesting/util/MyAuthenticatorService.kt

@@ -1,12 +0,0 @@
-package com.example.hpostesting.util
-
-import android.app.Service
-import android.content.Intent
-import android.os.IBinder
-
-class MyAuthenticatorService : Service() {
-    override fun onBind(intent: Intent?): IBinder? {
-        val authenticator = MyAuthenticator(this)
-        return authenticator.iBinder
-    }
-}

app/src/main/java/com/example/hpostesting/util/SecureStorage.kt

@@ -1,33 +0,0 @@
-package com.example.hpostesting.util
-
-import android.content.Context
-import androidx.security.crypto.EncryptedSharedPreferences
-import androidx.security.crypto.MasterKey
-
-class SecureStorage(context: Context) {
-    private val masterKey = MasterKey.Builder(context)
-        .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
-        .build()
-
-    private val sharedPreferences = EncryptedSharedPreferences.create(
-        context,
-        "secure_prefs",
-        masterKey,
-        EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-        EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-    )
-
-    fun storePassword(password: String) {
-        sharedPreferences.edit().putString("shared_password", password).apply()
-    }
-    fun storeAdminPassword(password: String) {
-        sharedPreferences.edit().putString("admin_password", password).apply()
-    }
-    fun getAdminPassword(): String? {
-        return sharedPreferences.getString("admin_password", null)
-    }
-    fun getPassword(): String? {
-        return sharedPreferences.getString("shared_password", null)
-    }
-
-}

app/src/main/res/drawable/baseline_cloud_24.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96z"/>
-    
-</vector>

app/src/main/res/drawable/baseline_cloud_done_24.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM10,17l-3.5,-3.5 1.41,-1.41L10,14.17 15.18,9l1.41,1.41L10,17z"/>
-    
-</vector>

app/src/main/res/drawable/baseline_cloud_sync_24.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M21.5,14.98c-0.02,0 -0.03,0 -0.05,0.01C21.2,13.3 19.76,12 18,12c-1.4,0 -2.6,0.83 -3.16,2.02C13.26,14.1 12,15.4 12,17c0,1.66 1.34,3 3,3l6.5,-0.02c1.38,0 2.5,-1.12 2.5,-2.5S22.88,14.98 21.5,14.98zM10,4.26v2.09C7.67,7.18 6,9.39 6,12c0,1.77 0.78,3.34 2,4.44V14h2v6H4v-2h2.73C5.06,16.54 4,14.4 4,12C4,8.27 6.55,5.15 10,4.26zM20,6h-2.73c1.43,1.26 2.41,3.01 2.66,5l-2.02,0C17.68,9.64 16.98,8.45 16,7.56V10h-2V4h6V6z"/>
-    
-</vector>

app/src/main/res/drawable/baseline_info_24.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
-    
-</vector>

app/src/main/res/drawable/baseline_translate_24.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
-    
-</vector>

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

@@ -23,18 +23,18 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-                <androidx.appcompat.widget.Toolbar
+        <!--        <androidx.appcompat.widget.Toolbar-->
-                    android:id="@+id/my_toolbar"
+        <!--            android:id="@+id/my_toolbar"-->
-                    android:layout_width="match_parent"
+        <!--            android:layout_width="match_parent"-->
-                    android:layout_height="?attr/actionBarSize"
+        <!--            android:layout_height="?attr/actionBarSize"-->
-                    android:background="?attr/colorPrimary"
+        <!--            android:background="?attr/colorPrimary"-->
-                    app:titleTextColor="#FFFFFF"
+        <!--            app:titleTextColor="#FFFFFF"-->
-                    android:elevation="4dp"
+        <!--            android:elevation="4dp"-->
-                    app:menu="@menu/my_menu"
+        <!--            app:menu="@menu/my_menu"-->
-                    android:theme="@style/ToolbarTheme"
+        <!--            android:theme="@style/ToolbarTheme"-->
-                    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        <!--            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"-->
-                    app:layout_constraintStart_toStartOf="parent"
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
-                    app:layout_constraintTop_toTopOf="parent"/>
+        <!--            app:layout_constraintTop_toTopOf="parent"/>-->
 
         <FrameLayout
             android:id="@+id/fg_device"

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

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
-  ~ // Notice: All information contained herein is, and remains
-  ~ // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
-  ~ // if any. The intellectual and technical concepts contained
-  ~ // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
-  ~ // and its suppliers and may be covered by Indian and Foreign Patents,
-  ~ // patents in process, and are protected by trade secret or copyright law.
-  ~ // Dissemination of this information or reproduction of this material
-  ~ // is strictly forbidden unless prior written permission is obtained
-  ~ // from ShanMukha Innovations Pvt. Ltd.
-  -->
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_parent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <!--        <androidx.appcompat.widget.Toolbar-->
-        <!--            android:id="@+id/my_toolbar"-->
-        <!--            android:layout_width="match_parent"-->
-        <!--            android:layout_height="?attr/actionBarSize"-->
-        <!--            android:background="?attr/colorPrimary"-->
-        <!--            app:titleTextColor="#FFFFFF"-->
-        <!--            android:elevation="4dp"-->
-        <!--            app:menu="@menu/my_menu"-->
-        <!--            android:theme="@style/ToolbarTheme"-->
-        <!--            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toTopOf="parent"/>-->
-
-        <FrameLayout
-            android:id="@+id/fg_hb_test"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            >
-
-        </FrameLayout>
-
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

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

@@ -17,7 +17,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    >
+    tools:context=".presentation.KitScanActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
@@ -45,7 +45,6 @@
         android:layout_marginHorizontal="24dp"
         android:layout_marginTop="16dp"
         android:text="@string/scan_qr_code_of_the_kit"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/app_bar_layout" />
 
@@ -59,7 +58,6 @@
         android:textColor="@color/black"
         app:backgroundTint="@color/blue_app_light"
         app:cornerRadius="100dp"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_title" />
 
@@ -130,7 +128,7 @@
             android:id="@+id/name_edit_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxLength="27"
+            android:maxLength="17"
             android:inputType="text"
             android:hint="@string/serial_number" />
 

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

@@ -92,7 +92,6 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             app:cardElevation="8dp"
-            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/cv_item1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/cv_item1"
@@ -133,7 +132,6 @@
             android:id="@+id/cv_item3"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:visibility="gone"
             android:layout_marginTop="32dp"
             android:layout_marginStart="16dp"
             app:cardElevation="8dp"
@@ -180,7 +178,6 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             app:cardElevation="8dp"
-            android:visibility="gone"
             app:layout_constraintTop_toTopOf="@id/cv_item3"
             app:layout_constraintBottom_toBottomOf="@id/cv_item3"
             app:layout_constraintStart_toEndOf="@id/cv_item3"

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

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Reset Password"
-        android:textStyle="bold"
-        android:textColor="@color/black"
-        android:textSize="27sp"
-        android:layout_marginTop="15dp"/>
-
-    <EditText
-        android:id="@+id/editTextNewPassword"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@color/black"
-        android:layout_marginTop="30dp"
-        android:textSize="20sp"
-        android:hint="Enter new password"
-        android:inputType="textPassword" />
-
-    <Button
-        android:id="@+id/buttonResetPassword"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:textColor="@color/white"
-        android:text="Reset Password" />
-
-</LinearLayout>

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

@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
-  ~ // Notice: All information contained herein is, and remains
-  ~ // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
-  ~ // if any. The intellectual and technical concepts contained
-  ~ // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
-  ~ // and its suppliers and may be covered by Indian and Foreign Patents,
-  ~ // patents in process, and are protected by trade secret or copyright law.
-  ~ // Dissemination of this information or reproduction of this material
-  ~ // is strictly forbidden unless prior written permission is obtained
-  ~ // from ShanMukha Innovations Pvt. Ltd.
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.example.hpostesting.presentation.diagnostics.DiagnosticsFragment">
-
-    <TextView
-        android:id="@+id/tv_subtitle2"
-        style="@style/title2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="16dp"
-        android:textSize="20sp"
-        android:textColor="@color/black"
-        android:textStyle="bold"
-        android:text="Update values of ABS Limits"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:id="@+id/main_ll"
-        style="@style/title1_1"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="16dp"
-        android:orientation="vertical"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_subtitle2">
-
-        <EditText
-            android:id="@+id/et_2mmled1_ll"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:hint="2mm Led 1 lower limit"
-            android:inputType="numberDecimal" />
-        <EditText
-            android:id="@+id/et_2mmled1_ul"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:hint="2mm Led 1 upper limit"
-            android:inputType="numberDecimal" />
-
-        <EditText
-            android:id="@+id/et_2mmled2_ll"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:hint="2mm Led 2 lower limit"
-            android:inputType="numberDecimal" />
-
-        <EditText
-            android:id="@+id/et_2mmled2_ul"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:hint="2mm Led 2 upper limit"
-            android:inputType="numberDecimal" />
-        <EditText
-            android:id="@+id/et_10mmled1_ll"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:hint="10mm Led 1 lower limit"
-            android:inputType="numberDecimal" />
-        <EditText
-            android:id="@+id/et_10mmled1_ul"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:hint="10mm Led 1 upper limit"
-            android:inputType="numberDecimal" />
-        <EditText
-            android:id="@+id/et_10mmled2_ll"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:hint="10mm Led 2 lower limit"
-            android:inputType="numberDecimal" />
-        <EditText
-            android:id="@+id/et_10mmled2_ul"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:hint="10mm Led 2 upper limit"
-            android:inputType="numberDecimal" />
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/btn_submit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:gravity="center"
-        android:text="@string/submit"
-        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/main_ll" />
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:elevation="12dp"
-        android:indeterminate="true"
-        android:indeterminateDrawable="@drawable/progressbar_drawable"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -11,7 +11,6 @@
   ~ // is strictly forbidden unless prior written permission is obtained
   ~ // from ShanMukha Innovations Pvt. Ltd.
   -->
-
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -20,29 +19,28 @@
     android:layout_height="match_parent">
 
 
-    <LinearLayout
+<LinearLayout
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_height="wrap_content">
+    <ImageView
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="20dp"
+        android:src="@drawable/smi_logo"
+        android:contentDescription="@string/smi" />
+    <TextView
+        android:id="@+id/titleText"
         android:layout_width="match_parent"
-        android:orientation="vertical"
+        android:layout_height="wrap_content"
-        android:layout_height="wrap_content">
+        android:text="@string/smi_desp"
-        <ImageView
+        android:layout_marginTop="12dp"
-            android:layout_width="150dp"
+        android:layout_marginEnd="12dp"
-            android:layout_height="150dp"
+        android:layout_marginStart="12dp"
-            android:layout_gravity="center"
+        android:textSize="18sp"
-            android:layout_marginTop="20dp"
+        android:textColor="@color/black"
-            android:src="@drawable/smi_logo"
+        />
-            android:contentDescription="@string/smi" />
-        <TextView
-            android:id="@+id/titleText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/smi_desp"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_marginStart="12dp"
-            android:textSize="18sp"
-            android:textColor="@color/black"
-            />
-
     <TextView
         android:id="@+id/link_click"
         android:clickable="true"
@@ -56,4 +54,4 @@
         android:textColor="@color/red"
         android:focusable="true" />
 </LinearLayout>
-    </ScrollView>
+</ScrollView>

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

@@ -38,9 +38,7 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="24dp"
         android:layout_marginTop="16dp"
-        android:textSize="22sp"
+        android:text="@string/auto_dac"
-        android:textStyle="bold"
-        android:text="@string/calibrate_device"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -65,10 +63,9 @@
         android:layout_marginHorizontal="24dp"
         android:layout_marginTop="16dp"
         android:gravity="center"
-        android:scrollbars="vertical"
         android:text="Start"
         android:textColor="@color/black"
-        android:textSize="14sp"
+        android:textSize="11sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
@@ -82,7 +79,7 @@
         android:layout_marginTop="24dp"
         android:clickable="false"
         android:gravity="center"
-        android:text="@string/calibrate_device"
+        android:text="Start Auto DAC"
         android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -96,7 +93,6 @@
         android:layout_marginTop="24dp"
         android:clickable="false"
         android:gravity="center"
-        android:visibility="gone"
         android:text="Read Current DAC Values"
         android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -38,7 +38,7 @@
         style="@style/title1_1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="100dp"
+        android:layout_marginTop="50dp"
         android:gravity="center"
         android:text="Start"
         android:textColor="@color/black"

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

@@ -81,6 +81,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle4"/>
+
     <Button
         android:id="@+id/btn_submit"
         android:layout_width="wrap_content"
@@ -89,7 +90,7 @@
         android:layout_marginTop="24dp"
         android:clickable="false"
         android:gravity="center"
-        android:text="@string/start"
+        android:text="Start"
         android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -76,7 +76,7 @@
         android:layout_marginHorizontal="16dp"
         android:layout_marginTop="24dp"
         android:clickable="false"
-        android:text="@string/calibrate_device"
+        android:text="@string/auto_dac"
         android:textColor="@color/white"
         app:cornerRadius="16dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -140,32 +140,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btn_deviceInfo" />
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_reset_password"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/reset_password_for_this_device"
-            android:textColor="@color/white"
-            app:cornerRadius="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_update_values"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="Update values"
-            android:textColor="@color/white"
-            app:cornerRadius="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_reset_password" />
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_firefox"
         android:layout_width="match_parent"
@@ -178,7 +152,7 @@
         app:cornerRadius="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_reset_password" />
+        app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_files"

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

@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
-  ~ // Notice: All information contained herein is, and remains
-  ~ // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
-  ~ // if any. The intellectual and technical concepts contained
-  ~ // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
-  ~ // and its suppliers and may be covered by Indian and Foreign Patents,
-  ~ // patents in process, and are protected by trade secret or copyright law.
-  ~ // Dissemination of this information or reproduction of this material
-  ~ // is strictly forbidden unless prior written permission is obtained
-  ~ // from ShanMukha Innovations Pvt. Ltd.
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.example.hpostesting.presentation.autodac.AutoDacFragment">
-
-
-    <!--        <TextView-->
-    <!--            android:id="@+id/tv_title"-->
-    <!--            style="@style/title1"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:layout_marginHorizontal="24dp"-->
-    <!--            android:text="@string/diagnostics"-->
-    <!--            android:layout_marginTop="16dp"-->
-    <!--            app:layout_constraintStart_toStartOf="parent"-->
-    <!--            app:layout_constraintTop_toTopOf="parent" />-->
-
-    <TextView
-        android:id="@+id/tv_subtitle2"
-        style="@style/title2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="16dp"
-        android:textSize="22sp"
-        android:textStyle="bold"
-        android:text="HB Test"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tv_subtitle3"
-        style="@style/title2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
-
-    <TextView
-        android:id="@+id/tv_subtitle4"
-        style="@style/title1_1"
-        android:layout_width="0dp"
-        android:layout_height="320dp"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="16dp"
-        android:gravity="center"
-        android:scrollbars="vertical"
-        android:text="Start"
-        android:textColor="@color/black"
-        android:textSize="14sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
-
-
-    <Button
-        android:id="@+id/btn_buffer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:gravity="center"
-        android:text="Buffer Start"
-        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
-
-    <Button
-        android:id="@+id/btn_sample"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="15dp"
-        android:clickable="false"
-        android:gravity="center"
-        android:visibility="visible"
-        android:text="Sample Start"
-        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_buffer" />
-    <Button
-        android:id="@+id/btn_submit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:gravity="center"
-        android:visibility="gone"
-        android:text="Submit"
-        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_sample" />
-
-    <!--        <Button-->
-    <!--            android:id="@+id/btn_read"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:text="@string/read"-->
-    <!--            android:layout_margin="16dp"-->
-    <!--            android:clickable="false"-->
-    <!--            app:layout_constraintTop_toBottomOf="@id/btn_set_reference"-->
-    <!--            app:layout_constraintStart_toStartOf="parent" />-->
-
-    <!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-    <ImageView
-        android:id="@+id/iv_check"
-        android:visibility="gone"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_marginTop="40dp"
-        android:importantForAccessibility="no"
-        android:src="@drawable/check"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:elevation="12dp"
-        android:indeterminate="true"
-        android:indeterminateDrawable="@drawable/progressbar_drawable"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -16,78 +16,74 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.example.hpostesting.presentation.hemocube.HemoCubeFragment">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_parent"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <Button
-                android:id="@+id/btn_placeRefreshbuffer"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="5dp"
-                android:layout_marginTop="3dp"
-                android:layout_marginEnd="3dp"
-                android:textSize="14sp"
-                android:visibility="gone"
-                android:clickable="false"
-                android:text="Refresh \nbuffer"
-                android:textColor="@color/white"
-                android:backgroundTint="@color/brightGreen"
-                app:cornerRadius="16dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
-            <TextView
-                android:id="@+id/tv_title"
-                style="@style/title1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="16dp"
-                android:text="@string/Instructions"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
+    <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/tv_subtitle2"
+        android:id="@+id/cl_parent"
-                style="@style/title2"
+        android:layout_width="match_parent"
-                android:layout_width="0dp"
+        android:layout_height="match_parent">
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="16dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_title" />
 
-            <TextView
+        <TextView
-                android:id="@+id/tv_name"
+            android:id="@+id/tv_title"
-                style="@style/title2"
+            style="@style/title1"
-                android:layout_width="0dp"
+            android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+            android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
+            android:layout_marginHorizontal="24dp"
-                android:gravity="center"
+            android:layout_marginTop="16dp"
-                android:padding="12dp"
+            android:text="@string/Instructions"
-                android:layout_marginTop="26dp"
+            app:layout_constraintStart_toStartOf="parent"
-                android:textSize="14sp"
+            app:layout_constraintTop_toTopOf="parent" />
-                android:textFontWeight="700"
-                android:text="Name: SMI\n ID: 1672282828"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                tools:ignore="MissingConstraints" />
 
-            <TextView
+        <TextView
-                android:id="@+id/tv_subtitle4"
+            android:id="@+id/tv_subtitle2"
-                style="@style/title1_1"
+            style="@style/title2"
-                android:layout_width="0dp"
+            android:layout_width="0dp"
-                android:layout_height="wrap_content"
+            android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
+            android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="72dp"
+            android:layout_marginTop="16dp"
-                android:gravity="center"
+            app:layout_constraintEnd_toEndOf="parent"
-                android:textColor="@color/red"
+            app:layout_constraintStart_toStartOf="parent"
-                android:textSize="16sp"
+            app:layout_constraintTop_toBottomOf="@id/tv_title" />
-                app:layout_constraintEnd_toEndOf="parent"
+
-                app:layout_constraintStart_toStartOf="parent"
+        <!--        <TextView-->
-                app:layout_constraintTop_toBottomOf="@id/et_abha_id" />
+        <!--            android:id="@+id/tv_subtitle3"-->
+        <!--            style="@style/title2"-->
+        <!--            android:layout_width="0dp"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginHorizontal="24dp"-->
+        <!--            android:layout_marginTop="16dp"-->
+        <!--            android:text="@string/step5"-->
+        <!--            app:layout_constraintEnd_toEndOf="parent"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->
+
+        <TextView
+            android:id="@+id/tv_name"
+            style="@style/title2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="24dp"
+            android:gravity="center"
+            android:padding="12dp"
+            android:layout_marginTop="26dp"
+            android:textFontWeight="700"
+            android:text="Name: SMI\n ID: 1672282828"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:ignore="MissingConstraints" />
+
+        <TextView
+            android:id="@+id/tv_subtitle4"
+            style="@style/title1_1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="24dp"
+            android:layout_marginTop="72dp"
+            android:gravity="center"
+            android:textColor="@color/red"
+            android:textSize="18sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/et_abha_id" />
 
 
         <!--        <Button-->
@@ -250,10 +246,8 @@
             android:gravity="center"
             android:text="no device message"
             android:textColor="@color/black"
-            android:scrollbars="vertical"
             android:textSize="11sp"
-            android:visibility="gone"
+            android:visibility="visible"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ll_btns" />
 
@@ -271,25 +265,14 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/error_message" />
 
-        <pl.droidsonroids.gif.GifImageView
+        <ImageView
-            android:id="@+id/testing"
-            android:visibility="gone"
-            android:layout_width="180dp"
-            android:layout_height="150dp"
-            android:layout_marginTop="10dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/virtual_lab"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_device_messages" />
-        <pl.droidsonroids.gif.GifImageView
             android:id="@+id/iv_check"
             android:visibility="gone"
             android:layout_width="100dp"
             android:layout_height="100dp"
             android:layout_marginTop="40dp"
             android:importantForAccessibility="no"
-            android:src="@drawable/verified"
+            android:src="@drawable/check"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_device_messages" />

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

@@ -48,25 +48,16 @@
         android:id="@+id/internetNotAvailableCL"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="visible"
+        android:visibility="gone"
-        android:padding="20dp">
+        android:padding="24dp">
 
-        <ImageView
-            android:id="@+id/internetIcon"
-            android:layout_width="33dp"
-            android:layout_height="33dp"
-            android:layout_marginEnd="10dp"
-            android:src="@drawable/off"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            />
         <ImageView
             android:id="@+id/btnLogout1"
-            android:layout_width="33dp"
+            android:layout_width="30dp"
-            android:layout_height="33dp"
+            android:layout_height="30dp"
             android:layout_marginEnd="10dp"
             android:src="@drawable/baseline_logout_24"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/internetNotAvailableCL"
             app:layout_constraintEnd_toEndOf="parent"
             />
 
@@ -76,11 +67,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="24dp"
             android:text="@string/internet_not_available_please_enter_the_user_id_manually"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnLogout1"/>
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/til_name"
@@ -99,27 +90,7 @@
                 android:layout_height="wrap_content"
                 android:maxLength="18"
                 android:inputType="textCapCharacters"
-                android:hint="@string/sample_id" />
+                android:hint="@string/user_id" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/til_age"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:layout_marginHorizontal="24dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/til_name">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/age"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLength="2"
-                android:inputType="number"
-                android:hint="@string/age" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -132,7 +103,7 @@
             android:layout_marginTop="24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/til_age">
+            app:layout_constraintTop_toBottomOf="@+id/til_name">
 
             <AutoCompleteTextView
                 android:id="@+id/et_blood_group"
@@ -148,11 +119,7 @@
             android:id="@+id/btn_submit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="54dp"
+            android:layout_margin="24dp"
-            android:layout_marginEnd="54dp"
-            android:layout_marginTop="15dp"
-            android:layout_marginBottom="10dp"
-            android:textColor="@color/white"
             android:text="@string/submit"
             app:cornerRadius="100dp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -163,7 +130,6 @@
             android:id="@+id/rv_order_offline"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:visibility="gone"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -181,30 +147,6 @@
 <!--            android:visibility="gone"-->
 <!--            app:layout_constraintBottom_toBottomOf="@+id/rv_order_offline"-->
 <!--            app:layout_constraintStart_toStartOf="parent" />-->
-        <TextView
-            android:id="@+id/labelQuickCapture"
-            style="@style/title1_1"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/quick_capture"
-            app:layout_constraintBottom_toTopOf="@+id/btnNewKitoffline"
-            app:layout_constraintEnd_toEndOf="parent"
-             />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/btnQuickCapture"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:backgroundTint="@color/primary"
-            android:contentDescription="Capture measurements quickly"
-            android:src="@drawable/flask"
-            app:elevation="1dp"
-            app:layout_constraintBottom_toTopOf="@+id/labelQuickCapture"
-            app:layout_constraintEnd_toEndOf="parent"
-             />
 
         <TextView
             android:id="@+id/label1"
@@ -212,7 +154,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/new_kit"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/btnNewKitoffline"
             app:layout_constraintEnd_toEndOf="parent" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -224,158 +166,184 @@
             android:contentDescription="@string/new_kit"
             android:src="@drawable/ic_add"
             app:elevation="1dp"
-            app:layout_constraintBottom_toTopOf="@+id/label1"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-<!--    <androidx.constraintlayout.widget.ConstraintLayout-->
+    <androidx.constraintlayout.widget.ConstraintLayout
-<!--        android:id="@+id/internetAvailableCL"-->
+        android:id="@+id/internetAvailableCL"
-<!--        android:layout_width="match_parent"-->
+        android:layout_width="match_parent"
-<!--        android:layout_height="match_parent"-->
+        android:layout_height="match_parent"
-<!--        android:visibility="gone"-->
+        android:visibility="visible"
-<!--        android:padding="24dp">-->
+        android:padding="24dp">
 
-<!--        <TextView-->
+        <TextView
-<!--            android:id="@+id/tv_title"-->
+            android:id="@+id/tv_title"
-<!--            style="@style/title1"-->
+            style="@style/title1"
-<!--            android:layout_width="wrap_content"-->
+            android:layout_width="wrap_content"
-<!--            android:layout_height="wrap_content"-->
+            android:layout_height="wrap_content"
-<!--            android:text="@string/user_list"-->
+            android:text="@string/user_list"
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
+            app:layout_constraintEnd_toEndOf="parent"
-<!--            app:layout_constraintStart_toStartOf="parent"-->
+            app:layout_constraintStart_toStartOf="parent"
-<!--            app:layout_constraintTop_toTopOf="parent" />-->
+            app:layout_constraintTop_toTopOf="parent" />
 
-<!--        <ImageView-->
+        <ImageView
-<!--            android:id="@+id/uploadData"-->
+            android:id="@+id/uploadData"
-<!--            android:layout_width="50dp"-->
+            android:layout_width="50dp"
-<!--            android:layout_height="50dp"-->
+            android:layout_height="50dp"
-<!--            android:src="@drawable/upload_data"-->
+            android:src="@drawable/upload_data"
-<!--            android:visibility="gone"-->
+            android:visibility="gone"
-<!--            app:layout_constraintBottom_toBottomOf="@+id/tv_title"-->
+            app:layout_constraintBottom_toBottomOf="@+id/tv_title"
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
+            app:layout_constraintEnd_toEndOf="parent"
-<!--            app:layout_constraintTop_toTopOf="@+id/tv_title" />-->
+            app:layout_constraintTop_toTopOf="@+id/tv_title" />
-<!--        <ImageView-->
+        <ImageView
-<!--            android:id="@+id/btnLogout"-->
+            android:id="@+id/btnLogout"
-<!--            android:layout_width="30dp"-->
+            android:layout_width="30dp"
-<!--            android:layout_height="30dp"-->
+            android:layout_height="30dp"
-<!--            android:layout_marginEnd="10dp"-->
+            android:layout_marginEnd="10dp"
-<!--            android:src="@drawable/baseline_logout_24"-->
+            android:src="@drawable/baseline_logout_24"
-<!--            app:layout_constraintBottom_toBottomOf="@+id/tv_title"-->
+            app:layout_constraintBottom_toBottomOf="@+id/tv_title"
-<!--            app:layout_constraintEnd_toStartOf="@+id/uploadData"-->
+            app:layout_constraintEnd_toStartOf="@+id/uploadData"
-<!--            app:layout_constraintTop_toTopOf="@+id/tv_title" />-->
+            app:layout_constraintTop_toTopOf="@+id/tv_title" />
 
-<!--        <TextView-->
+        <TextView
-<!--            android:id="@+id/tv_not_available"-->
+            android:id="@+id/tv_not_available"
-<!--            style="@style/title1_1"-->
+            style="@style/title1_1"
-<!--            android:layout_width="0dp"-->
+            android:layout_width="0dp"
-<!--            android:layout_height="wrap_content"-->
+            android:layout_height="wrap_content"
-<!--            android:layout_marginHorizontal="16dp"-->
+            android:layout_marginHorizontal="16dp"
-<!--            android:layout_marginTop="56dp"-->
+            android:layout_marginTop="56dp"
-<!--            android:text="@string/no_patient_records_found_to_test_please_add_one_from_below"-->
+            android:text="@string/no_patient_records_found_to_test_please_add_one_from_below"
-<!--            android:textAlignment="center"-->
+            android:textAlignment="center"
-<!--            android:visibility="gone"-->
+            android:visibility="gone"
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
+            app:layout_constraintEnd_toEndOf="parent"
-<!--            app:layout_constraintStart_toStartOf="parent"-->
+            app:layout_constraintStart_toStartOf="parent"
-<!--            app:layout_constraintTop_toBottomOf="@id/tv_title" />-->
+            app:layout_constraintTop_toBottomOf="@id/tv_title" />
 
-<!--        <androidx.cardview.widget.CardView-->
+        <androidx.cardview.widget.CardView
-<!--            android:id="@+id/cardView4"-->
+            android:id="@+id/cardView4"
-<!--            android:layout_width="match_parent"-->
+            android:layout_width="match_parent"
-<!--            android:layout_height="wrap_content"-->
+            android:layout_height="wrap_content"
-<!--            app:cardElevation="0dp"-->
+            app:cardElevation="0dp"
-<!--            app:layout_constraintTop_toBottomOf="@+id/tv_title"-->
+            app:layout_constraintTop_toBottomOf="@+id/tv_title"
-<!--            tools:layout_editor_absoluteX="24dp">-->
+            tools:layout_editor_absoluteX="24dp">
 
-<!--            <androidx.constraintlayout.widget.ConstraintLayout-->
+            <androidx.constraintlayout.widget.ConstraintLayout
-<!--                android:layout_width="match_parent"-->
+                android:layout_width="match_parent"
-<!--                android:layout_height="match_parent">-->
+                android:layout_height="match_parent">
 
-<!--                <androidx.appcompat.widget.SearchView-->
+                <androidx.appcompat.widget.SearchView
-<!--                    android:id="@+id/search_product"-->
+                    android:id="@+id/search_product"
-<!--                    android:layout_width="match_parent"-->
+                    android:layout_width="match_parent"
-<!--                    android:layout_height="wrap_content"-->
+                    android:layout_height="wrap_content"
-<!--                    android:layout_margin="10dp"-->
+                    android:layout_margin="10dp"
-<!--                    android:background="@drawable/edit_text_background"-->
+                    android:background="@drawable/edit_text_background"
-<!--                    android:inputType="text"-->
+                    android:inputType="text"
-<!--                    app:iconifiedByDefault="false"-->
+                    app:iconifiedByDefault="false"
-<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
+                    app:layout_constraintBottom_toBottomOf="parent"
-<!--                    app:layout_constraintEnd_toEndOf="parent"-->
+                    app:layout_constraintEnd_toEndOf="parent"
-<!--                    app:layout_constraintStart_toStartOf="parent"-->
+                    app:layout_constraintStart_toStartOf="parent"
-<!--                    app:layout_constraintTop_toTopOf="parent" />-->
+                    app:layout_constraintTop_toTopOf="parent" />
 
-<!--                <requestFocus />-->
+                <requestFocus />
 
-<!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-<!--        </androidx.cardview.widget.CardView>-->
+        </androidx.cardview.widget.CardView>
 
-<!--        <RadioGroup-->
+        <RadioGroup
-<!--            android:id="@+id/radioGroup"-->
+            android:id="@+id/radioGroup"
-<!--            android:layout_width="0dp"-->
+            android:layout_width="0dp"
-<!--            android:orientation="horizontal"-->
+            android:orientation="horizontal"
-<!--            android:layout_height="wrap_content"-->
+            android:layout_height="wrap_content"
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
+            app:layout_constraintEnd_toEndOf="parent"
-<!--            app:layout_constraintStart_toStartOf="parent"-->
+            app:layout_constraintStart_toStartOf="parent"
-<!--            app:layout_constraintTop_toBottomOf="@+id/cardView4">-->
+            app:layout_constraintTop_toBottomOf="@+id/cardView4">
 
-<!--            <RadioButton-->
+            <RadioButton
-<!--                android:id="@+id/userIdRadioButton"-->
+                android:id="@+id/userIdRadioButton"
-<!--                android:layout_width="wrap_content"-->
+                android:layout_width="wrap_content"
-<!--                android:layout_height="wrap_content"-->
+                android:layout_height="wrap_content"
-<!--                android:checked="true"-->
+                android:checked="true"
-<!--                android:text="@string/user_id" />-->
+                android:text="@string/user_id" />
 
-<!--            <RadioButton-->
+            <RadioButton
-<!--                android:id="@+id/abhaIdRadioButton"-->
+                android:id="@+id/abhaIdRadioButton"
-<!--                android:layout_width="wrap_content"-->
+                android:layout_width="wrap_content"
-<!--                android:layout_height="wrap_content"-->
+                android:layout_height="wrap_content"
-<!--                android:text="@string/abha_id"-->
+                android:text="@string/abha_id"
-<!--                app:layout_constraintTop_toBottomOf="@id/userIdRadioButton" />-->
+                app:layout_constraintTop_toBottomOf="@id/userIdRadioButton" />
 
-<!--            <RadioButton-->
+            <RadioButton
-<!--                android:id="@+id/aadharIdRadioButton"-->
+                android:id="@+id/aadharIdRadioButton"
-<!--                android:layout_width="wrap_content"-->
+                android:layout_width="wrap_content"
-<!--                android:layout_height="wrap_content"-->
+                android:layout_height="wrap_content"
-<!--                android:text="@string/aadhar_id"-->
+                android:text="@string/aadhar_id"
-<!--                app:layout_constraintTop_toBottomOf="@id/abhaIdRadioButton" />-->
+                app:layout_constraintTop_toBottomOf="@id/abhaIdRadioButton" />
 
-<!--        </RadioGroup>-->
+        </RadioGroup>
 
-<!--        <androidx.recyclerview.widget.RecyclerView-->
+        <androidx.recyclerview.widget.RecyclerView
-<!--            android:id="@+id/rv_order"-->
+            android:id="@+id/rv_order"
-<!--            android:layout_width="0dp"-->
+            android:layout_width="0dp"
-<!--            android:layout_height="0dp"-->
+            android:layout_height="0dp"
-<!--            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"-->
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-<!--            app:layout_constraintBottom_toBottomOf="parent"-->
+            app:layout_constraintBottom_toBottomOf="parent"
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
+            app:layout_constraintEnd_toEndOf="parent"
-<!--            app:layout_constraintStart_toStartOf="parent"-->
+            app:layout_constraintStart_toStartOf="parent"
-<!--            app:layout_constraintTop_toBottomOf="@+id/radioGroup"-->
+            app:layout_constraintTop_toBottomOf="@+id/radioGroup"
-<!--            tools:listitem="@layout/user_item_view"/>-->
+            tools:listitem="@layout/user_item_view"/>
-
-<!--        <TextView-->
-<!--            android:id="@+id/label"-->
-<!--            style="@style/title1_1"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:text="@string/new_kit"-->
-<!--            app:layout_constraintBottom_toTopOf="@+id/btnNewKit"-->
-<!--            app:layout_constraintEnd_toEndOf="parent" />-->
-
-<!--        <com.google.android.material.floatingactionbutton.FloatingActionButton-->
-<!--            android:id="@+id/btnNewKit"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_margin="8dp"-->
-<!--            android:backgroundTint="@color/primary"-->
-<!--            android:contentDescription="@string/new_kit"-->
-<!--            android:src="@drawable/ic_add"-->
-<!--            app:elevation="1dp"-->
-<!--            app:layout_constraintBottom_toBottomOf="parent"-->
-<!--            app:layout_constraintEnd_toEndOf="parent" />-->
 
 
-<!--    </androidx.constraintlayout.widget.ConstraintLayout>-->
+        <TextView
+            android:id="@+id/labelQuickCapture"
+            style="@style/title1_1"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Quick Capture"
+            app:layout_constraintBottom_toTopOf="@+id/btnQuickCapture"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/btnQuickCapture"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:backgroundTint="@color/primary"
+            android:contentDescription="Capture measurements quickly"
+            android:src="@drawable/flask"
+            app:elevation="1dp"
+            app:layout_constraintBottom_toTopOf="@+id/label"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+
+        <TextView
+            android:id="@+id/label"
+            style="@style/title1_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/new_kit"
+            app:layout_constraintBottom_toTopOf="@+id/btnNewKit"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/btnNewKit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:backgroundTint="@color/primary"
+            android:contentDescription="@string/new_kit"
+            android:src="@drawable/ic_add"
+            app:elevation="1dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -76,7 +76,6 @@
         android:textColor="@color/black"
         app:backgroundTint="@color/blue_app_light"
         app:cornerRadius="100dp"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_title" />
 
@@ -104,9 +103,9 @@
         android:clickable="false"
         android:gravity="center"
         android:text="Refresh"
-        android:textColor="@color/white"
         android:visibility="visible"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:textColor="@color/white"
+        app:layout_constraintEnd_toEndOf="@id/btn_scan_now"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btn_scan_now" />
 

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

@@ -60,7 +60,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/tv_title" />
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/et_login"
+                android:id="@+id/et_aadharID"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -77,25 +77,7 @@
                     android:inputType="textCapCharacters"
                     android:maxLength="13" />
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/til_name"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/et_login">
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/et_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:maxLength="24"
-                    android:hint="Device user name" />
-
-            </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/et_centerName"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
@@ -104,44 +86,7 @@
                 android:layout_marginTop="16dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_name">
+                app:layout_constraintTop_toBottomOf="@id/et_aadharID">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/centerName"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:maxLength="24"
-                    android:hint="Center name"
-                    android:inputType="text" />
-            </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/til_district"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/et_centerName">
-
-                <AutoCompleteTextView
-                    android:id="@+id/et_district"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/district"
-                    android:inputType="none"
-                     />
-
-            </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/et_password"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_district">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/password"
@@ -159,10 +104,9 @@
                 android:layout_marginTop="16dp"
                 android:text="@string/login"
                 app:cornerRadius="16dp"
-                android:textColor="@color/white"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/et_password" />
+                app:layout_constraintTop_toBottomOf="@+id/et_centerName" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

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

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

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

@@ -55,57 +55,12 @@
         app:layout_constraintStart_toEndOf="@id/lab_name"
         app:layout_constraintTop_toTopOf="@id/lab_name" />
 
-        <TextView
-            android:id="@+id/title_cuvette"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="@string/select_cuvette_size"
-            android:textColor="@color/black"
-            android:textStyle="bold"
-            android:textSize="18sp"
-            app:layout_constraintTop_toBottomOf="@id/lab_name"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="30dp"/>
-        <Spinner
-            android:id="@+id/spinnerCuvette"
-            android:layout_width="wrap_content"
-            android:layout_height="60dp"
-            android:layout_centerInParent="true"
-            app:layout_constraintTop_toBottomOf="@id/title_cuvette"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginTop="8dp"
-            android:layout_marginStart="30dp"
-            />
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_add_size"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="24dp"
-            android:text="@string/add"
-            app:cornerRadius="16dp"
-            app:layout_constraintBottom_toBottomOf="@id/spinnerCuvette"
-            app:layout_constraintStart_toEndOf="@id/spinnerCuvette"
-            app:layout_constraintTop_toTopOf="@id/spinnerCuvette" />
-        <TextView
-            android:id="@+id/last_updated"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="Last"
-            android:textColor="@color/black"
-            android:textSize="17sp"
-            app:layout_constraintTop_toBottomOf="@id/btn_add_size"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="30dp"/>
 
         <FrameLayout
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@+id/last_updated"
+            app:layout_constraintTop_toBottomOf="@+id/lab_name"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:layout_marginTop="10dp"/>

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

@@ -50,7 +50,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:hint="@string/commands"
+            android:hint="commands"
             android:layout_alignParentStart="true"
             android:imeOptions="actionDone"
             android:textSize="18sp"

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

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- RadioGroup to select servers -->
-    <RadioGroup
-        android:id="@+id/radioGroupServers"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:orientation="vertical">
-
-        <!-- Radio Buttons for each server option -->
-        <RadioButton
-            android:id="@+id/radioButtonInternal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Internal" />
-
-        <RadioButton
-            android:id="@+id/radioButtonClinical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Clinical" />
-
-        <RadioButton
-            android:id="@+id/radioButtonCustomer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Customer" />
-
-    </RadioGroup>
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values-hi/arrays.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
-  ~ // Notice: All information contained herein is, and remains
-  ~ // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
-  ~ // if any. The intellectual and technical concepts contained
-  ~ // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
-  ~ // and its suppliers and may be covered by Indian and Foreign Patents,
-  ~ // patents in process, and are protected by trade secret or copyright law.
-  ~ // Dissemination of this information or reproduction of this material
-  ~ // is strictly forbidden unless prior written permission is obtained
-  ~ // from ShanMukha Innovations Pvt. Ltd.
-  -->
-
-<resources>
-    <string-array name="district">
-        <item>Mysuru</item>
-        <item>Kodagu</item>
-        <item>Chamarajanagar</item>
-        <item>Other</item>
-    </string-array>
-</resources>

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

@@ -38,7 +38,6 @@
     </string-array>
 
     <string-array name="blood_group">
-        <item>Unknown</item>
         <item>O+ve</item>
         <item>O-ve</item>
         <item>A+ve</item>
@@ -195,7 +194,7 @@
     <string name="set_baseline_reference_again">क्या फिर से आधार लाइन सेट करना है?</string>
     <string name="baseline_instruction">आधार निर्देश</string>
     <string name="to_be_launched_in_next_version_of_the_app">अगले संस्करण में लॉन्च किया जाएगा</string>
-    <string name="invalid_kit">अमान्य किट सीरियल नंबर</string>
+    <string name="invalid_kit">अमान्य किट सीरियल नंबर, सही उदाहरण, SMI/SC/019/01/001</string>
     <string name="user_list">उपयोगकर्ता सूची</string>
     <string name="user_id">उपयोगकर्ता आईडी</string>
     <string name="aadhar_id">आधार आईडी</string>
@@ -296,16 +295,7 @@
     <string name="lab_name">Lab Name</string>
     <string name="menu_about">About</string>
     <string name="action_about">About</string>
+    <string name="smi_desp">ShanMukha Innovations is a spin-off from Indian Institute of Science, Bangalore. Incorporated in 2016, the company has been delivering innovative Made in India first of its kind deep technology-based products in healthcare.\n\nNotable solutions include Mobile Infection Testing and Reporting Labs (MITR Labs), portable thermal cycler (PolyCube).\n\nThe company launched Sicklecert ®, India’s first CDSCO approved indigenous diagnostic test for sickle-cell anemia.\n\nOur customers include government, non-profit and private sector companies. Leading research institutes such as IISc, IIT Tirupati have engaged us for unique projects. We take pride in supporting Indian and global customers with world-class products.</string>
     <string name="smi">SMI</string>
-    <string name="smi_desp"><b>ShanMukha Innovations</b> is a spin-off from Indian Institute of Science, Bangalore. Incorporated in 2016, the company has been delivering innovative Made in India first of its kind deep technology-based products in healthcare.\\n\\nNotable solutions include Mobile Infection Testing and Reporting Labs (MITR Labs), portable thermal cycler (PolyCube).\\n\\nThe company launched Sicklecert ®, India’s first CDSCO approved indigenous diagnostic test for sickle-cell anemia.\\n\\nOur customers include government, non-profit and private sector companies. Leading research institutes such as IISc, IIT Tirupati have engaged us for unique projects. We take pride in supporting Indian and global customers with world-class products.</string>
     <string name="learn_more">Visit to learn more: <u>sminnovations.in</u></string>
-    <string name="commands">Commands</string>
-    <string name="select_cuvette_size">Select Cuvette Size</string>
-    <string name="sample_id">Sample Id</string>
-    <string name="quick_capture">Quick Capture</string>
-    <string name="reset_password_for_this_device">Reset password for this device</string>
-    <string name="calibrate_device">Calibrate the device</string>
-    <string name="cuvette_presentt">Cuvette Present , Please Remove Cuvette And Try Again</string>
-    <string name="cuvette_absentt">Cuvette Absent,Now You Can Submit</string>
-
 </resources>

app/src/main/res/values-kn/arrays.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
-  ~ // Notice: All information contained herein is, and remains
-  ~ // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
-  ~ // if any. The intellectual and technical concepts contained
-  ~ // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
-  ~ // and its suppliers and may be covered by Indian and Foreign Patents,
-  ~ // patents in process, and are protected by trade secret or copyright law.
-  ~ // Dissemination of this information or reproduction of this material
-  ~ // is strictly forbidden unless prior written permission is obtained
-  ~ // from ShanMukha Innovations Pvt. Ltd.
-  -->
-
-<resources>
-    <string-array name="district">
-        <item>Mysuru</item>
-        <item>Kodagu</item>
-        <item>Chamarajanagar</item>
-        <item>Other</item>
-    </string-array>
-</resources>

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

@@ -39,7 +39,6 @@
     </string-array>
 
     <string-array name="blood_group">
-        <item>Unknown</item>
         <item>O+ve</item>
         <item>O-ve</item>
         <item>A+ve</item>
@@ -93,7 +92,7 @@
     <string name="name_error">ಹೆಸರು ಖಾಲಿ ಇರಬಾರದು</string>
     <string name="age_error">ವಯಸ್ಸು ಖಾಲಿ ಇರಬಾರದು</string>
     <string name="gender_error">ಲಿಂಗ ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="age_error_out_of_bound">ವಯಸ್ಸು ಅರ್ಹವಾಗಿಲ್ಲ</string>
+    <string name="age_error_out_of_bound">ವಯಸ್ಸು ಯಾವುದೇ ಸಾಧ್ಯವಿಲ್ಲ</string>
     <string name="yob_error">ಹುಟ್ಟಿದ ವರ್ಷ ಖಾಲಿ ಇರಬಾರದು</string>
     <string name="yob_error_2">ಅಮಾನ್ಯ ಹುಟ್ಟಿದ ವರ್ಷ</string>
     <string name="mobile_error">ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಖಾಲಿ ಇರಬಾರದು</string>
@@ -111,31 +110,31 @@
     <string name="start_now">ಈಗ ಪ್ರಾರಂಭಿಸಿ</string>
     <string name="hemo_cube">ಹೆಮೋ ಕ್ಯೂಬ್</string>
     <string name="hb">ಹೆಮೊಗ್ಲೊಬಿನ್</string>
-    <string name="normal">ನಾರ್ಮಲ್</string>
+    <string name="normal">ಸಾಮಾನ್ಯ</string>
-    <string name="sickle_cell_disease">ಸಿಕಲ್ ಸೆಲ್ ಡಿಸೀಸ್</string>
+    <string name="sickle_cell_disease">ಸಿಕ್ಲ್ ಸೆಲ್ ರೋಗ</string>
-    <string name="sickle_cell_trait">ಸಿಕಲ್ ಸೆಲ್ ಟ್ರೈಟ್</string>
+    <string name="sickle_cell_trait">ಸಿಕ್ಲ್ ಸೆಲ್ ಗುಣ</string>
-    <string name="undefined">ನಿಕೃಷ್ಟವಾಗಿ ಹೇಳದಿರುವ\ \ </string>
+    <string name="undefined">ಅವ್ಯಾಖ್ಯಾತ\ \ </string>
-    <string name="sicklecell_nconfirmatory">ಕುಡಗೋಲು ಕಣ ರಕ್ತಹೀನತೆ ದೃಢೀಕರಣ</string>
+    <string name="sicklecell_nconfirmatory">ಸಿಕ್ಲ್‌ಸೆಲ್\nದೃಢೀಕರಣ</string>
     <string name="sicklecell_screening">ಸಿಕ್ಲ್ ಸೆಲ್ ಸ್ಕ್ರೀನಿಂಗ್</string>
     <string name="thalassemia">ಥ್ಯಾಲಸೀಮಿಯಾ</string>
     <string name="usb_connection">USB ಕನೆಕ್ಷನ್</string>
-    <string name="high_performance_optical_spectroscopy">ಹೈ ಪರ್ಫಾರ್ಮೆನ್ಸ್ ಆಪ್ಟಿಕಲ್ ಸ್ಪೆಕ್ಟ್ರೋಸ್ಕೋಪಿ</string>
+    <string name="high_performance_optical_spectroscopy">ಹೈ ಪರಫಾರ್ಮೆನ್ಸ್\nಆಪ್ಟಿಕಲ್ ಸ್ಪೆಕ್ಟ್ರೋಸ್ಕೊಪಿ</string>
-    <string name="sickle_cert">ಸಿಕಲ್ ಸರ್ಟ್</string>
+    <string name="sickle_cert">ಸಿಕ್ಲ್ ಸರ್ಟಿಫಿಕೇಟ್</string>
-    <string name="sickle_find">ಸಿಕಲ್ ಫೈಂಡ್</string>
+    <string name="sickle_find">ಸಿಕ್ಲ್ ಹುಡುಕಿ</string>
     <string name="submit">ಸಲ್ಲಿಸಿ</string>
-    <string name="diagnostics"> ಡಯಗ್ನೊಸ್ಟಿಕ್</string>
+    <string name="diagnostics">ಡೆವೈಸ್ ಟೆಸ್ಟ್</string>
     <string name="auto_dac">Auto DAC</string>
     <string name="assurance_controls">Quality Controls</string>
     <string name="calibration">Calibration</string>
-    <string name="deviceProvision">ಡಿವೈಸ್  ಪೂರ್ವಸಿದ್ಧತೆ</string>
+    <string name="deviceProvision">Device Provision</string>
-    <string name="place_buffer">ಬಫರ್ ಪ್ರಾರಂಭಿಸಿ</string>
+    <string name="place_buffer">ಪ್ರಾರಂಭಿಸಿ</string>
     <string name="Start_Sample">ನಮೂನೆ ಪ್ರಾರಂಭಿಸಿ</string>
     <string name="new_kit">ಹೊಸ ಕಿಟ್</string>
     <string name="new_buffer">ಹೊಸ ಬಫರ್</string>
     <string name="name_error_2">ಅಮಾನ್ಯ ಅಕ್ಷರ, ಅನುಮತವಾದ ಅಕ್ಷರಗಳು ಅಕ್ಷರಗಳು, ಸಂಖ್ಯೆಗಳು ಮತ್ತು ( ) _ - , . ಮಾತ್ರ</string>
     <string name="recommended">\*ಫಲಿತಾಂಶವನ್ನು ಪ್ರಯೋಗಶಾಲೆಯ ಪರೀಕ್ಷಾದಿಂದ ದೃಢೀಕರಿಸಬೇಕು</string>
     <string name="recommended_age">\*ಫಲಿತಾಂಶವನ್ನು ಪ್ರಯೋಗಶಾಲೆಯ ಪರೀಕ್ಷಾದಿಂದ ದೃಢೀಕರಿಸಬೇಕು ಏಕೆಂದರೆ ರೋಗಿಯ ವಯಸ್ಸು 5 ವರ್ಷಗಳಿಗಿಂತ ಕಡಿಮೆ</string>
-    <string name="positive_borderline">ಪಾಸಿಟಿವ್ ಬಾರ್ಡರ್‌ಲೈನ್</string>
+    <string name="positive_borderline">ಧನಸ್ಪರ್ಶ</string>
     <string name="negative_borderline">ನೆಗೆಟಿವ್ ಬಾರ್ಡರ್‌ಲೈನ್</string>
     <string name="is_patient_under_any_medication">ರೋಗಿ ಯಾವುದೇ ಔಷಧಿ ಅಥವಾ ಚಿಕಿತ್ಸೆಯಲ್ಲಿದ್ದಾನೆಯೇ?</string>
     <string name="is_patient_undergoing_any_blood_transfusion">ರೋಗಿಗೆ ರಕ್ತ ಪ್ರವಾಹನೆ ನಡೆಯುತ್ತಿದೆಯೇ?</string>
@@ -182,131 +181,122 @@
     <string name="threedots">...</string>
     <string name="create_abha_id_card">ABHA ಐಡಿ ಕಾರ್ಡ್ ರಚಿಸಿ</string>
     <string name="official_abha_app">ಆಧಿಕಾರಿ ABHA ಆಪ್</string>
-    <string name="scan_patient_aadhaar_card">ವ್ಯಕ್ತಿಯ ಆಧಾರ್ ಕಾರ್ಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
+    <string name="scan_patient_aadhaar_card">ರೋಗಿ ಆಧಾರ್ ಕಾರ್ಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
     <string name="enter_aadhaar_number_manualy">ಆಧಾರ್ ಸಂಖ್ಯೆಯನ್ನು ಕೈಯಿಂದ ನಮೂದಿಸಿ</string>
     <string name="aadhaar_number">ಆಧಾರ್ ಸಂಖ್ಯೆ</string>
     <string name="aadhaar_in_tv"><b>ಆಧಾರ್ ಸಂಖ್ಯೆ</b></string>
-    <string name="please_use_official_abha_app_to_create_abha_id_and_come_back">ದಯವಿಟ್ಟು ಅಧಿಕೃತ ABHA ಆಪ್ ಅನ್ನು ಬಳಸಿ ABHA ಐಡಿ ರಚಿಸಿ ಮತ್ತೆ ಹಿಂತಿರುಗಿ ಬನ್ನಿ.</string>
+    <string name="please_use_official_abha_app_to_create_abha_id_and_come_back">ದಯವಿಟ್ಟು "ಆಧಿಕಾರಿ ABHA ಆಪ್" ಅನ್ನು ಬಳಸಿ ABHA ಐಡಿ ರಚಿಸಿ ಮತ್ತು ಹಿಂತಿರುಗಿ ಬನ್ನಿ.</string>
     <string name="please_enter_aadhaar">ಮುಂದುವರಿಸಲು ದಯವಿಟ್ಟು ಆಧಾರ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ</string>
     <string name="scan_qr_code_of_the_kit">ಕಿಟ್‌ನ ಕ್ಯೂಆರ್ ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
     <string name="enter_kit_serial_number_manually">ಕಿಟ್ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಯನ್ನು ಕೈಯಿಂದ ನಮೂದಿಸಿ</string>
     <string name="serial_number">ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ</string>
-    <string name="set_baseline_reference_again">ಬೇಸ್‌ಲೈನ್ ಉಲ್ಲೇಖವನ್ನು ಮತ್ತೆ ಸೆಟ್ ಮಾಡಿ </string>
+    <string name="set_baseline_reference_again">ಬೇಸ್ಲೈನ್/ಸಂದರ್ಭ ಹೊಂದಿಸಿರಾ?</string>
     <string name="baseline_instruction">ಬೇಸ್ಲೈನ್ ನಿರ್ದೇಶನ</string>
     <string name="to_be_launched_in_next_version_of_the_app">ಮುಂದಿನ ಆಪ್ ಆವೃತ್ತಿಯಲ್ಲಿ ಪ್ರಕಟಿಸಲಾಗಿದೆ</string>
-    <string name="invalid_kit">ಅಮಾನ್ಯ ಕಿಟ್ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ</string>
+    <string name="invalid_kit">ಅಮಾನ್ಯ ಕಿಟ್ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ, ಶರಿಯಾದ ಉದಾಹರಣೆ, SMI/SC/019/01/001</string>
     <string name="user_list">ಬಳಕೆದಾರ ಪಟ್ಟಿ</string>
     <string name="user_id">ಬಳಕೆದಾರ ಐಡಿ</string>
     <string name="aadhar_id">ಆಧಾರ್ ಐಡಿ</string>
-    <string name="internet_not_available_please_enter_the_user_id_manually">ಇಂಟರ್ನೆಟ್ ಇಲ್ಲ. ದಯವಿಟ್ಟು ಬಳಕೆದಾರ ಐಡಿ ಮತ್ತು ರಕ್ತ ಗುಂಪುವನ್ನು ಕೈಯಿಂದ ನಮೂದಿಸಿ</string>
+    <string name="internet_not_available_please_enter_the_user_id_manually">ಇಂಟರ್ನೆಟ್ ಇಲ್ಲದೆ, ದಯವಿಟ್ಟು ಬಳಕೆದಾರ ಐಡಿ ಮತ್ತು ರಕ್ತ ಗುಂಪುವನ್ನು ಕೈಯಿಂದ ನಮೂದಿಸಿ</string>
     <string name="user_id_error_message">ಬಳಕೆದಾರ ಐಡಿ 18 ಅಂಕಗಳಿರಬೇಕು ಮತ್ತು ದಯವಿಟ್ಟು ರಕ್ತ ಗುಂಪುವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
-    <string name="upload_db_registration_title">ನೀವು ಸ್ಥಳೀಯ ಡೇಟಾ ಬೇಸ್ ಅನ್ನು  ಟೆಸ್ಟ್ ಗಳನ್ನು ಅಪ್ಲೋಡ್ ಮಾಡಿ</string>
+    <string name="upload_db_registration_title">ಸ್ಥಾನಿಕ DB ಪರೀಕ್ಷೆಗಳನ್ನು ಅಪ್ಲೋಡ್ ಮಾಡಿ</string>
-    <string name="upload_db_registration_message">ನೀವು  ಪರೀಕ್ಷೆಗಳನ್ನು ಕ್ಲೌಡ್‌ಗೆ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಬಯಸುತ್ತೀರಾ?</string>
+    <string name="upload_db_registration_message">ನೀವು ಸ್ಥಾನಿಕ DB ಪರೀಕ್ಷೆಗಳನ್ನು ಕ್ಲೌಡ್‌ಗೆ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಬಯಸುತ್ತೀರಾ?</string>
     <string name="download_db_registration_title">ಡೌನ್ಲೋಡ್ ಡಿಬಿ ಟೆಸ್ಟ್‌ಗಳು</string>
-    <string name="download_db_registration_message">ನೀವು ಸ್ಥಳೀಯ ಡೇಟಾ ಬೇಸ್ ಅನ್ನು  ಟೆಸ್ಟ್ ಗಳನ್ನು ಕ್ಲೌಡ್‌ಗೆ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಬಯಸುತ್ತೀರಾ?</string>
+    <string name="download_db_registration_message">ನೀವು ಲೋಕಲ್ ಡಿಬಿ ಟೆಸ್ಟ್‌ಗಳನ್ನು CSV ಆಕರದಲ್ಲಿ ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಬಯಸುತ್ತೀರಾ?</string>
     <string name="upload">ಅಪ್ಲೋಡ್ ಮಾಡಿ</string>
     <string name="cancel">ರದ್ದು ಮಾಡಿ</string>
     <string name="upload_success_message">ಯಶಸ್ವಿಯಾಗಿ ಅಪ್ಲೋಡ್ ಮಾಡಲಾಗಿದೆ</string>
     <string name="test_completed">ಪರೀಕ್ಷೆ ಮುಗಿಯಿತು</string>
     <string name="select_blood_group">ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ</string>
     <string name="all_registered_user_are_tested_successfully">ಎಲ್ಲಾ ನೋಂದಣಿಗೆ ಬಂದ ಬಳಕೆದಾರರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಪರೀಕ್ಷಿಸಲಾಗಿದೆ</string>
-    <string name="start_incubation">ಇನ್ಕ್ಯುಬೇಷನ್ ಪ್ರಾರಂಭಿಸಿ</string>
+    <string name="start_incubation">ಇನ್ಕ್ಯೂಬೇಶನ್ ಆರಂಭ</string>
     <string name="check_buffer">ಬಫರ್ ಚೆಕ್ ಮಾಡಿ</string>
     <!-- Kannada Translations -->
-    <string name="low_battery_warning">ಬ್ಯಾಟರಿ ಸ್ತರ 40% ಕ್ಕಿಂತ ಕಡಿಮೆಯಾಗಿದೆ, ಟೆಸ್ಟ್ ಮುಂದುವರಿಸಲು ದಯವಿಟ್ಟು  ಡಿವೈಸ  ಚಾರ್ಜ್ ಮಾಡಿ</string>
+    <string name="low_battery_warning">ಬ್ಯಾಟರಿ ಸ್ತರ 40% ಕ್ಕಿಂತ ಕಡಿಮೆಯಾಗಿದೆ, ದಯವಿಟ್ಟು ಸಾಧನವನ್ನು ಮುಂದುವರಿಸಲು ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡಿ</string>
-    <string name="test_already_conducted">ಈ ಬಳಕೆದಾರನ ಮೇಲೆ ಟೆಸ್ಟ್  ಮುಗಿದಿದೆ </string>
+    <string name="test_already_conducted">ಈ ಬಳಕೆದಾರನ ಮೇಲೆ ಪರೀಕ್ಷೆ ಇನ್ನು ಮುಗಿದಿದೆ</string>
-    <string name="incubation_not_completed">15 ನಿಮಿಷಗಳ ಇನ್ಕ್ಯೂಬೇಷನ್ ಇನ್ನು   ಪೂರ್ತಿ ಆಗಿಲ್ಲ್ಲ</string>
+    <string name="incubation_not_completed">ಇನ್ಕ್ಯೂಬೇಷನ್ ಹತ್ತಿಲ್ಲ 15 ನಿಮಿಷಗಳ ಪೂರ್ತಿ ಆಗಿಲ್ಲ</string>
     <string name="incubation_crossed_30_minutes">ಇನ್ಕ್ಯೂಬೇಷನ್ 30 ನಿಮಿಷಗಳನ್ನು ದಾಟಿದೆ, ಇನ್ನೊಮ್ಮೆ ಇನ್ಕ್ಯೂಬೇಷನ್ ಮಾಡಬೇಕಾಗಿದೆ</string>
-    <string name="incubation_not_started">ಈ ಟೆಸ್ಟ್ ಸ್ಯಾಂಪಲ್ ಇನ್ಕ್ಯುಬೇಷನ್ ಇನ್ನು ಆರಂಭವಾಗಿಲ್ಲ</string>
+    <string name="incubation_not_started">ಈ ಬಳಕೆದಾರನ ಮೇಲೆ ಇನ್ಕ್ಯೂಬೇಷನ್ ಆರಂಭವಾಗಿಲ್ಲ</string>
-    <string name="test_concluded">ಟೆಸ್ಟ್  ಮುಕ್ತಯವಾಗಿದೆ</string>
+    <string name="test_concluded">ಪರೀಕ್ಷೆ ಮುಗಿಯಿತು</string>
-    <string name="test_pending">ಟೆಸ್ಟ್ ಇನ್ನು ಮುಗಿದಿಲ್ಲ</string>
+    <string name="test_pending">ಪರೀಕ್ಷೆ ಬಾಕಿ ಇದೆ</string>
-    <string name="blood_group_error">ರಕ್ತದ ಗುಂಪನ್ನುತಪ್ಪಾಗಿ ನಮೂದಿಸಿದ್ಧೀರಿ </string>
+    <string name="blood_group_error">ದಯವಿಟ್ಟು ನಿಮ್ಮ ರಕ್ತ ಗುಂಡಾರವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="blood_group_toast">ದಯವಿಟ್ಟು ನಿಮ್ಮ ರಕ್ತ  ಗುಂಪನ್ನು ನಮೂದಿಸಿ</string>
+    <string name="blood_group_toast">ದಯವಿಟ್ಟು ನಿಮ್ಮ ರಕ್ತ ಗುಂಡಾರವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="blood_group_updated_successfully">ರಕ್ತದ ಗುಂಪನ್ನು ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ</string>
+    <string name="blood_group_updated_successfully">ರಕ್ತ ಗುಂಡಾರ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ</string>
-    <string name="failed_to_update_blood_group">ರಕ್ತದ ಗುಂಪನ್ನು ನವೀಕರಿಸಲು ವಿಫಲವಾಗಿದೆ</string>
+    <string name="failed_to_update_blood_group">ರಕ್ತ ಗುಂಡಾರ ನವೀಕರಿಸಲು ವಿಫಲವಾಗಿದೆ: %1$s</string>
-    <string name="no_user_data_found">ಈ ನಿರ್ದಿಷ್ಟ ಬಳಕೆದಾರರ ಐಡಿಗೆ ಯಾವುದೇ  ಡೇಟಾ ಕಂಡುಬಂದಿಲ್ಲ</string>
+    <string name="no_user_data_found">ನೀರು ನಿರ್ದಿಷ್ಟ ಐಡಿಗೆ ಯಾವುದೇ ಬಳಕೆದಾರ ಡೇಟಾ ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="device_disconnected">ಡಿವೈಸ್ ಸಂಪರ್ಕ ಕಡಿತಗೊಂಡಿದೆ</string>
+    <string name="device_disconnected">ಸಾಧನ ಹಂಚಿಹೋಯಿತು</string>
-    <string name="no_device_found">ಯಾವುದೇ ಡಿವೈಸ್ ಕಂಡುಬಂದಿಲ್ಲ</string>
+    <string name="no_device_found">ಯಾವುದೇ ಸಾಧನ ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="invalid_kit_number">ಕಿಟ್ ಸಂಖ್ಯೆ ತಪ್ಪಾಗಿದೆ</string>
+    <string name="invalid_kit_number">ಅಮಾನ್ಯವಾದ ಕಿಟ್ ಸಂಖ್ಯೆ</string>
     <string name="internt_not">ಇಂಟರ್ನೆಟ್ ಲಭ್ಯವಿಲ್ಲ</string>
-    <string name="internt_not_local">ಇಂಟರ್ನೆಟ್ ಲಭ್ಯವಿಲ್ಲ, ಪರೀಕ್ಷೆ ವಿವರಗಳನ್ನು ಸ್ಥಳೀಯ ಜಾಗದಲ್ಲಿ ಉಳಿಸಲಾಗಿದೆ</string>
+    <string name="internt_not_local">ಇಂಟರ್ನೆಟ್ ಲಭ್ಯವಿಲ್ಲ, ಪರೀಕ್ಷೆ ವಿವರಗಳನ್ನು ಸ್ಥಾನಿಕವಾಗಿ ಉಳಿಸಲಾಗಿದೆ</string>
     <string name="error_local">ಡೇಟಾ ಅಪ್ಲೋಡ್ ಮಾಡುವಾಗ ತಪ್ಪಾಗಿದೆ, ಪರೀಕ್ಷೆ ವಿವರಗಳನ್ನು ಸ್ಥಾನಿಕವಾಗಿ ಉಳಿಸಲಾಗಿದೆ</string>
     <string name="error_exist">ಇನ್ನೊಂದು ಬಫರ್ ಪಡೆಯುವಾಗ ತಪ್ಪಾಗಿದೆ</string>
     <string name="do_exist">ನೀವು ಇನ್ನೊಂದು ಬಫರ್ ಜಾರಿಗೆ ಹೋಗಲು ಇಚ್ಛಿಸುತ್ತಾರಾ?</string>
-    <string name="test_go_noback">ಟೆಸ್ಟ್ ಪ್ರಗತಿಯಲ್ಲಿದೆ. ಹಿಂತಿರುಗಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+    <string name="test_go_noback">ಪರೀಕ್ಷೆ ಜರುಗುತ್ತಿದೆ, ಹಿಂತಿರುಗಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
-    <string name="kit_uploaded">ಕಿಟ್ ಯಶಸ್ವಿಯಾಗಿ ಅಪ್ಲೋಡ್ ಆಗಿದೆ</string>
+    <string name="kit_uploaded">ಕಿಟ್ ಪರಿಣಾಮ ಯಶಸ್ವಿಯಾಗಿ ಅಪ್ಲೋಡ್ ಆಗಿದೆ</string>
-    <string name="kit_upload_failed">ಕಿಟ್  ಅಪ್ಲೋಡ್ ವಿಫಲವಾಗಿದೆ. ಅದನ್ನು ಕೈಯಾರೆ ಹೊಸದಾಗಿ ಬರೆಯಿರಿ</string>
+    <string name="kit_upload_failed">ಕಿಟ್ ಪರಿಣಾಮ ಅಪ್ಲೋಡ್ ಆಗಲಿಲ್ಲ, ಅದನ್ನು ಕೈಯಾರೆ ಹೊಸದಾಗಿ ಬರೆಯಿರಿ</string>
-    <string name="test_ongoing">ಟೆಸ್ಟ್ ಪ್ರಗತಿಯಲ್ಲಿದೆ</string>
+    <string name="test_ongoing">ಪರೀಕ್ಷೆ ಜರುಗುತ್ತಿದೆ</string>
     <string name="error_classification">ವರ್ಗೀಕರಣ ನಡೆಸುವಾಗ ತಪ್ಪಾಗಿದೆ</string>
-    <string name="test_upload">ಟೆಸ್ಟ್ ಫಲಿತಾಂಶ ಯಶಸ್ವಿಯಾಗಿ ಅಪ್ಲೋಡ್ ಆಗಿದೆ</string>
+    <string name="test_upload">ಪರೀಕ್ಷೆ ಫಲಿತಾಂಶ ಯಶಸ್ವಿಯಾಗಿ ಅಪ್ಲೋಡ್ ಆಗಿದೆ</string>
-    <string name="test_upload_failed">ಟೆಸ್ಟ್ ಫಲಿತಾಂಶ ಅಪ್ಲೋಡ್ ಆಗಲಿಲ್ಲ</string>
+    <string name="test_upload_failed">ಪರೀಕ್ಷೆ ಫಲಿತಾಂಶ ಅಪ್ಲೋಡ್ ಆಗಲಿಲ್ಲ</string>
     <string name="log_out">ಲಾಗೌಟ್ ಮಾಡಿ</string>
     <string name="do_log_out">ನೀವು ಅಪ್ಲಿಕೇಶನ್ ನಿಂದ ಲಾಗೌಟ್ ಮಾಡಲು ಬಯಸುತ್ತಿದ್ದೀರಾ?</string>
     <string name="cancelled_unable_scan">ರದ್ದು ಮಾಡಲಾಗಿದೆ: ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ, ಮತ್ತೊಮ್ಮೆ ಪ್ರಯಾಸಿಸಿ!!</string>
     <string name="kit_updated">ಕಿಟ್ ಸಂಖ್ಯೆ ನವೀಕರಿಸಲಾಗಿದೆ, ದಯವಿಟ್ಟು ಟೆಸ್ಟ್ ಆರಂಭಿಸುವ ಮೊದಲು ಬಳಸುವವನನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="select_patient">ದಯವಿಟ್ಟು ಟೆಸ್ಟ್ ಆರಂಭಿಸುವ ಮೊದಲು ರೋಗಿಯನ್ನು ಹೆಸರನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
+    <string name="select_patient">ದಯವಿಟ್ಟು ಟೆಸ್ಟ್ ಆರಂಭಿಸುವ ಮೊದಲು ರೋಗಿಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
     <string name="enable_location">ದಯವಿಟ್ಟು ಸ್ಥಾನ ಸೇವೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
     <string name="location_denied">ಸರಿಯಾದ ಸ್ಥಾನ ಅನುಮತಿ ನಿರಾಕರಿಸಲಾಗಿದೆ</string>
-    <string name="coarse_location_denied">ಕೋರ್ಸ್ ಸ್ಥಾನ್ನಕ್ಕೆ ಅನುಮತಿ ನಿರಾಕರಿಸಲಾಗಿದೆ</string>
+    <string name="coarse_location_denied">ಅಲ್ಪ ಸರಿಯಾದ ಸ್ಥಾನ ಅನುಮತಿ ನಿರಾಕರಿಸಲಾಗಿದೆ</string>
     <string name="permission_grant">ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಲು ಎಲ್ಲಾ ಫೈಲ್‌ಗಳಿಗೆ ಪ್ರವೇಶ ಅನುಮತಿ ನೀಡಬೇಕು</string>
     <string name="permission_required">ಈ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಲು ಎಲ್ಲಾ ಅನುಮತಿಗಳು ಅಗತ್ಯವಿವೆ.</string>
     <string name="device_not">ಡೆವೈಸ್ ಸಂಪರ್ಕಿಸಲಾಗಿಲ್ಲ.</string>
-    <string name="device">ಡಿವೈಸ್ ಕನೆಕ್ಟ್ ಆಗಿದೆ</string>
+    <string name="device">Device is Connected.</string>
     <string name="enter_proper_login_id">ದಯವಿಟ್ಟು ಸರಿಯಾದ ಲಾಗಿನ್ ಐಡಿ ನಮೂದಿಸಿ</string>
     <string name="enter_proper_password">ದಯವಿಟ್ಟು ಸರಿಯಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿ</string>
-    <string name="wrong_password">ಪಾಸ್ವರ್ಡ್ ತಪ್ಪಾಗಿ ನಮೂದಿಸಿದ್ದೀರಿ</string>
+    <string name="wrong_password">ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್</string>
-    <string name="wrong_user_id">ಬಳಕೆದಾರ ಐಡಿ ತಪ್ಪಾಗಿ ನಮೂದಿಸಿದ್ದೀರಿ</string>
+    <string name="wrong_user_id">ತಪ್ಪಾದ ಬಳಕೆದಾರ ಐಡಿ</string>
-    <string name="error_invalid_test">ದೋಷ. ಟೆಸ್ಟ್  ಅಮಾನ್ಯವಾಗಿದೆ</string>
+    <string name="error_invalid_test">ಅಮಾನ್ಯ ಟೆಸ್ಟ್. ಡಿ-ಆಕ್ಸಿಜನೇಷನ್ ಸಮಸ್ಯೆ</string>
-    <string name="error_negative_abs">ದೋಷ: ನೆಗೆಟಿವ್ ಆ ಬಿ ಸ್</string>
+    <string name="error_negative_abs">ದೋಷ: ನೆಗೆಟಿವ್ ಆಬ್ಸ್. ಬ್ಲ್ಯಾಂಕ್ ರೀಡಿಂಗ್ ಪುನಃ ತೆಗೆದುಕೊಳ್ಳಿ</string>
     <string name="error_improper_buffer_high">ದೋಷ: ಅಮಾನ್ಯ ಟೆಸ್ಟ್. ಬಫರ್ ರೀಡಿಂಗ್ ಅಸರವಿಲ್ಲ (ಹೈ)</string>
     <string name="error_improper_buffer_low">ದೋಷ: ಅಮಾನ್ಯ ಟೆಸ್ಟ್. ಬಫರ್ ರೀಡಿಂಗ್ ಅಸರವಿಲ್ಲ (ಲೋ)</string>
-    <string name="error_processing_device_data">ದೋಷ. ಸಾಧನ ಡಾಟಾವನ್ನುಸಂಸ್ಕರಿಸಲಾಗುತ್ತಿದೆ</string>
+    <string name="error_processing_device_data">ಡೇಟಾ ಪ್ರಕ್ರಿಯಿಸುವಾಗ ದೋಷ</string>
-    <string name="error_repeat_test_lower_volume">ದೋಷ. ಕಡಿಮೆ ಸ್ಯಾಂಪಲ್ ಬಳಸಿ  ಪರೀಕ್ಷೆಯನ್ನು ಪುನರಾವರ್ತಿಸಿ</string>
+    <string name="error_repeat_test_lower_volume">ಅಮಾನ್ಯ. ರೇಟ್ ಹೆಚ್ಚುವ ಹೊರತು ಪುನಃ ಟೆಸ್ಟ್ ಮಾಡಿ</string>
-    <string name="error_repeat_test_higher_volume">ದೋಷ. ಹೆಚ್ಚಿನ ಸ್ಯಾಂಪಲ್ ಬಳಸಿ  ಪರೀಕ್ಷೆಯನ್ನು ಪುನರಾವರ್ತಿಸಿ</string>
+    <string name="error_repeat_test_higher_volume">ಅಮಾನ್ಯ. ಅತ್ಯಂತ ಕಡಿಮೆ ಅಭ್ಸರ್ಬೆನ್ಸ್ - ಹೆಚ್ಚು ಹೊರತು ಪುನಃ ಟೆಸ್ಟ್</string>
-    <string name="positive_for_sickle_cell">ಕುಡಗೋಲು ಕಣ ರಕ್ತಹೀನತೆ "ಪಾಸಿಟಿವ್" ಫಲಿತಂಶ ಬಂದಿರುತ್ತೇವೆ</string>
+    <string name="positive_for_sickle_cell">ಸಿಕ್ಲ್ ಸೆಲ್ ಸಾಕಾರಿ. HPLC ದೃಢೀಕರಣಕ್ಕಾಗಿ</string>
-    <string name="something_wrong_with_device">ಡಿವೈಸ್ ನಲ್ಲಿ ಏನೋ ತಪ್ಪಾಗಿದೆ</string>
+    <string name="something_wrong_with_device">ಸಾಧನದಲ್ಲಿ ಏನಾದರೂ ತಪ್ಪಾಗಿದೆ, ದಯವಿಟ್ಟು ಸಾಧನವನ್ನು ಹತ್ತಿರಕ್ಕೆ ತರಿಸಿ ಮತ್ತೆ ಬಳಸಿ ಬಳಸಿ ಬಳಸಿ ಪರೀಕ್ಷಿಸಿ</string>
-    <string name="processing_result">ಫಲಿತಂಶವನ್ನು ಸಂಸ್ಕರಿಸುತ್ತುದೆ</string>
+    <string name="processing_result">ಪ್ರಕ್ರಿಯಿಸುತ್ತಿದೆ ಫಲಿತ</string>
-    <string name="data_collected_processing_data">ಸಂಗ್ರಹಿಸಿದ ಡೇಟಾವನ್ನು ಸಂಸ್ಕರಿಸಲಾಗುತ್ತಿದೆ </string>
+    <string name="data_collected_processing_data">ಸಮಿತಿ ಸೇರಿಸಿದ ಡೇಟಾ, ಡೇಟಾ ಪ್ರಕ್ರಿಯಿಸುತ್ತಿದೆ</string>
-    <string name="sample_completed">ಸ್ಯಾಂಪಲ್ ಪರೀಕ್ಷೆಪೂರ್ಣಗೊಂಡಿದೆ</string>
+    <string name="sample_completed">ನಮೂನೆ ಪೂರ್ಣಗೊಂಡಿದೆ</string>
     <string name="gathering_data">ಡೇಟಾ ಸಂಗ್ರಹಿಸುತ್ತಿದೆ</string>
-    <string name="sample_started">ಸ್ಯಾಂಪಲ್ ಪರೀಕ್ಷೆ ಪ್ರಾರಂಭವಾಗಿದೆ</string>
+    <string name="sample_started">ನಮೂನೆ ಪ್ರಾರಂಭವಾಗಿದೆ</string>
-    <string name="buffer_completed">ಬಫರ್ ಪರೀಕ್ಷೆ ಪೂರ್ಣಗೊಂಡಿದೆ</string>
+    <string name="buffer_completed">ಬಫರ್ ಪೂರ್ಣಗೊಂಡಿದೆ</string>
-    <string name="buffer_started">ಬಫರ್ ಪರೀಕ್ಷೆ ಪ್ರಾರಂಭವಾಗಿದೆ</string>
+    <string name="buffer_started">ಬಫರ್ ಪ್ರಾರಂಭವಾಗಿದೆ</string>
     <string name="power_bank">Connect with Power Bank</string>
-    <string name="start">ಪ್ರಾರಂಭಿಸಿ</string>
+    <string name="start">ಆರಂಭ</string>
-    <string name="place_sample">ಸ್ಯಾಂಪಲ್ ಅನ್ನು ಒಳಗೆ ಇರಿಸಿ</string>
+    <string name="place_sample">ನಮೂನೆ ಇಟ್ಟುಕೊಳ್ಳಿ</string>
-    <string name="invalid">ಅಮಾನ್ಯವಾಗಿದೆ</string>
+    <string name="invalid">ಅಮಾನ್ಯ</string>
     <string name="deviceinfo">ಸಾಧನ ಮಾಹಿತಿ</string>
     <string name="error">ದೋಷ</string>
-    <string name="language_update">ಭಾಷೆಯನ್ನುಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ</string>
+    <string name="language_update">ಭಾಷೆ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ</string>
     <string name="select_language">ನಿಮ್ಮ ಆದರಿತ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
     <string name="app_language">ಅಪ್ಲಿಕೇಶನ್ ಭಾಷೆ</string>
     <string name="add_blood_group">ರಕ್ತ ಗುಂಡನ್ನು ಸೇರಿಸಿ</string>
     <string name="ok">ಸರಿ</string>
     <string name="downloadcsv">CSV ಡೌನ್ಲೋಡ್ ಮಾಡಿ</string>
-    <string name="action_activity">ಚಟುವಟಿಕೆಗಳು</string>
+    <string name="action_activity">Activities</string>
-    <string name="check_cuvette">ಕುವೆಟ್ ಇರುವಿಕೆಯನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ</string>
+    <string name="check_cuvette">Checking cuvette presence</string>
-    <string name="cuvette_present">ಕುವೆಟ್ಟೆ ಇರುತ್ತದೆ</string>
+    <string name="cuvette_present">Cuvette present</string>
-    <string name="cuvette_absent">ಕುವೆಟ್ಟೆ ಇರುವುದಿಲ್ಲ </string>
+    <string name="cuvette_absent">Cuvette absent</string>
-    <string name="retry">ಮರುಪ್ರಯತ್ನಿಸಿ</string>
+    <string name="retry">Retry</string>
-    <string name="Firefox">ಫೈರ್‌ಫಾಕ್ಸ್</string>
+    <string name="Firefox">Firefox</string>
-    <string name="Files">ಫೈಲ್</string>
+    <string name="Files">Files</string>
-    <string name="usb_terminal">ಯುಎಸ್ಬಿ ಟರ್ಮಿನಲ್</string>
+    <string name="usb_terminal">Usb Terminal</string>
-    <string name="menu_about">ಬಗ್ಗೆ</string>
+    <string name="menu_about">About</string>
-    <string name="action_about">ಬಗ್ಗೆ</string>
+    <string name="action_about">About</string>
-    <string name="lab_name">ಲ್ಯಾಬ್ ಹೆಸರು</string>
+    <string name="lab_name">Lab Name</string>
-    <string name="smi">ಎಸ್ಎಂಐ</string>
+    <string name="smi_desp">ShanMukha Innovations is a spin-off from Indian Institute of Science, Bangalore. Incorporated in 2016, the company has been delivering innovative Made in India first of its kind deep technology-based products in healthcare.\n\nNotable solutions include Mobile Infection Testing and Reporting Labs (MITR Labs), portable thermal cycler (PolyCube).\n\nThe company launched Sicklecert ®, India’s first CDSCO approved indigenous diagnostic test for sickle-cell anemia.\n\nOur customers include government, non-profit and private sector companies. Leading research institutes such as IISc, IIT Tirupati have engaged us for unique projects. We take pride in supporting Indian and global customers with world-class products.</string>
-    <string name="smi_desp">ಷಣ್ಮುಖ ಇನ್ನೋವೇಶನ್ಸ್ ಬೆಂಗಳೂರಿನ ಇಂಡಿಯನ್ ಇನ್‌ಸ್ಟಿಟ್ಯೂಟ್ ಆಫ್ ಸೈನ್ಸ್‌ನಿಂದ ಸ್ಪಿನ್-ಆಫ್ ಆಗಿದೆ.2016 ರಲ್ಲಿ ಸ್ಥಾಪನೆಯಾಗಿದ್ದು, ಕಂಪನಿಯು ಆರೋಗ್ಯ ರಕ್ಷಣೆಯಲ್ಲಿ ತನ್ನ ರೀತಿಯ ಆಳವಾದ ತಂತ್ರಜ್ಞಾನ ಆಧಾರಿತ ಉತ್ಪನ್ನಗಳಲ್ಲಿ ಮೊದಲ ಬಾರಿಗೆ ನವೀನ ಮೇಡ್ ಇನ್ ಇಂಡಿಯಾವನ್ನು ತಲುಪಿಸುತ್ತಿದೆ. ಗಮನಾರ್ಹ ಪರಿಹಾರಗಳಲ್ಲಿ ಮೊಬೈಲ್ ಸೋಂಕು ಪರೀಕ್ಷೆ ಮತ್ತು ವರದಿ ಮಾಡುವ ಲ್ಯಾಬ್‌ಗಳು (MITR ಲ್ಯಾಬ್ಸ್), ಪೋರ್ಟಬಲ್ ಥರ್ಮಲ್ ಸೈಕ್ಲರ್ (ಪಾಲಿಕ್ಯೂಬ್) ಸೇರಿವೆ. ಕಂಪನಿಯು ಸಿಕ್ಲೆಸರ್ಟ್ ® ಅನ್ನು ಪ್ರಾರಂಭಿಸಿತು, ಇದು ಭಾರತದ ಮೊದಲ CDSCO ಅಂಗೀಕರಿಸಿದ ಕುಡಗೋಲು-ಕಣ ರಕ್ತಹೀನತೆಗಾಗಿ ಸ್ಥಳೀಯ ರೋಗನಿರ್ಣಯ ಪರೀಕ್ಷೆಯನ್ನು ಅನುಮೋದಿಸಿದೆ. ನಮ್ಮ ಗ್ರಾಹಕರು ಸರ್ಕಾರಿ, ಲಾಭರಹಿತ ಮತ್ತು ಖಾಸಗಿ ವಲಯದ ಕಂಪನಿಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತಾರೆ. ಐಐಎಸ್‌ಸಿ, ಐಐಟಿ ತಿರುಪತಿಯಂತಹ ಪ್ರಮುಖ ಸಂಶೋಧನಾ ಸಂಸ್ಥೆಗಳು ವಿಶಿಷ್ಟ ಯೋಜನೆಗಳಿಗೆ ನಮ್ಮನ್ನು ತೊಡಗಿಸಿಕೊಂಡಿವೆ. ವಿಶ್ವ ದರ್ಜೆಯ ಉತ್ಪನ್ನಗಳೊಂದಿಗೆ ಭಾರತೀಯ ಮತ್ತು ಜಾಗತಿಕ ಗ್ರಾಹಕರನ್ನು ಬೆಂಬಲಿಸುವಲ್ಲಿ ನಾವು ಹೆಮ್ಮೆಪಡುತ್ತೇವೆ</string>
+    <string name="smi">SMI</string>
-    <string name="learn_more">ಹೆಚ್ಚಿನ ವಿವರಗಳಿಗೆ ಸಂಪರ್ಕಿಸಿ: <u>sminnovations.in</u></string>
+    <string name="learn_more">Visit to learn more: <u>sminnovations.in</u></string>
-    <string name="commands">ಆಜ್ಞೆಗಳು</string>
-    <string name="select_cuvette_size">Cuvette ಗಾತ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="sample_id">Sample Id</string>
-    <string name="quick_capture">ತ್ವರಿತ ಕ್ಯಾಪ್ಚರ್</string>
-    <string name="reset_password_for_this_device">ಈ ಸಾಧನಕ್ಕಾಗಿ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಮರುಹೊಂದಿಸಿ</string>
-    <string name="calibrate_device">ಸಾಧನವನ್ನು ಮಾಪನಾಂಕ ಮಾಡಿ</string>
-    <string name="cuvette_presentt">Cuvette Present , Please Remove Cuvette And Try Again</string>
-    <string name="cuvette_absentt">Cuvette Absent,Now You Can Submit</string>
-
     <!-- Add translations for other strings -->
 
 </resources>

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

@@ -25,11 +25,5 @@
         <item>ka</item>
         <!-- Use language codes (e.g., en, kn) as values -->
     </string-array>
-    <string-array name="district">
-        <item>Mysuru</item>
-        <item>Kodagu</item>
-        <item>Chamarajanagar</item>
-        <item>Other</item>
-    </string-array>
 
 </resources>

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

@@ -38,7 +38,6 @@
     </string-array>
 
     <string-array name="blood_group">
-        <item>Unknown</item>
         <item>O+ve</item>
         <item>O-ve</item>
         <item>A+ve</item>
@@ -87,7 +86,7 @@
     <string name="acquire">Acquire</string>
     <string name="enter_patient_details">Enter Patient Details</string>
     <string name="patient_name">Patient Name</string>
-    <string name="age">Age</string>
+    <string name="age">Age in years</string>
     <string name="gender">Gender</string>
     <string name="name_error">Name can\'t be empty</string>
     <string name="age_error">Age can\'t be empty</string>
@@ -199,12 +198,12 @@
     <string name="set_baseline_reference_again">Set Baseline/Reference again?</string>
     <string name="baseline_instruction">Baseline Instruction</string>
     <string name="to_be_launched_in_next_version_of_the_app">To be launched in next version of the app</string>
-    <string name="invalid_kit">Invalid Kit Serial Number</string>
+    <string name="invalid_kit">Invalid Kit Serial Number, correct example, SMI/SC/019/01/001</string>
     <string name="user_list">User List</string>
     <string name="user_id">User ID</string>
     <string name="aadhar_id">Aadhar ID</string>
     <string name="internet_not_available_please_enter_the_user_id_manually">Internet not available, please enter the user ID and blood group manually</string>
-    <string name="user_id_error_message">Sample ID Length should be greater then 5 and please select the blood group</string>
+    <string name="user_id_error_message">User ID should be 18 digits and please select the blood group</string>
     <string name="upload_db_registration_title">Upload DB Tests</string>
     <string name="upload_db_registration_message">Do you want to upload the local DB tests to the cloud?</string>
     <string name="upload">Upload</string>
@@ -219,7 +218,7 @@
     <string name="all_registered_user_are_tested_successfully">All registered user are tested successfully</string>
     <string name="start_incubation">Incubate</string>
     <string name="check_buffer">Check Buffer</string>
-    <string name="low_battery_warning">Battery level is low than 40%, please charge the device to continue testing</string>
+    <string name="low_battery_warning">Battery level is lower than 40%, please charge the device to continue testing</string>
     <string name="test_already_conducted">Test has been already conducted for this user</string>
     <string name="incubation_not_completed">Incubation has not completed 15 minutes</string>
     <string name="incubation_crossed_30_minutes">Incubation crossed 30 minutes, need to repeat the incubation</string>
@@ -250,6 +249,7 @@
     <string name="do_log_out">Do you want to LogOut the Application?</string>
     <string name="cancelled_unable_scan">Cancelled: Unable to scan, Try Again!!</string>
     <string name="kit_updated">Kit number is updated, Please Select user before starting test</string>
+    <string name="kit_update">Kit number is updated.</string>
     <string name="select_patient">Please Select patient before starting test</string>
     <string name="enable_location">Please enable location services</string>
     <string name="location_denied">Fine location permission denied</string>
@@ -290,22 +290,13 @@
     <string name="action_activity">Activities</string>
     <string name="check_cuvette">Checking cuvette presence</string>
     <string name="cuvette_present">Cuvette present , you can start the test</string>
-    <string name="cuvette_absent">Cuvette is absent , please place the cuvette and retry again</string>
+    <string name="cuvette_absent">cuvette is not present, please put the cuvette and retry again</string>
     <string name="retry">Retry again</string>
     <string name="usb_terminal">Usb Terminal</string>
     <string name="menu_about">About</string>
     <string name="action_about">About</string>
     <string name="lab_name">Lab Name</string>
+    <string name="smi_desp"><b>ShanMukha Innovations</b> is a spin-off from Indian Institute of Science, Bangalore. Incorporated in 2016, the company has been delivering innovative Made in India first of its kind deep technology-based products in healthcare.\n\nNotable solutions include Mobile Infection Testing and Reporting Labs (MITR Labs), portable thermal cycler (PolyCube).\n\nThe company launched Sicklecert ®, India’s first CDSCO approved indigenous diagnostic test for sickle-cell anemia.\n\nOur customers include government, non-profit and private sector companies. Leading research institutes such as IISc, IIT Tirupati have engaged us for unique projects. We take pride in supporting Indian and global customers with world-class products.</string>
     <string name="smi">SMI</string>
-    <string name="smi_desp"><b>ShanMukha Innovations</b> is a spin-off from Indian Institute of Science, Bangalore. Incorporated in 2016, the company has been delivering innovative Made in India first of its kind deep technology-based products in healthcare.\\n\\nNotable solutions include Mobile Infection Testing and Reporting Labs (MITR Labs), portable thermal cycler (PolyCube).\\n\\nThe company launched Sicklecert ®, India’s first CDSCO approved indigenous diagnostic test for sickle-cell anemia.\\n\\nOur customers include government, non-profit and private sector companies. Leading research institutes such as IISc, IIT Tirupati have engaged us for unique projects. We take pride in supporting Indian and global customers with world-class products.</string>
     <string name="learn_more">Visit to learn more: <u>sminnovations.in</u></string>
-    <string name="commands">Commands</string>
-    <string name="select_cuvette_size">Select Cuvette Size</string>
-    <string name="sample_id">Sample Id</string>
-    <string name="quick_capture">Quick Capture</string>
-    <string name="reset_password_for_this_device">Reset password for this device</string>
-    <string name="calibrate_device">Calibrate Device</string>
-    <string name="cuvette_presentt">Cuvette Present , Please Remove Cuvette And Try Again</string>
-    <string name="cuvette_absentt">Cuvette Absent,Now You Can Submit</string>
-
 </resources>

app/src/main/res/xml/authenticator.xml

@@ -1,5 +0,0 @@
-<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="com.example.account"
-    android:icon="@mipmap/ic_launcher"
-    android:label="@string/app_name"
-    android:smallIcon="@mipmap/ic_launcher" />

app/src/main/res/xml/remote_config_defaults.xml

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
-  ~ // Notice: All information contained herein is, and remains
-  ~ // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
-  ~ // if any. The intellectual and technical concepts contained
-  ~ // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
-  ~ // and its suppliers and may be covered by Indian and Foreign Patents,
-  ~ // patents in process, and are protected by trade secret or copyright law.
-  ~ // Dissemination of this information or reproduction of this material
-  ~ // is strictly forbidden unless prior written permission is obtained
-  ~ // from ShanMukha Innovations Pvt. Ltd.
-  -->
-<defaultsMap>
-    <entry>
-        <key>BUFFER_FLAGS_ENABLED</key>
-        <value>true</value>
-    </entry>
-    <entry>
-        <key>positiveBoderLine10mm1</key>
-        <value>1.3</value>
-    </entry>
-    <entry>
-        <key>positiveBoderLine10mm2</key>
-        <value>1.66</value>
-    </entry>
-    <entry>
-        <key>negativeBoderLine10mm1</key>
-        <value>2.0</value>
-    </entry>
-    <entry>
-        <key>negativeBoderLine10mm2</key>
-        <value>2.4</value>
-    </entry>
-    <entry>
-        <key>normalMin10mm</key>
-        <value>0.07</value>
-    </entry>
-    <entry>
-        <key>normalMax10mm</key>
-        <value>0.23</value>
-    </entry>
-    <entry>
-        <key>negativeBorderlineMin10mm</key>
-        <value>0.23</value>
-    </entry>
-    <entry>
-        <key>negativeBorderlineMax10mm</key>
-        <value>0.27</value>
-    </entry>
-    <entry>
-        <key>sickleCellTraitMin10mm</key>
-        <value>0.27</value>
-    </entry>
-    <entry>
-        <key>sickleCellTraitMax10mm</key>
-        <value>0.31</value>
-    </entry>
-    <entry>
-        <key>positiveForSickleCellMin10mm</key>
-        <value>0.31</value>
-    </entry>
-    <entry>
-        <key>positiveForSickleCellMax10mm</key>
-        <value>0.39</value>
-    </entry>
-    <entry>
-        <key>sickleCellDiseaseMin10mm</key>
-        <value>0.39</value>
-    </entry>
-    <entry>
-        <key>sickleCellDiseaseMax10mm</key>
-        <value>0.7</value>
-    </entry>
-    <entry>
-        <key>positiveBoderLine2mm1</key>
-        <value>0.8</value>
-    </entry>
-    <entry>
-        <key>positiveBoderLine2mm2</key>
-        <value>1.1</value>
-    </entry>
-    <entry>
-        <key>negativeBoderLine2mm1</key>
-        <value>1.5</value>
-    </entry>
-    <entry>
-        <key>negativeBoderLine2mm2</key>
-        <value>1.9</value>
-    </entry>
-    <entry>
-        <key>normalMin2mm</key>
-        <value>0.1</value>
-    </entry>
-    <entry>
-        <key>normalMax2mm</key>
-        <value>0.23</value>
-    </entry>
-    <entry>
-        <key>negativeBorderlineMin2mm</key>
-        <value>0.23</value>
-    </entry>
-    <entry>
-        <key>negativeBorderlineMax2mm</key>
-        <value>0.25</value>
-    </entry>
-    <entry>
-        <key>sickleCellTraitMin2mm</key>
-        <value>0.25</value>
-    </entry>
-    <entry>
-        <key>sickleCellTraitMax2mm</key>
-        <value>0.31</value>
-    </entry>
-    <entry>
-        <key>positiveForSickleCellMin2mm</key>
-        <value>0.31</value>
-    </entry>
-    <entry>
-        <key>positiveForSickleCellMax2mm</key>
-        <value>0.45</value>
-    </entry>
-    <entry>
-        <key>sickleCellDiseaseMin2mm</key>
-        <value>0.45</value>
-    </entry>
-    <entry>
-        <key>sickleCellDiseaseMax2mm</key>
-        <value>0.7</value>
-    </entry>
-    <entry>
-        <key>bufferMinLed1</key>
-        <value>21000.00</value>
-    </entry>
-    <entry>
-        <key>bufferMaxLed1</key>
-        <value>23000.00</value>
-    </entry>
-    <entry>
-        <key>bufferMinLed2</key>
-        <value>17000.00</value>
-    </entry>
-    <entry>
-        <key>bufferMaxLed2</key>
-        <value>19000.00</value>
-    </entry>
-</defaultsMap>

app/src/test/java/com/example/hpostesting/DiagnosticsViewModelTest.kt

@@ -13,11 +13,13 @@
 
 package com.example.hpostesting
 
+import android.content.Context
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.repository.Repository
+import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
 import com.example.hpostesting.presentation.diagnostics.DiagnosticsViewModel
 import io.mockk.coEvery
 import io.mockk.mockk
@@ -49,7 +51,8 @@ class DiagnosticsViewModelTest {
 
     // Mock Repository
     private val mockRepository = mockk<Repository>()
-
+    @Mock
+    private lateinit var context: Context
     // Mock Observer for LiveData
     @Mock
     private lateinit var mockObserver: Observer<String>
@@ -63,7 +66,7 @@ class DiagnosticsViewModelTest {
         MockitoAnnotations.openMocks(this)
 
         // Create the ViewModel with the mock repository and set the coroutine dispatcher
-        diagnosticsViewModel = DiagnosticsViewModel(repository = mockRepository)
+        diagnosticsViewModel = DiagnosticsViewModel(repository = mockRepository, context = context)
 //        diagnosticsViewModel.viewModelScope = testCoroutineScope
 
         // Observe the LiveData