Enable Cloud Run deployments

.gitlab-ci.yml

@@ -1,101 +1,53 @@
-# This file is a template, and might need editing before it works on your project.
-# To contribute improvements to CI/CD templates, please follow the Development guide at:
-# https://docs.gitlab.com/ee/development/cicd/templates.html
-# This specific template is located at:
-# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Android.gitlab-ci.yml
-
-# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny
-# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template.
-
+---
 image: eclipse-temurin:17-jdk-jammy
-
 variables:
-
-  # ANDROID_COMPILE_SDK is the version of Android you're compiling with.
-  # It should match compileSdkVersion.
-  ANDROID_COMPILE_SDK: "34"
-
-  # ANDROID_BUILD_TOOLS is the version of the Android build tools you are using.
-  # It should match buildToolsVersion.
-  ANDROID_BUILD_TOOLS: "33.0.2"
-
-  # It's what version of the command line tools we're going to download from the official site.
-  # Official Site-> https://developer.android.com/studio/index.html
-  # There, look down below at the cli tools only, sdk tools package is of format:
-  #        commandlinetools-os_type-ANDROID_SDK_TOOLS_latest.zip
-  # when the script was last modified for latest compileSdkVersion, it was which is written down below
-  ANDROID_SDK_TOOLS: "9477386"
-
-# Packages installation before running script
+  ANDROID_COMPILE_SDK: '34'
+  ANDROID_BUILD_TOOLS: 33.0.2
+  ANDROID_SDK_TOOLS: '9477386'
 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
+- apt-get --quiet update --yes
+- apt-get --quiet install --yes wget unzip
+- export ANDROID_HOME="${PWD}/android-sdk-root"
+- install -d $ANDROID_HOME
+- 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
+- sdkmanager --version
+- yes | sdkmanager --licenses > /dev/null || true
+- sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}"
+- sdkmanager "platform-tools"
+- sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
+- chmod +x ./gradlew
 lintDebug:
   interruptible: true
   stage: build
   script:
-    - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint
+  - "./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint"
   artifacts:
     paths:
-      - app/lint/reports/lint-results-debug.html
-    expose_as: "lint-report"
+    - app/lint/reports/lint-results-debug.html
+    expose_as: lint-report
     when: always
-
-# Make Project
 assembleDebug:
   interruptible: true
   stage: build
   script:
-    - ./gradlew assembleDebug
+  - "./gradlew assembleDebug"
   artifacts:
     paths:
-      - app/build/outputs/
-
-# Run all tests, if any fails, interrupt the pipeline(fail it)
+    - app/build/outputs/
 debugTests:
-  needs: [lintDebug, assembleDebug]
+  needs:
+  - lintDebug
+  - assembleDebug
   interruptible: true
   stage: test
   script:
-    - ./gradlew -Pci --console=plain :app:testDebug
-  artifacts:
-    paths:
-      - app/build/test-results/
-
-publishTestResults:
-  stage: test
-  script:
-    - echo "Publishing JUnit test results"
-  needs: [debugTests]
-  artifacts:
-    when: always
-    reports:
-      junit: app/build/test-results/testDebugUnitTest/*.xml
+  - "./gradlew -Pci --console=plain :app:testDebug"
+stages:
+- build
+- test
+- deploy
+include:
+- remote: https://gitlab.com/gitlab-org/incubation-engineering/five-minute-production/library/-/raw/main/gcp/cloud-run.gitlab-ci.yml

app/build.gradle

@@ -14,18 +14,17 @@ android {
     compileSdk 34
     namespace 'in.sminnovations.hpostesting'
 
-    // dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production
+    // prod - production, preprod - preproduction, quality - qc, dev - development
     defaultConfig {
         applicationId "in.sminnovations.hpostesting.dev"
         minSdk 21
         targetSdk 34
-        versionCode 114
-        versionName "2.1.114"
+        versionCode 91
+        versionName "2.1.91"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-
     buildTypes {
         release {
             minifyEnabled false
@@ -81,7 +80,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-storage-ktx'
     implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
     implementation 'com.google.android.gms:play-services-auth:20.7.0'
-    implementation 'com.google.android.gms:play-services-location:21.1.0'
+    implementation 'com.google.android.gms:play-services-location:21.0.1'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
     implementation 'com.google.android.things:androidthings:1.0'
     implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta11'
@@ -96,8 +95,6 @@ dependencies {
     // Testing
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     testImplementation "androidx.work:work-testing:2.9.0"
     androidTestImplementation 'androidx.test:core-ktx:1.5.0'
@@ -111,13 +108,10 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:3.12.4'
     androidTestImplementation 'org.mockito:mockito-android:3.12.4'
     androidTestImplementation 'org.mockito:mockito-inline:3.12.4'
-    androidTestImplementation 'org.mockito:mockito-android:3.12.4'
-    testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
-    testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
-
     testImplementation "androidx.arch.core:core-testing:2.2.0"
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
 
+
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
     implementation 'com.opencsv:opencsv:5.9'
     implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
@@ -157,14 +151,11 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp:4.9.3")
 
     implementation "androidx.preference:preference-ktx:1.2.1"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
+    implementation 'io.nats:jnats:2.11.2'
 
     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 fileTree(dir: 'libs', include: ['*.aar'])
-    implementation 'io.nats:jnats:2.11.4'
-
 }

app/google-services.json

@@ -34,35 +34,6 @@
         }
       }
     },
-    {
-      "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",
@@ -205,4 +176,4 @@
     }
   ],
   "configuration_version": "1"
-}
+}

app/release/output-metadata.json

@@ -4,15 +4,15 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "in.sminnovations.hpostesting.quality",
+  "applicationId": "com.example.hpos",
   "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 101,
-      "versionName": "2.1.101",
+      "versionCode": 1,
+      "versionName": "1.0",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/AndroidManifest.xml

@@ -48,10 +48,6 @@
             android:name="com.example.hpostesting.presentation.autodac.AutoDacActivity"
             android:exported="false"
             android:theme="@style/Theme.HPOS.NoActionBar" />
-        <activity
-            android:name="com.example.hpostesting.presentation.jig.JigActivity"
-            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
             android:name="com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity"
             android:exported="false"
@@ -73,15 +69,6 @@
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
             android:theme="@style/Theme.HPOS.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
-
-        <activity
-            android:name="com.example.hpostesting.presentation.trueheme.TrueHemeActivity"
-            android:exported="false"
-            android:noHistory="true"
-            android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
-            android:theme="@style/Theme.HPOS.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
-
         <activity
             android:name="com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity"
             android:exported="false"
@@ -99,7 +86,6 @@
             android:exported="false"
             android:label="@string/title_activity_dashboard"
             android:theme="@style/Theme.HPOS.NoActionBar"
-            android:screenOrientation="portrait"
             tools:ignore="AppLinkUrlError,MissingClass">
 
             <intent-filter>
@@ -123,8 +109,9 @@
             android:noHistory="true"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
@@ -164,7 +151,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
+            android:authorities="com.example.hpostesting.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

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

@@ -1,7 +1,5 @@
 package com.example.hpostesting.data.api
 
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.login.LoginRequest
@@ -20,5 +18,4 @@ interface MolbioAuthApi {
     suspend fun login(
         @Body loginRequest: LoginRequest
     ): LoginResponse
-
 }

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

@@ -1,7 +1,5 @@
 package com.example.hpostesting.data.api
 
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.log.UploadLogsResponse
 import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
 import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultResponse
@@ -9,11 +7,8 @@ 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 okhttp3.MultipartBody
-import okhttp3.Response
 import okhttp3.ResponseBody
 import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.Header
 import retrofit2.http.Multipart
 import retrofit2.http.POST
 import retrofit2.http.PUT
@@ -36,19 +31,9 @@ interface MolbioResultApi {
         @Body deviceUpdateRequest: DeviceUpdateRequest
     ): ResponseBody
 
-    @GET("deviceService/device/getClientCertificate")
-    suspend fun downloadClientCertificate(
-    ): ResponseBody
-
     @Multipart
     @POST("deviceService/device/uploadLogs")
     suspend fun uploadLogs(
         @Part logFile: MultipartBody.Part
     ): UploadLogsResponse
-
-
-    @PUT("deviceService/device/uploadDeviceDiagnostics")
-    suspend fun deviceDiagnostics(
-        @Body deviceDiagnosticsRequest: DeviceDiagnosticsRequest
-    ): DeviceDiagnosticsResponse
 }

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

@@ -1,13 +1,6 @@
 package com.example.hpostesting.data.api
 
-import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.presentation.UsbServiceListener
-
 interface PropertyProvider {
 
     fun getProperty(key: String): String
-}
-
-interface DeviceCommunicationHandler {
-    fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener)
-}
+}

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

@@ -2,13 +2,13 @@ package com.example.hpostesting.data.constant
 
 object Constants {
     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 HOMOCUBE_USB_PERMISSION = "shanmukha.in.sickle_cell_homocube.USB_PERMISSION"
 
     const val BASE_URL = "www.google.com"
 
     const val ABHA_APP_PACKAGE = "in.ndhm.phr"
 
-    const val MOLBIO_INTEGRATION = false
+    const val MOLBIO_INTERGATION = false
     const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
     const val deviceProvisionPassword = "f2ab0e7f9d69"
     const val DEVICE_ID_API = "deviceIDAPI"
@@ -35,9 +35,8 @@ object Constants {
     const val MAX_WAVELENGTH_RANGE_TO_RECORD = 750
 
     const val DEVICE_PRODUCT_ID = 24597
-    const val DEVICE_TYPE_HEMOCUBE = "HEMOCUBE"
+    const val DEVICE_TYPE_HOMOCUBE = "HOMOCUBE"
     const val DEVICE_TYPE_TEST_RIGHT = "TEST_RIGHT"
-    const val DEVICE_TYPE_TRUEHEME = "TRUEHEME"
 
     const val DEVICE_VENDOR_ID = 1027
     const val HOMO_CUBE_ID = 29987
@@ -59,11 +58,6 @@ object Constants {
     const val QUICK_CAPTURE_VOLUME = "VOLUME"
     const val QUICK_CAPTURE_READING_PER_SAMPLE = "READING_PER_SAMPLE"
 
-    const val BLANK_EVERY_TEST = false
-
-    // jig
-    const val NAVIGATE_TO_TEST_JIG_DIRECTLY = false
-
     val STATICID = listOf(
         "FACTORY",
         "ADMIN",
@@ -176,7 +170,6 @@ object Constants {
 
     const val KIT_NUMBER = "KitNumber"
     const val KIT_COUNT = "KitCount"
-    const val KIT_CAPACITY = Int.MAX_VALUE // Enforceable
     const val BUFFER_VALUE_1 = "BufferValue1"
     const val BUFFER_VALUE_2 = "BufferValue2"
     const val BUFFER_VALUE_3 = "BufferValue3"
@@ -184,7 +177,7 @@ object Constants {
     const val DEVICE_ID = "DEVICE_ID"
 
     const val BUFFER_LED_LOWER_BOUND = 21000
-    const val BUFFER_LED_UPPER_BOUND = 23500
+    const val BUFFER_LED_UPPER_BOUND = 24500
 
     const val TEST_STATUS_CODE_TEST_STARTED = 1.0
     const val TEST_STATUS_CODE_CONFIG_STARTED = 2.0
@@ -1182,64 +1175,64 @@ object Constants {
 
     val BUFFER_INTENSITY_THRESHOLDS: Map<String, List<List<Int>>> = mapOf<String, List<List<Int>>>(
         "HCV-000-3001" to listOf(
-            listOf(23000, 25074),
-            listOf(23000, 24596),
-            listOf(23000, 26065),
-            listOf(23000, 27093),
+            listOf(20000, 25074),
+            listOf(20000, 24596),
+            listOf(20000, 26065),
+            listOf(20000, 27093),
         ),
         "HCV-000-3002" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3003" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3004" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3005" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3006" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3007" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3008" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3009" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3010" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3011" to listOf(
             listOf(20000, 25074),
@@ -1248,58 +1241,58 @@ object Constants {
             listOf(20000, 27093),
         ),
         "HCV-000-3012" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
-        "HCV-000-3013" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+        "HCV-000-1015" to listOf(
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3014" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3015" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3016" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3017" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3018" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3019" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3020" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3021" to listOf(
             listOf(20000, 25074),
@@ -1308,58 +1301,58 @@ object Constants {
             listOf(20000, 27093),
         ),
         "HCV-000-3022" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3023" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3024" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3025" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3026" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3027" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3028" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3029" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HCV-000-3030" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0001" to listOf(
             listOf(20000, 25074),
@@ -1368,58 +1361,58 @@ object Constants {
             listOf(20000, 27093),
         ),
         "HPP1-0124-0002" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0003" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0004" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0005" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0006" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0007" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0008" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0009" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0010" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0011" to listOf(
             listOf(20000, 25074),
@@ -1428,118 +1421,118 @@ object Constants {
             listOf(20000, 27093),
         ),
         "HPP1-0124-0012" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0013" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0014" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0015" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0016" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0017" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0018" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0019" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0020" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0021" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(20000, 25074),
+            listOf(20000, 24596),
+            listOf(20000, 26065),
+            listOf(20000, 27093),
         ),
         "HPP1-0124-0022" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0023" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0024" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0025" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0026" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0027" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0028" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0029" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0030" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0031" to listOf(
             listOf(20000, 25074),
@@ -1548,121 +1541,122 @@ object Constants {
             listOf(20000, 27093),
         ),
         "HPP1-0124-0032" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0033" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0034" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0035" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0036" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0037" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0038" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0039" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0040" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
-        "HPP1-0124-0040" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+        "HPP1-0124-0041" to listOf(
+            listOf(20000, 25074),
+            listOf(20000, 24596),
+            listOf(20000, 26065),
+            listOf(20000, 27093),
         ),
         "HPP1-0124-0042" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0043" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0044" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0045" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0046" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0047" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0048" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0049" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         ),
         "HPP1-0124-0050" to listOf(
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
-            listOf(23500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
+            listOf(24500, 26250),
         )
     )
 
+
     val COEFFICIENTS: Map<String, List<List<Double>>> = mapOf(
         "HC-V1-005" to listOf(
             listOf(1.5,0.0),

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

@@ -4,10 +4,6 @@ enum class TestStatus(val code: Double) {
     TEST_STARTED(1.0),
     CONFIG_STARTED(2.0),
     CONFIG_COMPLETED(3.0),
-    FIRST_EMPTY_AIR_READING_STARTED(4.1),
-    FIRST_EMPTY_AIR_READING_COMPLETED(4.2),
-    FIRST_EMPTY_AIR_READING_PRINT_STARTED(4.3),
-    FIRST_EMPTY_AIR_READING_PRINT_COMPLETED(4.4),
     BUFFER_STARTED(4.0),
     BUFFER_COMPLETED(5.0),
     BUFFER_PRINT_STARTED(6.0),
@@ -16,10 +12,6 @@ enum class TestStatus(val code: Double) {
     SAMPLE_COMPLETED(9.0),
     SAMPLE_PRINT_STARTED(10.0),
     SAMPLE_PRINT_COMPLETED(11.0),
-    SECOND_EMPTY_AIR_READING_STARTED(11.1),
-    SECOND_EMPTY_AIR_READING_COMPLETED(11.2),
-    SECOND_EMPTY_AIR_PRINT_STARTED(11.3),
-    SECOND_EMPTY_AIR_PRINT_COMPLETED(11.4),
     FIRST_GAIN_STARTED(12.0),
     FIRST_GAIN_COMPLETED(13.0),
     FIRST_GAIN_PRINT_STARTED(14.0),

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

@@ -8,7 +8,7 @@ import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 
-@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 26, exportSchema = false)
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 23, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao

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

@@ -1,44 +0,0 @@
-package com.example.hpostesting.data.model
-
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-
-data class TestState (
-    var testDetails: HemoCubeTestData? = null,
-    var isOnline: Boolean = false,
-    var currentDeviceData: DeviceData? = null,
-    var resultData: String = "",
-    var currentResultData: String = "",
-    var isUsingExistingBuffer: Boolean = false,
-    var isTestOngoing: Boolean = false,
-    var led1BufferForDevice: Double = 0.0,
-    var led2BufferForDevice: Double = 0.0,
-    var led3BufferForDevice: Double = 0.0,
-    var led4BufferForDevice: Double = 0.0,
-    var led1SampleForDevice: Double = 0.0,
-    var led2SampleForDevice: Double = 0.0,
-    var led3SampleForDevice: Double = 0.0,
-    var led4SampleForDevice: Double = 0.0,
-    var fittedAbs1: Double = 0.0,
-    var fittedAbs2: Double = 0.0,
-    var fittedAbs3: Double = 0.0,
-    var fittedAbs4: Double = 0.0,
-//    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 calculatedPredictedDenovixRatio: Double = 0.0,
-    var validationError: Boolean = false,
-    var deviceHardwareId: String = "",
-    var allErrorMessages: String = "",
-    var testStatusCode: Double = 0.0,
-    var repeatReadingCount: Int = 0,
-    var readingsPerSample: Int = Constants.READINGS_PER_SAMPLE,
-    var uploadedToCloud: Boolean = false,
-    var uploadedToMolbio: Boolean = false
-)

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/AdditionalDetails.kt

@@ -1,14 +0,0 @@
-package com.example.hpostesting.data.model.devicediagnostics
-
-data class AdditionalDetails(
-     val batteryLevel: String? = "",
-     val batteryCapacity: String? = "",
-     val batteryMaxCapacity: String? = "",
-     val batteryTemperature: String? = "",
-     val batteryVoltage: String? = "",
-)
-
-
-
-
-

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsData.kt

@@ -1,12 +0,0 @@
-package com.example.hpostesting.data.model.devicediagnostics
-
-data class DeviceDiagnosticsData(
-    val id: String? = "",
-    val deviceId: String? = "",
-    val additionalDetails: AdditionalDetails?= AdditionalDetails(),
-    val createdBy: String? = "",
-    val updatedBy: String? = "",
-    val updatedAt: String? = "",
-    val createdAt: String? = "",
-)
-

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsRequest.kt

@@ -1,5 +0,0 @@
-package com.example.hpostesting.data.model.devicediagnostics
-
-data class DeviceDiagnosticsRequest(
-    val additionalDetails: AdditionalDetails?= AdditionalDetails()
-)

app/src/main/java/com/example/hpostesting/data/model/devicediagnostics/DeviceDiagnosticsResponse.kt

@@ -1,11 +0,0 @@
-package com.example.hpostesting.data.model.devicediagnostics
-
-import com.google.gson.annotations.SerializedName
-
-
-data class DeviceDiagnosticsResponse(
-    @SerializedName("Data")
-    val data: DeviceDiagnosticsData? = DeviceDiagnosticsData(),
-    val message: String? = "",
-    val result: String? = ""
-)

app/src/main/java/com/example/hpostesting/data/model/deviceprovision/ProvisionData.kt

@@ -1,8 +0,0 @@
-package com.example.hpostesting.data.model.deviceprovision
-
-data class ProvisionData(
-val username: String?,
-val password: String?,
-val natsToken: String?
-)
-

app/src/main/java/com/example/hpostesting/data/model/diagnostics/DiagnosticsData.kt

@@ -5,8 +5,5 @@ data class DiagnosticsData (
     var appVersion: String? = "",
     var deviceType: String = "HEMOCUBE",
     var deviceData: String = "",
-    var devicePassword: String = "",
-    var deviceNatsToken: String = "",
-    var accessToken: String = "",
     var runTime: String = ""
 )

app/src/main/java/com/example/hpostesting/data/model/jig/JigData.kt

@@ -1,9 +0,0 @@
-package com.example.hpostesting.data.model.jig
-
-data class JigData (
-    var deviceId: String = "",
-    var appVersion: String? = "",
-    var deviceType: String = "JIG",
-    var scanData: String = "",
-    var createdAt: String = ""
-)

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

@@ -4,7 +4,7 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 
 data class MolbioV2Result(
     val age: Int? = 31,
-    val analysisDate: String? = "2024-02-08 16:33:56",
+    val analysisDate: String? = "",
     val analysisId: String? = "",
     val analysisStatus: String? = "",
     val analysisType: String? = "HPOS",
@@ -12,11 +12,11 @@ data class MolbioV2Result(
     val bloodGroup: String? = "",
     val coefficients: List<Int>? = listOf(22, 22),
     val collectionLocation: List<Any>? = listOf(),
-    val collectionTime: String? = "2024-02-08 16:33:56",
+    val collectionTime: String? = "",
     val collector: String? = "",
     val curveFitting: String? = "Linear",
     val deviceName: String? = "HPOS",
-    val expiryTime: String? = "2024-02-08 16:33:56",
+    val expiryTime: String? = "",
     val gender: String? = "",
     val interpretation: String? = "",
     val `operator`: String? = "",
@@ -30,7 +30,7 @@ data class MolbioV2Result(
     val testId: String? = "",
     val testResult: String? = "",
     val testStatus: String? = "",
-    val testTime: String? = "2024-02-08 16:33:56",
+    val testTime: String? = "",
     val testType: String? = "",
     val thresholds: String? = "",
     val underMedication: Boolean? = false,

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

@@ -15,15 +15,5 @@ data class DeviceData(
     @get:PropertyName("coefficients") @set:PropertyName("coefficients")
     var coefficients: List<Double> = emptyList(),
     @get:PropertyName("calibratedAt") @set:PropertyName("calibratedAt")
-    var calibratedAt: String = ""  ,
-    @get:PropertyName("deviceProvisionResponse") @set:PropertyName("deviceProvisionResponse")
-    var deviceProvisionResponse: String = "" ,
-    @get:PropertyName("username") @set:PropertyName("username")
-    var username: String = "",
-    @get:PropertyName("password") @set:PropertyName("password")
-    var password: String = "",
-    @get:PropertyName("natsToken") @set:PropertyName("natsToken")
-    var natsToken: String = "",
-    @get:PropertyName("natsTokenExpiry") @set:PropertyName("natsTokenExpiry")
-    var natsTokenExpiry: String = ""
+    var calibratedAt: String = ""
 )

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

@@ -61,14 +61,6 @@ data class HemoCubeTestData(
     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,

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

@@ -6,12 +6,9 @@ import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.model.PendingUploads
 import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.jig.JigData
 import com.example.hpostesting.data.model.log.UploadLogsResponse
 import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.login.LoginResponse
@@ -60,7 +57,7 @@ class DatabaseRepository @Inject constructor(
         }
     }
 
-    override suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse> {
+    suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse> {
         return safeApiCall { molbioAuthApi.deviceProvision(deviceProvisionRequest) }
     }
 
@@ -80,14 +77,6 @@ class DatabaseRepository @Inject constructor(
         return safeApiCall { molbioResultApi.deviceUpdate(deviceUpdateRequest) }
     }
 
-    override suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse> {
-        return safeApiCall { molbioResultApi.deviceDiagnostics(deviceDiagnosticsRequest) }
-    }
-
-    override suspend fun downloadClientCertificate(): Result<ResponseBody> {
-        return safeApiCall { molbioResultApi.downloadClientCertificate() }
-    }
-
     override suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse> {
         return safeApiCall { molbioResultApi.uploadLogs(logFile) }
     }
@@ -145,16 +134,6 @@ class DatabaseRepository @Inject constructor(
         }
     }
 
-    override suspend fun addTestJigData(data: JigData?): Response<String> {
-        return try {
-            db.collection("jigs").add(data!!).await()
-            Response.Success(data.deviceId)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
     override suspend fun uploadFileToStorage(
         patientID: String, filePath: String
     ): Response<Boolean> {
@@ -224,28 +203,7 @@ class DatabaseRepository @Inject constructor(
         return allDeviceDataList.find { it.deviceId == deviceId }
     }
 
-    override suspend fun getDeviceResponse(data: DeviceData?): Response<String> {
-        return try {
-            db.collection("devices").add(data!!).await()
-            Response.Success(data.deviceProvisionResponse)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
-    override suspend fun uploadDeviceId(data: DeviceData): Response<String>? {
-        return try {
-            db.collection("devices").add(data!!).await()
-            Response.Success(data.deviceId)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
     override fun <UserData> addTestToDatabase(testDetails: UserData): Any {
         TODO("Not yet implemented")
     }
-
 }

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

@@ -2,12 +2,7 @@ package com.example.hpostesting.data.repository
 
 import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.jig.JigData
 import com.example.hpostesting.data.model.log.UploadLogsResponse
 import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.login.LoginResponse
@@ -32,18 +27,12 @@ interface Repository {
 
     suspend fun addDiagnostics(data: DiagnosticsData?): Response<String>
 
-    suspend fun addTestJigData(data: JigData?): Response<String>
-
     suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean>
 
     suspend fun getDeviceDataById(deviceId: String): DeviceData?
-    suspend fun getDeviceResponse(data: DeviceData?): Response<String>
-    suspend fun uploadDeviceId(data: DeviceData): Response<String>?
     abstract fun <UserData> addTestToDatabase(testDetails: UserData): Any
 //    suspend fun addToDatabase(data: PatientDetails)
 
-    suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse>
-
     suspend fun login(loginRequest: LoginRequest): Result<LoginResponse>
 
     suspend fun uploadResults(molbioV2ResultRequest: MolbioV2ResultRequest): Result<MolbioV2ResultResponse>
@@ -51,7 +40,6 @@ interface Repository {
     suspend fun checkUpdate(checkUpdateRequest: CheckUpdateRequest): Result<CheckUpdateResponse>
 
     suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody>
-    suspend fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest): Result<DeviceDiagnosticsResponse>
-    suspend fun downloadClientCertificate(): Result<ResponseBody>
+
     suspend fun uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse>
 }

app/src/main/java/com/example/hpostesting/domain/LogFileManagerImpl.kt

@@ -1,6 +1,7 @@
 package com.example.hpostesting.domain
 
 import android.content.Context
+import android.util.Log
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -31,7 +32,7 @@ class LogFileManagerImpl @Inject constructor(private val context: Context) : Log
 
             file
         } catch (e: IOException) {
-//            Log.e("LogFileManager", "Error creating log file: ${e.message}")
+            Log.e("LogFileManager", "Error creating log file: ${e.message}")
             null
         }
     }

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

@@ -1,19 +1,18 @@
 package com.example.hpostesting.presentation
 
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.text.Editable
 import android.util.Log
 import android.view.View
-import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
+
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import com.example.hpostesting.presentation.testRight.TestRightActivity
 import com.google.android.material.snackbar.Snackbar
@@ -21,28 +20,16 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanIntentResult
 import com.journeyapps.barcodescanner.ScanOptions
-import com.zebra.barcode.sdk.sms.ConfigurationUpdateEvent
-import com.zebra.scannercontrol.DCSSDKDefs
-import com.zebra.scannercontrol.DCSSDKDefs.DCSSDK_COMMAND_OPCODE
-import com.zebra.scannercontrol.DCSSDKDefs.DCSSDK_RESULT
-import com.zebra.scannercontrol.DCSScannerInfo
-import com.zebra.scannercontrol.FirmwareUpdateEvent
-import com.zebra.scannercontrol.IDcsSdkApiDelegate
-import com.zebra.scannercontrol.SDKHandler
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityKitScanBinding
 
-class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
+class KitScanActivity : AppCompatActivity() {
 
     private val TAG = "KitScanActivity"
     private lateinit var binding: ActivityKitScanBinding
 
     private lateinit var sharedPreference: SharedPreferences
 
-    var sdkHandler: SDKHandler? = null
-    var editBarcode: EditText? = null
-    var mScannerInfoList = ArrayList<DCSScannerInfo>()
-
     private val barcodeLauncher = registerForActivityResult(
         ScanContract()
     ) { result: ScanIntentResult ->
@@ -64,35 +51,6 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         super.attachBaseContext(newBase)
     }
 
-
-    override fun dcssdkEventScannerAppeared(dcsScannerInfo: DCSScannerInfo?) {}
-
-    override fun dcssdkEventScannerDisappeared(i: Int) {}
-
-    override fun dcssdkEventCommunicationSessionEstablished(dcsScannerInfo: DCSScannerInfo?) {}
-
-    override fun dcssdkEventCommunicationSessionTerminated(i: Int) {}
-//    override fun dcssdkEventBarcode(p0: ByteArray?, p1: Int, p2: Int) {
-//        TODO("Not yet implemented")
-//    }
-
-
-    override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventBinaryData(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventFirmwareUpdate(firmwareUpdateEvent: FirmwareUpdateEvent?) {}
-
-    override fun dcssdkEventAuxScannerAppeared(
-        dcsScannerInfo: DCSScannerInfo?,
-        dcsScannerInfo1: DCSScannerInfo?
-    ) {
-    }
-
-    override fun dcssdkEventConfigurationUpdate(configurationUpdateEvent: ConfigurationUpdateEvent?) {}
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -152,8 +110,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         setSupportActionBar(binding.toolbar)
 
         binding.btnScanNow.setOnClickListener {
-//            startScanningNow()
-            pullTrigger()
+            startScanningNow()
         }
 
 
@@ -207,70 +164,13 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
                 Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
             }
         }
-
-        //Setting up the SDK handler
-        sdkHandler = SDKHandler(this)
-        //Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications.
-        sdkHandler!!.dcssdkSetDelegate(this)
-        //this command is telling the sdk that we're going to be connecting to the scanner via USB
-        sdkHandler!!.dcssdkSetOperationalMode(DCSSDKDefs.DCSSDK_MODE.DCSSDK_OPMODE_SNAPI)
-
-        //deciding what kind of notifications we want to receive. Explained more in the function
-        //first we use bitmapping to set these values into the notifications_mask.
-        var notifications_mask = 0
-        // We would like to subscribe to all barcode events
-        notifications_mask =
-            notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
-        sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
-        mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
-        Log.e("scannersize",sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
-        if (mScannerInfoList.isNotEmpty()) {
-            sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
-        } else {
-            Toast.makeText(this,"Error", Toast.LENGTH_LONG).show()
-        }
-    }
-
-    private fun pullTrigger() {
-        // Check if the list is not empty before accessing its elements
-        if (mScannerInfoList.isNotEmpty()) {
-            // Only proceed if the scanner is not active
-            if (!mScannerInfoList[0].isActive) {
-                sdkHandler?.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
-            }
-            val inXML = "<inArgs><scannerID> 1 </scannerID></inArgs>"
-            val outXML = StringBuilder()
-            val result: DCSSDK_RESULT =
-                sdkHandler!!.dcssdkExecuteCommandOpCodeInXMLForScanner(
-                    DCSSDK_COMMAND_OPCODE.DCSSDK_DEVICE_PULL_TRIGGER, inXML, outXML, mScannerInfoList[0].scannerID // Ensure you're using the correct scanner ID
-                )
-            if (result == DCSSDK_RESULT.DCSSDK_RESULT_SUCCESS) {
-                Log.d("Scanning", "Success")
-            } else if (result == DCSSDK_RESULT.DCSSDK_RESULT_FAILURE) {
-                Log.d("Scanning", "Failed")
-            }
-        } else {
-            // Handle the case where the list is empty, perhaps notify the user or log an error
-            Log.e("ScannerError", "No scanners are connected or available.")
-        }
-    }
-
-
-    //this function is called if barcode is detected.
-    override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) {
-        val result = String(barcodeData!!)
-        Log.d("BARCODE", result)
-        runOnUiThread {
-            val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
-            binding.nameEditText.text = editableResult
-        }
     }
 
     private fun checkHemoCubeKitData(): Boolean {
         return sharedPreference.getString(Constants.KIT_NUMBER, "")
             ?.isNotBlank() == true && sharedPreference.getInt(
             Constants.KIT_COUNT, 0
-        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < Constants.KIT_CAPACITY
+        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < 35
     }
 
     private fun isSerialValid(s: String): Boolean {
@@ -285,7 +185,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 
         DataHolder.deviceType.observe(this) { deviceType ->
             when (deviceType) {
-                Constants.DEVICE_TYPE_HEMOCUBE -> {
+                Constants.DEVICE_TYPE_HOMOCUBE -> {
                     val i = Intent(applicationContext, HemocubeActivity::class.java)
                     startActivity(i)
                 }
@@ -294,11 +194,6 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
                     val i = Intent(applicationContext, TestRightActivity::class.java)
                     startActivity(i)
                 }
-
-                Constants.DEVICE_TYPE_TRUEHEME -> {
-                    val i = Intent(applicationContext, HemocubeActivity::class.java)
-                    startActivity(i)
-                }
             }
         }
     }

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

@@ -1,10 +1,8 @@
 package com.example.hpostesting.presentation
 
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.Manifest
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
+import android.content.*
 import android.content.pm.PackageManager
 import android.hardware.usb.UsbManager
 import android.location.Location
@@ -22,12 +20,7 @@ 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
-import com.google.android.gms.location.LocationCallback
-import com.google.android.gms.location.LocationRequest
-import com.google.android.gms.location.LocationResult
-import com.google.android.gms.location.LocationServices
+import com.google.android.gms.location.*
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -88,7 +81,7 @@ class MainActivity : AppCompatActivity() {
 
         DataHolder.deviceType.observe(this) { deviceType ->
             with(binding) {
-                if (deviceType == Constants.DEVICE_TYPE_HEMOCUBE) {
+                if (deviceType == Constants.DEVICE_TYPE_HOMOCUBE) {
                     cvItem1.visibility = View.VISIBLE
                     cvItem3.visibility = View.VISIBLE
                     cvItem2.visibility = View.GONE
@@ -118,8 +111,8 @@ class MainActivity : AppCompatActivity() {
                         binding.cvItem3.visibility = View.VISIBLE
                         binding.cvItem2.visibility = View.GONE
                         binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
+                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
+                        Constants.DEVICE_TYPE_HOMOCUBE
                     }
 
                     device.productId == Constants.HEMO_CUBE_V2_PRODUCT_ID && device.vendorId == Constants.HEMO_CUBE_V2_VENDOR_ID -> {
@@ -127,8 +120,8 @@ class MainActivity : AppCompatActivity() {
                         binding.cvItem3.visibility = View.VISIBLE
                         binding.cvItem2.visibility = View.GONE
                         binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
+                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
+                        Constants.DEVICE_TYPE_HOMOCUBE
                     }
 
                     device.productId == 24577 && device.vendorId == 1027 -> {
@@ -136,8 +129,8 @@ class MainActivity : AppCompatActivity() {
                         binding.cvItem3.visibility = View.VISIBLE
                         binding.cvItem2.visibility = View.GONE
                         binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_TRUEHEME)
-                        Constants.DEVICE_TYPE_TRUEHEME
+                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
+                        Constants.DEVICE_TYPE_HOMOCUBE
                     }
 
                     device.productId == 8963 && device.vendorId == 1659 -> {
@@ -145,17 +138,8 @@ class MainActivity : AppCompatActivity() {
                         binding.cvItem3.visibility = View.VISIBLE
                         binding.cvItem2.visibility = View.GONE
                         binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
-                    }
-
-                    device.productId == 4614 && device.vendorId == 7111 -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
+                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
+                        Constants.DEVICE_TYPE_HOMOCUBE
                     }
 
                     device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> {
@@ -294,6 +278,7 @@ class MainActivity : AppCompatActivity() {
 //            exception.printStackTrace()
 //        }
 
+
         fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
             location?.let {
                 if (DataHolder.selectedTest != null) {
@@ -317,6 +302,9 @@ class MainActivity : AppCompatActivity() {
             val rootView = findViewById<View>(android.R.id.content)
             Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
         }
+
+
+
     }
 
     private fun requestLocationUpdates() {

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

@@ -1,10 +1,6 @@
 package com.example.hpostesting.presentation
 
-import android.content.Context
-import android.os.Build
 import android.util.Log
-import androidx.annotation.RequiresApi
-import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import io.nats.client.AuthHandler
 import io.nats.client.Connection
@@ -12,17 +8,9 @@ import io.nats.client.Message
 import io.nats.client.NKey
 import io.nats.client.Nats
 import io.nats.client.Options
-import io.nats.client.support.SSLUtils
-import java.io.FileInputStream
 import java.io.IOException
 import java.nio.charset.StandardCharsets
 import java.security.GeneralSecurityException
-import java.security.KeyStore
-import java.security.SecureRandom
-import java.security.cert.CertificateFactory
-import javax.net.ssl.KeyManagerFactory
-import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManagerFactory
 
 
 class NatsManager(datacollector: DashboardActivity) {
@@ -31,160 +19,103 @@ class NatsManager(datacollector: DashboardActivity) {
     var nc: Connection? = null
     val datacollector = datacollector
     var connect = false
-    var sharedPreferences = datacollector.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
 
-    private fun createSSLContext(): SSLContext {
-        val keyStorePassword = "prime24".toCharArray() // Change as necessary
-        val clientCertPath = "/storage/sdcard0/Download/client.p12"
-
-        // Load client certificate and key
-        val keyStore = KeyStore.getInstance("PKCS12")
-        FileInputStream(clientCertPath).use { keyStoreInputStream ->
-            keyStore.load(keyStoreInputStream, keyStorePassword)
-        }
-        val caCertPath =
-            "/storage/sdcard0/Android/data/in.sminnovations.hpostesting.quality/files/NATS/clientCertificate/client-cert.pem"
-        val caCert = FileInputStream(caCertPath).use { inputStream ->
-            val certificateFactory = CertificateFactory.getInstance("X.509")
-            certificateFactory.generateCertificate(inputStream)
-        }
-
-        val trustStore = KeyStore.getInstance(KeyStore.getDefaultType()).apply {
-            load(null, null) // Initialize the keystore
-            setCertificateEntry("caCert", caCert) // Add the CA certificate
-        }
-
-        // Initialize key manager factory
-        val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
-        kmf.init(keyStore, keyStorePassword)
-
-        // Initialize trust manager factory
-        val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-        tmf.init(trustStore)
-
-        // Initialize SSLContext
-        val sslContext = SSLContext.getInstance("TLS")
-        sslContext.init(kmf.keyManagers, tmf.trustManagers, SecureRandom())
-
-        return sslContext
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
     fun connect() {
         Log.d(TAG, "TRY TO CONNECT")
         Thread {
 
+            val seedString = "SUAEB5PUWNS6C2HUV3MFI6HUDEAPGPFPBHMI73NHIQATCDD2BWALVEZXZ4"
+            val seedBytes = seedString.toCharArray()
+
+            val theNKey = NKey.fromSeed(seedBytes) // really should load from somewhere
+
+            val options = Options.Builder()
+                .server("nats://192.168.10.117:4222")
+                .authHandler(object : AuthHandler {
+                    override fun getID(): CharArray? {
+                        return try {
+                            theNKey?.publicKey
+                        } catch (ex: GeneralSecurityException) {
+                            null
+                        } catch (ex: IOException) {
+                            null
+                        } catch (ex: NullPointerException) {
+                            null
+                        }
+                    }
+
+                    override fun sign(nonce: ByteArray): ByteArray? {
+                        return try {
+                            theNKey?.sign(nonce)
+                        } catch (ex: GeneralSecurityException) {
+                            null
+                        } catch (ex: IOException) {
+                            null
+                        } catch (ex: NullPointerException) {
+                            null
+                        }
+                    }
+
+                    override fun getJWT(): CharArray? {
+                        return null
+                    }
+                })
+                .build()
+
             try {
-
-                val seedString = sharedPreferences.getString(Constants.NATS_TOKEN, "")
-                val deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
-                Log.e("seedString", seedString.toString())
-                Log.d("nats deviceId", deviceId.toString())
-                val seedBytes = seedString?.toCharArray()
-
-                val theNKey = NKey.fromSeed(seedBytes) // really should load from somewhere
-
-                val options = Options.Builder()
-                    .server("nats://nanodgx.in:4222")
-                    .sslContext(SSLUtils.createOpenTLSContext())
-                    .authHandler(object : AuthHandler {
-                        override fun getID(): CharArray? {
-                            return try {
-                                theNKey?.publicKey
-                            } catch (ex: GeneralSecurityException) {
-                                null
-                            } catch (ex: IOException) {
-                                null
-                            } catch (ex: NullPointerException) {
-                                null
-                            }
-                        }
-
-                        override fun sign(nonce: ByteArray): ByteArray? {
-                            return try {
-                                theNKey?.sign(nonce)
-                            } catch (ex: GeneralSecurityException) {
-                                null
-                            } catch (ex: IOException) {
-                                null
-                            } catch (ex: NullPointerException) {
-                                null
-                            }
-                        }
-
-                        override fun getJWT(): CharArray? {
-                            return null
-                        }
-                    })
-                    .build()
-
                 nc = Nats.connect(options)
                 Log.d(TAG, "Connected to Nats server ${options.servers.first()}")
                 connect = true
                 datacollector.setConnect(true)
 
-                if (nc?.status == Connection.Status.CONNECTED) {
-                    Log.d("NATSCONNECTION", "NATS is successfully connected.")
 
-                    val d = nc?.createDispatcher { msg: Message? ->
-                        println("Nats dispatcher $msg")
-                    }
+                nc?.publish(
+                    "server.hpos.HCV-000-3001.ping",
+                    "ALIVE".toByteArray(StandardCharsets.UTF_8)
+                )
+                nc?.publish(
+                    "server.hpos.HCV-000-3001.health",
+                    "ALIVE".toByteArray(StandardCharsets.UTF_8)
+                )
+                Log.d(TAG, "Published msg server.hpos.HCV-000-3001.ping on topic Testing")
+                val d = nc?.createDispatcher { msg: Message? ->
+                    println("PRITIMOI SARKAR $msg")
+                }
 
-                    nc?.subscribe("device.hpos.${deviceId}.ping")
+                d?.subscribe("device.hpos.HCV-000-3001.update") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector. setResponse(response)
+                    println("Message received (up to 100 times): $response")
+                }
 
-                    nc?.publish(
-                        "server.hpos.${deviceId}.ping",
-                        "ALIVE".toByteArray(StandardCharsets.UTF_8)
-                    )
-                    nc?.publish(
-                        "server.hpos.${deviceId}.health",
-                        "ALIVE".toByteArray(StandardCharsets.UTF_8)
-                    )
+                d?.subscribe("device.hpos.HCV-000-3001.uploadlogs") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response + "uPLOAD")
+                    println("Message received (up to 100 times): $response")
+                }
 
-                    d?.subscribe("device.hpos.${deviceId}.ping") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response)
-                        println("Message received (up to 100 times): $response")
-                        Log.d(TAG, "subscribed msg ${msg} on topic ping")
-                    }
+                d?.subscribe("device.hpos.HCV-000-3001.disable") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response)
+                    println("Message received (up to 100 times): $response")
+                }
 
-                    d?.subscribe("device.hpos.${deviceId}.update") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response)
-                        println("Message received (up to 100 times): $response")
-                    }
+                d?.subscribe("device.hpos.HCV-000-3001.updatecustomer") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response)
+                    println("Message received (up to 100 times): $response")
+                }
 
-                    d?.subscribe("device.hpos.${deviceId}.uploadlogs") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response + "UPLOAD")
-                        println("Message received (up to 100 times): $response")
-                    }
-
-                    d?.subscribe("device.hpos.${deviceId}.disable") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response)
-                        println("Message received (up to 100 times): $response")
-                    }
-
-                    d?.subscribe("device.hpos.${deviceId}.updatecustomer") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response)
-                        println("Message received (up to 100 times): $response")
-                    }
-
-                    d?.subscribe("device.hpos.${deviceId}.checkupdate") { msg ->
-                        val response = String(msg.data, StandardCharsets.UTF_8)
-                        datacollector.setResponse(response)
-                        println("Message received (up to 100 times): $response")
-                    }
-                } else {
-                    Log.d("NATSCONNECTION", "NATS is not connected. Current status: ${nc?.status}")
+                d?.subscribe("device.hpos.HCV-000-3001.checkupdate") { msg ->
+                    val response = String(msg.data, StandardCharsets.UTF_8)
+                    datacollector.setResponse(response)
+                    println("Message received (up to 100 times): $response")
                 }
 
             } catch (exp: Exception) {
                 println(exp.printStackTrace())
                 connect = false
-                datacollector.setConnect(false)
+                datacollector.setConnect(true)
             }
         }.start()
 
@@ -195,16 +126,6 @@ class NatsManager(datacollector: DashboardActivity) {
         Log.d(TAG, "Published msg ${msg} on topic ${topic}")
     }
 
-    fun sub(topic: String) {
-        val d = nc?.createDispatcher { msg: Message? ->
-            val response = String(msg?.data ?: ByteArray(0), StandardCharsets.UTF_8)
-            datacollector.onMessageReceived(topic, response)
-            Log.d(TAG, "Subscribed msg $msg on topic $topic")
-        }
-
-        d?.subscribe(topic)
-    }
-
     fun close() {
         nc?.close()
         Log.d(TAG, "Nats connection close")

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

@@ -243,6 +243,8 @@ class UserListAdapter(
         }
     }
 
+
+
     private fun isBetween15And30Minutes(createdAt: String): Long {
         val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
         val createdAtDate: Date = formatter.parse(createdAt)!!

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

@@ -12,7 +12,7 @@ import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Spinner
-import android.widget.Toast
+import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
@@ -22,7 +22,7 @@ import `in`.sminnovations.hpostesting.databinding.FragmentAssuranceControlsBindi
 import java.time.Instant
 
 class AssuranceControlsFragment: Fragment() {
-    lateinit var binding: FragmentAssuranceControlsBinding
+    private lateinit var binding: FragmentAssuranceControlsBinding
     private lateinit var sharedPreferences: SharedPreferences
 
     override fun onCreateView(
@@ -31,9 +31,6 @@ class AssuranceControlsFragment: Fragment() {
         binding = FragmentAssuranceControlsBinding.inflate(inflater, container, false)
         sharedPreferences =
             requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
-        DataHolder.hemoCubeTestData!!.solution = ""
-        DataHolder.hemoCubeTestData!!.volume = ""
         return binding.root
     }
 
@@ -46,7 +43,7 @@ class AssuranceControlsFragment: Fragment() {
 //        binding.btnSubmit.visibility = View.GONE
 
         val solutionSpinner: Spinner = binding.spinnerSolutions
-        val solutionOptions = arrayOf("Select solution", "Tartrazine", "Acid Red")
+        val solutionOptions = arrayOf("Select solution", "KMnO4", "Tartrazine", "AR", "HB", "Blood")
         val solutionAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
         solutionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         solutionSpinner.adapter = solutionAdapter
@@ -68,7 +65,7 @@ class AssuranceControlsFragment: Fragment() {
         }
 
         val concentrationSpinner: Spinner = binding.spinnerConcentration
-        val concentrationOptions = arrayOf("Select concentration", "65umol", "45umol", "22.5umol", "12.25umol", "6.125umol", "75umol", "50umol", "25umol", "12.5umol", "6.25umol")
+        val concentrationOptions = arrayOf("Select concentration", "250umol", "350umol", "450umol", "550umol", "650umol")
         val concentrationAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, concentrationOptions)
         concentrationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         concentrationSpinner.adapter = concentrationAdapter
@@ -125,13 +122,6 @@ class AssuranceControlsFragment: Fragment() {
         volumeSpinner.setSelection(volumePosition)
 
         binding.btnSubmit.setOnClickListener {
-            val selectedSolution = DataHolder.hemoCubeTestData!!.solution
-            val selectedVolume = DataHolder.hemoCubeTestData!!.volume
-            if (selectedSolution == "Select solution" || selectedVolume == "Select volume") {
-                Toast.makeText(requireContext(), "Please select both solution and volume", Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
-
             DataHolder.hemoCubeTestData!!.quickCapture = true
             val currentUnixTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 Instant.now().epochSecond

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

@@ -145,18 +145,18 @@ class AutoDacActivity: AppCompatActivity()  {
         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
+                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
             )
         } else {
             mPendingIntent = PendingIntent.getBroadcast(
                 this,
                 0,
-                Intent(Constants.HEMOCUBE_USB_PERMISSION),
+                Intent(Constants.HOMOCUBE_USB_PERMISSION),
                 PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
             )
         }
 
-        val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
+        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
         registerReceiver(broadcastReceiver, filter)
         manager.requestPermission(device, mPendingIntent)
     }

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

@@ -12,15 +12,11 @@ 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.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.presentation.UsbServiceListener
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentAutoDacBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
 
 class AutoDacFragment: Fragment() {
 
@@ -105,6 +101,8 @@ class AutoDacFragment: Fragment() {
             HemoCubeCommands.AUTO_DAC_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
+
+
                 }
                 override fun onUsbError(e: Exception?) {
                     autoDacViewModel.progressBar.postValue(false)
@@ -143,22 +141,22 @@ class AutoDacFragment: Fragment() {
                     }
 
                     if (resultData.contains("#CC")) {
-                        autoDacViewModel.addAutoDacDataToDb(
-                            DiagnosticsData(
-                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                                devicePassword = sharedPreferences.getString(Constants.DEVICE_PASSWORD_API, "").toString(),
-                                deviceNatsToken = sharedPreferences.getString(Constants.NATS_TOKEN, "").toString(),
-                                accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString(),
-                                deviceData = resultData,
-                                runTime = SimpleDateFormat(
-                                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                                ).format(Calendar.getInstance().time)
-                            )
-                        )
                         activity?.runOnUiThread {
                             binding.ivCheck.visibility = View.VISIBLE
                         }
                     }
+
+                    if (resultData.contains("END") || fullReadOutput.contains("END")) {
+//                        autoDacViewModel.addAutoDacDataToDb(
+//                            DiagnosticsData(
+//                            deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
+//                            deviceData = resultData,
+//                            runTime = SimpleDateFormat(
+//                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+//                            ).format(Calendar.getInstance().time)
+//                        )
+//                        )
+                    }
                 }
 
                 override fun onUsbError(e: Exception?) {
@@ -170,6 +168,7 @@ class AutoDacFragment: Fragment() {
         }
     }
 
+
     fun parseData(inputData: List<String>): List<Pair<String, String>> {
         val pattern = Regex("([A-Z]+)\\s(\\d+)")
         val parsedData = mutableListOf<Pair<String, String>>()

app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemocubeBufferCheckActivity.kt

@@ -1,6 +1,5 @@
 package com.example.hpostesting.presentation.buffercheck
 
-import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.ComponentName
@@ -125,22 +124,21 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
     }
 
 
-    @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) {
             PendingIntent.getBroadcast(
-                this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
+                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
             )
         } else {
             PendingIntent.getBroadcast(
                 this,
                 0,
-                Intent(Constants.HEMOCUBE_USB_PERMISSION),
+                Intent(Constants.HOMOCUBE_USB_PERMISSION),
                 PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
             )
         }
 
-        val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
+        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
         registerReceiver(broadcastReceiver, filter)
         manager.requestPermission(device, mPendingIntent)
     }

app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationActivity.kt

@@ -144,18 +144,18 @@ class CalibrationActivity: AppCompatActivity()  {
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
         val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             PendingIntent.getBroadcast(
-                this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
+                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
             )
         } else {
             PendingIntent.getBroadcast(
                 this,
                 0,
-                Intent(Constants.HEMOCUBE_USB_PERMISSION),
+                Intent(Constants.HOMOCUBE_USB_PERMISSION),
                 PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
             )
         }
 
-        val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
+        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
         registerReceiver(broadcastReceiver, filter)
         manager.requestPermission(device, mPendingIntent)
     }

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

@@ -4,9 +4,8 @@ import android.app.DownloadManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.SharedPreferences
+import android.content.IntentFilter
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
@@ -21,12 +20,14 @@ import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.NatsManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.jig.JigActivity
 import com.google.android.material.navigation.NavigationView
+import com.google.android.material.progressindicator.LinearProgressIndicator
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.appupdate.AppUpdateManagerFactory
+
 import com.google.firebase.appdistribution.FirebaseAppDistribution
 import com.google.firebase.appdistribution.FirebaseAppDistributionException
 import com.google.firebase.crashlytics.FirebaseCrashlytics
@@ -34,24 +35,18 @@ import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
 import okhttp3.ResponseBody
+
 import java.io.File
 
-interface NatsMessageCallback {
-    fun onMessageReceived(topic: String, message: String)
-}
-
-open interface IDataCollector: NatsMessageCallback {
+open interface IDataCollector {
     fun setConnect(connect: Boolean)
     fun setResponse(response: String)
 }
-
 @AndroidEntryPoint
 class DashboardActivity : AppCompatActivity(), IDataCollector {
 
-    val TAG = "DashboardActivity"
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityDashboardBinding
-    lateinit var sharedPreferences: SharedPreferences
     var responses: String = ""
     lateinit var nats: NatsManager
     private var downloadId: Long = 0
@@ -64,27 +59,15 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         super.attachBaseContext(newBase)
     }
 
-    override fun onMessageReceived(topic: String, message: String) {
-        // Handle incoming messages from NATS
-        Log.d(TAG, "Received message on topic $topic: $message")
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         binding = ActivityDashboardBinding.inflate(layoutInflater)
-        sharedPreferences = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         setContentView(binding.root)
         setSupportActionBar(binding.appBarDashboard.toolbar)
         nats = NatsManager(this)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            nats.connect()
-        }
-
-        val deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")
-
-        nats.sub("server.hpos.${deviceId}.ping")
-        nats.pub("server.hpos.${deviceId}.ping", "THIS IS A TEST MSG")
+        nats.connect()
+        nats.pub("server.hpos.HCV-000-3001.ping", "THIS IS A TEST MSG")
 
         hemocubeViewModel.deviceUpdate.observe(this) { result ->
             when (result) {
@@ -94,24 +77,29 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
 //                    val apkUrl = "https://dl.dropboxusercontent.com/s/fi/1c3nn7t0co431hicl3hrt/app-debug.apk?rlkey=e4uf13ty1dpcked614vy1aaqp&dl=0"
                     initiateUpdate(apkUrl.toString())
                     Log.d("ApI", "APK URL: $apkUrl")
-//                    Toast.makeText(
-//                        this,
-//                        "APK UPLOAD ${result.data}",
-//                        Toast.LENGTH_SHORT
-//                    ).show()
+                    Toast.makeText(
+                        this,
+                        "APK UPLOAD ${result.data}",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                    // The APK URL LiveData will be updated automatically
                 }
 
                 is Result.Error -> {
                         result.exception.let { message ->
                             Toast.makeText(this, "An error occurred On Updating App: $message", Toast.LENGTH_LONG)
                                 .show()
+
                     }
+
                 }
 
                 is Result.Loading -> {
+
                 }
 
                 else -> {
+
                 }
             }
         }
@@ -128,11 +116,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         )
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
-
-        if (Constants.NAVIGATE_TO_TEST_JIG_DIRECTLY) {
-            startActivity(Intent(this, JigActivity::class.java))
-            finish()
-        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -147,8 +130,12 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     }
 
     private fun initiateUpdate(responseBody: String) {
+        // Extract the URL from the ResponseBody
         val apkUrl = responseBody
+
+        // Check if the extracted APK URL is valid
         if (!isValidHttpUrl(apkUrl)) {
+            // Handle the case where the URL is not valid
             return
         }
 
@@ -162,12 +149,18 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         downloadId = downloadManager.enqueue(request)
 
         // Register a BroadcastReceiver to receive the download complete event
-//        val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-//        registerReceiver(downloadReceiver, filter)
+        val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
+        registerReceiver(downloadReceiver, filter)
     }
+
+    // Function to check if a URL has a valid HTTP/HTTPS scheme
+    // Function to extract the APK URL from the ResponseBody
     private fun extractApkUrl(responseBody: ResponseBody): String {
+        // Assuming your ResponseBody contains the APK URL as a string
         return responseBody.string()
     }
+
+    // Function to check if a URL has a valid HTTP/HTTPS scheme
     private fun isValidHttpUrl(url: String): Boolean {
         return url.startsWith("http://") || url.startsWith("https://")
     }
@@ -175,6 +168,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         override fun onReceive(context: Context?, intent: Intent?) {
             val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
             if (id == downloadId) {
+                // Install the downloaded APK
                 installApk()
             }
         }
@@ -184,10 +178,9 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         val file = File(getExternalFilesDir("Updates"), "update.apk")
         file.setReadable(true, false) // Ensure the file is readable
 
-        val pInfo = baseContext.packageManager.getPackageInfo(baseContext.packageName, 0)
         val uri: Uri = FileProvider.getUriForFile(
             this,
-            "${pInfo}.fileprovider",
+            "com.example.hpostesting.fileprovider",
             file
         )
 
@@ -208,9 +201,12 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
 
     override fun onDestroy() {
         super.onDestroy()
-//        unregisterReceiver(downloadReceiver)
+        unregisterReceiver(downloadReceiver)
     }
 
+
+
+
     override fun onResume() {
         super.onResume()
 

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

@@ -1,7 +1,6 @@
 package com.example.hpostesting.presentation.dashboard
 
 import android.annotation.SuppressLint
-import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -15,13 +14,12 @@ 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.deviceinfo.DeviceActivity
 import com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity
+import com.example.hpostesting.presentation.deviceinfo.DeviceActivity
 import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import `in`.sminnovations.hpostesting.databinding.FragmentGalleryBinding
 
-
 class GalleryFragment : Fragment() {
 
     private var _binding: FragmentGalleryBinding? = null
@@ -57,7 +55,7 @@ class GalleryFragment : Fragment() {
         ) {
             binding.btnDeviceProvision.visibility = View.VISIBLE
         } else {
-            binding.btnDeviceProvision.visibility = View.VISIBLE
+            binding.btnDeviceProvision.visibility = View.GONE
         }
 
         binding.btnDeviceProvision.setOnClickListener {
@@ -84,19 +82,6 @@ class GalleryFragment : Fragment() {
             startActivity(Intent(requireContext(), DeviceActivity::class.java))
         }
 
-        binding.btnFirefox.setOnClickListener {
-            val intent = Intent(Intent.ACTION_VIEW)
-            intent.component = ComponentName("org.mozilla.firefox", "org.mozilla.gecko.BrowserApp")
-            startActivity(intent)
-        }
-
-        binding.btnFiles.setOnClickListener {
-            val intent = Intent(Intent.ACTION_GET_CONTENT)
-            intent.type = "file/*"
-            startActivity(intent)
-
-        }
-
         userid = sharedPreferences.getString(Constants.USER_ID, "").toString()
         binding.tvSubtitle4.text = "Login ID : ${userid}"
 

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

@@ -19,20 +19,16 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.api.DeviceCommunicationHandler
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.login.LoginResponse
 import com.example.hpostesting.data.model.molbioresult.MolbioV2Result
 import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
-import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.presentation.KitScanActivity
-import com.example.hpostesting.presentation.UsbServiceListener
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.adapter.UserListAdapter
 import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
@@ -47,19 +43,11 @@ import com.google.firebase.perf.ktx.performance
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
-import okhttp3.ResponseBody
 import org.json.JSONObject
-import java.io.BufferedOutputStream
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.nio.charset.Charset
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
 
 @AndroidEntryPoint
 class HomeFragment : Fragment() {
@@ -74,9 +62,6 @@ class HomeFragment : Fragment() {
     private val homeViewModel: HemoCubeViewModel by activityViewModels()
 
     private var isTokenAvailable = false
-    private var natsToken: String = ""
-    private var deviceId: String = ""
-
 
     private lateinit var sharedPreference: SharedPreferences
     override fun onCreateView(
@@ -104,7 +89,7 @@ class HomeFragment : Fragment() {
             binding.labelQuickCapture.visibility = View.VISIBLE
             binding.btnQuickCapture.visibility = View.VISIBLE
         }
-        getDeviceId()
+
         checkUnprocessedCSVData()
         viewModel.allUserData.observe(viewLifecycleOwner) { userData ->
             deleteIncompleteRegistrations(userData)
@@ -125,55 +110,15 @@ class HomeFragment : Fragment() {
                 binding.rvOrderOffline.adapter = adapter
             }
         }
-        hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) { deviceData ->
-            val devicelist = mutableListOf<DeviceData>()
-            if (deviceData != null) {
-                devicelist.add(DeviceData(deviceData.deviceId))
-            }
-
-        }
         viewModel.networkStatusLiveData?.observe(viewLifecycleOwner) { isConnected ->
             if (isConnected) {
+
                 binding.internetAvailableCL.visibility = View.VISIBLE
                 binding.internetNotAvailableCL.visibility = View.GONE
                 loadUserData()
                 setSearch()
                 checkForLocalDBData()
                 checkForTokenAndUpdate()
-
-                hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-                    val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
-                    userDataList.forEach { userData ->
-                        if (!userData.molbioFlag && isTokenAvailable) {
-                            resultList.results?.add(
-                                MolbioV2Result(
-                                    rawData = userData,
-                                    analysisId = userData._id,
-                                    analysisDate = "2024-02-08 16:33:56",
-                                    analysisStatus = userData.classificationResult,
-                                    thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
-                                    interpretation = userData.classificationResult,
-                                    testId = userData._id,
-                                    testTime = userData.testTime,
-                                    collectionTime = "2024-02-08 16:33:56",//userData.testTime,
-                                    expiryTime = "2024-02-08 16:33:56"//userData.testTime,
-                                )
-                            )
-                        }
-                        if (!userData.molbioFlag && isTokenAvailable) {
-                            userData.molbioFlag = true
-                            hemoCubeViewModel.uploadResult(resultList)
-                        }
-                        if (!userData.localFlag) {
-                            userData.localFlag = true
-                            hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                        }
-
-                    }
-
-                }
-
-
             } else {
                 binding.internetAvailableCL.visibility = View.GONE
                 binding.internetNotAvailableCL.visibility = View.VISIBLE
@@ -204,9 +149,9 @@ class HomeFragment : Fragment() {
             val btnSaveLocalVisibility =
                 if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE
 
-            binding.downloadCSV.visibility = btnSaveLocalVisibility
+            binding.btnSaveLocal.visibility = btnSaveLocalVisibility
 
-            binding.downloadCSV.setOnClickListener {
+            binding.btnSaveLocal.setOnClickListener {
                 if (btnSaveLocalVisibility == View.VISIBLE) {
                     // Execute the action when the button is visible (testStatus is true for at least one user)
                     showDownloadDialog(requireContext())
@@ -220,8 +165,6 @@ class HomeFragment : Fragment() {
                 }
             }
         }
-
-
         binding.btnNewKit.setOnClickListener {
             with(sharedPreference.edit()) {
                 putString(Constants.KIT_NUMBER, "")
@@ -243,55 +186,32 @@ class HomeFragment : Fragment() {
         binding.downloadCSV.setOnClickListener {
             showDownloadDialog(requireContext())
         }
-
     }
 
     private fun checkForTokenAndUpdate() {
-        var accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
-        var password = sharedPreference.getString(Constants.DEVICE_PASSWORD_API, "").toString()
-        var userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
-        deviceId = sharedPreference.getString(Constants.DEVICE_ID, "").toString()
-        Log.e("idpass", userID)
-        Log.e("idpass", password)
-        Log.e("idpass", deviceId)
+        val accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
+        val password = sharedPreference.getString(Constants.DEVICE_PASSWORD_API, "").toString()
+        val userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
         if (userID.isNotEmpty() && password.isNotEmpty()) {
-            if (!isTokenAvailable) {
+            if (accessToken.isEmpty()) {
                 hemoCubeViewModel.login(createLoginRequestData(userID, password))
             } else {
                 if (isTokenExpired(accessToken)) {
                     hemoCubeViewModel.login(createLoginRequestData(userID, password))
                 } else {
                     isTokenAvailable = true
-
                     hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
                     hemoCubeViewModel.uploadLogs()
                     hemoCubeViewModel.startPeriodicCheckUpdate()
-                    hemoCubeViewModel.downloadClientCertificate()
                 }
             }
-        }else if (deviceId.isNotEmpty()) {
-                fetchDeviceCredentials()
-                // This code will execute after credentials have been successfully fetched and stored.
-                userID = sharedPreference.getString("username", "").toString()
-                password = sharedPreference.getString("password", "").toString()
-                accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
-                if (accessToken.isEmpty()) {
-                    hemoCubeViewModel.login(createLoginRequestData(userID, password))
-                } else {
-                    // Continue with your existing logic if the token is not empty.
-                isTokenAvailable = true
-                hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
-                hemoCubeViewModel.uploadLogs()
-                hemoCubeViewModel.startPeriodicCheckUpdate()
-            }
-         } else {
+        } else {
             Toast.makeText(
                 requireContext(),
                 "Contact Help and get your device provision done",
                 Toast.LENGTH_SHORT
             ).show()
         }
-
         hemoCubeViewModel.loginResponse.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
@@ -317,21 +237,20 @@ class HomeFragment : Fragment() {
             }
         }
 
-        hemoCubeViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
+        hemoCubeViewModel.deviceUpdate.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
-//                    Toast.makeText(
-//                        requireContext(),
-//                        "Log uploaded ${response.data.data?.filename}",
-//                        Toast.LENGTH_SHORT
-//                    ).show()
+                    Toast.makeText(
+                        requireContext(), response.data.toString(), Toast.LENGTH_SHORT
+                    ).show()
+
                 }
 
                 is Result.Error -> {
                     response.exception.let { message ->
                         Toast.makeText(
                             activity,
-                            "An error occurred in uploading logs: $message",
+                            "An error occurred check update: $message",
                             Toast.LENGTH_LONG
                         )
                             .show()
@@ -346,27 +265,21 @@ class HomeFragment : Fragment() {
             }
         }
 
-
-
-        hemoCubeViewModel.downloadcertificate.observe(viewLifecycleOwner) { response ->
+        hemoCubeViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
-                    val url = response.data
-
-                    val fileName = "nats_certificate.zip"
-                    val downloadDirectory = "NATS"
-                    val file = downloadFile(url, requireContext(), fileName, downloadDirectory)
-                    Toast.makeText(requireContext(), "NATS certificate Downloaded", Toast.LENGTH_SHORT).show()
-
-                    val unzipDirectoryPath = requireContext().getExternalFilesDir(null)?.absolutePath + "/$downloadDirectory"
-                    unzip(file.absolutePath, unzipDirectoryPath)
-                    Toast.makeText(requireContext(), "NATS certificate Extracted", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(
+                        requireContext(),
+                        "Log uploaded ${response.data.data?.filename}",
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
+
                 is Result.Error -> {
                     response.exception.let { message ->
                         Toast.makeText(
                             activity,
-                            "An error occurred in nats download: $message",
+                            "An error occurred in uploading logs: $message",
                             Toast.LENGTH_LONG
                         )
                             .show()
@@ -405,11 +318,8 @@ class HomeFragment : Fragment() {
                 else -> {}
             }
         }
-
-
     }
 
-
     private fun isTokenExpired(token: String): Boolean {
         val parts = token.split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
         val decodedPayload = String(Base64.decode(parts[1], Base64.DEFAULT))
@@ -459,60 +369,6 @@ class HomeFragment : Fragment() {
         )
     }
 
-    private fun downloadFile(responseBody: ResponseBody, context: Context, fileName: String, downloadDirectory: String): File {
-        // Ensure the download directory exists
-        val fileDir = File(context.getExternalFilesDir(null), downloadDirectory)
-        if (!fileDir.exists()) {
-            fileDir.mkdirs()
-        }
-        val file = File(fileDir, fileName)
-        Log.d("Download", "Starting download to $file")
-        responseBody.byteStream().use { inputStream ->
-            FileOutputStream(file).use { outputStream ->
-                inputStream.copyTo(outputStream)
-            }
-        }
-
-// After download
-        Log.d("Download", "Download completed to ${file.absolutePath}")
-
-        return file
-    }
-
-
-
-
-    private fun unzip(zipFilePath: String, destDirectory: String) {
-        val destDir = File(destDirectory)
-        if (!destDir.exists()) {
-            destDir.mkdir()
-        }
-        ZipInputStream(FileInputStream(zipFilePath)).use { zipIn ->
-            var entry: ZipEntry? = zipIn.nextEntry
-            while (entry != null) {
-                val filePath = destDirectory + File.separator + entry.name
-                if (!entry.isDirectory) {
-                    extractFile(zipIn, filePath)
-                } else {
-                    val dir = File(filePath)
-                    dir.mkdir()
-                }
-                zipIn.closeEntry()
-                entry = zipIn.nextEntry
-            }
-        }
-    }
-
-    private fun extractFile(zipIn: ZipInputStream, filePath: String) {
-        BufferedOutputStream(FileOutputStream(filePath)).use { bos ->
-            val bytesIn = ByteArray(4096)
-            var read: Int
-            while (zipIn.read(bytesIn).also { read = it } != -1) {
-                bos.write(bytesIn, 0, read)
-            }
-        }
-    }
-
     private fun setUserId() {
         binding.btnSubmit.setOnClickListener {
             val userId = binding.userId.text.toString()
@@ -538,48 +394,6 @@ class HomeFragment : Fragment() {
         }
     }
 
-
-    private fun fetchDeviceCredentials() {
-        try {
-            val db = Firebase.firestore
-            // Ensure deviceId is not null or empty
-            val deviceId = sharedPreference.getString(Constants.DEVICE_ID, "").takeIf { it!!.isNotBlank() }
-                ?: throw IllegalStateException("Device ID is missing or blank.")
-
-            val deviceRef = db.collection("devices").whereEqualTo("deviceId", deviceId)
-
-            deviceRef.get()
-                .addOnSuccessListener { documentSnapshot ->
-                    if (!documentSnapshot.isEmpty) {
-                        val deviceData = documentSnapshot.documents[0].toObject(DeviceData::class.java)
-                        deviceData?.let { data ->
-                            val username = data.username
-                            val password = data.password
-                            val natsToken = data.natsToken
-                            // Log for debugging
-                            Log.d("fetchDeviceCredentials", "Username: $username, Password: $password")
-                            // Save credentials in SharedPreferences
-                            with(sharedPreference.edit()) {
-                                putString("username", username)
-                                putString("password", password)
-                                putString(Constants.NATS_TOKEN, natsToken)
-                                apply()
-                            }
-                            hemoCubeViewModel.login(createLoginRequestData(username, password))
-                        } ?: Log.e("fetchDeviceCredentials", "Failed to parse device data.")
-                    } else {
-                        Log.e("fetchDeviceCredentials", "Document does not exist.")
-                    }
-                }
-                .addOnFailureListener { exception ->
-                    Log.e("fetchDeviceCredentials", "Error fetching device data", exception)
-                }
-        } catch (e: Exception) {
-            Log.e("fetchDeviceCredentials", "Error in fetchDeviceCredentials", e)
-        }
-    }
-
-
     private fun loadUserData() {
         try {
             val dateFormat = SimpleDateFormat("yyyy-MM-dd")
@@ -807,33 +621,30 @@ class HomeFragment : Fragment() {
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
             userDataList.forEach { userData ->
+                if (!userData.localFlag) {
+                    userData.localFlag = true
+                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
                     if (!userData.molbioFlag && isTokenAvailable) {
                         resultList.results?.add(
                             MolbioV2Result(
                                 rawData = userData,
                                 analysisId = userData._id,
-                                analysisDate = "2024-02-08 16:33:56", //userData.reportUploadTime,
+                                analysisDate = userData.testTime,
                                 analysisStatus = userData.classificationResult,
                                 thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
                                 interpretation = userData.classificationResult,
                                 testId = userData._id,
                                 testTime = userData.testTime,
-                                collectionTime = "2024-02-08 16:33:56",//userData.testTime,
-                                expiryTime = "2024-02-08 16:33:56",//userData.testTime,
+                                collectionTime = userData.testTime,
+                                expiryTime = userData.testTime,
                             )
                         )
-
-                }
-
-                if(!userData.localFlag){
-                    userData.localFlag = true
-                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                }
-                if (!userData.molbioFlag && isTokenAvailable) {
-                    userData.molbioFlag = true
-                    hemoCubeViewModel.uploadResult(resultList)
+                    }
                 }
             }
+            if (isTokenAvailable) {
+                hemoCubeViewModel.uploadResult(resultList)
+            }
             dialog.dismiss()
         }
 
@@ -965,44 +776,4 @@ class HomeFragment : Fragment() {
             }
         }
     }
-
-    private fun getDeviceId() {
-        val handler = activity as? DeviceCommunicationHandler
-        handler?.sendAndListenToDevice(
-            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val receivedData = String(it, Charset.forName("UTF-8"))
-                        // Assuming the device ID is the full content of the received data. Adjust if needed.
-                        deviceId =
-                            extractDeviceId(receivedData) // Implement this method based on your data format.
-                        if (deviceId.isNotEmpty()) {
-                            // Store the deviceId in SharedPreferences
-                            with(sharedPreference.edit()) {
-                                putString(Constants.DEVICE_ID, deviceId)
-                                apply()
-                            }
-                            // Optionally, you can update UI or proceed with further logic now that you have the device ID
-                            activity?.runOnUiThread {
-                                // Update your UI or trigger next steps here
-                            }
-                        }
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    // Handle USB communication error
-                }
-
-            })
-    }
-
-    fun extractDeviceId(receivedData: String): String {
-        // Example based on the format "SNS HPP1-3038 SNE"
-        val regex = "SNS (\\w+) SNE".toRegex()
-        val matchResult = regex.find(receivedData)
-        return matchResult?.groups?.get(1)?.value ?: ""
-    }
-
-}
+}

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

@@ -22,21 +22,20 @@ import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.api.DeviceCommunicationHandler
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.calibration.CalibrationFragment
+import com.example.hpostesting.presentation.calibration.CalibrationViewModel
+import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.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.ActivityCalibrationBinding
 import `in`.sminnovations.hpostesting.databinding.ActivityDeviceBinding
-
-@Suppress("MemberVisibilityCanBePrivate")
 @AndroidEntryPoint
-class DeviceActivity : AppCompatActivity(), DeviceCommunicationHandler {
+class DeviceActivity : AppCompatActivity() {
     private lateinit var binding: ActivityDeviceBinding
     private val deviceViewModel by viewModels<DeviceViewModel>()
     private var myMenu: Menu? = null
@@ -111,7 +110,6 @@ class DeviceActivity : AppCompatActivity(), DeviceCommunicationHandler {
             }
         }
     }
-
     open fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
@@ -127,9 +125,12 @@ class DeviceActivity : AppCompatActivity(), DeviceCommunicationHandler {
             } else {
                 setupService()
             }
+
+
         }
     }
 
+
     fun onErrorReported(msg: String) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
         if (!isFinishing) onBackPressed()
@@ -141,28 +142,28 @@ class DeviceActivity : AppCompatActivity(), DeviceCommunicationHandler {
         supportFragmentManager.beginTransaction().replace(binding.fgDevice.id, DeviceFragment())
             .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
+                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
             )
         } else {
             mPendingIntent = PendingIntent.getBroadcast(
                 this,
                 0,
-                Intent(Constants.HEMOCUBE_USB_PERMISSION),
+                Intent(Constants.HOMOCUBE_USB_PERMISSION),
                 PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
             )
         }
 
-        val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
+        val filter = IntentFilter(Constants.HOMOCUBE_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)
@@ -180,8 +181,4 @@ class DeviceActivity : AppCompatActivity(), DeviceCommunicationHandler {
             deviceViewModel.isServiceConnected = false
         }
     }
-
-    override fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener) {
-        mService.sendAndListenToHemoCube(command = HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND, listener)
-    }
 }

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

@@ -4,10 +4,10 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
 import com.example.hpostesting.data.constant.Constants
@@ -32,7 +32,7 @@ class DeviceFragment : Fragment() {
     ): View {
         binding = FragmentDeviceBinding.inflate(inflater, container, false)
         sharedPreferences =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         return binding.root
     }
 

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

@@ -1,26 +1,35 @@
 package com.example.hpostesting.presentation.deviceinfo
 
+import android.content.Context
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.hpostesting.data.NetworkStatusLiveData
 import com.example.hpostesting.data.dao.HemoCubeDao
+import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.repository.Repository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 @HiltViewModel
 class DeviceViewModel @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 _networkStatusLiveData = NetworkStatusLiveData(context)
-//    val allUserData = hemoCubeDao.getAll()
+    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    val allUserData = hemoCubeDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
-//    val networkStatusLiveData: LiveData<Boolean>
-//        get() = _networkStatusLiveData
-val fireBaseUpload = MutableLiveData<String>()
-    val fireBaseBulkUpload = MutableLiveData<String>()
+    val networkStatusLiveData: LiveData<Boolean>
+        get() = _networkStatusLiveData
+    val fireBaseUpload = MutableLiveData<String>()
 
 }

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

@@ -21,11 +21,8 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.api.DeviceCommunicationHandler
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.UsbServiceListener
 import com.example.hpostesting.presentation.testRight.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -34,7 +31,7 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityAutoDacBinding
 
 @AndroidEntryPoint
-class DeviceProvisionActivity : AppCompatActivity(), DeviceCommunicationHandler {
+class DeviceProvisionActivity : AppCompatActivity() {
     private lateinit var binding: ActivityAutoDacBinding
     val viewModel: DeviceProvisionViewModel by viewModels()
     private var myMenu: Menu? = null
@@ -65,6 +62,7 @@ class DeviceProvisionActivity : AppCompatActivity(), DeviceCommunicationHandler
         }
     }
 
+
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsbService.UsbServiceBinder
@@ -147,18 +145,18 @@ class DeviceProvisionActivity : AppCompatActivity(), DeviceCommunicationHandler
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
         val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             PendingIntent.getBroadcast(
-                this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
+                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
             )
         } else {
             PendingIntent.getBroadcast(
                 this,
                 0,
-                Intent(Constants.HEMOCUBE_USB_PERMISSION),
+                Intent(Constants.HOMOCUBE_USB_PERMISSION),
                 PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
             )
         }
 
-        val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
+        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
         registerReceiver(broadcastReceiver, filter)
         manager.requestPermission(device, mPendingIntent)
     }
@@ -183,8 +181,4 @@ class DeviceProvisionActivity : AppCompatActivity(), DeviceCommunicationHandler
             viewModel.isServiceConnected = false
         }
     }
-
-    override fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener) {
-        mService.sendAndListenToHemoCube(command = HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND, listener)
-    }
 }

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

@@ -4,19 +4,16 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.util.Log
 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.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
-import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.presentation.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.firebase.crashlytics.ktx.crashlytics
@@ -24,14 +21,11 @@ import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDeviceProvisionBinding
 
 class DeviceProvisionFragment : Fragment() {
+
     private var resultData: String = ""
     private lateinit var binding: FragmentDeviceProvisionBinding
     private val viewModel: DeviceProvisionViewModel by activityViewModels()
     private lateinit var sharedPreferences: SharedPreferences
-    private lateinit var deviceProvisionResponse: String
-    private var currentDeviceData: DeviceData? = null
-    private var isOnline = false
-    val deviceData = MutableLiveData<DeviceData?>()
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
@@ -39,11 +33,13 @@ class DeviceProvisionFragment : Fragment() {
         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() {
         listenToHemoCube()
         getDeviceId()
@@ -59,11 +55,7 @@ class DeviceProvisionFragment : Fragment() {
         }
     }
 
-
     private fun observeViewModel() {
-        viewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-        }
 
         viewModel.deviceProvisionResponse.observe(viewLifecycleOwner) { response ->
             when (response) {
@@ -82,44 +74,20 @@ class DeviceProvisionFragment : Fragment() {
                                 Constants.NATS_TOKEN,
                                 response.data.data?.device?.deviceUser?.natsToken
                             )
-                            response.data.data?.device?.deviceUser?.natsToken?.let {
-                                Log.e("natstoken",
-                                    it
-                                )
-                            }
                             putString(
                                 Constants.NATS_TOKEN_EXPIRE_DATE,
                                 response.data.data?.device?.deviceUser?.natsTokenExpiry
                             )
                             apply()
                         }
-                        startActivity(
-                            Intent(
-                                requireContext(),
-                                DashboardActivity::class.java
-                            )
-                        )
+                        startActivity(Intent(requireContext(), DashboardActivity::class.java))
                         Toast.makeText(
                             activity, "Device registered successfully", Toast.LENGTH_LONG
                         ).show()
-                        viewModel.addDeviceProvisionDataToDb(
-                            DeviceData(
-                                deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                                username = response.data.data?.credentials?.username.toString(),
-                                password = response.data.data?.credentials?.password.toString(),
-                                deviceProvisionResponse = response.data.data.toString(),
-                                natsToken = response.data.data?.device?.deviceUser?.natsToken.toString(),
-                                natsTokenExpiry = response.data.data?.device?.deviceUser?.natsTokenExpiry.toString()
-                            )
-                        )
-//                        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)
                     } else {
                         Toast.makeText(
                             activity,
-                            "An error in device provision: ${response.data.message}",
+                            "An error occurred in device provision: ${response.data.message}",
                             Toast.LENGTH_LONG
                         ).show()
                         binding.btnSubmit.visibility = View.VISIBLE
@@ -144,15 +112,9 @@ class DeviceProvisionFragment : Fragment() {
                 else -> {}
             }
         }
-        viewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                Toast.makeText(
-                    activity, "Device provision successfully uploaded to firebase", Toast.LENGTH_LONG
-                ).show()
-            }
-        }
     }
 
+
     private fun getDeviceId() {
         (activity as DeviceProvisionActivity).mService.sendAndListenToHemoCube(
             HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
@@ -167,8 +129,7 @@ class DeviceProvisionFragment : Fragment() {
         val fullReadOutput = StringBuilder()
 
         try {
-            (activity as DeviceProvisionActivity).mService.listenToHemoCube(object :
-                UsbServiceListener {
+            (activity as DeviceProvisionActivity).mService.listenToHemoCube(object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val stringData = String(it)
@@ -185,19 +146,14 @@ class DeviceProvisionFragment : Fragment() {
         }
     }
 
-    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 handleUsbData() {
         when {
             resultData.contains("SNE") -> {
-                val hardwareId = extractV2HardwareId(resultData)
+                val pattern = Regex("HCV-\\d{3}-\\d{4}")
+                val matchResult = pattern.find(resultData)
+                val hardwareId = matchResult?.value
 
-                if (!hardwareId.isNullOrBlank()) {
+                if (hardwareId.toString().length == 12) {
                     with(sharedPreferences.edit()) {
                         putString(Constants.DEVICE_ID, hardwareId)
                         apply()

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

@@ -1,68 +1,36 @@
 package com.example.hpostesting.presentation.deviceprovision
 
+import android.content.Context
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.example.hpostesting.data.NetworkStatusLiveData
 import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.repository.Repository
+import com.example.hpostesting.data.repository.DatabaseRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class DeviceProvisionViewModel @Inject constructor(
-    private val repository: Repository,
+    private val databaseRepository: DatabaseRepository,
+    context: Context
 ) : ViewModel() {
+
     var isServiceConnected = false
+    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    val networkStatusLiveData: LiveData<Boolean>
+        get() = _networkStatusLiveData
+
     val deviceProvisionResponse = MutableLiveData<Result<DeviceProvisionResponse>>()
-    val fireBaseUpload = MutableLiveData<String>()
-    val fireBaseBulkUpload = MutableLiveData<String>()
-    val deviceData = MutableLiveData<DeviceData?>()
 
     fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest) = viewModelScope.launch {
         deviceProvisionResponse.postValue(Result.Loading())
-        repository.deviceProvision(deviceProvisionRequest).let {
+        databaseRepository.deviceProvision(deviceProvisionRequest).let {
             deviceProvisionResponse.postValue(it)
         }
     }
-
-
-    fun addDeviceId(data: DeviceData) {
-        viewModelScope.launch {
-            try {
-                repository.uploadDeviceId(data)
-                fireBaseUpload.postValue("Successfully device Id uploaded to firebase")
-            } catch (e: Exception) {
-//                Log.e("Testdb", "Exception during data upload: ${e.message}")
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
-
-    fun addDeviceProvisionDataToDb(data: DeviceData) {
-        viewModelScope.launch {
-            try {
-                when (val response = repository.getDeviceResponse(data)) {
-                    is Response.Success -> {
-//                        Log.i("Testdb", "Data uploaded to Firestore successfully")
-                        fireBaseUpload.postValue("Successfully device response uploaded to firebase")
-                    }
-
-                    is Response.Error -> {
-//                        Log.e("Testdb", "Error uploading data to Firestore: $response")
-                        fireBaseUpload.postValue("Error")
-                    }
-
-                    else -> {}
-                }
-            } catch (e: Exception) {
-//                Log.e("Testdb", "Exception during data upload: ${e.message}")
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
 }

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

@@ -1,6 +1,5 @@
 package com.example.hpostesting.presentation.diagnostics
 
-import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.ComponentName
@@ -23,6 +22,8 @@ import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
+import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -30,7 +31,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDiagnosticsBinding
 
-@Suppress("MemberVisibilityCanBePrivate")
 @AndroidEntryPoint
 class DiagnosticsActivity : AppCompatActivity() {
     private lateinit var binding: ActivityDiagnosticsBinding
@@ -141,23 +141,22 @@ class DiagnosticsActivity : AppCompatActivity() {
             .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
+                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
             )
         } else {
             mPendingIntent = PendingIntent.getBroadcast(
                 this,
                 0,
-                Intent(Constants.HEMOCUBE_USB_PERMISSION),
+                Intent(Constants.HOMOCUBE_USB_PERMISSION),
                 PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
             )
         }
 
-        val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
+        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
         registerReceiver(broadcastReceiver, filter)
         manager.requestPermission(device, mPendingIntent)
     }

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

@@ -1,8 +1,6 @@
 package com.example.hpostesting.presentation.diagnostics
 
 import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.util.Log
@@ -13,12 +11,8 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.Result.Success
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
-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.UsbServiceListener
@@ -38,10 +32,7 @@ class DiagnosticsFragment : Fragment() {
     private var resultData: String = ""
     private val messages = MutableLiveData<String>()
     private var startListening = MutableLiveData(false)
-    private val batteryStatus: Intent? =
-        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
-            context?.registerReceiver(null, ifilter)
-        }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
     ): View {
@@ -65,25 +56,7 @@ class DiagnosticsFragment : Fragment() {
         binding.btnSubmit.setOnClickListener {
             binding.btnSubmit.visibility = View.GONE
             runDeviceDiagnostics()
-            val batteryLevel = diagnosticsViewModel.getBatteryLevel().toString()
-            val batteryCapacity = context?.let { diagnosticsViewModel.getBatteryCapacity(it).toString() }
-            val batteryMaxCapacity = context?.let { diagnosticsViewModel.getBatteryMaxCapacity(it).toString() }
-            val batteryTemperature = diagnosticsViewModel.getBatteryTemperature().toString()
-            val batteryVoltage = context?.let { diagnosticsViewModel.getBatteryVoltage(it).toString() }
-
-            val additionalDetails = AdditionalDetails(
-                batteryLevel = batteryLevel,
-                batteryCapacity = batteryCapacity!!,
-                batteryMaxCapacity = batteryMaxCapacity!!,
-                batteryTemperature = batteryTemperature,
-                batteryVoltage = batteryVoltage!!
-            )
-            diagnosticsViewModel.deviceDiagnostics(
-                DeviceDiagnosticsRequest(additionalDetails = additionalDetails)
-            )
         }
-
-
     }
 
 
@@ -108,42 +81,6 @@ class DiagnosticsFragment : Fragment() {
 
             binding.progressBar.visibility = View.GONE
         }
-
-        diagnosticsViewModel.deviceDiagnosticsResponse.observe(viewLifecycleOwner) { response ->
-            when (response) {
-                is Success -> {
-                    if (response.data.result == "Success") {
-                        Toast.makeText(
-                            activity, response.data.message ?: "Device diagnostics uploaded successfully", Toast.LENGTH_LONG
-                        ).show()
-
-                        response.data.data?.let { diagnosticsData ->
-
-                            val batteryLevel = diagnosticsData.additionalDetails?.batteryLevel
-
-                        }
-                    } else {
-                        Toast.makeText(
-                            activity,
-                            "${response.data.message}",
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
-                }
-                is Result.Error -> {
-                    // Handle the error scenario
-                    Toast.makeText(
-                        activity,
-                        "An error occurred: ${response.exception.message}",
-                        Toast.LENGTH_LONG
-                    ).show()
-                }
-                is Result.Loading -> {
-                }
-            }
-        }
-
-
     }
 
     private fun getDeviceId() {
@@ -179,7 +116,6 @@ class DiagnosticsFragment : Fragment() {
             })
     }
 
-
     private fun listenToHemoCube() {
 
         val fullReadOutput = StringBuilder()
@@ -212,9 +148,6 @@ class DiagnosticsFragment : Fragment() {
                     if (resultData.contains("END") || fullReadOutput.contains("END")) {
                         diagnosticsViewModel.addDiagnosticsDataToDb(DiagnosticsData(
                             deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                            devicePassword = sharedPreferences.getString(Constants.DEVICE_PASSWORD_API, "").toString(),
-                            deviceNatsToken = sharedPreferences.getString(Constants.NATS_TOKEN, "").toString(),
-                            accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString(),
                             deviceData = resultData,
                             runTime = SimpleDateFormat(
                                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()

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

@@ -1,44 +1,47 @@
 package com.example.hpostesting.presentation.diagnostics
 
 import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.os.BatteryManager
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.NetworkStatusLiveData
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
-import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.repository.Repository
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.toHemoCubeTestData
+import com.example.hpostesting.data.repository.DatabaseRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
 import javax.inject.Inject
 @HiltViewModel
 class DiagnosticsViewModel @Inject constructor(
-    private val respository: Repository,
-    context: Context,
+    private val hemoCubeDao: HemoCubeDao,
+    private val repository: DatabaseRepository,
+    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>()
-    val deviceDiagnosticsResponse = MutableLiveData<com.example.hpostesting.data.Result<DeviceDiagnosticsResponse>>()
-    private val batteryStatus: Intent? =
-        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
-            context.registerReceiver(null, ifilter)
-        }
+
     fun addDiagnosticsDataToDb(data: DiagnosticsData) {
         viewModelScope.launch {
             try {
-                when (val response = respository.addDiagnostics(data)) {
+                when (val response = repository.addDiagnostics(data)) {
                     is Response.Success -> {
 //                        Log.i("Testdb", "Data uploaded to Firestore successfully")
                         fireBaseUpload.postValue("Success")
@@ -57,81 +60,4 @@ class DiagnosticsViewModel @Inject constructor(
             }
         }
     }
-
-
-    fun deviceDiagnostics(deviceDiagnosticsRequest: DeviceDiagnosticsRequest) = viewModelScope.launch {
-        deviceDiagnosticsResponse.postValue(Result.Loading())
-        respository.deviceDiagnostics(deviceDiagnosticsRequest).let {
-            deviceDiagnosticsResponse.postValue(it)
-        }
-    }
-
-
-    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
-    }
-
-    fun getBatteryTemperature(): Float? {
-        val batteryTemp: Float? = batteryStatus?.let { intent ->
-            val temperature = intent.getIntExtra(
-                BatteryManager.EXTRA_TEMPERATURE,
-                0
-            )
-            temperature.toFloat() / 10
-        }
-
-        return batteryTemp
-    }
-
-    fun getBatteryVoltage(context: Context): Float {
-        val batteryIntent =
-            context.registerReceiver(
-                null,
-                IntentFilter(Intent.ACTION_BATTERY_CHANGED)
-            )
-        val voltage = batteryIntent?.getIntExtra(
-            BatteryManager.EXTRA_VOLTAGE,
-            0
-        ) ?: 0
-
-        // milli-volts to volts
-        return voltage.toFloat() / 1000
-    }
-
-
-    fun getBatteryCapacity(context: Context): Int {
-        val batteryManager =
-            context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-        val currentCapacity =
-            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-
-        return currentCapacity
-    }
-
-    fun getBatteryMaxCapacity(context: Context): Float {
-        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-        val designCapacity =
-            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-        val currentCapacity =
-            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-
-        // Calculate the estimated maximum battery capacity in mAh
-        val maxCapacity = currentCapacity.toFloat() / designCapacity.toFloat() * 100
-
-        return maxCapacity
-    }
 }

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

@@ -17,7 +17,6 @@ import com.example.hpostesting.data.Result
 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.TestState
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.presentation.UsbServiceListener
@@ -26,10 +25,12 @@ import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
+import com.google.firebase.perf.ktx.performance
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
 import kotlin.math.abs
 import kotlin.math.log10
+import kotlin.math.round
 
 @Suppress("MemberVisibilityCanBePrivate")
 class HemoCubeFragment : Fragment() {
@@ -43,6 +44,7 @@ class HemoCubeFragment : Fragment() {
     private var resultData: String = ""
     private var currentResultData: String = ""
     private var isUsingExistingBuffer = false
+    private var loginId: String = ""
     private var isTestOngoing = false
     private var startListening = MutableLiveData<Boolean>(false)
     private var led1BufferForDevice = 0.0
@@ -57,7 +59,7 @@ class HemoCubeFragment : Fragment() {
     private var fittedAbs2 = 0.0
     private var fittedAbs3 = 0.0
     private var fittedAbs4 = 0.0
-    private var calculatedPredictedDenovixRatio = 0.0
+    private var _predictedDenovixRatio = 0.0
     private var validationError = false
     private var deviceHardwareId = ""
     private var allErrorMessages = ""
@@ -66,7 +68,6 @@ class HemoCubeFragment : Fragment() {
     private var readingsPerSample = Constants.READINGS_PER_SAMPLE
     private var uploadedToCloud = false
     private var uploadedToMolbio = false
-    lateinit var testState: TestState
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
@@ -74,11 +75,6 @@ class HemoCubeFragment : Fragment() {
         binding = FragmentHemoCubeReferenceBinding.inflate(inflater, container, false)
         sharedPreferences =
             requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
-        testState = TestState(
-            testDetails = DataHolder.selectedTest?.toHemoCubeTestData(),
-        )
-
         return binding.root
     }
 
@@ -123,7 +119,7 @@ class HemoCubeFragment : Fragment() {
         }
 
         binding.btnPlacebuffer.setOnClickListener {
-            if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
+            if (isBufferValueAvailable()) {
                 showBufferAlertDialog()
             } else {
                 activity?.runOnUiThread {
@@ -153,7 +149,7 @@ class HemoCubeFragment : Fragment() {
                     when (it) {
                         is Result.Success -> {
                             uploadedToMolbio = true
-                            if (Constants.MOLBIO_INTEGRATION) {
+                            if (Constants.MOLBIO_INTERGATION) {
                                 it.data.data?.get(0)?.rawData?.let { it1 ->
                                     hemoCubeViewModel.updateMolbioFlag(
                                         it1._id
@@ -188,6 +184,23 @@ class HemoCubeFragment : Fragment() {
             binding.progressBar.visibility = View.GONE
         }
 
+//        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
+//            if (result == "Success") {
+//                showToast(R.string.test_upload)
+//                handleReadingFinish()
+//            }
+//            if (result == "Local") {
+//                showToast(R.string.internt_not_local)
+//                handleReadingFinish()
+//            }
+//            if (result == "Error") {
+//                showToast(R.string.error_local)
+//                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
+//            }
+//
+//            binding.progressBar.visibility = View.GONE
+//        }
+
         hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
 
         hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
@@ -198,9 +211,9 @@ class HemoCubeFragment : Fragment() {
             apply {
                 DataHolder.hemoCubeTestData?.let {
                     currentDeviceData?.coefficients?.let { coefficients ->
-//                        val coefficient1 = coefficients[0]
-//                        val coefficient2 = coefficients[1]
-//                        val result = coefficient1 * coefficient2
+                        val coefficient1 = coefficients[0]
+                        val coefficient2 = coefficients[1]
+                        val result = coefficient1 * coefficient2
                     }
                 }
                 isOnline = isNetworkAvailable
@@ -218,10 +231,6 @@ class HemoCubeFragment : Fragment() {
 
     private fun handleReadingFinish() {
         if (allReadingsComplete(repeatReadingCount, readingsPerSample) && uploadedToCloud) {
-            if (validationError) {
-                hemoCubeViewModel.messages.postValue("Error")
-                return
-            }
             activity?.runOnUiThread {
                 binding.btnSubmit.visibility = View.GONE
                 val i = Intent(
@@ -311,7 +320,9 @@ class HemoCubeFragment : Fragment() {
     }
 
     private fun listenToHemoCube() {
-        DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData()
+        if (DataHolder.hemoCubeTestData == null) {
+            DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData()
+        }
         hemoCubeViewModel.progressBar.postValue(true)
 
         val fullReadOutput = StringBuilder()
@@ -356,7 +367,7 @@ class HemoCubeFragment : Fragment() {
             })
     }
 
-    fun handleUsbData(stringData: String) {
+    private fun handleUsbData(stringData: String) {
         if (stringData.contains("#")) {
             isTestOngoing = true
         }
@@ -367,24 +378,7 @@ class HemoCubeFragment : Fragment() {
 
         when {
             resultData.contains("SNE") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
-                processV2HardwareId(resultData)
-            }
-
-            (resultData.contains("SN") && !resultData.contains("SNS") && !resultData.contains("SNE") && resultData.length >= 15) && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
-                processV1HardwareId(resultData)
-            }
-
-            (resultData.contains("#LS") && this.testStatusCode < TestStatus.FIRST_EMPTY_AIR_READING_STARTED.code) -> {
-                // air reading 1
-                this.testStatusCode = TestStatus.FIRST_EMPTY_AIR_READING_STARTED.code
-                hemoCubeViewModel.messages.postValue("Air reading started")
-            }
-
-            (resultData.contains("#LC") && this.testStatusCode < TestStatus.FIRST_EMPTY_AIR_READING_COMPLETED.code) -> {
-                // air reading 1, send command to print
-                this.testStatusCode = TestStatus.FIRST_EMPTY_AIR_READING_COMPLETED.code
-                hemoCubeViewModel.messages.postValue("Air reading completed")
-                fetchResult()
+                processHardwareId(resultData)
             }
 
             resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.code -> {
@@ -400,7 +394,7 @@ class HemoCubeFragment : Fragment() {
                 }
             }
 
-            (resultData.contains("#SS") || resultData.contains("#SS1")) && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> {
+            resultData.contains("#SS1") && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> {
                 this.testStatusCode = TestStatus.SAMPLE_STARTED.code
                 activity?.runOnUiThread {
                     binding.tvSubtitle4.text = getString(R.string.sample_started)
@@ -408,7 +402,7 @@ class HemoCubeFragment : Fragment() {
                 }
             }
 
-            (resultData.contains("#SC") || resultData.contains("#SC1")) && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
+            resultData.contains("#SC1") && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
                 this.testStatusCode = TestStatus.SAMPLE_COMPLETED.code
                 hemoCubeViewModel.messages.postValue(
                     getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data))
@@ -455,59 +449,10 @@ class HemoCubeFragment : Fragment() {
                 fetchResult()
             }
 
-            (resultData.contains("#LS") && this.testStatusCode < TestStatus.SECOND_EMPTY_AIR_READING_STARTED.code) -> {
-                // air reading 2
-                this.testStatusCode = TestStatus.SECOND_EMPTY_AIR_READING_STARTED.code
-                hemoCubeViewModel.messages.postValue("Air reading started")
-            }
-
-            (resultData.contains("#LC") && this.testStatusCode < TestStatus.SECOND_EMPTY_AIR_READING_COMPLETED.code) -> {
-                // air reading 2, print values
-                this.testStatusCode = TestStatus.SECOND_EMPTY_AIR_READING_COMPLETED.code
-                hemoCubeViewModel.messages.postValue("Air reading completed")
-                fetchResult()
-            }
-
             resultData.contains("REND") && this.testStatusCode < TestStatus.SAMPLE_PRINT_COMPLETED.code -> {
                 handleSampleCompleted()
             }
 
-            currentResultData.contains("REND")
-                    && this.testStatusCode >= TestStatus.FIRST_EMPTY_AIR_READING_COMPLETED.code
-                    && this.testStatusCode < TestStatus.FIRST_EMPTY_AIR_READING_PRINT_COMPLETED.code -> {
-                this.testStatusCode = TestStatus.FIRST_GAIN_PRINT_COMPLETED.code
-                hemoCubeViewModel.messages.postValue("First air reading completed")
-
-                val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
-                DataHolder.hemoCubeTestData?.apply {
-                    led1Air1 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
-                    led2Air1 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
-                    led3Air1 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                    led4Air1 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
-                }
-
-                startBufferProcess()
-                currentResultData = ""
-            }
-
-            currentResultData.contains("REND")
-                    && this.testStatusCode >= TestStatus.SECOND_EMPTY_AIR_READING_COMPLETED.code
-                    && this.testStatusCode < TestStatus.SECOND_EMPTY_AIR_PRINT_COMPLETED.code -> {
-                this.testStatusCode = TestStatus.SECOND_EMPTY_AIR_PRINT_COMPLETED.code
-                hemoCubeViewModel.messages.postValue("Second air reading completed")
-
-                val resultLines = currentResultData.split("\\s+(?=LB|LS)".toRegex())
-                DataHolder.hemoCubeTestData?.apply {
-                    led1Air2 = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
-                    led2Air2 = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
-                    led3Air2 = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                    led4Air2 = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
-                }
-
-                sendSecondGainCommand()
-                currentResultData = ""
-            }
-
             currentResultData.contains("REND")
                     && this.testStatusCode >= TestStatus.FIRST_GAIN_COMPLETED.code
                     && this.testStatusCode < TestStatus.FIRST_GAIN_PRINT_COMPLETED.code -> {
@@ -628,8 +573,8 @@ class HemoCubeFragment : Fragment() {
         currentResultData = ""
     }
 
-    fun processV1HardwareId(resultData: String) {
-        val hardwareId = extractV1HardwareId(resultData)
+    fun processHardwareId(resultData: String) {
+        val hardwareId = extractMiddleString(resultData)
 
         if (!hardwareId.isNullOrBlank()) {
             updateDeviceId(hardwareId)
@@ -637,59 +582,21 @@ class HemoCubeFragment : Fragment() {
                 binding.btnPlacebuffer.visibility = View.VISIBLE
             }
             hemoCubeViewModel.messages.postValue(getString(R.string.start))
-        } else {
-            hemoCubeViewModel.messages.postValue("Config error")
-        }
 
-        if (!Constants.DEVICE_CONFIGURATION.containsKey(deviceHardwareId)) {
-            assignDefaultDevice(resultData)
-//            testState.allErrorMessages += "Calibration configuration for this device id is not found\n"
-        }
-        if (!Constants.BUFFER_INTENSITY_THRESHOLDS.containsKey(deviceHardwareId)) {
-//            testState.allErrorMessages += "ADC thresholds for this device id are not found\n"
-        }
-    }
-
-    fun extractV1HardwareId(input: String): String? {
-        val regex = Regex("SN (\\S+)")
-        val matchResult = regex.find(input)
-
-        return matchResult?.groupValues?.get(1)
-    }
-
-    fun processV2HardwareId(resultData: String) {
-        val hardwareId = extractV2HardwareId(resultData)
-
-        if (!hardwareId.isNullOrBlank()) {
-            updateDeviceId(hardwareId)
-            activity?.runOnUiThread {
-                binding.btnPlacebuffer.visibility = View.VISIBLE
+            if (!Constants.DEVICE_CONFIGURATION.containsKey(deviceHardwareId)) {
+                deviceHardwareId = "HCV-000-3001"
+                allErrorMessages += "Calibration configuration for this device id is not found\n"
+            }
+            if (!Constants.BUFFER_INTENSITY_THRESHOLDS.containsKey(deviceHardwareId)) {
+                allErrorMessages += "ADC thresholds for this device id are not found\n"
             }
-            hemoCubeViewModel.messages.postValue(getString(R.string.start))
         } else {
             hemoCubeViewModel.messages.postValue("Config error")
         }
-
-        if (!Constants.DEVICE_CONFIGURATION.containsKey(deviceHardwareId)) {
-            assignDefaultDevice(resultData)
-            testState.allErrorMessages += "Calibration configuration for this device id is not found\n"
-        }
-        if (!Constants.BUFFER_INTENSITY_THRESHOLDS.containsKey(deviceHardwareId)) {
-            testState.allErrorMessages += "ADC thresholds for this device id are not found\n"
-        }
     }
 
-    fun assignDefaultDevice(configData: String) {
-        deviceHardwareId = "HCV-000-3001"
-        testStatusCode = TestStatus.CONFIG_COMPLETED.code
-        activity?.runOnUiThread {
-            binding.btnPlacebuffer.visibility = View.VISIBLE
-        }
-        hemoCubeViewModel.messages.postValue(getString(R.string.start))
-    }
-
-    fun extractV2HardwareId(input: String): String? {
-        val pattern = Regex("SNS\\s*(.*?)\\s*SNE")
+    fun extractMiddleString(input: String): String? {
+        val pattern = Regex("SNS\\s(.*?)\\sSNE")
         val matchResult: MatchResult? = pattern.find(input)
 
         return matchResult?.groups?.get(1)?.value
@@ -728,7 +635,7 @@ class HemoCubeFragment : Fragment() {
             val led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
             val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
             val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
-            val deviceRatio = led2Average / led1Average
+            val deviceRatio = led4Average / led1Average
 
             if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
                     ?.get(0)!!
@@ -742,10 +649,10 @@ class HemoCubeFragment : Fragment() {
                     3
                 )?.get(0)!!
             ) {
-//                validationError = true
-//                testState.allErrorMessages += "Error: Invalid Test. Improper buffer reading (low)"
+                validationError = true
+                allErrorMessages += "Error: Invalid Test. Improper buffer reading (low)"
                 activity?.runOnUiThread {
-//                    binding.errorMessage.text = getString(R.string.error_improper_buffer_low)
+                    binding.errorMessage.text = getString(R.string.error_improper_buffer_low)
 //                    binding.errorMessage.visibility = View.VISIBLE
                 }
             }
@@ -762,12 +669,12 @@ class HemoCubeFragment : Fragment() {
                     3
                 )?.get(1)!!
             ) {
-//                validationError = true
-//                testState.allErrorMessages += "Error: Invalid Test. Improper buffer reading (high)" + "\n"
+                validationError = true
+                allErrorMessages += "Error: Invalid Test. Improper buffer reading (high)" + "\n"
                 activity?.runOnUiThread {
-//                    binding.errorMessage.text =
+                    binding.errorMessage.text =
                         getString(R.string.error_improper_buffer_high)
-//                    binding.errorMessage.visibility = View.VISIBLE
+                    binding.errorMessage.visibility = View.VISIBLE
                 }
             }
 
@@ -789,57 +696,56 @@ class HemoCubeFragment : Fragment() {
 
             val slope1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(0)
             val intercept1 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(1)?.get(1)
-            val calculatedHb1 = (led1Average - intercept1!!) / slope1!!
+            val _hb1 = (led3Average - intercept1!!) / slope1!!
 
             val slope2 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(0)
             val intercept = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(1)
-            val calculatedHb2 = (led2Average - intercept!!) / slope2!!
+            val _hb2 = (led4Average - intercept!!) / slope2!!
 
             val slope3 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(2)?.get(0)
             val intercept3 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(2)?.get(1)
-            val calculatedHb3 = (led3Average - intercept3!!) / slope3!!
+            val _hb3 = (led3Average - intercept3!!) / slope3!!
 
             val slope4 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(0)
             val intercept4 = Constants.DEVICE_HB_PARAMETERS[deviceHardwareId]?.get(3)?.get(1)
-            val calculatedHb4 = (led4Average - intercept4!!) / slope4!!
+            val _hb4 = (led4Average - intercept4!!) / slope4!!
 
-            calculatedPredictedDenovixRatio = fittedAbs3.div(fittedAbs1)
+            _predictedDenovixRatio = fittedAbs3.div(fittedAbs1)
 
-            val slope = (led4Average - led1Average) / (431-411)
-            val calculatedSlopeRatio = abs(led2Average / slope)
-            val slopeClass = slopeRatioClassification(calculatedSlopeRatio)
+            val slope = (led1Average - led2Average) / (435 - 415)
+            val _slopeRatio = abs(led3Average / slope)
+            val slopeClass = slopeRatioClassification(_slopeRatio)
 
             if (fittedAbs1 <= fittedAbs2) {
-//                validationError = true
-//                testState.allErrorMessages += "Error: Invalid Test. Problem with de-oxygenation" + "\n"
+                validationError = true
+                allErrorMessages += "Error: Invalid Test. Problem with de-oxygenation" + "\n"
                 activity?.runOnUiThread {
-//                    binding.errorMessage.text = getString(R.string.error_invalid_test)
+                    binding.errorMessage.text = getString(R.string.error_invalid_test)
 //                    binding.errorMessage.visibility = View.VISIBLE
                 }
             }
 
             if (fittedAbs1 < 0 || fittedAbs2 < 0 || fittedAbs3 < 0 || fittedAbs4 < 0) {
-//                validationError = true
+                validationError = true
                 activity?.runOnUiThread {
                     binding.errorMessage.text = getString(R.string.error_negative_abs)
 //                    binding.errorMessage.visibility = View.VISIBLE
                 }
             }
 
-            var absorbanceLowerLimit = 0.0
-            if (led1Average < absorbanceLowerLimit || led2Average < absorbanceLowerLimit || led3Average < absorbanceLowerLimit || led4Average < absorbanceLowerLimit) {
+            if ((led1Average < 0.7 || led2Average < 0.7 || led3Average < 0.7 || led4Average < 0.7) && _slopeRatio > 35.0) {
                 validationError = true
                 activity?.runOnUiThread {
-                    binding.errorMessage.text = "Invalid"
+                    binding.errorMessage.text = "Severely Low Hb. Repeat test with 12 ul in 2 ml Buffer"
                     binding.errorMessage.visibility = View.VISIBLE
                 }
             }
 
             if (fittedAbs3 < 0.1) {
-//                validationError = true
-//                testState.allErrorMessages += "Error: Low Hb. Repeat test" + "\n"
+                validationError = true
+                allErrorMessages += "Error: Low Hb. Repeat test" + "\n"
                 activity?.runOnUiThread {
-//                    binding.errorMessage.text = "Error: Low Hb. Repeat test"
+                    binding.errorMessage.text = "Error: Low Hb. Repeat test"
 //                    binding.errorMessage.visibility = View.VISIBLE
                 }
             }
@@ -863,22 +769,22 @@ class HemoCubeFragment : Fragment() {
                 this.abs2 = fittedAbs2
                 this.abs3 = fittedAbs3
                 this.abs4 = fittedAbs4
-                this.hb3 = calculatedHb3
-                this.hb4 = calculatedHb4
+                this.hb3 = _hb3
+                this.hb4 = _hb4
                 this.deviceRatio = deviceRatio
                 this.calculatedRatio = calculateRatio(deviceRatio)
-                this.predictedDenovixRatio = calculatedPredictedDenovixRatio
-                this.slopeRatio = calculatedSlopeRatio
+                this.predictedDenovixRatio = _predictedDenovixRatio
+                this.slopeRatio = _slopeRatio
                 this.coefficients = currentDeviceData?.coefficients?.get(0)
                     .toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
                 this.prdClassification = absorbanceBasedClassification(predictedDenovixRatio)
                 this.deviceRatioClass = deviceRatioClassification(deviceRatio)
                 this.slopeRatioClass = slopeClass
-                this.classificationResult = deviceRatioClass
-                hemoCubeViewModel.messages.postValue("${this.classificationResult} \n Device Ratio: ${"%.3f".format(this.deviceRatio)}")
+                this.classificationResult = deviceRatioClass //findResult(calculatedRatio)
+                hemoCubeViewModel.messages.postValue("${this.deviceRatioClass} ${if (led4Average < 0.17) " - Low Hb" else ""}\n")
                 if (DataHolder.hemoCubeTestData?.testType == "HB")
-                    hemoCubeViewModel.messages.postValue("Hb: $calculatedHb4")
-                this.errorMessages = testState.allErrorMessages
+                    hemoCubeViewModel.messages.postValue("HB: $_hb4")
+                this.errorMessages = allErrorMessages
                 this.resultData = deviceLog
                 this.batteryLevel = hemoCubeViewModel.getBatteryLevel().toString()
                 this.batteryCapacity =
@@ -909,56 +815,68 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
-    fun findResultWithAdditionalMethods(deviceRatio: Double?, deviceRatioClass: String?, slopeRatio: Double?): String {
+    fun findResult(calculatedRatio: Double?): String {
         try {
-//            hemoCubeViewModel.messages.postValue("post classification checks")
-            if (deviceRatio != null) {
-                if (slopeRatio != null) {
-                    if (deviceRatioClass == "Normal" && slopeRatio > 45.0)
-                        return "Negative Borderline, Repeat Test"
+            hemoCubeViewModel.messages.postValue("result classification")
+            if (calculatedRatio != null) {
+                if (calculatedRatio < 0.05)
+                    return getString(R.string.error_repeat_test_higher_volume)
+                if (calculatedRatio in 0.05..0.155) {
+                    return getString(R.string.normal)
                 }
+                if (calculatedRatio in 0.155..0.175)
+                    return getString(R.string.negative_borderline)
+                if (calculatedRatio in 0.175..0.22)
+                    return getString(R.string.sickle_cell_trait)
+                if (calculatedRatio in 0.22..0.25)
+                    return getString(R.string.positive_for_sickle_cell)
+                if (calculatedRatio in 0.25..0.35)
+                    return getString(R.string.sickle_cell_disease)
+                if (calculatedRatio > 0.35)
+                    return getString(R.string.error_repeat_test_lower_volume)
+            } else {
+                return getString(R.string.invalid)
             }
         } catch (e: Exception) {
-            handleException(e)
-            return "Error"
+            showToast(R.string.error_classification)
+            Firebase.crashlytics.recordException(e)
+            return getString(R.string.error)
         }
-        return deviceRatioClass.toString()
+        return getString(R.string.invalid)
     }
 
     fun deviceRatioClassification(ratio: Double?): String {
         try {
+            hemoCubeViewModel.messages.postValue("result classification")
             if (ratio != null) {
-                if (ratio in 0.016..0.22) {
-//                    setSubtitleTextColor(R.color.green_2)
-                    return "Normal"
+                if (ratio in 0.2..0.29) {
+                    activity?.runOnUiThread {
+                        binding.tvSubtitle4.setTextColor(
+                            ContextCompat.getColor(
+                                requireContext(),
+                                R.color.green_2
+                            )
+                        )
+                    }
+                    return getString(R.string.normal)
                 }
-                if (ratio in 0.22..0.24)
-                    return "Negative Borderline"
-                if (ratio in 0.24..0.32)
-                    return "Sickle Cell Trait"
-                if (ratio in 0.32..0.37)
-                    return "Positive for Sickle Cell. HPLC for Confirmation"
-                if (ratio in 0.37..0.56)
-                    return "Sickle Cell Disease"
+                if (ratio in 0.29..0.32)
+                    return getString(R.string.negative_borderline)
+                if (ratio in 0.32..0.35)
+                    return getString(R.string.sickle_cell_trait)
+                if (ratio in 0.35..0.38)
+                    return getString(R.string.positive_for_sickle_cell)
+                if (ratio in 0.38..0.5)
+                    return getString(R.string.sickle_cell_disease)
             } else {
-                return "Invalid"
+                return getString(R.string.invalid)
             }
         } catch (e: Exception) {
-            handleException(e)
-            return "Error"
+            showToast(R.string.error_classification)
+            Firebase.crashlytics.recordException(e)
+            return getString(R.string.error)
         }
-        return "Invalid"
-    }
-
-    fun setSubtitleTextColor(colorResId: Int) {
-        activity?.runOnUiThread {
-            binding.tvSubtitle4.setTextColor(ContextCompat.getColor(requireContext(), colorResId))
-        }
-    }
-
-    fun handleException(e: Exception) {
-        showToast(R.string.error_classification)
-        Firebase.crashlytics.recordException(e)
+        return getString(R.string.invalid)
     }
 
     fun slopeRatioClassification(ratio: Double?): String {

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

@@ -3,6 +3,7 @@ package com.example.hpostesting.presentation.hemocube
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.SharedPreferences
 import android.os.BatteryManager
 import android.util.Log
 import androidx.lifecycle.LiveData
@@ -34,6 +35,7 @@ import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.CheckUpdateResponse
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
+import com.example.hpostesting.data.repository.DatabaseRepository
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.CheckUpdateWorker
 import com.example.hpostesting.domain.LogFileManager
@@ -45,6 +47,7 @@ import okhttp3.RequestBody.Companion.asRequestBody
 import okhttp3.ResponseBody
 import java.text.SimpleDateFormat
 import java.util.Calendar
+import java.util.Date
 import java.util.Locale
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -79,7 +82,6 @@ class HemoCubeViewModel @Inject constructor(
     val checkUpdate = MutableLiveData<Result<CheckUpdateResponse>>()
 
     val deviceUpdate = MutableLiveData<Result<ResponseBody>>()
-    val downloadcertificate = MutableLiveData<Result<ResponseBody>>()
 
     val uploadLogs = MutableLiveData<Result<UploadLogsResponse>?>()
 
@@ -156,13 +158,6 @@ class HemoCubeViewModel @Inject constructor(
         }
     }
 
-    fun downloadClientCertificate() = viewModelScope.launch {
-        downloadcertificate.postValue(Result.Loading())
-        repository.downloadClientCertificate().let {
-            downloadcertificate.postValue(it)
-        }
-    }
-
     fun startPeriodicCheckUpdate() {
         val periodicRequest = PeriodicWorkRequestBuilder<CheckUpdateWorker>(
             repeatInterval = 1, repeatIntervalTimeUnit = TimeUnit.MINUTES

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

@@ -130,18 +130,18 @@ open class HemocubeActivity : AppCompatActivity() {
         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
+                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
             )
         } else {
             mPendingIntent = PendingIntent.getBroadcast(
                 this,
                 0,
-                Intent(Constants.HEMOCUBE_USB_PERMISSION),
+                Intent(Constants.HOMOCUBE_USB_PERMISSION),
                 PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
             )
         }
 
-        val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
+        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
         registerReceiver(broadcastReceiver, filter)
         manager.requestPermission(device, mPendingIntent)
     }

app/src/main/java/com/example/hpostesting/presentation/jig/JigActivity.kt

@@ -1,183 +0,0 @@
-package com.example.hpostesting.presentation.jig
-
-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.content.pm.ActivityInfo
-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.DataHolder
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.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.ActivityJigBinding
-
-@AndroidEntryPoint
-class JigActivity: AppCompatActivity(){
-    private lateinit var binding: ActivityJigBinding
-    val viewModel: JigViewModel by viewModels()
-    private var myMenu: Menu? = null
-
-    private lateinit var mDriver: UsbSerialDriver
-    private var mConnection: UsbDeviceConnection? = null
-    lateinit var mService: UsbService
-
-    private val TAG = "JIG"
-
-    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)
-        binding = ActivityJigBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-//        setSupportActionBar(binding.myToolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-//        setupListener()
-//        connectUsb(false)
-
-        this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE)
-
-        moveToNext()
-    }
-
-    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.fgJig.id, JigFragment())
-            .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/jig/JigFragment.kt

@@ -1,241 +0,0 @@
-package com.example.hpostesting.presentation.jig
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.SharedPreferences
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.text.Editable
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.EditText
-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.model.jig.JigData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.journeyapps.barcodescanner.ScanContract
-import com.journeyapps.barcodescanner.ScanIntentResult
-import com.zebra.barcode.sdk.sms.ConfigurationUpdateEvent
-import com.zebra.scannercontrol.DCSSDKDefs
-import com.zebra.scannercontrol.DCSScannerInfo
-import com.zebra.scannercontrol.FirmwareUpdateEvent
-import com.zebra.scannercontrol.IDcsSdkApiDelegate
-import com.zebra.scannercontrol.SDKHandler
-import `in`.sminnovations.hpostesting.databinding.FragmentJigBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-
-class JigFragment : Fragment(), IDcsSdkApiDelegate {
-    private lateinit var binding: FragmentJigBinding
-    private val jigViewModel: JigViewModel 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 = FragmentJigBinding.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)
-        initScanner()
-        initViews()
-        observeViewModel()
-    }
-
-    private fun initScanner() {
-        //Setting up the SDK handler
-        sdkHandler = SDKHandler(requireContext())
-        //Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications.
-        sdkHandler!!.dcssdkSetDelegate(this)
-        //this command is telling the sdk that we're going to be connecting to the scanner via USB
-        sdkHandler!!.dcssdkSetOperationalMode(DCSSDKDefs.DCSSDK_MODE.DCSSDK_OPMODE_SNAPI)
-
-        //deciding what kind of notifications we want to receive. Explained more in the function
-        //first we use bitmapping to set these values into the notifications_mask.
-        var notifications_mask = 0
-        // We would like to subscribe to all barcode events
-        notifications_mask =
-            notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
-        sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
-        mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
-        Log.e("scannersize", sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
-        if (mScannerInfoList.isNotEmpty()) {
-            sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
-        } else {
-            Toast.makeText(requireContext(), "Scanner Error", Toast.LENGTH_LONG).show()
-        }
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun initViews() {
-        binding.btnScanNow.setOnClickListener {
-            pullTrigger()
-        }
-
-        binding.btnRefresh.setOnClickListener {
-            activity?.recreate()
-            initScanner()
-
-            activity?.runOnUiThread {
-                binding.tvScanText.text = ""
-            }
-        }
-
-        activity?.runOnUiThread {
-            binding.tvAppVersion.text =
-                getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
-        }
-    }
-
-    private fun observeViewModel() {
-
-        jigViewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-        }
-
-        messages.observe(viewLifecycleOwner) {
-            binding.tvScanText.text = it
-        }
-
-        jigViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                showToast("Data uploaded successfully")
-            }
-            if (result == "Local") {
-                showToast("Data uploading failed, note it down manually")
-            }
-
-            binding.progressBar.visibility = View.GONE
-        }
-    }
-
-    private fun getAppVersion(context: Context): String {
-        return try {
-            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-            pInfo.versionName
-        } catch (e: PackageManager.NameNotFoundException) {
-            "N/A"
-        }
-    }
-
-    private fun getAppEnvironment(context: Context): String {
-        return try {
-            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-            pInfo.packageName.substringAfterLast('.')
-        } catch (e: PackageManager.NameNotFoundException) {
-            "N/A"
-        }
-    }
-
-    private fun showToast(message: String) {
-        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
-    }
-
-    var sdkHandler: SDKHandler? = null
-    var editBarcode: EditText? = null
-    var mScannerInfoList = ArrayList<DCSScannerInfo>()
-
-    private val barcodeLauncher = registerForActivityResult(
-        ScanContract()
-    ) { result: ScanIntentResult ->
-        if (result.contents.isNullOrEmpty()) {
-//            Toast.makeText(this, R.string.cancelled_unable_scan, Toast.LENGTH_LONG).show()
-        } else {
-//            Log.d(TAG, result.contents)
-            processScannedData(result.contents)
-        }
-    }
-
-    private fun processScannedData(contents: String) {
-        binding.tvScanText.setText(contents)
-    }
-
-    private fun pullTrigger() {
-        // Check if the list is not empty before accessing its elements
-        if (mScannerInfoList.isNotEmpty()) {
-            // Only proceed if the scanner is not active
-            if (!mScannerInfoList[0].isActive) {
-                sdkHandler?.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
-            }
-            val inXML = "<inArgs><scannerID> 1 </scannerID></inArgs>"
-            val outXML = StringBuilder()
-            val result: DCSSDKDefs.DCSSDK_RESULT =
-                sdkHandler!!.dcssdkExecuteCommandOpCodeInXMLForScanner(
-                    DCSSDKDefs.DCSSDK_COMMAND_OPCODE.DCSSDK_DEVICE_PULL_TRIGGER,
-                    inXML,
-                    outXML,
-                    mScannerInfoList[0].scannerID // Ensure you're using the correct scanner ID
-                )
-            if (result == DCSSDKDefs.DCSSDK_RESULT.DCSSDK_RESULT_SUCCESS) {
-                Log.d("Scanning", "Success")
-            } else if (result == DCSSDKDefs.DCSSDK_RESULT.DCSSDK_RESULT_FAILURE) {
-                Log.d("Scanning", "Failed")
-            }
-        } else {
-            // Handle the case where the list is empty, perhaps notify the user or log an error
-            Log.e("ScannerError", "No scanners are connected or available.")
-        }
-    }
-
-    override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) {
-        val result = String(barcodeData!!)
-        Log.d("BARCODE", result)
-        activity?.runOnUiThread {
-            val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
-            binding.tvScanText.text = result
-
-            jigViewModel.addScanDataToDb(
-                JigData(
-                    deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                    scanData = result,
-                    createdAt = SimpleDateFormat(
-                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                    ).format(Calendar.getInstance().time)
-                )
-            )
-        }
-    }
-
-    override fun dcssdkEventScannerAppeared(dcsScannerInfo: DCSScannerInfo?) {}
-
-    override fun dcssdkEventScannerDisappeared(i: Int) {}
-
-    override fun dcssdkEventCommunicationSessionEstablished(dcsScannerInfo: DCSScannerInfo?) {}
-
-    override fun dcssdkEventCommunicationSessionTerminated(i: Int) {}
-//    override fun dcssdkEventBarcode(p0: ByteArray?, p1: Int, p2: Int) {
-//        TODO("Not yet implemented")
-//    }
-
-
-    override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventBinaryData(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventFirmwareUpdate(firmwareUpdateEvent: FirmwareUpdateEvent?) {}
-
-    override fun dcssdkEventAuxScannerAppeared(
-        dcsScannerInfo: DCSScannerInfo?,
-        dcsScannerInfo1: DCSScannerInfo?,
-    ) {
-    }
-
-    override fun dcssdkEventConfigurationUpdate(configurationUpdateEvent: ConfigurationUpdateEvent?) {}
-
-}

app/src/main/java/com/example/hpostesting/presentation/jig/JigViewModel.kt

@@ -1,49 +0,0 @@
-package com.example.hpostesting.presentation.jig
-
-import android.content.Context
-import android.content.SharedPreferences
-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.jig.JigData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.repository.Repository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-class JigViewModel  @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 addScanDataToDb(data: JigData) {
-        viewModelScope.launch {
-            try {
-                when (val response = repository.addTestJigData(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/testRight/TestRightViewModel.kt

@@ -2,6 +2,7 @@ package com.example.hpostesting.presentation.testRight
 
 import android.content.Context
 import android.net.Uri
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -25,6 +26,7 @@ import com.example.hpostesting.domain.TestRightResultCalculation
 import com.example.hpostesting.util.MyUtils
 import com.google.firebase.storage.FirebaseStorage
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.scopes.ViewModelScoped
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import java.io.File

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

@@ -34,7 +34,7 @@ class UsbService : Service() {
     fun connect(driver: UsbSerialDriver, connection: UsbDeviceConnection) {
         mPort = driver.ports[0] // Most devices have just one port (port 0)
         mPort.open(connection)
-        mPort.setParameters(9600, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
+        mPort.setParameters(115200, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
         isUsbConnected = true
         Log.d(TAG, "My Usb Connected ${mPort.driver}")
 

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

@@ -1,199 +0,0 @@
-package com.example.hpostesting.presentation.trueheme
-
-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.DataHolder
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.testRight.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.ActivityHemocubeBinding
-
-@AndroidEntryPoint
-class TrueHemeActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityHemocubeBinding
-    private val viewModel by viewModels<HemoCubeViewModel>()
-    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)
-        binding = ActivityHemocubeBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        setSupportActionBar(binding.myToolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        setupListener()
-        connectUsb(false)
-    }
-
-    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()
-            }
-        }
-    }
-
-
-    @SuppressLint("MutableImplicitPendingIntent", "UnspecifiedRegisterReceiverFlag")
-    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)
-    }
-
-    open fun reconnectDevice() {
-        mService.disconnect()
-        unbindService(connection)
-        viewModel.isServiceConnected = false
-        connectUsb(true)
-    }
-
-    private fun moveToNext() {
-        if (supportFragmentManager.isDestroyed) return
-
-        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeFragment())
-            .commit()
-    }
-
-
-    override fun onBackPressed() {
-        val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
-        if (fragment is HemoCubeFragment) {
-            fragment.handleBackButtonPress()
-        } else {
-            super.onBackPressed()
-        }
-    }
-
-
-    fun onErrorReported(msg: String) {
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
-        if (!isFinishing) onBackPressed()
-    }
-
-    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/trueheme/TrueHemeViewModel.kt

@@ -1,533 +0,0 @@
-package com.example.hpostesting.presentation.trueheme
-
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.os.BatteryManager
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkManager
-import com.example.hpostesting.data.CsvWriter
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.dao.HemoCubeBufferDao
-import com.example.hpostesting.data.dao.HemoCubeDao
-import com.example.hpostesting.data.datasource.LocalFileDataSource
-import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.log.UploadLogsResponse
-import com.example.hpostesting.data.model.login.LoginRequest
-import com.example.hpostesting.data.model.login.LoginResponse
-import com.example.hpostesting.data.model.molbioresult.MolbioV2Result
-import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
-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.toHemoCubeTestData
-import com.example.hpostesting.data.model.updates.CheckUpdateRequest
-import com.example.hpostesting.data.model.updates.CheckUpdateResponse
-import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
-import com.example.hpostesting.data.repository.Repository
-import com.example.hpostesting.domain.CheckUpdateWorker
-import com.example.hpostesting.domain.LogFileManager
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.MultipartBody
-import okhttp3.RequestBody.Companion.asRequestBody
-import okhttp3.ResponseBody
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-@Suppress("MemberVisibilityCanBePrivate")
-@HiltViewModel
-class TrueHemeViewModel @Inject constructor(
-    private val hemoCubeDao: HemoCubeDao,
-    private val hemoCubeBufferDao: HemoCubeBufferDao,
-    private val repository: Repository,
-    private val logFileManager: LogFileManager,
-    private val localFileDataSource: LocalFileDataSource,
-    context: Context,
-) : ViewModel() {
-    var isServiceConnected = false
-    val progressBar = MutableLiveData(false)
-    private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
-    val messages = MutableLiveData<String>()
-    private val sharedPreference =
-        context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
-    private val workManager = WorkManager.getInstance(context)
-
-//    init {
-//        startPeriodicCheckUpdate()
-//    }
-
-    val loginResponse = MutableLiveData<Result<LoginResponse>>()
-
-    val resultUpload = MutableLiveData<Result<MolbioV2ResultResponse>>()
-
-    val checkUpdate = MutableLiveData<Result<CheckUpdateResponse>>()
-
-    val deviceUpdate = MutableLiveData<Result<ResponseBody>>()
-
-    val uploadLogs = MutableLiveData<Result<UploadLogsResponse>?>()
-
-
-    // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
-
-    private val _networkStatusLiveData = NetworkStatusLiveData(context)
-    val allUserData = hemoCubeDao.getAll()
-    val allKitTestData = hemoCubeBufferDao.getAll()
-    val deviceData = MutableLiveData<DeviceData?>()
-
-
-    val networkStatusLiveData: LiveData<Boolean>
-        get() = _networkStatusLiveData
-    val deviceMessages = MutableLiveData<String?>()
-    val fireBaseUpload = MutableLiveData<String>()
-    val fireBaseBulkUpload = MutableLiveData<String>()
-
-    private val batteryStatus: Intent? =
-        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
-            context.registerReceiver(null, ifilter)
-        }
-
-    fun uploadHemoCubeResultToDatabase(
-        isOnline: Boolean, testStatus: Boolean, kitSerial: String?,
-    ) = viewModelScope.launch {
-        if (kitSerial != null) {
-            testDetails?.kitSerial = kitSerial
-        }
-        testDetails?.testStatus = testStatus
-
-        try {
-            if (isOnline) {
-                parseData()
-                addResultTestToDb()
-            } else {
-                parseData()
-                testDetails?.testTime = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                ).format(Calendar.getInstance().time)
-                hemoCubeDao.insertAll(testDetails!!)
-                fireBaseUpload.postValue("Local")
-            }
-        } catch (e: Exception) {
-            Log.e("Testdb", "Upload failed: ${e.message}")
-        }
-    }
-
-    fun login(loginRequest: LoginRequest) = viewModelScope.launch {
-        loginResponse.postValue(Result.Loading())
-        repository.login(loginRequest).let {
-            loginResponse.postValue(it)
-        }
-    }
-
-    fun uploadResult(molbioV2ResultRequest: MolbioV2ResultRequest) = viewModelScope.launch {
-        resultUpload.postValue(Result.Loading())
-        repository.uploadResults(molbioV2ResultRequest).let {
-            resultUpload.postValue(it)
-        }
-    }
-
-    fun checkUpdate(checkUpdateRequest: CheckUpdateRequest) = viewModelScope.launch {
-        checkUpdate.postValue(Result.Loading())
-        repository.checkUpdate(checkUpdateRequest).let {
-            checkUpdate.postValue(it)
-        }
-    }
-
-    fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest) = viewModelScope.launch {
-        deviceUpdate.postValue(Result.Loading())
-        repository.deviceUpdate(deviceUpdateRequest).let {
-            deviceUpdate.postValue(it)
-        }
-    }
-
-    fun startPeriodicCheckUpdate() {
-        val periodicRequest = PeriodicWorkRequestBuilder<CheckUpdateWorker>(
-            repeatInterval = 1, repeatIntervalTimeUnit = TimeUnit.MINUTES
-        ).build()
-
-        workManager.enqueueUniquePeriodicWork(
-            "checkUpdateWorker", ExistingPeriodicWorkPolicy.KEEP, periodicRequest
-        )
-    }
-
-    fun uploadLogs() = viewModelScope.launch {
-        uploadLogs.postValue(Result.Loading())
-        val logFile = logFileManager.createLogFile().let { file ->
-            val requestBody = file?.asRequestBody("multipart/form-data".toMediaTypeOrNull())
-            val multipartFile =
-                requestBody?.let { MultipartBody.Part.createFormData("logFile", file?.name, it) }
-            multipartFile?.let { partFile ->
-                repository.uploadLogs(partFile).let { result ->
-                    uploadLogs.postValue(result)
-                }
-            }
-        }
-    }
-
-    fun uploadHemoCubeResultToDatabaseForBufferCheck(
-        isOnline: Boolean,
-        bufferCheckData: BufferCheckData,
-    ) =
-        viewModelScope.launch {
-            if (isOnline) {
-                try {
-                    when (val response =
-                        repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
-                        is Response.Success -> {
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
-                            fireBaseUpload.postValue("Success")
-                            bufferCheckData.localFlag = true
-                            hemoCubeBufferDao.insertAll(bufferCheckData)
-                        }
-
-                        is Response.Error -> {
-                            Log.e("Testdb", "Error uploading data to Firestore: $response")
-                            fireBaseUpload.postValue("Error")
-                            bufferCheckData.localFlag = true
-                            hemoCubeBufferDao.insertAll(bufferCheckData)
-                        }
-
-                        else -> {}
-                    }
-                } catch (e: Exception) {
-                    Log.e("Testdb", "Exception during data upload: ${e.message}")
-                    fireBaseUpload.postValue("Error")
-                }
-            } else {
-                hemoCubeBufferDao.insertAll(bufferCheckData)
-                fireBaseUpload.postValue("Local")
-            }
-        }
-
-    fun bulkAddResultKitTestToDb(bufferCheckData: BufferCheckData) {
-        viewModelScope.launch {
-            bufferCheckData.reportUploadTime = SimpleDateFormat(
-                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-            ).format(Calendar.getInstance().time)
-            when (repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
-                is Response.Success -> {
-                    fireBaseBulkUpload.postValue("Success")
-                    updateBufferLocalFlag(bufferCheckData._id)
-                }
-
-                else -> {
-                    fireBaseBulkUpload.postValue("Error")
-                }
-            }
-        }
-    }
-
-    fun uploadHemoCubeResultToDatabaseforbuffercheckN(bufferCheckData: BufferCheckData) =
-        viewModelScope.launch {
-            addResultTestToDbforbuffercheck(bufferCheckData)
-        }
-
-    fun getDeviceData(deviceId: String?) = viewModelScope.launch {
-        deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
-    }
-
-    fun parseData() {
-        testDetails?.deviceRatio = DataHolder.hemocubeResult
-        testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
-        testDetails?.location = DataHolder.location
-        testDetails?.testTime = SimpleDateFormat(
-            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-        ).format(Calendar.getInstance().time)
-        testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion
-        testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId
-        testDetails?.deviceSerialNumber =
-            sharedPreference.getString(Constants.USER_ID, "").toString()
-        testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-        testDetails?.led1Buffer = DataHolder.hemoCubeTestData?.led1Buffer
-        testDetails?.led2Buffer = DataHolder.hemoCubeTestData?.led2Buffer
-        testDetails?.led3Buffer = DataHolder.hemoCubeTestData?.led3Buffer
-        testDetails?.led4Buffer = DataHolder.hemoCubeTestData?.led4Buffer
-        testDetails?.led1Sample = DataHolder.hemoCubeTestData?.led1Sample
-        testDetails?.led2Sample = DataHolder.hemoCubeTestData?.led2Sample
-        testDetails?.led3Sample = DataHolder.hemoCubeTestData?.led3Sample
-        testDetails?.led4Sample = DataHolder.hemoCubeTestData?.led4Sample
-        testDetails?.led1Average = DataHolder.hemoCubeTestData?.led1Average
-        testDetails?.led2Average = DataHolder.hemoCubeTestData?.led2Average
-        testDetails?.led3Average = DataHolder.hemoCubeTestData?.led3Average
-        testDetails?.led4Average = DataHolder.hemoCubeTestData?.led4Average
-        testDetails?.abs1 = DataHolder.hemoCubeTestData?.abs1
-        testDetails?.abs2 = DataHolder.hemoCubeTestData?.abs2
-        testDetails?.abs3 = DataHolder.hemoCubeTestData?.abs3
-        testDetails?.abs4 = DataHolder.hemoCubeTestData?.abs4
-        testDetails?.deviceRatio = DataHolder.hemoCubeTestData?.deviceRatio
-        testDetails?.slopeRatio = DataHolder.hemoCubeTestData?.slopeRatio
-        testDetails?.predictedDenovixRatio = DataHolder.hemoCubeTestData?.predictedDenovixRatio
-        testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio
-        testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
-        testDetails?.incubationTime = DataHolder.hemoCubeTestData?.incubationTime.toString()
-        testDetails?.name = DataHolder.hemoCubeTestData?.name.toString()
-        testDetails?.birthYear = DataHolder.hemoCubeTestData?.birthYear.toString()
-        testDetails?.userImageURL = DataHolder.hemoCubeTestData?.userImageURL.toString()
-        testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
-        testDetails?.prdClassification = DataHolder.hemoCubeTestData?.prdClassification.toString()
-        testDetails?.deviceRatioClass = DataHolder.hemoCubeTestData?.deviceRatioClass.toString()
-        testDetails?.slopeRatioClass = DataHolder.hemoCubeTestData?.slopeRatioClass.toString()
-        testDetails?.errorMessages = DataHolder.hemoCubeTestData?.errorMessages.toString()
-        testDetails?.batteryLevel = DataHolder.hemoCubeTestData?.batteryLevel.toString()
-        testDetails?.batteryCapacity = DataHolder.hemoCubeTestData?.batteryCapacity.toString()
-        testDetails?.batteryMaxCapacity = DataHolder.hemoCubeTestData?.batteryMaxCapacity.toString()
-        testDetails?.batteryTemperature = DataHolder.hemoCubeTestData?.batteryTemperature.toString()
-        testDetails?.batteryVoltage = DataHolder.hemoCubeTestData?.batteryVoltage.toString()
-        testDetails?.quickCapture = DataHolder.hemoCubeTestData?.quickCapture!!
-        testDetails?.solution = DataHolder.hemoCubeTestData?.solution
-        testDetails?.concentration = DataHolder.hemoCubeTestData?.concentration
-        testDetails?.volume = DataHolder.hemoCubeTestData?.volume
-    }
-
-    private fun addResultTestToDb() {
-        viewModelScope.launch {
-            try {
-                testDetails!!.reportUploadTime = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                ).format(Calendar.getInstance().time)
-
-                when (val response = repository.addTestToDatabase(testDetails)) {
-                    is Response.Success -> {
-                        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")
-                        testDetails.localFlag = true
-                        uploadResult(
-                            MolbioV2ResultRequest(
-                                mutableListOf(
-                                    MolbioV2Result(
-                                        rawData = testDetails,
-                                        analysisId = testDetails._id,
-                                        analysisDate = testDetails.testTime,
-                                        analysisStatus = testDetails.classificationResult,
-                                        thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[testDetails.deviceId].toString(),
-                                        interpretation = testDetails.classificationResult,
-                                        testId = testDetails._id,
-                                        testTime = testDetails.testTime,
-                                        collectionTime = testDetails.testTime,
-                                        expiryTime = testDetails.testTime,
-                                    )
-                                )
-                            )
-                        )
-                        hemoCubeDao.insertAll(testDetails)
-                    }
-
-                    is Response.Error -> {
-                        Log.e("Testdb", "Error uploading data to Firestore: $response")
-                        fireBaseUpload.postValue("Error")
-                        hemoCubeDao.insertAll(testDetails)
-                    }
-
-                    else -> {}
-                }
-            } catch (e: Exception) {
-                Log.e("Testdb", "Exception during data upload: ${e.message}")
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
-
-    fun bulkAddResultTestToDb(userData: HemoCubeTestData) {
-        viewModelScope.launch {
-            userData.reportUploadTime = SimpleDateFormat(
-                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-            ).format(Calendar.getInstance().time)
-            when (repository.addTestToDatabase(userData)) {
-                is Response.Success -> {
-                    fireBaseBulkUpload.postValue("Success")
-                    updateLocalFlag(userData._id)
-                }
-
-                else -> {
-                    fireBaseBulkUpload.postValue("Error")
-                }
-            }
-        }
-    }
-
-    private fun updateLocalFlag(userId: String) = viewModelScope.launch {
-        hemoCubeDao.updateFieldById(id = userId, true)
-    }
-
-    fun updateMolbioFlag(userId: String) = viewModelScope.launch {
-        hemoCubeDao.updateMolbioFlag(id = userId, true)
-    }
-
-    fun addUser(userData: HemoCubeTestData) = viewModelScope.launch {
-        hemoCubeDao.insertAll(userData)
-    }
-
-    fun deleteById(userId: String) = viewModelScope.launch {
-        hemoCubeDao.deleteById(id = userId)
-    }
-
-
-    private fun addResultTestToDbforbuffercheck(bufferCheckData: BufferCheckData) {
-        viewModelScope.launch {
-            try {
-
-                when (val response =
-                    repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
-                    is Response.Success -> {
-                        Log.i("Testdb", "Data uploaded to Firestore successfully")
-                        fireBaseUpload.postValue("Success")
-                    }
-
-                    is Response.Error -> {
-                        Log.e("Testdb", "Error uploading data to Firestore: $response")
-                        fireBaseUpload.postValue("Error")
-                    }
-                }
-            } catch (e: Exception) {
-                Log.e("Testdb", "Exception during data upload: ${e.message}")
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
-
-    private fun updateBufferLocalFlag(bufferId: String) =
-        viewModelScope.launch {
-            hemoCubeBufferDao.updateFieldById(id = bufferId, true)
-        }
-
-    fun getLocalUserDataForCsv(context: Context): Boolean {
-        val localUserDataLiveData: LiveData<List<HemoCubeTestData>> = hemoCubeDao.getAll()
-
-        // Observe the LiveData to get the actual data when available
-        localUserDataLiveData.observeForever { localUserData ->
-            localUserData?.let {
-                val csvData = mutableListOf<Array<String>>()
-
-                it.forEach { userData ->
-                    csvData.add(
-                        arrayOf(
-                            userData._id,
-                            userData.name,
-                            userData.bloodGroup,
-                            userData.birthYear,
-                            userData.classificationResult,
-                            userData.testTime.toString(),
-                            userData.userImageURL
-                        )
-                    )
-                }
-
-                val csvWriter = CsvWriter(context)
-                csvWriter.writeCsv("userData.csv", csvData)
-
-                // Remove the observer to avoid leaks
-                localUserDataLiveData.removeObserver {}
-            }
-        }
-
-        return true // Assuming success, you might want to modify this based on your actual logic
-    }
-
-    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
-    }
-
-    fun getBatteryTemperature(): Float? {
-        val batteryTemp: Float? = batteryStatus?.let { intent ->
-            val temperature = intent.getIntExtra(
-                BatteryManager.EXTRA_TEMPERATURE,
-                0
-            )
-            temperature.toFloat() / 10
-        }
-
-        return batteryTemp
-    }
-
-    fun getBatteryVoltage(context: Context): Float {
-        val batteryIntent =
-            context.registerReceiver(
-                null,
-                IntentFilter(Intent.ACTION_BATTERY_CHANGED)
-            )
-        val voltage = batteryIntent?.getIntExtra(
-            BatteryManager.EXTRA_VOLTAGE,
-            0
-        ) ?: 0
-
-        // milli-volts to volts
-        return voltage.toFloat() / 1000
-    }
-
-
-    fun getBatteryCapacity(context: Context): Int {
-        val batteryManager =
-            context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-        val currentCapacity =
-            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-
-        return currentCapacity
-    }
-
-    fun getBatteryMaxCapacity(context: Context): Float {
-        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-        val designCapacity =
-            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-        val currentCapacity =
-            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-
-        // Calculate the estimated maximum battery capacity in mAh
-        val maxCapacity = currentCapacity.toFloat() / designCapacity.toFloat() * 100
-
-        return maxCapacity
-    }
-
-    fun createCSV(hemoCubeTestData: List<HemoCubeTestData>, appContext: Context) =
-        viewModelScope.launch {
-            val fileName = "HPOS${getCurrentDate()}.csv"
-            if (localFileDataSource.exportDataToCSV(fileName, hemoCubeTestData)) {
-                hemoCubeTestData.forEach { data ->
-                    data.localFlag = true
-                    hemoCubeDao.updateCSVFieldById(
-                        data._id,
-                        true
-                    )
-                }
-            }
-        }
-
-    fun getCurrentDate(): String {
-        return SimpleDateFormat(
-            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-        ).format(Calendar.getInstance().time)
-    }
-}

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="@color/primary"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/primary" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
-</vector>

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

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<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_jig"
-            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"
-            tools:context=".presentation.jig.JigActivity">
-
-        </FrameLayout>
-
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

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

@@ -1,9 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.example.hpostesting.presentation.KitscanJava">
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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_trueheme"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@id/my_toolbar"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            tools:context=".presentation.trueheme.TrueHemeActivity">
-        </FrameLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

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

@@ -62,7 +62,6 @@
     <Spinner
         android:id="@+id/spinner_volume"
         android:layout_width="0dp"
-        android:visibility="gone"
         android:layout_height="wrap_content"
         android:layout_marginTop="52dp"
         android:background="@drawable/spinner_border"

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

@@ -77,13 +77,13 @@
         app:cornerRadius="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
+        app:layout_constraintTop_toBottomOf="@id/btn_auto_dac" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_deviceProvision"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="visible"
+        android:visibility="gone"
         android:layout_marginHorizontal="16dp"
         android:layout_marginTop="24dp"
         android:clickable="false"
@@ -92,7 +92,7 @@
         app:cornerRadius="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_auto_dac" />
+        app:layout_constraintTop_toBottomOf="@id/btn_calibration" />
         
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_deviceInfo"
@@ -108,33 +108,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btn_calibration" />
 
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_firefox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/Firefox"
-        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_files"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/Files"
-        android:textColor="@color/white"
-        app:cornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_firefox" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -214,7 +214,7 @@
             android:layout_width="414dp"
             android:layout_height="201dp"
             android:gravity="center"
-            android:text="no device message"
+            android:text="#SS1\n#SC1"
             android:textColor="@color/black"
             android:textSize="11sp"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -115,15 +115,15 @@
             tools:listitem="@layout/offline_user_list_view" />
 
 
-<!--        <ImageView-->
-<!--            android:id="@+id/btnSaveLocal"-->
-<!--            android:layout_width="30dp"-->
-<!--            android:layout_height="30dp"-->
-<!--            android:layout_marginEnd="10dp"-->
-<!--            android:src="@drawable/downloads"-->
-<!--            android:visibility="gone"-->
-<!--            app:layout_constraintBottom_toBottomOf="@+id/rv_order_offline"-->
-<!--            app:layout_constraintStart_toStartOf="parent" />-->
+        <ImageView
+            android:id="@+id/btnSaveLocal"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="10dp"
+            android:src="@drawable/downloads"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/rv_order_offline"
+            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -1,126 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.example.hpostesting.presentation.jig.JigFragment">
-
-    <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:text="Test Jig"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tv_app_version"
-        style="@style/title2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="16dp"
-        android:text="0.0.0"
-        app:layout_constraintStart_toEndOf="@id/tv_subtitle2"
-        app:layout_constraintTop_toBottomOf="@id/tv_subtitle2"
-        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="Scan to get the code"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
-
-    <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" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_scan_now"
-        android:layout_width="258dp"
-        android:layout_height="56dp"
-        android:layout_margin="24dp"
-        android:drawableLeft="@drawable/baseline_qr_code_scanner_24"
-        android:text="@string/scan_now"
-        android:textColor="@color/black"
-        app:backgroundTint="@color/blue_app_light"
-        app:cornerRadius="100dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_title" />
-
-    <TextView
-        android:id="@+id/tv_scan_text"
-        style="@style/title1_1"
-        android:layout_width="0dp"
-        android:layout_height="150dp"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="16dp"
-        android:gravity="center"
-        android:text="no scan"
-        android:textColor="@color/black"
-        android:textSize="22sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_scan_now" />
-
-    <Button
-        android:id="@+id/btn_refresh"
-        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="Refresh"
-        android:visibility="visible"
-        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" />
-
-    <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_trueheme_sample.xml

@@ -1,264 +0,0 @@
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.example.hpostesting.presentation.trueheme.TrueHemeFragment">
-
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_parent"
-        android:layout_width="match_parent"
-        android:layout_height="match_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
-            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"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title" />
-
-        <!--        <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"-->
-        <!--            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-->
-        <!--            android:visibility="gone"-->
-        <!--            android:id="@+id/btn_samplestart"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="16dp"-->
-        <!--            android:layout_marginTop="24dp"-->
-        <!--            android:clickable="false"-->
-        <!--            android:text="@string/Start_Sample"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/til_blood_group" />-->
-
-
-        <!--        <Button-->
-        <!--            android:id="@+id/btn_placebuffer"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="16dp"-->
-        <!--            android:layout_marginTop="24dp"-->
-        <!--            android:clickable="false"-->
-        <!--            android:text="@string/place_buffer"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/btn_submit" />-->
-
-
-        <TextView
-            android:id="@+id/tv_title2"
-            style="@style/title1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="48dp"
-            android:text="@string/enter_kit_serial_number_manually"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="MissingConstraints" />
-
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/et_abha_id"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="20dp"
-            app:layout_constraintEnd_toStartOf="@id/btn_go"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title2">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/name_edit_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLength="17"
-                android:inputType="text"
-                android:hint="@string/serial_number" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_go"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="24dp"
-            android:text="@string/go"
-            app:cornerRadius="16dp"
-            app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toEndOf="@id/et_abha_id"
-            app:layout_constraintTop_toTopOf="@id/et_abha_id" />
-        <Button
-            android:visibility="gone"
-            android:id="@+id/btn_samplestart"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/Start_Sample"
-            android:textColor="@color/white"
-            app:cornerRadius="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_placebuffer" />
-
-
-
-        <Button
-            android:id="@+id/btn_placebuffer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/place_buffer"
-            android:textColor="@color/white"
-            app:cornerRadius="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
-
-        <Button
-            android:id="@+id/btn_submit"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/submit"
-            android:textColor="@color/white"
-            app:cornerRadius="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
-
-        <TextView
-            android:id="@+id/error_message"
-            style="@style/title1_1"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="72dp"
-            android:gravity="center"
-            android:textColor="@color/red"
-            android:textSize="12sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
-
-        <TextView
-            android:id="@+id/tv_device_messages"
-            style="@style/title1_1"
-            android:layout_width="414dp"
-            android:layout_height="201dp"
-            android:gravity="center"
-            android:text="no device message"
-            android:textColor="@color/black"
-            android:textSize="11sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/error_message" />
-
-        <Button
-            android:visibility="gone"
-            android:id="@+id/btn_digitalCard"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="DigitalCard View"
-            android:textColor="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/error_message" />
-
-        <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/tv_device_messages" />
-
-        <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>
-</layout>

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

@@ -12,12 +12,6 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/cardView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="16dp">
-
     <ImageView
         android:id="@+id/imageView"
         android:layout_width="wrap_content"
@@ -25,7 +19,6 @@
         android:contentDescription="@string/nav_header_desc"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
         app:srcCompat="@mipmap/hpos_icon" />
-    </androidx.cardview.widget.CardView>
 
     <TextView
         android:layout_width="match_parent"

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

@@ -101,7 +101,7 @@
     <string name="normal">Normal</string>
     <string name="sickle_cell_disease">Sickle Cell Disease</string>
     <string name="sickle_cell_trait">Sickle Cell Trait</string>
-    <string name="undefined">Undefined</string>
+    <string name="undefined">Undefined\ \ </string>
     <string name="sicklecell_nconfirmatory">Sicklecell\nConfirmatory</string>
     <string name="sicklecell_screening">Sicklecell Screening</string>
     <string name="thalassemia">Thalassemia</string>
@@ -115,8 +115,6 @@
     <string name="assurance_controls">Quality Assurance</string>
     <string name="calibration">Calibration</string>
     <string name="deviceProvision">Device Provision</string>
-    <string name="Firefox">Firefox</string>
-    <string name="Files">Files</string>
     <string name="deviceinfo">Device Information</string>
     <string name="place_buffer">Start</string>
     <string name="Start_Sample">Start Sample</string>

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

@@ -1,55 +0,0 @@
-package com.example.hpostesting
-
-import android.content.SharedPreferences
-import com.example.hpostesting.presentation.assurance.AssuranceControlsFragment
-import junit.framework.TestCase.assertEquals
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.MockitoAnnotations
-
-class AssuranceControlsFragmentTest {
-    @Mock
-    lateinit var sharedPreferences: SharedPreferences
-
-    private lateinit var assuranceControlsFragment: AssuranceControlsFragment
-
-    @Before
-    fun setUp() {
-        MockitoAnnotations.initMocks(this)
-        assuranceControlsFragment = AssuranceControlsFragment()
-    }
-
-//    @Test
-//    fun testInitViews() {
-//        val fragmentScenario = FragmentScenario.launchInContainer(AssuranceControlsFragment::class.java)
-//
-//        fragmentScenario.onFragment { fragment ->
-//            // Mock the shared preferences
-//            `when`(fragment.requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)).thenReturn(sharedPreferences)
-//
-//            // Mock the solution spinner selection
-//            fragment.binding.spinnerSolutions.setSelection(1)
-//
-//            // Verify that DataHolder.hemoCubeTestData!!.solution is set correctly
-//            assertEquals("KMnO4", DataHolder.hemoCubeTestData!!.solution)
-//
-//            // You can similarly test other parts of initViews() based on your requirements
-//        }
-//    }
-
-    @Test
-    fun testGetPositionOfValue() {
-        val fragment = AssuranceControlsFragment()
-
-        val testData = listOf("Select solution", "KMnO4", "Tartrazine", "AR", "HB", "Blood")
-
-        // Test a value that exists in the list
-        val positionKMnO4 = fragment.getPositionOfValue("KMnO4", testData)
-        assertEquals(1, positionKMnO4)
-
-        // Test a value that does not exist in the list
-        val positionNonExistent = fragment.getPositionOfValue("NonExistent", testData)
-        assertEquals(0, positionNonExistent)
-    }
-}

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

@@ -1,65 +0,0 @@
-package com.example.hpostesting
-
-//
-//@PrepareForTest(Object::class)
-//class AuthInterceptorTest {
-//
-////    @Rule
-////    val rule = PowerMockRule()
-//
-//    @Mock
-//    private lateinit var sharedPreferences: SharedPreferences
-//
-//    @Mock
-//    private lateinit var chain: Interceptor.Chain
-//
-//    @Mock
-//    private lateinit var request: okhttp3.Request
-//
-//    @Mock
-//    private lateinit var response: Response
-//
-//    @Captor
-//    private lateinit var captor: ArgumentCaptor<okhttp3.Request>
-//
-//    private lateinit var authInterceptor: AuthInterceptor
-//
-//    @Before
-//    fun setup() {
-//        MockitoAnnotations.initMocks(this)
-//        authInterceptor = AuthInterceptor(sharedPreferences)
-//    }
-//
-//    @Test
-//    fun intercept_withToken_shouldAddAuthorizationHeader() {
-//        // Arrange
-//        val accessToken = "fakeAccessToken"
-//        `when`(sharedPreferences.getString(Constants.ACCESS_TOKEN, null)).thenReturn(accessToken)
-//        `when`(chain.request()).thenReturn(request)
-//        `when`(chain.proceed(request)).thenReturn(response)
-//
-//        // Act
-//        val result = authInterceptor.intercept(chain)
-//
-//        // Assert
-//        verify(chain).proceed(captor.capture())
-//        assertEquals("Bearer $accessToken", captor.value.header("Authorization"))
-//        assertEquals(response, result)
-//    }
-//
-//    @Test
-//    fun intercept_withoutToken_shouldNotAddAuthorizationHeader() {
-//        // Arrange
-//        `when`(sharedPreferences.getString(Constants.ACCESS_TOKEN, null)).thenReturn(null)
-//        `when`(chain.request()).thenReturn(request)
-//        `when`(chain.proceed(request)).thenReturn(response)
-//
-//        // Act
-//        val result = authInterceptor.intercept(chain)
-//
-//        // Assert
-//        verify(chain).proceed(captor.capture())
-//        assertEquals(null, captor.value.header("Authorization"))
-//        assertEquals(response, result)
-//    }
-//}

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

@@ -1,67 +0,0 @@
-package com.example.hpostesting
-
-import android.content.Context
-import com.example.hpostesting.data.CsvWriter
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-
-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE)
-class CsvWriterTest {
-
-    private lateinit var csvWriter: CsvWriter
-    private lateinit var context: Context
-
-    @Before
-    fun setUp() {
-        context = androidx.test.core.app.ApplicationProvider.getApplicationContext()
-        csvWriter = CsvWriter(context)
-    }
-
-    @Test
-    fun writeCsv_Success() {
-        // Arrange
-        val fileName = "test.csv"
-        val data = listOf(
-            arrayOf("1", "A", "1990", "Positive", "2024-02-04", "image_url1", "John Doe"),
-            arrayOf("2", "B", "1985", "Negative", "2024-02-05", "image_url2", "Jane Doe")
-        )
-
-        // Act
-        val result = csvWriter.writeCsv(fileName, data)
-
-        // Assert
-        Assert.assertTrue(result)
-    }
-
-//    @Test
-//    fun writeCsv_Failure() {
-//        // Arrange
-//        val fileName = "test.csv"
-//        val data = listOf(
-//            arrayOf("1", "A", "1990", "Positive", "2024-02-04", "image_url1", "John Doe"),
-//            arrayOf("2", "B", "1985", "Negative", "2024-02-05", "image_url2", "Jane Doe")
-//        )
-//
-//        // Mocking Environment.getExternalStorageDirectory()
-//        val mockFile = Mockito.mock(File::class.java)
-//        Mockito.`when`(Environment.getExternalStorageDirectory()).thenReturn(mockFile)
-//        Mockito.`when`(mockFile.exists()).thenReturn(true)
-//
-//        // Mocking FileWriter to simulate IOException
-//        val mockWriter = Mockito.mock(FileWriter::class.java)
-//        Mockito.`when`(mockWriter.write(Mockito.anyString())).thenThrow(IOException::class.java)
-//        Mockito.`when`(mockFile.absolutePath).thenReturn("/fake/path/to/file.csv")
-//        Mockito.`when`(FileWriter(mockFile)).thenReturn(mockWriter)
-//
-//        // Act
-//        val result = csvWriter.writeCsv(fileName, data)
-//
-//        // Assert
-//        Assert.assertFalse("Expected writeCsv to fail", result)
-//    }
-}

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

@@ -1,83 +0,0 @@
-package com.example.hpostesting
-
-import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.lifecycle.Observer
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
-import com.example.hpostesting.data.repository.Repository
-import com.example.hpostesting.presentation.deviceprovision.DeviceProvisionViewModel
-import com.example.hpostesting.util.TestCoroutineRule
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runBlockingTest
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito
-import org.mockito.MockitoAnnotations
-
-@ExperimentalCoroutinesApi
-class DeviceProvisionViewModelTest {
-
-    // Rule to make LiveData updates instant
-    @get:Rule
-    val instantExecutorRule = InstantTaskExecutorRule()
-
-    // Rule for testing coroutines
-    @get:Rule
-    val coroutineRule = TestCoroutineRule()
-
-    // Mocks
-    @Mock
-    private lateinit var databaseRepository: Repository
-
-    @Mock
-    private lateinit var deviceProvisionObserver: Observer<Result<DeviceProvisionResponse>>
-
-    // Class under test
-    private lateinit var viewModel: DeviceProvisionViewModel
-
-    @Before
-    fun setUp() {
-        MockitoAnnotations.openMocks(this)
-        viewModel = DeviceProvisionViewModel(databaseRepository)
-        viewModel.deviceProvisionResponse.observeForever(deviceProvisionObserver)
-    }
-
-    @After
-    fun tearDown() {
-        viewModel.deviceProvisionResponse.removeObserver(deviceProvisionObserver)
-    }
-
-    @Test
-    fun `deviceProvision success`() = coroutineRule.runBlockingTest {
-        // Arrange
-        val deviceProvisionRequest = DeviceProvisionRequest(/* provide necessary parameters */)
-        val expectedResult = Result.Success(DeviceProvisionResponse(/* provide necessary response data */))
-        Mockito.`when`(databaseRepository.deviceProvision(deviceProvisionRequest)).thenReturn(expectedResult)
-
-        // Act
-        viewModel.deviceProvision(deviceProvisionRequest)
-
-        // Assert
-//        Mockito.verify(deviceProvisionObserver, Mockito.timeout(1000)).onChanged(Result.Loading())
-        Mockito.verify(deviceProvisionObserver, Mockito.timeout(1000)).onChanged(expectedResult)
-    }
-
-    @Test
-    fun `deviceProvision error`() = coroutineRule.runBlockingTest {
-        // Arrange
-        val deviceProvisionRequest = DeviceProvisionRequest(/* provide necessary parameters */)
-        val expectedError = Result.Error(Exception("Test error"))
-        Mockito.`when`(databaseRepository.deviceProvision(deviceProvisionRequest)).thenReturn(expectedError)
-
-        // Act
-        viewModel.deviceProvision(deviceProvisionRequest)
-
-        // Assert
-//        Mockito.verify(deviceProvisionObserver, Mockito.timeout(1000)).onChanged(Result.Loading())
-        Mockito.verify(deviceProvisionObserver, Mockito.timeout(1000)).onChanged(expectedError)
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.example.hpostesting
-
-import android.content.Context
-import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.example.hpostesting.data.dao.HemoCubeDao
-import com.example.hpostesting.data.repository.Repository
-import com.example.hpostesting.presentation.deviceinfo.DeviceViewModel
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.mockito.junit.MockitoJUnitRunner
-
-@RunWith(MockitoJUnitRunner::class)
-class DeviceViewModelTest {
-
-    @get:Rule
-    val rule = InstantTaskExecutorRule()
-
-    @Mock
-    private lateinit var hemoCubeDao: HemoCubeDao
-
-    @Mock
-    private lateinit var repository: Repository
-
-    @Mock
-    private lateinit var context: Context
-
-    private lateinit var viewModel: DeviceViewModel
-
-    @Before
-    fun setup() {
-        viewModel = DeviceViewModel(hemoCubeDao, repository)
-    }
-
-    @Test
-    fun `test initial state`() {
-        assert(!viewModel.isServiceConnected)
-        assert(!viewModel.progressBar.value!!)
-        assert(viewModel.messages.value == null)
-//        assert(viewModel.allUserData == hemoCubeDao.getAll())
-//        assert(viewModel.deviceData.value == null)
-//        assert(viewModel.networkStatusLiveData.value == false)
-        assert(viewModel.fireBaseUpload.value == null)
-    }
-
-    // Add more tests for other functions and interactions as needed
-}

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

@@ -1,86 +0,0 @@
-package com.example.hpostesting
-
-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.DiagnosticsViewModel
-import io.mockk.coEvery
-import io.mockk.mockk
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.test.TestCoroutineDispatcher
-import kotlinx.coroutines.test.TestCoroutineScope
-import kotlinx.coroutines.test.runBlockingTest
-import kotlinx.coroutines.test.setMain
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.MockitoAnnotations
-
-@ExperimentalCoroutinesApi
-class DiagnosticsViewModelTest {
-
-    // Use this rule to swap the background executor used by the Architecture Components
-    @get:Rule
-    var instantTaskExecutorRule = InstantTaskExecutorRule()
-
-    // Use this dispatcher to control execution of coroutines in tests
-    private val testDispatcher = TestCoroutineDispatcher()
-
-    // Use this scope to control the execution of coroutines in tests
-    private val testCoroutineScope = TestCoroutineScope(testDispatcher)
-
-    // Mock Repository
-    private val mockRepository = mockk<Repository>()
-
-    // Mock Observer for LiveData
-    @Mock
-    private lateinit var mockObserver: Observer<String>
-
-    // Subject under test
-    private lateinit var diagnosticsViewModel: DiagnosticsViewModel
-
-    @Before
-    fun setup() {
-        // Initialize mocks
-        MockitoAnnotations.openMocks(this)
-
-        // Create the ViewModel with the mock repository and set the coroutine dispatcher
-        diagnosticsViewModel = DiagnosticsViewModel(repository = mockRepository)
-//        diagnosticsViewModel.viewModelScope = testCoroutineScope
-
-        // Observe the LiveData
-//        diagnosticsViewModel.fireBaseUpload.observeForever(mockObserver)
-
-        Dispatchers.setMain(TestCoroutineDispatcher())
-    }
-
-    @Test
-    fun `test addDiagnosticsDataToDb success`() = runBlocking {
-        // Given
-        val diagnosticsData = mockk<DiagnosticsData>()
-        coEvery { mockRepository.addDiagnostics(diagnosticsData) } returns Response.Success("Success")
-
-        // When
-        diagnosticsViewModel.addDiagnosticsDataToDb(diagnosticsData)
-
-        // Then
-        assert(diagnosticsViewModel.fireBaseUpload.value == "Success")
-    }
-
-    @Test
-    fun `addDiagnosticsDataToDb error`() = testCoroutineScope.runBlockingTest {
-        // Given
-        coEvery { mockRepository.addDiagnostics(any()) } returns Response.Error(Exception("Test error"))
-
-        // When
-        diagnosticsViewModel.addDiagnosticsDataToDb(mockk())
-
-        // Then
-        assert(diagnosticsViewModel.fireBaseUpload.value == "Error")
-    }
-}

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

@@ -1,13 +1,10 @@
 package com.example.hpostesting
 
-import android.content.Context
 import android.content.SharedPreferences
 import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
 import junit.framework.TestCase
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNull
 import org.junit.Before
 import org.junit.Test
 import org.mockito.ArgumentMatchers
@@ -17,9 +14,6 @@ import org.mockito.MockitoAnnotations
 
 class HemoCubeFragmentTest {
 
-    @Mock
-    lateinit var mockContext: Context
-
     @Mock
     private lateinit var mockSharedPreferences: SharedPreferences
 
@@ -38,7 +32,7 @@ class HemoCubeFragmentTest {
     }
 
     @Test
-    fun `extractV2HardwareId to get device id`() {
+    fun `extractMiddleString to get device id`() {
         // Arrange
         Mockito.`when`(
             mockSharedPreferences.getString(
@@ -48,7 +42,7 @@ class HemoCubeFragmentTest {
         ).thenReturn("dummy_value")
 
         // Act
-        val deviceId = hemoCubeFragment.extractV2HardwareId("SNS HPP1-9000 SNE")
+        val deviceId = hemoCubeFragment.extractMiddleString("SNS HPP1-9000 SNE")
 
         // Assert
         TestCase.assertEquals("HPP1-9000", deviceId)
@@ -87,316 +81,4 @@ class HemoCubeFragmentTest {
         TestCase.assertEquals(true, result)
         TestCase.assertEquals(hemoCubeFragment.allReadingsComplete(0, 1), false)
     }
-
-    @Test
-    fun `extractV1HardwareId should return hardware ID when input contains SN`() {
-        // Arrange
-        val input = "Some text SN ABC123 some more text"
-
-        // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
-
-        // Assert
-        assertEquals("ABC123", result)
-    }
-
-    @Test
-    fun `extractV1HardwareId should return null when input does not contain SN`() {
-        // Arrange
-        val input = "Some text without SN"
-
-        // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
-
-        // Assert
-        assertNull(result)
-    }
-
-    @Test
-    fun `extractV1HardwareId should return null when input is empty`() {
-        // Arrange
-        val input = ""
-
-        // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
-
-        // Assert
-        assertNull(result)
-    }
-
-    @Test
-    fun `extractV1HardwareId should return null when input is null`() {
-        // Arrange
-        val input: String? = null
-
-        // Act
-        val result = input?.let { hemoCubeFragment.extractV1HardwareId(it) }
-
-        // Assert
-        assertNull(result)
-    }
-
-    @Test
-    fun `extractV1HardwareId should return hardware ID when input contains SN in a specific format`() {
-        // Arrange
-        val input = """
-            SN HCV-000-3001
-            #BS
-            #BC
-            #SS
-            #SC
-            RESULT
-            LB1 20636.32
-            LB2 15855.67
-            LB3 21801.36
-            LB4 18362.33
-            LS1 17287
-            LS2 14855.67
-            LS3 15282.31
-            LS4 9737.98
-            REND
-        """.trimIndent()
-
-        // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
-
-        // Assert
-        assertEquals("HCV-000-3001", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should return the correct hardware ID when it exists in the input`() {
-        // Arrange
-        val input = "SNS ABC123 SNE"
-
-        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
-
-        // Assert
-        assertEquals("ABC123", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should return null when no hardware ID is found in the input`() {
-        // Arrange
-        val input = "No hardware ID in this input"
-
-        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
-
-        // Assert
-        assertNull(result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle whitespace around the hardware ID`() {
-        // Arrange
-        val input = "SNS   XYZ789    SNE"
-
-        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
-
-        // Assert
-        assertEquals("XYZ789", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle provided input string with HCV-000-3013`() {
-        // Arrange
-        val input = "SNS HCV-000-3013 SNE\n" +
-                "#SS1\n" +
-                "#SC1\n" +
-                "RESULT \n" +
-                "LB1 23411.00\n" +
-                "LB2 21417.00\n" +
-                "LB3 23869.00\n" +
-                "LB4 24967.00\n" +
-                "LS1 3401.00\n" +
-                "LS2 1107.00\n" +
-                "LS3 14410.00\n" +
-                "LS4 15047.00\n" +
-                "REND\n"
-
-        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
-
-        // Assert
-        assertEquals("HCV-000-3013", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle provided input string with HPP1-4001`() {
-        // Arrange
-        val input = "SNS HPP1-4001 SNE#SS1\n" +
-                "#SC1\n" +
-                "RESULT\n" +
-                "LB1 23777\n" +
-                "LB2 24130\n" +
-                "LB3 23442\n" +
-                "LB4 23945\n" +
-                "LS1 2521\n" +
-                "LS2 973\n" +
-                "LS3 10252\n" +
-                "LS4 11017\n" +
-                "REND\n"
-
-        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
-
-        // Assert
-        assertEquals("HPP1-4001", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle provided input string with HPP1-000-4001`() {
-        // Arrange
-        val input = "SNS HPP1-000-4001 SNE#SS1\n" +
-                "#SC1\n" +
-                "RESULT\n" +
-                "LB1 23777\n" +
-                "LB2 24130\n" +
-                "LB3 23442\n" +
-                "LB4 23945\n" +
-                "LS1 2521\n" +
-                "LS2 973\n" +
-                "LS3 10252\n" +
-                "LS4 11017\n" +
-                "REND\n"
-
-        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
-
-        // Assert
-        assertEquals("HPP1-000-4001", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle provided input string with HPP-000-4001`() {
-        // Arrange
-        val input = "SNS HPP-000-4001 SNE#SS1\n" +
-                "#SC1\n" +
-                "RESULT\n" +
-                "LB1 23777\n" +
-                "LB2 24130\n" +
-                "LB3 23442\n" +
-                "LB4 23945\n" +
-                "LS1 2521\n" +
-                "LS2 973\n" +
-                "LS3 10252\n" +
-                "LS4 11017\n" +
-                "REND\n"
-
-        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
-
-        // Assert
-        assertEquals("HPP-000-4001", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle provided input string with HPP-000-5001`() {
-        // Arrange
-        val input = "SNS HPP-000-5001 SNE#SS1\n" +
-                "#SC1\n" +
-                "RESULT\n" +
-                "LB1 23777\n" +
-                "LB2 24130\n" +
-                "LB3 23442\n" +
-                "LB4 23945\n" +
-                "LS1 2521\n" +
-                "LS2 973\n" +
-                "LS3 10252\n" +
-                "LS4 11017\n" +
-                "REND\n"
-
-        // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
-
-        // Assert
-        assertEquals("HPP-000-5001", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationNormal() {
-        val ratio = 0.22
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
-        assertEquals("Normal", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationNegativeBorderline() {
-        val ratio = 0.235
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
-        assertEquals("Negative Borderline", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationSickleCellTrait() {
-        val ratio = 0.25
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
-        assertEquals("Sickle Cell Trait", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationPositiveForSickleCell() {
-        val ratio = 0.37
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
-        assertEquals("Positive for Sickle Cell. HPLC for Confirmation", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationSickleCellDisease() {
-        val ratio = 0.45
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
-        assertEquals("Sickle Cell Disease", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationInvalid() {
-        val ratio: Double? = null
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
-        assertEquals("Invalid", result)
-    }
-
-    @Test
-    fun findResultWithAdditionalMethods_ValidInput_ReturnsNegativeBorderlineRepeatTest() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 70.0)).thenReturn("Negative Borderline, Repeat Test")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 70.0)
-        assertEquals("Negative Borderline, Repeat Test", result)
-    }
-
-    @Test
-    fun findResultWithAdditionalMethods_NormalDeviceRatio_ReturnsNormalBelowSlopeRatioThreshold() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 70.0)).thenReturn("Negative Borderline, Repeat Test")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 30.0)
-        assertEquals("Normal", result)
-    }
-
-    @Test
-    fun findResultWithAdditionalMethods_NBL_ReturnsNBL() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline, Repeat Test", 70.0)
-        assertEquals("Negative Borderline, Repeat Test", result)
-    }
-
-    @Test
-    fun findResultWithAdditionalMethods_SCT_ReturnsSCT() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Trait", 70.0)
-        assertEquals("Sickle Cell Trait", result)
-    }
-
-    @Test
-    fun findResultWithAdditionalMethods_PBL_ReturnsPBL() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Positive for Sickle Cell. HPLC for Confirmation", 70.0)
-        assertEquals("Positive for Sickle Cell. HPLC for Confirmation", result)
-    }
-
-    @Test
-    fun findResultWithAdditionalMethods_SCD_ReturnsSCD() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Disease", 70.0)
-        assertEquals("Sickle Cell Disease", result)
-    }
 }

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

@@ -1,20 +1,27 @@
 package com.example.hpostesting
 
 import android.content.Context
+import android.os.Build
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
+import androidx.work.Configuration
+import androidx.work.testing.SynchronousExecutor
+import androidx.work.testing.WorkManagerTestInitHelper
 import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.model.login.LoginResponse
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.LogFileManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.util.TestCoroutineRule
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.mockk
 import io.mockk.verify
-import junit.framework.TestCase
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runBlockingTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -22,34 +29,35 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
+import java.io.File
 
-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE)
-@ExperimentalCoroutinesApi
-class HemocubeViewModelTest {
-
-    @get:Rule
-    val instantTaskExecutorRule = InstantTaskExecutorRule()
-
-    @get:Rule
-    val coroutineRule = TestCoroutineRule()
-
-    @MockK(relaxed = true)
-    lateinit var repository: Repository
-
-    @MockK(relaxed = true)
-    lateinit var logFileManager: LogFileManager
-
-    @MockK(relaxed = true)
-    lateinit var context: Context
-
-    @MockK(relaxed = true)
-    lateinit var observer: Observer<Result<LoginResponse>>
-
-    private lateinit var viewModel: HemoCubeViewModel
-
-    @Before
-    fun setup() {
+//@RunWith(RobolectricTestRunner::class)
+//@Config(manifest = Config.NONE)
+//@ExperimentalCoroutinesApi
+//class HemocubeViewModelTest {
+//
+//    @get:Rule
+//    val instantTaskExecutorRule = InstantTaskExecutorRule()
+//
+//    @get:Rule
+//    val coroutineRule = TestCoroutineRule()
+//
+//    @MockK(relaxed = true)
+//    lateinit var repository: Repository
+//
+//    @MockK(relaxed = true)
+//    lateinit var logFileManager: LogFileManager
+//
+//    @MockK(relaxed = true)
+//    lateinit var context: Context
+//
+//    @MockK(relaxed = true)
+//    lateinit var observer: Observer<Result<LoginResponse>>
+//
+//    private lateinit var viewModel: HemoCubeViewModel
+//
+//    @Before
+//    fun setup() {
 //        MockKAnnotations.init(this)
 //
 //        val config = Configuration.Builder()
@@ -70,34 +78,13 @@ class HemocubeViewModelTest {
 //            context
 //        )
 //        viewModel.loginResponse.observeForever(observer)
-    }
-
-    @After
-    fun teardown() {
+//    }
+//
+//    @After
+//    fun teardown() {
 //        viewModel.loginResponse.removeObserver(observer)
-    }
-
-    @Test
-    fun `testAddNumbers in HemocubeViewModelTest`() {
-        // Create a mock of the Calculator class using Mockito-Kotlin
-        val calculatorMock = mockk<Calculator>()
-
-        // Define the behavior of the add method on the mock
-        every { calculatorMock.add(2, 3) } returns 5
-
-        // Create an instance of MathApplication with the mock Calculator
-        val mathApplication = MathApplication(calculatorMock)
-
-        // Perform the test using the MathApplication
-        val result = mathApplication.addNumbers(2, 3)
-
-        // Verify that the add method of the mock was called with the correct parameters
-        verify { calculatorMock.add(2, 3) }
-
-        // Verify the result of the test
-        TestCase.assertEquals(5, result)
-    }
-
+//    }
+//
 //    @Test
 //    fun `login() should update LiveData with success`() = coroutineRule.runBlockingTest {
 //
@@ -137,7 +124,7 @@ class HemocubeViewModelTest {
 //        viewModel.uploadLogs()
 //
 //        // Assert
-//        verify { observer.onChanged(response as Result<LoginResponse>) }
+//        verify { observer.onChanged(response) }
 //    }
 //
 //    @Test
@@ -154,4 +141,4 @@ class HemocubeViewModelTest {
 //        // Assert
 //        verify { observer.onChanged(response) }
 //    }
-}
+//}

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

@@ -1,86 +0,0 @@
-package com.example.hpostesting
-
-//
-//class LogFileManagerImplTest {
-//
-//    @Mock
-//    private lateinit var mockContext: Context
-//
-//    private lateinit var logFileManager: LogFileManagerImpl
-//
-//    @Before
-//    fun setUp() {
-//        mockContext = mock()
-//        logFileManager = LogFileManagerImpl(mockContext)
-//    }
-
-//    @Test
-//    fun testCreateLogFileSuccess() {
-//        // Mock filesDir
-//        whenever(mockContext.getString(R.string.app_name)).thenReturn("MockedAppName")
-//        val mockFilesDir = mock<File>()
-//        doReturn(true).whenever(mockContext).getFilesDir().exists()
-//        doReturn(mockFilesDir).whenever(mockContext).getFilesDir()
-//
-//        // Set expected file name
-//        val expectedFileName = "hpos_1234567890.log"
-//        val currentTime = System.currentTimeMillis() / 1000L
-//        doReturn(true).whenever(mockFilesDir).createNewFile(expectedFileName)
-//        doReturn(mockFilesDir.absolutePath + File.separator + expectedFileName).whenever(mockFilesDir).absolutePath
-//
-//        // Mock FileOutputStream
-//        val mockFileOutputStream = mock<FileOutputStream>()
-//        doReturn(mockFileOutputStream).whenever(FileOutputStream(mockFilesDir.absolutePath + File.separator + expectedFileName))
-//
-//        // Call createLogFile and verify result
-//        val logFile = logFileManager.createLogFile()
-//
-//        assertNotNull(logFile)
-//        assertTrue(logFile.exists())
-//        assertEquals(expectedFileName, logFile.name)
-//
-//        // Verify FileOutputStream was called
-//        verify(mockFileOutputStream).write(any())
-//        verify(mockFileOutputStream).close()
-//    }
-//
-//    @Test
-//    fun testCreateLogFileExistingFile() throws IOException {
-//        // Mock filesDir with existing file
-//        val mockFilesDir = mock<File>()
-//        val existingFile = mock<File>()
-//        doReturn(true).whenever(mockContext).getFilesDir().exists()
-//        doReturn(mockFilesDir).whenever(mockContext).getFilesDir()
-//        doReturn(true).whenever(mockFilesDir).exists()
-//        doReturn(listOf(existingFile)).whenever(mockFilesDir).listFiles()
-//
-//        // Call createLogFile and expect exception
-//        try {
-//            logFileManager.createLogFile()
-//            fail("Expected IOException due to existing file")
-//        } catch (e: IOException) {
-//            // Expected behavior
-//        }
-//
-//        // Verify FileOutputStream was not called
-//        verify(mockFilesDir, times(0)).createNewFile(anyString())
-//    }
-//
-//    @Test
-//    fun testCreateLogFileIOException() throws IOException {
-//        // Mock filesDir and IOException
-//        val mockFilesDir = mock<File>()
-//        doReturn(true).whenever(mockContext).getFilesDir().exists()
-//        doReturn(mockFilesDir).whenever(mockContext).getFilesDir()
-//        doReturn(true).whenever(mockFilesDir).exists()
-//        doThrow(IOException("Mock IOException")).whenever(mockFilesDir).createNewFile(anyString())
-//
-//        // Call createLogFile and expect null result
-//        val logFile = logFileManager.createLogFile()
-//
-//        assertNull(logFile)
-//
-//        // Verify FileOutputStream was not called
-//        verify(mockFilesDir, times(0)).createNewFile(anyString())
-//    }
-//}

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

@@ -1,15 +0,0 @@
-package com.example.hpostesting
-
-
-class Calculator {
-    fun add(a: Int, b: Int): Int {
-        return a + b
-    }
-}
-
-
-class MathApplication(private val calculator: Calculator) {
-    fun addNumbers(a: Int, b: Int): Int {
-        return calculator.add(a, b)
-    }
-}

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

@@ -1,31 +0,0 @@
-package com.example.hpostesting
-
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.verify
-import junit.framework.TestCase.assertEquals
-import org.junit.Test
-
-class MathApplicationTest {
-
-    @Test
-    fun testAddNumbers() {
-        // Create a mock of the Calculator class using Mockito-Kotlin
-        val calculatorMock = mockk<Calculator>()
-
-        // Define the behavior of the add method on the mock
-        every { calculatorMock.add(2, 3) } returns 5
-
-        // Create an instance of MathApplication with the mock Calculator
-        val mathApplication = MathApplication(calculatorMock)
-
-        // Perform the test using the MathApplication
-        val result = mathApplication.addNumbers(2, 3)
-
-        // Verify that the add method of the mock was called with the correct parameters
-        verify { calculatorMock.add(2, 3) }
-
-        // Verify the result of the test
-        assertEquals(5, result)
-    }
-}

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

@@ -1,77 +0,0 @@
-package com.example.hpostesting
-
-import android.content.Context
-import android.net.ConnectivityManager
-import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import io.mockk.every
-import io.mockk.mockk
-import io.mockk.verify
-import junit.framework.TestCase
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.mockito.junit.MockitoJUnitRunner
-
-
-@RunWith(MockitoJUnitRunner::class)
-class NetworkStatusLiveDataTest {
-    @get:Rule
-    val instantTaskExecutorRule = InstantTaskExecutorRule()
-
-    @Mock
-    private lateinit var mockContext: Context
-
-    @Mock
-    private lateinit var mockConnectivityManager: ConnectivityManager
-
-    @Before
-    fun setUp() {
-//        mockContext = ApplicationProvider.getApplicationContext<Context>()
-//        mockConnectivityManager = mockContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-    }
-
-    @Test
-    fun testAddNumbers() {
-        // Create a mock of the Calculator class using Mockito-Kotlin
-        val calculatorMock = mockk<Calculator>()
-
-        // Define the behavior of the add method on the mock
-        every { calculatorMock.add(2, 3) } returns 5
-
-        // Create an instance of MathApplication with the mock Calculator
-        val mathApplication = MathApplication(calculatorMock)
-
-        // Perform the test using the MathApplication
-        val result = mathApplication.addNumbers(2, 3)
-
-        // Verify that the add method of the mock was called with the correct parameters
-        verify { calculatorMock.add(2, 3) }
-
-        // Verify the result of the test
-        TestCase.assertEquals(5, result)
-    }
-
-//    @Test
-//    fun testNetworkStatusLiveData() {
-//        // Assuming mockConnectivityManager is a mocked ConnectivityManager instance
-//        val mockNetwork = mock(Network::class.java)
-//        val mockNetworkCapabilities = mock(NetworkCapabilities::class.java)
-//
-//        // Define desired capabilities
-//        `when`(mockNetworkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)).thenReturn(true)
-//        `when`(mockNetworkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)).thenReturn(true)
-//
-//        // Set up network to return mocked capabilities
-//        `when`(mockConnectivityManager.activeNetwork).thenReturn(mockNetwork)
-//        `when`(mockConnectivityManager.getNetworkCapabilities(mockNetwork)).thenReturn(mockNetworkCapabilities)
-//
-//        // Act
-//        val networkStatusLiveData = NetworkStatusLiveData(mockContext)
-//        val isConnected = networkStatusLiveData.value
-//
-//        // Assert
-//        assertTrue("Network should be connected", isConnected!!)
-//    }
-}

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

@@ -1,350 +0,0 @@
-package com.example.hpostesting
-
-import android.content.Context
-import android.content.SharedPreferences
-import com.example.hpostesting.presentation.trueheme.TrueHemeFragment
-import junit.framework.TestCase
-import org.junit.Before
-import org.junit.Test
-import org.mockito.ArgumentMatchers
-import org.mockito.Mock
-import org.mockito.Mockito
-import org.mockito.MockitoAnnotations
-
-class TrueHemeFragmentTest {
-
-    @Mock
-    lateinit var mockContext: Context
-
-    @Mock
-    private lateinit var mockSharedPreferences: SharedPreferences
-
-    private lateinit var fragment: TrueHemeFragment
-
-    @Before
-    fun setUp() {
-        MockitoAnnotations.initMocks(this)
-        fragment = TrueHemeFragment()
-    }
-
-    @Test
-    fun `extractV2HardwareId to get device id`() {
-        // Arrange
-        Mockito.`when`(
-            mockSharedPreferences.getString(
-                ArgumentMatchers.anyString(),
-                ArgumentMatchers.anyString()
-            )
-        ).thenReturn("dummy_value")
-
-        // Act
-        val deviceId = fragment.extractV2HardwareId("SNS HPP1-9000 SNE")
-
-        // Assert
-        TestCase.assertEquals("HPP1-9000", deviceId)
-    }
-
-    @Test
-    fun `updateDeviceId in shared pref`() {
-        // Arrange
-        Mockito.`when`(
-            mockSharedPreferences.getString(
-                ArgumentMatchers.anyString(),
-                ArgumentMatchers.anyString()
-            )
-        ).thenReturn("HPP1-0001")
-
-        // Act
-        val deviceId = mockSharedPreferences.getString(
-            ArgumentMatchers.anyString(),
-            ArgumentMatchers.anyString()
-        )
-
-        // Assert
-        TestCase.assertEquals("HPP1-0001", deviceId)
-    }
-
-    @Test
-    fun `allReadingsComplete check`() {
-        // Arrange
-        val repeatReadingCount = 1
-        val readingsPerSample = 1
-
-        // Act
-        val result = fragment.allReadingsComplete(repeatReadingCount, readingsPerSample)
-
-        // Assert
-        TestCase.assertEquals(true, result)
-        TestCase.assertEquals(fragment.allReadingsComplete(0, 1), false)
-    }
-
-    @Test
-    fun `extractV1HardwareId should return hardware ID when input contains SN`() {
-        // Arrange
-        val input = "Some text SN ABC123 some more text"
-
-        // Act
-        val result = fragment.extractV1HardwareId(input)
-
-        // Assert
-        TestCase.assertEquals("ABC123", result)
-    }
-
-    @Test
-    fun `extractV1HardwareId should return null when input does not contain SN`() {
-        // Arrange
-        val input = "Some text without SN"
-
-        // Act
-        val result = fragment.extractV1HardwareId(input)
-
-        // Assert
-        TestCase.assertNull(result)
-    }
-
-    @Test
-    fun `extractV1HardwareId should return null when input is empty`() {
-        // Arrange
-        val input = ""
-
-        // Act
-        val result = fragment.extractV1HardwareId(input)
-
-        // Assert
-        TestCase.assertNull(result)
-    }
-
-    @Test
-    fun `extractV1HardwareId should return null when input is null`() {
-        // Arrange
-        val input: String? = null
-
-        // Act
-        val result = input?.let { fragment.extractV1HardwareId(it) }
-
-        // Assert
-        TestCase.assertNull(result)
-    }
-
-    @Test
-    fun `extractV1HardwareId should return hardware ID when input contains SN in a specific format`() {
-        // Arrange
-        val input = """
-            SN HCV-000-3001
-            #BS
-            #BC
-            #SS
-            #SC
-            RESULT
-            LB1 20636.32
-            LB2 15855.67
-            LB3 21801.36
-            LB4 18362.33
-            LS1 17287
-            LS2 14855.67
-            LS3 15282.31
-            LS4 9737.98
-            REND
-        """.trimIndent()
-
-        // Act
-        val result = fragment.extractV1HardwareId(input)
-
-        // Assert
-        TestCase.assertEquals("HCV-000-3001", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should return the correct hardware ID when it exists in the input`() {
-        // Arrange
-        val input = "SNS ABC123 SNE"
-
-        // Act
-        val result = fragment.extractV2HardwareId(input)
-
-        // Assert
-        TestCase.assertEquals("ABC123", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should return null when no hardware ID is found in the input`() {
-        // Arrange
-        val input = "No hardware ID in this input"
-
-        // Act
-        val result = fragment.extractV2HardwareId(input)
-
-        // Assert
-        TestCase.assertNull(result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle whitespace around the hardware ID`() {
-        // Arrange
-        val input = "SNS   XYZ789    SNE"
-
-        // Act
-        val result = fragment.extractV2HardwareId(input)
-
-        // Assert
-        TestCase.assertEquals("XYZ789", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle provided input string with HCV-000-3013`() {
-        // Arrange
-        val input = "SNS HCV-000-3013 SNE\n" +
-                "#SS1\n" +
-                "#SC1\n" +
-                "RESULT \n" +
-                "LB1 23411.00\n" +
-                "LB2 21417.00\n" +
-                "LB3 23869.00\n" +
-                "LB4 24967.00\n" +
-                "LS1 3401.00\n" +
-                "LS2 1107.00\n" +
-                "LS3 14410.00\n" +
-                "LS4 15047.00\n" +
-                "REND\n"
-
-        // Act
-        val result = fragment.extractV2HardwareId(input)
-
-        // Assert
-        TestCase.assertEquals("HCV-000-3013", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle provided input string with HPP1-4001`() {
-        // Arrange
-        val input = "SNS HPP1-4001 SNE#SS1\n" +
-                "#SC1\n" +
-                "RESULT\n" +
-                "LB1 23777\n" +
-                "LB2 24130\n" +
-                "LB3 23442\n" +
-                "LB4 23945\n" +
-                "LS1 2521\n" +
-                "LS2 973\n" +
-                "LS3 10252\n" +
-                "LS4 11017\n" +
-                "REND\n"
-
-        // Act
-        val result = fragment.extractV2HardwareId(input)
-
-        // Assert
-        TestCase.assertEquals("HPP1-4001", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle provided input string with HPP1-000-4001`() {
-        // Arrange
-        val input = "SNS HPP1-000-4001 SNE#SS1\n" +
-                "#SC1\n" +
-                "RESULT\n" +
-                "LB1 23777\n" +
-                "LB2 24130\n" +
-                "LB3 23442\n" +
-                "LB4 23945\n" +
-                "LS1 2521\n" +
-                "LS2 973\n" +
-                "LS3 10252\n" +
-                "LS4 11017\n" +
-                "REND\n"
-
-        // Act
-        val result = fragment.extractV2HardwareId(input)
-
-        // Assert
-        TestCase.assertEquals("HPP1-000-4001", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle provided input string with HPP-000-4001`() {
-        // Arrange
-        val input = "SNS HPP-000-4001 SNE#SS1\n" +
-                "#SC1\n" +
-                "RESULT\n" +
-                "LB1 23777\n" +
-                "LB2 24130\n" +
-                "LB3 23442\n" +
-                "LB4 23945\n" +
-                "LS1 2521\n" +
-                "LS2 973\n" +
-                "LS3 10252\n" +
-                "LS4 11017\n" +
-                "REND\n"
-
-        // Act
-        val result = fragment.extractV2HardwareId(input)
-
-        // Assert
-        TestCase.assertEquals("HPP-000-4001", result)
-    }
-
-    @Test
-    fun `extractV2HardwareId should handle provided input string with HPP-000-5001`() {
-        // Arrange
-        val input = "SNS HPP-000-5001 SNE#SS1\n" +
-                "#SC1\n" +
-                "RESULT\n" +
-                "LB1 23777\n" +
-                "LB2 24130\n" +
-                "LB3 23442\n" +
-                "LB4 23945\n" +
-                "LS1 2521\n" +
-                "LS2 973\n" +
-                "LS3 10252\n" +
-                "LS4 11017\n" +
-                "REND\n"
-
-        // Act
-        val result = fragment.extractV2HardwareId(input)
-
-        // Assert
-        TestCase.assertEquals("HPP-000-5001", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationNormal() {
-        val ratio = 0.25
-        val result = fragment.deviceRatioClassification(ratio)
-        TestCase.assertEquals("Normal", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationNegativeBorderline() {
-        val ratio = 0.31
-        val result = fragment.deviceRatioClassification(ratio)
-        TestCase.assertEquals("Negative Borderline, Repeat Test", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationSickleCellTrait() {
-        val ratio = 0.34
-        val result = fragment.deviceRatioClassification(ratio)
-        TestCase.assertEquals("Sickle Cell Trait", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationPositiveForSickleCell() {
-        val ratio = 0.37
-        val result = fragment.deviceRatioClassification(ratio)
-        TestCase.assertEquals("Positive for Sickle Cell. HPLC for Confirmation", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationSickleCellDisease() {
-        val ratio = 0.45
-        val result = fragment.deviceRatioClassification(ratio)
-        TestCase.assertEquals("Sickle Cell Disease", result)
-    }
-
-    @Test
-    fun testDeviceRatioClassificationInvalid() {
-        val ratio: Double? = null
-        val result = fragment.deviceRatioClassification(ratio)
-        TestCase.assertEquals("Invalid", result)
-    }
-}

barcode_scanner_library_v2.0.8.0/build.gradle

@@ -1,2 +0,0 @@
-configurations.maybeCreate("default")
-artifacts.add("default", file('barcode_scanner_library_v2.0.8.0.aar'))