Blood group and incubation time added together.

.gitlab-ci.yml

@@ -1,88 +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

.idea/gradle.xml

@@ -5,6 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
@@ -13,7 +14,6 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

app/build.gradle

@@ -14,13 +14,12 @@ android {
     compileSdk 34
     namespace 'in.sminnovations.hpostesting'
 
-    // prod - production, preprod - preproduction, quality - qc, dev - development
     defaultConfig {
-        applicationId "in.sminnovations.hpostesting.dev"
+        applicationId "in.sminnovations.hpostesting"
         minSdk 21
         targetSdk 34
-        versionCode 91
-        versionName "2.1.91"
+        versionCode 20
+        versionName "2.1.21"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -49,30 +48,18 @@ android {
         abortOnError false
         checkReleaseBuilds false
     }
-    packagingOptions {
-        exclude 'mockito-extensions/org.mockito.plugins.MockMaker'
-    }
-//    testOptions {
-//        unitTests {
-//            includeAndroidResources = true
-//        }
-//    }
 }
 
 dependencies {
-    implementation "com.google.dagger:hilt-android:2.46"
-    kapt "com.google.dagger:hilt-android-compiler:2.46"
 
     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.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.7.0'
-    implementation 'androidx.fragment:fragment-ktx:1.6.2'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
 
     //firebase
     implementation platform('com.google.firebase:firebase-bom:32.1.0')
-    implementation("com.google.firebase:firebase-perf-ktx")
     implementation("com.google.firebase:firebase-crashlytics-ktx")
     implementation("com.google.firebase:firebase-analytics-ktx")
     implementation 'com.google.firebase:firebase-firestore-ktx'
@@ -83,79 +70,51 @@ dependencies {
     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'
-
+    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta10'
+    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta10")
 
 
     // Testing
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     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'
-    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"
+    implementation "androidx.fragment:fragment-ktx:1.6.1"
 
     // 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-runtime:2.6.1"
-    kapt ("androidx.room:room-compiler:2.6.1")
+    implementation "androidx.room:room-ktx:2.6.0-beta01"
+    implementation "androidx.room:room-runtime:2.6.0-beta01"
+    kapt ("androidx.room:room-compiler:2.6.0-beta01")
 
     //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-ui-ktx:2.7.6"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.2"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.2"
 
     //Dagger - Hilt
     implementation "com.google.dagger:hilt-android:2.46"
     kapt "com.google.dagger:hilt-android-compiler:2.46"
-    kapt "androidx.hilt:hilt-compiler:1.1.0"
+    kapt "androidx.hilt:hilt-compiler:1.0.0"
 
     // 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 'io.nats:jnats:2.11.2'
-
-    implementation("androidx.work:work-runtime-ktx:2.9.0")
-
-    // implementation("io.nats:jnats:2.11.2")
-    implementation 'com.google.android.play:core:1.10.3'
 
 }

app/google-services.json

@@ -1,179 +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: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/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,11 +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" />
 
     <uses-feature android:name="android.hardware.camera" />
 
@@ -18,11 +13,8 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
     <uses-feature android:name="android.hardware.usb.host" />
-
     <uses-permission android:name="android.permission.USB_PERMISSION" />
-
     <application
         android:name="com.example.hpostesting.HPOSTestingApplication"
         android:allowBackup="true"
@@ -34,34 +26,6 @@
         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: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.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"
@@ -85,18 +49,7 @@
             android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
             android:exported="false"
             android:label="@string/title_activity_dashboard"
-            android:theme="@style/Theme.HPOS.NoActionBar"
-            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>
-
+            android:theme="@style/Theme.HPOS.NoActionBar" />
 
         <service
             android:name="com.example.hpostesting.presentation.testRight.UsbService"
@@ -149,16 +102,6 @@
             android:stateNotNeeded="true"
             tools:replace="android:screenOrientation" />
 
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="com.example.hpostesting.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/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,21 +0,0 @@
-package com.example.hpostesting.data.api
-
-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,39 +0,0 @@
-package com.example.hpostesting.data.api
-
-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.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
-
-    @Multipart
-    @POST("deviceService/device/uploadLogs")
-    suspend fun uploadLogs(
-        @Part logFile: MultipartBody.Part
-    ): UploadLogsResponse
-}

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

@@ -1,6 +0,0 @@
-package com.example.hpostesting.data.api
-
-interface PropertyProvider {
-
-    fun getProperty(key: String): String
-}

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

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

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

@@ -1,30 +0,0 @@
-package com.example.hpostesting.data.constant
-
-import android.content.Context
-import android.content.SharedPreferences
-import java.util.Locale
-
-object LanguageManager {
-    private const val LANGUAGE_PREF_KEY = "language_pref"
-
-    fun setLocale(context: Context, languageCode: String) {
-        val locale = Locale(languageCode)
-        Locale.setDefault(locale)
-
-        val resources = context.resources
-        val configuration = resources.configuration
-        configuration.setLocale(locale)
-
-        context.createConfigurationContext(configuration)
-    }
-
-    fun persistLanguagePreference(context: Context, languageCode: String) {
-        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-        prefs.edit().putString(LANGUAGE_PREF_KEY, languageCode).apply()
-    }
-
-    fun getSavedLanguage(context: Context): String {
-        val prefs: SharedPreferences = 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,32 +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),
-    BUFFER_STARTED(4.0),
-    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),
-    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/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

@@ -20,13 +20,4 @@ interface HemoCubeDao {
 
     @Query("DELETE FROM hemo_cube_test_table WHERE _id = :id")
     suspend fun deleteById(id: String)
-
-    @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,17 +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(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 23, exportSchema = false)
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 3, 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,19 +1,23 @@
 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
 
-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,161 +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/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/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/diagnostics/DiagnosticsData.kt

@@ -1,9 +0,0 @@
-package com.example.hpostesting.data.model.diagnostics
-
-data class DiagnosticsData (
-    var deviceId: String = "",
-    var appVersion: String? = "",
-    var deviceType: String = "HEMOCUBE",
-    var deviceData: String = "",
-    var runTime: 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? = "",
-    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? = "",
-    val collector: String? = "",
-    val curveFitting: String? = "Linear",
-    val deviceName: String? = "HPOS",
-    val expiryTime: String? = "",
-    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? = "",
-    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? = "",
-    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? = "",
-    val collector: String? = "",
-    val createdAt: String? = "",
-    val createdBy: Int? = 0,
-    val curveFitting: String? = "",
-    val deviceId: Int? = 0,
-    val expiryTime: String? = "",
-    val gender: String? = "",
-    val id: Int? = 0,
-    val interpretation: String? = "",
-    val `operator`: String? = "",
-    val patientId: Int? = 0,
-    val pregnancy: Boolean? = false,
-    val rawData: HemoCubeTestData? = HemoCubeTestData(),
-    val recommendation: String? = "",
-    val sampleId: String? = "",
-    val sampleType: String? = "",
-    val sickleCellHistory: Boolean? = false,
-    val testId: String? = "",
-    val testResult: String? = "",
-    val testStatus: String? = "",
-    val testTime: String? = "",
-    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 +0,0 @@
-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 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 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/HemoCubeTestData.kt

@@ -8,18 +8,13 @@ data class HemoCubeTestData(
     @PrimaryKey
     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? = "",
@@ -29,57 +24,11 @@ data class HemoCubeTestData(
     var resultData: String = "",
     var led1Buffer: Double? = null,
     var led2Buffer: Double? = null,
-    var led3Buffer: Double? = null,
-    var led4Buffer: Double? = null,
     var led1Sample: Double? = null,
     var led2Sample: Double? = null,
-    var led3Sample: Double? = null,
-    var led4Sample: Double? = null,
     var led1Average: Double? = null,
     var led2Average: Double? = null,
-    var led3Average: Double? = null,
-    var led4Average: Double? = null,
-    var abs1: Double? = null,
-    var abs2: Double? = null,
-    var abs3: Double? = null,
-    var abs4: Double? = null,
-    var hb3: Double? = null,
-    var hb4: Double? = null,
-    var led1Gain1: Double? = null,
-    var led2Gain1: Double? = null,
-    var led3Gain1: Double? = null,
-    var led4Gain1: Double? = null,
-    var led1Gain2: Double? = null,
-    var led2Gain2: Double? = null,
-    var led3Gain2: Double? = null,
-    var led4Gain2: Double? = null,
-    var led1Gain3: Double? = null,
-    var led2Gain3: Double? = null,
-    var led3Gain3: Double? = null,
-    var led4Gain3: Double? = null,
-    var led1Gain4: Double? = null,
-    var led2Gain4: Double? = null,
-    var led3Gain4: Double? = null,
-    var led4Gain4: Double? = null,
     var 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
+    var classificationResult: String = ""
 )

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

@@ -10,10 +10,7 @@ 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 location: Location? = null,
     var createdBy: String? = "",
@@ -22,14 +19,12 @@ data class UserData(
     var testStatus: Boolean? = false,
     var mobileId: String = "",
     var deviceId: String = "",
-    var state: String = "",
     var deviceSerialNumber: String = "",
     var kitSerial: String = "",
     var csvPath: String = "",
     var reportPath: String = "",
     var result: TestRightResultType? = null,
-    var resultRatio: Double? = null,
-    var prdClassification: String = ""
+    var resultRatio: Double? = null
 ) {
     enum class Gender {
         MALE,
@@ -46,14 +41,8 @@ data class UserData(
 fun UserData.toHemoCubeTestData() = HemoCubeTestData(
     _id = _id,
     name = name,
-    bloodGroup = bloodGroup,
     birthYear = birthYear,
-    gender = gender,
-    state = state,
-    abhaId = abhaId,
     userImageURL = userImageURL,
     testStatus = testStatus,
-    location = location,
-    prdClassification = prdClassification,
-    testTime = testTime
+    location = location
 )

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,142 +1,63 @@
 package com.example.hpostesting.data.repository
 
+import android.content.Context
 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 androidx.room.Room
+import com.example.hpostesting.data.dao.MyDatabase
 import com.example.hpostesting.data.model.PendingUploads
 import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-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.android.datatransport.runtime.dagger.Provides
 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.Dispatchers
 import kotlinx.coroutines.tasks.await
-import okhttp3.MultipartBody
-import okhttp3.ResponseBody
+import kotlinx.coroutines.withContext
 import java.io.File
-import java.net.ConnectException
-import java.net.SocketTimeoutException
-import javax.inject.Inject
-import javax.inject.Named
+import javax.inject.Singleton
 
-class NetworkException(message: String, cause: Throwable) : Exception(message, cause)
-class DatabaseRepository @Inject constructor(
-    @Named("Auth")private val molbioAuthApi: MolbioAuthApi,
-    private val molbioResultApi: MolbioResultApi
-) : Repository {
+class DatabaseRepository : Repository {
 
     private val db: FirebaseFirestore = Firebase.firestore
     private val storage = Firebase.storage
 
-    private suspend fun <T : Any> safeApiCall(apiCall: suspend () -> T): Result<T> {
+    suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
         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)
-        }
-    }
-
-    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 uploadLogs(logFile: MultipartBody.Part): Result<UploadLogsResponse> {
-        return safeApiCall { molbioResultApi.uploadLogs(logFile) }
-    }
-
-    override suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
-        return try {
-            val userdata =
-                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
             if (userdata.documents.isNotEmpty()) {
                 userdata.documents.forEach {
                     db.collection("patientData").document(it.id).update("testStatus", true)
                 }
             }
-            db.collection("testData").add(data).await()
-            Response.Success(data._id)
+            db.collection("testData").add(data!!).await()
+            Response.Success(data!!._id)
         } catch (e: Exception) {
             Response.Error(e)
         }
     }
 
-    override suspend fun addTestToDatabase(data: UserData?): Response<String> {
+    suspend fun addTestToDatabase(data: UserData?): Response<String> {
         return try {
-            val userdata =
-                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
             if (userdata.documents.isNotEmpty()) {
                 userdata.documents.forEach {
                     db.collection("patientData").document(it.id).update("testStatus", true)
                 }
             }
-            db.collection("testData").add(data).await()
-            Response.Success(data._id)
+            db.collection("testData").add(data!!).await()
+            Response.Success(data!!._id)
         } catch (e: Exception) {
             Firebase.crashlytics.recordException(e)
             Response.Error(e)
         }
     }
 
-    override suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String> {
-        return try {
-            db.collection("buffers").add(data!!).await()
-            Response.Success(data.kitno)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
-    override suspend fun addDiagnostics(data: DiagnosticsData?): Response<String> {
-        return try {
-            db.collection("diagnostics").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> {
+    suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean> {
         try {
 
             val file = Uri.fromFile(File(filePath))
@@ -195,15 +116,11 @@ class DatabaseRepository @Inject constructor(
         return db.collection("devices").get().await().toObjects(DeviceData::class.java)
     }
 
-    override suspend fun getDeviceDataById(deviceId: String): DeviceData? {
+    suspend fun getDeviceDataById(deviceId: String): DeviceData? {
         val querySnapshot = db.collection("devices").get().await()
         val allDeviceDataList = querySnapshot.toObjects(DeviceData::class.java)
 
         // Find the DeviceData object with the specified deviceId
         return allDeviceDataList.find { it.deviceId == deviceId }
     }
-
-    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,45 +1,5 @@
 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.diagnostics.DiagnosticsData
-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>
-
-    suspend fun addTestToDatabase(data: UserData?): Response<String>
-
-    suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String>
-
-    suspend fun addDiagnostics(data: DiagnosticsData?): Response<String>
-
-    suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean>
-
-    suspend fun getDeviceDataById(deviceId: String): DeviceData?
-    abstract fun <UserData> addTestToDatabase(testDetails: UserData): Any
 //    suspend fun addToDatabase(data: PatientDetails)
-
-    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 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,39 +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
-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/di/AppModule.kt

@@ -2,37 +2,20 @@ 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 +27,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 +44,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 +53,20 @@ 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(
-        @Named("Auth") molbioAuthApi: MolbioAuthApi,
-        molbioResultApi: MolbioResultApi
-    ): DatabaseRepository {
-        return DatabaseRepository(molbioAuthApi = molbioAuthApi, molbioResultApi = molbioResultApi)
-    }
-
-    @Provides
-    @Singleton
-    fun provideRepository(
-        @Named("Auth") molbioAuthApi: MolbioAuthApi,
-        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()
+    fun provideDatabaseRepository(): DatabaseRepository {
+        return DatabaseRepository()
     }
 }

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

@@ -1,6 +1,5 @@
 package com.example.hpostesting.presentation
 
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -11,8 +10,7 @@ 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
@@ -34,7 +32,7 @@ class KitScanActivity : AppCompatActivity() {
         ScanContract()
     ) { result: ScanIntentResult ->
         if (result.contents.isNullOrEmpty()) {
-            Toast.makeText(this, R.string.cancelled_unable_scan, Toast.LENGTH_LONG).show()
+            Toast.makeText(this, "Cancelled: Unable to scan, Try Again!!", Toast.LENGTH_LONG).show()
         } else {
             Log.d(TAG, result.contents)
             processScannedData(result.contents)
@@ -45,17 +43,11 @@ class KitScanActivity : AppCompatActivity() {
         binding.nameEditText.setText(contents)
     }
 
-    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 = 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) {
@@ -127,25 +119,16 @@ class KitScanActivity : AppCompatActivity() {
                     }
                     Toast.makeText(
                         applicationContext,
-                        R.string.kit_updated,
+                        "Kit number is updated, Please Select user before starting test",
                         Toast.LENGTH_SHORT
                     ).show()
 
                     val i = Intent(applicationContext, DashboardActivity::class.java)
                     startActivity(i)
                     finish()
-                } else {
-                    DataHolder.kitSerial = binding.nameEditText.text.toString()
-                    DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
-                    with(sharedPreference.edit()) {
-                        putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
-                        putInt(Constants.KIT_COUNT, 1)
-                        apply()
-                    }
-                    moveToNext()
                 }
             } else {
-                Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
+                Toast.makeText(this, "Invalid KIT Number", Toast.LENGTH_LONG).show()
                 return@setOnClickListener
             }
             if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(
@@ -161,7 +144,7 @@ class KitScanActivity : AppCompatActivity() {
                 }
                 moveToNext()
             } else {
-                Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
+                Toast.makeText(this, "Invalid KIT Number", Toast.LENGTH_LONG).show()
             }
         }
     }
@@ -217,7 +200,7 @@ class KitScanActivity : AppCompatActivity() {
     private fun checkDataNotNull(): Boolean {
         return if (DataHolder.selectedTest?._id == null) {
             Toast.makeText(
-                applicationContext, R.string.select_patient, Toast.LENGTH_SHORT
+                applicationContext, "Please Select patient before starting test", Toast.LENGTH_SHORT
             ).show()
 
             val i = Intent(applicationContext, DashboardActivity::class.java)

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

@@ -1,6 +1,5 @@
 package com.example.hpostesting.presentation
 
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.Manifest
 import android.content.*
 import android.content.pm.PackageManager
@@ -10,6 +9,8 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
@@ -17,9 +18,9 @@ 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.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.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
@@ -45,12 +46,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    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 = ActivityMainBinding.inflate(layoutInflater)
@@ -104,7 +99,6 @@ 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
@@ -115,33 +109,6 @@ class MainActivity : AppCompatActivity() {
                         Constants.DEVICE_TYPE_HOMOCUBE
                     }
 
-                    device.productId == Constants.HEMO_CUBE_V2_PRODUCT_ID && device.vendorId == Constants.HEMO_CUBE_V2_VENDOR_ID -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
-                        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_HOMOCUBE)
-                        Constants.DEVICE_TYPE_HOMOCUBE
-                    }
-
-                    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_HOMOCUBE)
-                        Constants.DEVICE_TYPE_HOMOCUBE
-                    }
-
                     device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> {
                         Log.d(
                             TAG,
@@ -171,7 +138,7 @@ class MainActivity : AppCompatActivity() {
 
             else -> {
                 Log.d(TAG, "Device NOT Connected")
-                Toast.makeText(this, R.string.device_not, Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Device Not Connected", Toast.LENGTH_SHORT).show()
                 DataHolder.usbConnected.value = false
                 null
             }
@@ -259,7 +226,7 @@ class MainActivity : AppCompatActivity() {
             ) != PackageManager.PERMISSION_GRANTED
         ) {
             // Handle location permission request if needed
-            Toast.makeText(this, R.string.enable_location, Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "Please enable location services", Toast.LENGTH_SHORT).show()
             requestCoarseLocationPermission()
             requestFineLocationPermission()
             return
@@ -346,7 +313,7 @@ class MainActivity : AppCompatActivity() {
                     requestFineLocationPermission()
                 } else {
                     // Coarse location permission denied
-                    Toast.makeText(this, R.string.coarse_location_denied, Toast.LENGTH_SHORT)
+                    Toast.makeText(this, "Coarse location permission denied", Toast.LENGTH_SHORT)
                         .show()
                 }
             }
@@ -357,7 +324,7 @@ class MainActivity : AppCompatActivity() {
                     getLocation()
                 } else {
                     // Fine location permission denied
-                    Toast.makeText(this, R.string.location_denied, Toast.LENGTH_SHORT)
+                    Toast.makeText(this, "Fine location permission denied", Toast.LENGTH_SHORT)
                         .show()
                 }
             }

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

@@ -1,134 +0,0 @@
-package com.example.hpostesting.presentation
-
-import android.util.Log
-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 java.io.IOException
-import java.nio.charset.StandardCharsets
-import java.security.GeneralSecurityException
-
-
-class NatsManager(datacollector: DashboardActivity) {
-
-    val TAG = "Nats Service"
-    var nc: Connection? = null
-    val datacollector = datacollector
-    var connect = false
-
-    fun connect() {
-        Log.d(TAG, "TRY TO CONNECT")
-        Thread {
-
-            val seedString = "SUAEB5PUWNS6C2HUV3MFI6HUDEAPGPFPBHMI73NHIQATCDD2BWALVEZXZ4"
-            val seedBytes = seedString.toCharArray()
-
-            val theNKey = NKey.fromSeed(seedBytes) // really should load from somewhere
-
-            val options = Options.Builder()
-                .server("nats://192.168.10.117:4222")
-                .authHandler(object : AuthHandler {
-                    override fun getID(): CharArray? {
-                        return try {
-                            theNKey?.publicKey
-                        } catch (ex: GeneralSecurityException) {
-                            null
-                        } catch (ex: IOException) {
-                            null
-                        } catch (ex: NullPointerException) {
-                            null
-                        }
-                    }
-
-                    override fun sign(nonce: ByteArray): ByteArray? {
-                        return try {
-                            theNKey?.sign(nonce)
-                        } catch (ex: GeneralSecurityException) {
-                            null
-                        } catch (ex: IOException) {
-                            null
-                        } catch (ex: NullPointerException) {
-                            null
-                        }
-                    }
-
-                    override fun getJWT(): CharArray? {
-                        return null
-                    }
-                })
-                .build()
-
-            try {
-                nc = Nats.connect(options)
-                Log.d(TAG, "Connected to Nats server ${options.servers.first()}")
-                connect = true
-                datacollector.setConnect(true)
-
-
-                nc?.publish(
-                    "server.hpos.HCV-000-3001.ping",
-                    "ALIVE".toByteArray(StandardCharsets.UTF_8)
-                )
-                nc?.publish(
-                    "server.hpos.HCV-000-3001.health",
-                    "ALIVE".toByteArray(StandardCharsets.UTF_8)
-                )
-                Log.d(TAG, "Published msg server.hpos.HCV-000-3001.ping on topic Testing")
-                val d = nc?.createDispatcher { msg: Message? ->
-                    println("PRITIMOI SARKAR $msg")
-                }
-
-                d?.subscribe("device.hpos.HCV-000-3001.update") { msg ->
-                    val response = String(msg.data, StandardCharsets.UTF_8)
-                    datacollector. setResponse(response)
-                    println("Message received (up to 100 times): $response")
-                }
-
-                d?.subscribe("device.hpos.HCV-000-3001.uploadlogs") { msg ->
-                    val response = String(msg.data, StandardCharsets.UTF_8)
-                    datacollector.setResponse(response + "uPLOAD")
-                    println("Message received (up to 100 times): $response")
-                }
-
-                d?.subscribe("device.hpos.HCV-000-3001.disable") { msg ->
-                    val response = String(msg.data, StandardCharsets.UTF_8)
-                    datacollector.setResponse(response)
-                    println("Message received (up to 100 times): $response")
-                }
-
-                d?.subscribe("device.hpos.HCV-000-3001.updatecustomer") { msg ->
-                    val response = String(msg.data, StandardCharsets.UTF_8)
-                    datacollector.setResponse(response)
-                    println("Message received (up to 100 times): $response")
-                }
-
-                d?.subscribe("device.hpos.HCV-000-3001.checkupdate") { msg ->
-                    val response = String(msg.data, StandardCharsets.UTF_8)
-                    datacollector.setResponse(response)
-                    println("Message received (up to 100 times): $response")
-                }
-
-            } catch (exp: Exception) {
-                println(exp.printStackTrace())
-                connect = false
-                datacollector.setConnect(true)
-            }
-        }.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 close() {
-        nc?.close()
-        Log.d(TAG, "Nats connection close")
-    }
-
-}

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

@@ -1,8 +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
 import android.content.pm.PackageManager
 import android.os.Build
@@ -15,9 +13,11 @@ import androidx.annotation.RequiresApi
 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 com.google.firebase.firestore.FirebaseFirestoreSettings
+import com.google.firebase.firestore.ktx.firestore
+import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.ActivitySplashBinding
 
 class SplashActivity : AppCompatActivity() {
@@ -34,12 +34,6 @@ class SplashActivity : AppCompatActivity() {
 
     private var allPermissionsGranted = 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 = ActivitySplashBinding.inflate(layoutInflater)
@@ -83,7 +77,7 @@ class SplashActivity : AppCompatActivity() {
                     } else {
                         Toast.makeText(
                             this,
-                            R.string.permission_grant,
+                            "You must grant permission to access all files to use the app",
                             Toast.LENGTH_SHORT
                         ).show()
                         finish()
@@ -145,7 +139,7 @@ class SplashActivity : AppCompatActivity() {
         if (allGranted) {
             moveToLandingPage()
         } else {
-            Toast.makeText(this, R.string.permission_required, Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "All permissions are required to use the app.", Toast.LENGTH_SHORT).show()
             finish()
         }
     }

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

@@ -1,162 +0,0 @@
-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
-import android.widget.Toast
-import androidx.navigation.findNavController
-import androidx.recyclerview.widget.AsyncListDiffer
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.constant.Constants
-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) {
-    }
-
-    private val differCallback = object : DiffUtil.ItemCallback<HemoCubeTestData>() {
-        override fun areItemsTheSame(
-            oldItem: HemoCubeTestData, newItem: HemoCubeTestData
-        ): Boolean {
-            return oldItem._id == newItem._id
-        }
-
-        override fun areContentsTheSame(
-            oldItem: HemoCubeTestData, newItem: HemoCubeTestData
-        ): Boolean {
-            return oldItem == newItem
-        }
-    }
-
-    val differ = AsyncListDiffer(this, differCallback)
-    private val context: Context? = null
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OfflineUserListViewHolder {
-        return OfflineUserListViewHolder(
-            OfflineUserListViewBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        )
-    }
-
-    override fun getItemCount(): 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: ${
-                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) {
-                    Toast.makeText(
-                        view.context,
-                        view.context.getString(R.string.low_battery_warning),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    return@setOnClickListener
-                }
-                if (userList.testStatus != null) {
-                    if (userList.testStatus!!) {
-                        Toast.makeText(
-                            view.context,
-                            view.context.getString(R.string.test_already_conducted),
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    } else {
-                        if (userList.incubationTime != "") {
-                            if (isBetween15And30Minutes(userList.incubationTime) < Constants.INCUBATION_TIME_MIN) {
-                                Toast.makeText(
-                                    view.context,
-                                    view.context.getString(R.string.incubation_not_completed),
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            } else
-                                if (isBetween15And30Minutes(userList.incubationTime) > Constants.INCUBATION_TIME_MAX) {
-                                Toast.makeText(
-                                    view.context,
-                                    view.context.getString(R.string.incubation_crossed_30_minutes),
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            } else {
-                                DataHolder.selectedTest = UserData(
-                                    _id = userList._id,
-                                    bloodGroup = userList.bloodGroup,
-                                    incubationTime = userList.incubationTime
-                                )
-                                view.findNavController()
-                                    .navigate(R.id.action_nav_home_to_mainActivity)
-                            }
-                        } else {
-                            Toast.makeText(
-                                view.context,
-                                view.context.getString(R.string.incubation_not_started),
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
-                    }
-                }
-            }
-
-        }
-    }
-
-    private fun isBetween15And30Minutes(createdAt: String): Long {
-        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-        val createdAtDate: Date = formatter.parse(createdAt)!!
-
-        val currentTime = Calendar.getInstance().time
-
-        val diffMillis = currentTime.time - createdAtDate.time
-
-        return diffMillis / (60 * 1000)
-    }
-
-
-    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

@@ -3,8 +3,6 @@ package com.example.hpostesting.presentation.adapter
 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
@@ -16,6 +14,8 @@ import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.model.patient.UserData
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
+import com.google.firebase.firestore.ktx.firestore
+import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.UserItemViewBinding
 import java.text.SimpleDateFormat
@@ -23,9 +23,8 @@ 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.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.google.firebase.firestore.FirebaseFirestore
 
@@ -36,7 +35,6 @@ class UserListAdapter(
     options: FirestoreRecyclerOptions<UserData>,
     private val view: View,
     private val batLevel: Int,
-    private val requireActivity: FragmentActivity
 ) : FirestoreRecyclerAdapter<UserData, UserListAdapter.OrderItemViewHolder>(options) {
 
     class OrderItemViewHolder(val binding: UserItemViewBinding) :
@@ -54,7 +52,7 @@ class UserListAdapter(
             userName.text = "Name: ${model.name}"
             userId.text = "User ID:${model._id}"
             if (model.incubationTime == "") {
-                btnBlood.visibility = View.VISIBLE
+
             } else {
                 userId.text =
                     "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)} \n Started at: ${
@@ -64,49 +62,37 @@ class UserListAdapter(
                             ).parse(model.incubationTime)!!
                         )
                     }"
-                btnBlood.visibility = View.GONE
+
             }
 
 
             Glide.with(view).load(model.userImageURL).into(userImage)
             if (model.testStatus!!) {
-                teststatus.text = view.context.getString(R.string.test_concluded)
+                teststatus.text = "Test concluded"
 
             } else {
-                teststatus.text = view.context.getString(R.string.test_pending)
+                teststatus.text = "Test is Pending"
             }
 
             holder.binding.btnBlood.setOnClickListener {
-                val view: View? = requireActivity.currentFocus
-
-                // on below line checking if view is not null.
-                if (view != null) {
-                    // on below line we are creating a variable
-                    // for input manager and initializing it.
-                    val inputMethodManager =
-                        context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
-
-                    // on below line hiding our keyboard.
-                    inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
-                }
                 val inflater = LayoutInflater.from(context)
                 val dialogView = inflater.inflate(R.layout.dialog_custom, null)
 
                 val builder = AlertDialog.Builder(context)
                     .setView(dialogView)
-                    .setTitle(R.string.blood_group)
+                    .setTitle("Add Blood Group")
 
                 val etBloodGroup = dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
 
-                builder.setPositiveButton(R.string.ok) { dialog, which ->
+                builder.setPositiveButton("OK") { dialog, which ->
                     val bloodGroup = etBloodGroup.text.toString()
-                    if (bloodGroup.equals("Select Blood Group") ||bloodGroup.equals("ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ") || bloodGroup.isNullOrBlank()) {
-                        if (view != null) {
-                            etBloodGroup.error =view.context.getString(R.string.blood_group_error)
-                        }
-                        if (view != null) {
-                            Toast.makeText(context, view.context.getString(R.string.blood_group_toast), Toast.LENGTH_SHORT).show()
-                        }
+                    if (bloodGroup.equals("Select Blood Group") || bloodGroup.isNullOrBlank()) {
+                        etBloodGroup.error = "Please enter your blood group"
+                        Toast.makeText(
+                            context,
+                            "Please enter your blood group",
+                            Toast.LENGTH_SHORT
+                        ).show()
                     } else {
                         // Check if hemoCubeViewModel and testDetails are not null
                         val db: FirebaseFirestore = FirebaseFirestore.getInstance()
@@ -119,39 +105,47 @@ class UserListAdapter(
                                     val document = userdata.documents[0]
                                     db.collection("patientData")
                                         .document(document.id)
-                                        .update("bloodGroup", bloodGroup,
-                                            "incubationTime", SimpleDateFormat(
-                                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                                            ).format(Calendar.getInstance().time).toString()
-                                        )
+                                        .update("bloodGroup", bloodGroup)
                                         .addOnSuccessListener {
-                                            if (view != null) {
-                                                Toast.makeText(
-                                                    view.context,
-                                                    context?.getString(R.string.blood_group_updated_successfully),
-                                                    Toast.LENGTH_SHORT
-                                                ).show()
-                                            }
-                                            btnBlood.visibility = View.GONE
+                                            Toast.makeText(
+                                                context,
+                                                "Blood group updated successfully",
+                                                Toast.LENGTH_SHORT
+                                            ).show()
+                                                btnBlood.visibility = View.GONE
+                                            Firebase.firestore.collection("patientData").whereEqualTo("_id", model._id).get()
+                                                .addOnSuccessListener { data ->
+                                                    if (data.documents.isNotEmpty()) {
+                                                        data.documents.forEach { userData ->
+                                                            Firebase.firestore.collection("patientData").document(userData.id)
+                                                                .update(
+                                                                    "incubationTime", SimpleDateFormat(
+                                                                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                                                                    ).format(Calendar.getInstance().time).toString()
+                                                                ).addOnSuccessListener {
+                                                                    Toast.makeText(
+                                                                        view.context, "Incubation started", Toast.LENGTH_SHORT
+                                                                    ).show()
+                                                                    startListening()
+                                                                }
+                                                        }
+                                                    }
+                                                }
                                         }
                                         .addOnFailureListener { e ->
-                                            if (view != null) {
-                                                Toast.makeText(
-                                                    view.context,
-                                                    context?.getString(R.string.failed_to_update_blood_group),
-                                                    Toast.LENGTH_SHORT
-                                                ).show()
-                                            }
+                                            Toast.makeText(
+                                                context,
+                                                "Failed to update blood group: ${e.message}",
+                                                Toast.LENGTH_SHORT
+                                            ).show()
                                         }
                                 } catch (e: IndexOutOfBoundsException) {
                                     // Handle the case where no documents are found for the specified ID
-                                    if (view != null) {
-                                        Toast.makeText(
-                                            view.context,
-                                            context?.getString(R.string.no_user_data_found),
-                                            Toast.LENGTH_SHORT
-                                        ).show()
-                                    }
+                                    Toast.makeText(
+                                        context,
+                                        "No user data found for the specified ID",
+                                        Toast.LENGTH_SHORT
+                                    ).show()
                                 }
 
                             }
@@ -166,7 +160,7 @@ class UserListAdapter(
                     // Handle the selected blood group here
                 }
 
-                builder.setNegativeButton(R.string.cancel) { dialog, which ->
+                builder.setNegativeButton("Cancel") { dialog, which ->
                     dialog.dismiss()
                 }
 
@@ -174,32 +168,12 @@ class UserListAdapter(
                 alertDialog.show()
             }
 
-            btnStartIncubation.setOnClickListener {
-//                it.visibility = View.GONE
-//                Firebase.firestore.collection("patientData").whereEqualTo("_id", model._id).get()
-//                    .addOnSuccessListener { data ->
-//                        if (data.documents.isNotEmpty()) {
-//                            data.documents.forEach { userData ->
-//                                Firebase.firestore.collection("patientData").document(userData.id)
-//                                    .update(
-//                                        "incubationTime", SimpleDateFormat(
-//                                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-//                                        ).format(Calendar.getInstance().time).toString()
-//                                    ).addOnSuccessListener {
-//                                        Toast.makeText(
-//                                            view.context, "Incubation started", Toast.LENGTH_SHORT
-//                                        ).show()
-//                                        startListening()
-//                                    }
-//                            }
-//                        }
-//                    }
-            }
+
             userCard.setOnClickListener {
-                if (false) {
+                if (batLevel < 40) {
                     Toast.makeText(
                         view.context,
-                        context?.getString(R.string.low_battery_warning),
+                        "Battery level is low than 40%, please charge the device to continue testing",
                         Toast.LENGTH_SHORT
                     ).show()
                     return@setOnClickListener
@@ -208,21 +182,21 @@ class UserListAdapter(
                     if (model.testStatus!!) {
                         Toast.makeText(
                             view.context,
-                            context?.getString(R.string.test_already_conducted),
+                            "Test has been already conducted for this user",
                             Toast.LENGTH_SHORT
                         ).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),
+                                    "Incubation has not completed 15 minutes",
                                     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),
+                                    "Incubation crossed 30 minutes, need to repeat the incubation",
                                     Toast.LENGTH_SHORT
                                 ).show()
                             } else {
@@ -233,7 +207,7 @@ class UserListAdapter(
                         } else {
                             Toast.makeText(
                                 view.context,
-                                context?.getString(R.string.incubation_not_started),
+                                "Incubation not started for this user",
                                 Toast.LENGTH_SHORT
                             ).show()
                         }
@@ -255,4 +229,11 @@ class UserListAdapter(
 
         return diffMillis / (60 * 1000)
     }
+
+
+
+
+
+
+
 }

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,161 +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 androidx.annotation.RequiresApi
-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() {
-    private 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)
-        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", "KMnO4", "Tartrazine", "AR", "HB", "Blood")
-        val solutionAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
-        solutionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        solutionSpinner.adapter = solutionAdapter
-        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", "250umol", "350umol", "450umol", "550umol", "650umol")
-        val concentrationAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, concentrationOptions)
-        concentrationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        concentrationSpinner.adapter = concentrationAdapter
-        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]
-                if (!selectedValue.equals("Select volume")) {
-                    DataHolder.hemoCubeTestData!!.volume = selectedValue
-                }
-            }
-
-            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 {
-            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!!.name = "${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,183 +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.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-            )
-        } else {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HOMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
-
-        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
-        manager.requestPermission(device, mPendingIntent)
-    }
-
-
-    fun setupService() {
-        val intent = Intent(this, UsbService::class.java)
-        bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-
-
-    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,190 +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.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
-
-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()
-        }
-    }
-
-
-    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 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")) {
-                        activity?.runOnUiThread {
-                            binding.ivCheck.visibility = View.VISIBLE
-                        }
-                    }
-
-                    if (resultData.contains("END") || fullReadOutput.contains("END")) {
-//                        autoDacViewModel.addAutoDacDataToDb(
-//                            DiagnosticsData(
-//                            deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-//                            deviceData = resultData,
-//                            runTime = SimpleDateFormat(
-//                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-//                            ).format(Calendar.getInstance().time)
-//                        )
-//                        )
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    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,52 +0,0 @@
-package com.example.hpostesting.presentation.autodac
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.dao.HemoCubeDao
-import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.repository.Repository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-class 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/buffercheck/HemoCubeBufferCheckFragment.kt

@@ -1,7 +1,6 @@
 package com.example.hpostesting.presentation.buffercheck
 
 import android.content.Context
-import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -11,21 +10,19 @@ import android.widget.Toast
 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 java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-import java.util.UUID
 import kotlin.math.log10
 
 class HemoCubeBufferCheckFragment : Fragment() {
@@ -35,32 +32,15 @@ class HemoCubeBufferCheckFragment : Fragment() {
     private lateinit var sharedPreferences: SharedPreferences
     private var currentDeviceData: DeviceData? = null
     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
     }
 
@@ -71,45 +51,15 @@ class HemoCubeBufferCheckFragment : Fragment() {
     }
 
     private fun initViews() {
-
-        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()
-            } else {
-                Toast.makeText(context, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
-                return@setOnClickListener
-            }
-            activity?.runOnUiThread {
-                binding.tvSubtitle2.visibility = View.GONE
-                binding.etAbhaId.visibility = View.GONE
-                binding.tvTitle.visibility = View.GONE
-                binding.tvTitle2.visibility = View.GONE
-                binding.btnGo.visibility = View.GONE
-            }
-        }
-
-        binding.btnSamplestart.setOnClickListener {
-            startSampleProcess()
-            it.visibility = View.GONE
-        }
-        binding.btnSubmit.isEnabled = false
-        binding.btnSubmit.isClickable = false
-
-        binding.btnPlacebuffer.setOnClickListener {
-            checkAndStartProcess()
-            it.visibility = View.GONE
-        }
+        binding.btnKit.visibility = View.GONE
+        binding.btnSubmit.visibility = View.GONE
+        binding.etBloodGroup.visibility = View.GONE
+        listenToHemoCube()
+        startBufferProcess()
     }
 
     private fun observeViewModel() {
+
         hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
             currentDeviceData = it
         }
@@ -119,44 +69,34 @@ class HemoCubeBufferCheckFragment : Fragment() {
                 hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
             } else {
                 Toast.makeText(
-                    requireContext(), R.string.internt_not, Toast.LENGTH_SHORT
+                    requireContext(),
+                    "No internet connection avaiable",
+                    Toast.LENGTH_SHORT
                 ).show()
             }
-            isOnline = isNetworkAvailable
-        }
-        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            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)
-            }
-
-            binding.progressBar.visibility = View.GONE
         }
 
-        hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
+        messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.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)
                     }
                 }
 
@@ -164,217 +104,112 @@ class HemoCubeBufferCheckFragment : Fragment() {
                 }
             })
         } catch (e: Exception) {
-            showToast(R.string.test_ongoing)
+            showToast("test is going on")
             Firebase.crashlytics.recordException(e)
         }
     }
 
-    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()
 
         when {
-            stringData.contains("SN") -> {
-                val slData = stringData.split(" ")
-                if (slData.size > 1) {
-                    val hardwareId = slData[1].trim()
-                    deviceHardwareId = hardwareId
-                    with(sharedPreferences.edit()) {
-                        putString(Constants.DEVICE_ID, hardwareId)
-                        apply()
+            stringData.contains("ERROR 500") -> showError500Dialog()
+            stringData.contains("ERROR 501") -> showError501Dialog()
+            stringData.contains("#Buffer Completed") -> showStartSampleDialog()
+            stringData.contains("#Sample Completed") -> fetchResult()
+
+            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 {
-                    binding.tvSubtitle4.visibility = View.VISIBLE
-                    binding.btnPlacebuffer.visibility = View.VISIBLE
+                if (validString.isNotEmpty()) {
+                    handleValidResult(validString)
                 }
-                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
-                }
-            }
-
-            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 showError500Dialog() {
+        UIUtils.createAlertDialog(requireContext(),
+            "BUFFER ERROR",
+            "Do you want to continue with existing buffer?",
+            getString(R.string.noo),
+            "Yes",
+            object : MyDialogListener {
+                override fun onClickNegativeButton() {}
+
+                override fun onClickPositiveButton() {
+                    listenToHemoCube()
+                    startBufferProcess()
+                }
+            })
+    }
+
+
+    private fun showError501Dialog() {
+        UIUtils.createAlertDialog(requireContext(),
+            "SAMPLE ERROR",
+            "Do you want to continue with Sample?",
+            getString(R.string.noo),
+            "Yes",
+            object : MyDialogListener {
+                override fun onClickNegativeButton() {}
+
+                override fun onClickPositiveButton() {
+                    listenToHemoCube()
+                    startSampleProcess()
+                }
+            })
+    }
+
+    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 deviceLog = resultData
-
-            val pInfo = requireActivity().packageManager.getPackageInfo(
-                requireActivity().packageName, 0
-            )
-            val version = pInfo.versionName
-
-            val led1Average = log10(led1BufferForDevice.div(led1SampleForDevice))
-            val led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
-            val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
-            val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
-            val deviceRatio = led3Average / led1Average
-
-            if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
-                    ?.get(0)!! || led2BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    1
-                )
-                    ?.get(0)!! || led3BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
-                    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
-                }
+            val result = validString.split(" ")
+            if (result.size == 8) {
+                val led1BufferForDevice = result[3].toDoubleOrNull()
+                val led2BufferForDevice = result[4].toDoubleOrNull()
+                val led1Sample = result[5].toDoubleOrNull()
+                val led2Sample = result[6].toDoubleOrNull()
+                val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0)
+                val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0)
+                val deviceRatio = led1Average / led2Average
+                val calculatedRatio = calculateRatio(deviceRatio)
+                val classificationResult = findResult(calculatedRatio)
+                messages.postValue(classificationResult)
             }
-
-            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
@@ -385,61 +220,33 @@ 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 in 0.05..0.155) return "Normal"
-                if (calculatedRatio in 0.155..0.175) return "Negative Borderline. Repeat Test"
-                if (calculatedRatio in 0.175..0.22) return "Sickle Cell Trait"
-                if (calculatedRatio in 0.22..0.25) return "Positive for Sickle Cell. HPLC for Confirmation"
-                if (calculatedRatio in 0.25..0.35) return "Sickle Cell Disease"
-                if (calculatedRatio > 0.35) return "Inconclusive. Repeat with test with lower volume of blood"
+                if (calculatedRatio < 0.085) return "Kit Failed"
+                if (calculatedRatio in 0.085..0.155) return "Kit Passed"
+                if (calculatedRatio in 0.155..0.175) return "Kit Failed"
+                if (calculatedRatio in 0.175..0.22) return "Kit Failed"
+                if (calculatedRatio in 0.22..0.25) return "Kit Failed"
+                if (calculatedRatio in 0.25..0.35) return "Kit Failed"
+                if (calculatedRatio > 0.35) return "Kit Failed"
             } else {
-                return "INVALID"
-            }
-        } catch (e: Exception) {
-            showToast(R.string.error_classification)
-            Firebase.crashlytics.recordException(e)
-            return "ERROR"
-        }
-        return "INVALID"
-    }
-
-    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"
+                return "NULL"
             }
         } catch (e: Exception) {
             showToast("error while performing classification")
             Firebase.crashlytics.recordException(e)
             return "ERROR"
         }
-        return "INVALID"
+        return "NULL"
     }
 
     private fun showToast(message: String) {
         Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
     }
 
-    private fun showToast(messageResId: Int) {
-        Toast.makeText(requireContext(), getString(messageResId), Toast.LENGTH_SHORT).show()
-    }
-
-
     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?) {}
 
@@ -449,11 +256,9 @@ 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?) {}
 
@@ -462,28 +267,10 @@ 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?) {}
 
@@ -498,11 +285,26 @@ class HemoCubeBufferCheckFragment : Fragment() {
         return coefficient1 * ratio + coefficient2
     }
 
-    private fun isSerialValid(s: String): Boolean {
-        if (s.length != 17) {
-            binding.nameEditText.error = getString(R.string.invalid_kit)
-            return false
+    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 isValidResult(line: String): String {
+        return if (line.contains("RESULT") && line.split(" ").size == 8) {
+            line
+        } else {
+            ""
         }
-        return true
     }
 }

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

@@ -21,7 +21,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
@@ -74,12 +73,6 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
         }
     }
 
-    override fun attachBaseContext(newBase: Context?) {
-        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
-        LanguageManager.setLocale(newBase, languageCode)
-        super.attachBaseContext(newBase)
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHemocubeBinding.inflate(layoutInflater)
@@ -99,7 +92,7 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
             } else {
                 myMenu?.get(0)?.icon =
                     ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_off_24)
-                Toast.makeText(this, R.string.device_disconnected, Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Device is Disconnected", Toast.LENGTH_SHORT).show()
             }
         }
     }
@@ -110,7 +103,7 @@ open class HemocubeBufferCheckActivity : AppCompatActivity() {
         val availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager)
 
         if (availableDrivers.isEmpty()) {
-            Toast.makeText(this, R.string.no_device_found, Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "No device found", Toast.LENGTH_SHORT).show()
         } else {
             mDriver = availableDrivers[0]
             mConnection = manager.openDevice(mDriver.device)

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

@@ -1,182 +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.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-            )
-        } else {
-            PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HOMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
-
-        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
-        manager.requestPermission(device, mPendingIntent)
-    }
-
-
-    fun setupService() {
-        val intent = Intent(this, UsbService::class.java)
-        bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-
-
-    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/calibration/CalibrationFragment.kt

@@ -1,278 +0,0 @@
-package com.example.hpostesting.presentation.calibration
-
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-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.calibration.CalibrationData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
-import `in`.sminnovations.hpostesting.databinding.FragmentCalibrationBinding
-
-class CalibrationFragment: Fragment() {
-
-    private lateinit var binding: FragmentCalibrationBinding
-    private val calibrationViewModel: CalibrationViewModel 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)
-    private lateinit var calibrationData: CalibrationData
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
-    ): View {
-        binding = FragmentCalibrationBinding.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()
-        loadSavedCalibration()
-    }
-
-
-    private fun initViews() {
-        binding.btnSubmit.visibility = View.GONE
-        listenToHemoCube()
-        getDeviceId()
-        binding.btnSubmit.setOnClickListener {
-            binding.btnSubmit.visibility = View.GONE
-            saveCalibration()
-        }
-
-        val etLed1Slope = binding.etLed1Slope
-        etLed1Slope.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                calibrationData.led1Slope = s.toString().toDoubleOrNull() ?: 0.0
-            }
-        })
-        val etLed1Intercept = binding.etLed1Intercept
-        etLed1Intercept.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                calibrationData.led1Intercept = s.toString().toDoubleOrNull() ?: 0.0
-            }
-        })
-
-        val etLed2Slope = binding.etLed2Slope
-        etLed2Slope.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                calibrationData.led2Slope = s.toString().toDoubleOrNull() ?: 0.0
-            }
-        })
-        val etLed2Intercept = binding.etLed2Intercept
-        etLed2Intercept.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                calibrationData.led2Intercept = s.toString().toDoubleOrNull() ?: 0.0
-            }
-        })
-
-        val etLed3Slope = binding.etLed3Slope
-        etLed3Slope.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                calibrationData.led3Slope = s.toString().toDoubleOrNull() ?: 0.0
-            }
-        })
-        val etLed3Intercept = binding.etLed3Intercept
-        etLed3Intercept.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                calibrationData.led3Intercept = s.toString().toDoubleOrNull() ?: 0.0
-            }
-        })
-
-        val etLed4Slope = binding.etLed4Slope
-        etLed4Slope.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                calibrationData.led4Slope = s.toString().toDoubleOrNull() ?: 0.0
-            }
-        })
-        val etLed4Intercept = binding.etLed4Intercept
-        etLed4Intercept.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            }
-
-            override fun afterTextChanged(s: Editable?) {
-                calibrationData.led4Intercept = s.toString().toDoubleOrNull() ?: 0.0
-            }
-        })
-    }
-
-    private fun loadSavedCalibration() {
-        calibrationData = calibrationViewModel.loadSavedCalibrationData()
-        activity?.runOnUiThread() {
-            binding.etLed1Slope.text =
-                Editable.Factory.getInstance().newEditable(calibrationData.led1Slope.toString())
-            binding.etLed1Intercept.text =
-                Editable.Factory.getInstance().newEditable(calibrationData.led1Intercept.toString())
-
-            binding.etLed2Slope.text =
-                Editable.Factory.getInstance().newEditable(calibrationData.led2Slope.toString())
-            binding.etLed2Intercept.text =
-                Editable.Factory.getInstance().newEditable(calibrationData.led2Intercept.toString())
-
-            binding.etLed3Slope.text =
-                Editable.Factory.getInstance().newEditable(calibrationData.led3Slope.toString())
-            binding.etLed3Intercept.text =
-                Editable.Factory.getInstance().newEditable(calibrationData.led3Intercept.toString())
-
-            binding.etLed4Slope.text =
-                Editable.Factory.getInstance().newEditable(calibrationData.led4Slope.toString())
-            binding.etLed4Intercept.text =
-                Editable.Factory.getInstance().newEditable(calibrationData.led4Intercept.toString())
-        }
-    }
-
-    private fun saveCalibration() {
-        if (calibrationViewModel.saveCalibration(calibrationData)) {
-            startActivity(Intent(requireActivity(), DashboardActivity::class.java))
-        }
-    }
-
-    private fun observeViewModel() {
-
-        calibrationViewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-        }
-
-        messages.observe(viewLifecycleOwner) {
-            binding.tvSubtitle4.text = it
-        }
-
-        calibrationViewModel.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() {
-        calibrationViewModel.progressBar.postValue(true)
-        (activity as CalibrationActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        calibrationViewModel.messages.postValue(stringData)
-                        binding.tvSubtitle4.text = stringData
-                    }
-                }
-                override fun onUsbError(e: Exception?) {
-                    calibrationViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun listenToHemoCube() {
-
-        val fullReadOutput = StringBuilder()
-        startListening.postValue(true)
-
-        try {
-            (activity as CalibrationActivity).mService.listenToHemoCube(object :
-                UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        calibrationViewModel.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
-                            }
-                        }
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    calibrationViewModel.progressBar.postValue(false)
-                }
-            })
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-
-    private fun showToast(message: String) {
-        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
-    }
-}

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

@@ -1,90 +0,0 @@
-package com.example.hpostesting.presentation.calibration
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.dao.HemoCubeDao
-import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.calibration.CalibrationData
-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 CalibrationViewModel  @Inject constructor(
-    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)
-
-//    private val _networkStatusLiveData = NetworkStatusLiveData(context)
-    val deviceData = MutableLiveData<DeviceData?>()
-//    val networkStatusLiveData: LiveData<Boolean>
-//        get() = _networkStatusLiveData
-    val fireBaseUpload = MutableLiveData<String>()
-    val savedCalibrationData = MutableLiveData<String>()
-
-    fun loadSavedCalibrationData(): CalibrationData {
-        val calibrationData = CalibrationData()
-
-        val sharedPreferenceKeys = arrayOf(
-            "LED1SLOPE", "LED1INTERCEPT",
-            "LED2SLOPE", "LED2INTERCEPT",
-            "LED3SLOPE", "LED3INTERCEPT",
-            "LED4SLOPE", "LED4INTERCEPT",
-            "CALIBRATED_AT"
-        )
-
-        with(calibrationData) {
-            led1Slope = sharedPreference.getString(sharedPreferenceKeys[0], "")?.toDoubleOrNull() ?: 0.0
-            led1Intercept = sharedPreference.getString(sharedPreferenceKeys[1], "")?.toDoubleOrNull() ?: 0.0
-            led2Slope = sharedPreference.getString(sharedPreferenceKeys[2], "")?.toDoubleOrNull() ?: 0.0
-            led2Intercept = sharedPreference.getString(sharedPreferenceKeys[3], "")?.toDoubleOrNull() ?: 0.0
-            led3Slope = sharedPreference.getString(sharedPreferenceKeys[4], "")?.toDoubleOrNull() ?: 0.0
-            led3Intercept = sharedPreference.getString(sharedPreferenceKeys[5], "")?.toDoubleOrNull() ?: 0.0
-            led4Slope = sharedPreference.getString(sharedPreferenceKeys[6], "")?.toDoubleOrNull() ?: 0.0
-            led4Intercept = sharedPreference.getString(sharedPreferenceKeys[7], "")?.toDoubleOrNull() ?: 0.0
-            calibratedAt = sharedPreference.getString(sharedPreferenceKeys[8], "") ?: ""
-        }
-
-        return calibrationData
-    }
-
-    fun saveCalibration(calibrationData: CalibrationData): Boolean {
-        try {
-            with(sharedPreference.edit()) {
-                putString("LED1SLOPE", calibrationData.led1Slope.toString())
-                putString("LED1INTERCEPT", calibrationData.led1Intercept.toString())
-
-                putString("LED2SLOPE", calibrationData.led2Slope.toString())
-                putString("LED2INTERCEPT", calibrationData.led2Intercept.toString())
-
-                putString("LED3SLOPE", calibrationData.led3Slope.toString())
-                putString("LED3INTERCEPT", calibrationData.led3Intercept.toString())
-
-                putString("LED4SLOPE", calibrationData.led4Slope.toString())
-                putString("LED4INTERCEPT", calibrationData.led4Intercept.toString())
-
-                putString("CALIBRATED_AT", calibrationData.calibratedAt)
-                apply()
-            }
-
-            return true
-        } catch (e: Exception) {
-            return false
-        }
-    }
-}

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

@@ -1,63 +1,31 @@
 package com.example.hpostesting.presentation.dashboard
 
-import android.app.DownloadManager
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import android.view.Menu
 import android.widget.Toast
-import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.FileProvider
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.NatsManager
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.google.android.material.navigation.NavigationView
-import com.google.android.material.progressindicator.LinearProgressIndicator
-import com.google.android.play.core.appupdate.AppUpdateManager
-import com.google.android.play.core.appupdate.AppUpdateManagerFactory
-
 import com.google.firebase.appdistribution.FirebaseAppDistribution
 import com.google.firebase.appdistribution.FirebaseAppDistributionException
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.crashlytics.ktx.crashlytics
+//import com.google.firebase.appdistribution.FirebaseAppDistribution
+//import com.google.firebase.appdistribution.FirebaseAppDistributionException
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
-import okhttp3.ResponseBody
 
-import java.io.File
-
-open interface IDataCollector {
-    fun setConnect(connect: Boolean)
-    fun setResponse(response: String)
-}
 @AndroidEntryPoint
-class DashboardActivity : AppCompatActivity(), IDataCollector {
+class DashboardActivity : AppCompatActivity() {
 
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityDashboardBinding
-    var responses: String = ""
-    lateinit var nats: NatsManager
-    private var downloadId: Long = 0
-    // TODO: Remove hemocube viewmodel
-    private val hemocubeViewModel: HemoCubeViewModel by viewModels()
-
-    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)
@@ -65,45 +33,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         binding = ActivityDashboardBinding.inflate(layoutInflater)
         setContentView(binding.root)
         setSupportActionBar(binding.appBarDashboard.toolbar)
-        nats = NatsManager(this)
-        nats.connect()
-        nats.pub("server.hpos.HCV-000-3001.ping", "THIS IS A TEST MSG")
-
-        hemocubeViewModel.deviceUpdate.observe(this) { result ->
-            when (result) {
-                is Result.Success -> {
-                    // Handle success
-                    val apkUrl = result.data
-//                    val apkUrl = "https://dl.dropboxusercontent.com/s/fi/1c3nn7t0co431hicl3hrt/app-debug.apk?rlkey=e4uf13ty1dpcked614vy1aaqp&dl=0"
-                    initiateUpdate(apkUrl.toString())
-                    Log.d("ApI", "APK URL: $apkUrl")
-                    Toast.makeText(
-                        this,
-                        "APK UPLOAD ${result.data}",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    // The APK URL LiveData will be updated automatically
-                }
-
-                is Result.Error -> {
-                        result.exception.let { message ->
-                            Toast.makeText(this, "An error occurred On Updating App: $message", Toast.LENGTH_LONG)
-                                .show()
-
-                    }
-
-                }
-
-                is Result.Loading -> {
-
-                }
-
-                else -> {
-
-                }
-            }
-        }
-
 
         val drawerLayout: DrawerLayout = binding.drawerLayout
         val navView: NavigationView = binding.navView
@@ -116,6 +45,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         )
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
+
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -129,83 +59,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
     }
 
-    private fun initiateUpdate(responseBody: String) {
-        // Extract the URL from the ResponseBody
-        val apkUrl = responseBody
-
-        // Check if the extracted APK URL is valid
-        if (!isValidHttpUrl(apkUrl)) {
-            // Handle the case where the URL is not valid
-            return
-        }
-
-        val request = DownloadManager.Request(Uri.parse(apkUrl))
-        request.setTitle("App Update")
-        request.setDescription("Downloading update...")
-        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-        request.setDestinationInExternalFilesDir(this, "Updates", "update.apk")
-
-        val downloadManager = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        downloadId = downloadManager.enqueue(request)
-
-        // Register a BroadcastReceiver to receive the download complete event
-        val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-        registerReceiver(downloadReceiver, filter)
-    }
-
-    // Function to check if a URL has a valid HTTP/HTTPS scheme
-    // Function to extract the APK URL from the ResponseBody
-    private fun extractApkUrl(responseBody: ResponseBody): String {
-        // Assuming your ResponseBody contains the APK URL as a string
-        return responseBody.string()
-    }
-
-    // Function to check if a URL has a valid HTTP/HTTPS scheme
-    private fun isValidHttpUrl(url: String): Boolean {
-        return url.startsWith("http://") || url.startsWith("https://")
-    }
-    private val downloadReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
-            if (id == downloadId) {
-                // Install the downloaded APK
-                installApk()
-            }
-        }
-    }
-
-    private fun installApk() {
-        val file = File(getExternalFilesDir("Updates"), "update.apk")
-        file.setReadable(true, false) // Ensure the file is readable
-
-        val uri: Uri = FileProvider.getUriForFile(
-            this,
-            "com.example.hpostesting.fileprovider",
-            file
-        )
-
-        // Create an intent to install the APK
-        val installIntent = Intent(Intent.ACTION_INSTALL_PACKAGE)
-        installIntent.data = uri
-        installIntent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                Intent.FLAG_ACTIVITY_NEW_TASK or
-                Intent.FLAG_ACTIVITY_CLEAR_TOP
-        installIntent.putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true)
-
-        // Start the installation
-        startActivity(installIntent)
-
-        Log.d("InstallApk", "Install Intent URI: $uri")
-        Log.d("InstallApk", "Package Name: $packageName")
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        unregisterReceiver(downloadReceiver)
-    }
-
-
-
 
     override fun onResume() {
         super.onResume()
@@ -213,14 +66,11 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         val firebaseAppDistribution = FirebaseAppDistribution.getInstance()
         firebaseAppDistribution.updateIfNewReleaseAvailable()
             .addOnProgressListener { updateProgress ->
-
-                if (updateProgress.apkBytesDownloaded > 0) {
-                    Toast.makeText(
-                        this,
-                        "${updateProgress.updateStatus}. ${updateProgress.apkBytesDownloaded / 1048576} /${updateProgress.apkFileTotalBytes / 1048576} MB",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
+                Toast.makeText(
+                    this,
+                    "${updateProgress.updateStatus}. ${updateProgress.apkBytesDownloaded / 1048576} /${updateProgress.apkFileTotalBytes / 1048576} MB",
+                    Toast.LENGTH_SHORT
+                ).show()
             }
             .addOnFailureListener { e ->
                 // (Optional) Handle errors.
@@ -232,30 +82,14 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
 
                         else -> {
                             // Handle other errors.
-                            Toast.makeText(
-                                this,
-                                "AppDistribution error, status: ${e.errorCode}",
-                                Toast.LENGTH_SHORT
-                            ).show()
+                            Toast.makeText(this, "AppDistribution error, status: ${e.errorCode}", Toast.LENGTH_SHORT).show()
                         }
                     }
                     FirebaseCrashlytics.getInstance().recordException(e)
                 }
             }
             .addOnSuccessListener {
-//                Toast.makeText(this, "App Update: Success!", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "App Update: Success!", Toast.LENGTH_SHORT).show()
             }
     }
-
-    override fun setConnect(connect: Boolean) {
-        if(connect){
-            Log.i("NATS Connection", connect.toString())
-        }
-    }
-
-    override fun setResponse(response: String) {
-
-        responses = responses+response+"\n"
-        println(responses)
-    }
 }

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

@@ -1,90 +1,40 @@
 package com.example.hpostesting.presentation.dashboard
 
-import android.annotation.SuppressLint
-import android.content.Context
 import android.content.Intent
-import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.presentation.autodac.AutoDacActivity
 import com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity
-import com.example.hpostesting.presentation.calibration.CalibrationActivity
-import com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity
-import com.example.hpostesting.presentation.deviceinfo.DeviceActivity
-import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import `in`.sminnovations.hpostesting.databinding.FragmentGalleryBinding
 
 class GalleryFragment : Fragment() {
 
     private var _binding: FragmentGalleryBinding? = null
-    private lateinit var sharedPreferences: SharedPreferences
-    private var userid = ""
+
     // This property is only valid between onCreateView and
     // onDestroyView.
     private val binding get() = _binding!!
 
-    private lateinit var sharedPreference: SharedPreferences
-
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
-
-    @SuppressLint("SetTextI18n")
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
     ): View {
 //        val galleryViewModel =
 //            ViewModelProvider(this).get(GalleryViewModel::class.java)
 
         _binding = FragmentGalleryBinding.inflate(inflater, container, false)
         val root: View = binding.root
-        sharedPreferences =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
-        sharedPreference = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
-        if (sharedPreference.getString(
-                Constants.USER_ID, ""
-            ) == "FACTORY" && sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
-                .isEmpty() && sharedPreference.getString(Constants.DEVICE_PASSWORD_API, "")
-                .toString().isEmpty()
-        ) {
-            binding.btnDeviceProvision.visibility = View.VISIBLE
-        } else {
-            binding.btnDeviceProvision.visibility = View.GONE
-        }
-
-        binding.btnDeviceProvision.setOnClickListener {
-            startActivity(Intent(requireContext(), DeviceProvisionActivity::class.java))
-        }
 
+//        val textView: TextView = binding.textGallery
+//        galleryViewModel.text.observe(viewLifecycleOwner) {
+////            textView.text = it
+//        }
         binding.btnSubmit.setOnClickListener {
             startActivity(Intent(requireContext(), HemocubeBufferCheckActivity::class.java))
         }
-
-        binding.btnDiagnostics.setOnClickListener {
-            startActivity(Intent(requireContext(), DiagnosticsActivity::class.java))
-        }
-
-        binding.btnAutoDac.setOnClickListener {
-            startActivity(Intent(requireContext(), AutoDacActivity::class.java))
-        }
-
-        binding.btnCalibration.setOnClickListener {
-            startActivity(Intent(requireContext(), CalibrationActivity::class.java))
-        }
-
-        binding.btnDeviceInfo.setOnClickListener {
-            startActivity(Intent(requireContext(), DeviceActivity::class.java))
-        }
-
-        userid = sharedPreferences.getString(Constants.USER_ID, "").toString()
-        binding.tvSubtitle4.text = "Login ID : ${userid}"
-
         return root
     }
 

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

@@ -8,8 +8,6 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.os.BatteryManager
 import android.os.Bundle
-import android.util.Base64
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -18,20 +16,11 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.model.login.LoginRequest
-import com.example.hpostesting.data.model.login.LoginResponse
-import com.example.hpostesting.data.model.molbioresult.MolbioV2Result
-import com.example.hpostesting.data.model.molbioresult.MolbioV2ResultRequest
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.data.model.updates.CheckUpdateRequest
-import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.presentation.KitScanActivity
-import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.adapter.UserListAdapter
-import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.TestRightViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
@@ -39,13 +28,10 @@ import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
-import com.google.firebase.perf.ktx.performance
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
-import org.json.JSONObject
 import java.text.SimpleDateFormat
-import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 
@@ -56,16 +42,12 @@ class HomeFragment : Fragment() {
     private val viewModel: TestRightViewModel by activityViewModels()
     private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
     private lateinit var rvAdapter: UserListAdapter
-    private var batLevel: Int =
-        0 // Initialize with a default value, or obtain the actual battery level
-    private lateinit var adapter: OfflineUserListAdapter
-    private val homeViewModel: HemoCubeViewModel by activityViewModels()
+    private var batLevel: Int = 0 // Initialize with a default value, or obtain the actual battery level
 
-    private var isTokenAvailable = false
 
     private lateinit var sharedPreference: SharedPreferences
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View? {
         _binding = FragmentHomeBinding.inflate(inflater, container, false)
 
@@ -76,7 +58,8 @@ class HomeFragment : Fragment() {
             return super.onCreateView(inflater, container, savedInstanceState)
         }
 
-        sharedPreference = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        sharedPreference =
+            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         DataHolder.selectedTest = null
 
         return binding.root
@@ -84,41 +67,19 @@ class HomeFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
-            binding.labelQuickCapture.visibility = View.VISIBLE
-            binding.btnQuickCapture.visibility = View.VISIBLE
-        }
-
-        checkUnprocessedCSVData()
         viewModel.allUserData.observe(viewLifecycleOwner) { userData ->
             deleteIncompleteRegistrations(userData)
         }
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
             deleteHemoCubeIncompleteRegistrations(userData)
-            if (userData.isNotEmpty()) {
-                val userList = mutableListOf<HemoCubeTestData>()
-                userData.forEach {
-                    if (it.testStatus == false) {
-                        userList.add(it)
-                    }
-                }
-                val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
-                val batLevel: Int = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-                adapter = OfflineUserListAdapter(binding.root, batLevel)
-                adapter.differ.submitList(userList)
-                binding.rvOrderOffline.adapter = adapter
-            }
         }
-        viewModel.networkStatusLiveData?.observe(viewLifecycleOwner) { isConnected ->
+        viewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isConnected ->
             if (isConnected) {
-
                 binding.internetAvailableCL.visibility = View.VISIBLE
                 binding.internetNotAvailableCL.visibility = View.GONE
                 loadUserData()
                 setSearch()
                 checkForLocalDBData()
-                checkForTokenAndUpdate()
             } else {
                 binding.internetAvailableCL.visibility = View.GONE
                 binding.internetNotAvailableCL.visibility = View.VISIBLE
@@ -128,43 +89,22 @@ class HomeFragment : Fragment() {
         hemoCubeViewModel.fireBaseBulkUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 Toast.makeText(
-                    requireContext(), R.string.test_upload, Toast.LENGTH_SHORT
+                    requireContext(),
+                    "Test Results Uploaded Successfully",
+                    Toast.LENGTH_SHORT
                 ).show()
             }
             if (result == "Error") {
-                Toast.makeText(requireContext(), R.string.test_upload_failed, Toast.LENGTH_SHORT)
+                Toast.makeText(requireContext(), "Test Results Upload Failed", Toast.LENGTH_SHORT)
                     .show()
             }
         }
         binding.btnLogout.setOnClickListener {
             logoutUser(requireContext())
         }
-
-
         binding.uploadData.setOnClickListener {
             showUploadDialog(requireContext())
         }
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
-
-            val btnSaveLocalVisibility =
-                if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE
-
-            binding.btnSaveLocal.visibility = btnSaveLocalVisibility
-
-            binding.btnSaveLocal.setOnClickListener {
-                if (btnSaveLocalVisibility == View.VISIBLE) {
-                    // Execute the action when the button is visible (testStatus is true for at least one user)
-                    showDownloadDialog(requireContext())
-                } else {
-                    // Handle the case when the button is not visible
-                    Toast.makeText(
-                        requireContext(),
-                        "No test details stored locally",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            }
-        }
         binding.btnNewKit.setOnClickListener {
             with(sharedPreference.edit()) {
                 putString(Constants.KIT_NUMBER, "")
@@ -174,218 +114,15 @@ class HomeFragment : Fragment() {
             startActivity(Intent(requireContext(), KitScanActivity::class.java))
             requireActivity().finish()
         }
-        binding.btnQuickCapture.setOnClickListener {
-            DataHolder.hemoCubeTestData = HemoCubeTestData()
-
-            val i = Intent(
-                requireContext().applicationContext, AssuranceControlsActivity::class.java
-            )
-            startActivity(i)
-        }
-
-        binding.downloadCSV.setOnClickListener {
-            showDownloadDialog(requireContext())
-        }
-    }
-
-    private fun checkForTokenAndUpdate() {
-        val accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
-        val password = sharedPreference.getString(Constants.DEVICE_PASSWORD_API, "").toString()
-        val userID = sharedPreference.getString(Constants.DEVICE_ID_API, "").toString()
-        if (userID.isNotEmpty() && password.isNotEmpty()) {
-            if (accessToken.isEmpty()) {
-                hemoCubeViewModel.login(createLoginRequestData(userID, password))
-            } else {
-                if (isTokenExpired(accessToken)) {
-                    hemoCubeViewModel.login(createLoginRequestData(userID, password))
-                } else {
-                    isTokenAvailable = true
-                    hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
-                    hemoCubeViewModel.uploadLogs()
-                    hemoCubeViewModel.startPeriodicCheckUpdate()
-                }
-            }
-        } else {
-            Toast.makeText(
-                requireContext(),
-                "Contact Help and get your device provision done",
-                Toast.LENGTH_SHORT
-            ).show()
-        }
-        hemoCubeViewModel.loginResponse.observe(viewLifecycleOwner) { response ->
-            when (response) {
-                is Result.Success -> {
-                    updateTokens(response)
-                }
-
-                is Result.Error -> {
-                    response.exception.let { message ->
-                        Toast.makeText(
-                            activity,
-                            "An error occurred in login: $message",
-                            Toast.LENGTH_LONG
-                        )
-                            .show()
-                    }
-                }
-
-                is Result.Loading -> {
-
-                }
-
-                else -> {}
-            }
-        }
-
-        hemoCubeViewModel.deviceUpdate.observe(viewLifecycleOwner) { response ->
-            when (response) {
-                is Result.Success -> {
-                    Toast.makeText(
-                        requireContext(), response.data.toString(), Toast.LENGTH_SHORT
-                    ).show()
-
-                }
-
-                is Result.Error -> {
-                    response.exception.let { message ->
-                        Toast.makeText(
-                            activity,
-                            "An error occurred check update: $message",
-                            Toast.LENGTH_LONG
-                        )
-                            .show()
-                    }
-                }
-
-                is Result.Loading -> {
-
-                }
-
-                else -> {}
-            }
-        }
-
-        hemoCubeViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
-            when (response) {
-                is Result.Success -> {
-                    Toast.makeText(
-                        requireContext(),
-                        "Log uploaded ${response.data.data?.filename}",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-
-                is Result.Error -> {
-                    response.exception.let { message ->
-                        Toast.makeText(
-                            activity,
-                            "An error occurred in uploading logs: $message",
-                            Toast.LENGTH_LONG
-                        )
-                            .show()
-                    }
-                }
-
-                is Result.Loading -> {
-
-                }
-
-                else -> {}
-            }
-        }
-
-        hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
-            when (it) {
-                is Result.Success -> {
-                    it.data.data?.forEach { id ->
-                        id.rawData?.let { it1 ->
-                            hemoCubeViewModel.updateMolbioFlag(
-                                it1._id
-                            )
-                        }
-                    }
-                }
-
-                is Result.Error -> {
-                    binding.btnSubmit.visibility = View.VISIBLE
-                    //Remove this line of code while deploying to IOCL
-                    it.exception.let { message ->
-                        Toast.makeText(activity, "An error occurred: $message", Toast.LENGTH_LONG)
-                            .show()
-                    }
-                }
-
-                else -> {}
-            }
-        }
-    }
-
-    private fun isTokenExpired(token: String): Boolean {
-        val parts = token.split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-        val decodedPayload = String(Base64.decode(parts[1], Base64.DEFAULT))
-        val jsonPayload = JSONObject(decodedPayload)
-
-        val exp = jsonPayload.optLong("exp", 0)
-        val currentTimeSeconds = System.currentTimeMillis() / 1000
-
-        return exp <= currentTimeSeconds
-    }
-
-    private fun updateTokens(response: Result.Success<LoginResponse>) {
-        with(sharedPreference.edit()) {
-            putString(Constants.ACCESS_TOKEN, response.data.data?.accessToken)
-            putString(Constants.NATS_TOKEN, response.data.data?.deviceUser?.natsToken)
-            putString(
-                Constants.NATS_TOKEN_EXPIRE_DATE, response.data.data?.deviceUser?.natsTokenExpiry
-            )
-            apply()
-        }
-        isTokenAvailable = true
-    }
-
-    private fun createLoginRequestData(userID: String, password: String): LoginRequest {
-        val pInfo = requireActivity().packageManager.getPackageInfo(
-            requireActivity().packageName, 0
-        )
-        val version = pInfo.versionName
-        return LoginRequest(
-            password = password, serialNumber = userID, username = userID, version = version
-        )
-    }
-
-    private fun createCheckUpdateRequestData(): CheckUpdateRequest {
-        val pInfo = requireActivity().packageManager.getPackageInfo(
-            requireActivity().packageName, 0
-        )
-        val version = pInfo.versionName
-        return CheckUpdateRequest(
-            currentVersion = version
-        )
-    }
-
-    private fun createDeviceUpdateRequestData(): DeviceUpdateRequest {
-        return DeviceUpdateRequest(
-            serial_no = sharedPreference.getString(Constants.DEVICE_ID, "")
-        )
     }
 
     private fun setUserId() {
         binding.btnSubmit.setOnClickListener {
             val userId = binding.userId.text.toString()
-            val bloodGroup = binding.etBloodGroup.text
-            if (userId.length >= 10 && !bloodGroup.equals("Select Blood Group") || !bloodGroup.isNullOrBlank()) {
-                hemoCubeViewModel.addUser(
-                    HemoCubeTestData(
-                        _id = userId,
-                        bloodGroup = bloodGroup.toString(),
-                        incubationTime = SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                        ).format(Calendar.getInstance().time).toString()
-                    )
-                )
-//                val userData = UserData(_id = userId)
-//                DataHolder.selectedTest = userData
-//                findNavController().navigate(R.id.action_nav_home_to_mainActivity)
+            if (userId.length >= 18) {
+                val userData = UserData(_id = userId)
+                DataHolder.selectedTest = userData
+                findNavController().navigate(R.id.action_nav_home_to_mainActivity)
             } else {
                 val errorMessage = getString(R.string.user_id_error_message)
                 Toast.makeText(requireContext(), errorMessage, Toast.LENGTH_SHORT).show()
@@ -417,16 +154,10 @@ class HomeFragment : Fragment() {
             val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
             val batLevel: Int = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
 
-            rvAdapter = view?.let {
-                UserListAdapter(
-                    requireContext(),
-                    hemoCubeViewModel,
-                    recyclerViewOptions,
-                    it,
-                    batLevel,
-                    requireActivity()
-                )
-            }!!
+                    rvAdapter = view?.let {
+                        UserListAdapter(requireContext(), hemoCubeViewModel, recyclerViewOptions,
+                            it, batLevel)
+                    }!!
             binding.rvOrder.adapter = rvAdapter
 
             rvAdapter.startListening()
@@ -444,14 +175,14 @@ class HomeFragment : Fragment() {
 
     private fun logoutUser(context: Context) {
         val builder = AlertDialog.Builder(context)
-        builder.setTitle(R.string.log_out)
-        builder.setMessage(R.string.do_log_out)
-        builder.setPositiveButton(R.string.yes) { dialog, _ ->
+        builder.setTitle("Log Out")
+        builder.setMessage("Do you want to LogOut the Application?")
+        builder.setPositiveButton("Yes") { dialog, _ ->
             saveUserId("")
             findNavController().navigate(R.id.action_nav_home_to_loginFragment)
             dialog.dismiss()
         }
-        builder.setNegativeButton(R.string.no) { dialog, _ ->
+        builder.setNegativeButton("No") { dialog, _ ->
             dialog.dismiss()
         }
 
@@ -460,26 +191,14 @@ class HomeFragment : Fragment() {
     }
 
     private fun getData(search: String?, field: String) {
-        val userSearchTrace = Firebase.performance.newTrace("user_search_trace")
-        userSearchTrace.start()
-
         search?.replaceFirstChar {
             if (search.lowercase()
                     .startsWith(it.lowercase())
             ) it.titlecase(Locale.getDefault()) else it.toString()
 
         }
-        val currentDate = Date()
-        val dateFormat = SimpleDateFormat("yyyyMMdd")
-        val partition = dateFormat.format(currentDate)
-        val searchTerm = partition + search
-        val searchField = field + "Search"
-        val query =
-            Firebase.firestore.collection("patientData").orderBy(searchField).startAt(searchTerm)
-                .endAt(searchTerm + "\uf8ff")
-        query.get().addOnSuccessListener {
-            userSearchTrace.stop()
-        }
+        val query = Firebase.firestore.collection("patientData").orderBy(field).startAt(search)
+            .endAt(search + "\uf8ff")
         val recyclerViewOptions =
             FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
                 .build()
@@ -487,19 +206,10 @@ class HomeFragment : Fragment() {
         batLevel = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
 
         rvAdapter = view?.let {
-            UserListAdapter(
-                requireContext(),
-                hemoCubeViewModel,
-                recyclerViewOptions,
-                it,
-                batLevel,
-                requireActivity()
-            )
+            UserListAdapter(requireContext(), hemoCubeViewModel, recyclerViewOptions, it, batLevel)
         }!!
         binding.rvOrder.adapter = rvAdapter
         rvAdapter.startListening()
-
-        userSearchTrace.stop()
     }
 
     private fun setSearch() {
@@ -548,24 +258,9 @@ class HomeFragment : Fragment() {
         }
 
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val uploadDataVisibility =
-                if (userDataList.any { !it.localFlag && !it.molbioFlag && it.testStatus == true }) View.VISIBLE else View.GONE
+            val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
             binding.uploadData.visibility = uploadDataVisibility
         }
-
-        hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { bufferData ->
-            val uploadDataVisibility =
-                if (bufferData.any { !it.localFlag }) View.VISIBLE else View.GONE
-            binding.uploadData.visibility = uploadDataVisibility
-        }
-    }
-
-    private fun checkUnprocessedCSVData() {
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val downloadDataVisibility =
-                if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.VISIBLE else View.GONE
-            binding.downloadCSV.visibility = downloadDataVisibility
-        }
     }
 
     private fun showUploadDialog(context: Context) {
@@ -585,23 +280,6 @@ class HomeFragment : Fragment() {
         dialog.show()
     }
 
-//    private fun showDownloadDialog(context: Context) {
-//        val builder = AlertDialog.Builder(context)
-//        builder.setTitle(R.string.download_db_registration_title)
-//        builder.setMessage(R.string.download_db_registration_message)
-//
-//        builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
-//            downloadLocalDBData(dialog)
-//        }
-//
-//        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
-//            dialog.dismiss()
-//        }
-//
-//        val dialog = builder.create()
-//        dialog.show()
-//    }
-
     private fun uploadLocalDBData(dialog: DialogInterface) {
         viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             if (userDataList.isEmpty()) {
@@ -619,68 +297,18 @@ class HomeFragment : Fragment() {
         }
 
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val resultList = MolbioV2ResultRequest(mutableListOf(MolbioV2Result()))
-            userDataList.forEach { userData ->
-                if (!userData.localFlag) {
+            if (userDataList.isEmpty()) {
+                dialog.dismiss()
+            } else {
+                userDataList.forEach { userData ->
                     userData.localFlag = true
                     hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                    if (!userData.molbioFlag && isTokenAvailable) {
-                        resultList.results?.add(
-                            MolbioV2Result(
-                                rawData = userData,
-                                analysisId = userData._id,
-                                analysisDate = userData.testTime,
-                                analysisStatus = userData.classificationResult,
-                                thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId].toString(),
-                                interpretation = userData.classificationResult,
-                                testId = userData._id,
-                                testTime = userData.testTime,
-                                collectionTime = userData.testTime,
-                                expiryTime = userData.testTime,
-                            )
-                        )
-                    }
                 }
+                dialog.dismiss()
             }
-            if (isTokenAvailable) {
-                hemoCubeViewModel.uploadResult(resultList)
-            }
-            dialog.dismiss()
-        }
-
-        hemoCubeViewModel.allKitTestData.observe(viewLifecycleOwner) { kitDataList ->
-            kitDataList.forEach { userData ->
-                if (!userData.localFlag) {
-                    userData.localFlag = true
-                    hemoCubeViewModel.bulkAddResultKitTestToDb(userData)
-                }
-            }
-            dialog.dismiss()
         }
     }
 
-//    private fun downloadLocalDBData(dialog: DialogInterface) {
-//        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-//            val downloadList = mutableListOf<HemoCubeTestData>()
-//
-//            userDataList.forEach { userData ->
-//                if (!userData.isCSVCreated) {
-//                    downloadList.add(userData) // Add the userData to downloadList
-//                }
-//            }
-//
-//            if (downloadList.isNotEmpty()) {
-//                // Call ViewModel function to create CSV with filtered data
-//                hemoCubeViewModel.createCSV(downloadList, requireContext())
-//                Toast.makeText(requireContext(), "Done", Toast.LENGTH_SHORT).show()
-//            } else {
-//                Toast.makeText(requireContext(), "Failed", Toast.LENGTH_SHORT).show()
-//            }
-//
-//            dialog.dismiss()
-//        }
-//    }
-
     private fun deleteIncompleteRegistrations(userDataList: List<UserData>) {
         userDataList.forEach { userData ->
             if (userData.csvPath.isEmpty()) {
@@ -691,7 +319,7 @@ class HomeFragment : Fragment() {
 
     private fun deleteHemoCubeIncompleteRegistrations(userDataList: List<HemoCubeTestData>) {
         userDataList.forEach { userData ->
-            if (userData._id.isEmpty()) {
+            if (userData.testTime?.isEmpty() == true) {
                 hemoCubeViewModel.deleteById(userData._id)
             }
         }
@@ -701,79 +329,4 @@ class HomeFragment : Fragment() {
         super.onDestroyView()
         _binding = null
     }
-
-    private fun downloadCsv() {
-        context?.let { context ->
-            val success = homeViewModel.getLocalUserDataForCsv(context)
-            if (success) {
-                // Provide feedback to the user if needed
-                Toast.makeText(context, "CSV file downloaded successfully", Toast.LENGTH_SHORT)
-                    .show()
-            } else {
-                // Handle the case where CSV file generation failed
-                Toast.makeText(context, "Failed to download CSV file", Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    private fun showDownloadDialog(context: Context) {
-        val builder = AlertDialog.Builder(context)
-        builder.setTitle(R.string.download_db_registration_title)
-        builder.setMessage(R.string.download_db_registration_message)
-
-        builder.setPositiveButton(R.string.downloadcsv) { dialog, _ ->
-            downloadLocalDBData(dialog)
-        }
-
-        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
-            dialog.dismiss()
-        }
-
-        val dialog = builder.create()
-        dialog.show()
-    }
-
-    private fun downloadLocalDBData(dialog: DialogInterface) {
-        var csvDownloaded = false
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            try {
-                if (!csvDownloaded) {
-                    val downloadList = mutableListOf<HemoCubeTestData>()
-
-                    userDataList.forEach { userData ->
-                        if (userData.testStatus == true) {
-//                        if (!userData.isCSVCreated) {
-                            downloadList.add(userData) // Add the userData to downloadList
-                        }
-//                        }
-                    }
-
-                    if (downloadList.isNotEmpty()) {
-                        // Call ViewModel function to create CSV with filtered data
-                        hemoCubeViewModel.createCSV(downloadList, requireContext())
-                        csvDownloaded = true
-                        Toast.makeText(
-                            requireContext(),
-                            "CSV file downloaded successfully",
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    } else {
-                        Toast.makeText(
-                            requireContext(),
-                            "No data to download",
-                            Toast.LENGTH_SHORT
-                        )
-                            .show()
-                    }
-                }
-
-            } catch (e: Exception) {
-                e.printStackTrace()
-                Toast.makeText(requireContext(), "Error downloading CSV file", Toast.LENGTH_SHORT)
-                    .show()
-            } finally {
-                dialog.dismiss()
-            }
-        }
-    }
 }

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

@@ -1,75 +1,49 @@
 package com.example.hpostesting.presentation.dashboard
 
-import android.content.Context
-import android.content.pm.PackageManager
 import android.os.Bundle
-import android.widget.Toast
-import androidx.preference.ListPreference
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import com.example.hpostesting.data.constant.LanguageManager
-import `in`.sminnovations.hpostesting.R
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import com.example.hpostesting.presentation.dashboard.ui.slideshow.SlideshowViewModel
+import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
 
-private var isLanguageChanged = false
 
-class SlideshowFragment : PreferenceFragmentCompat() {
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
+class SlideshowFragment : Fragment() {
 
-        val languagePreference = ListPreference(requireContext())
-        languagePreference.key = "language_preference"
-        languagePreference.title = getString(R.string.app_language)
-        languagePreference.summary = getString(R.string.select_language)
-        languagePreference.entries = arrayOf("English", "Kannada", "Hindi")
-        languagePreference.entryValues = arrayOf("en", "kn", "hi")
-        languagePreference.setDefaultValue("en")
+    private var _binding: FragmentSlideshowBinding? = null
 
-        languagePreference.onPreferenceChangeListener =
-            Preference.OnPreferenceChangeListener { _, newValue ->
-                val languageCode = newValue as String
-                updateLanguage(requireContext(), languageCode)
-                true
-            }
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
 
-        preferenceScreen.addPreference(languagePreference)
-        setPreferenceScreen(preferenceScreen)
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        val slideshowViewModel =
+            ViewModelProvider(this).get(SlideshowViewModel::class.java)
 
-        // App Version Preference
-        val appVersionPreference = Preference(requireContext())
-        appVersionPreference.title = "App Version"
-        appVersionPreference.summary = getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
+        _binding = FragmentSlideshowBinding.inflate(inflater, container, false)
+        val root: View = binding.root
 
-        preferenceScreen.addPreference(languagePreference)
-        preferenceScreen.addPreference(appVersionPreference)
-        setPreferenceScreen(preferenceScreen)
+        val pInfo = requireActivity().packageManager.getPackageInfo(
+            requireActivity().packageName, 0
+        )
+        val version = pInfo.versionName
+        binding.textSlideshow.text = version
 
-        if (isLanguageChanged) {
-            Toast.makeText(requireContext(), R.string.language_update, Toast.LENGTH_SHORT).show()
-        }
+//        val textView: TextView = binding.textSlideshow
+//        slideshowViewModel.text.observe(viewLifecycleOwner) {
+//            textView.text = it
+//        }
+        return root
     }
 
-    private fun updateLanguage(context: Context, languageCode: String) {
-        LanguageManager.persistLanguagePreference(context, languageCode)
-        LanguageManager.setLocale(context, languageCode)
-        requireActivity().recreate() // Recreate activity to apply language changes
-        isLanguageChanged = true
-    }
-
-    private fun getAppVersion(context: Context): String {
-        return try {
-            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-            pInfo.versionName
-        } catch (e: PackageManager.NameNotFoundException) {
-            "N/A"
-        }
-    }
-
-    private fun getAppEnvironment(context: Context): String {
-        return try {
-            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-            pInfo.packageName.substringAfterLast('.')
-        } catch (e: PackageManager.NameNotFoundException) {
-            "N/A"
-        }
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
     }
 }

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

@@ -23,8 +23,7 @@ class LoginFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         _binding = FragmentLoginBinding.inflate(inflater, container, false)
-        sharedPreference =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        sharedPreference = requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         return binding.root
     }
 
@@ -48,10 +47,10 @@ class LoginFragment : Fragment() {
                 performLogin(loginId, password)
             } else {
                 if (loginId.isBlank()) {
-                    binding.loginId.error = R.string.enter_proper_login_id.toString()
+                    binding.loginId.error = "Please enter a proper Login ID"
                 }
                 if (password.isBlank()) {
-                    binding.password.error = R.string.enter_proper_password.toString()
+                    binding.password.error = "Please enter a proper password"
                 }
             }
         }
@@ -73,10 +72,10 @@ class LoginFragment : Fragment() {
                 navigateToHomeFragment()
                 return
             } else {
-                Toast.makeText(requireContext(), R.string.wrong_password, Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), "Wrong Password", Toast.LENGTH_SHORT).show()
             }
         }
-        Toast.makeText(requireContext(), R.string.wrong_user_id, Toast.LENGTH_SHORT).show()
+        Toast.makeText(requireContext(), "Wrong UserID", Toast.LENGTH_SHORT).show()
     }
 
     private fun saveUserId(userId: String) {

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

@@ -0,0 +1,13 @@
+package com.example.hpostesting.presentation.dashboard.ui.home
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class HomeViewModel : ViewModel() {
+
+    private val _text = MutableLiveData<String>().apply {
+        value = "This is home Fragment"
+    }
+    val text: LiveData<String> = _text
+}

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

@@ -1,184 +0,0 @@
-package com.example.hpostesting.presentation.deviceinfo
-
-import android.annotation.SuppressLint
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.ServiceConnection
-import android.content.SharedPreferences
-import android.hardware.usb.UsbDevice
-import android.hardware.usb.UsbDeviceConnection
-import android.hardware.usb.UsbManager
-import androidx.appcompat.app.AppCompatActivity
-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.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.calibration.CalibrationFragment
-import com.example.hpostesting.presentation.calibration.CalibrationViewModel
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.testRight.UsbService
-import com.hoho.android.usbserial.driver.UsbSerialDriver
-import com.hoho.android.usbserial.driver.UsbSerialProber
-import dagger.hilt.android.AndroidEntryPoint
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.ActivityCalibrationBinding
-import `in`.sminnovations.hpostesting.databinding.ActivityDeviceBinding
-@AndroidEntryPoint
-class DeviceActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityDeviceBinding
-    private val deviceViewModel by viewModels<DeviceViewModel>()
-    private var myMenu: Menu? = null
-    private lateinit var sharedPreferences: SharedPreferences
-    private lateinit var mDriver: UsbSerialDriver
-    private var mConnection: UsbDeviceConnection? = null
-    lateinit var mService: UsbService
-    private var deviceId = ""
-    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()
-            deviceViewModel.isServiceConnected = true
-            mConnection.let { mService.connect(mDriver, mConnection!!) }
-            moveToNext()
-        }
-
-        override fun onServiceDisconnected(arg0: ComponentName) {
-            deviceViewModel.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 = ActivityDeviceBinding.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.fgDevice.id, DeviceFragment())
-            .commit()
-    }
-    @SuppressLint("MutableImplicitPendingIntent")
-    private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-            )
-        } else {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HOMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
-
-        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
-        manager.requestPermission(device, mPendingIntent)
-    }
-
-
-    fun setupService() {
-        val intent = Intent(this, UsbService::class.java)
-        bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.my_menu, menu)
-        return true
-    }
-    override fun onDestroy() {
-        super.onDestroy()
-        if (deviceViewModel.isServiceConnected) {
-            mService.disconnect()
-            unbindService(connection)
-            deviceViewModel.isServiceConnected = false
-        }
-    }
-}

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

@@ -1,109 +0,0 @@
-package com.example.hpostesting.presentation.deviceinfo
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
-import `in`.sminnovations.hpostesting.databinding.FragmentDeviceBinding
-
-
-
-class DeviceFragment : Fragment() {
-    private lateinit var binding: FragmentDeviceBinding
-    private val deviceViewModel: HemoCubeViewModel by activityViewModels()
-    private lateinit var sharedPreferences: SharedPreferences
-    private var deviceId = ""
-    private var startListening = MutableLiveData(false)
-    private var resultData: String = ""
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
-    ): View {
-        binding = FragmentDeviceBinding.inflate(inflater, container, false)
-        sharedPreferences =
-            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initViews()
-
-    }
-
-    private fun initViews() {
-        deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()
-        listenToHemoCube()
-        getDeviceId()
-    }
-
-    private fun getDeviceId() {
-        deviceViewModel.progressBar.postValue(true)
-        (activity as DeviceActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            object : UsbServiceListener {
-                @SuppressLint("SetTextI18n")
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        deviceViewModel.messages.postValue(stringData)
-                        binding.tvSubtitle4.text = "Device ID: ${stringData}"
-                    }
-                }
-                override fun onUsbError(e: Exception?) {
-                    deviceViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-
-
-    private fun listenToHemoCube() {
-
-        val fullReadOutput = StringBuilder()
-        startListening.postValue(true)
-
-        try {
-            (activity as DeviceActivity).mService.listenToHemoCube(object : UsbServiceListener {
-                @SuppressLint("SetTextI18n")
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        deviceViewModel.messages.postValue(stringData)
-                        fullReadOutput.append(stringData)
-                        resultData += stringData
-                        binding.tvSubtitle4.text = "Device ID : ${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()
-                                }
-//                                binding.tvSubtitle4.text = hardwareId
-                            }
-                        }
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    deviceViewModel.progressBar.postValue(false)
-                }
-            })
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-}

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

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

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

@@ -1,184 +0,0 @@
-package com.example.hpostesting.presentation.deviceprovision
-
-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 DeviceProvisionActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityAutoDacBinding
-    val viewModel: DeviceProvisionViewModel 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()
-            }
-        }
-    }
-
-    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, DeviceProvisionFragment()).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.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-            )
-        } else {
-            PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HOMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
-
-        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
-        manager.requestPermission(device, mPendingIntent)
-    }
-
-
-    fun setupService() {
-        val intent = Intent(this, UsbService::class.java)
-        bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-
-
-    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/deviceprovision/DeviceProvisionFragment.kt

@@ -1,168 +0,0 @@
-package com.example.hpostesting.presentation.deviceprovision
-
-import android.content.Context
-import android.content.Intent
-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 com.example.hpostesting.data.Result
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
-import `in`.sminnovations.hpostesting.databinding.FragmentDeviceProvisionBinding
-
-class DeviceProvisionFragment : Fragment() {
-
-    private var resultData: String = ""
-    private lateinit var binding: FragmentDeviceProvisionBinding
-    private val viewModel: DeviceProvisionViewModel by activityViewModels()
-    private lateinit var sharedPreferences: SharedPreferences
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentDeviceProvisionBinding.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() {
-        listenToHemoCube()
-        getDeviceId()
-        binding.btnSubmit.setOnClickListener {
-            viewModel.deviceProvision(
-                DeviceProvisionRequest(
-                    email = Constants.deviceProvisionEmail,
-                    password = Constants.deviceProvisionPassword,
-                    serialNumber = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                    uid = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()
-                )
-            )
-        }
-    }
-
-    private fun observeViewModel() {
-
-        viewModel.deviceProvisionResponse.observe(viewLifecycleOwner) { response ->
-            when (response) {
-                is Result.Success -> {
-                    if (response.data.result == "Success") {
-                        with(sharedPreferences.edit()) {
-                            putString(
-                                Constants.DEVICE_ID_API,
-                                response.data.data?.credentials?.username
-                            )
-                            putString(
-                                Constants.DEVICE_PASSWORD_API,
-                                response.data.data?.credentials?.password
-                            )
-                            putString(
-                                Constants.NATS_TOKEN,
-                                response.data.data?.device?.deviceUser?.natsToken
-                            )
-                            putString(
-                                Constants.NATS_TOKEN_EXPIRE_DATE,
-                                response.data.data?.device?.deviceUser?.natsTokenExpiry
-                            )
-                            apply()
-                        }
-                        startActivity(Intent(requireContext(), DashboardActivity::class.java))
-                        Toast.makeText(
-                            activity, "Device registered successfully", Toast.LENGTH_LONG
-                        ).show()
-                    } else {
-                        Toast.makeText(
-                            activity,
-                            "An error occurred in device provision: ${response.data.message}",
-                            Toast.LENGTH_LONG
-                        ).show()
-                        binding.btnSubmit.visibility = View.VISIBLE
-                    }
-
-                }
-
-                is Result.Error -> {
-                    response.exception.let { message ->
-                        Toast.makeText(
-                            activity,
-                            "An error occurred in device provision: $message",
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
-                }
-
-                is Result.Loading -> {
-                    binding.btnSubmit.visibility = View.GONE
-                }
-
-                else -> {}
-            }
-        }
-    }
-
-
-    private fun getDeviceId() {
-        (activity as DeviceProvisionActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
-                override fun onUsbError(e: Exception?) {}
-            })
-    }
-
-    private fun listenToHemoCube() {
-
-        val fullReadOutput = StringBuilder()
-
-        try {
-            (activity as DeviceProvisionActivity).mService.listenToHemoCube(object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        fullReadOutput.append(stringData)
-                        resultData += stringData
-                        handleUsbData()
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {}
-            })
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-
-    private fun handleUsbData() {
-        when {
-            resultData.contains("SNE") -> {
-                val pattern = Regex("HCV-\\d{3}-\\d{4}")
-                val matchResult = pattern.find(resultData)
-                val hardwareId = matchResult?.value
-
-                if (hardwareId.toString().length == 12) {
-                    with(sharedPreferences.edit()) {
-                        putString(Constants.DEVICE_ID, hardwareId)
-                        apply()
-                    }
-                    activity?.runOnUiThread {
-                        binding.btnSubmit.visibility = View.VISIBLE
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -1,36 +0,0 @@
-package com.example.hpostesting.presentation.deviceprovision
-
-import android.content.Context
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
-import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
-import com.example.hpostesting.data.repository.DatabaseRepository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-class DeviceProvisionViewModel @Inject constructor(
-    private val databaseRepository: DatabaseRepository,
-    context: Context
-) : ViewModel() {
-
-    var isServiceConnected = false
-    private val _networkStatusLiveData = NetworkStatusLiveData(context)
-    val networkStatusLiveData: LiveData<Boolean>
-        get() = _networkStatusLiveData
-
-    val deviceProvisionResponse = MutableLiveData<Result<DeviceProvisionResponse>>()
-
-    fun deviceProvision(deviceProvisionRequest: DeviceProvisionRequest) = viewModelScope.launch {
-        deviceProvisionResponse.postValue(Result.Loading())
-        databaseRepository.deviceProvision(deviceProvisionRequest).let {
-            deviceProvisionResponse.postValue(it)
-        }
-    }
-}

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

@@ -1,183 +0,0 @@
-package com.example.hpostesting.presentation.diagnostics
-
-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 androidx.appcompat.app.AppCompatActivity
-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.core.content.ContextCompat
-import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.testRight.UsbService
-import com.hoho.android.usbserial.driver.UsbSerialDriver
-import com.hoho.android.usbserial.driver.UsbSerialProber
-import dagger.hilt.android.AndroidEntryPoint
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.ActivityDiagnosticsBinding
-
-@AndroidEntryPoint
-class DiagnosticsActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityDiagnosticsBinding
-    val viewModel: DiagnosticsViewModel 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 = ActivityDiagnosticsBinding.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.fgDiagnostics.id, DiagnosticsFragment())
-            .commit()
-    }
-
-    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.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-            )
-        } else {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HOMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
-
-        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
-        manager.requestPermission(device, mPendingIntent)
-    }
-
-
-    fun setupService() {
-        val intent = Intent(this, UsbService::class.java)
-        bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-
-
-    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/diagnostics/DiagnosticsFragment.kt

@@ -1,197 +0,0 @@
-package com.example.hpostesting.presentation.diagnostics
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.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.FragmentDiagnosticsBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-
-class DiagnosticsFragment : Fragment() {
-
-    private lateinit var binding: FragmentDiagnosticsBinding
-    private val diagnosticsViewModel: DiagnosticsViewModel 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 = FragmentDiagnosticsBinding.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
-            runDeviceDiagnostics()
-        }
-    }
-
-
-    private fun observeViewModel() {
-
-        diagnosticsViewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-        }
-
-        messages.observe(viewLifecycleOwner) {
-            binding.tvSubtitle4.text = it
-            Log.e("diagnostics",binding.tvSubtitle4.text.toString())
-        }
-
-        diagnosticsViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                showToast("Diagnostics data uploaded successfully")
-            }
-            if (result == "Local") {
-                showToast("Diagnostics uploading failed, note it down manually")
-            }
-
-            binding.progressBar.visibility = View.GONE
-        }
-    }
-
-    private fun getDeviceId() {
-        diagnosticsViewModel.progressBar.postValue(true)
-        (activity as DiagnosticsActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        diagnosticsViewModel.messages.postValue(stringData)
-                        binding.tvSubtitle4.text = stringData
-                    }
-                }
-                override fun onUsbError(e: Exception?) {
-                    diagnosticsViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun runDeviceDiagnostics() {
-        diagnosticsViewModel.progressBar.postValue(true)
-        (activity as DiagnosticsActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.DIAGNOSTICS_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-
-
-                }
-                override fun onUsbError(e: Exception?) {
-                    diagnosticsViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun listenToHemoCube() {
-
-        val fullReadOutput = StringBuilder()
-        startListening.postValue(true)
-
-        try {
-            (activity as DiagnosticsActivity).mService.listenToHemoCube(object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        diagnosticsViewModel.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("END") || fullReadOutput.contains("END")) {
-                        diagnosticsViewModel.addDiagnosticsDataToDb(DiagnosticsData(
-                            deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                            deviceData = resultData,
-                            runTime = SimpleDateFormat(
-                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                            ).format(Calendar.getInstance().time)
-                        ))
-                    }
-//                    val inputData = mutableListOf<String>()
-//                    while (true) {
-//                        if (fullReadOutput.toString().lowercase() == "end") {
-//                            break
-//                        }
-//                        inputData.add(fullReadOutput.toString())
-//                    }
-//
-//                    val parsedData = parseData(inputData)
-//                    Log.i("D-Data", parsedData.toString())
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    diagnosticsViewModel.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/diagnostics/DiagnosticsViewModel.kt

@@ -1,63 +0,0 @@
-package com.example.hpostesting.presentation.diagnostics
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.dao.HemoCubeDao
-import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.data.repository.DatabaseRepository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-import javax.inject.Inject
-@HiltViewModel
-class DiagnosticsViewModel @Inject constructor(
-    private val hemoCubeDao: HemoCubeDao,
-    private val repository: DatabaseRepository,
-    context: Context
-) : ViewModel() {
-    var isServiceConnected = false
-    val progressBar = MutableLiveData(false)
-    val messages = MutableLiveData<String>()
-    private val sharedPreference: SharedPreferences =
-        context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
-    val deviceData = MutableLiveData<DeviceData?>()
-    val fireBaseUpload = MutableLiveData<String>()
-
-    fun addDiagnosticsDataToDb(data: DiagnosticsData) {
-        viewModelScope.launch {
-            try {
-                when (val response = repository.addDiagnostics(data)) {
-                    is Response.Success -> {
-//                        Log.i("Testdb", "Data uploaded to Firestore successfully")
-                        fireBaseUpload.postValue("Success")
-                    }
-
-                    is Response.Error -> {
-//                        Log.e("Testdb", "Error uploading data to Firestore: $response")
-                        fireBaseUpload.postValue("Error")
-                    }
-
-                    else -> {}
-                }
-            } catch (e: Exception) {
-//                Log.e("Testdb", "Exception during data upload: ${e.message}")
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
-}

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

@@ -1,47 +0,0 @@
-package com.example.hpostesting.presentation.hemocube
-
-import android.content.BroadcastReceiver
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
-import android.hardware.usb.UsbDevice
-import android.hardware.usb.UsbDeviceConnection
-import android.hardware.usb.UsbManager
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import android.os.IBinder
-import android.view.Menu
-import androidx.activity.viewModels
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
-import com.hoho.android.usbserial.driver.UsbSerialDriver
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.ActivityDigitalCardBinding
-import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
-
-class DigitalCardActivity : AppCompatActivity() {
-
-    private lateinit var binding: ActivityDigitalCardBinding
-
-    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 = ActivityDigitalCardBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        moveToNext()
-    }
-
-
-    private fun moveToNext() {
-        if (supportFragmentManager.isDestroyed) return
-        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, DigitalCardFragment())
-            .commit()
-    }
-}

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

@@ -1,83 +0,0 @@
-package com.example.hpostesting.presentation.hemocube
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.util.Log
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.FragmentDigitalCardBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Date
-import java.util.Locale
-
-class DigitalCardFragment : Fragment() {
-    private lateinit var binding: FragmentDigitalCardBinding
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
-    private lateinit var sharedPreferences: SharedPreferences
-    private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
-    ): View {
-        binding = FragmentDigitalCardBinding.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()
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun initViews() {
-        activity?.runOnUiThread {
-            binding.progressBar.visibility = View.VISIBLE
-        }
-        Log.d("DigitalCardFragment", "Name: ${DataHolder.hemoCubeTestData?.name}")
-        Log.d("DigitalCardFragment", "DOB: ${testDetails?.birthYear}")
-        Log.d("DigitalCardFragment", "Gender: ${testDetails?.gender}")
-        Log.d("DigitalCardFragment", "State: ${testDetails?.state}")
-        Log.d("DigitalCardFragment", "ABHA ID: ${testDetails?.abhaId}")
-        Log.d("DigitalCardFragment", "Blood Group: ${testDetails?.bloodGroup}")
-        Log.d("DigitalCardFragment", "Sickle-Cell: ${testDetails?.classificationResult}")
-//        Log.d("DigitalCardFragment", "Issue Date: $formattedDate")
-        activity?.runOnUiThread {
-            binding.progressBar.visibility = View.GONE
-            binding.name.text = "Name: ${DataHolder.hemoCubeTestData?.name}"
-            binding.dob.text = "DOB: ${testDetails?.birthYear}"
-            binding.gender.text = "Gender: ${testDetails?.gender}"
-            binding.State.text = "State: ${testDetails?.state}"
-            binding.abhaid.text = "ABHA ID: ${testDetails?.abhaId}"
-            binding.blood.text = "Blood Group: ${testDetails?.bloodGroup}"
-            binding.sicklecell.text = "Sickle-Cell: ${DataHolder.hemoCubeTestData?.prdClassification.toString()}"
-
-        }
-        // Update the UI with the fetched details
-        val originalDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-        val originalDate: Date? = originalDateFormat.parse(SimpleDateFormat(
-            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-        ).format(Calendar.getInstance().time))
-
-// Format the parsed date to "mm date, year"
-        val desiredDateFormat = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault())
-        val formattedDate: String = originalDate?.let { desiredDateFormat.format(it) } ?: "N/A"
-        activity?.runOnUiThread {
-            binding.issueDate.text = "Issue Date: ${formattedDate}"
-        }
-
-    }
-
-
-}

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

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