add new device ids

.gitlab-ci.yml

@@ -1,101 +0,0 @@
-# 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
-before_script:
-  - apt-get --quiet update --yes
-  - apt-get --quiet install --yes wget unzip
-
-  # Setup path as android_home for moving/exporting the downloaded sdk into it
-  - export ANDROID_HOME="${PWD}/android-sdk-root"
-  # Create a new directory at specified location
-  - install -d $ANDROID_HOME
-  # Here we are installing androidSDK tools from official source,
-  # (the key thing here is the url from where you are downloading these sdk tool for command line, so please do note this url pattern there and here as well)
-  # after that unzipping those tools and
-  # then running a series of SDK manager commands to install necessary android SDK packages that'll allow the app to build
-  - wget --no-verbose --output-document=$ANDROID_HOME/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip
-  - unzip -q -d "$ANDROID_HOME/cmdline-tools" "$ANDROID_HOME/cmdline-tools.zip"
-  - mv -T "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/tools"
-  - export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/cmdline-tools/tools/bin
-
-  # Nothing fancy here, just checking sdkManager version
-  - sdkmanager --version
-
-  # use yes to accept all licenses
-  - yes | sdkmanager --licenses > /dev/null || true
-  - sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}"
-  - sdkmanager "platform-tools"
-  - sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
-
-  # Not necessary, but just for surity
-  - chmod +x ./gradlew
-
-# Basic android and gradle stuff
-# Check linting
-lintDebug:
-  interruptible: true
-  stage: build
-  script:
-    - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint
-  artifacts:
-    paths:
-      - app/lint/reports/lint-results-debug.html
-    expose_as: "lint-report"
-    when: always
-
-# Make Project
-assembleDebug:
-  interruptible: true
-  stage: build
-  script:
-    - ./gradlew assembleDebug
-  artifacts:
-    paths:
-      - app/build/outputs/
-
-# Run all tests, if any fails, interrupt the pipeline(fail it)
-debugTests:
-  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

.idea/gradle.xml

@@ -4,7 +4,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">

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
     defaultConfig {
         applicationId "in.sminnovations.hpostesting.dev"
         minSdk 21
         targetSdk 34
-        versionCode 114
+        versionCode 76
-        versionName "2.1.114"
+        versionName "2.1.76"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-
     buildTypes {
         release {
             minifyEnabled false
@@ -53,11 +52,6 @@ android {
     packagingOptions {
         exclude 'mockito-extensions/org.mockito.plugins.MockMaker'
     }
-//    testOptions {
-//        unitTests {
-//            includeAndroidResources = true
-//        }
-//    }
 }
 
 dependencies {
@@ -66,9 +60,9 @@ dependencies {
 
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
     implementation 'androidx.fragment:fragment-ktx:1.6.2'
 
     //firebase
@@ -81,70 +75,54 @@ 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'
     implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta11")
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'com.google.android.play:core:1.10.3'
-    implementation 'io.nats:jnats:2.11.2'
-
 
 
     // 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'
-    testImplementation 'androidx.fragment:fragment-testing:1.6.2'
-    testImplementation "org.robolectric:robolectric:4.7"
-
-    // mockk
-    testImplementation 'io.mockk:mockk:1.10.6'
-
     // Mockito 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 "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
+    implementation 'com.opencsv:opencsv:4.6'
     implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
 
     implementation "androidx.fragment:fragment-ktx:1.6.2"
 
     // CSV read, write
-    implementation 'com.opencsv:opencsv:5.9'
+    implementation 'com.opencsv:opencsv:4.6'
 
     // Barcode scanner
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
-    // Google ML Kit using play services
+    // Google ML Kit usign play services
     implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
 
     //Room
-    implementation "androidx.room:room-ktx:2.6.1"
+    implementation "androidx.room:room-ktx:2.6.0"
-    implementation "androidx.room:room-runtime:2.6.1"
+    implementation "androidx.room:room-runtime:2.6.0"
-    kapt ("androidx.room:room-compiler:2.6.1")
+    kapt ("androidx.room:room-compiler:2.6.0")
 
     //image
     implementation 'com.github.bumptech.glide:glide:4.13.2'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
 
     // Navigation Component
-    implementation "androidx.navigation:navigation-fragment-ktx:2.7.6"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.5"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.6"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.5"
 
     //Dagger - Hilt
     implementation "com.google.dagger:hilt-android:2.46"
@@ -154,17 +132,7 @@ dependencies {
     // Retrofit + GSON
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
-    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("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

@@ -1,208 +0,0 @@
-{
-  "project_info": {
-    "project_number": "650071678820",
-    "project_id": "hpos-af3cc",
-    "storage_bucket": "hpos-af3cc.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f1435a1c07f710036c6471",
-        "android_client_info": {
-          "package_name": "com.example.hposconsentform"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:7865bef608cdee6f6c6471",
-        "android_client_info": {
-          "package_name": "com.smi.counselling"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:2925e9ce3417d2386c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hemocube"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-srhm9spm9hjn4frcd3r6o02gdhdbtd15.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "in.sminnovations.hemocube",
-            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
-          }
-        },
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hposregistration"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-70kp5jvjda4r5diqch2kn4lc40p4f42g.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "in.sminnovations.hposregistration",
-            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
-          }
-        },
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-l87dnr0bdj95get0khgnvfv2an1k6ogq.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "in.sminnovations.hpostesting",
-            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
-          }
-        },
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:a53292637abb7c0d6c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting.dev"
-        }
-      },
-      "oauth_client": [
-        {
-          "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
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "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,
+      "versionCode": 1,
-      "versionName": "2.1.101",
+      "versionName": "1.0",
       "outputFile": "app-release.apk"
     }
   ],

app/src/androidTest/java/com/example/hpostesting/AssuranceControlsActivityTest.kt

@@ -1,42 +0,0 @@
-package com.example.hpostesting
-
-import androidx.test.core.app.ActivityScenario
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.matcher.ViewMatchers.withId
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-//import com.example.hpostesting.R
-import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
-import `in`.sminnovations.hpostesting.databinding.ActivityAssuranceControlsBinding
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-@RunWith(AndroidJUnit4::class)
-class AssuranceControlsActivityTest {
-//
-//    @Test
-//    fun testViewBinding() {
-//        val activityScenario = ActivityScenario.launch(AssuranceControlsActivity::class.java)
-//        activityScenario.onActivity { activity ->
-//            assertNotNull(activity.binding)
-//            assertEquals(ActivityAssuranceControlsBinding::class.java, activity.binding.javaClass)
-//        }
-//    }
-//
-//    @Test
-//    fun testSharedPreferencesInitialization() {
-//        val activityScenario = ActivityScenario.launch(AssuranceControlsActivity::class.java)
-//        activityScenario.onActivity { activity ->
-//            assertNotNull(activity.sharedPreference)
-//            assertEquals("HEMOCUBE", activity.sharedPreference.getString("HEMOCUBE", null))
-//        }
-//    }
-
-//    @Test
-//    fun testFragmentTransaction() {
-//        val activityScenario = ActivityScenario.launch(AssuranceControlsActivity::class.java)
-//        onView(withId(R.id.fgAssuranceControls)).check(matches(isDisplayed())) // Using Espresso for UI verification
-//    }
-}

app/src/androidTest/java/com/example/hpostesting/ExampleInstrumentedTest.kt

@@ -17,6 +17,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-//        assertEquals("com.example.refactoredapp", appContext.packageName)
+        assertEquals("com.example.refactoredapp", appContext.packageName)
     }
 }

app/src/debug/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/AndroidManifest.xml

@@ -5,8 +5,6 @@
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-
     <uses-permission
         android:name="android.permission.BATTERY_STATS"
         tools:ignore="ProtectedPermissions" />
@@ -34,38 +32,12 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.HPOSTesting"
         tools:targetApi="31">
-        <activity
-            android:name="com.example.hpostesting.presentation.deviceinfo.DeviceActivity"
-            android:exported="false" />
         <activity
             android:name="com.example.hpostesting.presentation.hemocube.DigitalCardActivity"
             android:exported="false" />
         <activity
             android:name="com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity"
-            android:exported="false"
+            android:exported="false" />
-            android:theme="@style/Theme.HPOS.NoActionBar" />
-        <activity
-            android:name="com.example.hpostesting.presentation.autodac.AutoDacActivity"
-            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
-        <activity
-            android:name="com.example.hpostesting.presentation.jig.JigActivity"
-            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
-        <activity
-            android:name="com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity"
-            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
-        <activity
-            android:name="com.example.hpostesting.presentation.calibration.CalibrationActivity"
-            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar"/>
-
-        <activity
-            android:name="com.example.hpostesting.presentation.assurance.AssuranceControlsActivity"
-            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar"/>
-
         <activity
             android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
             android:exported="false"
@@ -73,15 +45,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,23 +62,13 @@
             android:exported="false"
             android:label="@string/title_activity_dashboard"
             android:theme="@style/Theme.HPOS.NoActionBar"
-            android:screenOrientation="portrait"
+            tools:ignore="MissingClass" />
-            tools:ignore="AppLinkUrlError,MissingClass">
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="content" />
-                <data android:scheme="file" />
-                <data android:mimeType="application/vnd.android.package-archive" />
-            </intent-filter>
-        </activity>
-
 
         <service
             android:name="com.example.hpostesting.presentation.testRight.UsbService"
             android:enabled="true"
             android:exported="false" />
+
         <activity
             android:name="com.example.hpostesting.presentation.SplashActivity"
             android:exported="true"
@@ -123,11 +76,8 @@
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
-<!--                <category android:name="android.intent.category.HOME" />-->
-<!--                <category android:name="android.intent.category.DEFAULT" />-->
-<!--                <category android:name="android.intent.category.MONKEY"/>-->
-<!--                <category android:name="android.intent.category.LAUNCHER_APP" />-->
             </intent-filter>
         </activity>
         <activity
@@ -164,17 +114,6 @@
             android:screenOrientation="portrait"
             android:stateNotNeeded="true"
             tools:replace="android:screenOrientation" />
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
-
     </application>
 
 </manifest>

app/src/main/assets/app.properties

@@ -1 +0,0 @@
-BASE_URL= https://datacollection.micropcr.com/api/

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

@@ -1,15 +1,20 @@
 package com.example.hpostesting
 
 import android.app.Application
+import android.content.Context
+import androidx.room.Room
+import com.example.hpostesting.data.dao.MyDatabase
+import com.google.android.datatransport.runtime.dagger.Provides
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.FirebaseFirestoreSettings
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import javax.inject.Singleton
 
 @HiltAndroidApp
-class HPOSTestingApplication : Application() {
+class HPOSTestingApplication: Application() {
     val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
     override fun onCreate() {

app/src/main/java/com/example/hpostesting/data/CsvWriter.kt

@@ -1,50 +0,0 @@
-package com.example.hpostesting.data
-
-import android.content.Context
-import android.os.Environment
-import java.io.File
-import java.io.FileWriter
-import java.io.IOException
-
-class CsvWriter(private val context: Context) {
-
-    fun writeCsv(fileName: String, data: List<Array<String>>): Boolean {
-        try {
-            val filePath = File(getExternalStorageDirectory(), fileName)
-            val writer = FileWriter(filePath)
-
-            // Write header row
-            val header = arrayOf(
-                "ID",
-                "Blood Group",
-                "Birth Year",
-                "Classification Result",
-                "Test Time",
-                "User Image URL",
-                "Name"
-            )
-            writer.write(header.joinToString(",") + "\n")
-
-            // Write data rows
-            for (line in data) {
-                writer.write(line.joinToString(",") + "\n")
-            }
-
-            writer.close()
-            return true
-        } catch (e: IOException) {
-            e.printStackTrace()
-            return false
-        }
-    }
-
-    private fun getExternalStorageDirectory(): File {
-        val folder = File(Environment.getExternalStorageDirectory(), "HposFolder")
-
-        if (!folder.exists()) {
-            folder.mkdirs()
-        }
-
-        return folder
-    }
-}

app/src/main/java/com/example/hpostesting/data/FileUploader.kt

@@ -0,0 +1,46 @@
+package com.example.hpostesting.data
+
+import android.util.Log
+import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.repository.DatabaseRepository
+import com.example.hpostesting.util.MyUtils
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+
+class FileUploader {
+
+    private val TAG = "FileUploader"
+    val repository = DatabaseRepository()
+
+    suspend fun start() {
+
+        val listOfFiles = repository.getAllFromPendingQueue()
+
+        for (each in listOfFiles){
+            // Checking internet connectivity & mobile as same or not
+            if (MyUtils.isInternetConnected() && each.mobileId == DataHolder.mobileUniqueId) {
+
+                Log.d(TAG, "uploading file ${each.pendingId}")
+                GlobalScope.launch {
+                    val response = repository.uploadFileToStorage(each.patientId, each.filePath)
+
+                    when (response) {
+                        is Response.Success -> {
+                            Log.d(TAG, "File Uploaded ${each.pendingId}")
+                            repository.removeFromPendingQueue(each.pendingId)
+                        }
+
+                        is Response.Error -> {
+                            Log.d(TAG, response.exception.toString())
+                        }
+                    }
+                }.join()
+
+            } else {
+                return
+            }
+        }
+        return
+    }
+
+}

app/src/main/java/com/example/hpostesting/data/Result.kt

@@ -1,7 +0,0 @@
-package com.example.hpostesting.data
-
-sealed class Result<out T : Any> {
-    data class Success<out T : Any>(val data: T) : Result<T>()
-    data class Error(val exception: Exception) : Result<Nothing>()
-    class Loading<T : Any> : Result<T>()
-}

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

@@ -1,24 +0,0 @@
-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
-import com.example.hpostesting.data.model.login.LoginResponse
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-interface MolbioAuthApi {
-
-    @POST("deviceManagement/device/provision")
-    suspend fun deviceProvision(
-        @Body deviceProvisionRequest: DeviceProvisionRequest,
-    ): DeviceProvisionResponse
-
-    @POST("deviceService/device/login")
-    suspend fun login(
-        @Body loginRequest: LoginRequest,
-    ): LoginResponse
-
-}

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

@@ -1,52 +0,0 @@
-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
-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.ResponseBody
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.Multipart
-import retrofit2.http.POST
-import retrofit2.http.PUT
-import retrofit2.http.Part
-
-interface MolbioResultApi {
-
-    @PUT("deviceService/results/HPOS")
-    suspend fun uploadResults(
-        @Body molbioV2ResultRequest: MolbioV2ResultRequest,
-    ): MolbioV2ResultResponse
-
-    @POST("deviceService/device/checkUpdate")
-    suspend fun checkUpdate(
-        @Body checkUpdateRequest: CheckUpdateRequest,
-    ): CheckUpdateResponse
-
-    @POST("deviceService/device/getUpdate")
-    suspend fun deviceUpdate(
-        @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 +0,0 @@
-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/HemoCubeCommands.kt

@@ -1,18 +1,9 @@
 package com.example.hpostesting.data.constant
 
 enum class HemoCubeCommands(val command: String) {
-    START_BUFFER_COMMAND("B\r"),
+    startBuffer("B\r"),
-    AUTO_DAC_COMMAND("C\r"),
+    runDiagnostics("D\r"),
-    SET_AUTO_DAC_TO_EPROM_COMMAND("G\r"),
+    startSample("S\r"),
-    DIAGNOSTICS_COMMAND("D\r"),
+    getSample("P\r"),
-    FIRMWARE_INFO_COMMAND("F\r"),
+    getDeviceId("I\r"),
-    START_SAMPLE("S\r"),
-    PRINT_COMMAND("P\r"),
-    READ_DAC_COMMAND("R\r"),
-    DEVICE_CONFIGURATION_COMMAND("I\r"),
-    LOAD_DAC_VALUES("E\r"),
-    FIRST_GAIN_COMMAND("T\r"),
-    SECOND_GAIN_COMMAND("U\r"),
-    THIRD_GAIN_COMMAND("V\r"),
-    FORTH_GAIN_COMMAND("W\r"),
 }

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

@@ -19,14 +19,12 @@ object LanguageManager {
     }
 
     fun persistLanguagePreference(context: Context, languageCode: String) {
-        val prefs: SharedPreferences =
+        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-            context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
         prefs.edit().putString(LANGUAGE_PREF_KEY, languageCode).apply()
     }
 
     fun getSavedLanguage(context: Context): String {
-        val prefs: SharedPreferences =
+        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-            context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
         return prefs.getString(LANGUAGE_PREF_KEY, "en") ?: "en"
     }
 }

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

@@ -1,42 +0,0 @@
-package com.example.hpostesting.data.constant
-
-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),
-    EPROM_ADC_RETRIEVAL_STARTED(4.5),
-    EPROM_ADC_RETRIEVAL_COMPLETED(4.6),
-    BUFFER_STARTED(4.7),
-    BUFFER_COMPLETED(5.0),
-    BUFFER_PRINT_STARTED(6.0),
-    BUFFER_PRINT_COMPLETED(7.0),
-    SAMPLE_STARTED(8.0),
-    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),
-    FIRST_GAIN_PRINT_COMPLETED(15.0),
-    SECOND_GAIN_STARTED(16.0),
-    SECOND_GAIN_COMPLETED(17.0),
-    SECOND_GAIN_PRINT_STARTED(18.0),
-    SECOND_GAIN_PRINT_COMPLETED(19.0),
-    THIRD_GAIN_STARTED(20.0),
-    THIRD_GAIN_COMPLETED(21.0),
-    THIRD_GAIN_PRINT_STARTED(22.0),
-    THIRD_GAIN_PRINT_COMPLETED(23.0),
-    FORTH_GAIN_STARTED(24.0),
-    FORTH_GAIN_COMPLETED(25.0),
-    FORTH_GAIN_PRINT_STARTED(26.0),
-    FORTH_GAIN_PRINT_COMPLETED(27.0),
-    TEST_COMPLETED(30.0)
-}

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

@@ -16,7 +16,6 @@ class Converters {
             null
         }
     }
-
     @TypeConverter
     fun toString(location: UserData.Location?): String? {
         return if (location != null) {

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

@@ -7,7 +7,7 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
-
+import com.example.hpostesting.data.model.patient.UserData
 @Dao
 interface DeviceDao {
     @Query("SELECT * from device_table")

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

@@ -1,26 +0,0 @@
-package com.example.hpostesting.data.dao
-
-import androidx.lifecycle.LiveData
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import com.example.hpostesting.data.model.patient.BufferCheckData
-
-@Dao
-interface HemoCubeBufferDao {
-    @Query("SELECT * from hemo_cube_buffer_test_table")
-    fun getAll(): LiveData<List<BufferCheckData>>
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAll(bufferCheckData: BufferCheckData)
-
-    @Query("SELECT * FROM hemo_cube_buffer_test_table WHERE _id = :id")
-    suspend fun getUserByID(id: String): BufferCheckData
-
-    @Query("DELETE FROM hemo_cube_buffer_test_table WHERE _id = :id")
-    suspend fun deleteById(id: String)
-
-    @Query("UPDATE hemo_cube_buffer_test_table SET localFlag = :newValue WHERE _id = :id")
-    suspend fun updateFieldById(id: String, newValue: Boolean)
-}

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

@@ -23,10 +23,4 @@ interface HemoCubeDao {
 
     @Query("UPDATE hemo_cube_test_table SET localFlag = :newValue WHERE _id = :id")
     suspend fun updateFieldById(id: String, newValue: Boolean)
-
-    @Query("UPDATE hemo_cube_test_table SET molbioFlag = :newValue WHERE _id = :id")
-    suspend fun updateMolbioFlag(id: String, newValue: Boolean)
-
-    @Query("UPDATE hemo_cube_test_table SET isCSVCreated = :newValue WHERE _id = :id")
-    suspend fun updateCSVFieldById(id: String, newValue: Boolean)
 }

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

@@ -1,21 +1,19 @@
 package com.example.hpostesting.data.dao
 
+import android.content.Context
 import androidx.room.Database
+import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.google.android.datatransport.runtime.dagger.Provides
+import javax.inject.Singleton
 
-@Database(
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 13, exportSchema = false)
-    entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
-    version = 26,
-    exportSchema = false
-)
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao
     abstract fun hemoCubeDao(): HemoCubeDao
-    abstract fun hemoCubeBufferDao(): HemoCubeBufferDao
 }

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

@@ -1,14 +1,23 @@
 package com.example.hpostesting.data.datasource
 
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.opencsv.CSVWriter
+import java.io.File
+import java.io.FileWriter
 
-interface LocalFileDataSource {
+class LocalFileDataSource {
 
-    fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>)
+    fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>){
+        val writer = CSVWriter(FileWriter(filepath))
+        writer.writeAll(contents) // data is adding to csv
+        writer.close()
+    }
 
-    fun saveTextToDisk(filepath: String, contents: String)
+    fun saveTextToDisk(filepath: String, contents: String){
+        val writer = FileWriter(File(filepath))
+
+        writer.append(contents)
+        writer.flush()
+        writer.close()
+    }
 
-    fun exportDataToCSV(
-        fileName: String, dataList: List<HemoCubeTestData>,
-    ): Boolean
 }

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

@@ -1,164 +0,0 @@
-package com.example.hpostesting.data.datasource
-
-import android.os.Environment
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.opencsv.CSVWriter
-import java.io.File
-import java.io.FileWriter
-import java.io.IOException
-import javax.inject.Inject
-
-class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
-
-    override fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>) {
-        val writer = CSVWriter(FileWriter(filepath))
-        writer.writeAll(contents) // data is adding to csv
-        writer.close()
-    }
-
-    override fun saveTextToDisk(filepath: String, contents: String) {
-        val writer = FileWriter(File(filepath))
-
-        writer.append(contents)
-        writer.flush()
-        writer.close()
-    }
-
-    override fun exportDataToCSV(
-        fileName: String, dataList: List<HemoCubeTestData>,
-    ): Boolean {
-        try {
-            val formattedFileName = fileName.replace(
-                Regex("[^a-zA-Z0-9.-]"),
-                "_"
-            ) // Replace special characters with underscores
-            val filePath = File(getExternalStorageDirectory(), formattedFileName)
-            val writer = FileWriter(filePath)
-            val csvWriter = CSVWriter(writer)
-            // Write CSV header
-            val header = arrayOf(
-                "_id",
-                "name",
-                "incubationTime",
-                "bloodGroup",
-                "birthYear", // Include other fields from the data class
-                "state",
-                "abhaId",
-                "userImageURL",
-                "location",
-                "reportUploadTime",
-                "testType",
-                "testTime",
-                "testStatus",
-                "gender",
-                "localFlag", // Add more fields as necessary
-                "deviceId",
-                "appVersion",
-                "deviceSerialNumber",
-                "deviceType",
-                "kitSerial",
-                "resultData",
-                "led1Buffer",
-                "led2Buffer",
-                "led3Buffer",
-                "led4Buffer",
-                "led1Sample",
-                "led2Sample",
-                "led3Sample",
-                "led4Sample",
-                "led1Average",
-                "led2Average",
-                "led3Average",
-                "led4Average",
-                "abs1",
-                "abs2",
-                "abs3",
-                "abs4",
-                "deviceRatio",
-                "calculatedRatio",
-                "predictedDenovixRatio",
-                "coefficients",
-                "classificationResult",
-                "prdClassification",
-                "errorMessages",
-                "batteryLevel",
-                "batteryCapacity",
-                "batteryMaxCapacity",
-                "batteryTemperature",
-                "batteryVoltage"
-            )
-            csvWriter.writeNext(header)
-
-            // Write data rows
-            for (data in dataList) {
-                val row = arrayOf(
-                    data._id,
-                    data.name,
-                    data.incubationTime,
-                    data.bloodGroup,
-                    data.birthYear, // Include other fields similarly
-                    data.state,
-                    data.abhaId,
-                    data.userImageURL,
-                    data.location?.toString(),
-                    data.reportUploadTime ?: "",
-                    data.testType ?: "",
-                    data.testTime ?: "",
-                    data.testStatus?.toString() ?: "",
-                    data.gender,
-                    data.localFlag.toString(),
-                    data.deviceId ?: "",
-                    data.appVersion ?: "",
-                    data.deviceSerialNumber,
-                    data.deviceType,
-                    data.kitSerial,
-                    data.resultData,
-                    data.led1Buffer?.toString() ?: "",
-                    data.led2Buffer?.toString() ?: "",
-                    data.led3Buffer?.toString() ?: "",
-                    data.led4Buffer?.toString() ?: "",
-                    data.led1Sample?.toString() ?: "",
-                    data.led2Sample?.toString() ?: "",
-                    data.led3Sample?.toString() ?: "",
-                    data.led4Sample?.toString() ?: "",
-                    data.led1Average?.toString() ?: "",
-                    data.led2Average?.toString() ?: "",
-                    data.led3Average?.toString() ?: "",
-                    data.led4Average?.toString() ?: "",
-                    data.abs1?.toString() ?: "",
-                    data.abs2?.toString() ?: "",
-                    data.abs3?.toString() ?: "",
-                    data.abs4?.toString() ?: "",
-                    data.deviceRatio?.toString() ?: "",
-                    data.calculatedRatio?.toString() ?: "",
-                    data.predictedDenovixRatio?.toString() ?: "",
-                    data.coefficients ?: "",
-                    data.classificationResult,
-                    data.prdClassification,
-                    data.errorMessages,
-                    data.batteryLevel,
-                    data.batteryCapacity,
-                    data.batteryMaxCapacity,
-                    data.batteryTemperature,
-                    data.batteryVoltage
-                )
-                csvWriter.writeNext(row)
-            }
-            writer.close()
-            return true
-        } catch (e: IOException) {
-            e.printStackTrace()
-            return false
-        }
-    }
-
-    private fun getExternalStorageDirectory(): File {
-        val folder = File(Environment.getExternalStorageDirectory(), "HposFolder")
-
-        if (!folder.exists()) {
-            folder.mkdirs()
-        }
-
-        return folder
-    }
-}

app/src/main/java/com/example/hpostesting/data/encryption/AESCrypt.kt

@@ -1,36 +0,0 @@
-package com.example.hpostesting.data.encryption
-
-import android.security.keystore.KeyGenParameterSpec
-import android.security.keystore.KeyProperties
-import android.util.Base64
-import javax.crypto.Cipher
-import javax.crypto.KeyGenerator
-import javax.crypto.spec.SecretKeySpec
-
-
-object AESCrypt {
-    private const val ALGORITHM = "AES"
-    private const val KEY = "your_secret_key"
-
-    @Throws(Exception::class)
-    fun encrypt(value: String): String {
-        val keySpec = SecretKeySpec(KEY.toByteArray(), ALGORITHM)
-        val cipher = Cipher.getInstance(ALGORITHM)
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec)
-        val encryptedBytes = cipher.doFinal(value.toByteArray())
-        return Base64.encodeToString(encryptedBytes, Base64.DEFAULT)
-    }
-
-    @Throws(Exception::class)
-    fun decrypt(encrypted: String?): String {
-        val keySpec = SecretKeySpec(KEY.toByteArray(), ALGORITHM)
-        val cipher = Cipher.getInstance(ALGORITHM)
-        cipher.init(Cipher.DECRYPT_MODE, keySpec)
-        val encryptedBytes = Base64.decode(encrypted, Base64.DEFAULT)
-        val decryptedBytes = cipher.doFinal(encryptedBytes)
-        return String(decryptedBytes)
-    }
-
-    //generates a secret key for the encryption functions to use
-    //TODO: Generating keys requires a higher API level. ask someone if this is okay.
-}

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/calibration/CalibrationData.kt

@@ -1,13 +0,0 @@
-package com.example.hpostesting.data.model.calibration
-
-data class CalibrationData (
-    var led1Slope: Double = 1.0,
-    var led1Intercept: Double = 0.0,
-    var led2Slope: Double = 1.0,
-    var led2Intercept: Double = 0.0,
-    var led3Slope: Double = 1.0,
-    var led3Intercept: Double = 0.0,
-    var led4Slope: Double = 1.0,
-    var led4Intercept: Double = 0.0,
-    var calibratedAt: String = ""
-)

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/Credentials.kt

@@ -1,6 +0,0 @@
-package com.example.hpostesting.data.model.deviceprovision
-
-data class Credentials(
-    val password: String? = "",
-    val username: String? = "",
-)

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

@@ -1,17 +0,0 @@
-package com.example.hpostesting.data.model.deviceprovision
-
-data class Device(
-    val assigned: Boolean? = false,
-    val createdAt: String? = "",
-    val createdBy: Int? = 0,
-    val deviceType: DeviceType? = DeviceType(),
-    val deviceTypeId: Int? = 0,
-    val deviceUser: DeviceUser? = DeviceUser(),
-    val enabled: Boolean? = false,
-    val id: Int? = 0,
-    val name: String? = "",
-    val serialNumber: String? = "",
-    val uid: String? = "",
-    val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
-)

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

@@ -1,6 +0,0 @@
-package com.example.hpostesting.data.model.deviceprovision
-
-data class DeviceProvisionData(
-    val credentials: Credentials? = Credentials(),
-    val device: Device? = Device(),
-)

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

@@ -1,9 +0,0 @@
-package com.example.hpostesting.data.model.deviceprovision
-
-data class DeviceProvisionRequest(
-    val deviceTypeName: String? = "HPOS",
-    val email: String? = "",
-    val password: String? = "",
-    val serialNumber: String? = "",
-    val uid: String? = "",
-)

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

@@ -1,12 +0,0 @@
-package com.example.hpostesting.data.model.deviceprovision
-
-import com.google.gson.annotations.SerializedName
-
-data class DeviceProvisionResponse(
-    @SerializedName("Data")
-    val data: DeviceProvisionData? = DeviceProvisionData(),
-    @SerializedName("Message")
-    val message: String? = "",
-    @SerializedName("Result")
-    val result: String? = "",
-)

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

@@ -1,12 +0,0 @@
-package com.example.hpostesting.data.model.deviceprovision
-
-data class DeviceType(
-    val createdAt: String? = "",
-    val createdBy: Int? = 0,
-    val description: String? = "",
-    val enabled: Boolean? = false,
-    val id: Int? = 0,
-    val name: String? = "",
-    val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
-)

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

@@ -1,15 +0,0 @@
-package com.example.hpostesting.data.model.deviceprovision
-
-data class DeviceUser(
-    val createdAt: String? = "",
-    val createdBy: Int? = 0,
-    val deviceId: Int? = 0,
-    val enabled: Boolean? = false,
-    val id: Int? = 0,
-    val lastLogin: Any? = Any(),
-    val natsToken: String? = "",
-    val natsTokenExpiry: String? = "",
-    val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
-    val username: 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

@@ -1,12 +1,9 @@
 package com.example.hpostesting.data.model.diagnostics
 
-data class DiagnosticsData(
+data class DiagnosticsData (
     var deviceId: String = "",
     var appVersion: String? = "",
     var deviceType: String = "HEMOCUBE",
     var deviceData: String = "",
-    var devicePassword: String = "",
+    var runTime: 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/log/UploadLogsData.kt

@@ -1,5 +0,0 @@
-package com.example.hpostesting.data.model.log
-
-data class UploadLogsData(
-    val filename: String? = "",
-)

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

@@ -1,12 +0,0 @@
-package com.example.hpostesting.data.model.log
-
-import com.google.gson.annotations.SerializedName
-
-data class UploadLogsResponse(
-    @SerializedName("Data")
-    val data: UploadLogsData? = UploadLogsData(),
-    @SerializedName("Message")
-    val message: String? = "",
-    @SerializedName("Result")
-    val result: String? = "",
-)

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

@@ -1,16 +0,0 @@
-package com.example.hpostesting.data.model.login
-
-data class Device(
-    val assigned: Boolean? = false,
-    val createdAt: String? = "",
-    val createdBy: Int? = 0,
-    val deviceType: DeviceType? = DeviceType(),
-    val deviceTypeId: Int? = 0,
-    val enabled: Boolean? = false,
-    val id: Int? = 0,
-    val name: String? = "",
-    val serialNumber: String? = "",
-    val uid: String? = "",
-    val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
-)

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

@@ -1,12 +0,0 @@
-package com.example.hpostesting.data.model.login
-
-data class DeviceType(
-    val createdAt: String? = "",
-    val createdBy: Int? = 0,
-    val description: String? = "",
-    val enabled: Boolean? = false,
-    val id: Int? = 0,
-    val name: String? = "",
-    val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
-)

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

@@ -1,16 +0,0 @@
-package com.example.hpostesting.data.model.login
-
-data class DeviceUser(
-    val createdAt: String? = "",
-    val createdBy: Int? = 0,
-    val device: Device? = Device(),
-    val deviceId: Int? = 0,
-    val enabled: Boolean? = false,
-    val id: Int? = 0,
-    val lastLogin: String? = "",
-    val natsToken: String? = "",
-    val natsTokenExpiry: String? = "",
-    val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
-    val username: String? = "",
-)

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

@@ -1,6 +0,0 @@
-package com.example.hpostesting.data.model.login
-
-data class LoginData(
-    val accessToken: String? = "",
-    val deviceUser: DeviceUser? = DeviceUser(),
-)

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

@@ -1,13 +0,0 @@
-package com.example.hpostesting.data.model.login
-
-data class LoginRequest(
-    val lab: String? = "",
-    val latitude: String? = "",
-    val location: String? = "",
-    val longitude: String? = "",
-    val mode: String? = "",
-    val password: String? = "",
-    val serialNumber: String? = "",
-    val username: String? = "",
-    val version: String? = "",
-)

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

@@ -1,12 +0,0 @@
-package com.example.hpostesting.data.model.login
-
-import com.google.gson.annotations.SerializedName
-
-data class LoginResponse(
-    @SerializedName("Data")
-    val data: LoginData? = LoginData(),
-    @SerializedName("Message")
-    val message: String? = "",
-    @SerializedName("Result")
-    val result: String? = "",
-)

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

@@ -1,38 +0,0 @@
-package com.example.hpostesting.data.model.molbioresult
-
-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 analysisId: String? = "",
-    val analysisStatus: String? = "",
-    val analysisType: String? = "HPOS",
-    val analysisTypeMethod: String? = "",
-    val bloodGroup: String? = "",
-    val coefficients: List<Int>? = listOf(22, 22),
-    val collectionLocation: List<Any>? = listOf(),
-    val collectionTime: String? = "2024-02-08 16:33:56",
-    val collector: String? = "",
-    val curveFitting: String? = "Linear",
-    val deviceName: String? = "HPOS",
-    val expiryTime: String? = "2024-02-08 16:33:56",
-    val gender: String? = "",
-    val interpretation: String? = "",
-    val `operator`: String? = "",
-    val patientId: Int? = 4545,
-    val pregnancy: Boolean? = false,
-    val rawData: HemoCubeTestData? = HemoCubeTestData(),
-    val recommendation: String? = "NA",
-    val sampleId: String? = "",
-    val sampleType: String? = "",
-    val sickleCellHistory: Boolean? = false,
-    val testId: String? = "",
-    val testResult: String? = "",
-    val testStatus: String? = "",
-    val testTime: String? = "2024-02-08 16:33:56",
-    val testType: String? = "",
-    val thresholds: String? = "",
-    val underMedication: Boolean? = false,
-    val volume: Int? = 2,
-)

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

@@ -1,42 +0,0 @@
-package com.example.hpostesting.data.model.molbioresult
-
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-
-data class MolbioV2ResultData(
-    val age: Int? = 0,
-    val analysisDate: String? = "2024-02-08 16:33:56",
-    val analysisStatus: String? = "",
-    val analysisType: String? = "",
-    val analysisTypeMethod: String? = "",
-    val bloodGroup: String? = "",
-    val coefficients: List<Int>? = listOf(),
-    val collectionLocation: List<Any>? = listOf(),
-    val collectionTime: String? = "2024-02-08 16:33:56",
-    val collector: String? = "",
-    val createdAt: String? = "",
-    val createdBy: Int? = 0,
-    val curveFitting: String? = "",
-    val deviceId: Int? = 0,
-    val expiryTime: String? = "2024-02-08 16:33:56",
-    val gender: String? = "",
-    val id: Int? = 0,
-    val interpretation: String? = "",
-    val `operator`: String? = "",
-    val patientId: Int? = 0,
-    val pregnancy: Boolean? = false,
-    val rawData: HemoCubeTestData? = HemoCubeTestData(),
-    val recommendation: String? = "",
-    val sampleId: String? = "",
-    val sampleType: String? = "",
-    val sickleCellHistory: Boolean? = false,
-    val testId: String? = "",
-    val testResult: String? = "",
-    val testStatus: String? = "",
-    val testTime: String? = "2024-02-08 16:33:56",
-    val testType: String? = "",
-    val thresholds: String? = "",
-    val underMedication: Boolean? = false,
-    val updatedAt: String? = "",
-    val updatedBy: Int? = 0,
-    val volume: Int? = 0,
-)

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

@@ -1,5 +0,0 @@
-package com.example.hpostesting.data.model.molbioresult
-
-data class MolbioV2ResultRequest(
-    val results: MutableList<MolbioV2Result>? = mutableListOf(),
-)

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

@@ -1,12 +0,0 @@
-package com.example.hpostesting.data.model.molbioresult
-
-import com.google.gson.annotations.SerializedName
-
-data class MolbioV2ResultResponse(
-    @SerializedName("Data")
-    val data: List<MolbioV2ResultData>? = listOf(),
-    @SerializedName("Message")
-    val message: String? = "",
-    @SerializedName("Result")
-    val result: String? = "",
-)

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

@@ -1,55 +0,0 @@
-package com.example.hpostesting.data.model.molbioresult
-
-import com.example.hpostesting.data.model.patient.UserData
-
-data class RawData(
-    var _id: String = "",
-    var name: String = "",
-    var incubationTime: String = "",
-    var bloodGroup: String = "",
-    var birthYear: String = "",
-    var state: String = "",
-    var abhaId: String = "",
-    var userImageURL: String = "",
-    var location: UserData.Location? = null,
-    var reportUploadTime: String? = "",
-    var testType: String? = "HEMOCUBE",
-    var testTime: String? = "",
-    var testStatus: Boolean? = false,
-    var gender: String = "",
-    var localFlag: Boolean = false,
-    var deviceId: String? = "",
-    var appVersion: String? = "",
-    var deviceSerialNumber: String = "",
-    var deviceType: String = "HEMOCUBE",
-    var kitSerial: String = "",
-    var resultData: String = "",
-    var led1Buffer: Double? = null,
-    var led2Buffer: Double? = null,
-    var led3Buffer: Double? = null,
-    var led4Buffer: Double? = null,
-    var led1Sample: Double? = null,
-    var led2Sample: Double? = null,
-    var led3Sample: Double? = null,
-    var led4Sample: Double? = null,
-    var led1Average: Double? = null,
-    var led2Average: Double? = null,
-    var led3Average: Double? = null,
-    var led4Average: Double? = null,
-    var abs1: Double? = null,
-    var abs2: Double? = null,
-    var abs3: Double? = null,
-    var abs4: Double? = null,
-    var deviceRatio: Double? = null,
-    var calculatedRatio: Double? = null,
-    var predictedDenovixRatio: Double? = null,
-    var coefficients: String? = "",
-    var classificationResult: String = "",
-    var prdClassification: String = "",
-    var errorMessages: String = "",
-    var batteryLevel: String = "",
-    var batteryCapacity: String = "",
-    var batteryMaxCapacity: String = "",
-    var batteryTemperature: String = "",
-    var batteryVoltage: String = "",
-)

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

@@ -1,47 +1,21 @@
 package com.example.hpostesting.data.model.patient
 
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "hemo_cube_buffer_test_table")
 data class BufferCheckData(
-    @PrimaryKey
-    var _id: String = "",
     var kitno: String = "",
     var deviceId: String? = "",
-    var appVersion: String? = "",
+    var appVersion:String? = "",
     var deviceSerialNumber: String = "",
     var deviceType: String = "HEMOCUBE",
-    var localFlag: Boolean = false,
     var resultData: String = "",
     var led1Buffer: Double? = null,
     var led2Buffer: Double? = null,
-    var led3Buffer: Double? = null,
-    var led4Buffer: Double? = null,
     var led1Sample: Double? = null,
     var led2Sample: Double? = null,
-    var led3Sample: Double? = null,
-    var led4Sample: Double? = null,
     var led1Average: Double? = null,
     var led2Average: Double? = null,
-    var led3Average: Double? = null,
-    var led4Average: Double? = null,
-    var abs1: Double? = null,
-    var abs2: Double? = null,
-    var abs3: Double? = null,
-    var abs4: Double? = null,
     var deviceRatio: Double? = null,
     var calculatedRatio: Double? = null,
-    var predictedDenovixRatio: Double? = null,
     var coefficients: String? = "",
     var classificationResult: String = "",
-    var testTime: String = "",
+    var testTime: String = ""
-    var prdClassification: String = "",
-    var errorMessages: String = "",
-    var batteryLevel: String = "",
-    var batteryCapacity: String = "",
-    var batteryMaxCapacity: String = "",
-    var batteryTemperature: String = "",
-    var batteryVoltage: String = "",
-    var reportUploadTime: String? = "",
 )

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 = "",
+    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 = "",
 )

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

@@ -22,7 +22,7 @@ data class HemoCubeTestData(
     var gender: String = "",
     var localFlag: Boolean = false,
     var deviceId: String? = "",
-    var appVersion: String? = "",
+    var appVersion:String? = "",
     var deviceSerialNumber: String = "",
     var deviceType: String = "HEMOCUBE",
     var kitSerial: String = "",
@@ -43,51 +43,16 @@ data class HemoCubeTestData(
     var abs2: Double? = null,
     var abs3: Double? = null,
     var abs4: Double? = null,
-    var hb3: Double? = null,
-    var hb4: Double? = null,
-    var led1Gain1: Double? = null,
-    var led2Gain1: Double? = null,
-    var led3Gain1: Double? = null,
-    var led4Gain1: Double? = null,
-    var led1Gain2: Double? = null,
-    var led2Gain2: Double? = null,
-    var led3Gain2: Double? = null,
-    var led4Gain2: Double? = null,
-    var led1Gain3: Double? = null,
-    var led2Gain3: Double? = null,
-    var led3Gain3: Double? = null,
-    var led4Gain3: Double? = null,
-    var led1Gain4: Double? = null,
-    var led2Gain4: Double? = null,
-    var led3Gain4: Double? = null,
-    var led4Gain4: Double? = null,
-    var led1Air1: Double? = null,
-    var led2Air1: Double? = null,
-    var led3Air1: Double? = null,
-    var led4Air1: Double? = null,
-    var led1Air2: Double? = null,
-    var led2Air2: Double? = null,
-    var led3Air2: Double? = null,
-    var led4Air2: Double? = null,
     var deviceRatio: Double? = null,
     var calculatedRatio: Double? = null,
     var predictedDenovixRatio: Double? = null,
-    var slopeRatio: Double? = null,
     var coefficients: String? = "",
     var classificationResult: String = "",
     var prdClassification: String = "",
-    var deviceRatioClass: String = "",
-    var slopeRatioClass: String = "",
     var errorMessages: String = "",
     var batteryLevel: String = "",
     var batteryCapacity: String = "",
     var batteryMaxCapacity: String = "",
     var batteryTemperature: String = "",
     var batteryVoltage: String = "",
-    var molbioFlag: Boolean = false,
-    var quickCapture: Boolean = false,
-    var solution: String? = "",
-    var concentration: String? = "",
-    var volume: String? = "",
-    var isCSVCreated: Boolean = false,
 )

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

@@ -18,7 +18,7 @@ data class PatientDetails(
     var address: Address?,
     var category: Category?,
     var registerDate: Date?,
-    var uploadDate: Date?,
+    var uploadDate: Date?
 ) {
     constructor() : this(
         "",
@@ -45,6 +45,7 @@ data class PatientDetails(
         OTHER
     }
 
+
     data class Address(
         var house: String?,
         val street: String?,

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

@@ -10,11 +10,11 @@ data class UserData(
     var _id: String = "",
     var name: String = "",
     var incubationTime: String = "",
-    var gender: String = "",
     var birthYear: String = "",
     var abhaId: String = "",
     var bloodGroup: String = "",
     var userImageURL: String = "",
+    var gender: String ="",
     var location: Location? = null,
     var createdBy: String? = "",
     var reportUploadTime: String? = "",
@@ -29,7 +29,7 @@ data class UserData(
     var reportPath: String = "",
     var result: TestRightResultType? = null,
     var resultRatio: Double? = null,
-    var prdClassification: String = "",
+    var prdClassification: String = ""
 ) {
     enum class Gender {
         MALE,
@@ -39,21 +39,21 @@ data class UserData(
 
     data class Location(
         var latitude: Double? = null,
-        var longitude: Double? = null,
+        var longitude: Double? = null
     )
 }
 
 fun UserData.toHemoCubeTestData() = HemoCubeTestData(
     _id = _id,
     name = name,
-    bloodGroup = bloodGroup,
     birthYear = birthYear,
-    gender = gender,
-    state = state,
-    abhaId = abhaId,
     userImageURL = userImageURL,
     testStatus = testStatus,
     location = location,
+    gender = gender,
+    state = state,
+    abhaId = abhaId,
+    bloodGroup = bloodGroup,
     prdClassification = prdClassification,
     testTime = testTime
 )

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

@@ -0,0 +1,55 @@
+package com.example.hpostesting.data.model.test
+
+import com.example.hpostesting.data.model.Location
+import java.util.Date
+
+data class TestDetails(
+    val testID: String,
+    var testStatus: Status,
+    val patientID: String,
+    val patientName: String,
+    val patientAge: Int?,
+
+    var resultRatio: Double?,
+    var result: TestRightResultType?,
+
+    val reportPath: String?,
+    val csvPath: String?,
+    val logPath: String?,
+
+    // Meta Data
+    var deviceId: String?,
+    val mobileId: String,
+    var kitSerial: String?,
+    val location: Location?,
+    val appVersion: String,
+
+    val registeredTime: Date?,
+    var uploadTime: Date?
+) {
+    constructor() : this(
+        "",
+        Status.PENDING,
+        "",
+        "",
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        "",
+        null,
+        null,
+        "",
+        null,
+        null
+    )
+}
+
+enum class Status {
+    COMPLETED,
+    PENDING,
+    INPROGRESS
+}

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

@@ -0,0 +1,11 @@
+package com.example.hpostesting.data.model.test
+
+data class TestInfo(
+    val value: String,
+    val number1: String,
+    val number2: String,
+    val result: String,
+    val resultConfirmatory: String,
+    val directoryPath: String,
+    val fullPath: String
+)

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

@@ -1,29 +0,0 @@
-package com.example.hpostesting.di
-
-import android.content.Context
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.data.dao.UserDao
-import com.example.hpostesting.domain.SaveRawData
-import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.presentation.testRight.TestRightViewModel
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ViewModelComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
-
-@Module
-@InstallIn(ViewModelComponent::class)
-object ViewModelModule {
-
-    @Provides
-    fun provideTestRightViewModel(
-        saveRawData: SaveRawData,
-        saveRawDataTest: SaveRawDataTest,
-        databaseRepository: DatabaseRepository,
-        userDao: UserDao,
-        context: Context
-    ): TestRightViewModel {
-        return TestRightViewModel(saveRawData, saveRawDataTest, databaseRepository, userDao, context)
-    }
-}

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

@@ -1,5 +0,0 @@
-package com.example.hpostesting.data.model.updates
-
-data class CheckUpdateData(
-    val version: String? = "",
-)

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

@@ -1,5 +0,0 @@
-package com.example.hpostesting.data.model.updates
-
-data class CheckUpdateRequest(
-    val currentVersion: String? = "",
-)

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

@@ -1,12 +0,0 @@
-package com.example.hpostesting.data.model.updates
-
-import com.google.gson.annotations.SerializedName
-
-data class CheckUpdateResponse(
-    @SerializedName("Data")
-    val data: CheckUpdateData? = CheckUpdateData(),
-    @SerializedName("Message")
-    val message: String? = "",
-    @SerializedName("Result")
-    val result: String? = "",
-)

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

@@ -1,5 +0,0 @@
-package com.example.hpostesting.data.model.updates
-
-data class DeviceUpdateRequest(
-    val serial_no: String? = "",
-)

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

@@ -1,108 +1,37 @@
 package com.example.hpostesting.data.repository
 
 import android.net.Uri
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.api.MolbioAuthApi
-import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.model.PendingUploads
 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
-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.UserData
-import com.example.hpostesting.data.model.updates.CheckUpdateRequest
-import com.example.hpostesting.data.model.updates.CheckUpdateResponse
-import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.ktx.storage
 import kotlinx.coroutines.tasks.await
-import okhttp3.MultipartBody
-import okhttp3.ResponseBody
 import java.io.File
-import java.net.ConnectException
-import java.net.SocketTimeoutException
 import javax.inject.Inject
-import javax.inject.Named
 
-class NetworkException(message: String, cause: Throwable) : Exception(message, cause)
+class DatabaseRepository @Inject constructor() : Repository {
-class DatabaseRepository @Inject constructor(
-    @Named("Auth") private val molbioAuthApi: MolbioAuthApi,
-    private val molbioResultApi: MolbioResultApi,
-) : Repository {
 
     private val db: FirebaseFirestore = Firebase.firestore
     private val storage = Firebase.storage
 
-    private suspend fun <T : Any> safeApiCall(apiCall: suspend () -> T): Result<T> {
-        return try {
-            val response = apiCall.invoke()
-            Result.Success(response)
-        } catch (e: SocketTimeoutException) {
-            Result.Error(NetworkException("Network timeout", e))
-        } catch (e: ConnectException) {
-            Result.Error(NetworkException("Network connection failed", e))
-        } catch (e: Exception) {
-            Result.Error(e)
-        }
-    }
-
-    override suspend fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest): Result<DeviceProvisionResponse> {
-        return safeApiCall { molbioAuthApi.deviceProvision(deviceProvisionRequest) }
-    }
-
-    override suspend fun login(loginRequest: LoginRequest): Result<LoginResponse> {
-        return safeApiCall { molbioAuthApi.login(loginRequest) }
-    }
-
-    override suspend fun uploadResults(molbioV2ResultRequest: MolbioV2ResultRequest): Result<MolbioV2ResultResponse> {
-        return safeApiCall { molbioResultApi.uploadResults(molbioV2ResultRequest) }
-    }
-
-    override suspend fun checkUpdate(checkUpdateRequest: CheckUpdateRequest): Result<CheckUpdateResponse> {
-        return safeApiCall { molbioResultApi.checkUpdate(checkUpdateRequest) }
-    }
-
-    override suspend fun deviceUpdate(deviceUpdateRequest: DeviceUpdateRequest): Result<ResponseBody> {
-        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) }
-    }
-
     override suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
         return try {
-            val userdata =
+            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
-                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
             if (userdata.documents.isNotEmpty()) {
                 userdata.documents.forEach {
                     db.collection("patientData").document(it.id).update("testStatus", true)
                 }
             }
-            db.collection("testData").add(data).await()
+            db.collection("testData").add(data!!).await()
-            Response.Success(data._id)
+            Response.Success(data!!._id)
         } catch (e: Exception) {
             Response.Error(e)
         }
@@ -110,15 +39,14 @@ class DatabaseRepository @Inject constructor(
 
     override suspend fun addTestToDatabase(data: UserData?): Response<String> {
         return try {
-            val userdata =
+            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
-                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
             if (userdata.documents.isNotEmpty()) {
                 userdata.documents.forEach {
                     db.collection("patientData").document(it.id).update("testStatus", true)
                 }
             }
-            db.collection("testData").add(data).await()
+            db.collection("testData").add(data!!).await()
-            Response.Success(data._id)
+            Response.Success(data!!._id)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
             Response.Error(e)
@@ -128,7 +56,7 @@ class DatabaseRepository @Inject constructor(
     override suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String> {
         return try {
             db.collection("buffers").add(data!!).await()
-            Response.Success(data.kitno)
+            Response.Success(data!!.kitno)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
             Response.Error(e)
@@ -138,26 +66,14 @@ class DatabaseRepository @Inject constructor(
     override suspend fun addDiagnostics(data: DiagnosticsData?): Response<String> {
         return try {
             db.collection("diagnostics").add(data!!).await()
-            Response.Success(data.deviceId)
+            Response.Success(data!!.deviceId)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
             Response.Error(e)
         }
     }
 
-    override suspend fun addTestJigData(data: JigData?): Response<String> {
+    override suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean> {
-        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> {
         try {
 
             val file = Uri.fromFile(File(filePath))
@@ -223,28 +139,4 @@ class DatabaseRepository @Inject constructor(
         // Find the DeviceData object with the specified deviceId
         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/LocalFileRepository.kt

@@ -1,12 +1,6 @@
 package com.example.hpostesting.data.repository
 
-import android.os.Environment
 import com.example.hpostesting.data.datasource.LocalFileDataSource
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.opencsv.CSVWriter
-import java.io.File
-import java.io.FileWriter
-import java.io.IOException
 
 class LocalFileRepository(private val localFileDataSource: LocalFileDataSource) {
     fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>) =

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

@@ -1,27 +1,11 @@
 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
-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.UserData
-import com.example.hpostesting.data.model.updates.CheckUpdateRequest
-import com.example.hpostesting.data.model.updates.CheckUpdateResponse
-import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
-import okhttp3.MultipartBody
-import okhttp3.ResponseBody
 
 interface Repository {
     suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String>
@@ -32,26 +16,7 @@ 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>
-
-    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/AuthInterceptor.kt

@@ -1,23 +0,0 @@
-package com.example.hpostesting.domain
-
-import android.content.SharedPreferences
-import com.example.hpostesting.data.constant.Constants
-import okhttp3.Interceptor
-import okhttp3.Response
-
-class AuthInterceptor(private val sharedPreferences: SharedPreferences) : Interceptor {
-
-    override fun intercept(chain: Interceptor.Chain): Response {
-        var request = chain.request()
-
-        val token = sharedPreferences.getString(Constants.ACCESS_TOKEN, null)
-
-        if (token != null) {
-            request = request.newBuilder()
-                .addHeader("Authorization", "Bearer $token")
-                .build()
-        }
-
-        return chain.proceed(request)
-    }
-}

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

@@ -1,28 +0,0 @@
-package com.example.hpostesting.domain
-
-import android.content.Context
-import android.util.Log
-import androidx.work.CoroutineWorker
-import androidx.work.WorkerParameters
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.withContext
-
-class CheckUpdateWorker(
-    context: Context,
-    workerParams: WorkerParameters
-) : CoroutineWorker(context, workerParams) {
-
-    override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
-        try {
-//            for (i in 1..900){
-//                delay(1000)
-//                Log.d("Work for every second", "doWork: Running")
-//            }
-
-            Result.success()
-        } catch (e: Exception) {
-            Result.failure()
-        }
-    }
-}

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

@@ -1,12 +0,0 @@
-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
-
-interface LogFileManager {
-
-    fun createLogFile(): File?
-}

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

@@ -1,38 +0,0 @@
-package com.example.hpostesting.domain
-
-import android.content.Context
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-import javax.inject.Inject
-
-class LogFileManagerImpl @Inject constructor(private val context: Context) : LogFileManager {
-
-    override fun createLogFile(): File? {
-        val unixTime = System.currentTimeMillis() / 1000L
-        val logFileName = "hpos_$unixTime.log"
-
-        return try {
-            val process = Runtime.getRuntime().exec("logcat -d -v threadtime -t 1000")
-            val logBuilder = StringBuilder()
-            val input = process.inputStream
-            val bufferedReader = input.bufferedReader()
-
-            bufferedReader.forEachLine { line ->
-                logBuilder.append(line).append("\n")
-            }
-
-            val logContent = logBuilder.toString()
-
-            val file = File(context.filesDir, logFileName)
-            val fileOutputStream = FileOutputStream(file)
-            fileOutputStream.write(logContent.toByteArray())
-            fileOutputStream.close()
-
-            file
-        } catch (e: IOException) {
-//            Log.e("LogFileManager", "Error creating log file: ${e.message}")
-            null
-        }
-    }
-}

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

@@ -1,10 +1,10 @@
 package com.example.hpostesting.domain
 
 import android.util.Log
+import com.example.hpostesting.data.repository.LocalFileRepository
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestRightCalculationData
-import com.example.hpostesting.data.repository.LocalFileRepository
 import java.util.Collections.sort
 
 class SaveRawData(private val localFileRepository: LocalFileRepository) {
@@ -98,7 +98,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
         folderPath: String,
         fileName: String,
         calculationData: TestRightCalculationData,
-        testDetails: UserData?,
+        testDetails: UserData?
     ) {
 //        val fileObj = File(folderPath, fileName)
 //        val writer = FileWriter(fileObj)
@@ -116,7 +116,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
 
     private fun getLogStringFromObjWithPatientData(
         calculationData: TestRightCalculationData,
-        testDetails: UserData?,
+        testDetails: UserData?
     ): String {
         var outputString = "Test calculation logs ==>\n"
         outputString += "Name = ${testDetails?.name}\n"

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

@@ -2,37 +2,21 @@ package com.example.hpostesting.domain.di
 
 import android.app.Application
 import android.content.Context
-import android.content.SharedPreferences
-import android.content.res.AssetManager
 import androidx.room.Room
-import com.example.hpostesting.data.api.MolbioAuthApi
-import com.example.hpostesting.data.api.MolbioResultApi
-import com.example.hpostesting.data.api.PropertyProvider
-import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
 import com.example.hpostesting.data.dao.UserDao
 import com.example.hpostesting.data.datasource.LocalFileDataSource
-import com.example.hpostesting.data.datasource.LocalFileDataSourceImpl
 import com.example.hpostesting.data.repository.DatabaseRepository
 import com.example.hpostesting.data.repository.LocalFileRepository
 import com.example.hpostesting.data.repository.Repository
-import com.example.hpostesting.domain.AuthInterceptor
-import com.example.hpostesting.domain.LogFileManager
-import com.example.hpostesting.domain.LogFileManagerImpl
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.util.PropertyProviderImpl
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import okhttp3.OkHttpClient
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-import java.util.concurrent.TimeUnit
-import javax.inject.Named
 import javax.inject.Singleton
 
 @Module
@@ -44,7 +28,9 @@ object AppModule {
     fun provideMyDatabase(@ApplicationContext context: Context): MyDatabase {
         return Room.databaseBuilder(
             context, MyDatabase::class.java, "my_database"
-        ).fallbackToDestructiveMigration().build()
+        )
+            .fallbackToDestructiveMigration()
+            .build()
     }
 
     @Provides
@@ -59,13 +45,6 @@ object AppModule {
         return myDatabase.hemoCubeDao()
     }
 
-    @Provides
-    @Singleton
-    fun provideMyHemoCubeBuffer(myDatabase: MyDatabase): HemoCubeBufferDao {
-        return myDatabase.hemoCubeBufferDao()
-    }
-
-
     @Provides
     @Singleton
     fun provideContext(application: Application): Context {
@@ -75,108 +54,26 @@ object AppModule {
     @Provides
     @Singleton
     fun provideSaveRawData(): SaveRawData {
-        val repository = LocalFileRepository(LocalFileDataSourceImpl())
+        val repository = LocalFileRepository(LocalFileDataSource())
         return SaveRawData(repository)
     }
 
     @Provides
     @Singleton
     fun provideSaveRawDataTest(): SaveRawDataTest {
-        val repository = LocalFileRepository(LocalFileDataSourceImpl())
+        val repository = LocalFileRepository(LocalFileDataSource())
         return SaveRawDataTest(repository)
     }
 
     @Provides
     @Singleton
-    fun provideDatabaseRepository(
+    fun provideDatabaseRepository(): DatabaseRepository {
-        @Named("Auth") molbioAuthApi: MolbioAuthApi,
+        return DatabaseRepository()
-        molbioResultApi: MolbioResultApi
-    ): DatabaseRepository {
-        return DatabaseRepository(molbioAuthApi = molbioAuthApi, molbioResultApi = molbioResultApi)
     }
 
     @Provides
     @Singleton
-    fun provideRepository(
+    fun provideRepository(): Repository {
-        @Named("Auth") molbioAuthApi: MolbioAuthApi,
+        return DatabaseRepository()
-        molbioResultApi: MolbioResultApi
-    ): Repository {
-        return DatabaseRepository(molbioAuthApi, molbioResultApi)
-    }
-
-    @Provides
-    @Singleton
-    fun provideAssetManager(@ApplicationContext context: Context): AssetManager {
-        return context.assets
-    }
-
-    @Provides
-    @Singleton
-    fun providePropertyProvider(assetManager: AssetManager): PropertyProvider {
-        return PropertyProviderImpl(assetManager)
-    }
-
-    @Provides
-    @Singleton
-    fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
-        return context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-    }
-
-    @Provides
-    @Singleton
-    fun provideAuthInterceptor(sharedPreferences: SharedPreferences): AuthInterceptor {
-        return AuthInterceptor(sharedPreferences)
-    }
-
-    @Provides
-    @Singleton
-    @Named("Auth")
-    fun provideAuthOkHttpClient(authInterceptor: AuthInterceptor): OkHttpClient {
-        return OkHttpClient.Builder().addInterceptor(authInterceptor)
-            .connectTimeout(30, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build()
-    }
-
-    @Provides
-    @Singleton
-    fun provideOkHttpClient(): OkHttpClient =
-        OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS).build()
-
-    @Provides
-    @Singleton
-    fun provideRetrofit(
-        propertyProvider: PropertyProvider,@Named("Auth") client: OkHttpClient
-    ): Retrofit {
-        return Retrofit.Builder().baseUrl(propertyProvider.getProperty("BASE_URL")).client(client)
-            .addConverterFactory(GsonConverterFactory.create()).build()
-    }
-
-    @Provides
-    @Singleton
-    @Named("Auth")
-    fun provideAuthRetrofit(propertyProvider: PropertyProvider, client: OkHttpClient): Retrofit {
-        return Retrofit.Builder().baseUrl(propertyProvider.getProperty("BASE_URL")).client(client)
-            .addConverterFactory(GsonConverterFactory.create()).build()
-    }
-
-    @Provides
-    @Singleton
-    @Named("Auth")
-    fun provideAuthApi(@Named("Auth") retrofit: Retrofit): MolbioAuthApi =
-        retrofit.create(MolbioAuthApi::class.java)
-
-    @Provides
-    @Singleton
-    fun provideResultApi(retrofit: Retrofit): MolbioResultApi =
-        retrofit.create(MolbioResultApi::class.java)
-
-    @Provides
-    @Singleton
-    fun provideLogFileManager(context: Context): LogFileManager = LogFileManagerImpl(context)
-
-    @Provides
-    @Singleton
-    fun provideLocalFileDataSource(): LocalFileDataSource {
-        return LocalFileDataSourceImpl()
     }
 }

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,40 +51,11 @@ 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)
 
         binding = ActivityKitScanBinding.inflate(layoutInflater)
-        sharedPreference = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        sharedPreference = this.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         setContentView(binding.root)
 
         if (DataHolder.sampleReadCounter <= Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE && DataHolder.isReferenceTaken) {
@@ -119,6 +77,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 //            }
 //        }
 
+
         try {
             if (checkHemoCubeKitData()) {
                 DataHolder.selectedTest!!.kitSerial =
@@ -151,10 +110,10 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         setSupportActionBar(binding.toolbar)
 
         binding.btnScanNow.setOnClickListener {
-//            startScanningNow()
+            startScanningNow()
-            pullTrigger()
         }
 
+
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
             if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
@@ -205,72 +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,"Scanner Is not available In this device", 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.*
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
 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.*
-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.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
@@ -111,19 +104,14 @@ class MainActivity : AppCompatActivity() {
         val deviceType = when {
             availableDrivers.isNotEmpty() -> {
                 val device = availableDrivers[0].device
-                Toast.makeText(
-                    this,
-                    "Connected, productId: ${device.productId}, vendorId: ${device.vendorId}",
-                    Toast.LENGTH_SHORT
-                ).show()
                 when {
                     device.productId == Constants.HOMO_CUBE_ID && device.vendorId == Constants.VENDOR_ID -> {
                         binding.cvItem1.visibility = View.VISIBLE
                         binding.cvItem3.visibility = View.VISIBLE
                         binding.cvItem2.visibility = View.GONE
                         binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
+                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
+                        Constants.DEVICE_TYPE_HOMOCUBE
                     }
 
                     device.productId == Constants.HEMO_CUBE_V2_PRODUCT_ID && device.vendorId == Constants.HEMO_CUBE_V2_VENDOR_ID -> {
@@ -131,35 +119,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)
+                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
+                        Constants.DEVICE_TYPE_HOMOCUBE
-                    }
-
-                    device.productId == 24577 && device.vendorId == 1027 -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_TRUEHEME)
-                        Constants.DEVICE_TYPE_TRUEHEME
-                    }
-
-                    device.productId == 8963 && device.vendorId == 1659 -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
-                    }
-
-                    device.productId == 4614 && device.vendorId == 7111 -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
-                        Constants.DEVICE_TYPE_HEMOCUBE
                     }
 
                     device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> {
@@ -298,6 +259,7 @@ class MainActivity : AppCompatActivity() {
 //            exception.printStackTrace()
 //        }
 
+
         fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
             location?.let {
                 if (DataHolder.selectedTest != null) {
@@ -321,6 +283,9 @@ class MainActivity : AppCompatActivity() {
             val rootView = findViewById<View>(android.R.id.content)
             Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
         }
+
+
+
     }
 
     private fun requestLocationUpdates() {
@@ -352,7 +317,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onRequestPermissionsResult(
-        requestCode: Int, permissions: Array<String>, grantResults: IntArray,
+        requestCode: Int, permissions: Array<String>, grantResults: IntArray
     ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         when (requestCode) {

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

@@ -1,213 +0,0 @@
-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
-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) {
-
-    val TAG = "Nats Service"
-    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 {
-
-            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?.subscribe("device.hpos.${deviceId}.ping")
-
-                    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.${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.${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.${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}")
-                }
-
-            } catch (exp: Exception) {
-                println(exp.printStackTrace())
-                connect = false
-                datacollector.setConnect(false)
-            }
-        }.start()
-
-    }
-
-    fun pub(topic: String, msg: String) {
-        nc?.publish(topic, msg.toByteArray(StandardCharsets.UTF_8))
-        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/SplashActivity.kt

@@ -1,5 +1,6 @@
 package com.example.hpostesting.presentation
 
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.Manifest
 import android.content.Context
 import android.content.Intent
@@ -15,7 +16,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.util.MyUtils
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivitySplashBinding
@@ -53,10 +53,7 @@ class SplashActivity : AppCompatActivity() {
 
     private fun setupStaticConstants() {
         DataHolder.mobileUniqueId =
-            Settings.Secure.getString(
+            Settings.Secure.getString(applicationContext.contentResolver, Settings.Secure.ANDROID_ID)
-                applicationContext.contentResolver,
-                Settings.Secure.ANDROID_ID
-            )
     }
 
 //    private fun setupFirestoreCache() {
@@ -101,10 +98,7 @@ class SplashActivity : AppCompatActivity() {
     private fun requestPermissionsBelowAndroidR() {
         val permissionsToRequest = requiredPermissions
             .filterNot { permission ->
-                ContextCompat.checkSelfPermission(
+                ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
-                    this,
-                    permission
-                ) == PackageManager.PERMISSION_GRANTED
             }
             .toTypedArray()
 
@@ -120,18 +114,9 @@ class SplashActivity : AppCompatActivity() {
         val coarseLocationPermission = Manifest.permission.ACCESS_COARSE_LOCATION
         val cameraPermission = Manifest.permission.CAMERA
         val locationPermissionsGranted =
-            ContextCompat.checkSelfPermission(
+            ContextCompat.checkSelfPermission(this, fineLocationPermission) == PackageManager.PERMISSION_GRANTED &&
-                this,
+                    ContextCompat.checkSelfPermission(this, coarseLocationPermission) == PackageManager.PERMISSION_GRANTED
-                fineLocationPermission
+        val cameraPermissionGranted = ContextCompat.checkSelfPermission(this, cameraPermission) == PackageManager.PERMISSION_GRANTED
-            ) == PackageManager.PERMISSION_GRANTED &&
-                    ContextCompat.checkSelfPermission(
-                        this,
-                        coarseLocationPermission
-                    ) == PackageManager.PERMISSION_GRANTED
-        val cameraPermissionGranted = ContextCompat.checkSelfPermission(
-            this,
-            cameraPermission
-        ) == PackageManager.PERMISSION_GRANTED
 
         if (locationPermissionsGranted && cameraPermissionGranted) {
             handlePermissionsResult(true)

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

@@ -1,6 +1,6 @@
 package com.example.hpostesting.presentation
 
 interface UsbServiceListener {
-    fun onUsbRead(data: ByteArray?)
+        fun onUsbRead(data: ByteArray?)
-    fun onUsbError(e: Exception?)
+        fun onUsbError(e: Exception?)
 }

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

@@ -1,8 +1,6 @@
 package com.example.hpostesting.presentation.adapter
 
-import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.Resources
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,27 +15,28 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.OfflineUserListViewBinding
+import org.apache.commons.collections4.MapUtils.getString
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 
+
 class OfflineUserListAdapter(private val view: View, private val batLevel: Int) :
     RecyclerView.Adapter<OfflineUserListAdapter.OfflineUserListViewHolder>() {
 
     inner class OfflineUserListViewHolder(val binding: OfflineUserListViewBinding) :
-        RecyclerView.ViewHolder(binding.root) {
+        RecyclerView.ViewHolder(binding.root)
-    }
 
     private val differCallback = object : DiffUtil.ItemCallback<HemoCubeTestData>() {
         override fun areItemsTheSame(
-            oldItem: HemoCubeTestData, newItem: HemoCubeTestData,
+            oldItem: HemoCubeTestData, newItem: HemoCubeTestData
         ): Boolean {
             return oldItem._id == newItem._id
         }
 
         override fun areContentsTheSame(
-            oldItem: HemoCubeTestData, newItem: HemoCubeTestData,
+            oldItem: HemoCubeTestData, newItem: HemoCubeTestData
         ): Boolean {
             return oldItem == newItem
         }
@@ -55,32 +54,17 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
         return differ.currentList.size
     }
 
-    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: OfflineUserListViewHolder, position: Int) {
         val userList = differ.currentList[position]
         holder.binding.apply {
             userID.text = "User ID: ${userList._id}"
             bloodGroup.text = "Blood group: ${userList.bloodGroup}"
-            time.text = "Time: ${isBetween15And30Minutes(userList.incubationTime)} \n Started at: ${
+            time.text = "Time: ${userList.incubationTime}"
-                SimpleDateFormat("HH:mm:ss").format(
-                    SimpleDateFormat(
-                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                    ).parse(userList.incubationTime)!!
-                )
-            }"
-
-            if (userList.testStatus!!) {
-                teststatus.text = view.context.getString(R.string.test_concluded)
-
-            } else {
-                teststatus.text = view.context.getString(R.string.test_pending)
-            }
-
             userCard.setOnClickListener {
-                if (false) {
+                if (batLevel < 40) {
                     Toast.makeText(
                         view.context,
-                        view.context.getString(R.string.low_battery_warning),
+                        context?.getString(R.string.low_battery_warning),
                         Toast.LENGTH_SHORT
                     ).show()
                     return@setOnClickListener
@@ -89,7 +73,7 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
                     if (userList.testStatus!!) {
                         Toast.makeText(
                             view.context,
-                            view.context.getString(R.string.test_already_conducted),
+                            context?.getString(R.string.test_already_conducted),
                             Toast.LENGTH_SHORT
                         ).show()
                     } else {
@@ -97,36 +81,34 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
                             if (isBetween15And30Minutes(userList.incubationTime) < Constants.INCUBATION_TIME_MIN) {
                                 Toast.makeText(
                                     view.context,
-                                    view.context.getString(R.string.incubation_not_completed),
+                                    context?.getString(R.string.incubation_not_completed),
                                     Toast.LENGTH_SHORT
                                 ).show()
-                            } else
+                            } else if (isBetween15And30Minutes(userList.incubationTime) > Constants.INCUBATION_TIME_MAX) {
-                                if (isBetween15And30Minutes(userList.incubationTime) > Constants.INCUBATION_TIME_MAX) {
+                                Toast.makeText(
-                                    Toast.makeText(
+                                    view.context,
-                                        view.context,
+                                    context?.getString(R.string.incubation_crossed_30_minutes),
-                                        view.context.getString(R.string.incubation_crossed_30_minutes),
+                                    Toast.LENGTH_SHORT
-                                        Toast.LENGTH_SHORT
+                                ).show()
-                                    ).show()
+                            } else {
-                                } else {
+                                DataHolder.selectedTest = UserData(
-                                    DataHolder.selectedTest = UserData(
+                                    _id = userList._id,
-                                        _id = userList._id,
+                                    bloodGroup = userList.bloodGroup,
-                                        bloodGroup = userList.bloodGroup,
+                                    incubationTime = userList.incubationTime
-                                        incubationTime = userList.incubationTime
+                                )
-                                    )
+                                view.findNavController()
-                                    view.findNavController()
+                                    .navigate(R.id.action_nav_home_to_mainActivity)
-                                        .navigate(R.id.action_nav_home_to_mainActivity)
+                            }
-                                }
                         } else {
                             Toast.makeText(
                                 view.context,
-                                view.context.getString(R.string.incubation_not_started),
+                                context?.getString(R.string.incubation_not_started),
                                 Toast.LENGTH_SHORT
                             ).show()
                         }
                     }
                 }
             }
-
         }
     }
 
@@ -140,20 +122,4 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
 
         return diffMillis / (60 * 1000)
     }
-
-    private fun showWarningToast(resId: Int) {
-        val contextToUse = view.context ?: return
-
-        val message = try {
-            contextToUse.getString(resId)
-        } catch (e: Resources.NotFoundException) {
-            "Resource not found for ID: $resId"
-        }
-
-        Toast.makeText(
-            contextToUse,
-            message,
-            Toast.LENGTH_SHORT
-        ).show()
-    }
 }

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

@@ -4,28 +4,31 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Context
 import android.content.Context.INPUT_METHOD_SERVICE
+import android.view.inputmethod.InputMethodManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
-import android.widget.AutoCompleteTextView
 import android.widget.Toast
-import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
-import com.google.firebase.firestore.FirebaseFirestore
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.UserItemViewBinding
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
+import android.widget.AutoCompleteTextView
+import androidx.core.content.ContextCompat.getSystemService
+import androidx.core.content.getSystemService
+import androidx.fragment.app.FragmentActivity
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.google.firebase.firestore.FirebaseFirestore
 
 class UserListAdapter(
 
@@ -34,7 +37,7 @@ class UserListAdapter(
     options: FirestoreRecyclerOptions<UserData>,
     private val view: View,
     private val batLevel: Int,
-    private val requireActivity: FragmentActivity,
+    private val requireActivity: FragmentActivity
 ) : FirestoreRecyclerAdapter<UserData, UserListAdapter.OrderItemViewHolder>(options) {
 
     class OrderItemViewHolder(val binding: UserItemViewBinding) :
@@ -94,21 +97,16 @@ class UserListAdapter(
                     .setView(dialogView)
                     .setTitle(R.string.blood_group)
 
-                val etBloodGroup =
+                val etBloodGroup = dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
-                    dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
 
                 builder.setPositiveButton(R.string.ok) { dialog, which ->
                     val bloodGroup = etBloodGroup.text.toString()
-                    if (bloodGroup.equals("Select Blood Group") || bloodGroup.equals("ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ") || bloodGroup.isNullOrBlank()) {
+                    if (bloodGroup.equals("Select Blood Group") ||bloodGroup.equals("ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ") || bloodGroup.isNullOrBlank()) {
                         if (view != null) {
-                            etBloodGroup.error = view.context.getString(R.string.blood_group_error)
+                            etBloodGroup.error =view.context.getString(R.string.blood_group_error)
                         }
                         if (view != null) {
-                            Toast.makeText(
+                            Toast.makeText(context, view.context.getString(R.string.blood_group_toast), Toast.LENGTH_SHORT).show()
-                                context,
-                                view.context.getString(R.string.blood_group_toast),
-                                Toast.LENGTH_SHORT
-                            ).show()
                         }
                     } else {
                         // Check if hemoCubeViewModel and testDetails are not null
@@ -122,8 +120,7 @@ class UserListAdapter(
                                     val document = userdata.documents[0]
                                     db.collection("patientData")
                                         .document(document.id)
-                                        .update(
+                                        .update("bloodGroup", bloodGroup,
-                                            "bloodGroup", bloodGroup,
                                             "incubationTime", SimpleDateFormat(
                                                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                                             ).format(Calendar.getInstance().time).toString()
@@ -200,7 +197,7 @@ class UserListAdapter(
 //                    }
             }
             userCard.setOnClickListener {
-                if (false) {
+                if (batLevel < Constants.BATTERY_LEVEL_MIN) {
                     Toast.makeText(
                         view.context,
                         context?.getString(R.string.low_battery_warning),
@@ -217,13 +214,13 @@ class UserListAdapter(
                         ).show()
                     } else {
                         if (model.incubationTime != "") {
-                            if (isBetween15And30Minutes(model.incubationTime) < -15000) {
+                            if (isBetween15And30Minutes(model.incubationTime) < 15) {
                                 Toast.makeText(
                                     view.context,
                                     context?.getString(R.string.incubation_not_completed),
                                     Toast.LENGTH_SHORT
                                 ).show()
-                            } else if (isBetween15And30Minutes(model.incubationTime) > 300000) {
+                            } else if (isBetween15And30Minutes(model.incubationTime) > 30) {
                                 Toast.makeText(
                                     view.context,
                                     context?.getString(R.string.incubation_crossed_30_minutes),
@@ -247,6 +244,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/AssuranceControlsActivity.kt

@@ -1,28 +0,0 @@
-package com.example.hpostesting.presentation.assurance
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import dagger.hilt.android.AndroidEntryPoint
-import `in`.sminnovations.hpostesting.databinding.ActivityAssuranceControlsBinding
-
-@AndroidEntryPoint
-class AssuranceControlsActivity : AppCompatActivity() {
-    lateinit var binding: ActivityAssuranceControlsBinding
-    lateinit var sharedPreference: SharedPreferences
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = ActivityAssuranceControlsBinding.inflate(layoutInflater)
-        sharedPreference = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-        setContentView(binding.root)
-
-        if (savedInstanceState == null) {
-            supportFragmentManager.beginTransaction()
-                .replace(binding.fgAssuranceControls.id, AssuranceControlsFragment())
-                .commit()
-        }
-    }
-}

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

@@ -1,198 +0,0 @@
-package com.example.hpostesting.presentation.assurance
-
-import android.R
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.Spinner
-import android.widget.Toast
-import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
-import `in`.sminnovations.hpostesting.databinding.FragmentAssuranceControlsBinding
-import java.time.Instant
-
-class AssuranceControlsFragment : Fragment() {
-    lateinit var binding: FragmentAssuranceControlsBinding
-    private lateinit var sharedPreferences: SharedPreferences
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
-    ): View {
-        binding = FragmentAssuranceControlsBinding.inflate(inflater, container, false)
-        sharedPreferences =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
-        DataHolder.hemoCubeTestData!!.solution = ""
-        DataHolder.hemoCubeTestData!!.volume = ""
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initViews()
-    }
-
-    private fun initViews() {
-//        binding.btnSubmit.visibility = View.GONE
-
-        val solutionSpinner: Spinner = binding.spinnerSolutions
-        val solutionOptions = arrayOf("Select solution", "Tartrazine", "Acid Red")
-        val solutionAdapter =
-            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
-        solutionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        solutionSpinner.adapter = solutionAdapter
-        solutionSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long,
-            ) {
-                val selectedValue: String = solutionOptions[position]
-                if (!selectedValue.equals("Select solution")) {
-                    DataHolder.hemoCubeTestData!!.solution = selectedValue
-                }
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-            }
-        }
-
-        val concentrationSpinner: Spinner = binding.spinnerConcentration
-        val concentrationOptions = arrayOf(
-            "Select concentration",
-            "65umol",
-            "45umol",
-            "22.5umol",
-            "12.25umol",
-            "6.125umol",
-            "75umol",
-            "50umol",
-            "25umol",
-            "12.5umol",
-            "6.25umol"
-        )
-        val concentrationAdapter =
-            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, concentrationOptions)
-        concentrationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        concentrationSpinner.adapter = concentrationAdapter
-        concentrationSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long,
-            ) {
-                val selectedValue: String = concentrationOptions[position]
-                if (!selectedValue.equals("Select concentration")) {
-                    DataHolder.hemoCubeTestData!!.concentration = selectedValue
-                }
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-            }
-        }
-
-        val volumeSpinner: Spinner = binding.spinnerVolume
-        val volumeOptions = arrayOf("Select volume", "1uml", "2uml", "4uml", "4.5uml", "5uml")
-        val volumeAdapter =
-            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, volumeOptions)
-        volumeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        volumeSpinner.adapter = volumeAdapter
-        volumeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long,
-            ) {
-                val selectedValue: String = volumeOptions[position]
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-            }
-        }
-
-        // load saved values
-        val savedSolution =
-            sharedPreferences.getString(Constants.QUICK_CAPTURE_SOLUTION, "").toString()
-        val solutionPosition = getPositionOfValue(savedSolution, solutionOptions.toList())
-        solutionSpinner.setSelection(solutionPosition)
-
-        val savedConcentration =
-            sharedPreferences.getString(Constants.QUICK_CAPTURE_CONCENTRATION, "").toString()
-        val concentrationPosition =
-            getPositionOfValue(savedConcentration, concentrationOptions.toList())
-        concentrationSpinner.setSelection(concentrationPosition)
-
-        val savedVolume = sharedPreferences.getString(Constants.QUICK_CAPTURE_VOLUME, "").toString()
-        val volumePosition = getPositionOfValue(savedVolume, volumeOptions.toList())
-        volumeSpinner.setSelection(volumePosition)
-
-        binding.btnSubmit.setOnClickListener {
-            val selectedSolution = binding.spinnerSolutions.selectedItem.toString()
-            val selectedConcentration = binding.spinnerConcentration.selectedItem.toString()
-
-            // Check if any of the selections are default values
-            if (selectedSolution == "Select solution") {
-                Toast.makeText(requireContext(), "Please select a solution", Toast.LENGTH_LONG).show()
-                return@setOnClickListener // Prevent further execution
-            }
-
-            if (selectedConcentration == "Select concentration") {
-                Toast.makeText(requireContext(), "Please select a concentration", Toast.LENGTH_LONG).show()
-                return@setOnClickListener // Prevent further execution
-            }
-            DataHolder.hemoCubeTestData!!.quickCapture = true
-            val currentUnixTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                Instant.now().epochSecond
-            } else {
-                ""
-            }
-            DataHolder.hemoCubeTestData!!._id = currentUnixTime.toString() + "SMI"
-            DataHolder.hemoCubeTestData!!.solution = binding.spinnerSolutions.selectedItem.toString()
-            DataHolder.hemoCubeTestData!!.name = binding.spinnerConcentration.selectedItem.toString()
-                "${DataHolder.hemoCubeTestData!!.solution} ${DataHolder.hemoCubeTestData!!.concentration} ${DataHolder.hemoCubeTestData!!.volume}"
-
-            DataHolder.selectedTest = UserData()
-            DataHolder.selectedTest?._id = DataHolder.hemoCubeTestData!!._id
-            DataHolder.selectedTest?.name = DataHolder.hemoCubeTestData!!.name
-
-            with(sharedPreferences.edit()) {
-                putString(Constants.QUICK_CAPTURE_SOLUTION, DataHolder.hemoCubeTestData!!.solution)
-                putString(
-                    Constants.QUICK_CAPTURE_CONCENTRATION,
-                    DataHolder.hemoCubeTestData!!.concentration
-                )
-                putString(Constants.QUICK_CAPTURE_VOLUME, DataHolder.hemoCubeTestData!!.volume)
-                apply()
-            }
-
-            val i = Intent(requireContext(), HemocubeActivity::class.java)
-            startActivity(i)
-        }
-    }
-
-    fun <T> getPositionOfValue(value: T, data: List<T>?): Int {
-        data?.let {
-            for (i in it.indices) {
-                if (it[i] == value) {
-                    return i
-                }
-            }
-        }
-
-        return 0
-    }
-}

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

@@ -1,6 +0,0 @@
-package com.example.hpostesting.presentation.assurance
-
-import androidx.lifecycle.ViewModel
-
-class AssuranceControlsViewModel : ViewModel() {
-}

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

@@ -1,180 +0,0 @@
-package com.example.hpostesting.presentation.autodac
-
-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.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.ActivityAutoDacBinding
-
-@AndroidEntryPoint
-class AutoDacActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityAutoDacBinding
-    val viewModel: AutoDacViewModel by viewModels()
-    private var myMenu: Menu? = null
-
-    private lateinit var mDriver: UsbSerialDriver
-    private var mConnection: UsbDeviceConnection? = null
-    lateinit var mService: UsbService
-
-    private val TAG = "HemoCube"
-
-    private val broadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-
-            synchronized(this) {
-                val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
-
-                if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
-                    device?.apply {
-                        connectUsb(true)
-                        DataHolder.usbConnected.postValue(true)
-                    }
-                } else {
-                    onErrorReported("permission denied for device")
-                    DataHolder.usbConnected.postValue(true)
-                }
-            }
-        }
-    }
-
-    private val connection = object : ServiceConnection {
-        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            val binder = service as UsbService.UsbServiceBinder
-            mService = binder.getService()
-            viewModel.isServiceConnected = true
-            mConnection.let { mService.connect(mDriver, mConnection!!) }
-            moveToNext()
-        }
-
-        override fun onServiceDisconnected(arg0: ComponentName) {
-            viewModel.isServiceConnected = false
-        }
-    }
-
-    override fun attachBaseContext(newBase: Context?) {
-        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
-        LanguageManager.setLocale(newBase, languageCode)
-        super.attachBaseContext(newBase)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityAutoDacBinding.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()
-            }
-        }
-    }
-
-    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.fgAutoDac.id, AutoDacFragment())
-            .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/autodac/AutoDacFragment.kt

@@ -1,239 +0,0 @@
-package com.example.hpostesting.presentation.autodac
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.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() {
-
-    private lateinit var binding: FragmentAutoDacBinding
-    private val autoDacViewModel: AutoDacViewModel by activityViewModels()
-    private lateinit var sharedPreferences: SharedPreferences
-    private var currentDeviceData: DeviceData? = null
-    private var resultData: String = ""
-    private val messages = MutableLiveData<String>()
-    private var startListening = MutableLiveData(false)
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
-    ): View {
-        binding = FragmentAutoDacBinding.inflate(inflater, container, false)
-        sharedPreferences =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initViews()
-        observeViewModel()
-    }
-
-    private fun initViews() {
-        binding.btnSubmit.visibility = View.GONE
-        listenToHemoCube()
-        getDeviceId()
-        binding.btnSubmit.setOnClickListener {
-            binding.btnSubmit.visibility = View.GONE
-            runAutoDacCommand()
-        }
-        binding.btnReadDac.setOnClickListener {
-            binding.btnReadDac.visibility = View.GONE
-            readCurrentDACValuesCommand()
-        }
-    }
-
-    private fun observeViewModel() {
-
-        autoDacViewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-        }
-
-        messages.observe(viewLifecycleOwner) {
-            binding.tvSubtitle4.text = it
-        }
-
-        autoDacViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                showToast("Auto Dac data uploaded successfully")
-            }
-            if (result == "Local") {
-                showToast("Auto Dac uploading failed, note it down manually")
-            }
-
-            binding.progressBar.visibility = View.GONE
-        }
-    }
-
-    private fun getDeviceId() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        autoDacViewModel.messages.postValue(stringData)
-                        binding.tvSubtitle4.text = stringData
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun runAutoDacCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.AUTO_DAC_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun setAutoDacValuesCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.SET_AUTO_DAC_TO_EPROM_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun readCurrentDACValuesCommand() {
-        autoDacViewModel.progressBar.postValue(true)
-        (activity as AutoDacActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.READ_DAC_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun listenToHemoCube() {
-
-        val fullReadOutput = StringBuilder()
-        startListening.postValue(true)
-
-        try {
-            (activity as AutoDacActivity).mService.listenToHemoCube(object :
-                UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        autoDacViewModel.messages.postValue(stringData)
-                        fullReadOutput.append(stringData)
-                        resultData += stringData
-                        binding.tvSubtitle4.text = resultData
-                        if (stringData.contains("SN")) {
-                            val slData = stringData.split(" ")
-                            if (slData.size > 1) {
-                                val hardwareId = slData[1].trim()
-                                with(sharedPreferences.edit()) {
-                                    putString(Constants.DEVICE_ID, hardwareId)
-                                    apply()
-                                }
-                            }
-                            activity?.runOnUiThread {
-                                binding.btnSubmit.visibility = View.VISIBLE
-                            }
-                        }
-                    }
-
-                    if (resultData.contains("#CC")) {
-                        setAutoDacValuesCommand()
-
-                        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("#WC")) {
-                        showToast("DAC Values saved to EPROM")
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    autoDacViewModel.progressBar.postValue(false)
-                }
-            })
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-
-    fun parseData(inputData: List<String>): List<Pair<String, String>> {
-        val pattern = Regex("([A-Z]+)\\s(\\d+)")
-        val parsedData = mutableListOf<Pair<String, String>>()
-
-        for (item in inputData) {
-            val matchResult = pattern.find(item)
-            if (matchResult != null) {
-                val (letters, numbers) = matchResult.destructured
-                parsedData.add(Pair(letters, numbers))
-            }
-        }
-
-        return parsedData
-    }
-
-    private fun showToast(message: String) {
-        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.example.hpostesting.presentation.autodac
-
-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.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 AutoDacViewModel @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 addAutoDacDataToDb(data: DiagnosticsData) {
-        viewModelScope.launch {
-            try {
-                when (val response = repository.addDiagnostics(data)) {
-                    is Response.Success -> {
-                        fireBaseUpload.postValue("Success")
-                    }
-
-                    is Response.Error -> {
-                        fireBaseUpload.postValue("Error")
-                    }
-                }
-            } catch (e: Exception) {
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
-}

app/src/main/java/com/example/hpostesting/presentation/blank/BlankActivity.kt

@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankActivity {
-}

app/src/main/java/com/example/hpostesting/presentation/blank/BlankFragment.kt

@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankFragment {
-}

app/src/main/java/com/example/hpostesting/presentation/blank/BlankViewModel.kt

@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankViewModel {
-}

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

@@ -7,26 +7,30 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
+import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
+import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+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 `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
+import kotlin.math.log10
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
-import java.util.UUID
-import kotlin.math.log10
 
 class HemoCubeBufferCheckFragment : Fragment() {
 
@@ -37,30 +41,15 @@ class HemoCubeBufferCheckFragment : Fragment() {
     private var resultData: String = ""
     private var kitno: String = ""
     private var isOnline = false
+    private val messages = MutableLiveData<String>()
     private var isTestOngoing = false
     private var startListening = MutableLiveData(false)
-    private var led1BufferForDevice = 0.0
-    private var led2BufferForDevice = 0.0
-    private var led3BufferForDevice = 0.0
-    private var led4BufferForDevice = 0.0
-    private var led1SampleForDevice = 0.0
-    private var led2SampleForDevice = 0.0
-    private var led3SampleForDevice = 0.0
-    private var led4SampleForDevice = 0.0
-    private var fittedAbs1 = 0.0
-    private var fittedAbs2 = 0.0
-    private var fittedAbs3 = 0.0
-    private var fittedAbs4 = 0.0
-    private var _predictedDenovixRatio = 0.0
-    private var validationError = false
-    private var allErrorMessages = ""
-    private var deviceHardwareId = ""
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
     ): View {
         binding = FragmentHemoCubeReferenceBinding.inflate(inflater, container, false)
         sharedPreferences =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         return binding.root
     }
 
@@ -75,14 +64,13 @@ class HemoCubeBufferCheckFragment : Fragment() {
         binding.nameEditText.setText("SMI/SC/")
         binding.tvTitle.visibility = View.GONE
         binding.tvName.visibility = View.GONE
-        binding.btnPlacebuffer.visibility = View.GONE
 
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
             if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
                 kitno = serialNumber
                 listenToHemoCube()
-                getDeviceInfo()
+                startBufferProcess()
             } else {
                 Toast.makeText(context, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
                 return@setOnClickListener
@@ -96,17 +84,17 @@ class HemoCubeBufferCheckFragment : Fragment() {
             }
         }
 
-        binding.btnSamplestart.setOnClickListener {
+
-            startSampleProcess()
+
-            it.visibility = View.GONE
+        activity?.runOnUiThread {
+            binding.btnSubmit.isEnabled = true
+            binding.btnSubmit.isClickable = true
+        }
+        binding.btnSubmit.setOnClickListener {
+
         }
         binding.btnSubmit.isEnabled = false
         binding.btnSubmit.isClickable = false
-
-        binding.btnPlacebuffer.setOnClickListener {
-            checkAndStartProcess()
-            it.visibility = View.GONE
-        }
     }
 
     private fun observeViewModel() {
@@ -128,10 +116,6 @@ class HemoCubeBufferCheckFragment : Fragment() {
             if (result == "Success") {
                 showToast(R.string.kit_uploaded)
             }
-            if (result == "Error") {
-                showToast("Error uploading data, Kit result stored locally")
-                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
-            }
             if (result == "Local") {
                 showToast(R.string.kit_upload_failed)
             }
@@ -139,28 +123,27 @@ class HemoCubeBufferCheckFragment : Fragment() {
             binding.progressBar.visibility = View.GONE
         }
 
-        hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
+        messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
         }
-
-        hemoCubeViewModel.deviceMessages.observe(viewLifecycleOwner) {
-            binding.tvDeviceMessages.text = it
-        }
-    }
-
-    private fun checkAndStartProcess() {
-        startBufferProcess()
     }
 
     private fun listenToHemoCube() {
+        if (DataHolder.hemoCubeTestData == null) {
+            DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData()
+        }
+
+        val fullReadOutput = StringBuilder()
         startListening.postValue(true)
+
         try {
             (activity as HemocubeBufferCheckActivity).mService.listenToHemoCube(object :
                 UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val stringData = String(it)
-                        handleUsbData(stringData)
+                        fullReadOutput.append(stringData)
+                        handleUsbData(stringData, fullReadOutput)
                     }
                 }
 
@@ -173,214 +156,97 @@ class HemoCubeBufferCheckFragment : Fragment() {
         }
     }
 
-    private fun handleUsbData(stringData: String) {
+    private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
         if (stringData.contains("#")) {
+            messages.postValue(stringData)
             isTestOngoing = true
         }
 
-        resultData += stringData
+        resultData += fullReadOutput.toString()
-        hemoCubeViewModel.deviceMessages.postValue(resultData)
 
         when {
-            stringData.contains("SN") -> {
+            stringData.contains("#Buffer Completed") -> showStartSampleDialog()
-                val slData = stringData.split(" ")
+            stringData.contains("#Sample Completed") -> {
-                if (slData.size > 1) {
+                activity?.runOnUiThread {
-                    val hardwareId = slData[1].trim()
+                    binding.btnSubmit.isEnabled = true
-                    deviceHardwareId = hardwareId
+                    binding.btnSubmit.isClickable = true
-                    with(sharedPreferences.edit()) {
+                }
-                        putString(Constants.DEVICE_ID, hardwareId)
+                fetchResult()
-                        apply()
+            }
+
+            stringData.contains("RESULT") || resultData.contains("REND") -> {
+                var validString: String
+                val results: List<String>
+                if (stringData.contains("RESULT")) {
+                    validString = isValidResult(stringData)
+                    if (validString.isEmpty()) {
+                        results = resultData.split("\n")
+                        validString = parseResult(results)
                     }
+                } else {
+                    results = resultData.split("\n")
+                    validString = parseResult(results)
                 }
-                activity?.runOnUiThread {
+                if (validString.isNotEmpty()) {
-                    binding.tvSubtitle4.visibility = View.VISIBLE
+                    handleValidResult(validString)
-                    binding.btnPlacebuffer.visibility = View.VISIBLE
                 }
-                hemoCubeViewModel.messages.postValue("Start")
-            }
-
-            stringData.contains("#BS") -> {
-                hemoCubeViewModel.messages.postValue("Buffer Started")
-            }
-
-            stringData.contains("#BC") -> {
-                activity?.runOnUiThread {
-                    binding.tvSubtitle4.text = "Buffer Completed"
-//                    binding.btnSamplestart.visibility = View.VISIBLE
-                }
-                fetchResult()
-            }
-
-            stringData.contains("#SS") -> {
-                activity?.runOnUiThread {
-                    binding.tvSubtitle4.text = "Sample Started"
-                    binding.btnSamplestart.visibility = View.GONE
-                }
-            }
-
-            stringData.contains("#SC") -> {
-                hemoCubeViewModel.messages.postValue("Sample Completed \nGathering data")
-                fetchResult()
-            }
-
-            resultData.contains("REND") -> {
-//                hemoCubeViewModel.messages.postValue(
-//                    "Data collected \n" + " Processing data"
-//                )
-                val resultLines = resultData.split("\\s+(?=LB|LS)".toRegex())
-                var bufferIntensity = resultLines[1].split(' ')[1].trim()
-                led1BufferForDevice = bufferIntensity.toDoubleOrNull()!!
-                bufferIntensity = resultLines[2].split(' ')[1].trim()
-                led2BufferForDevice = bufferIntensity.toDoubleOrNull()!!
-                bufferIntensity = resultLines[3].split(' ')[1].trim()
-                led3BufferForDevice = bufferIntensity.toDoubleOrNull()!!
-                bufferIntensity = resultLines[4].split(' ')[1].trim()
-                led4BufferForDevice = bufferIntensity.toDoubleOrNull()!!
-                led1SampleForDevice = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
-                led2SampleForDevice = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
-                led3SampleForDevice = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-                led4SampleForDevice =
-                    resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
-                processResult()
             }
         }
     }
 
-    private fun processResult() {
+    private fun showStartSampleDialog() {
+        activity?.runOnUiThread {
+            UIUtils.createAlertDialog(requireContext(),
+                "Start Sample",
+                "Do you want to start sample reading?",
+                getString(R.string.no),
+                "Yes",
+                object : MyDialogListener {
+                    override fun onClickNegativeButton() {}
+
+                    override fun onClickPositiveButton() {
+                        listenToHemoCube()
+                        startSampleProcess()
+                    }
+                })
+        }
+    }
+
+    private fun handleValidResult(validString: String) {
         try {
-//            hemoCubeViewModel.messages.postValue("processing result")
+            val result = validString.split(" ")
-            val deviceLog = resultData
+            if (result.size == 8) {
-
+                val deviceId = result[2]
-            val pInfo = requireActivity().packageManager.getPackageInfo(
+                val led1BufferForDevice = result[3].toDoubleOrNull()
-                requireActivity().packageName, 0
+                val led2BufferForDevice = result[4].toDoubleOrNull()
-            )
+                val led1Sample = result[5].toDoubleOrNull()
-            val version = pInfo.versionName
+                val led2Sample = result[6].toDoubleOrNull()
-
+                val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0)
-            val led1Average = log10(led1BufferForDevice.div(led1SampleForDevice))
+                val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0)
-            val led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
+                val deviceRatio = led1Average / led2Average
-            val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
+                val calculateRatio = calculateRatio(deviceRatio)
-            val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
+                val classificationResult = findResult(calculateRatio)
-            val deviceRatio = led3Average / led1Average
+                messages.postValue(classificationResult)
-
+                val bufferData = BufferCheckData(
-            if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
+                    deviceId= deviceId,
-                    ?.get(0)!! || led2BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
+                    kitno = kitno,
-                    1
+                    led1Buffer = led1BufferForDevice,
+                    led2Buffer = led2BufferForDevice,
+                    led1Average = led1Average,
+                    led2Average = led2Average,
+                    led1Sample = led1Sample,
+                    led2Sample = led2Sample,
+                    deviceRatio = deviceRatio,
+                    calculatedRatio = calculateRatio,
+                    coefficients = currentDeviceData?.coefficients?.get(0).toString() + ", " + currentDeviceData?.coefficients?.get(1).toString(),
+                    classificationResult = classificationResult,
+                    deviceSerialNumber = sharedPreferences.getString(Constants.USER_ID, "").toString(),
+                    testTime = SimpleDateFormat(
+                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                    ).format(Calendar.getInstance().time)
                 )
-                    ?.get(0)!! || led3BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
+                hemoCubeViewModel.uploadHemoCubeResultToDatabaseforbuffercheckN(bufferData)
-                    2
-                )
-                    ?.get(0)!! || led4BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    3
-                )?.get(0)!!
-            ) {
-                validationError = true
-                allErrorMessages += "Error: Invalid Test. Improper buffer reading (low)"
-                activity?.runOnUiThread {
-                    binding.errorMessage.text =
-                        "Error: Invalid Test. Improper buffer reading (low)" + "\n"
-                    binding.errorMessage.visibility = View.VISIBLE
-                }
             }
-
-            if (led1BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
-                    ?.get(1)!! || led2BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    1
-                )
-                    ?.get(1)!! || led3BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    2
-                )
-                    ?.get(1)!! || led4BufferForDevice > Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    3
-                )?.get(1)!!
-            ) {
-                validationError = true
-                allErrorMessages += "Error: Invalid Test. Improper buffer reading (high)" + "\n"
-                activity?.runOnUiThread {
-                    binding.errorMessage.text =
-                        "Error: Invalid Test. Improper buffer reading (high)"
-                    binding.errorMessage.visibility = View.VISIBLE
-                }
-            }
-
-            var gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(0)?.get(0)
-            var constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(0)?.get(1)
-            fittedAbs1 = gradient?.times(led1Average)?.plus(constant!!)!!
-
-            gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(1)?.get(0)
-            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(1)?.get(1)
-            fittedAbs2 = gradient?.times(led2Average)?.plus(constant!!)!!
-
-            gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(2)?.get(0)
-            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(2)?.get(1)
-            fittedAbs3 = gradient?.times(led3Average)?.plus(constant!!)!!
-
-            gradient = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(3)?.get(0)
-            constant = Constants.DEVICE_CONFIGURATION[deviceHardwareId]?.get(3)?.get(1)
-            fittedAbs4 = gradient?.times(led4Average)?.plus(constant!!)!!
-
-            _predictedDenovixRatio = fittedAbs3.div(fittedAbs1)
-
-            if (fittedAbs1 <= fittedAbs2) {
-                validationError = true
-                allErrorMessages += "Error: Invalid Test. Problem with de-oxygenation" + "\n"
-                activity?.runOnUiThread {
-                    binding.errorMessage.text = "Error: Invalid Test. Problem with de-oxygenation"
-                    binding.errorMessage.visibility = View.VISIBLE
-                }
-            }
-
-            if (fittedAbs1 < 0 || fittedAbs2 < 0 || fittedAbs3 < 0 || fittedAbs4 < 0) {
-                validationError = true
-                activity?.runOnUiThread {
-                    binding.errorMessage.text = "Error: Negative Abs. Redo Kit check Reading"
-                    binding.errorMessage.visibility = View.VISIBLE
-                }
-            }
-
-            val prdClassification = absorbanceBasedClassification(_predictedDenovixRatio)
-            hemoCubeViewModel.messages.postValue(prdClassification)
-
-            val bufferData = BufferCheckData(
-                _id = UUID.randomUUID().toString(),
-                deviceId = deviceHardwareId,
-                kitno = kitno,
-                appVersion = version,
-                led1Buffer = led1BufferForDevice,
-                led2Buffer = led2BufferForDevice,
-                led3Buffer = led3BufferForDevice,
-                led4Buffer = led4BufferForDevice,
-                led1Sample = led1SampleForDevice,
-                led2Sample = led2SampleForDevice,
-                led3Sample = led3SampleForDevice,
-                led4Sample = led4SampleForDevice,
-                led1Average = led1Average,
-                led2Average = led2Average,
-                led3Average = led3Average,
-                led4Average = led4Average,
-                abs1 = fittedAbs1,
-                abs2 = fittedAbs2,
-                abs3 = fittedAbs3,
-                abs4 = fittedAbs4,
-                deviceRatio = deviceRatio,
-                resultData = deviceLog,
-                predictedDenovixRatio = _predictedDenovixRatio,
-                prdClassification = prdClassification,
-                errorMessages = allErrorMessages,
-                coefficients = currentDeviceData?.coefficients?.get(0)
-                    .toString() + ", " + currentDeviceData?.coefficients?.get(1).toString(),
-                deviceSerialNumber = sharedPreferences.getString(Constants.USER_ID, "").toString(),
-                testTime = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                ).format(Calendar.getInstance().time),
-                batteryLevel = hemoCubeViewModel.getBatteryLevel().toString(),
-                batteryCapacity = hemoCubeViewModel.getBatteryCapacity(requireContext()).toString(),
-                batteryMaxCapacity = hemoCubeViewModel.getBatteryMaxCapacity(requireContext())
-                    .toString(),
-                batteryTemperature = hemoCubeViewModel.getBatteryTemperature().toString(),
-                batteryVoltage = hemoCubeViewModel.getBatteryVoltage(requireContext()).toString()
-            )
-
-            hemoCubeViewModel.uploadHemoCubeResultToDatabaseForBufferCheck(isOnline, bufferData)
         } catch (e: Exception) {
             Toast.makeText(
                 requireContext(), "Error while processing device data", Toast.LENGTH_SHORT
@@ -391,48 +257,23 @@ class HemoCubeBufferCheckFragment : Fragment() {
 
     private fun findResult(calculatedRatio: Double?): String {
         try {
-            hemoCubeViewModel.messages.postValue("result classification")
             if (calculatedRatio != null) {
-                if (calculatedRatio < 0.05) return "Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume"
+                if (calculatedRatio < 0.085) return "Kit Failed"
-                if (calculatedRatio in 0.05..0.155) return "Normal"
+                if (calculatedRatio in 0.085..0.155) return "Kit Passed"
-                if (calculatedRatio in 0.155..0.175) return "Negative Borderline. Repeat Test"
+                if (calculatedRatio in 0.155..0.175) return "Kit Failed"
-                if (calculatedRatio in 0.175..0.22) return "Sickle Cell Trait"
+                if (calculatedRatio in 0.175..0.22) return "Kit Failed"
-                if (calculatedRatio in 0.22..0.25) return "Positive for Sickle Cell. HPLC for Confirmation"
+                if (calculatedRatio in 0.22..0.25) return "Kit Failed"
-                if (calculatedRatio in 0.25..0.35) return "Sickle Cell Disease"
+                if (calculatedRatio in 0.25..0.35) return "Kit Failed"
-                if (calculatedRatio > 0.35) return "Inconclusive. Repeat with test with lower volume of blood"
+                if (calculatedRatio > 0.35) return "Kit Failed"
             } else {
-                return "INVALID"
+                return "NULL"
             }
         } catch (e: Exception) {
             showToast(R.string.error_classification)
             Firebase.crashlytics.recordException(e)
             return "ERROR"
         }
-        return "INVALID"
+        return "NULL"
-    }
-
-    private fun absorbanceBasedClassification(predictedDenovixRatio: Double?): String {
-        try {
-            hemoCubeViewModel.messages.postValue("result classification")
-            if (predictedDenovixRatio != null) {
-                if (predictedDenovixRatio in 0.0..0.16) return "Kit Passed"
-                if (predictedDenovixRatio in 0.16..0.165) return "Kit Passed"
-                if (predictedDenovixRatio in 0.165..0.235) return "Kit Failed"
-                if (predictedDenovixRatio in 0.235..0.24) return "Kit Failed"
-                if (predictedDenovixRatio in 0.24..1.0) return "Kit Failed"
-            } else {
-                return "INVALID"
-            }
-        } catch (e: Exception) {
-            showToast("error while performing classification")
-            Firebase.crashlytics.recordException(e)
-            return "ERROR"
-        }
-        return "INVALID"
-    }
-
-    private fun showToast(message: String) {
-        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
     }
 
     private fun showToast(messageResId: Int) {
@@ -441,11 +282,8 @@ class HemoCubeBufferCheckFragment : Fragment() {
 
 
     private fun startBufferProcess() {
-        activity?.runOnUiThread {
-            binding.btnPlacebuffer.visibility = View.GONE
-        }
 
-        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_BUFFER_COMMAND,
+        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startBuffer,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
 
@@ -455,11 +293,8 @@ class HemoCubeBufferCheckFragment : Fragment() {
     }
 
     private fun startSampleProcess() {
-        activity?.runOnUiThread {
-            binding.btnPlacebuffer.visibility = View.GONE
-        }
 
-        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_SAMPLE,
+        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startSample,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
 
@@ -468,28 +303,9 @@ class HemoCubeBufferCheckFragment : Fragment() {
             })
     }
 
-    private fun getDeviceInfo() {
-        hemoCubeViewModel.progressBar.postValue(true)
-        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        hemoCubeViewModel.messages.postValue(stringData)
-                        binding.tvSubtitle4.text = stringData
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hemoCubeViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
     private fun fetchResult() {
 
-        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.PRINT_COMMAND,
+        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.getSample,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
 
@@ -504,6 +320,21 @@ class HemoCubeBufferCheckFragment : Fragment() {
         return coefficient1 * ratio + coefficient2
     }
 
+    private fun parseResult(frames: List<String>): String {
+        val lines = mutableListOf<String>()
+        for (frame in frames.reversed()) {
+            if (frame.contains("REND") || frame.contains("RESULT")) lines += frame
+            if (frame.contains("RESULT")) {
+                break
+            }
+        }
+        val line = lines.reversed().joinToString("").trim()
+        if (line.contains("RESULT") && line.split(" ").size == 8) {
+            return line
+        }
+        return ""
+    }
+
     private fun isSerialValid(s: String): Boolean {
         if (s.length != 17) {
             binding.nameEditText.error = getString(R.string.invalid_kit)
@@ -511,4 +342,13 @@ class HemoCubeBufferCheckFragment : Fragment() {
         }
         return true
     }
+
+
+    private fun isValidResult(line: String): String {
+        return if (line.contains("RESULT") && line.split(" ").size == 8) {
+            line
+        } else {
+            ""
+        }
+    }
 }

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
@@ -61,7 +60,6 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
 
         }
     }
-
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsbService.UsbServiceBinder
@@ -126,23 +124,21 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
     }
 
 
-    @SuppressLint("MutableImplicitPendingIntent")
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent =
+        val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+            PendingIntent.getBroadcast(
-                PendingIntent.getBroadcast(
+                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-                    this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
+            )
-                )
+        } else {
-            } else {
+            PendingIntent.getBroadcast(
-                PendingIntent.getBroadcast(
+                this,
-                    this,
+                0,
-                    0,
+                Intent(Constants.HOMOCUBE_USB_PERMISSION),
-                    Intent(Constants.HEMOCUBE_USB_PERMISSION),
+                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-                    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)
     }
@@ -155,8 +151,7 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
 
-        supportFragmentManager.beginTransaction()
+        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeBufferCheckFragment())
-            .replace(binding.fghemocube.id, HemoCubeBufferCheckFragment())
             .commit()
     }
 

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

@@ -1,184 +0,0 @@
-package com.example.hpostesting.presentation.calibration
-
-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.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
-
-@AndroidEntryPoint
-class CalibrationActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityCalibrationBinding
-    val viewModel: CalibrationViewModel by viewModels()
-    private var myMenu: Menu? = null
-
-    private lateinit var mDriver: UsbSerialDriver
-    private var mConnection: UsbDeviceConnection? = null
-    lateinit var mService: UsbService
-
-    private val TAG = "Calibration"
-
-    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 = ActivityCalibrationBinding.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()
-            }
-        }
-    }
-
-
-    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.fgCalibration.id, CalibrationFragment())
-            .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) {
-                PendingIntent.getBroadcast(
-                    this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-                )
-            } else {
-                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
-        }
-    }
-}