127 version with all updates, credential.txt file location changed, Ui updated.

2024-09-09 16:39:58 +05:30 · 2024-09-09 16:36:29 +05:30 · 2024-09-09 16:29:59 +05:30
48 changed files with 273 additions and 1724 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,63 @@
+# This file is a template, and might need editing before it works on your project.
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
+# https://docs.gitlab.com/ee/development/cicd/templates.html
+# This specific template is located at:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Android.gitlab-ci.yml
+
+# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny
+# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template.
+
 image: eclipse-temurin:17-jdk-jammy

 variables:
-  ANDROID_COMPILE_SDK: "34"
-  ANDROID_BUILD_TOOLS: "33.0.2"
-  ANDROID_SDK_TOOLS: "9477386"
-  
-  # Keystore credentials stored as GitLab CI/CD variables
-  KEYSTORE_PASSWORD: $KS_PASSWORD
-  KEY_ALIAS: $KS_ALIAS
-  KEY_PASSWORD: $KS_KEY_PASSWORD

+  # ANDROID_COMPILE_SDK is the version of Android you're compiling with.
+  # It should match compileSdkVersion.
+  ANDROID_COMPILE_SDK: "34"
+
+  # ANDROID_BUILD_TOOLS is the version of the Android build tools you are using.
+  # It should match buildToolsVersion.
+  ANDROID_BUILD_TOOLS: "33.0.2"
+
+  # It's what version of the command line tools we're going to download from the official site.
+  # Official Site-> https://developer.android.com/studio/index.html
+  # There, look down below at the cli tools only, sdk tools package is of format:
+  #        commandlinetools-os_type-ANDROID_SDK_TOOLS_latest.zip
+  # when the script was last modified for latest compileSdkVersion, it was which is written down below
+  ANDROID_SDK_TOOLS: "9477386"
+
+# Packages installation before running script
 before_script:
  - apt-get --quiet update --yes
  - apt-get --quiet install --yes wget unzip
+
+  # Setup path as android_home for moving/exporting the downloaded sdk into it
  - export ANDROID_HOME="${PWD}/android-sdk-root"
+  # Create a new directory at specified location
  - install -d $ANDROID_HOME
+  # Here we are installing androidSDK tools from official source,
+  # (the key thing here is the url from where you are downloading these sdk tool for command line, so please do note this url pattern there and here as well)
+  # after that unzipping those tools and
+  # then running a series of SDK manager commands to install necessary android SDK packages that'll allow the app to build
  - wget --no-verbose --output-document=$ANDROID_HOME/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip
  - unzip -q -d "$ANDROID_HOME/cmdline-tools" "$ANDROID_HOME/cmdline-tools.zip"
  - mv -T "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/tools"
  - export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/cmdline-tools/tools/bin
+
+  # Nothing fancy here, just checking sdkManager version
  - sdkmanager --version
+
+  # use yes to accept all licenses
  - yes | sdkmanager --licenses > /dev/null || true
  - sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}"
  - sdkmanager "platform-tools"
  - sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
+
+  # Not necessary, but just for surity
  - chmod +x ./gradlew

+# Basic android and gradle stuff
+# Check linting
 lintDebug:
  interruptible: true
  stage: build
@@ -37,6 +69,7 @@ lintDebug:
    expose_as: "lint-report"
    when: always

+# Make Project
 assembleDebug:
  interruptible: true
  stage: build
@@ -45,68 +78,8 @@ assembleDebug:
  artifacts:
    paths:
      - app/build/outputs/
-      
-# Job for building signed release APK for tags containing "release" on any branch
-assembleRelease:
-  stage: build
-  script:
-    - |
-      if [[ "$CI_COMMIT_TAG" =~ release ]]; then
-        echo "Decoding keystore file from Base64"
-        
-        # Debug: Print the first few characters of BASE64_KEYSTORE
-        echo "First 20 characters of BASE64_KEYSTORE: ${BASE64_KEYSTORE:0:20}..."
-        
-        # Check if BASE64_KEYSTORE is a file path
-        if [[ "$BASE64_KEYSTORE" == /* ]] && [[ -f "$BASE64_KEYSTORE" ]]; then
-          echo "BASE64_KEYSTORE appears to be a file path. Reading content..."
-          BASE64_CONTENT=$(cat "$BASE64_KEYSTORE")
-        else
-          echo "BASE64_KEYSTORE is not a file path. Using as-is."
-          BASE64_CONTENT="$BASE64_KEYSTORE"
-        fi
-        
-        # Remove any potential whitespace or newline characters
-        CLEANED_KEYSTORE=$(echo "$BASE64_CONTENT" | tr -d '[:space:]')
-        
-        # Attempt to decode and save to a file
-        if echo "$CLEANED_KEYSTORE" | base64 -d > "$CI_PROJECT_DIR/app/keystore.jks" 2>/tmp/base64_error; then
-          echo "Keystore file decoded successfully"
-        else
-          echo "Error decoding keystore file:"
-          cat /tmp/base64_error
-          echo "First 20 characters of cleaned content: ${CLEANED_KEYSTORE:0:20}..."
-          exit 1
-        fi
-        
-        # Check if the keystore file was created and has content
-        if [ -s "$CI_PROJECT_DIR/app/keystore.jks" ]; then
-          echo "Keystore file created successfully"
-          # Print file size for verification
-          ls -l "$CI_PROJECT_DIR/app/keystore.jks"
-        else
-          echo "Error: Keystore file is empty or not created"
-          exit 1
-        fi
-        
-        echo "Building signed release APK"
-        ./gradlew assembleRelease \
-          -Pandroid.injected.signing.store.file="$CI_PROJECT_DIR/app/keystore.jks" \
-          -Pandroid.injected.signing.store.password="$KEYSTORE_PASSWORD" \
-          -Pandroid.injected.signing.key.alias="$KEY_ALIAS" \
-          -Pandroid.injected.signing.key.password="$KEY_PASSWORD"
-      else
-        echo "Tag '$CI_COMMIT_TAG' does not contain 'release'. Skipping release build."
-      fi
-  artifacts:
-    paths:
-      - app/build/outputs/
-    expire_in: never
-  rules:
-    - if: $CI_COMMIT_TAG =~ /release/
-      when: always
-    - when: never

+# Run all tests, if any fails, interrupt the pipeline(fail it)
 debugTests:
  needs: [lintDebug, assembleDebug]
  interruptible: true
@@ -125,4 +98,4 @@ publishTestResults:
  artifacts:
    when: always
    reports:
-      junit: app/build/test-results/testDebugUnitTest/*.xml
+      junit: app/build/test-results/testDebugUnitTest/*.xml
--- a/README.md
+++ b/README.md
@@ -2,4 +2,3 @@
 ### Release key

 	key0: prime24
-        
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,13 +15,14 @@ android {
    namespace 'in.sminnovations.hpostesting'

    // dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production
-    // server -> for server switching for internal test
+    //for testing in iisc->in.sminnovations.hpostesting.test / prod -> in.sminnovations.hpostesting.iocl
    defaultConfig {
-        applicationId "in.sminnovations.hpostesting.server"
+        applicationId "in.sminnovations.hpostesting.iocl"
        minSdk 21
        targetSdk 34
-        versionCode 130
-        versionName "2.1.130"
+        versionCode 129
+        versionName "2.1.129"
+
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

@@ -124,6 +125,7 @@ dependencies {
    implementation 'com.github.mik3y:usb-serial-for-android:3.8.0'

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

--- a/app/google-services.json
+++ b/app/google-services.json
@@ -1,36 +1,45 @@
 {
  "project_info": {
-    "project_number": "650071678820",
-    "project_id": "hpos-af3cc",
-    "storage_bucket": "hpos-af3cc.appspot.com"
+    "project_number": "630821402019",
+    "project_id": "iocl-iisc",
+    "storage_bucket": "iocl-iisc.appspot.com"
  },
  "client": [
    {
      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f6fd45e2f6a63aef6c6471",
+        "mobilesdk_app_id": "1:630821402019:android:ab77866fb7b3114b1dd616",
        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting.server"
+          "package_name": "in.sminnovations.hposregistration.iocl"
        }
      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
      "api_key": [
        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+          "current_key": "AIzaSyABIdxI89eTZ8BqU2cIoJOgJ1lS1cFLCtQ"
        }
      ],
      "services": {
        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:630821402019:android:ed56bae066ac32b51dd616",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hpostesting.iocl"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyABIdxI89eTZ8BqU2cIoJOgJ1lS1cFLCtQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
        }
      }
    }
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -4,15 +4,15 @@
    "type": "APK",
    "kind": "Directory"
  },
-  "applicationId": "in.sminnovations.hpostesting.dev",
+  "applicationId": "in.sminnovations.hpostesting.iocl",
  "variantName": "release",
  "elements": [
    {
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 127,
-      "versionName": "2.1.127",
+      "versionCode": 129,
+      "versionName": "2.1.129",
      "outputFile": "app-release.apk"
    }
  ],
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,12 +25,6 @@

    <uses-permission android:name="android.permission.USB_PERMISSION" />

-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.ACCOUNT_MANAGER"
-        tools:ignore="ProtectedPermissions" />
-
-
    <application
        android:name="com.example.hpostesting.HPOSTestingApplication"
        android:allowBackup="true"
@@ -80,17 +74,13 @@
            android:name="com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity"
            android:exported="false"
            android:theme="@style/Theme.HPOS.NoActionBar" />
-        <activity
-            android:name="com.example.hpostesting.presentation.hb_test.HBTestActivity"
-            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.autodac.AutoDacActivity"
            android:exported="false"
            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.jig.JigActivity"
-            android:exported="true"
+            android:exported="false"
            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity"
@@ -134,7 +124,7 @@
            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
-            android:exported="true"
+            android:exported="false"
            android:label="@string/title_activity_dashboard"
            android:screenOrientation="portrait"
            android:theme="@style/Theme.HPOS.NoActionBar"
@@ -176,7 +166,7 @@
        </activity>
        <activity
            android:name="com.example.hpostesting.presentation.testRight.TestRightActivity"
-            android:exported="true"
+            android:exported="false"
            android:noHistory="true"
            android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
            android:theme="@style/Theme.HPOS.NoActionBar"
--- a/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt
+++ b/app/src/main/java/com/example/hpostesting/HPOSTestingApplication.kt
@@ -14,29 +14,25 @@
 package com.example.hpostesting

 import android.app.Application
-import com.example.hpostesting.firebase.FirebaseManager
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.FirebaseFirestoreSettings
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import javax.inject.Inject

@HiltAndroidApp
 class HPOSTestingApplication : Application() {
-    @Inject
-    lateinit var firebaseManager: FirebaseManager
+    val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
    override fun onCreate() {
        super.onCreate()
        val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
-        // You can now use firebaseManager here after Hilt injects it
        val firestoreSettings = FirebaseFirestoreSettings.Builder()
            .setPersistenceEnabled(true) // Enable offline persistence if needed
            .build()

-        val firestore = firebaseManager.getCurrentFirestore()
+        val firestore = FirebaseFirestore.getInstance()
        firestore.firestoreSettings = firestoreSettings
    }
 }
--- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
@@ -28,8 +28,8 @@ object Constants {
    const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb"
    const val ABHA_APP_PACKAGE = "in.ndhm.phr"

-    const val MOLBIO_INTEGRATION = false
-    const val FIREBASE_INTEGRATION = true
+    const val MOLBIO_INTEGRATION = true
+    const val FIREBASE_INTEGRATION = false
    const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
    const val deviceProvisionPassword = "f2ab0e7f9d69"
    const val DEVICE_ID_API = "deviceIDAPI"
--- a/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
@@ -21,7 +21,6 @@ import com.example.hpostesting.data.model.test.TestType

 object DataHolder {

-    var sampleId: String = "sampleId"
    var selectedTestType: TestType = TestType.SICKLECERT
    val usbConnected = MutableLiveData(true)
    var mobileUniqueId: String? = null
@@ -38,8 +37,6 @@ object DataHolder {
    val intensityReferenceArray = ArrayList<Double>()
    var selectedTest: UserData? = null
    var hemoCubeTestData: HemoCubeTestData? = null
-    var bloodGroup: String = "Unknown"
-    var age = "0"
    var kitSerial: String = ""
    var centerName: String = ""
    var district: String = ""
--- a/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
@@ -35,8 +35,6 @@ enum class TestStatus(val code: Double) {
    BUFFER_PRINT_STARTED(6.0),
    BUFFER_PRINT_COMPLETED(7.0),
    SAMPLE_STARTED(8.0),
-    CUVETTE_ABSENTT(30.2),
-    CUVETTE_PRESENTT(30.1),
    SAMPLE_COMPLETED(9.0),
    SAMPLE_PRINT_STARTED(10.0),
    SAMPLE_PRINT_COMPLETED(11.0),
--- a/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt
@@ -40,8 +40,10 @@ interface HemoCubeDao {

    @Query("DELETE FROM hemo_cube_test_table WHERE _id = :id")
    suspend fun deleteById(id: String)
+
    @Query("DELETE FROM hemo_cube_test_table WHERE testStatus = 0")
    suspend fun deleteByStatus()
+
    @Query("UPDATE hemo_cube_test_table SET localFlag = :newValue WHERE _id = :id")
    suspend fun updateFieldById(id: String, newValue: Boolean)

--- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt
@@ -54,7 +54,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
                "name",
                "incubationTime",
                "bloodGroup",
-                "age", // Include other fields from the data class
+                "birthYear", // Include other fields from the data class
                "state",
                "abhaId",
                "userImageURL",
@@ -177,7 +177,7 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
                "name",
                "incubationTime",
                "bloodGroup",
-                "age", // Include other fields from the data class
+                "birthYear", // Include other fields from the data class
                "state",
                "abhaId",
                "userImageURL",
--- a/app/src/main/java/com/example/hpostesting/data/model/test/TestType.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/test/TestType.kt
@@ -15,6 +15,5 @@ package com.example.hpostesting.data.model.test

 enum class TestType {
    SICKLECERT,
-    SICKLEFIND,
-    HB_EST
+    SICKLEFIND
 }
--- a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
@@ -14,9 +14,6 @@
 package com.example.hpostesting.data.repository

 import android.net.Uri
-import android.os.Build
-import android.util.Log
-import androidx.annotation.RequiresApi
 import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
@@ -40,18 +37,17 @@ import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.CheckUpdateResponse
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
-import com.example.hpostesting.firebase.FirebaseManager
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
-import com.google.firebase.storage.FirebaseStorage
+import com.google.firebase.storage.ktx.storage
 import kotlinx.coroutines.tasks.await
 import okhttp3.MultipartBody
 import okhttp3.ResponseBody
 import java.io.File
 import java.net.ConnectException
 import java.net.SocketTimeoutException
-import java.time.LocalTime
 import javax.inject.Inject
 import javax.inject.Named

@@ -59,30 +55,11 @@ class NetworkException(message: String, cause: Throwable) : Exception(message, c
 class DatabaseRepository @Inject constructor(
    @Named("Auth") private val molbioAuthApi: MolbioAuthApi,
    private val molbioResultApi: MolbioResultApi,
-    private val firebaseManager: FirebaseManager,
 ) : Repository {

-    private val localdb: FirebaseFirestore
-        get() = firebaseManager.getCurrentFirestore()
+    private val db: FirebaseFirestore = Firebase.firestore
+    private val storage = Firebase.storage

-    private val localStg: FirebaseStorage
-        get() = firebaseManager.getCurrentStorage()
-
-
-
-//    // Example function to add data to Firestore , like the basic data as test data
-//    @RequiresApi(Build.VERSION_CODES.O)
-//    fun addtodb(data: String) {
-//        val date = LocalTime.now()
-//        localdb.collection("BasicData")
-//            .add(mapOf("data $date" to data))
-//            .addOnSuccessListener {
-//                Log.d("UPLOAD", "Data uploaded successfully ${localdb.app.name}")
-//            }
-//            .addOnFailureListener { exception ->
-//                Log.d("UPLOAD", "Failed to upload data: ${exception.message}  ${localdb.app.name}")
-//            }
-//    }
    private suspend fun <T : Any> safeApiCall(apiCall: suspend () -> T): Result<T> {
        return try {
            val response = apiCall.invoke()
@@ -131,13 +108,13 @@ class DatabaseRepository @Inject constructor(
    override suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
        return try {
            val userdata =
-                localdb.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
            if (userdata.documents.isNotEmpty()) {
                userdata.documents.forEach {
-                    localdb.collection("patientData").document(it.id).update("testStatus", true)
+                    db.collection("patientData").document(it.id).update("testStatus", true)
                }
            }
-            localdb.collection("testData").add(data).await()
+            db.collection("testData").add(data).await()
            Response.Success(data._id)
        } catch (e: Exception) {
            Response.Error(e)
@@ -145,10 +122,15 @@ class DatabaseRepository @Inject constructor(
    }
    override suspend fun addQcTestToDatabase(data: HemoCubeTestData?): Response<String> {
        return try {
-
-            localdb.collection("qcData").add(data!!).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("qcData").add(data).await()
            Response.Success(data._id)
-
        } catch (e: Exception) {
            Response.Error(e)
        }
@@ -160,7 +142,7 @@ class DatabaseRepository @Inject constructor(

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

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

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

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

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

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

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

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

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

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

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

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

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

    override suspend fun uploadDeviceId(data: DeviceData): Response<String>? {
        return try {
-            localdb.collection("devices").add(data!!).await()
+            db.collection("devices").add(data!!).await()
            Response.Success(data.deviceId)
        } catch (e: Exception) {
            Firebase.crashlytics.recordException(e)
@@ -285,13 +267,13 @@ class DatabaseRepository @Inject constructor(
    override suspend fun addTestToDatabasefornew(data: HemoCubeTestData?): Response<String> {
            return try {
                val userdata =
-                    localdb.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+                    db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
                if (userdata.documents.isNotEmpty()) {
                    userdata.documents.forEach {
-                        localdb.collection("patientData").document(it.id).update("testStatus", true)
+                        db.collection("patientData").document(it.id).update("testStatus", true)
                    }
                }
-                localdb.collection("testData").add(data).await()
+                db.collection("testData").add(data).await()
                Response.Success(data._id)
            } catch (e: Exception) {
                Firebase.crashlytics.recordException(e)
--- a/app/src/main/java/com/example/hpostesting/di/AppModule.kt
+++ b/app/src/main/java/com/example/hpostesting/di/AppModule.kt
@@ -21,6 +21,7 @@ import androidx.room.Room
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.util.PropertyProvider
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
@@ -35,13 +36,9 @@ import com.example.hpostesting.domain.LogFileManager
 import com.example.hpostesting.domain.LogFileManagerImpl
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.firebase.FirebaseManager
 import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.utils.UsbServiceListenerImpl
-import com.example.hpostesting.util.PropertyProvider
 import com.example.hpostesting.util.PropertyProviderImpl
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.storage.FirebaseStorage
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -110,52 +107,22 @@ object AppModule {
        return SaveRawDataTest(repository)
    }

-    @Provides
-    @Singleton
-    fun provideFirebaseFirestore(): FirebaseFirestore {
-        return FirebaseFirestore.getInstance()
-    }
-
-    @Provides
-    @Singleton
-    fun provideFirebaseStorage(): FirebaseStorage {
-        return FirebaseStorage.getInstance()
-    }
-
-    @Provides
-    @Singleton
-    fun provideFirebaseManager(
-        @ApplicationContext context: Context,
-    ): FirebaseManager {
-        return FirebaseManager(context)
-    }
-
    @Provides
    @Singleton
    fun provideDatabaseRepository(
-        firebaseManager: FirebaseManager,
        @Named("Auth") molbioAuthApi: MolbioAuthApi,
        molbioResultApi: MolbioResultApi
    ): DatabaseRepository {
-        return DatabaseRepository(
-            firebaseManager = firebaseManager,
-            molbioAuthApi = molbioAuthApi,
-            molbioResultApi = molbioResultApi
-        )
+        return DatabaseRepository(molbioAuthApi = molbioAuthApi, molbioResultApi = molbioResultApi)
    }

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

    @Provides
@@ -239,9 +206,4 @@ object AppModule {
    fun provideUsbServiceListener(context: Context): UsbServiceListener {
        return UsbServiceListenerImpl(context)
    }
-
-
-
-
-
 }
--- a/app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt
+++ b/app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt
@@ -1,153 +0,0 @@
-package com.example.hpostesting.firebase
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-import android.content.Context
-import android.content.Intent
-import android.os.Process
-import com.google.firebase.FirebaseApp
-import com.google.firebase.FirebaseOptions
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.storage.FirebaseStorage
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-class FirebaseManager @Inject constructor(private val context: Context) {
-
-    private val sharedPreferences =
-        context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)
-
-    private var currentFirestore: FirebaseFirestore = FirebaseFirestore.getInstance()
-    private var currentStorage: FirebaseStorage = FirebaseStorage.getInstance()
-    var updateStatus = false
-
-    private val defaultServers = listOf(
-        // i have it in different place look down
-        firebaseConfig1, firebaseConfig2, firebaseConfig3,
-    )
-
-    init {
-        val lastSelectedServer = getLastSelectedServer()
-        switchServer(lastSelectedServer)
-    }
-
-    fun getCurrentFirestore(): FirebaseFirestore = currentFirestore
-    fun getCurrentStorage(): FirebaseStorage = currentStorage
-
-    fun switchServer(firebaseConfig: FirebaseConfig) {
-        saveSelectedServer(firebaseConfig)
-        val firebaseApp = getOrInitializeFirebaseApp(firebaseConfig)
-        currentFirestore = FirebaseFirestore.getInstance(firebaseApp)
-        currentStorage = FirebaseStorage.getInstance(firebaseApp)
-        updateStatus = true
-
-    }
-
-    private fun getOrInitializeFirebaseApp(firebaseConfig: FirebaseConfig): FirebaseApp {
-        val existingApp = FirebaseApp.getApps(context).find { it.name == firebaseConfig.serverName }
-
-        return if (existingApp != null) {
-
-            existingApp
-        } else {
-
-            val options = FirebaseOptions.Builder().setProjectId(firebaseConfig.projectId)
-                .setApplicationId(firebaseConfig.appId).setApiKey(firebaseConfig.apiKey)
-                .setStorageBucket(firebaseConfig.storageBucket).build()
-
-            FirebaseApp.initializeApp(context, options, firebaseConfig.serverName)
-        }
-    }
-
-    private fun saveSelectedServer(firebaseConfig: FirebaseConfig) {
-        with(sharedPreferences.edit()) {
-            putString("selectedServerName", firebaseConfig.serverName)
-            putString("projectId", firebaseConfig.projectId)
-            putString("appId", firebaseConfig.appId)
-            putString("apiKey", firebaseConfig.apiKey)
-            putString("storageBucket", firebaseConfig.storageBucket)
-            apply()
-        }
-
-    }
-
-    fun restartApp() {
-        if (updateStatus) {
-            updateStatus = false
-            delayedRestart(context)
-        }
-    }
-
-    fun getLastSelectedServer(): FirebaseConfig {
-        val selectedServerName =
-            sharedPreferences.getString("selectedServerName", defaultServers.first().serverName)
-        val projectId = sharedPreferences.getString("projectId", defaultServers.first().projectId)
-        val appId = sharedPreferences.getString("appId", defaultServers.first().appId)
-        val apiKey = sharedPreferences.getString("apiKey", defaultServers.first().apiKey)
-        val storageBucket =
-            sharedPreferences.getString("storageBucket", defaultServers.first().storageBucket)
-
-        return FirebaseConfig(
-            serverName = selectedServerName ?: defaultServers.first().serverName,
-            projectId = projectId ?: defaultServers.first().projectId,
-            appId = appId ?: defaultServers.first().appId,
-            apiKey = apiKey ?: defaultServers.first().apiKey,
-            storageBucket = storageBucket ?: defaultServers.first().storageBucket
-        )
-    }
-
-    fun getAvailableServers(): List<FirebaseConfig> {
-        return defaultServers
-    }
-}
-
-fun restartApp(context: Context) {
-    val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
-    intent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-    context.startActivity(intent)
-    Process.killProcess(Process.myPid())
-}
-@OptIn(DelicateCoroutinesApi::class)
-fun delayedRestart(context: Context) {
-    GlobalScope.launch(Dispatchers.Main) {
-        delay(5000L)
-        restartApp(context)
-    }
-}
-
-private val firebaseConfig1 = FirebaseConfig(
-    serverName = "dev",
-    apiKey = "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I",
-    appId = "1:650071678820:android:a53292637abb7c0d6c6471",
-    projectId = "hpos-af3cc",
-    storageBucket = "hpos-af3cc.appspot.com"
-)
-
-private val firebaseConfig2 = FirebaseConfig(
-    serverName = "qc-qa",
-    apiKey = "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs",
-    appId = "1:1004619739289:android:3dbcefb10ea99654e5c808",
-    projectId = "hpos-qa",
-    storageBucket = "hpos-qa.appspot.com"
-)
-
-private val firebaseConfig3 = FirebaseConfig(
-    serverName = "prod",
-    apiKey = "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38",
-    appId = "1:121176529204:android:a7bc0842f61e5095bbed61",
-    projectId = "hpos-preprod",
-    storageBucket = "hpos-preprod.appspot.com"
-)
--- a/app/src/main/java/com/example/hpostesting/firebase/dataClass.kt
+++ b/app/src/main/java/com/example/hpostesting/firebase/dataClass.kt
@@ -1,21 +0,0 @@
-package com.example.hpostesting.firebase
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-data class FirebaseConfig(
-    val serverName: String,
-    val apiKey: String,
-    val appId: String,
-    val projectId: String,
-    val storageBucket: String
-)
-
--- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
@@ -26,9 +26,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.data.model.test.TestType
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.hb_test.HBTestActivity
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import com.example.hpostesting.presentation.testRight.TestRightActivity
 import com.google.android.material.snackbar.Snackbar
@@ -367,26 +365,21 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {

    private fun moveToNext() {
        if(fromWhere == "Main"){
-            if(DataHolder.selectedTestType == TestType.HB_EST){
-                val i = Intent(applicationContext, HBTestActivity::class.java)
-                startActivity(i)
-            }else{
-                DataHolder.deviceType.observe(this) { deviceType ->
-                    when (deviceType) {
-                        Constants.DEVICE_TYPE_HEMOCUBE -> {
-                            val i = Intent(applicationContext, HemocubeActivity::class.java)
-                            startActivity(i)
-                        }
+            DataHolder.deviceType.observe(this) { deviceType ->
+                when (deviceType) {
+                    Constants.DEVICE_TYPE_HEMOCUBE -> {
+                        val i = Intent(applicationContext, HemocubeActivity::class.java)
+                        startActivity(i)
+                    }

-                        Constants.DEVICE_TYPE_TEST_RIGHT -> {
-                            val i = Intent(applicationContext, TestRightActivity::class.java)
-                            startActivity(i)
-                        }
+                    Constants.DEVICE_TYPE_TEST_RIGHT -> {
+                        val i = Intent(applicationContext, TestRightActivity::class.java)
+                        startActivity(i)
+                    }

-                        Constants.DEVICE_TYPE_TRUEHEME -> {
-                            val i = Intent(applicationContext, HemocubeActivity::class.java)
-                            startActivity(i)
-                        }
+                    Constants.DEVICE_TYPE_TRUEHEME -> {
+                        val i = Intent(applicationContext, HemocubeActivity::class.java)
+                        startActivity(i)
                    }
                }
            }
--- a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
@@ -18,7 +18,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.hardware.usb.UsbManager
 import android.location.Location
@@ -31,9 +30,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestType
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.android.gms.location.FusedLocationProviderClient
@@ -48,12 +48,12 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityMainBinding

 class MainActivity : AppCompatActivity() {
+
    private lateinit var binding: ActivityMainBinding
    private var myMenu: Menu? = null
    private val TAG = "MainActivity"
    private lateinit var fusedLocationClient: FusedLocationProviderClient
    private lateinit var locationCallback: LocationCallback
-    private lateinit var sharedPreference: SharedPreferences

    private val usbReceiver = object : BroadcastReceiver() {
        override fun onReceive(context: Context?, intent: Intent) {
@@ -73,21 +73,14 @@ class MainActivity : AppCompatActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        sharedPreference = getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
        binding = ActivityMainBinding.inflate(layoutInflater)
        setContentView(binding.root)
        binding.myToolbar.title = "Test Type"
        setSupportActionBar(binding.myToolbar)
-        if ((sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN")) {
-            binding.cvItem3.visibility = View.VISIBLE
-        }else{
-            binding.cvItem3.visibility = View.GONE
-        }
+
        setupListeners()
        fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
        getLocation()
-
        locationCallback = object : LocationCallback() {
            override fun onLocationResult(locationResult: LocationResult) {
                locationResult.lastLocation?.let { location ->
@@ -99,6 +92,7 @@ class MainActivity : AppCompatActivity() {
                }
            }
        }
+
        val usbFilter = IntentFilter().apply {
            addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
            addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED)
@@ -109,7 +103,7 @@ class MainActivity : AppCompatActivity() {
            with(binding) {
                if (deviceType == Constants.DEVICE_TYPE_HEMOCUBE) {
                    cvItem1.visibility = View.VISIBLE
-                    cvItem3.visibility = View.VISIBLE
+                    cvItem3.visibility = View.GONE
                    cvItem2.visibility = View.GONE
                    cvItem4.visibility = View.GONE
                }
@@ -123,7 +117,6 @@ class MainActivity : AppCompatActivity() {
 //        }
    }

-
    private fun checkAndUpdateUsbConnection() {
        val availableDrivers = UsbSerialProber.getDefaultProber()
            .findAllDrivers(getSystemService(Context.USB_SERVICE) as UsbManager)
@@ -139,7 +132,7 @@ class MainActivity : AppCompatActivity() {
                when {
                    device.productId == Constants.HOMO_CUBE_ID && device.vendorId == Constants.VENDOR_ID -> {
                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
+                        binding.cvItem3.visibility = View.GONE
                        binding.cvItem2.visibility = View.GONE
                        binding.cvItem4.visibility = View.GONE
                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
@@ -148,7 +141,7 @@ class MainActivity : AppCompatActivity() {

                    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.cvItem3.visibility = View.GONE
                        binding.cvItem2.visibility = View.GONE
                        binding.cvItem4.visibility = View.GONE
                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
@@ -157,7 +150,7 @@ class MainActivity : AppCompatActivity() {

                    device.productId == 24577 && device.vendorId == 1027 -> {
                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
+                        binding.cvItem3.visibility = View.GONE
                        binding.cvItem2.visibility = View.GONE
                        binding.cvItem4.visibility = View.GONE
                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_TRUEHEME)
@@ -166,7 +159,7 @@ class MainActivity : AppCompatActivity() {

                    device.productId == 8963 && device.vendorId == 1659 -> {
                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
+                        binding.cvItem3.visibility = View.GONE
                        binding.cvItem2.visibility = View.GONE
                        binding.cvItem4.visibility = View.GONE
                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
@@ -175,7 +168,7 @@ class MainActivity : AppCompatActivity() {

                    device.productId == 4614 && device.vendorId == 7111 -> {
                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
+                        binding.cvItem3.visibility = View.GONE
                        binding.cvItem2.visibility = View.GONE
                        binding.cvItem4.visibility = View.GONE
                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HEMOCUBE)
@@ -239,13 +232,6 @@ class MainActivity : AppCompatActivity() {
            startActivity(i)
            finish()
        }
-        binding.cvItem3.setOnClickListener {
-            DataHolder.selectedTestType = TestType.HB_EST
-            val i = Intent(applicationContext, KitScanActivity::class.java)
-            i.putExtra("fromWhere","Main")
-            startActivity(i)
-            finish()
-        }

        DataHolder.usbConnected.observe(this) {
            if (it) {
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt
@@ -14,17 +14,25 @@
 package com.example.hpostesting.presentation.dashboard

 import android.content.Context
+import android.content.SharedPreferences
 import android.os.BatteryManager
 import android.os.Bundle
 import android.util.Log
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
+import com.example.hpostesting.presentation.adapter.UserListAdapter
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.testRight.TestRightViewModel
+import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentActivitiesBinding
+import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
@@ -50,11 +58,10 @@ class ActivitiesFragment : Fragment() {

            if (userData.isNotEmpty()) {
                userData.forEach { user ->
-                    if((isBetween15And30Minutes(user.incubationTime) > 30 || isBetween15And30Minutes(user.incubationTime) < 0 ) && user.testStatus == false){
+                    if(isBetween15And30Minutes(user.incubationTime) > 30 && user.testStatus == false){
                        hemoCubeViewModel.deleteByStatus()
                    }
                }
-
                binding.rvOrderOffline.visibility = View.VISIBLE
                binding.noDataText.visibility = View.GONE
                val bm =
@@ -81,5 +88,4 @@ class ActivitiesFragment : Fragment() {
        return diffMillis / (60 * 1000)
    }

-
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/AppVersionTapManage.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/AppVersionTapManage.kt
@@ -1,18 +0,0 @@
-package com.example.hpostesting.presentation.dashboard
-
-class AppVersionTapManager {
-
-    private var tapCount = 0
-    private val maxTapCount = 5
-
-    fun registerTap(onMaxTapsReached: () -> Unit) {
-        tapCount++
-        if (tapCount >= maxTapCount) {
-            onMaxTapsReached()
-            reset()
-        }
-    }
-    private fun reset() {
-        tapCount = 0
-    }
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
@@ -33,15 +33,19 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.data.model.login.LoginRequest
 import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.firebase.FirebaseManager
+import com.example.hpostesting.presentation.utils.NatsManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.jig.JigActivity
-import com.example.hpostesting.presentation.utils.NatsManager
 import com.google.android.material.navigation.NavigationView
+import com.google.firebase.appdistribution.FirebaseAppDistribution
+import com.google.firebase.appdistribution.FirebaseAppDistributionException
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.ktx.remoteConfig
@@ -52,7 +56,6 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
 import java.io.File
 import java.security.MessageDigest
-import javax.inject.Inject

 interface NatsMessageCallback {
    fun onMessageReceived(topic: String, message: String)
@@ -65,8 +68,6 @@ open interface IDataCollector: NatsMessageCallback {

@AndroidEntryPoint
 class DashboardActivity : AppCompatActivity(), IDataCollector {
-    @Inject
-    lateinit var databaseRepository: DatabaseRepository
    private val remoteConfig: FirebaseRemoteConfig = Firebase.remoteConfig
    val TAG = "DashboardActivity"
    private var isRegistered = false
@@ -75,7 +76,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
    lateinit var sharedPreferences: SharedPreferences
    var responses: String = ""
    lateinit var nats: NatsManager
-
    private var downloadId: Long = 0
    // TODO: Remove hemocube viewmodel
    private val hemocubeViewModel: HemoCubeViewModel by viewModels()
@@ -86,7 +86,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        super.attachBaseContext(newBase)
    }

-
    override fun onMessageReceived(topic: String, message: String) {
        // Handle incoming messages from NATS

@@ -96,15 +95,11 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
    @SuppressLint("SetWorldReadable")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        val firebaseManager = FirebaseManager(this)
        binding = ActivityDashboardBinding.inflate(layoutInflater)
        sharedPreferences = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
        setContentView(binding.root)
        setSupportActionBar(binding.appBarDashboard.toolbar)
        nats = NatsManager(this)
-
-        val currentServer = firebaseManager.getLastSelectedServer().serverName
-
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            nats.connect()
        }
@@ -113,7 +108,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        Log.d("DashboardActivity", "Saved Kit Serial: $savedKitSerial")
      //  Toast.makeText(this, "Saved Kit Serial: $savedKitSerial", Toast.LENGTH_SHORT).show()

-        val versionName =  getAppVersion(this@DashboardActivity) + " [ " + getAppEnvironment(this@DashboardActivity) +"->"+currentServer+"]"
+        val versionName =  getAppVersion(this@DashboardActivity) + " [ " + getAppEnvironment(this@DashboardActivity) + " ]"
        binding.appBarDashboard.versionName.text = versionName


@@ -255,12 +250,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {



-//    fun sendData(data:String){  this was used to send the basic data for server validation
-//        databaseRepository.addtodb(data)
-//        Toast.makeText(this, "data uploaded", Toast.LENGTH_SHORT).show()
-//    }
-
-
    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        // Inflate the menu; this adds items to the action bar if it is present.
        menuInflater.inflate(R.menu.dashboard, menu)
@@ -386,7 +375,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        return try {
            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
            pInfo.versionName
-
        } catch (e: PackageManager.NameNotFoundException) {
            "N/A"
        }
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
@@ -31,13 +31,13 @@ import android.os.BatteryManager
 import android.os.Build
 import android.os.Bundle
 import android.os.Environment
-import android.provider.ContactsContract.Data
 import android.provider.Settings
 import android.util.Base64
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.appcompat.content.res.AppCompatResources
@@ -134,7 +134,6 @@ class HomeFragment : Fragment() {
            binding.labelQuickCapture.visibility = View.VISIBLE
            binding.btnQuickCapture.visibility = View.VISIBLE
        }
-
        getDeviceId()
        checkUnprocessedCSVData()
        //checkForUpdate()
@@ -184,6 +183,7 @@ class HomeFragment : Fragment() {
                Toast.makeText(requireContext(), R.string.test_upload_failed, Toast.LENGTH_SHORT)
                    .show()
            }
+
        }
 //        binding.btnLogout.setOnClickListener {
 //            logoutUser(requireContext())
@@ -202,8 +202,7 @@ class HomeFragment : Fragment() {
 //            }else{
 //                binding.downloadCSV.visibility = View.GONE
 //            }
-            val btnSaveLocalVisibility =
-                if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE
+            val btnSaveLocalVisibility = if (userData.any { it.testStatus == true }) View.VISIBLE else View.GONE
            binding.downloadCSV.visibility = btnSaveLocalVisibility
            binding.downloadCSV.setOnClickListener {
                if (btnSaveLocalVisibility == View.VISIBLE) {
@@ -304,13 +303,13 @@ class HomeFragment : Fragment() {
            }
            if (isConnected != wasConnected) {
                if (isConnected) {
-                    binding.tvTitleNoInternet.text = "Please enter the user id and select blood group to start the test."
                    //binding.internetAvailableCL.visibility = View.VISIBLE
-                    binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.internet))
-                    binding.internetNotAvailableCL.visibility = View.VISIBLE
                    binding.pendingTest.visibility = View.GONE
                    setUserId()
                   // loadUserData()
+                    binding.tvTitleNoInternet.text = "Please enter the user id and select blood group to start the test."
+                    binding.internetIcon.setImageDrawable(AppCompatResources.getDrawable(requireContext(),R.drawable.internet))
+                    binding.internetNotAvailableCL.visibility = View.VISIBLE
                   // setSearch()
                    //checkForLocalDBData()
                    if (Constants.MOLBIO_INTEGRATION) {
@@ -799,21 +798,8 @@ class HomeFragment : Fragment() {
    private fun setUserId() {
        binding.btnSubmit.setOnClickListener {
            val userId = binding.userId.text.toString()
-            DataHolder.sampleId = userId
            val age = binding.age.text.toString()
-            DataHolder.age = age
            val bloodGroup = binding.etBloodGroup.text.toString()
-            DataHolder.bloodGroup = bloodGroup
-
-//            if (userId.length >= 5 && bloodGroup != "Select Blood Group") {
-//                DataHolder.selectedTest = UserData(
-//                    _id = userId,
-//                    bloodGroup = bloodGroup,
-//                    incubationTime = SimpleDateFormat(
-//                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-//                        ).format(Calendar.getInstance().time).toString()
-//                )
-//                findNavController().navigate(R.id.action_nav_home_to_mainActivity)
            if (userId.length >= 5 && bloodGroup.isNotEmpty() && age.isNotEmpty()) {
                lifecycleScope.launch {
                    // Add user first, ensuring it's done before fetching the user
@@ -854,16 +840,32 @@ class HomeFragment : Fragment() {
 //                hemoCubeViewModel.addUser(
 //                    HemoCubeTestData(
 //                        _id = userId,
-//                        bloodGroup = bloodGroup.toString(),
+//                        age = age,
+//                        bloodGroup = bloodGroup,
 //                        incubationTime = SimpleDateFormat(
 //                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
 //                        ).format(Calendar.getInstance().time).toString()
 //                    )
 //                )
+//
+//                lifecycleScope.launch {
+//                    val user = hemoCubeViewModel.hemoCubeDao.getUserByID(userId)
+//                    user.let {
+//                        DataHolder.selectedTest = UserData(
+//                            sampleid = it.sampleid,
+//                            _id = it._id,
+//                            age = it.age,
+//                            bloodGroup = it.bloodGroup,
+//                            incubationTime = SimpleDateFormat(
+//                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+//                            ).format(Calendar.getInstance().time).toString()
+//                        )
+//                        findNavController().navigate(R.id.action_nav_home_to_mainActivity)
+//                    }
+//                }
                Toast.makeText(requireContext(), "Successfully added- $userId", Toast.LENGTH_SHORT).show()
                binding.userId.setText("")
-                binding.age.setText("")
-                binding.etBloodGroup.setText("")
+                binding.etBloodGroup.clearListSelection()

 //                val userData = UserData(_id = userId)
 //                DataHolder.selectedTest = userData
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt
@@ -13,7 +13,6 @@

 package com.example.hpostesting.presentation.dashboard

-import android.app.AlertDialog
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
@@ -24,7 +23,7 @@ import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Toast
-import androidx.core.content.ContextCompat
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.preference.ListPreference
 import androidx.preference.Preference
@@ -32,231 +31,127 @@ import androidx.preference.PreferenceFragmentCompat
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.firebase.FirebaseConfig
-import com.example.hpostesting.firebase.FirebaseManager
+import com.example.hpostesting.data.model.TestState
+import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
 import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding

 private var isLanguageChanged = false

-class SlideshowFragment : Fragment() {
+class SlideshowFragment : Fragment(){
    private var selectedItem = "10mm"
    private val values = arrayOf("10mm", "2mm")
    private lateinit var binding: FragmentSlideshowBinding
    private lateinit var sharedPreferences: SharedPreferences
-
    override fun onCreateView(
        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
    ): View {
        binding = FragmentSlideshowBinding.inflate(inflater, container, false)
-        sharedPreferences = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        sharedPreferences =
+            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
        return binding.root
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)

-        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME, ""))
+        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME,""))

-        selectedItem = sharedPreferences.getString(Constants.CUVETTE_SIZE, "10mm").toString()
-        val time = sharedPreferences.getString(Constants.LAST_UPDATED, "NA").toString()
+        selectedItem = sharedPreferences.getString(Constants.CUVETTE_SIZE,"10mm").toString()
+        val time = sharedPreferences.getString(Constants.LAST_UPDATED,"NA").toString()
        binding.lastUpdated.text = "Last updated config: $time"
        binding.btnGo.setOnClickListener {
            var labname = binding.nameEditText.text.toString()
            DataHolder.hemoCubeTestData?.apply {
                this.labName = labname
            }
+
            with(sharedPreferences.edit()) {
                putString(Constants.LABNAME, labname)
                apply()
            }

            Toast.makeText(
-                requireContext(), "Lab Name is Added successfully.", Toast.LENGTH_SHORT
+                requireContext(),
+                "Lab Name is Added successfully.",
+                Toast.LENGTH_SHORT
            ).show()
        }
        val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, values)
        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
        val pos: Int
-        if (selectedItem == "10mm") {
+        if(selectedItem == "10mm"){
            pos = 0
-        } else {
+        }else{
            pos = 1
        }

        binding.spinnerCuvette.adapter = adapter
-        binding.spinnerCuvette.onItemSelectedListener =
-            object : AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(
-                    parent: AdapterView<*>?, view: View?, position: Int, id: Long
-                ) {
-                    // Handle item selection here
-                    selectedItem = values[position]
-                }
-
-                override fun onNothingSelected(parent: AdapterView<*>?) {
-                    // Do nothing here
-                }
+        binding.spinnerCuvette.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                // Handle item selection here
+                selectedItem = values[position]
            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                // Do nothing here
+            }
+        }
        binding.spinnerCuvette.setSelection(pos)
        binding.btnAddSize.setOnClickListener {
            with(sharedPreferences.edit()) {
                putString(Constants.CUVETTE_SIZE, selectedItem)
                apply()
            }
-            Toast.makeText(
-                requireContext(), "Selected cuvette size: $selectedItem", Toast.LENGTH_SHORT
-            ).show()
+            Toast.makeText(requireContext(), "Selected cuvette size: $selectedItem", Toast.LENGTH_SHORT).show()
        }

-        childFragmentManager.beginTransaction().replace(binding.container.id, PrefsFragment())
-            .commit()
+        childFragmentManager.beginTransaction().replace(binding.container.id,PrefsFragment()).commit()
    }
 }
-
-class PrefsFragment : PreferenceFragmentCompat(){
-    private lateinit var tapManager: AppVersionTapManager
-    private var isServerSelectionVisible = false
-    private lateinit var serverPreference: Preference
-    private lateinit var currentServerPreference: Preference
-    lateinit var firebaseManager: FirebaseManager
-    lateinit var databaseRepository: DatabaseRepository
-
+class PrefsFragment: PreferenceFragmentCompat(){
    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-         firebaseManager = FirebaseManager(requireContext())
-        databaseRepository = (activity as DashboardActivity).databaseRepository
-
-        tapManager = AppVersionTapManager()
-        val sharedPreference =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
        val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
-        val currentServer = firebaseManager.getLastSelectedServer().serverName

-        // Language Preference
-        val languagePreference = ListPreference(requireContext()).apply {
-            key = "language_preference"
-            title = getString(R.string.app_language)
-            summary = getString(R.string.select_language)
-            entries = arrayOf("English", "Kannada", "Hindi")
-            entryValues = arrayOf("en", "kn", "hi")
-            setDefaultValue("en")
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_translate_24)
+        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")

-            onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+        languagePreference.onPreferenceChangeListener =
+            Preference.OnPreferenceChangeListener { _, newValue ->
                val languageCode = newValue as String
                updateLanguage(requireContext(), languageCode)
                true
            }
-        }
+
        preferenceScreen.addPreference(languagePreference)
-
-        val appVersionPreference = Preference(requireContext()).apply {
-            title = "App Version"
-            summary =
-                getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext())  +"->"+currentServer+"]"
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_info_24)
-
-            setOnPreferenceClickListener {
-                if ((sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN")) {
-                    tapManager.registerTap {
-                        if (!isServerSelectionVisible) {
-                            showServerSelection()
-                        }
-                    }
-                } else {
-
-                }
-                true
-            }
-
-        }
-        preferenceScreen.addPreference(appVersionPreference)
-
-
-        currentServerPreference = Preference(requireContext()).apply {
-            key = "current_server_preference"
-            title = "Current Server"
-            summary = "No server selected"
-            isVisible = false
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_done_24)
-
-            setOnPreferenceClickListener {
-//                (activity as? DashboardActivity)?.sendData("hello test data")
-//                Toast.makeText(context, "data sent", Toast.LENGTH_SHORT).show()  this was used to send the basic data as test data
-            true
-            }
-        }
-        preferenceScreen.addPreference(currentServerPreference)
        setPreferenceScreen(preferenceScreen)

+        // App Version Preference
+        val appVersionPreference = Preference(requireContext())
+        appVersionPreference.title = "App Version SMI"
+        appVersionPreference.summary =
+            getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
+
+        preferenceScreen.addPreference(languagePreference)
+        preferenceScreen.addPreference(appVersionPreference)
+        setPreferenceScreen(preferenceScreen)
        if (isLanguageChanged) {
            Toast.makeText(requireContext(), R.string.language_update, Toast.LENGTH_SHORT).show()
        }
-    }
-
-
-    private fun showServerSelection() {
-        val currentServer = firebaseManager.getLastSelectedServer().serverName
-        serverPreference = Preference(requireContext()).apply {
-            title = "Select Server"
-            summary = "Choose your server"
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_sync_24)
-            setOnPreferenceClickListener {
-                showServerSelectionDialog()
-                true
-            }
-        }
-
-
-
-        preferenceScreen.addPreference(serverPreference)
-        currentServerPreference.isVisible = true
-        currentServerPreference.summary = "Current Server: $currentServer"
-
-        Toast.makeText(requireContext(), "Server selection now available", Toast.LENGTH_SHORT).show()
-    }
-
-    private fun showServerSelectionDialog() {
-        val servers = firebaseManager.getAvailableServers()
-
-        val serverNames = servers.map { it.serverName }.toTypedArray()
-        val builder = AlertDialog.Builder(requireContext())
-        builder.setTitle("Select Server")
-            .setItems(serverNames) { _, which ->
-                val selectedServer = servers[which]
-
-                switchFirebaseServer(selectedServer)
-            }
-            .setNegativeButton("Cancel", null)
-            .show()
-    }
-
-
-    private fun switchFirebaseServer(firebaseConfig: FirebaseConfig) {
-        firebaseManager.switchServer(firebaseConfig)
-        Toast.makeText(requireContext(), "Switched to ${firebaseConfig.serverName}, Please wait for few seconds", Toast.LENGTH_SHORT).show()
-        Toast.makeText(requireContext(), "Restart needed restarting the app", Toast.LENGTH_SHORT).show()
-        firebaseManager.restartApp()
-        currentServerPreference.summary = "Current Server: ${firebaseConfig.serverName}"

    }
-
-
-    private fun switchCurrentServer(serverCode: String) {
-        Toast.makeText(requireContext(), "Switched to server: $serverCode", Toast.LENGTH_SHORT)
-            .show()
-        currentServerPreference.summary = "Current Server: $serverCode"
-
-    }
-
    private fun updateLanguage(context: Context, languageCode: String) {
        LanguageManager.persistLanguagePreference(context, languageCode)
        LanguageManager.setLocale(context, languageCode)
-        requireActivity().recreate()
+        requireActivity().recreate() // Recreate activity to apply language changes
        isLanguageChanged = true
    }
-
    private fun getAppVersion(context: Context): String {
        return try {
            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
@@ -274,6 +169,4 @@ class PrefsFragment : PreferenceFragmentCompat(){
            "N/A"
        }
    }
-}
-
-
+}
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt
@@ -91,7 +91,7 @@ class LoginFragment : Fragment() {
        setupAutoCompleteTextView()
    }
    private fun setupAutoCompleteTextView() {
-        val districts = resources.getStringArray(R.array.district)
+        val districts = resources.getStringArray(R.array.districtN)
        val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, districts)
        binding.etDistrict.setAdapter(adapter)

--- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt
@@ -248,15 +248,15 @@ class DeviceProvisionFragment : Fragment() {

    private fun encryptAndSaveToFile(username: String, password: String) {
        val messageToEncrypt = "$username\n$password"
-        val encryptionKey = Settings.Secure.getString(requireContext().contentResolver, Settings.Secure.ANDROID_ID)
+        val encryptionKey =
+            Settings.Secure.getString(requireContext().contentResolver, Settings.Secure.ANDROID_ID)
        val encryptedString = Encryption.encrypt(messageToEncrypt, encryptionKey)
        Log.d("DEVICE ID/encryptionKey", encryptionKey)
+       // val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS)
        val target = File(requireContext().getExternalFilesDir(null), "HPOSDocuments")
        if (!target.exists()) {
            target.mkdirs()  // Create the directory if it doesn't exist
        }
-
-       // val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
        val file = File(target, "credentials.txt")

        if (!file.exists()) {
--- a/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestActivity.kt
@@ -1,207 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.presentation.hb_test
-
-import android.annotation.SuppressLint
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.ServiceConnection
-import android.hardware.usb.UsbDevice
-import android.hardware.usb.UsbDeviceConnection
-import android.hardware.usb.UsbManager
-import android.os.Bundle
-import android.os.IBinder
-import android.util.Log
-import android.view.Menu
-import android.widget.Toast
-import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import androidx.core.view.get
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.firebase.FirebaseManager
-import com.example.hpostesting.util.UsbService
-import com.hoho.android.usbserial.driver.UsbSerialDriver
-import com.hoho.android.usbserial.driver.UsbSerialProber
-import dagger.hilt.android.AndroidEntryPoint
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.ActivityHbTestBinding
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class HBTestActivity : AppCompatActivity() {
-
-    @Inject
-    lateinit var databaseRepository: DatabaseRepository
-    private lateinit var binding: ActivityHbTestBinding
-    val viewModel: HBTestViewModel by viewModels()
-    private var myMenu: Menu? = null
-
-    private lateinit var mDriver: UsbSerialDriver
-    private var mConnection: UsbDeviceConnection? = null
-    lateinit var mService: UsbService
-
-    private val TAG = "HemoCube"
-
-    private val broadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-
-            synchronized(this) {
-                val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
-
-                if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
-                    device?.apply {
-                        connectUsb(true)
-                        DataHolder.usbConnected.postValue(true)
-                    }
-                } else {
-                    onErrorReported("permission denied for device")
-                    DataHolder.usbConnected.postValue(true)
-                }
-            }
-        }
-    }
-
-    private val connection = object : ServiceConnection {
-        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            val binder = service as UsbService.UsbServiceBinder
-            mService = binder.getService()
-            viewModel.isServiceConnected = true
-            mConnection.let { mService.connect(mDriver, mConnection!!) }
-            moveToNext()
-        }
-
-        override fun onServiceDisconnected(arg0: ComponentName) {
-            viewModel.isServiceConnected = false
-        }
-    }
-
-    override fun attachBaseContext(newBase: Context?) {
-        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
-        LanguageManager.setLocale(newBase, languageCode)
-        super.attachBaseContext(newBase)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val firebaseManager = FirebaseManager(this)
-        val lastSelectedServer = firebaseManager.getLastSelectedServer()
-//        switchFirebaseServer(lastSelectedServer)
-        Log.d("CURRENT SERVR......","server : ${lastSelectedServer.serverName}")
-        binding = ActivityHbTestBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-//        setSupportActionBar(binding.myToolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        setupListener()
-        connectUsb(false)
-
-    }
-//    private fun switchFirebaseServer(config: FirebaseConfig) {
-//        val (newFirestore, newStorage) = firebaseManager.switchFirestoreServer(config)
-//        databaseRepository.switchServer(newFirestore, newStorage)
-////        Toast.makeText(this, "server switched", Toast.LENGTH_SHORT).show()// Update repository with new Firestore and Storage
-//    }
-    private fun setupListener() {
-        DataHolder.usbConnected.observe(this) {
-            Log.d("USB OBSERVE", "HemoCube called -> $it")
-            if (it) {
-                myMenu?.get(0)?.icon =
-                    ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_24)
-            } else {
-                myMenu?.get(0)?.icon =
-                    ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_off_24)
-                Toast.makeText(this, "Device is Disconnected", Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    open fun connectUsb(permissionGranted: Boolean) {
-        Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
-        val manager = getSystemService(Context.USB_SERVICE) as UsbManager
-        val availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager)
-
-        if (availableDrivers.isEmpty()) {
-            onErrorReported("No Device is Connected")
-        } else {
-            mDriver = availableDrivers[0]
-            mConnection = manager.openDevice(mDriver.device)
-
-            if (mConnection == null) {
-                requestUserPermission(manager, mDriver.device)
-            } else {
-                setupService()
-            }
-        }
-    }
-
-    fun onErrorReported(msg: String) {
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
-        if (!isFinishing) onBackPressed()
-    }
-
-
-    private fun moveToNext() {
-        if (supportFragmentManager.isDestroyed) return
-
-        supportFragmentManager.beginTransaction().replace(binding.fgHbTest.id, HBTestFragment())
-            .commit()
-    }
-
-    @SuppressLint("MutableImplicitPendingIntent")
-    private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this, 0, Intent(Constants.HEMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-            )
-        } else {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HEMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
-
-        val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
-        manager.requestPermission(device, mPendingIntent)
-    }
-
-    fun setupService() {
-        val intent = Intent(this, UsbService::class.java)
-        bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.my_menu, menu)
-        return true
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        if (viewModel.isServiceConnected) {
-            mService.disconnect()
-            unbindService(connection)
-            viewModel.isServiceConnected = false
-        }
-    }
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestFragment.kt
@@ -1,399 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.presentation.hb_test
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.text.method.ScrollingMovementMethod
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.FragmentAutoDacBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentHbTestBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-import kotlin.math.log10
-
-class HBTestFragment : Fragment() {
-    private var isUsingExistingBuffer = false
-    private var led1Average = 0.0
-    private var led3Average = 0.0
-    private var led2Average = 0.0
-    private var led4Average = 0.0
-    private var led1SampleForDevice = 0.0
-    private var led2SampleForDevice = 0.0
-    private var led3SampleForDevice = 0.0
-    private var led4SampleForDevice = 0.0
-    private var led1BufferForDevice = 0.0
-    private var led2BufferForDevice = 0.0
-    private var led3BufferForDevice = 0.0
-    private var led4BufferForDevice = 0.0
-    private var x = 0.0
-    private var deviceId = ""
-    private var hbEst = 0.0
-    private var testStatusCode = 0.0
-    private var testDetails: HemoCubeTestData = HemoCubeTestData()
-    private lateinit var binding: FragmentHbTestBinding
-    private val hBTestViewModel: HBTestViewModel by activityViewModels()
-    private lateinit var sharedPreferences: SharedPreferences
-    private var currentDeviceData: DeviceData? = null
-    private var resultData: String = ""
- //   private val messages = MutableLiveData<String>()
-    private var startListening = MutableLiveData(false)
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
-    ): View {
-        binding = FragmentHbTestBinding.inflate(inflater, container, false)
-        sharedPreferences =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initViews()
-        observeViewModel()
-    }
-
-    private fun initViews() {
-        binding.btnSubmit.visibility = View.GONE
-        listenToHemoCube()
-        getDeviceId()
-        binding.tvSubtitle4.movementMethod = ScrollingMovementMethod()
-        binding.btnSubmit.setOnClickListener {
-            hBTestViewModel.messages.postValue(resultData)
-            binding.btnSubmit.visibility = View.GONE
-            testDetails.localFlag = false
-            testDetails.testStatus = true
-            testDetails.deviceId = deviceId
-            testDetails._id = DataHolder.sampleId
-            testDetails.kitSerial = DataHolder.kitSerial
-            testDetails.classificationResult = "HB: $hbEst"
-            testDetails.hb3 = x
-            testDetails.hb4 = hbEst
-            testDetails.age = DataHolder.age
-            testDetails.bloodGroup = DataHolder.bloodGroup
-            testDetails.led1Buffer = led1BufferForDevice
-            testDetails.led2Buffer = led2BufferForDevice
-            testDetails.led3Buffer = led3BufferForDevice
-            testDetails.led4Buffer = led4BufferForDevice
-            testDetails.led1Sample = led1SampleForDevice
-            testDetails.led2Sample = led2SampleForDevice
-            testDetails.led3Sample = led3SampleForDevice
-            testDetails.led4Sample = led4SampleForDevice
-            testDetails.led1Average = led1Average
-            testDetails.led2Average = led2Average
-            testDetails.led3Average = led3Average
-            testDetails.led4Average = led4Average
-            testDetails.testType = "HB Est"
-            testDetails.testTime = SimpleDateFormat(
-                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-            ).format(Calendar.getInstance().time)
-            hBTestViewModel.uploadFirebaseQc(testDetails)
-        }
-        binding.btnBuffer.setOnClickListener {
-            binding.btnBuffer.visibility = View.GONE
-            binding.btnSample.isEnabled = false
-            binding.btnSample.isClickable = false
-            hBTestViewModel.messages.postValue("Buffer Started")
-            runBCommand()
-        }
-        binding.btnSample.setOnClickListener {
-            hBTestViewModel.messages.postValue("Sample Started")
-            binding.btnSample.visibility = View.GONE
-            binding.btnBuffer.visibility = View.GONE
-            runSCommand()
-        }
-        if (isBufferValueAvailable()) {
-            isUsingExistingBuffer = true
-            binding.btnBuffer.text = "Refresh Buffer"
-            binding.btnSample.isEnabled = true
-            binding.btnSample.isClickable = true
-        }else{
-            binding.btnBuffer.text = "Start Buffer"
-            binding.btnSample.isEnabled = false
-            binding.btnSample.isClickable = false
-        }
-
-    }
-
-    private fun observeViewModel() {
-
-        hBTestViewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-        }
-
-        hBTestViewModel.messages.observe(viewLifecycleOwner) {
-            binding.tvSubtitle4.text = it
-        }
-
-        hBTestViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                showToast("Data uploaded successfully")
-                requireActivity().finish()
-            }
-            if (result == "Local") {
-                showToast("Data uploading failed, note it down manually")
-            }
-
-            binding.progressBar.visibility = View.GONE
-        }
-    }
-
-    private fun getDeviceId() {
-        hBTestViewModel.progressBar.postValue(true)
-        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        //deviceId = stringData
-                        hBTestViewModel.messages.postValue(stringData)
-                        binding.tvSubtitle4.text = stringData
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hBTestViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runBCommand() {
-        hBTestViewModel.progressBar.postValue(true)
-        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.START_BUFFER_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hBTestViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runSCommand() {
-        hBTestViewModel.progressBar.postValue(true)
-        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.START_SAMPLE,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hBTestViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    private fun runPCommand() {
-        hBTestViewModel.progressBar.postValue(true)
-        (activity as HBTestActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.PRINT_COMMAND,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hBTestViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-    fun extractV2HardwareId(input: String): String? {
-        val pattern = Regex("SNS\\s*(.*?)\\s*SNE")
-        val matchResult: MatchResult? = pattern.find(input)
-
-        return matchResult?.groups?.get(1)?.value
-    }
-
-    private fun listenToHemoCube() {
-
-        val fullReadOutput = StringBuilder()
-        startListening.postValue(true)
-
-        try {
-            (activity as HBTestActivity).mService.listenToHemoCube(object :
-                UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        fullReadOutput.append(stringData)
-                        resultData += stringData
-                        hBTestViewModel.messages.postValue(resultData)
-                       // binding.tvSubtitle4.text = resultData
-                        if (stringData.contains("SNE")) {
-                            val slData = stringData.split(" ")
-                            if (slData.size > 1) {
-                                val hardwareId = slData[1].trim()
-                                deviceId = extractV2HardwareId(resultData).toString()
-                                hBTestViewModel.messages.postValue("Place buffer and click below button to start test")
-//                                with(sharedPreferences.edit()) {
-//                                    putString(Constants.DEVICE_ID, hardwareId)
-//                                    apply()
-//                                }
-                            }
-                            activity?.runOnUiThread {
-                                binding.btnBuffer.visibility = View.VISIBLE
-                            }
-                        }
-                    }
-                    if (resultData.contains("#BC") && testStatusCode < 1.0) {
-                        testStatusCode = 1.1
-                        resultData += getString(R.string.buffer_completed)
-                        hBTestViewModel.messages.postValue(resultData)
-                        activity?.runOnUiThread {
-                            binding.btnSample.visibility = View.VISIBLE
-                            binding.btnSample.isEnabled = true
-                            binding.btnSample.isClickable = true
-                        }
-                    }
-
-                    if (resultData.contains("#SC") && testStatusCode < 1.3) {
-                        testStatusCode = 1.4
-                        resultData +=getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data)
-                        hBTestViewModel.messages.postValue(resultData)
-                        activity?.runOnUiThread {
-                            binding.btnSubmit.visibility = View.VISIBLE
-                            runPCommand()
-                        }
-                    }
-
-                    if (resultData.contains("REND") && testStatusCode < 1.5) {
-                        testStatusCode = 1.6
-                        runResult()
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hBTestViewModel.progressBar.postValue(false)
-                }
-            })
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-
-    private fun runResult() {
-        resultData += "\nFetching results...\n"
-        hBTestViewModel.messages.postValue(resultData)
-
-        val resultLines = resultData.split("\\s+(?=LB|LS)".toRegex())
-        var bufferIntensity = resultLines[1].split(' ')[1].trim()
-        led1BufferForDevice = if (isUsingExistingBuffer) {
-            sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")?.toDoubleOrNull()!!
-        } else {
-            bufferIntensity.toDoubleOrNull()!!
-        }
-
-        bufferIntensity = resultLines[2].split(' ')[1].trim()
-        led2BufferForDevice = if (isUsingExistingBuffer) {
-            sharedPreferences.getString(Constants.BUFFER_VALUE_2, "")?.toDoubleOrNull()!!
-        } else {
-            bufferIntensity.toDoubleOrNull()!!
-        }
-
-        bufferIntensity = resultLines[3].split(' ')[1].trim()
-        led3BufferForDevice = if (isUsingExistingBuffer) {
-            sharedPreferences.getString(Constants.BUFFER_VALUE_3, "")?.toDoubleOrNull()!!
-        } else {
-            bufferIntensity.toDoubleOrNull()!!
-        }
-
-        bufferIntensity = resultLines[4].split(' ')[1].trim()
-        led4BufferForDevice = if (isUsingExistingBuffer) {
-            sharedPreferences.getString(Constants.BUFFER_VALUE_4, "")?.toDoubleOrNull()!!
-        } else {
-            bufferIntensity.toDoubleOrNull()!!
-        }
-
-
-        led1SampleForDevice = resultLines[5].split(' ')[1].trim().toDoubleOrNull()!!
-        led2SampleForDevice = resultLines[6].split(' ')[1].trim().toDoubleOrNull()!!
-        led3SampleForDevice = resultLines[7].split(' ')[1].trim().toDoubleOrNull()!!
-        led4SampleForDevice = resultLines[8].split(' ')[1].split('\r')[0].trim().toDoubleOrNull()!!
-
-        led1Average = log10(led1BufferForDevice.div(led1SampleForDevice))
-        led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
-        led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
-        led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
-
-        x = led1Average - led3Average
-
-        hbEst = (7.347 * x * x) + (12.704 * x) + 0.9033
-
-        resultData +="\n Result: HB EST: $hbEst"
-        if (!isUsingExistingBuffer) {
-            with(sharedPreferences.edit()) {
-                putString(Constants.BUFFER_VALUE_1, led1BufferForDevice.toString())
-                putString(Constants.BUFFER_VALUE_2, led2BufferForDevice.toString())
-                putString(Constants.BUFFER_VALUE_3, led3BufferForDevice.toString())
-                putString(Constants.BUFFER_VALUE_4, led4BufferForDevice.toString())
-                apply()
-            }
-        }
-        hBTestViewModel.messages.postValue(resultData)
-    }
-
-
-
-    private fun showToast(message: String) {
-        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
-    }
-    private fun isBufferValueAvailable(): Boolean {
-        return try {
-            if (sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_1, ""
-                ) != "" && sharedPreferences.getString(Constants.BUFFER_VALUE_2, "") != ""
-                && sharedPreferences.getString(Constants.BUFFER_VALUE_3, "") != ""
-                && sharedPreferences.getString(Constants.BUFFER_VALUE_4, "") != ""
-            ) {
-                sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")
-                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_2,
-                    ""
-                )
-                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_3,
-                    ""
-                )
-                    ?.toDouble()!! > 0.0 && sharedPreferences.getString(
-                    Constants.BUFFER_VALUE_4,
-                    ""
-                )
-                    ?.toDouble()!! > 0.0
-            } else {
-                false
-            }
-        } catch (e: Exception) {
-            showToast("error_exist")
-            false
-        }
-    }
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hb_test/HBTestViewModel.kt
@@ -1,87 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.presentation.hb_test
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.util.Log
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.dao.HemoCubeDao
-import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.data.repository.Repository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-class HBTestViewModel @Inject constructor(
-    private val hemoCubeDao: HemoCubeDao,
-    private val repository: Repository,
-    context: Context,
-) : ViewModel() {
-    var isServiceConnected = false
-    val progressBar = MutableLiveData(false)
-    val messages = MutableLiveData<String>()
-    private val sharedPreference: SharedPreferences =
-        context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-
-    val deviceData = MutableLiveData<DeviceData?>()
-    val fireBaseUpload = MutableLiveData<String>()
-    fun uploadFirebaseQc(testDetails: HemoCubeTestData){
-        viewModelScope.launch {
-            try {
-                when (val response = repository.addTestToDatabase(testDetails)) {
-                    is Response.Success -> {
-                        Log.i("Testdb", "Data uploaded to Firestore successfully")
-                        fireBaseUpload.postValue("Success")
-                        testDetails.localFlag = true
-                        hemoCubeDao.updateTest(testDetails)
-                    }
-
-                    is Response.Error -> {
-                        Log.e("Testdb", "Error uploading data to Firestore: $response")
-                        fireBaseUpload.postValue("Error")
-                        hemoCubeDao.updateTest(testDetails)
-                    }
-
-                    else -> {}
-                }
-            } catch (e: Exception) {
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
-    fun addAutoDacDataToDb(data: DiagnosticsData) {
-        viewModelScope.launch {
-            try {
-                when (val response = repository.addDiagnostics(data)) {
-                    is Response.Success -> {
-                        fireBaseUpload.postValue("Success")
-                    }
-
-                    is Response.Error -> {
-                        fireBaseUpload.postValue("Error")
-                    }
-                }
-            } catch (e: Exception) {
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -87,8 +87,6 @@ class HemoCubeFragment : Fragment() {
    private var checkCuvette = false
    private var checkRefreshCuvette = false
    private var checkCuvetteSam = false
-    private var checkSubmit = false
-    private var submitClick = false
    private var sampleClick = false
    private var refreshClick = false
    private lateinit var binding: FragmentHemoCubeReferenceBinding
@@ -184,44 +182,23 @@ class HemoCubeFragment : Fragment() {
        binding.tvSubtitle4.movementMethod = ScrollingMovementMethod()
        binding.tvDeviceMessages.movementMethod = ScrollingMovementMethod()
        binding.btnSubmit.setOnClickListener {
-//            with(sharedPreferences.edit()) {
-//                putBoolean(Constants.QUICK_CAPTURE, false)
-//                apply()
-//            }
-//            if(DataHolder.hemoCubeTestData!!.classificationResult != "Invalid"){
-//                DataHolder.sampleReadCounter++
-//            }
-//            binding.btnSubmit.isEnabled = false
-//            binding.btnSubmit.isClickable = false
-//            activity?.runOnUiThread {
-//                Log.d("HemoCubeFragment","Test Process completed, result saved")
-//                binding.progressBar.visibility = View.VISIBLE
-//                binding.btnSubmit.visibility = View.GONE
-//            }
-            submitClick = true
-            if(checkSubmit){
-                with(sharedPreferences.edit()) {
-                    putBoolean(Constants.QUICK_CAPTURE, false)
-                    apply()
-                }
-                if(DataHolder.hemoCubeTestData!!.classificationResult != "Invalid"){
-                    DataHolder.sampleReadCounter++
-                }
-                binding.btnSubmit.isEnabled = false
-                binding.btnSubmit.isClickable = false
-                activity?.runOnUiThread {
-                    Log.d("HemoCubeFragment","Test Process completed, result saved")
-                    binding.progressBar.visibility = View.VISIBLE
-                    binding.btnSubmit.visibility = View.GONE
-                }
-                hemoCubeViewModel.uploadHemoCubeResultToDatabase(
-                    isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, ""),quickCapture
-                )
-            }else{
-                checkCuvettePresence()
-                binding.btnSubmit.isEnabled = true
-                binding.btnSubmit.isClickable = true
+            with(sharedPreferences.edit()) {
+                putBoolean(Constants.QUICK_CAPTURE, false)
+                apply()
            }
+            if(DataHolder.hemoCubeTestData!!.classificationResult != "Invalid"){
+                DataHolder.sampleReadCounter++
+            }
+            binding.btnSubmit.isEnabled = false
+            binding.btnSubmit.isClickable = false
+            activity?.runOnUiThread {
+                Log.d("HemoCubeFragment","Test Process completed, result saved")
+                binding.progressBar.visibility = View.VISIBLE
+                binding.btnSubmit.visibility = View.GONE
+            }
+            hemoCubeViewModel.uploadHemoCubeResultToDatabase(
+                isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, ""),quickCapture
+            )
        }

        binding.tvTitle2.visibility = View.GONE
@@ -687,22 +664,6 @@ class HemoCubeFragment : Fragment() {
                }
                showRetryButtonForCuvette()
            }
-            resultData.contains("#CIN") && this.submitClick && this.testStatusCode < TestStatus.CUVETTE_PRESENTT.code -> {
-                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_presentt))
-                this.testStatusCode = TestStatus.CUVETTE_PRESENTT.code
-                activity?.runOnUiThread {
-                    binding.testing.visibility = View.GONE
-                }
-            }
-            resultData.contains("#AIN") && this.submitClick && this.testStatusCode <= TestStatus.CUVETTE_ABSENTT.code -> {
-                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absentt))
-                this.testStatusCode = TestStatus.CUVETTE_ABSENTT.code
-                activity?.runOnUiThread {
-                    checkSubmit = true
-                    binding.testing.visibility = View.GONE
-                }
-            }
-
            resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.code -> {
                hemoCubeViewModel.messages.postValue(getString(R.string.buffer_started))
                this.testStatusCode = TestStatus.BUFFER_STARTED.code
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
@@ -74,7 +74,6 @@ class HemoCubeViewModel @Inject constructor(
    private val localFileDataSource: LocalFileDataSource,
    context: Context,
 ) : ViewModel() {
-    private var testUpload: Boolean = false
    var isServiceConnected = false
    val progressBar = MutableLiveData(false)
    private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
@@ -133,13 +132,11 @@ class HemoCubeViewModel @Inject constructor(
        try {
            if (isOnline) {
                parseData()
-                //addResultTestToDb(quickCapture)
                if(Constants.FIREBASE_INTEGRATION){
                    addResultTestToDb(quickCapture)
                }else{
                    uploadToMolbio()
                }
-
            } else {
                parseData()
                val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
@@ -147,21 +144,13 @@ class HemoCubeViewModel @Inject constructor(
                    putInt(Constants.KIT_COUNT, kitCount.plus(1))
                    apply()
                }
-                //  addResultTestToDb(quickCapture,isOnline)
+              //  addResultTestToDb(quickCapture,isOnline)
                testDetails?.testTime = SimpleDateFormat(
                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                ).format(Calendar.getInstance().time)
                testDetails?.localFlag = false
                hemoCubeDao.updateTest(testDetails!!)
                fireBaseUpload.postValue("Local")
-
-//                parseData()
-//                addResultTestToDb(quickCapture)
-//                testDetails?.testTime = SimpleDateFormat(
-//                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-//                ).format(Calendar.getInstance().time)
-//                hemoCubeDao.updateTest(testDetails!!)
-//                fireBaseUpload.postValue("Local")
            }
        } catch (e: Exception) {
            Log.e("Testdb", "Upload failed: ${e.message}")
@@ -317,12 +306,6 @@ class HemoCubeViewModel @Inject constructor(
                }
            }
        }
-        if(testUpload){
-            fireBaseBulkUpload.postValue("Success")
-        }
-//        else{
-//            fireBaseBulkUpload.postValue("Error")
-//        }
    }


@@ -544,7 +527,6 @@ class HemoCubeViewModel @Inject constructor(
                            }
                            Log.i("Testdb", "Data uploaded to Firestore successfully")
                            fireBaseUpload.postValue("Success")
-
                            if (Constants.MOLBIO_INTEGRATION) {
                                // Sanitize testDetails before using it in the API call
                                val sanitizedTestDetails = sanitizeDoubleValues(testDetails)
@@ -596,13 +578,13 @@ class HemoCubeViewModel @Inject constructor(
            ).format(Calendar.getInstance().time)
            when (repository.addTestToDatabase(userData)) {
                is Response.Success -> {
-                    testUpload = true
+                    fireBaseBulkUpload.postValue("Success")
                    userData.localFlag = true
                    updateLocalFlag(userData._id)
                }

                else -> {
-                    testUpload = false
+                    fireBaseBulkUpload.postValue("Error")
                }
            }
        }
@@ -636,7 +618,9 @@ class HemoCubeViewModel @Inject constructor(
    fun deleteById(userId: String) = viewModelScope.launch {
        hemoCubeDao.deleteById(id = userId)
    }
-
+    fun deleteByStatus() = viewModelScope.launch {
+        hemoCubeDao.deleteByStatus()
+    }

    private fun addResultTestToDbforbuffercheck(bufferCheckData: BufferCheckData) {
        viewModelScope.launch {
@@ -667,10 +651,6 @@ class HemoCubeViewModel @Inject constructor(
        viewModelScope.launch {
            hemoCubeBufferDao.updateFieldById(id = bufferId, true)
        }
-    fun deleteByStatus() = viewModelScope.launch {
-        hemoCubeDao.deleteByStatus()
-    }
-

    fun getLocalUserDataForCsv(context: Context): Boolean {
        val localUserDataLiveData: LiveData<List<HemoCubeTestData>> = hemoCubeDao.getAll()
--- a/app/src/main/res/drawable/baseline_cloud_24.xml
+++ b/app/src/main/res/drawable/baseline_cloud_24.xml
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96z"/>
-    
-</vector>
--- a/app/src/main/res/drawable/baseline_cloud_done_24.xml
+++ b/app/src/main/res/drawable/baseline_cloud_done_24.xml
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM10,17l-3.5,-3.5 1.41,-1.41L10,14.17 15.18,9l1.41,1.41L10,17z"/>
-    
-</vector>
--- a/app/src/main/res/drawable/baseline_cloud_sync_24.xml
+++ b/app/src/main/res/drawable/baseline_cloud_sync_24.xml
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M21.5,14.98c-0.02,0 -0.03,0 -0.05,0.01C21.2,13.3 19.76,12 18,12c-1.4,0 -2.6,0.83 -3.16,2.02C13.26,14.1 12,15.4 12,17c0,1.66 1.34,3 3,3l6.5,-0.02c1.38,0 2.5,-1.12 2.5,-2.5S22.88,14.98 21.5,14.98zM10,4.26v2.09C7.67,7.18 6,9.39 6,12c0,1.77 0.78,3.34 2,4.44V14h2v6H4v-2h2.73C5.06,16.54 4,14.4 4,12C4,8.27 6.55,5.15 10,4.26zM20,6h-2.73c1.43,1.26 2.41,3.01 2.66,5l-2.02,0C17.68,9.64 16.98,8.45 16,7.56V10h-2V4h6V6z"/>
-    
-</vector>
--- a/app/src/main/res/drawable/baseline_info_24.xml
+++ b/app/src/main/res/drawable/baseline_info_24.xml
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
-    
-</vector>
--- a/app/src/main/res/drawable/baseline_translate_24.xml
+++ b/app/src/main/res/drawable/baseline_translate_24.xml
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
-    
-</vector>
--- a/app/src/main/res/layout/activity_hb_test.xml
+++ b/app/src/main/res/layout/activity_hb_test.xml
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
-  ~ // Notice: All information contained herein is, and remains
-  ~ // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
-  ~ // if any. The intellectual and technical concepts contained
-  ~ // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
-  ~ // and its suppliers and may be covered by Indian and Foreign Patents,
-  ~ // patents in process, and are protected by trade secret or copyright law.
-  ~ // Dissemination of this information or reproduction of this material
-  ~ // is strictly forbidden unless prior written permission is obtained
-  ~ // from ShanMukha Innovations Pvt. Ltd.
-  -->
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_parent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <!--        <androidx.appcompat.widget.Toolbar-->
-        <!--            android:id="@+id/my_toolbar"-->
-        <!--            android:layout_width="match_parent"-->
-        <!--            android:layout_height="?attr/actionBarSize"-->
-        <!--            android:background="?attr/colorPrimary"-->
-        <!--            app:titleTextColor="#FFFFFF"-->
-        <!--            android:elevation="4dp"-->
-        <!--            app:menu="@menu/my_menu"-->
-        <!--            android:theme="@style/ToolbarTheme"-->
-        <!--            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toTopOf="parent"/>-->
-
-        <FrameLayout
-            android:id="@+id/fg_hb_test"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            >
-
-        </FrameLayout>
-
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
--- a/app/src/main/res/layout/activity_kit_scan.xml
+++ b/app/src/main/res/layout/activity_kit_scan.xml
@@ -45,7 +45,6 @@
        android:layout_marginHorizontal="24dp"
        android:layout_marginTop="16dp"
        android:text="@string/scan_qr_code_of_the_kit"
-        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/app_bar_layout" />

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

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

        </com.google.android.material.textfield.TextInputLayout>
-
        <com.google.android.material.textfield.TextInputLayout
            android:id="@+id/til_blood_group"
            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
--- a/app/src/main/res/layout/fragment_jig.xml
+++ b/app/src/main/res/layout/fragment_jig.xml
@@ -76,7 +76,6 @@
        android:textColor="@color/black"
        app:backgroundTint="@color/blue_app_light"
        app:cornerRadius="100dp"
-        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/tv_title" />

@@ -104,9 +103,9 @@
        android:clickable="false"
        android:gravity="center"
        android:text="Refresh"
-        android:textColor="@color/white"
        android:visibility="visible"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:textColor="@color/white"
+        app:layout_constraintEnd_toEndOf="@id/btn_scan_now"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/btn_scan_now" />

--- a/app/src/main/res/layout/fragment_register_one_create_abha.xml
+++ b/app/src/main/res/layout/fragment_register_one_create_abha.xml
@@ -53,7 +53,6 @@
            android:textColor="@color/black"
            app:backgroundTint="@color/blue_app_light"
            app:cornerRadius="100dp"
-            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/tv_title2" />

--- a/app/src/main/res/layout/server_selector_drop_down.xml
+++ b/app/src/main/res/layout/server_selector_drop_down.xml
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- RadioGroup to select servers -->
-    <RadioGroup
-        android:id="@+id/radioGroupServers"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:orientation="vertical">
-
-        <!-- Radio Buttons for each server option -->
-        <RadioButton
-            android:id="@+id/radioButtonInternal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Internal" />
-
-        <RadioButton
-            android:id="@+id/radioButtonClinical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Clinical" />
-
-        <RadioButton
-            android:id="@+id/radioButtonCustomer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Customer" />
-
-    </RadioGroup>
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -305,7 +305,4 @@
    <string name="quick_capture">Quick Capture</string>
    <string name="reset_password_for_this_device">Reset password for this device</string>
    <string name="calibrate_device">Calibrate the device</string>
-    <string name="cuvette_presentt">Cuvette Present , Please Remove Cuvette And Try Again</string>
-    <string name="cuvette_absentt">Cuvette Absent,Now You Can Submit</string>
-
 </resources>
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -304,9 +304,6 @@
    <string name="quick_capture">ತ್ವರಿತ ಕ್ಯಾಪ್ಚರ್</string>
    <string name="reset_password_for_this_device">ಈ ಸಾಧನಕ್ಕಾಗಿ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಮರುಹೊಂದಿಸಿ</string>
    <string name="calibrate_device">ಸಾಧನವನ್ನು ಮಾಪನಾಂಕ ಮಾಡಿ</string>
-    <string name="cuvette_presentt">Cuvette Present , Please Remove Cuvette And Try Again</string>
-    <string name="cuvette_absentt">Cuvette Absent,Now You Can Submit</string>
-
    <!-- Add translations for other strings -->

 </resources>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -31,5 +31,9 @@
        <item>Chamarajanagar</item>
        <item>Other</item>
    </string-array>
+    <string-array name="districtN">
+        <item>Nagpur</item>
+        <item>Other</item>
+    </string-array>

 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -305,7 +305,4 @@
    <string name="quick_capture">Quick Capture</string>
    <string name="reset_password_for_this_device">Reset password for this device</string>
    <string name="calibrate_device">Calibrate Device</string>
-    <string name="cuvette_presentt">Cuvette Present , Please Remove Cuvette And Try Again</string>
-    <string name="cuvette_absentt">Cuvette Absent,Now You Can Submit</string>
-
 </resources>
Author	SHA1	Message	Date
chandrashekhar reddy	2a27a96f96	127 version with all updates, credential.txt file location changed, Ui updated.	2024-09-09 16:39:58 +05:30
chandrashekhar reddy	d35e59db9b	127 version with all updates, credential.txt file location changed, Ui updated.	2024-09-09 16:36:29 +05:30
chandrashekhar reddy	5b3fcb3aa0	127 version with all updates, credential.txt file location changed, Ui updated.	2024-09-09 16:29:59 +05:30