Edit README.md

README.md

@@ -1,5 +1,23 @@
+# Latest hpos app version 
+### current version : 2.1.133
 
 ### Release key
 
 	key0: prime24
-        
+
+
+
+#### **Change logs  :**
+
+- [✅] Auto Sumbmit
+- [✅] Auto Sumbmit Toggle
+- [✅] Genegrate report 
+- [✅] Report Selector
+- [✅] Report Printer
+- [✅] Report Disclaimer Editor
+
+#### **Completed 👌**
+        
+**version of android studio used**
+
+`Android Studio Koala Feature Drop | 2024.1.2 Patch 1`

app/build.gradle

@@ -7,6 +7,7 @@ plugins {
     id 'androidx.navigation.safeargs.kotlin'
     id 'kotlin-kapt'
     id 'com.google.firebase.crashlytics'
+    id 'kotlin-parcelize'
 }
 //apply plugin: 'kotlin-android'
 
@@ -18,11 +19,16 @@ android {
     // server -> for server switching for internal test
     defaultConfig {
         applicationId "in.sminnovations.hpostesting.server"
-        minSdk 21
+        minSdk 30
         targetSdk 34
-        versionCode 130
-        versionName "2.1.130"
+        versionCode 139
+        versionName "2.1.133"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        externalNativeBuild {
+            cmake {
+                cppFlags ''
+            }
+        }
     }
 
 
@@ -30,6 +36,7 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
         }
     }
     compileOptions {
@@ -53,6 +60,12 @@ android {
     packagingOptions {
         exclude 'mockito-extensions/org.mockito.plugins.MockMaker'
     }
+    externalNativeBuild {
+        cmake {
+            path file('src/main/cpp/CMakeLists.txt')
+            version '3.22.1'
+        }
+    }
 //    testOptions {
 //        unitTests {
 //            includeAndroidResources = true
@@ -76,7 +89,6 @@ dependencies {
     implementation platform('com.google.firebase:firebase-bom:32.1.0')
     implementation("com.google.firebase:firebase-perf-ktx")
     implementation("com.google.firebase:firebase-crashlytics-ktx")
-    implementation("com.google.firebase:firebase-config-ktx")
     implementation("com.google.firebase:firebase-analytics-ktx")
     implementation 'com.google.firebase:firebase-firestore-ktx'
     implementation 'com.google.firebase:firebase-auth-ktx'

app/google-services.json

@@ -1,33 +1,33 @@
 {
   "project_info": {
-    "project_number": "650071678820",
-    "project_id": "hpos-af3cc",
-    "storage_bucket": "hpos-af3cc.appspot.com"
+    "project_number": "1012719870714",
+    "project_id": "hpos-prod",
+    "storage_bucket": "hpos-prod.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f6fd45e2f6a63aef6c6471",
+        "mobilesdk_app_id": "1:1012719870714:android:d8d7c962d96f4097de5f43",
         "android_client_info": {
           "package_name": "in.sminnovations.hpostesting.server"
         }
       },
       "oauth_client": [
         {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+          "current_key": "AIzaSyA_O0oZGzy3Kiw9fiLQ3OFPME-xQJP88vs"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
               "client_type": 3
             }
           ]

app/release/output-metadata.json

@@ -1,37 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "in.sminnovations.hpostesting.dev",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 127,
-      "versionName": "2.1.127",
-      "outputFile": "app-release.apk"
-    }
-  ],
-  "elementType": "File",
-  "baselineProfiles": [
-    {
-      "minApi": 28,
-      "maxApi": 30,
-      "baselineProfiles": [
-        "baselineProfiles/1/app-release.dm"
-      ]
-    },
-    {
-      "minApi": 31,
-      "maxApi": 2147483647,
-      "baselineProfiles": [
-        "baselineProfiles/0/app-release.dm"
-      ]
-    }
-  ],
-  "minSdkVersionForDexing": 21
-}

app/src/main/AndroidManifest.xml

@@ -24,13 +24,12 @@
     <uses-feature android:name="android.hardware.usb.host" />
 
     <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"
+    <uses-permission
+        android:name="android.permission.ACCOUNT_MANAGER"
         tools:ignore="ProtectedPermissions" />
 
-
     <application
         android:name="com.example.hpostesting.HPOSTestingApplication"
         android:allowBackup="true"
@@ -44,9 +43,12 @@
         android:theme="@style/Theme.HPOSTesting"
         tools:targetApi="31">
         <activity
-            android:name="com.example.hpostesting.presentation.dashboard.UpdateValuesActivity"
+            android:name="com.example.hpostesting.presentation.reportgen.ReportActivity"
+            android:exported="false" />
+        <activity
+            android:name="com.example.hpostesting.presentation.main_base.UpdateValuesActivity"
             android:exported="false"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
 
         <service
             android:name="com.example.hpostesting.util.MyAuthenticatorService"
@@ -62,7 +64,7 @@
         </service>
 
         <activity
-            android:name="com.example.hpostesting.presentation.dashboard.ui.PasswordResetActivity"
+            android:name="com.example.hpostesting.presentation.main_base.ui.PasswordResetActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
         <activity
@@ -74,7 +76,7 @@
             android:exported="false"
             android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
-            android:name="com.example.hpostesting.presentation.hemocube.DigitalCardActivity"
+            android:name="com.example.hpostesting.presentation.trueheme_test.DigitalCardActivity"
             android:exported="false" />
         <activity
             android:name="com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity"
@@ -106,7 +108,7 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
-            android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
+            android:name="com.example.hpostesting.presentation.trueheme_test.TrueHemeTestActivity"
             android:exported="false"
             android:noHistory="true"
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
@@ -133,7 +135,7 @@
             android:noHistory="true"
             android:theme="@style/Theme.HPOS.NoActionBar" />
         <activity
-            android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
+            android:name="com.example.hpostesting.presentation.main_base.DashboardActivity"
             android:exported="true"
             android:label="@string/title_activity_dashboard"
             android:screenOrientation="portrait"

app/src/main/cpp/CMakeLists.txt

@@ -0,0 +1,24 @@
+
+cmake_minimum_required(VERSION 3.18.1)
+
+project("native-server")
+
+# Create the shared library from server.cpp
+add_library(
+        native-server
+        SHARED
+        server.cpp
+)
+
+# Find Android logging library
+find_library(
+        log-lib
+        log
+)
+
+# Link logging library to our native lib
+target_link_libraries(
+        native-server
+        ${log-lib}
+)
+

app/src/main/cpp/server.cpp

@@ -0,0 +1,53 @@
+#include <jni.h>
+#include <string>
+#include <unordered_map>
+
+std::vector<std::pair<int, std::pair<std::string, std::unordered_map<std::string, std::string>>>> firebaseDataOrdered = {
+        {0, {"dev",  {{"apiKey", "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"},  {"appId", "1:650071678820:android:a53292637abb7c0d6c6471"},  {"projectId", "hpos-af3cc"},  {"storageBucket", "hpos-af3cc.appspot.com"}}}},
+        {1, {"qc-qa", {{"apiKey", "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs"}, {"appId", "1:1004619739289:android:3dbcefb10ea99654e5c808"}, {"projectId", "hpos-qa"}, {"storageBucket", "hpos-qa.appspot.com"}}}},
+        {2, {"prod", {{"apiKey", "AIzaSyA_O0oZGzy3Kiw9fiLQ3OFPME-xQJP88vs"}, {"appId", "1:1012719870714:android:d8d7c962d96f4097de5f43"}, {"projectId", "hpos-prod"}, {"storageBucket", "hpos-prod.appspot.com"}}}},
+        {3, {"pre prod", {{"apiKey", "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38"}, {"appId", "1:121176529204:android:e6841fdac57bdc95bbed61"}, {"projectId", "hpos-preprod"}, {"storageBucket", "hpos-preprod.appspot.com"}}}},
+        {4, {"SMI R&D", {{"apiKey", "AIzaSyAVxpilbB804iRCCpMBDjjmdZhQguctGHM"}, {"appId", "1:327771387914:android:a3b4ed2e42ea6e38dc87f3"}, {"projectId", "hposrandd"}, {"storageBucket", "hposrandd.firebasestorage.app"}}}},
+        {5, {"molbio", {{"apiKey", "molbio"}, {"appId", "molbio"}, {"projectId", "molbio"}, {"storageBucket", "molbio"}}}}
+};
+
+
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_example_hpostesting_firebase_FirebaseManager_getFirebaseDataMap(JNIEnv *env,jobject thiz) {
+    jclass mapClass = env->FindClass("java/util/LinkedHashMap");
+    jmethodID init = env->GetMethodID(mapClass, "<init>", "()V");
+    jmethodID put = env->GetMethodID(mapClass, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+    jobject outerMap = env->NewObject(mapClass, init);
+
+    for (const auto &entry : firebaseDataOrdered) {
+        int order = entry.first;
+        const std::string &outerKeyStr = entry.second.first;
+        const auto &innerMapData = entry.second.second;
+
+        jobject innerMap = env->NewObject(mapClass, init);
+        // "int" field for order
+
+        jstring intKey = env->NewStringUTF("int");
+        jstring intValue = env->NewStringUTF(std::to_string(order).c_str());
+        env->CallObjectMethod(innerMap, put, intKey, intValue);
+        env->DeleteLocalRef(intKey);
+        env->DeleteLocalRef(intValue);
+
+        // actual firebase config keys
+        for (const auto &innerPair : innerMapData) {
+            jstring key = env->NewStringUTF(innerPair.first.c_str());
+            jstring value = env->NewStringUTF(innerPair.second.c_str());
+            env->CallObjectMethod(innerMap, put, key, value);
+            env->DeleteLocalRef(key);
+            env->DeleteLocalRef(value);
+        }
+
+        jstring outerKey = env->NewStringUTF(outerKeyStr.c_str());
+        env->CallObjectMethod(outerMap, put, outerKey, innerMap);
+        env->DeleteLocalRef(outerKey);
+        env->DeleteLocalRef(innerMap);
+    }
+
+    return outerMap;
+}

app/src/main/java/com/example/hpostesting/FHIRFormater/FHIR converter.kt

@@ -0,0 +1,254 @@
+package com.example.hpostesting.FHIRFormater
+
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.UserData
+import org.json.JSONArray
+import org.json.JSONObject
+
+
+
+class RecommendedFHIRConverter {
+
+    private fun createPatient(data: HemoCubeTestData, useStandardCodes: Boolean): JSONObject {
+        val patient = JSONObject()
+        patient.put("resourceType", "Patient")
+        patient.put("id", "patient-${data.sampleid}")
+
+        // Structured name
+        val nameArray = JSONArray()
+        val nameObj = JSONObject()
+        nameObj.put("use", "official")
+        nameObj.put("text", data.name)
+        nameArray.put(nameObj)
+        patient.put("name", nameArray)
+
+        // Gender (FHIR uses "male", "female", "other", "unknown")
+        patient.put("gender", data.gender.lowercase())
+
+        // Birth date estimation from age (optional: validate or remove if unknown)
+        val birthYear = try {
+            2025 - data.age.toInt()
+        } catch (e: Exception) {
+            null
+        }
+        if (birthYear != null) patient.put("birthDate", "$birthYear-01-01")
+
+        // ABHA ID as identifier
+        if (data.abhaId.isNotBlank()) {
+            val identifiers = JSONArray()
+            val identifier = JSONObject()
+            identifier.put("system", "https://healthid.ndhm.gov.in")
+            identifier.put("value", data.abhaId)
+            identifiers.put(identifier)
+            patient.put("identifier", identifiers)
+        }
+
+        return patient
+    }
+
+
+    private fun createDevice(data: HemoCubeTestData): JSONObject {
+        val device = JSONObject()
+        device.put("resourceType", "Device")
+        device.put("id", "device-${data.deviceSerialNumber}")
+        device.put("serialNumber", data.deviceSerialNumber)
+
+        // Device type as codeable concept
+        val type = JSONObject()
+        type.put("text", data.deviceType)
+        device.put("type", type)
+
+        // Device version
+        if (!data.appVersion.isNullOrBlank()) {
+            val versions = JSONArray()
+            val version = JSONObject()
+            version.put("type", JSONObject().put("text", "appVersion"))
+            version.put("value", data.appVersion)
+            versions.put(version)
+            device.put("version", versions)
+        }
+
+        return device
+    }
+
+
+    private fun createHemoglobinObservation(data: HemoCubeTestData, useStandardCodes: Boolean): JSONObject {
+        val observation = JSONObject()
+        observation.put("resourceType", "Observation")
+        observation.put("id", "hemoglobin-${data.sampleid}")
+        observation.put("status", if (data.testStatus == true) "final" else "preliminary")
+
+        // Standard LOINC code or fallback
+        val code = JSONObject()
+        val codingArray = JSONArray()
+        if (useStandardCodes) {
+            val coding = JSONObject()
+            coding.put("system", "http://loinc.org")
+            coding.put("code", "718-7") // LOINC for Hemoglobin [Mass/volume] in Blood
+            coding.put("display", "Hemoglobin [Mass/volume] in Blood")
+            codingArray.put(coding)
+        }
+        code.put("coding", codingArray)
+        code.put("text", "Hemoglobin Analysis")
+        observation.put("code", code)
+
+        // Subject reference to patient
+        observation.put("subject", JSONObject().put("reference", "Patient/patient-${data.sampleid}"))
+
+        // Device reference
+        observation.put("device", JSONObject().put("reference", "Device/device-${data.deviceSerialNumber}"))
+
+        // Time of observation
+        if (!data.testTime.isNullOrBlank()) {
+            observation.put("effectiveDateTime", data.testTime)
+        }
+
+        // Main result: if hb3 or hb4 exists, use as value
+        val hbValue = data.hb3 ?: data.hb4
+        if (hbValue != null) {
+            val valueQuantity = JSONObject()
+            valueQuantity.put("value", hbValue)
+            valueQuantity.put("unit", "g/dL")
+            valueQuantity.put("system", "http://unitsofmeasure.org")
+            valueQuantity.put("code", "g/dL")
+            observation.put("valueQuantity", valueQuantity)
+        }
+
+        // Optional extensions
+        val components = JSONArray()
+
+        fun addComponent(codeText: String, value: Double?) {
+            if (value != null) {
+                val comp = JSONObject()
+                comp.put("code", JSONObject().put("text", codeText))
+                comp.put("valueQuantity", JSONObject().put("value", value))
+                components.put(comp)
+            }
+        }
+
+        addComponent("HB3", data.hb3)
+        addComponent("HB4", data.hb4)
+        addComponent("Device Ratio", data.deviceRatio)
+        addComponent("Blood Group", null) // can't use non-numeric here unless coded properly
+
+        if (components.length() > 0) {
+            observation.put("component", components)
+        }
+
+        return observation
+    }
+
+    private fun createBundleEntry(resource: JSONObject): JSONObject {
+        val entry = JSONObject()
+        entry.put("fullUrl", "urn:uuid:${resource.getString("id")}")
+        entry.put("resource", resource)
+        entry.put("request", JSONObject().apply {
+            put("method", "POST")
+            put("url", resource.getString("resourceType"))
+        })
+        return entry
+    }
+
+    fun convertToFHIR(data: HemoCubeTestData, useStandardCodes: Boolean = false): String {
+        val bundle = JSONObject()
+        bundle.put("resourceType", "Bundle")
+        bundle.put("id", "hemocube-test-${data.sampleid}")
+        bundle.put("type", "collection")
+
+        val entries = JSONArray()
+
+        entries.put(createBundleEntry(createPatient(data, useStandardCodes)))
+        entries.put(createBundleEntry(createDevice(data)))
+        entries.put(createBundleEntry(createHemoglobinObservation(data, useStandardCodes)))
+
+        bundle.put("entry", entries)
+        return bundle.toString(2)
+    }
+
+}
+
+
+
+
+fun sus() {
+    val sampleData = HemoCubeTestData(
+        sampleid = 1234,
+        _id = "local-001",
+        name = "John Doe",
+        incubationTime = "15",
+        bloodGroup = "B+",
+        age = "30",
+        state = "Karnataka",
+        abhaId = "29-1234-4567",
+        userImageURL = "https://example.com/user.jpg",
+        location = UserData.Location(latitude = 12.9716, longitude = 77.5946),
+        reportUploadTime = "2025-07-15T09:30:00+05:30",
+        testType = "HEMOCUBE",
+        testTime = "2025-07-15T09:15:00+05:30",
+        testStatus = true,
+        gender = "male",
+        localFlag = true,
+        deviceId = "device-5678",
+        appVersion = "1.4.2",
+        deviceSerialNumber = "SN-001-XY",
+        deviceType = "HEMOCUBE",
+        kitSerial = "KIT-20250715",
+        resultData = "Raw data goes here",
+        led1Buffer = 0.123,
+        led2Buffer = 0.456,
+        led3Buffer = 0.789,
+        led4Buffer = 0.321,
+        led1Sample = 0.654,
+        led2Sample = 0.987,
+        led3Sample = 0.432,
+        led4Sample = 0.210,
+        led1Average = 0.300,
+        led2Average = 0.500,
+        led3Average = 0.400,
+        led4Average = 0.450,
+        abs1 = 0.12,
+        abs2 = 0.23,
+        abs3 = 0.34,
+        abs4 = 0.45,
+        hb3 = 13.5,
+        hb4 = 13.7,
+        led1Gain1 = 1.1,
+        led2Gain1 = 1.2,
+        led3Gain1 = 1.3,
+        led4Gain1 = 1.4,
+        deviceRatio = 0.87,
+        calculatedRatio = 0.89,
+        predictedDenovixRatio = 0.91,
+        slopeRatio = 0.93,
+        coefficients = "a=1.0,b=2.0,c=3.0",
+        classificationResult = "Normal",
+        prdClassification = "PRD1",
+        deviceRatioClass = "A",
+        slopeRatioClass = "B",
+        borderlineMethod2Class = "C",
+        errorMessages = "",
+        batteryLevel = "85%",
+        batteryCapacity = "2800mAh",
+        batteryMaxCapacity = "3000mAh",
+        batteryTemperature = "35C",
+        batteryVoltage = "3.7V",
+        molbioFlag = false,
+        quickCapture = false,
+        solution = "Blood Sample",
+        concentration = "13.5g/dL",
+        filter = "None",
+        volume = "20uL",
+        isCSVCreated = true,
+        labName = "ABC Labs",
+        cuvetteSize = "Standard",
+        district = "Bangalore Urban",
+        centerName = "Health Center 1",
+        ipAddress = "192.168.1.101",
+        configUpdatedRecent = "true"
+    )
+
+    val converter = RecommendedFHIRConverter()
+    val standardFhir = converter.convertToFHIR(sampleData, useStandardCodes = true)
+
+    println("FHIR Bundle Output:\n$standardFhir")
+}

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

@@ -15,7 +15,6 @@ 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
@@ -23,8 +22,16 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import javax.inject.Inject
 
+
 @HiltAndroidApp
 class HPOSTestingApplication : Application() {
+    companion object {
+        init {
+            System.loadLibrary("native-server")
+        }
+    }
+
+
     @Inject
     lateinit var firebaseManager: FirebaseManager
     override fun onCreate() {
@@ -39,4 +46,5 @@ class HPOSTestingApplication : Application() {
         val firestore = firebaseManager.getCurrentFirestore()
         firestore.firestoreSettings = firestoreSettings
     }
+
 }

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

@@ -32,7 +32,6 @@ import retrofit2.http.PUT
 import retrofit2.http.Part
 
 interface MolbioResultApi {
-
     @PUT("deviceService/results/HPOS")
     suspend fun uploadResults(
         @Body molbioV2ResultRequest: MolbioV2ResultRequest,
@@ -47,6 +46,7 @@ interface MolbioResultApi {
 //    suspend fun deviceUpdate(
 //        @Body deviceUpdateRequest: DeviceUpdateRequest,
 //    ): ResponseBody
+    
     @POST("deviceService/device/getUpdate")
     suspend fun deviceUpdate(
         @Body deviceUpdateRequest: DeviceUpdateRequest,
@@ -62,7 +62,6 @@ interface MolbioResultApi {
         @Part logFile: MultipartBody.Part,
     ): UploadLogsResponse
 
-
     @PUT("deviceService/device/uploadDeviceDiagnostics")
     suspend fun deviceDiagnostics(
         @Body deviceDiagnosticsRequest: DeviceDiagnosticsRequest

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
+    var MOLBIO_INTEGRATION = true
+    var FIREBASE_INTEGRATION = false
     const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
     const val deviceProvisionPassword = "f2ab0e7f9d69"
     const val DEVICE_ID_API = "deviceIDAPI"
@@ -44,9 +44,9 @@ object Constants {
     const val DELAY_BETWEEN_COMMANDS: Long = 1000
 
     const val TEST_RIGHT_TOTAL_PIXEL = 3694
-
     const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE = 34
     const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM = 9
+    const val MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM_RANDD= 129
 
     const val RANGE_IN_RESULT_CALCULATIONS = 10
 
@@ -108,7 +108,6 @@ object Constants {
     const val DEVICE_ID = "DEVICE_ID"
     const val LABNAME = "LAB_NAME"
     const val CUVETTE_SIZE = "CUVETTE_SIZE"
-    const val LAST_UPDATED = "LAST_UPDATED"
     const val IS_TOKEN_AVAILABLE = "IS_TOKEN_AVAILABLE"
     const val BUFFER_LED_LOWER_BOUND = 21000
     const val BUFFER_LED_UPPER_BOUND = 23500
@@ -1584,26 +1583,31 @@ object Constants {
             listOf(0.0, 0.0)
         )
     )
-    //Hemocube for 10mm
-    const val positiveBoderLine10mm1 = 1.3
-    const val positiveBoderLine10mm2 = 1.66
-    const val negativeBoderLine10mm1 = 2.0
-    const val negativeBoderLine10mm2 = 2.4
+    //Trueheme for 10mm
+    //Before changing below values review before
+    //classification borderline metric
+    const val positiveBoderLineMetricCheck10mmMin = 1.3
+    const val positiveBoderLineMetricCheck10mmMax = 1.66
+    const val negativeBoderLineMetricCheck10mmMin = 2.0
+    const val negativeBoderLineMetricCheck10mmMax = 2.4
+    //classification device ratio
     const val normalMin10mm = 0.07
     const val normalMax10mm = 0.23
     const val negativeBorderlineMin10mm = 0.23
     const val negativeBorderlineMax10mm = 0.27
     const val sickleCellTraitMin10mm = 0.27
     const val sickleCellTraitMax10mm = 0.31
-    const val positiveForSickleCellMin10mm = 0.31
-    const val positiveForSickleCellMax10mm = 0.39
+    const val positiveBoderlineMin10mm = 0.31
+    const val positiveBoderlineMax10mm = 0.39
     const val sickleCellDiseaseMin10mm = 0.39
     const val sickleCellDiseaseMax10mm = 0.7
-    //Hemocube for 2mm
-    const val positiveBoderLine2mm1 = 0.8
-    const val positiveBoderLine2mm2 = 1.1
-    const val negativeBoderLine2mm1 = 1.5
-    const val negativeBoderLine2mm2 = 1.9
+    //Trueheme for 2mm
+    //classification borderline metric
+    const val positiveBoderLineMetricCheck2mmMin = 0.8
+    const val positiveBoderLineMetricCheck2mmMax = 1.1
+    const val negativeBoderLineMetricCheck2mmMin = 1.5
+    const val negativeBoderLineMetricCheck2mmMax = 1.9
+    //classification device ratio
     const val normalMin2mm = 0.1
     const val normalMax2mm = 0.23
     const val negativeBorderlineMin2mm = 0.23
@@ -1624,6 +1628,7 @@ object Constants {
     const val min10mmLed2 = 0.05
     const val max10mmLed2 = 0.41
 
+    //Check used in handling the buffer values on buffer complete
     const val bufferMinLed1 = 21000.00
     const val bufferMaxLed1 = 23000.00
     const val bufferMinLed2 = 17000.00

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

@@ -38,6 +38,7 @@ 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.NetworkMonitor
 import com.example.hpostesting.util.PropertyProvider
 import com.example.hpostesting.util.PropertyProviderImpl
 import com.google.firebase.firestore.FirebaseFirestore
@@ -240,8 +241,12 @@ object AppModule {
         return UsbServiceListenerImpl(context)
     }
 
-
-
-
+    @Provides
+    @Singleton
+    fun provideNetworkMonitor(
+        @ApplicationContext context: Context
+    ): NetworkMonitor {
+        return NetworkMonitor(context).apply { startMonitoring() }
+    }
 
 }

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

@@ -14,6 +14,9 @@ package com.example.hpostesting.firebase
 import android.content.Context
 import android.content.Intent
 import android.os.Process
+import android.util.Log
+import androidx.core.content.edit
+import com.example.hpostesting.data.constant.Constants
 import com.google.firebase.FirebaseApp
 import com.google.firebase.FirebaseOptions
 import com.google.firebase.firestore.FirebaseFirestore
@@ -26,33 +29,83 @@ 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 defaultServers = mutableListOf<FirebaseConfig>()
+    external fun getFirebaseDataMap(): Map<String, Map<String, String>>
+    private val map: Map<String, Map<String, String>> = getFirebaseDataMap()
+    companion object {
+        init {
+            System.loadLibrary("native-server") //use NDK ro secure somethings
+        }
+    }
+    private val sharedPreferencesServerConfig = context.getSharedPreferences("FirebaseConfigPrefs", Context.MODE_PRIVATE)
+    private val sharedPreferencesDev = context.getSharedPreferences("DevMode",Context.MODE_PRIVATE)
 
     private var currentFirestore: FirebaseFirestore = FirebaseFirestore.getInstance()
     private var currentStorage: FirebaseStorage = FirebaseStorage.getInstance()
-    var updateStatus = false
+    private var updateStatus = false
+
+
+    private fun Map<String, String>.toFirebaseConfig(server: String): FirebaseConfig? {
+        val apiKey = this["apiKey"] ?: return null
+        val appId = this["appId"] ?: return null
+        val projectId = this["projectId"] ?: return null
+        val storageBucket = this["storageBucket"] ?: return null
+        return FirebaseConfig(
+            serverName = server,
+            projectId = projectId,
+            appId = appId,
+            apiKey = apiKey,
+            storageBucket = storageBucket
+        )
+    }
+
+
+   fun populate() {
+        defaultServers.clear()
+        map.forEach { (server, config) ->
+            config.toFirebaseConfig(server)?.let {
+                defaultServers.add(it)
+            } ?: Log.w("Firebase", "Skipping $server due to missing keys")
+        }
+    }
+
+
+
 
-    private val defaultServers = listOf(
-        // i have it in different place look down
-        firebaseConfig1, firebaseConfig2, firebaseConfig3,
-    )
 
     init {
+        populate()
         val lastSelectedServer = getLastSelectedServer()
         switchServer(lastSelectedServer)
     }
 
+
+    fun setDevModeOn(state : Boolean){
+        sharedPreferencesDev.edit {
+            putBoolean( "isDevModeOn",state )
+        }
+    }
+
+    fun getDevMode(): Boolean {
+        return sharedPreferencesDev.getBoolean("isDevModeOn",false)
+    }
+
+
     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
+        if (firebaseConfig.serverName =="molbio" ||firebaseConfig.apiKey == "molbio"){
+            saveSelectedServer(firebaseConfig)
+            makeMolbioAsBackEnd()
+        }else {
+            makeSMIBackEnd()
+            saveSelectedServer(firebaseConfig)
+            val firebaseApp = getOrInitializeFirebaseApp(firebaseConfig)
+            currentFirestore = FirebaseFirestore.getInstance(firebaseApp)
+            currentStorage = FirebaseStorage.getInstance(firebaseApp)
+            updateStatus = true
+        }
 
     }
 
@@ -60,7 +113,6 @@ class FirebaseManager @Inject constructor(private val context: Context) {
         val existingApp = FirebaseApp.getApps(context).find { it.name == firebaseConfig.serverName }
 
         return if (existingApp != null) {
-
             existingApp
         } else {
 
@@ -73,7 +125,7 @@ class FirebaseManager @Inject constructor(private val context: Context) {
     }
 
     private fun saveSelectedServer(firebaseConfig: FirebaseConfig) {
-        with(sharedPreferences.edit()) {
+        with(sharedPreferencesServerConfig.edit()) {
             putString("selectedServerName", firebaseConfig.serverName)
             putString("projectId", firebaseConfig.projectId)
             putString("appId", firebaseConfig.appId)
@@ -93,12 +145,12 @@ class FirebaseManager @Inject constructor(private val context: 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)
+            sharedPreferencesServerConfig.getString("selectedServerName", defaultServers.first().serverName)
+        val projectId = sharedPreferencesServerConfig.getString("projectId", defaultServers.first().projectId)
+        val appId = sharedPreferencesServerConfig.getString("appId", defaultServers.first().appId)
+        val apiKey = sharedPreferencesServerConfig.getString("apiKey", defaultServers.first().apiKey)
         val storageBucket =
-            sharedPreferences.getString("storageBucket", defaultServers.first().storageBucket)
+            sharedPreferencesServerConfig.getString("storageBucket", defaultServers.first().storageBucket)
 
         return FirebaseConfig(
             serverName = selectedServerName ?: defaultServers.first().serverName,
@@ -112,6 +164,16 @@ class FirebaseManager @Inject constructor(private val context: Context) {
     fun getAvailableServers(): List<FirebaseConfig> {
         return defaultServers
     }
+
+    private fun makeMolbioAsBackEnd(){
+        Constants.FIREBASE_INTEGRATION = false
+        Constants.MOLBIO_INTEGRATION = true
+        restartApp()
+    }
+    private fun makeSMIBackEnd(){
+        Constants.FIREBASE_INTEGRATION = true
+        Constants.MOLBIO_INTEGRATION = false
+    }
 }
 
 fun restartApp(context: Context) {
@@ -128,26 +190,51 @@ fun delayedRestart(context: 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"
-)
+//
+//
+//private val firebaseConfigDev = FirebaseConfig(
+//    serverName = "dev",
+//    apiKey = "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I",
+//    appId = "1:650071678820:android:a53292637abb7c0d6c6471",
+//    projectId = "hpos-af3cc",
+//    storageBucket = "hpos-af3cc.appspot.com"
+//)
+//private val firebaseConfigQaQc = FirebaseConfig(
+//    serverName = "qc-qa",
+//    apiKey = "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs",
+//    appId = "1:1004619739289:android:3dbcefb10ea99654e5c808",
+//    projectId = "hpos-qa",
+//    storageBucket = "hpos-qa.appspot.com"
+//)
+//
+//private val firebaseConfigProd = FirebaseConfig(
+//    serverName = "prod",
+//    apiKey = "AIzaSyA_O0oZGzy3Kiw9fiLQ3OFPME-xQJP88vs",
+//    appId = "1:1012719870714:android:d8d7c962d96f4097de5f43",
+//    projectId = "hpos-prod",
+//    storageBucket = "hpos-prod.appspot.com"
+//)
+//
+//private val firebaseConfigPreProd = FirebaseConfig(
+//    serverName = "pre prod",
+//    apiKey = "AIzaSyDYySi27LioZGNisP1NfnNU5inJX_0FT38",
+//    appId = "1:121176529204:android:e6841fdac57bdc95bbed61",
+//    projectId = "hpos-preprod",
+//    storageBucket = "hpos-preprod.appspot.com"
+//)
+//
+//private val firebaseConfigSmiRandD= FirebaseConfig(
+//    serverName = "SMI R&D",
+//    apiKey = "AIzaSyAVxpilbB804iRCCpMBDjjmdZhQguctGHM",
+//    appId = "1:327771387914:android:a3b4ed2e42ea6e38dc87f3",
+//    projectId = "hposrandd",
+//    storageBucket = "hposrandd.firebasestorage.app"
+//)
+//
+//private val configMolbio = FirebaseConfig(
+//    serverName = "molbio",
+//    apiKey = "molbio",
+//    appId = "molbio",
+//    projectId = "molbio",
+//    storageBucket = "molbio"
+//)

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

@@ -19,20 +19,19 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import android.text.Editable
 import android.util.Log
-import android.view.View
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContentProviderCompat.requireContext
 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.firebase.FirebaseManager
+import com.example.hpostesting.presentation.main_base.DashboardActivity
 import com.example.hpostesting.presentation.hb_test.HBTestActivity
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestActivity
 import com.example.hpostesting.presentation.testRight.TestRightActivity
-import com.google.android.material.snackbar.Snackbar
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanIntentResult
 import com.journeyapps.barcodescanner.ScanOptions
@@ -50,13 +49,12 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
-import kotlin.math.max
 
 class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
     private var fromWhere = "Home"
     private val TAG = "KitScanActivity"
     private lateinit var binding: ActivityKitScanBinding
-
+    private lateinit var firebaseManager: FirebaseManager
     private lateinit var sharedPreference: SharedPreferences
 
     var sdkHandler: SDKHandler? = null
@@ -75,21 +73,21 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
     }
 
     private fun processScannedData(contents: String) {//edited auto selection of cuvette size
-        if(contents.contains("SMI/SC/")){
+        if (contents.contains("SMI/SC/")) {
             with(sharedPreference.edit()) {
                 putString(Constants.CUVETTE_SIZE, "2mm")
                 apply()
             }
             Toast.makeText(this, "Selected cuvette size: 2mm", Toast.LENGTH_SHORT).show()
             binding.nameEditText.setText(contents)
-        }else if(contents.contains("SMI/SC-2-D10/")){
+        } else if (contents.contains("SMI/SC-2-D10/")) {
             with(sharedPreference.edit()) {
                 putString(Constants.CUVETTE_SIZE, "10mm")
                 apply()
             }
             Toast.makeText(this, "Selected cuvette size: 10mm", Toast.LENGTH_SHORT).show()
             binding.nameEditText.setText(contents)
-        }else{
+        } else {
             Toast.makeText(this, R.string.invalid_kit, Toast.LENGTH_LONG).show()
         }
     }
@@ -131,33 +129,51 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        firebaseManager = FirebaseManager(this)
+        val currentServer = firebaseManager.getLastSelectedServer().serverName
         binding = ActivityKitScanBinding.inflate(layoutInflater)
         sharedPreference = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         setContentView(binding.root)
         binding.toolbar.title = "Kit Serial Number"
         fromWhere = intent.getStringExtra("fromWhere").toString()
-        val maxTest = if(sharedPreference.getString(Constants.CUVETTE_SIZE, "10mm").toString() == "2mm"){
-            Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE
-        }else{
-            Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM
+
+        val maxTest = if (currentServer == "SMI R&D"){
+            Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM_RANDD
+
+            Log.d(TAG, "onCreate RandD mode")
+        }else {
+            if (sharedPreference.getString(Constants.CUVETTE_SIZE, "10mm").toString() == "2mm") {
+                Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE
+            } else {
+                Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE10MM
+            }
         }
         val time = timeDifference(sharedPreference.getString(Constants.KIT_TIME, "").toString())
         val kitNum = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-       // Toast.makeText(this@KitScanActivity,"Test MAx time"+ time+"-Test count-"+kitNum,Toast.LENGTH_SHORT).show()
-
-        if (DataHolder.sampleReadCounter <= maxTest && kitNum != "" && time < Constants.MAX_KIT_TIME) {
+        // Toast.makeText(this@KitScanActivity,"Test MAx time"+ time+"-Test count-"+kitNum,Toast.LENGTH_SHORT).show()
+//        if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
+//            moveToNext()
+//        }else{
+        if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
             moveToNext()
         } else {
-            Toast.makeText(this@KitScanActivity, "Limit Reached, Use New KIT for testing", Toast.LENGTH_SHORT).show()
-            DataHolder.sampleReadCounter = 0
-            DataHolder.kitSerial = ""
+            if (DataHolder.sampleReadCounter <= maxTest && kitNum != "" && time < Constants.MAX_KIT_TIME) {
+                moveToNext()
+            } else {
+                Toast.makeText(
+                    this@KitScanActivity,
+                    "Limit Reached, Use New KIT for testing",
+                    Toast.LENGTH_SHORT
+                ).show()
+                DataHolder.sampleReadCounter = 0
+                DataHolder.kitSerial = ""
 
-            with(sharedPreference.edit()) {
-                putString(Constants.KIT_NUMBER, "")
-                putString(Constants.BUFFER_VALUE_1, "")
-                putString(Constants.BUFFER_VALUE_2, "")
-                apply()
+                with(sharedPreference.edit()) {
+                    putString(Constants.KIT_NUMBER, "")
+                    putString(Constants.BUFFER_VALUE_1, "")
+                    putString(Constants.BUFFER_VALUE_2, "")
+                    apply()
+                }
             }
         }
 
@@ -210,13 +226,13 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
             if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
-                if(serialNumber.contains("SMI/SC/")){
+                if (serialNumber.contains("SMI/SC/")) {
                     with(sharedPreference.edit()) {
                         putString(Constants.CUVETTE_SIZE, "2mm")
                         apply()
                     }
                     Toast.makeText(this, "Selected cuvette size: 2mm", Toast.LENGTH_SHORT).show()
-                }else if(serialNumber.contains("SMI/SC-2-D10/")){
+                } else if (serialNumber.contains("SMI/SC-2-D10/")) {
                     with(sharedPreference.edit()) {
                         putString(Constants.CUVETTE_SIZE, "10mm")
                         apply()
@@ -299,7 +315,8 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         if (mScannerInfoList.isNotEmpty()) {
             sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
         } else {
-            Toast.makeText(this,"Scanner Is not available In this device", Toast.LENGTH_LONG).show()
+            Toast.makeText(this, "Scanner Is not available In this device", Toast.LENGTH_LONG)
+                .show()
         }
     }
 
@@ -337,7 +354,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
         runOnUiThread {
             val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
             processScannedData(result)
-           // binding.nameEditText.text = editableResult
+            // binding.nameEditText.text = editableResult
         }
     }
 
@@ -350,31 +367,33 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
 
     private fun isSerialValid(s: String): Boolean {
         if (s.contains("SMI/SC/")) {
-            if(s.length != 17){
-                binding.nameEditText.error = "Invalid Kit Serial Number, correct example SMI/SC/000/00/000"
+            if (s.length != 17) {
+                binding.nameEditText.error =
+                    "Invalid Kit Serial Number, correct example SMI/SC/000/00/000"
                 return false
             }
-        }else if(s.contains("SMI/SC-2-D10/")){
-            if(s.length != 27){
-                binding.nameEditText.error = "Invalid Kit Serial Number, correct example SMI/SC-2-D10/000000/000/000"
+        } else if (s.contains("SMI/SC-2-D10/")) {
+            if (s.length != 27) {
+                binding.nameEditText.error =
+                    "Invalid Kit Serial Number, correct example SMI/SC-2-D10/000000/000/000"
                 return false
             }
-        }else{
+        } else {
             return false
         }
         return true
     }
 
     private fun moveToNext() {
-        if(fromWhere == "Main"){
-            if(DataHolder.selectedTestType == TestType.HB_EST){
+        if (fromWhere == "Main") {
+            if (DataHolder.selectedTestType == TestType.HB_EST) {
                 val i = Intent(applicationContext, HBTestActivity::class.java)
                 startActivity(i)
-            }else{
+            } else {
                 DataHolder.deviceType.observe(this) { deviceType ->
                     when (deviceType) {
                         Constants.DEVICE_TYPE_HEMOCUBE -> {
-                            val i = Intent(applicationContext, HemocubeActivity::class.java)
+                            val i = Intent(applicationContext, TrueHemeTestActivity::class.java)
                             startActivity(i)
                         }
 
@@ -384,7 +403,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
                         }
 
                         Constants.DEVICE_TYPE_TRUEHEME -> {
-                            val i = Intent(applicationContext, HemocubeActivity::class.java)
+                            val i = Intent(applicationContext, TrueHemeTestActivity::class.java)
                             startActivity(i)
                         }
                     }
@@ -423,6 +442,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
             true
         }
     }
+
     private fun timeDifference(createdAt: String): Long {
         val currentTime = Calendar.getInstance().time
         val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())

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

@@ -35,7 +35,7 @@ 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.test.TestType
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.main_base.DashboardActivity
 import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationCallback
 import com.google.android.gms.location.LocationRequest

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

@@ -14,6 +14,7 @@
 package com.example.hpostesting.presentation
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -28,11 +29,12 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.main_base.DashboardActivity
 import com.example.hpostesting.util.MyUtils
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivitySplashBinding
 
+@SuppressLint("CustomSplashScreen")
 class SplashActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivitySplashBinding

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

@@ -29,7 +29,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
 import com.google.firebase.firestore.FirebaseFirestore
@@ -42,7 +42,7 @@ import java.util.Locale
 
 class UserListAdapter(
     private val context: Context,
-    private val hemoCubeViewModel: HemoCubeViewModel,
+    private val trueHemeTestViewModel: TrueHemeTestViewModel,
     options: FirestoreRecyclerOptions<UserData>,
     private val view: View,
     private val batLevel: Int,

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

@@ -31,7 +31,7 @@ import androidx.fragment.app.Fragment
 import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestActivity
 import `in`.sminnovations.hpostesting.databinding.FragmentAssuranceControlsBinding
 import java.time.Instant
 
@@ -259,7 +259,7 @@ class AssuranceControlsFragment : Fragment() {
                 apply()
             }
 
-            val i = Intent(requireContext(), HemocubeActivity::class.java)
+            val i = Intent(requireContext(), TrueHemeTestActivity::class.java)
             startActivity(i)
         }
     }

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

@@ -29,8 +29,8 @@ import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.main_base.DashboardActivity
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.R
@@ -44,7 +44,7 @@ import kotlin.math.log10
 class HemoCubeBufferCheckFragment : Fragment() {
 
     private lateinit var binding: FragmentHemoCubeReferenceBinding
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private val trueHemeTestViewModel: TrueHemeTestViewModel by activityViewModels()
     private lateinit var sharedPreferences: SharedPreferences
     private var currentDeviceData: DeviceData? = null
     private var resultData: String = ""
@@ -123,13 +123,13 @@ class HemoCubeBufferCheckFragment : Fragment() {
     }
 
     private fun observeViewModel() {
-        hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
+        trueHemeTestViewModel.deviceData.observe(viewLifecycleOwner) {
             currentDeviceData = it
         }
 
-        hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
+        trueHemeTestViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
             if (isNetworkAvailable) {
-                hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
+                trueHemeTestViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
             } else {
                 Toast.makeText(
                     requireContext(), R.string.internt_not, Toast.LENGTH_SHORT
@@ -137,7 +137,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
             }
             isOnline = isNetworkAvailable
         }
-        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
+        trueHemeTestViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 showToast(R.string.kit_uploaded)
             }
@@ -152,11 +152,11 @@ class HemoCubeBufferCheckFragment : Fragment() {
             binding.progressBar.visibility = View.GONE
         }
 
-        hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
+        trueHemeTestViewModel.messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
         }
 
-        hemoCubeViewModel.deviceMessages.observe(viewLifecycleOwner) {
+        trueHemeTestViewModel.deviceMessages.observe(viewLifecycleOwner) {
             binding.tvDeviceMessages.text = it
         }
     }
@@ -192,7 +192,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
         }
 
         resultData += stringData
-        hemoCubeViewModel.deviceMessages.postValue(resultData)
+        trueHemeTestViewModel.deviceMessages.postValue(resultData)
 
         when {
             stringData.contains("SN") -> {
@@ -209,11 +209,11 @@ class HemoCubeBufferCheckFragment : Fragment() {
                     binding.tvSubtitle4.visibility = View.VISIBLE
                     binding.btnPlacebuffer.visibility = View.VISIBLE
                 }
-                hemoCubeViewModel.messages.postValue("Start")
+                trueHemeTestViewModel.messages.postValue("Start")
             }
 
             stringData.contains("#BS") -> {
-                hemoCubeViewModel.messages.postValue("Buffer Started")
+                trueHemeTestViewModel.messages.postValue("Buffer Started")
             }
 
             stringData.contains("#BC") -> {
@@ -232,7 +232,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
             }
 
             stringData.contains("#SC") -> {
-                hemoCubeViewModel.messages.postValue("Sample Completed \nGathering data")
+                trueHemeTestViewModel.messages.postValue("Sample Completed \nGathering data")
                 fetchResult()
             }
 
@@ -351,7 +351,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
             }
 
             val prdClassification = absorbanceBasedClassification(_predictedDenovixRatio)
-            hemoCubeViewModel.messages.postValue(prdClassification)
+            trueHemeTestViewModel.messages.postValue(prdClassification)
 
             val bufferData = BufferCheckData(
                 _id = UUID.randomUUID().toString(),
@@ -385,15 +385,15 @@ class HemoCubeBufferCheckFragment : Fragment() {
                 testTime = SimpleDateFormat(
                     "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                 ).format(Calendar.getInstance().time),
-                batteryLevel = hemoCubeViewModel.getBatteryLevel().toString(),
-                batteryCapacity = hemoCubeViewModel.getBatteryCapacity(requireContext()).toString(),
-                batteryMaxCapacity = hemoCubeViewModel.getBatteryMaxCapacity(requireContext())
+                batteryLevel = trueHemeTestViewModel.getBatteryLevel().toString(),
+                batteryCapacity = trueHemeTestViewModel.getBatteryCapacity(requireContext()).toString(),
+                batteryMaxCapacity = trueHemeTestViewModel.getBatteryMaxCapacity(requireContext())
                     .toString(),
-                batteryTemperature = hemoCubeViewModel.getBatteryTemperature().toString(),
-                batteryVoltage = hemoCubeViewModel.getBatteryVoltage(requireContext()).toString()
+                batteryTemperature = trueHemeTestViewModel.getBatteryTemperature().toString(),
+                batteryVoltage = trueHemeTestViewModel.getBatteryVoltage(requireContext()).toString()
             )
 
-            hemoCubeViewModel.uploadHemoCubeResultToDatabaseForBufferCheck(isOnline, bufferData)
+            trueHemeTestViewModel.uploadHemoCubeResultToDatabaseForBufferCheck(isOnline, bufferData)
         } catch (e: Exception) {
             Toast.makeText(
                 requireContext(), "Error while processing device data", Toast.LENGTH_SHORT
@@ -404,7 +404,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
 
     private fun findResult(calculatedRatio: Double?): String {
         try {
-            hemoCubeViewModel.messages.postValue("result classification")
+            trueHemeTestViewModel.messages.postValue("result classification")
             if (calculatedRatio != null) {
                 if (calculatedRatio < 0.05) return "Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume"
                 if (calculatedRatio in 0.05..0.155) return "Normal"
@@ -426,7 +426,7 @@ class HemoCubeBufferCheckFragment : Fragment() {
 
     private fun absorbanceBasedClassification(predictedDenovixRatio: Double?): String {
         try {
-            hemoCubeViewModel.messages.postValue("result classification")
+            trueHemeTestViewModel.messages.postValue("result classification")
             if (predictedDenovixRatio != null) {
                 if (predictedDenovixRatio in 0.0..0.16) return "Kit Passed"
                 if (predictedDenovixRatio in 0.16..0.165) return "Kit Passed"
@@ -482,20 +482,20 @@ class HemoCubeBufferCheckFragment : Fragment() {
     }
 
     private fun getDeviceInfo() {
-        hemoCubeViewModel.progressBar.postValue(true)
+        trueHemeTestViewModel.progressBar.postValue(true)
         (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(
             HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val stringData = String(it)
-                        hemoCubeViewModel.messages.postValue(stringData)
+                        trueHemeTestViewModel.messages.postValue(stringData)
                         binding.tvSubtitle4.text = stringData
                     }
                 }
 
                 override fun onUsbError(e: Exception?) {
-                    hemoCubeViewModel.progressBar.postValue(false)
+                    trueHemeTestViewModel.progressBar.postValue(false)
                 }
             })
     }

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

@@ -36,7 +36,7 @@ import androidx.core.view.get
 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.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -47,7 +47,7 @@ import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
 @AndroidEntryPoint
 open class HemocubeBufferCheckActivity : AppCompatActivity() {
     private lateinit var binding: ActivityHemocubeBinding
-    private val viewModel by viewModels<HemoCubeViewModel>()
+    private val viewModel by viewModels<TrueHemeTestViewModel>()
     private var myMenu: Menu? = null
 
     private lateinit var mDriver: UsbSerialDriver

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

@@ -31,7 +31,7 @@ import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.calibration.CalibrationData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.main_base.DashboardActivity
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentCalibrationBinding

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

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

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

@@ -1,18 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.presentation.dashboard
-
-interface ItemClickListener {
-    fun onClick(pos: Int)
-}

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

@@ -1,279 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.presentation.dashboard
-
-import android.app.AlertDialog
-import android.content.Context
-import android.content.SharedPreferences
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-import androidx.preference.ListPreference
-import androidx.preference.Preference
-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 `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
-
-private var isLanguageChanged = false
-
-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)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME, ""))
-
-        selectedItem = sharedPreferences.getString(Constants.CUVETTE_SIZE, "10mm").toString()
-        val time = sharedPreferences.getString(Constants.LAST_UPDATED, "NA").toString()
-        binding.lastUpdated.text = "Last updated config: $time"
-        binding.btnGo.setOnClickListener {
-            var labname = binding.nameEditText.text.toString()
-            DataHolder.hemoCubeTestData?.apply {
-                this.labName = labname
-            }
-            with(sharedPreferences.edit()) {
-                putString(Constants.LABNAME, labname)
-                apply()
-            }
-
-            Toast.makeText(
-                requireContext(), "Lab Name is Added successfully.", Toast.LENGTH_SHORT
-            ).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") {
-            pos = 0
-        } else {
-            pos = 1
-        }
-
-        binding.spinnerCuvette.adapter = adapter
-        binding.spinnerCuvette.onItemSelectedListener =
-            object : AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(
-                    parent: AdapterView<*>?, view: View?, position: Int, id: Long
-                ) {
-                    // Handle item selection here
-                    selectedItem = values[position]
-                }
-
-                override fun onNothingSelected(parent: AdapterView<*>?) {
-                    // Do nothing here
-                }
-            }
-        binding.spinnerCuvette.setSelection(pos)
-        binding.btnAddSize.setOnClickListener {
-            with(sharedPreferences.edit()) {
-                putString(Constants.CUVETTE_SIZE, selectedItem)
-                apply()
-            }
-            Toast.makeText(
-                requireContext(), "Selected cuvette size: $selectedItem", Toast.LENGTH_SHORT
-            ).show()
-        }
-
-        childFragmentManager.beginTransaction().replace(binding.container.id, PrefsFragment())
-            .commit()
-    }
-}
-
-class PrefsFragment : PreferenceFragmentCompat(){
-    private lateinit var tapManager: AppVersionTapManager
-    private var isServerSelectionVisible = false
-    private lateinit var serverPreference: Preference
-    private lateinit var currentServerPreference: Preference
-    lateinit var firebaseManager: FirebaseManager
-    lateinit var databaseRepository: DatabaseRepository
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-         firebaseManager = FirebaseManager(requireContext())
-        databaseRepository = (activity as DashboardActivity).databaseRepository
-
-        tapManager = AppVersionTapManager()
-        val sharedPreference =
-            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-        val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
-        val currentServer = firebaseManager.getLastSelectedServer().serverName
-
-        // Language Preference
-        val languagePreference = ListPreference(requireContext()).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)
-
-            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)
-
-        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()
-        isLanguageChanged = true
-    }
-
-    private fun getAppVersion(context: Context): String {
-        return try {
-            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-            pInfo.versionName
-        } catch (e: PackageManager.NameNotFoundException) {
-            "N/A"
-        }
-    }
-
-    private fun getAppEnvironment(context: Context): String {
-        return try {
-            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-            pInfo.packageName.substringAfterLast('.')
-        } catch (e: PackageManager.NameNotFoundException) {
-            "N/A"
-        }
-    }
-}
-
-

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

@@ -1,26 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.presentation.dashboard.ui.gallery
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-
-class mGalleryViewModel : ViewModel() {
-
-    private val _text = MutableLiveData<String>().apply {
-        value = "This is gallery Fragment"
-    }
-    val text: LiveData<String> = _text
-}

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

@@ -1,26 +0,0 @@
-/*
- * // Copyright (c) 2024 ShanMukha Innovations Pvt. Ltd. All rights reserved.
- * // Notice: All information contained herein is, and remains
- * // the property of ShanMukha Innovations Pvt. Ltd. and its suppliers,
- * // if any. The intellectual and technical concepts contained
- * // herein are proprietary to ShanMukha Innovations Pvt. Ltd.
- * // and its suppliers and may be covered by Indian and Foreign Patents,
- * // patents in process, and are protected by trade secret or copyright law.
- * // Dissemination of this information or reproduction of this material
- * // is strictly forbidden unless prior written permission is obtained
- * // from ShanMukha Innovations Pvt. Ltd.
- */
-
-package com.example.hpostesting.presentation.dashboard.ui.slideshow
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-
-class SlideshowViewModel : ViewModel() {
-
-    private val _text = MutableLiveData<String>().apply {
-        value = "This is slideshow Fragment"
-    }
-    val text: LiveData<String> = _text
-}

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

@@ -26,14 +26,14 @@ import androidx.lifecycle.MutableLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDeviceBinding
 
 class DeviceFragment : Fragment() {
     private lateinit var binding: FragmentDeviceBinding
-    private val deviceViewModel: HemoCubeViewModel by activityViewModels()
+    private val deviceViewModel: TrueHemeTestViewModel by activityViewModels()
     private lateinit var sharedPreferences: SharedPreferences
     private var deviceId = ""
     private var startListening = MutableLiveData(false)

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

@@ -17,7 +17,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.os.Environment
 import android.provider.Settings
 import android.util.Log
 import android.view.LayoutInflater
@@ -34,13 +33,12 @@ import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.encryption.Encryption
 import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.google.android.gms.ads.identifier.AdvertisingIdClient
+import com.example.hpostesting.presentation.main_base.DashboardActivity
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDeviceProvisionBinding
+import okio.ByteString.Companion.decodeBase64
 import java.io.File
-import java.io.FileOutputStream
 
 class DeviceProvisionFragment : Fragment() {
     private var resultData: String = ""
@@ -150,17 +148,18 @@ class DeviceProvisionFragment : Fragment() {
                                 DashboardActivity::class.java
                             )
                         )
+
                     } else {
                         Toast.makeText(
                             activity,
                             "An error in device provision: ${response.data.message}",
                             Toast.LENGTH_LONG
                         ).show()
+                        Log.d("Error in hpos network", "observeViewModel:${response.data.message} ")
                         binding.btnSubmit.visibility = View.VISIBLE
                     }
 
                 }
-
                 is Result.Error -> {
                     response.exception.let { message ->
                         Toast.makeText(
@@ -168,7 +167,9 @@ class DeviceProvisionFragment : Fragment() {
                             "An error occurred in device provision: $message",
                             Toast.LENGTH_LONG
                         ).show()
+                        Log.d("Error in hpos network 2", "observeViewModel:$message} ")
                     }
+                    Log.d("Error in hpos network 3", "observeViewModel: $response} ")
                 }
 
                 is Result.Loading -> {

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

@@ -11,29 +11,14 @@
  * // from ShanMukha Innovations Pvt. Ltd.
  */
 
-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base
 
-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.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.FragmentAboutBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentActivitiesBinding
-import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
 
 class AboutFragment : Fragment() {
     private lateinit var binding: FragmentAboutBinding

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

@@ -11,7 +11,7 @@
  * // from ShanMukha Innovations Pvt. Ltd.
  */
 
-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base
 
 import android.content.Context
 import android.os.BatteryManager
@@ -23,7 +23,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import `in`.sminnovations.hpostesting.databinding.FragmentActivitiesBinding
 import java.text.SimpleDateFormat
 import java.util.Calendar
@@ -32,7 +32,7 @@ import java.util.Locale
 
 class ActivitiesFragment : Fragment() {
     private lateinit var binding: FragmentActivitiesBinding
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private val trueHemeTestViewModel: TrueHemeTestViewModel by activityViewModels()
     private lateinit var adapter: OfflineUserListAdapter
 
     override fun onCreateView(
@@ -46,12 +46,12 @@ class ActivitiesFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        hemoCubeViewModel.allPendingUserToUpload.observe(viewLifecycleOwner) { userData ->
+        trueHemeTestViewModel.allPendingUserToUpload.observe(viewLifecycleOwner) { userData ->
 
             if (userData.isNotEmpty()) {
                 userData.forEach { user ->
                     if((isBetween15And30Minutes(user.incubationTime) > 30 || isBetween15And30Minutes(user.incubationTime) < 0 ) && user.testStatus == false){
-                        hemoCubeViewModel.deleteByStatus()
+                        trueHemeTestViewModel.deleteByStatus()
                     }
                 }
 

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

@@ -0,0 +1,23 @@
+package com.example.hpostesting.presentation.main_base
+
+import com.example.hpostesting.data.constant.Constants.FIREBASE_INTEGRATION
+import com.example.hpostesting.data.constant.Constants.MOLBIO_INTEGRATION
+
+class AppVersionTapManager {
+
+     private var tapCount = 0
+    private val maxTapCount = 5
+     val shouldEnable = FIREBASE_INTEGRATION && !MOLBIO_INTEGRATION
+     val notEnable = MOLBIO_INTEGRATION && !FIREBASE_INTEGRATION
+
+    fun registerTap(onMaxTapsReached: () -> Unit) {
+        tapCount++
+            if (tapCount >= maxTapCount && shouldEnable) {
+                onMaxTapsReached()
+                reset()
+            }
+    }
+    private fun reset() {
+        tapCount = 0
+    }
+}

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

@@ -11,7 +11,7 @@
  * // from ShanMukha Innovations Pvt. Ltd.
  */
 
-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base
 
 import android.annotation.SuppressLint
 import android.app.AlertDialog
@@ -30,8 +30,6 @@ import android.net.Uri
 import android.os.BatteryManager
 import android.os.Build
 import android.os.Bundle
-import android.os.Environment
-import android.provider.ContactsContract.Data
 import android.provider.Settings
 import android.util.Base64
 import android.util.Log
@@ -45,7 +43,6 @@ import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.DataHolder
@@ -62,7 +59,7 @@ import com.example.hpostesting.presentation.KitScanActivity
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.adapter.UserListAdapter
 import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.presentation.testRight.TestRightViewModel
 import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
 import com.example.hpostesting.presentation.utils.UsbServiceListener
@@ -103,12 +100,12 @@ class HomeFragment : Fragment() {
     private var downloadId: Long = 0
     private lateinit var binding: FragmentHomeBinding
     private val viewModel: TestRightViewModel by activityViewModels()
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private val trueHemeTestViewModel: TrueHemeTestViewModel by activityViewModels()
     private lateinit var rvAdapter: UserListAdapter
     private var batLevel: Int =
         0 // Initialize with a default value, or obtain the actual battery level
     private lateinit var adapter: OfflineUserListAdapter
-    private val homeViewModel: HemoCubeViewModel by activityViewModels()
+    private val homeViewModel: TrueHemeTestViewModel by activityViewModels()
     private var isTokenAvailable by Delegates.notNull<Boolean>()
     private var natsToken: String = ""
     private var deviceId: String = ""
@@ -142,7 +139,7 @@ class HomeFragment : Fragment() {
             deleteIncompleteRegistrations(userData)
         }
        // getLocationIP()
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
+        trueHemeTestViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
             deleteHemoCubeIncompleteRegistrations(userData)
             if (userData.isNotEmpty()) {
                 val userList = mutableListOf<HemoCubeTestData>()
@@ -173,12 +170,12 @@ class HomeFragment : Fragment() {
 //        }
 
 
-        hemoCubeViewModel.fireBaseBulkUpload.observe(viewLifecycleOwner) { result ->
+        trueHemeTestViewModel.fireBaseBulkUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 Toast.makeText(
                     requireContext(), R.string.test_upload, Toast.LENGTH_SHORT
                 ).show()
-                hemoCubeViewModel.fireBaseBulkUpload.postValue("Done")
+                trueHemeTestViewModel.fireBaseBulkUpload.postValue("Done")
             }
             if (result == "Error") {
                 Toast.makeText(requireContext(), R.string.test_upload_failed, Toast.LENGTH_SHORT)
@@ -196,7 +193,7 @@ class HomeFragment : Fragment() {
 //        binding.uploadData.setOnClickListener {
 ////            showUploadDialog(requireContext())
 //        }
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
+        trueHemeTestViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
 //            if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
 //
 //            }else{
@@ -291,7 +288,7 @@ class HomeFragment : Fragment() {
 
     @RequiresApi(Build.VERSION_CODES.P)
     private fun checkNetworkStatus() {
-        hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isConnected ->
+        trueHemeTestViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isConnected ->
            // Toast.makeText(requireContext(),"connected"+isConnected+wasConnected, Toast.LENGTH_SHORT).show()
             if(isConnected){
                 binding.tvTitleNoInternet.text = "Please enter the user id and select blood group to start the test."
@@ -381,10 +378,10 @@ class HomeFragment : Fragment() {
 
                                 }*/
                     if(Constants.MOLBIO_INTEGRATION){
-                        hemoCubeViewModel.sendDataToMolbio()
+                        trueHemeTestViewModel.sendDataToMolbio()
                     }
                     if(Constants.FIREBASE_INTEGRATION) {
-                        hemoCubeViewModel.sendDataToFirebase()
+                        trueHemeTestViewModel.sendDataToFirebase()
                     }
 
                 } else {
@@ -437,7 +434,7 @@ class HomeFragment : Fragment() {
                    // hemoCubeViewModel.login(createLoginRequestData(userID, password))
                     //hemoCubeViewModel.startPeriodicCheckUpdate()
                 }else{
-                    hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
+                    trueHemeTestViewModel.checkUpdate(createCheckUpdateRequestData())
                 }
                 //isTokenAvailable = true
                // hemoCubeViewModel.startPeriodicCheckUpdate()
@@ -463,7 +460,7 @@ class HomeFragment : Fragment() {
                     callLogin(userID, password)
                     //hemoCubeViewModel.login(createLoginRequestData(userID, password))
                 }else{
-                    hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
+                    trueHemeTestViewModel.checkUpdate(createCheckUpdateRequestData())
                 }
             }
         } else {
@@ -474,7 +471,7 @@ class HomeFragment : Fragment() {
             ).show()
         }
 
-        hemoCubeViewModel.loginResponse.observe(viewLifecycleOwner) { response ->
+        trueHemeTestViewModel.loginResponse.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
                     updateTokens(response)
@@ -505,14 +502,14 @@ class HomeFragment : Fragment() {
             }
         }
 
-        hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
+        trueHemeTestViewModel.resultUpload.observe(viewLifecycleOwner) {
             when (it) {
                 is Result.Success -> {
 
                     Log.d("success,", "uploded")
                     it.data.data?.forEach { id ->
                         id.rawData?.let { it1 ->
-                            hemoCubeViewModel.updateMolbioFlag(
+                            trueHemeTestViewModel.updateMolbioFlag(
                                 it1._id
                             )
                         }
@@ -539,7 +536,7 @@ class HomeFragment : Fragment() {
             }
         }
 
-        hemoCubeViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
+        trueHemeTestViewModel.uploadLogs.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
 //                    Toast.makeText(
@@ -569,7 +566,7 @@ class HomeFragment : Fragment() {
             }
         }
 
-        hemoCubeViewModel.checkUpdate.observe(viewLifecycleOwner) { response ->
+        trueHemeTestViewModel.checkUpdate.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
                     val updatedversion = response.data.data?.version.toString()
@@ -595,7 +592,7 @@ class HomeFragment : Fragment() {
                     Log.d("versionnow", currentversion.toString())
                     Log.d("versionnow", updatedversion.toString())
                     if (updatedversion > currentversion.toString()) {
-                        hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
+                        trueHemeTestViewModel.deviceUpdate(createDeviceUpdateRequestData())
                         Toast.makeText(
                             activity,
                             "new version ${response.data.data?.version} Available",
@@ -631,7 +628,7 @@ class HomeFragment : Fragment() {
             }
         }
 
-        hemoCubeViewModel.downloadcertificate.observe(viewLifecycleOwner) { response ->
+        trueHemeTestViewModel.downloadcertificate.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
                     val url = response.data
@@ -818,7 +815,7 @@ class HomeFragment : Fragment() {
                 lifecycleScope.launch {
                     // Add user first, ensuring it's done before fetching the user
                     withContext(Dispatchers.IO) {
-                        hemoCubeViewModel.addUser(
+                        trueHemeTestViewModel.addUser(
                             HemoCubeTestData(
                                 _id = userId,
                                 age = age,
@@ -832,7 +829,7 @@ class HomeFragment : Fragment() {
 
                     // Now fetch the user after the addUser operation is complete
                     val user = withContext(Dispatchers.IO) {
-                        hemoCubeViewModel.hemoCubeDao.getUserByID(userId)
+                        trueHemeTestViewModel.hemoCubeDao.getUserByID(userId)
                     }
 
                     user?.let {
@@ -954,7 +951,7 @@ class HomeFragment : Fragment() {
             rvAdapter = view?.let {
                 UserListAdapter(
                     requireContext(),
-                    hemoCubeViewModel,
+                    trueHemeTestViewModel,
                     recyclerViewOptions,
                     it,
                     batLevel,
@@ -1023,7 +1020,7 @@ class HomeFragment : Fragment() {
         rvAdapter = view?.let {
             UserListAdapter(
                 requireContext(),
-                hemoCubeViewModel,
+                trueHemeTestViewModel,
                 recyclerViewOptions,
                 it,
                 batLevel,
@@ -1099,7 +1096,7 @@ class HomeFragment : Fragment() {
     }
 
     private fun checkUnprocessedCSVData() {
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+        trueHemeTestViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             if (sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN") {
                 val downloadDataVisibility =
                     if (userDataList.any { !it.isCSVCreated && it.testStatus == true }) View.VISIBLE else View.GONE
@@ -1220,7 +1217,7 @@ class HomeFragment : Fragment() {
 
     private fun downloadLocalDBData(dialog: DialogInterface) {
         var csvDownloaded = false
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+        trueHemeTestViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
 
 //
 //            userDataList.forEach { userData ->
@@ -1259,7 +1256,7 @@ class HomeFragment : Fragment() {
 
                     if (downloadList.isNotEmpty()) {
                         // Call ViewModel function to create CSV with filtered data
-                        hemoCubeViewModel.createCSV(downloadList, requireContext())
+                        trueHemeTestViewModel.createCSV(downloadList, requireContext())
                         csvDownloaded = true
                         Toast.makeText(
                             requireContext(),
@@ -1291,19 +1288,19 @@ class HomeFragment : Fragment() {
     private fun deleteHemoCubeIncompleteRegistrations(userDataList: List<HemoCubeTestData>) {
         userDataList.forEach { userData ->
             if (userData._id.isEmpty()) {
-                hemoCubeViewModel.deleteById(userData._id)
+                trueHemeTestViewModel.deleteById(userData._id)
             }
         }
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
-        hemoCubeViewModel.networkStatusLiveData.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.allKitTestData.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.allUserData.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.uploadLogs.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.checkUpdate.removeObservers(viewLifecycleOwner)
-        hemoCubeViewModel.downloadcertificate.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.networkStatusLiveData.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.allKitTestData.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.allUserData.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.uploadLogs.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.checkUpdate.removeObservers(viewLifecycleOwner)
+        trueHemeTestViewModel.downloadcertificate.removeObservers(viewLifecycleOwner)
     }
 
     private fun downloadCsv() {
@@ -1679,10 +1676,10 @@ class HomeFragment : Fragment() {
                         apply()
                     }
                 }
-                hemoCubeViewModel.login(createLoginRequestData(userID, password))
+                trueHemeTestViewModel.login(createLoginRequestData(userID, password))
             }
         }else{
-            hemoCubeViewModel.login(createLoginRequestData(userID, password))
+            trueHemeTestViewModel.login(createLoginRequestData(userID, password))
         }
     }
     private fun timeDifference(createdAt: String): Long {

app/src/main/java/com/example/hpostesting/presentation/main_base/MainBaseActivity.kt

@@ -11,7 +11,7 @@
  * // from ShanMukha Innovations Pvt. Ltd.
  */
 
-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -23,7 +23,6 @@ import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
-import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.FileProvider
@@ -38,14 +37,10 @@ import com.example.hpostesting.data.constant.LanguageManager
 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.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.presentation.jig.JigActivity
 import com.example.hpostesting.presentation.utils.NatsManager
 import com.google.android.material.navigation.NavigationView
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
-import com.google.firebase.remoteconfig.ktx.remoteConfig
-import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.BuildConfig
 import `in`.sminnovations.hpostesting.R
@@ -67,7 +62,6 @@ open interface IDataCollector: NatsMessageCallback {
 class DashboardActivity : AppCompatActivity(), IDataCollector {
     @Inject
     lateinit var databaseRepository: DatabaseRepository
-    private val remoteConfig: FirebaseRemoteConfig = Firebase.remoteConfig
     val TAG = "DashboardActivity"
     private var isRegistered = false
     private lateinit var appBarConfiguration: AppBarConfiguration
@@ -78,7 +72,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
 
     private var downloadId: Long = 0
     // TODO: Remove hemocube viewmodel
-    private val hemocubeViewModel: HemoCubeViewModel by viewModels()
+    private val hemocubeViewModel: TrueHemeTestViewModel by viewModels()
 
     override fun attachBaseContext(newBase: Context?) {
         val languageCode = LanguageManager.getSavedLanguage(newBase!!)
@@ -122,90 +116,6 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
         nats.sub("server.hpos.${deviceId}.ping")
         nats.pub("server.hpos.${deviceId}.ping", "THIS IS A TEST MSG")
 
-        val configSettings = remoteConfigSettings {
-            minimumFetchIntervalInSeconds = 3600
-        }
-        remoteConfig.setConfigSettingsAsync(configSettings)
-        remoteConfig.setDefaultsAsync(R.xml.remote_config_defaults)
-
-        remoteConfig.fetchAndActivate()
-            .addOnCompleteListener(this) { task ->
-                if (task.isSuccessful) {
-                    val normalMin2mm = remoteConfig.getDouble("normalMin2mm")
-                    val normalMax2mm = remoteConfig.getDouble("normalMax2mm")
-                    val negativeBorderlineMin2mm = remoteConfig.getDouble("negativeBorderlineMin2mm")
-                    val negativeBorderlineMax2mm = remoteConfig.getDouble("negativeBorderlineMax2mm")
-                    val positiveForSickleCellMin2mm = remoteConfig.getDouble("positiveForSickleCellMin2mm")
-                    val positiveForSickleCellMax2mm = remoteConfig.getDouble("positiveForSickleCellMax2mm")
-                    val sickleCellTraitMin2mm = remoteConfig.getDouble("sickleCellTraitMin2mm")
-                    val sickleCellTraitMax2mm = remoteConfig.getDouble("sickleCellTraitMax2mm")
-                    val sickleCellDiseaseMin2mm = remoteConfig.getDouble("sickleCellDiseaseMin2mm")
-                    val sickleCellDiseaseMax2mm = remoteConfig.getDouble("sickleCellDiseaseMax2mm")
-                    val positiveBoderLine2mm1 = remoteConfig.getDouble("positiveBoderLine2mm1")
-                    val positiveBoderLine2mm2 = remoteConfig.getDouble("positiveBoderLine2mm2")
-                    val negativeBoderLine2mm1 = remoteConfig.getDouble("negativeBoderLine2mm1")
-                    val negativeBoderLine2mm2 = remoteConfig.getDouble("negativeBoderLine2mm2")
-
-                    val normalMin10mm = remoteConfig.getDouble("normalMin10mm")
-                    val normalMax10mm = remoteConfig.getDouble("normalMax10mm")
-                    val negativeBorderlineMin10mm = remoteConfig.getDouble("negativeBorderlineMin10mm")
-                    val negativeBorderlineMax10mm = remoteConfig.getDouble("negativeBorderlineMax10mm")
-                    val positiveForSickleCellMin10mm = remoteConfig.getDouble("positiveForSickleCellMin10mm")
-                    val positiveForSickleCellMax10mm = remoteConfig.getDouble("positiveForSickleCellMax10mm")
-                    val sickleCellTraitMin10mm = remoteConfig.getDouble("sickleCellTraitMin10mm")
-                    val sickleCellTraitMax10mm = remoteConfig.getDouble("sickleCellTraitMax10mm")
-                    val sickleCellDiseaseMin10mm = remoteConfig.getDouble("sickleCellDiseaseMin10mm")
-                    val sickleCellDiseaseMax10mm = remoteConfig.getDouble("sickleCellDiseaseMax10mm")
-                    val positiveBoderLine10mm1 = remoteConfig.getDouble("positiveBoderLine10mm1")
-                    val positiveBoderLine10mm2 = remoteConfig.getDouble("positiveBoderLine10mm2")
-                    val negativeBoderLine10mm1 = remoteConfig.getDouble("negativeBoderLine10mm1")
-                    val negativeBoderLine10mm2 = remoteConfig.getDouble("negativeBoderLine10mm2")
-
-                    val bufferMinLed1 = remoteConfig.getDouble("bufferMinLed1")
-                    val bufferMaxLed1 = remoteConfig.getDouble("bufferMaxLed1")
-                    val bufferMinLed2 = remoteConfig.getDouble("bufferMinLed2")
-                    val bufferMaxLed2 = remoteConfig.getDouble("bufferMaxLed2")
-                    with(sharedPreferences.edit()) {
-                        putString("bufferMinLed1", bufferMinLed1.toString())
-                        putString("bufferMaxLed1", bufferMaxLed1.toString())
-                        putString("bufferMinLed2", bufferMinLed2.toString())
-                        putString("bufferMaxLed2", bufferMaxLed2.toString())//buffer
-                        putString("normalMin2mm", normalMin2mm.toString())//2mm
-                        putString("normalMax2mm", normalMax2mm.toString())
-                        putString("negativeBorderlineMin2mm", negativeBorderlineMin2mm.toString())
-                        putString("negativeBorderlineMax2mm", negativeBorderlineMax2mm.toString())
-                        putString("positiveForSickleCellMin2mm", positiveForSickleCellMin2mm.toString())
-                        putString("positiveForSickleCellMax2mm", positiveForSickleCellMax2mm.toString())
-                        putString("sickleCellTraitMin2mm", sickleCellTraitMin2mm.toString())
-                        putString("sickleCellTraitMax2mm", sickleCellTraitMax2mm.toString())
-                        putString("sickleCellDiseaseMin2mm", sickleCellDiseaseMin2mm.toString())
-                        putString("sickleCellDiseaseMax2mm", sickleCellDiseaseMax2mm.toString())
-                        putString("positiveBoderLine2mm1", positiveBoderLine2mm1.toString())
-                        putString("positiveBoderLine2mm2", positiveBoderLine2mm2.toString())
-                        putString("negativeBoderLine2mm1", negativeBoderLine2mm1.toString())
-                        putString("negativeBoderLine2mm2", negativeBoderLine2mm2.toString())//2mm
-                        putString("normalMin10mm", normalMin10mm.toString())//10mm
-                        putString("normalMax10mm", normalMax10mm.toString())
-                        putString("negativeBorderlineMin10mm", negativeBorderlineMin10mm.toString())
-                        putString("negativeBorderlineMax10mm", negativeBorderlineMax10mm.toString())
-                        putString("positiveForSickleCellMin10mm", positiveForSickleCellMin10mm.toString())
-                        putString("positiveForSickleCellMax10mm", positiveForSickleCellMax10mm.toString())
-                        putString("sickleCellTraitMin10mm", sickleCellTraitMin10mm.toString())
-                        putString("sickleCellTraitMax10mm", sickleCellTraitMax10mm.toString())
-                        putString("sickleCellDiseaseMin10mm", sickleCellDiseaseMin10mm.toString())
-                        putString("sickleCellDiseaseMax10mm", sickleCellDiseaseMax10mm.toString())
-                        putString("positiveBoderLine10mm1", positiveBoderLine10mm1.toString())
-                        putString("positiveBoderLine10mm2", positiveBoderLine10mm2.toString())
-                        putString("negativeBoderLine10mm1", negativeBoderLine10mm1.toString())
-                        putString("negativeBoderLine10mm2", negativeBoderLine10mm2.toString())//10mm
-                        apply()
-                    }
-                    Log.d(TAG, "Config params updated")
-                } else {
-                    Log.d(TAG, "Config params Fetch failed")
-                }
-            }
-
         hemocubeViewModel.deviceUpdate.observe(this) {
             Log.d("DashboardLogs",it.toString())
 

app/src/main/java/com/example/hpostesting/presentation/main_base/PanelFragment.kt

@@ -11,7 +11,7 @@
  * // from ShanMukha Innovations Pvt. Ltd.
  */
 
-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base
 
 import android.annotation.SuppressLint
 import android.content.ComponentName
@@ -25,19 +25,20 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.presentation.reportgen.ReportActivity
 import com.example.hpostesting.presentation.autodac.AutoDacActivity
 import com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity
 import com.example.hpostesting.presentation.calibration.CalibrationActivity
-import com.example.hpostesting.presentation.dashboard.ui.PasswordResetActivity
+import com.example.hpostesting.presentation.main_base.ui.PasswordResetActivity
 import com.example.hpostesting.presentation.deviceinfo.DeviceActivity
 import com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity
 import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.presentation.usb_teminal.UsbTerminalActivity
 import `in`.sminnovations.hpostesting.databinding.FragmentGalleryBinding
 
 
-class GalleryFragment : Fragment() {
+class PanelFragment : Fragment() {
 
     private var _binding: FragmentGalleryBinding? = null
     private lateinit var sharedPreferences: SharedPreferences
@@ -49,7 +50,7 @@ class GalleryFragment : Fragment() {
 
     private lateinit var sharedPreference: SharedPreferences
 
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private val trueHemeTestViewModel: TrueHemeTestViewModel by activityViewModels()
 
     @SuppressLint("SetTextI18n")
     override fun onCreateView(
@@ -89,6 +90,7 @@ class GalleryFragment : Fragment() {
             binding.btnDeviceInfo.visibility = View.VISIBLE
             binding.btnResetPassword.visibility = View.VISIBLE
             binding.btnUpdateValues.visibility = View.VISIBLE
+            binding.btnPrintReport.visibility = View.VISIBLE
         }else{
             binding.btnResetPassword.visibility = View.GONE
             binding.btnDeviceProvision.visibility = View.GONE
@@ -102,6 +104,7 @@ class GalleryFragment : Fragment() {
             binding.btnSubmit.visibility = View.GONE
             binding.btnDeviceInfo.visibility = View.VISIBLE
             binding.btnUpdateValues.visibility = View.GONE
+            binding.btnPrintReport.visibility = View.VISIBLE
         }
 
         binding.btnResetPassword.setOnClickListener{
@@ -136,12 +139,17 @@ class GalleryFragment : Fragment() {
             startActivity(Intent(requireContext(), DeviceActivity::class.java))
         }
 
+        binding.btnPrintReport.setOnClickListener{
+            startActivity(Intent(requireContext(), ReportActivity::class.java))
+        }
+
         binding.btnFirefox.setOnClickListener {
             val intent = Intent(Intent.ACTION_VIEW)
             intent.component = ComponentName("org.mozilla.firefox", "org.mozilla.gecko.BrowserApp")
             startActivity(intent)
         }
 
+
         binding.btnFiles.setOnClickListener {
             val intent = Intent(Intent.ACTION_GET_CONTENT)
             intent.type = "file/*"

app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt

@@ -0,0 +1,430 @@
+/*
+ * // 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.main_base
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.text.InputFilter
+import android.text.InputType
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.core.content.edit
+import androidx.fragment.app.Fragment
+import androidx.preference.EditTextPreference
+import androidx.preference.ListPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreferenceCompat
+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.google.android.material.dialog.MaterialAlertDialogBuilder
+import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
+
+
+private var isLanguageChanged = false
+private val DEFAULT_DISCLAIMER = """
+DISCLAIMER: This report is generated by HemoCube automated system. 
+Results should be interpreted by qualified medical professionals. 
+This report is for diagnostic purposes only and should not be used as the sole basis for medical decisions. 
+Please consult with your healthcare provider for proper interpretation and treatment recommendations.
+""".trimIndent()
+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)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME, ""))
+        selectedItem = sharedPreferences.getString(Constants.CUVETTE_SIZE, "10mm").toString()
+        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
+            ).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") {
+            pos = 0
+        } else {
+            pos = 1
+        }
+
+        binding.spinnerCuvette.adapter = adapter
+        binding.spinnerCuvette.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    parent: AdapterView<*>?, view: View?, position: Int, id: Long
+                ) {
+                    // Handle item selection here
+                    selectedItem = values[position]
+                }
+
+                override fun onNothingSelected(parent: AdapterView<*>?) {
+                    // Do nothing here
+                }
+            }
+
+        binding.spinnerCuvette.setSelection(pos)
+        binding.btnAddSize.setOnClickListener {
+            with(sharedPreferences.edit()) {
+                putString(Constants.CUVETTE_SIZE, selectedItem)
+                apply()
+            }
+            Toast.makeText(
+                requireContext(), "Selected cuvette size: $selectedItem", Toast.LENGTH_SHORT
+            ).show()
+        }
+
+        childFragmentManager.beginTransaction().replace(binding.container.id, PrefsFragment())
+            .commit()
+    }
+}
+
+class PrefsFragment : PreferenceFragmentCompat() {
+    private lateinit var tapManager: AppVersionTapManager
+    private lateinit var serverPreference: Preference
+    private lateinit var currentServerPreference: Preference
+    lateinit var firebaseManager: FirebaseManager
+    var autoSmbtValue = false
+    var reportDisclaimerText = DEFAULT_DISCLAIMER
+    private var topDevMode = false
+    lateinit var databaseRepository: DatabaseRepository
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        firebaseManager = FirebaseManager(requireContext())
+        databaseRepository = (activity as DashboardActivity).databaseRepository
+        tapManager = AppVersionTapManager()
+        topDevMode = firebaseManager.getDevMode()
+        val sharedPreference =
+            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        autoSmbtValue = sharedPreference.getBoolean("AutSmbt", false)
+        reportDisclaimerText = sharedPreference.getString("report_dis_txt", DEFAULT_DISCLAIMER).toString()
+        val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
+        val currentServer = firebaseManager.getLastSelectedServer().serverName
+        val arWeAdmin =sharedPreference.getString(Constants.USER_ID, "").toString() == "ADMIN"
+        val MAX_CHARS = 10_000
+        // 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)
+            onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val languageCode = newValue as String
+                updateLanguage(requireContext(), languageCode)
+                true
+            }
+        }
+
+
+        val servers = firebaseManager.getAvailableServers()
+        val serverNames = servers.map { it.serverName }.toTypedArray()
+
+        val serverSelectorPreference = CustomDialogPreference(requireContext()).apply {
+            key = "server_preference"
+            title = "Select the Server"
+            summary = "Current server: $currentServer"
+            setEntries(serverNames)
+            setEntryValues(serverNames)
+            setValue(currentServer)
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_sync_24)
+            setOnPreferenceChangeListener { newValue ->
+                val preferenceConfig = servers.find { it.serverName == newValue }
+                switchFirebaseServer(preferenceConfig!!)
+                true
+            }
+        }
+
+        // Add preferences to screen
+        preferenceScreen.addPreference(languagePreference)
+        preferenceScreen.addPreference(languagePreference)
+
+
+        val developerToggle = SwitchPreferenceCompat(requireContext()).apply {
+            title = "Developer Options"
+            summary = "Enable or disable developer options"
+            icon =
+                ContextCompat.getDrawable(requireContext(), R.drawable.baseline_developer_mode_24)
+            key = "developer_options" // Unique key for SharedPreferences
+
+            // Load toggle state from SharedPreferences
+            isChecked = firebaseManager.getDevMode()
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val isEnabled = newValue as Boolean
+                firebaseManager.setDevModeOn(isEnabled)
+
+                if (!isEnabled) {
+                    preferenceScreen.removePreference(this)
+                    preferenceScreen.removePreference(serverSelectorPreference)
+                }
+                if (!firebaseManager.getDevMode() && currentServer != "prod"){
+                 val prodConfig =  servers.find { it.serverName == "prod" }
+                    switchFirebaseServer(prodConfig!!)
+                }
+                true
+            }
+        }
+
+        val disclaimerPreference = EditTextPreference(requireContext()).apply {
+            key = "Report_disclaimer"
+            title = "Report disclaimer Editor"
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_add)
+            summaryProvider = Preference.SummaryProvider<EditTextPreference> { preference ->
+                val value = preference.text
+                if (value.isNullOrBlank()) {
+                    "Current disclaimer: (not set)"
+                } else {
+                    "Current disclaimer: $value"
+                }
+            }
+            setOnBindEditTextListener { edit ->
+                edit.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
+                edit.minLines = 4
+                edit.maxLines = 10
+                edit.gravity = Gravity.TOP or Gravity.START
+                edit.filters = arrayOf(InputFilter.LengthFilter(MAX_CHARS))
+            }
+            setOnPreferenceChangeListener { _, newValue ->
+                val text = (newValue as? String)?.trim().orEmpty()
+                if (text.length > MAX_CHARS) {
+                    Toast.makeText(
+                        requireContext(),
+                        "Text too long (${text.length}/$MAX_CHARS).",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                    return@setOnPreferenceChangeListener false
+                }else{
+                    sharedPreference.edit().putString("report_dis_txt", text).apply()
+                }
+                true
+            }
+        }
+        val resetDisclaimerPreference = Preference(requireContext()).apply {
+            title = "Reset to default Disclaimer"
+            summary = "Replace the current text with the app’s default disclaimer"
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_restore_24)
+            setOnPreferenceClickListener {
+               sharedPreference.edit().putString("report_dis_txt", DEFAULT_DISCLAIMER).apply()
+                disclaimerPreference.text = DEFAULT_DISCLAIMER
+                Toast.makeText(requireContext(), "Disclaimer reset to default", Toast.LENGTH_SHORT).show()
+                true
+            }
+        }
+
+        val autosmbt = SwitchPreferenceCompat(requireContext()).apply {
+            title = "Auto submit"
+            summary = "Enable or disable Auto submit"
+            icon =
+                ContextCompat.getDrawable(requireContext(), R.drawable.baseline_motion_auto_24)
+            key = "auto_submit_key" // Unique key for SharedPreferences
+
+            // Load toggle state from SharedPreferences
+            isChecked = autoSmbtValue
+            setOnPreferenceChangeListener { _, newValue ->
+                val isEnabled = newValue as Boolean
+                sharedPreference.edit {
+                    putBoolean("AutSmbt",isEnabled)
+                }
+                true
+            }
+        }
+
+        val appVersionPreference = Preference(requireContext()).apply {
+            title = "App Version"
+            summary =
+                getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + "->" + currentServer + "]"
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_info_24)
+
+            setOnPreferenceClickListener {
+                tapManager.registerTap {
+                    if (arWeAdmin) {
+                        firebaseManager.setDevModeOn(true)
+
+                    if (firebaseManager.getDevMode()  && currentServer != "dev") {
+                        Toast.makeText(requireContext(), "Now you are a Developer", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(requireContext(), "Setting Up developer Environment", Toast.LENGTH_SHORT).show()
+                    }
+
+                    if (preferenceScreen.findPreference<SwitchPreferenceCompat>("developer_options") == null) {
+                        preferenceScreen.addPreference(developerToggle)
+                        preferenceScreen.addPreference(autosmbt)
+                        preferenceScreen.addPreference(disclaimerPreference)
+                        preferenceScreen.addPreference(resetDisclaimerPreference)
+                    }
+
+                    if (preferenceScreen.findPreference<ListPreference>("server_preference") == null) {
+                        preferenceScreen.addPreference(serverSelectorPreference)
+                    }
+                    developerToggle.isChecked = true
+                    updateServerPreference(currentServer)
+                }else{
+                        Toast.makeText(requireContext(), "Works Only On Admin Mode", Toast.LENGTH_SHORT).show()
+                    }
+                }
+                true
+            }
+        }
+
+        preferenceScreen.addPreference(appVersionPreference)
+        if (firebaseManager.getDevMode() && arWeAdmin) {
+            developerToggle.isChecked = true // Ensure it's checked
+            preferenceScreen.addPreference(developerToggle)
+            preferenceScreen.addPreference(serverSelectorPreference)
+            preferenceScreen.addPreference(autosmbt)
+            preferenceScreen.addPreference(resetDisclaimerPreference)
+            preferenceScreen.addPreference(disclaimerPreference)
+
+        }
+
+        setPreferenceScreen(preferenceScreen)
+
+        if (isLanguageChanged) {
+            Toast.makeText(requireContext(), R.string.language_update, Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        listView.setPadding(0, 0, 0, 300) // Add bottom padding
+        listView.clipToPadding = false
+    }
+
+
+    private fun updateServerPreference(newServer: String) {
+        (findPreference<CustomDialogPreference>("server_preference"))?.let { pref ->
+            pref.setValue(newServer)
+            pref.summary = "Current server: $newServer"
+        }
+    }
+
+    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()
+    }
+
+    private fun updateLanguage(context: Context, languageCode: String) {
+        LanguageManager.persistLanguagePreference(context, languageCode)
+        LanguageManager.setLocale(context, languageCode)
+        requireActivity().recreate()
+        isLanguageChanged = true
+    }
+
+    private fun getAppVersion(context: Context): String {
+        return try {
+            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            pInfo.versionName
+        } catch (e: PackageManager.NameNotFoundException) {
+            "N/A"
+        }
+    }
+
+    private fun getAppEnvironment(context: Context): String {
+        return try {
+            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            pInfo.packageName.substringAfterLast('.')
+        } catch (e: PackageManager.NameNotFoundException) {
+            "N/A"
+        }
+    }
+}
+
+
+
+// CustomDialogPreference.kt
+class CustomDialogPreference(context: Context) : Preference(context) {
+    private var entries: Array<String> = arrayOf()
+    private var entryValues: Array<String> = arrayOf()
+    private var currentValue: String = ""
+    private var onValueChangeListener: ((String) -> Boolean)? = null
+
+    fun setEntries(entries: Array<String>) {
+        this.entries = entries
+    }
+
+    fun setEntryValues(values: Array<String>) {
+        this.entryValues = values
+    }
+
+    fun setValue(value: String) {
+        currentValue = value
+        persistString(value)
+    }
+
+    fun setOnPreferenceChangeListener(listener: (String) -> Boolean) {
+        onValueChangeListener = listener
+    }
+
+    override fun onClick() {
+        val builder = MaterialAlertDialogBuilder(context)
+        builder.setTitle(title)
+
+        builder.setSingleChoiceItems(entries, entries.indexOf(currentValue)) { dialog, which ->
+            val newValue = entryValues[which]
+            if (onValueChangeListener?.invoke(newValue) == true) {
+                setValue(newValue)
+                dialog.dismiss()
+            }
+        }
+
+        builder.setNegativeButton("Cancel") { dialog, _ ->
+            dialog.dismiss()
+        }
+
+        builder.show()
+    }
+}

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

@@ -11,18 +11,13 @@
  * // from ShanMukha Innovations Pvt. Ltd.
  */
 
-package com.example.hpostesting.presentation.dashboard
+package com.example.hpostesting.presentation.main_base
 
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.example.hpostesting.data.constant.Constants
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
 import `in`.sminnovations.hpostesting.databinding.ActivityUpdateValuesBinding
 
 class UpdateValuesActivity : AppCompatActivity() {

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

@@ -11,7 +11,7 @@
  * // from ShanMukha Innovations Pvt. Ltd.
  */
 
-package com.example.hpostesting.presentation.dashboard.ui
+package com.example.hpostesting.presentation.main_base.ui
 
 import com.example.hpostesting.util.SecureStorage
 import android.accounts.Account

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

@@ -1,4 +1,4 @@
-package com.example.hpostesting.presentation.dashboard.ui
+package com.example.hpostesting.presentation.main_base.ui
 
 import com.example.hpostesting.util.SecureStorage
 import android.os.Bundle

app/src/main/java/com/example/hpostesting/presentation/reportgen/ReportActivity.kt

@@ -0,0 +1,21 @@
+package com.example.hpostesting.presentation.reportgen
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.example.hpostesting.presentation.reportgen.ui.report.ReportFragment
+import dagger.hilt.android.AndroidEntryPoint
+import `in`.sminnovations.hpostesting.R
+@AndroidEntryPoint
+class ReportActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.report_gen)
+
+        if (savedInstanceState == null) {
+            supportFragmentManager.beginTransaction()
+                .replace(R.id.container, ReportFragment()) //Direct constructor
+                .commitNow()
+        }
+    }
+}

app/src/main/java/com/example/hpostesting/presentation/reportgen/ui/report/BufferAdapter.kt

@@ -0,0 +1,70 @@
+package com.example.hpostesting.presentation.reportgen.ui.report
+
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.recyclerview.widget.RecyclerView
+import com.example.hpostesting.data.dao.HemoCubeBufferDao
+import com.example.hpostesting.data.model.patient.BufferCheckData
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import `in`.sminnovations.hpostesting.R
+class BufferAdapter(
+    private var dataList: List<HemoCubeTestData>,
+    private val onItemClick: (HemoCubeTestData) -> Unit
+) : RecyclerView.Adapter<BufferAdapter.ViewHolder>() {
+
+    private var selectedItems: List<HemoCubeTestData> = emptyList()
+
+    inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val cardView: CardView = view.findViewById(R.id.cardView)
+        val sampleId: TextView = view.findViewById(R.id.sampleId)
+        val testTime: TextView = view.findViewById(R.id.testTime)
+        val result: TextView = view.findViewById(R.id.result)
+        val selectionIndicator: View = view.findViewById(R.id.selectionIndicator)
+
+        init {
+            cardView.setOnClickListener {
+                if (adapterPosition != RecyclerView.NO_POSITION) {
+                    onItemClick(dataList[adapterPosition])
+                }
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
+        LayoutInflater.from(parent.context).inflate(R.layout.item_buffer_card, parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = dataList[position]
+        val isSelected = selectedItems.contains(item)
+
+        holder.sampleId.text = "Sample ID: ${item._id}"
+        holder.testTime.text = "Time: ${item.testTime}"
+        holder.result.text = "Result: ${item.classificationResult}"
+
+        // Update selection appearance
+        if (isSelected) {
+            holder.cardView.setCardBackgroundColor(Color.parseColor("#E3F2FD"))
+            holder.selectionIndicator.visibility = View.VISIBLE
+        } else {
+            holder.cardView.setCardBackgroundColor(Color.WHITE)
+            holder.selectionIndicator.visibility = View.GONE
+        }
+    }
+
+    override fun getItemCount() = dataList.size
+
+    fun updateList(newList: List<HemoCubeTestData>) {
+        dataList = newList
+        notifyDataSetChanged()
+    }
+
+    fun updateSelectedItems(newSelectedItems: List<HemoCubeTestData>) {
+        selectedItems = newSelectedItems
+        notifyDataSetChanged()
+    }
+}

app/src/main/java/com/example/hpostesting/presentation/reportgen/ui/report/PrintObject.kt

@@ -0,0 +1,326 @@
+package com.example.hpostesting.presentation.reportgen.ui.report
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Typeface
+import android.graphics.pdf.PdfDocument
+import android.util.Log
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import `in`.sminnovations.hpostesting.R
+import java.io.File
+import java.io.FileOutputStream
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+
+object ReportGen {
+
+    private const val PAGE_WIDTH = 595  // A4 width in points
+    private const val PAGE_HEIGHT = 842 // A4 height in points
+    private const val MARGIN_LEFT = 50f
+    private const val MARGIN_RIGHT = 50f
+    private const val MARGIN_TOP = 80f
+    private const val MARGIN_BOTTOM = 80f
+
+    fun generate(context: Context, dataList: List<HemoCubeTestData>,disclaimerText: String) {
+        if (dataList.isEmpty()) {
+            Toast.makeText(context, "No items selected for report generation", Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        Log.d("ReportGen", "Generating report for ${dataList.size} items")
+
+        val message = if (dataList.size == 1) {
+            "Report for kit ${dataList.first()._id} started."
+        } else {
+            "Report for ${dataList.size} kits started."
+        }
+        Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+
+        val pdfFile = createProfessionalPdfReport(context, dataList, disclaimerText)
+        previewPdf(context, pdfFile)
+    }
+
+    private fun createProfessionalPdfReport(context: Context, dataList: List<HemoCubeTestData>,disclaimerText : String): File {
+        val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
+        val file = File(context.getExternalFilesDir(null), "HemoCube_Report_$timestamp.pdf")
+
+        val pdfDocument = PdfDocument()
+
+        // Paint styles
+        val headerPaint = Paint().apply {
+            typeface = Typeface.create(Typeface.DEFAULT_BOLD, Typeface.BOLD)
+            textSize = 20f
+            color = Color.rgb(0, 102, 153) // Professional blue
+        }
+
+        val titlePaint = Paint().apply {
+            typeface = Typeface.create(Typeface.DEFAULT_BOLD, Typeface.BOLD)
+            textSize = 18f
+            color = Color.BLACK
+        }
+
+        val sectionHeaderPaint = Paint().apply {
+            typeface = Typeface.create(Typeface.DEFAULT_BOLD, Typeface.BOLD)
+            textSize = 14f
+            color = Color.rgb(0, 102, 153)
+        }
+
+        val contentPaint = Paint().apply {
+            textSize = 11f
+            color = Color.DKGRAY
+        }
+
+        val boldContentPaint = Paint().apply {
+            typeface = Typeface.create(Typeface.DEFAULT_BOLD, Typeface.BOLD)
+            textSize = 11f
+            color = Color.BLACK
+        }
+
+        val disclaimerPaint = Paint().apply {
+            textSize = 9f
+            color = Color.GRAY
+            typeface = Typeface.create(Typeface.DEFAULT, Typeface.ITALIC)
+        }
+
+        // Create one page per test data
+        dataList.forEachIndexed { index, testData ->
+            val pageInfo = PdfDocument.PageInfo.Builder(PAGE_WIDTH, PAGE_HEIGHT, index + 1).create()
+            val page = pdfDocument.startPage(pageInfo)
+            val canvas = page.canvas
+
+            drawPage(canvas, testData, index + 1, dataList.size,
+                headerPaint, titlePaint, sectionHeaderPaint,
+                contentPaint, boldContentPaint, disclaimerPaint,disclaimerText,context)
+
+            pdfDocument.finishPage(page)
+        }
+
+        pdfDocument.writeTo(FileOutputStream(file))
+        pdfDocument.close()
+        return file
+    }
+
+    private fun drawPage(
+        canvas: Canvas,
+        testData: HemoCubeTestData,
+        pageNumber: Int,
+        totalPages: Int,
+        headerPaint: Paint,
+        titlePaint: Paint,
+        sectionHeaderPaint: Paint,
+        contentPaint: Paint,
+        boldContentPaint: Paint,
+        disclaimerPaint: Paint,
+        disclaimerText: String,
+        context: Context
+    ) {
+        var currentY = MARGIN_TOP
+
+        // Header with logo placeholder and title
+        drawHeader(canvas, headerPaint, titlePaint, currentY, context)
+        currentY += 100f
+
+        // Sample Information Section
+        currentY = drawSection(canvas, "SAMPLE INFORMATION", sectionHeaderPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Sample ID:", testData.sampleid.toString(), boldContentPaint, contentPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Blood Group:", testData.bloodGroup, boldContentPaint, contentPaint, currentY)
+        currentY += 15f
+
+        // Test Information Section
+        currentY = drawSection(canvas, "TEST INFORMATION", sectionHeaderPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Test ID:", testData._id, boldContentPaint, contentPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Test Type:", testData.testType ?: "TrueHeme", boldContentPaint, contentPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Test Time:", testData.testTime ?: "N/A", boldContentPaint, contentPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Incubation Time:", testData.incubationTime, boldContentPaint, contentPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Kit Serial:", testData.kitSerial, boldContentPaint, contentPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Device Serial:", testData.deviceSerialNumber, boldContentPaint, contentPaint, currentY)
+        currentY += 15f
+
+        // Test Results Section
+        currentY = drawSection(canvas, "TEST RESULTS", sectionHeaderPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Classification Result:", testData.classificationResult, boldContentPaint, contentPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Device Ratio:", testData.deviceRatio?.toString() ?: "N/A", boldContentPaint, contentPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Calculated Ratio:", testData.calculatedRatio?.toString() ?: "N/A", boldContentPaint, contentPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Slope Ratio:", testData.slopeRatio?.toString() ?: "N/A", boldContentPaint, contentPaint, currentY)
+        currentY += 15f
+
+        // LED Measurements Section
+        currentY = drawSection(canvas, "LED MEASUREMENTS", sectionHeaderPaint, currentY)
+        currentY = drawLEDData(canvas, testData, boldContentPaint, contentPaint, currentY)
+        currentY += 15f
+
+        // Laboratory Information Section
+        currentY = drawSection(canvas, "LABORATORY INFORMATION", sectionHeaderPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Lab Name:", testData.labName ?: "N/A", boldContentPaint, contentPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "Center Name:", testData.centerName ?: "N/A", boldContentPaint, contentPaint, currentY)
+        currentY = drawKeyValuePair(canvas, "District:", testData.district ?: "N/A", boldContentPaint, contentPaint, currentY)
+        currentY += 15f
+
+        // Footer with page number and disclaimer
+        drawFooter(canvas, pageNumber, totalPages, contentPaint, disclaimerPaint,disclaimerText)
+    }
+
+    private fun drawHeader(canvas: Canvas, headerPaint: Paint, titlePaint: Paint, startY: Float, context: Context) {
+        // Load and draw actual logo
+        try {
+            // Method 1: Load from drawable resources
+            val logoDrawable = ContextCompat.getDrawable(context, R.mipmap.hpos_icon) // Replace with your logo resource
+            logoDrawable?.let { drawable ->
+                val logoWidth = 70
+                val logoHeight = 60
+                drawable.setBounds(
+                    MARGIN_LEFT.toInt(),
+                    (startY - 20f).toInt(),
+                    (MARGIN_LEFT + logoWidth).toInt(),
+                    (startY + logoHeight - 20f).toInt()
+                )
+                drawable.draw(canvas)
+            }
+        } catch (e: Exception) {
+            // Fallback to placeholder if logo loading fails
+            val logoPaint = Paint().apply {
+                color = Color.rgb(0, 102, 153)
+                style = Paint.Style.FILL
+            }
+            canvas.drawRect(MARGIN_LEFT, startY - 20f, MARGIN_LEFT + 60f, startY + 20f, logoPaint)
+
+            // Draw "LOGO" text as placeholder
+            val placeholderPaint = Paint().apply {
+                color = Color.WHITE
+                textSize = 12f
+                typeface = Typeface.create(Typeface.DEFAULT_BOLD, Typeface.BOLD)
+                textAlign = Paint.Align.CENTER
+            }
+            canvas.drawText("LOGO", MARGIN_LEFT + 30f, startY, placeholderPaint)
+        }
+
+        // Company name and title
+        canvas.drawText("HemoCube", MARGIN_LEFT + 80f, startY + 10f, headerPaint)
+        canvas.drawText("Medical Test Report", MARGIN_LEFT, startY + 40f, titlePaint)
+
+        // Report generation date
+        val currentDate = SimpleDateFormat("dd MMM yyyy, HH:mm", Locale.getDefault()).format(Date())
+        canvas.drawText("Generated: $currentDate", PAGE_WIDTH - MARGIN_RIGHT - 150f, startY + 10f, Paint().apply {
+            textSize = 10f
+            color = Color.GRAY
+        })
+
+        // Line under header
+        val linePaint = Paint().apply {
+            color = Color.rgb(0, 102, 153)
+            strokeWidth = 2f
+        }
+        canvas.drawLine(MARGIN_LEFT, startY + 60f, PAGE_WIDTH - MARGIN_RIGHT, startY + 60f, linePaint)
+    }
+
+    private fun drawSection(canvas: Canvas, title: String, paint: Paint, y: Float): Float {
+        canvas.drawText(title, MARGIN_LEFT, y, paint)
+
+        // Underline for section
+        val linePaint = Paint().apply {
+            color = Color.rgb(0, 102, 153)
+            strokeWidth = 1f
+        }
+        canvas.drawLine(MARGIN_LEFT, y + 5f, MARGIN_LEFT + paint.measureText(title), y + 5f, linePaint)
+
+        return y + 25f
+    }
+
+    private fun drawKeyValuePair(canvas: Canvas, key: String, value: String, keyPaint: Paint, valuePaint: Paint, y: Float): Float {
+        canvas.drawText(key, MARGIN_LEFT + 10f, y, keyPaint)
+        canvas.drawText(value, MARGIN_LEFT + 150f, y, valuePaint)
+        return y + 18f
+    }
+
+    private fun drawLEDData(canvas: Canvas, testData: HemoCubeTestData, keyPaint: Paint, valuePaint: Paint, startY: Float): Float {
+        var currentY = startY
+
+        currentY = drawKeyValuePair(canvas, "LED1 Sample:", testData.led1Sample?.toString() ?: "N/A", keyPaint, valuePaint, currentY)
+        currentY = drawKeyValuePair(canvas, "LED2 Sample:", testData.led2Sample?.toString() ?: "N/A", keyPaint, valuePaint, currentY)
+        currentY = drawKeyValuePair(canvas, "LED3 Sample:", testData.led3Sample?.toString() ?: "N/A", keyPaint, valuePaint, currentY)
+        currentY = drawKeyValuePair(canvas, "LED4 Sample:", testData.led4Sample?.toString() ?: "N/A", keyPaint, valuePaint, currentY)
+
+        currentY = drawKeyValuePair(canvas, "ABS1:", testData.abs1?.toString() ?: "N/A", keyPaint, valuePaint, currentY)
+        currentY = drawKeyValuePair(canvas, "ABS2:", testData.abs2?.toString() ?: "N/A", keyPaint, valuePaint, currentY)
+        currentY = drawKeyValuePair(canvas, "ABS3:", testData.abs3?.toString() ?: "N/A", keyPaint, valuePaint, currentY)
+        currentY = drawKeyValuePair(canvas, "ABS4:", testData.abs4?.toString() ?: "N/A", keyPaint, valuePaint, currentY)
+
+        return currentY
+    }
+
+    private fun drawFooter(canvas: Canvas, pageNumber: Int, totalPages: Int, contentPaint: Paint, disclaimerPaint: Paint,disclaimerText: String) {
+        val footerY = PAGE_HEIGHT - MARGIN_BOTTOM + 20f
+
+        // Page number
+        canvas.drawText("Page $pageNumber of $totalPages", PAGE_WIDTH - MARGIN_RIGHT - 80f, footerY, contentPaint)
+
+        // Disclaimer
+
+        val disclaimerLines = wrapText(disclaimerText, disclaimerPaint, PAGE_WIDTH - MARGIN_LEFT - MARGIN_RIGHT)
+        var disclaimerY = footerY + 20f
+
+        disclaimerLines.forEach { line ->
+            canvas.drawText(line, MARGIN_LEFT, disclaimerY, disclaimerPaint)
+            disclaimerY += 12f
+        }
+
+        // Footer line
+        val linePaint = Paint().apply {
+            color = Color.rgb(0, 102, 153)
+            strokeWidth = 1f
+        }
+        canvas.drawLine(MARGIN_LEFT, footerY - 10f, PAGE_WIDTH - MARGIN_RIGHT, footerY - 10f, linePaint)
+    }
+
+    private fun wrapText(text: String, paint: Paint, maxWidth: Float): List<String> {
+        val words = text.split(" ")
+        val lines = mutableListOf<String>()
+        var currentLine = ""
+
+        for (word in words) {
+            val testLine = if (currentLine.isEmpty()) word else "$currentLine $word"
+            if (paint.measureText(testLine) <= maxWidth) {
+                currentLine = testLine
+            } else {
+                if (currentLine.isNotEmpty()) {
+                    lines.add(currentLine)
+                }
+                currentLine = word
+            }
+        }
+
+        if (currentLine.isNotEmpty()) {
+            lines.add(currentLine)
+        }
+
+        return lines
+    }
+
+    private fun previewPdf(context: Context, file: File) {
+        val uri = FileProvider.getUriForFile(
+            context,
+            "${context.packageName}.fileprovider",
+            file
+        )
+
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            setDataAndType(uri, "application/pdf")
+            flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NO_HISTORY
+        }
+
+        try {
+            context.startActivity(intent)
+        } catch (e: ActivityNotFoundException) {
+            Toast.makeText(context, "No PDF viewer found", Toast.LENGTH_SHORT).show()
+        }
+    }
+}

app/src/main/java/com/example/hpostesting/presentation/reportgen/ui/report/ReportFragment.kt

@@ -0,0 +1,219 @@
+package com.example.hpostesting.presentation.reportgen.ui.report
+
+import android.app.DatePickerDialog
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.EditText
+import android.widget.Spinner
+import android.widget.TextView
+import android.widget.Toast
+import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import dagger.hilt.android.AndroidEntryPoint
+import `in`.sminnovations.hpostesting.R
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
+
+private val DEFAULT_DISCLAIMER = """
+DISCLAIMER: This report is generated by HemoCube automated system. 
+Results should be interpreted by qualified medical professionals. 
+This report is for diagnostic purposes only and should not be used as the sole basis for medical decisions. 
+Please consult with your healthcare provider for proper interpretation and treatment recommendations.
+""".trimIndent()
+
+@AndroidEntryPoint
+class ReportFragment : Fragment() {
+
+    companion object {
+        fun newInstance() = ReportFragment()
+    }
+    private lateinit var sharedPreferences: SharedPreferences
+
+    private val viewModel: ReportViewModel by viewModels()
+
+    private lateinit var recyclerView: RecyclerView
+    private lateinit var searchBar: EditText
+    private lateinit var filterSpinner: Spinner
+    private lateinit var generateBtn: Button
+    private lateinit var selectedCountText: TextView
+    private lateinit var calendarButton: Button
+
+    private lateinit var adapter: BufferAdapter
+    private var selectedItems: MutableList<HemoCubeTestData> = mutableListOf()
+    private var allData: List<HemoCubeTestData> = emptyList()
+    private var currentFilter = "Today"
+    private var customDate: String? = null
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+
+    ): View = inflater.inflate(R.layout.fragment_report, container, false)
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        sharedPreferences = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        initViews(view)
+        setupRecyclerView()
+        setupFilterSpinner()
+        setupObservers()
+        setupListeners()
+
+        // Set default filter to Today
+        setDefaultFilter()
+    }
+
+    private fun initViews(view: View) {
+        recyclerView = view.findViewById(R.id.bufferRecyclerView)
+        searchBar = view.findViewById(R.id.searchBar)
+        filterSpinner = view.findViewById(R.id.filterSpinner)
+        generateBtn = view.findViewById(R.id.generateReportButton)
+        selectedCountText = view.findViewById(R.id.selectedCountText)
+        calendarButton = view.findViewById(R.id.calendarButton)
+    }
+
+    private fun setupRecyclerView() {
+        recyclerView.layoutManager = LinearLayoutManager(requireContext())
+        adapter = BufferAdapter(emptyList()) { item ->
+            toggleItemSelection(item)
+            updateUI()
+        }
+        recyclerView.adapter = adapter
+    }
+
+    private fun setupFilterSpinner() {
+        val filterOptions = arrayOf("Today", "Yesterday", "All", "Custom Date")
+        val spinnerAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, filterOptions)
+        spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        filterSpinner.adapter = spinnerAdapter
+    }
+
+    private fun setDefaultFilter() {
+        filterSpinner.setSelection(0) // Today
+        currentFilter = "Today"
+        calendarButton.visibility = View.GONE
+    }
+
+    private fun setupObservers() {
+        viewModel.allKitTestData.observe(viewLifecycleOwner) { list ->
+            allData = list
+            filterList(searchBar.text.toString(), currentFilter)
+        }
+    }
+
+    private fun setupListeners() {
+        searchBar.addTextChangedListener { editable ->
+            filterList(editable.toString(), currentFilter)
+        }
+
+        filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>, view: View?, pos: Int, id: Long) {
+                currentFilter = parent.getItemAtPosition(pos).toString()
+
+                if (currentFilter == "Custom Date") {
+                    calendarButton.visibility = View.VISIBLE
+                    if (customDate == null) {
+                        showDatePicker()
+                    } else {
+                        filterList(searchBar.text.toString(), currentFilter)
+                    }
+                } else {
+                    calendarButton.visibility = View.GONE
+                    customDate = null
+                    filterList(searchBar.text.toString(), currentFilter)
+                }
+            }
+
+            override fun onNothingSelected(p0: AdapterView<*>?) {}
+        }
+
+        calendarButton.setOnClickListener {
+            showDatePicker()
+        }
+
+        generateBtn.setOnClickListener {
+            if (selectedItems.isNotEmpty()) {
+                ReportGen.generate(requireContext(), selectedItems, disclaimerText = sharedPreferences.getString("report_dis_txt",
+                    DEFAULT_DISCLAIMER).toString())
+            }
+        }
+    }
+
+    private fun showDatePicker() {
+        val calendar = Calendar.getInstance()
+        val year = calendar.get(Calendar.YEAR)
+        val month = calendar.get(Calendar.MONTH)
+        val day = calendar.get(Calendar.DAY_OF_MONTH)
+
+        DatePickerDialog(requireContext(), { _, selectedYear, selectedMonth, selectedDay ->
+            val sdf = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
+            val selectedCalendar = Calendar.getInstance()
+            selectedCalendar.set(selectedYear, selectedMonth, selectedDay)
+            customDate = sdf.format(selectedCalendar.time)
+
+            // Update calendar button text
+            val displayFormat = SimpleDateFormat("MMM dd, yyyy", Locale.getDefault())
+            calendarButton.text = displayFormat.format(selectedCalendar.time)
+
+            filterList(searchBar.text.toString(), currentFilter)
+        }, year, month, day).show()
+    }
+
+    private fun toggleItemSelection(item: HemoCubeTestData) {
+        if (selectedItems.contains(item)) {
+            selectedItems.remove(item)
+        } else {
+            selectedItems.add(item)
+        }
+        adapter.updateSelectedItems(selectedItems)
+    }
+
+    private fun updateUI() {
+        selectedCountText.text = "Selected: ${selectedItems.size}"
+        generateBtn.visibility = if (selectedItems.isNotEmpty()) View.VISIBLE else View.GONE
+    }
+
+    private fun filterList(query: String, filter: String) {
+        val sdf = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
+        val today = sdf.format(Date())
+
+        val calendar = Calendar.getInstance()
+        calendar.add(Calendar.DAY_OF_MONTH, -1)
+        val yesterday = sdf.format(calendar.time)
+
+        val filtered = allData.filter { item ->
+            val matchesSearch = item._id.contains(query, true) ||
+                    item.classificationResult.contains(query, true)
+            val matchesDate = when (filter) {
+                "Today" -> item.testTime?.contains(today)
+                "Yesterday" -> item.testTime?.contains(yesterday)
+                "Custom Date" -> customDate?.let { item.testTime?.contains(it) } ?: true
+                "All" -> true
+                else -> true
+            }
+
+            matchesSearch && matchesDate ?: true
+        }
+
+        adapter.updateList(filtered)
+
+        // Clear selections if items are no longer visible
+        selectedItems.removeAll { selectedItem ->
+            !filtered.contains(selectedItem)
+        }
+        adapter.updateSelectedItems(selectedItems)
+        updateUI()
+    }
+}

app/src/main/java/com/example/hpostesting/presentation/reportgen/ui/report/ReportViewModel.kt

@@ -0,0 +1,19 @@
+package com.example.hpostesting.presentation.reportgen.ui.report
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import com.example.hpostesting.data.dao.HemoCubeBufferDao
+import com.example.hpostesting.data.dao.HemoCubeDao
+import com.example.hpostesting.data.model.patient.BufferCheckData
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+
+@HiltViewModel
+class ReportViewModel @Inject constructor(
+    private val hemoCubeDao: HemoCubeDao,
+) : ViewModel() {
+
+    val allKitTestData: LiveData<List<HemoCubeTestData>> = hemoCubeDao.getAll()
+}

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

@@ -13,7 +13,7 @@
 
 package com.example.hpostesting.presentation.testRight
 
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.main_base.DashboardActivity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences

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

@@ -19,7 +19,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.util.NetworkStatusLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.UserDao
 import com.example.hpostesting.data.model.CalculationVariableForTest
@@ -36,6 +35,7 @@ import com.example.hpostesting.domain.SaveRawDataTest
 import com.example.hpostesting.domain.SickleFindResultCaluculationWithMaxImpl
 import com.example.hpostesting.domain.TestRightResultCalculation
 import com.example.hpostesting.util.MyUtils
+import com.example.hpostesting.util.NetworkMonitor
 import com.google.firebase.storage.FirebaseStorage
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
@@ -55,10 +55,10 @@ class TestRightViewModel @Inject constructor(
     private val saveRawDataTest: SaveRawDataTest,
     private val repository: DatabaseRepository,
     private val userDao: UserDao,
+    networkMonitor: NetworkMonitor,
     context: Context?
 ) : ViewModel() {
 
-
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
 
@@ -69,9 +69,8 @@ class TestRightViewModel @Inject constructor(
 
     var testDetails = DataHolder.selectedTest
 
-    private val _networkStatusLiveData = context?.let { NetworkStatusLiveData(it) }
-    val networkStatusLiveData: NetworkStatusLiveData?
-        get() = _networkStatusLiveData
+    private var _networkStatusLiveData = networkMonitor.isConnected
+    val networkStatusLiveData = _networkStatusLiveData
 
     val allUserData = userDao.getAll()
 
@@ -82,6 +81,11 @@ class TestRightViewModel @Inject constructor(
 
     val calculationVariableList = ArrayList<CalculationVariableForTest>()
 
+    init {
+        networkMonitor.startMonitoring()
+        _networkStatusLiveData = networkMonitor.isConnected
+    }
+
     fun mapDeviceConstants(string: String) {
         if (string.isNotEmpty()) {
             val listOfStrings = string.split(",")

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

@@ -36,8 +36,8 @@ import androidx.core.view.get
 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.presentation.hemocube.HemoCubeFragment
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestFragment
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -48,7 +48,7 @@ import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
 @AndroidEntryPoint
 class TrueHemeActivity : AppCompatActivity() {
     private lateinit var binding: ActivityHemocubeBinding
-    private val viewModel by viewModels<HemoCubeViewModel>()
+    private val viewModel by viewModels<TrueHemeTestViewModel>()
     private var myMenu: Menu? = null
 
     private lateinit var mDriver: UsbSerialDriver
@@ -177,14 +177,14 @@ class TrueHemeActivity : AppCompatActivity() {
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
 
-        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeFragment())
+        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, TrueHemeTestFragment())
             .commit()
     }
 
 
     override fun onBackPressed() {
         val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
-        if (fragment is HemoCubeFragment) {
+        if (fragment is TrueHemeTestFragment) {
             fragment.handleBackButtonPress()
         } else {
             super.onBackPressed()

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

@@ -36,8 +36,8 @@ import com.example.hpostesting.data.model.TestState
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.presentation.utils.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
+import com.example.hpostesting.presentation.main_base.DashboardActivity
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import com.google.firebase.crashlytics.ktx.crashlytics
@@ -336,7 +336,7 @@ class TrueHemeFragment : Fragment() {
         startListening.postValue(true)
 
         try {
-            (activity as HemocubeActivity).mService.listenToHemoCube(object : UsbServiceListener {
+            (activity as TrueHemeTestActivity).mService.listenToHemoCube(object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val stringData = String(it)
@@ -357,7 +357,7 @@ class TrueHemeFragment : Fragment() {
 
     private fun getDeviceInfo() {
         hemoCubeViewModel.progressBar.postValue(true)
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
             HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
@@ -593,7 +593,7 @@ class TrueHemeFragment : Fragment() {
                 binding.btnSubmit.visibility = View.VISIBLE
                 binding.btnSubmit.isEnabled = true
                 binding.btnSubmit.isClickable = true
-//                        binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
+//              binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
                 binding.ivCheck.visibility = View.VISIBLE
             }
         } else {
@@ -736,7 +736,7 @@ class TrueHemeFragment : Fragment() {
         }
     }
 
-    private fun processResult() {
+    private fun processResult(){
         try {
             hemoCubeViewModel.messages.postValue(getString(R.string.processing_result))
             val deviceLog = resultData
@@ -1067,7 +1067,7 @@ class TrueHemeFragment : Fragment() {
             binding.btnPlacebuffer.visibility = View.GONE
         }
 
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
             HemoCubeCommands.START_BUFFER_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
@@ -1081,7 +1081,7 @@ class TrueHemeFragment : Fragment() {
     private fun startSampleProcess() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
             HemoCubeCommands.START_SAMPLE,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
@@ -1095,7 +1095,7 @@ class TrueHemeFragment : Fragment() {
     private fun sendFirstGainCommand() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
             HemoCubeCommands.FIRST_GAIN_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
@@ -1109,7 +1109,7 @@ class TrueHemeFragment : Fragment() {
     private fun sendSecondGainCommand() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
             HemoCubeCommands.SECOND_GAIN_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
@@ -1123,7 +1123,7 @@ class TrueHemeFragment : Fragment() {
     private fun sendThirdGainCommand() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
             HemoCubeCommands.THIRD_GAIN_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
@@ -1137,7 +1137,7 @@ class TrueHemeFragment : Fragment() {
     private fun sendForthGainCommand() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
             HemoCubeCommands.FORTH_GAIN_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
@@ -1151,7 +1151,7 @@ class TrueHemeFragment : Fragment() {
     private fun fetchResult() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(
+        (activity as TrueHemeTestActivity).mService.sendAndListenToHemoCube(
             HemoCubeCommands.PRINT_COMMAND,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
@@ -1170,7 +1170,7 @@ class TrueHemeFragment : Fragment() {
 
     private fun reconnect() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            (activity as HemocubeActivity).reconnectDevice()
+            (activity as TrueHemeTestActivity).reconnectDevice()
         }
     }
 }

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

@@ -25,11 +25,8 @@ import androidx.lifecycle.viewModelScope
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import com.example.hpostesting.util.CsvWriter
-import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.util.NetworkStatusLiveData
-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.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.datasource.LocalFileDataSource
@@ -46,10 +43,12 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.data.model.updates.CheckUpdateRequest
 import com.example.hpostesting.data.model.updates.CheckUpdateResponse
-import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.CheckUpdateWorker
 import com.example.hpostesting.domain.LogFileManager
+import com.example.hpostesting.util.CsvWriter
+import com.example.hpostesting.util.NetworkMonitor
+import com.example.hpostesting.util.Result
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -70,20 +69,22 @@ class TrueHemeViewModel @Inject constructor(
     private val repository: Repository,
     private val logFileManager: LogFileManager,
     private val localFileDataSource: LocalFileDataSource,
+    networkMonitor: NetworkMonitor,
     context: Context,
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
     private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
     val messages = MutableLiveData<String>()
-    private val sharedPreference =
-        context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+    private val sharedPreference = context.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
 
     private val workManager = WorkManager.getInstance(context)
-
-//    init {
-//        startPeriodicCheckUpdate()
-//    }
+    //    init {
+    //        startPeriodicCheckUpdate()
+    //    }
+    init {
+        networkMonitor.startMonitoring()
+    }
 
     val loginResponse = MutableLiveData<Result<LoginResponse>>()
 
@@ -97,7 +98,7 @@ class TrueHemeViewModel @Inject constructor(
 
     // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
 
-    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    private val _networkStatusLiveData = networkMonitor.isConnected
     val allUserData = hemoCubeDao.getAll()
     val allKitTestData = hemoCubeBufferDao.getAll()
     val deviceData = MutableLiveData<DeviceData?>()
@@ -181,7 +182,7 @@ class TrueHemeViewModel @Inject constructor(
         val logFile = logFileManager.createLogFile().let { file ->
             val requestBody = file?.asRequestBody("multipart/form-data".toMediaTypeOrNull())
             val multipartFile =
-                requestBody?.let { MultipartBody.Part.createFormData("logFile", file?.name, it) }
+                requestBody?.let { MultipartBody.Part.createFormData("logFile", file.name, it) }
             multipartFile?.let { partFile ->
                 repository.uploadLogs(partFile).let { result ->
                     uploadLogs.postValue(result)
@@ -193,37 +194,35 @@ class TrueHemeViewModel @Inject constructor(
     fun uploadHemoCubeResultToDatabaseForBufferCheck(
         isOnline: Boolean,
         bufferCheckData: BufferCheckData,
-    ) =
-        viewModelScope.launch {
-            if (isOnline) {
-                try {
-                    when (val response =
-                        repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
-                        is Response.Success -> {
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
-                            fireBaseUpload.postValue("Success")
-                            bufferCheckData.localFlag = true
-                            hemoCubeBufferDao.insertAll(bufferCheckData)
-                        }
-
-                        is Response.Error -> {
-                            Log.e("Testdb", "Error uploading data to Firestore: $response")
-                            fireBaseUpload.postValue("Error")
-                            bufferCheckData.localFlag = true
-                            hemoCubeBufferDao.insertAll(bufferCheckData)
-                        }
-
-                        else -> {}
+    ) = viewModelScope.launch {
+        if (isOnline) {
+            try {
+                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
+                    is Response.Success -> {
+                        Log.i("Testdb", "Data uploaded to Firestore successfully")
+                        fireBaseUpload.postValue("Success")
+                        bufferCheckData.localFlag = true
+                        hemoCubeBufferDao.insertAll(bufferCheckData)
                     }
-                } catch (e: Exception) {
-                    Log.e("Testdb", "Exception during data upload: ${e.message}")
-                    fireBaseUpload.postValue("Error")
+
+                    is Response.Error -> {
+                        Log.e("Testdb", "Error uploading data to Firestore: $response")
+                        fireBaseUpload.postValue("Error")
+                        bufferCheckData.localFlag = true
+                        hemoCubeBufferDao.insertAll(bufferCheckData)
+                    }
+
+                    else -> {}
                 }
-            } else {
-                hemoCubeBufferDao.insertAll(bufferCheckData)
-                fireBaseUpload.postValue("Local")
+            } catch (e: Exception) {
+                Log.e("Testdb", "Exception during data upload: ${e.message}")
+                fireBaseUpload.postValue("Error")
             }
+        } else {
+            hemoCubeBufferDao.insertAll(bufferCheckData)
+            fireBaseUpload.postValue("Local")
         }
+    }
 
     fun bulkAddResultKitTestToDb(bufferCheckData: BufferCheckData) {
         viewModelScope.launch {
@@ -396,8 +395,7 @@ class TrueHemeViewModel @Inject constructor(
         viewModelScope.launch {
             try {
 
-                when (val response =
-                    repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
+                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
                     is Response.Success -> {
                         Log.i("Testdb", "Data uploaded to Firestore successfully")
                         fireBaseUpload.postValue("Success")
@@ -415,10 +413,9 @@ class TrueHemeViewModel @Inject constructor(
         }
     }
 
-    private fun updateBufferLocalFlag(bufferId: String) =
-        viewModelScope.launch {
-            hemoCubeBufferDao.updateFieldById(id = bufferId, true)
-        }
+    private fun updateBufferLocalFlag(bufferId: String) = viewModelScope.launch {
+        hemoCubeBufferDao.updateFieldById(id = bufferId, true)
+    }
 
     fun getLocalUserDataForCsv(context: Context): Boolean {
         val localUserDataLiveData: LiveData<List<HemoCubeTestData>> = hemoCubeDao.getAll()
@@ -455,16 +452,12 @@ class TrueHemeViewModel @Inject constructor(
 
     fun getBatteryLevel(): Float? {
         val batteryPct: Float? = batteryStatus?.let { intent ->
-            val level: Int =
-                intent.getIntExtra(
-                    BatteryManager.EXTRA_LEVEL,
-                    -1
-                )
-            val scale: Int =
-                intent.getIntExtra(
-                    BatteryManager.EXTRA_SCALE,
-                    -1
-                )
+            val level: Int = intent.getIntExtra(
+                BatteryManager.EXTRA_LEVEL, -1
+            )
+            val scale: Int = intent.getIntExtra(
+                BatteryManager.EXTRA_SCALE, -1
+            )
             level * 100 / scale.toFloat()
         }
 
@@ -474,8 +467,7 @@ class TrueHemeViewModel @Inject constructor(
     fun getBatteryTemperature(): Float? {
         val batteryTemp: Float? = batteryStatus?.let { intent ->
             val temperature = intent.getIntExtra(
-                BatteryManager.EXTRA_TEMPERATURE,
-                0
+                BatteryManager.EXTRA_TEMPERATURE, 0
             )
             temperature.toFloat() / 10
         }
@@ -484,14 +476,11 @@ class TrueHemeViewModel @Inject constructor(
     }
 
     fun getBatteryVoltage(context: Context): Float {
-        val batteryIntent =
-            context.registerReceiver(
-                null,
-                IntentFilter(Intent.ACTION_BATTERY_CHANGED)
-            )
+        val batteryIntent = context.registerReceiver(
+            null, IntentFilter(Intent.ACTION_BATTERY_CHANGED)
+        )
         val voltage = batteryIntent?.getIntExtra(
-            BatteryManager.EXTRA_VOLTAGE,
-            0
+            BatteryManager.EXTRA_VOLTAGE, 0
         ) ?: 0
 
         // milli-volts to volts
@@ -500,8 +489,7 @@ class TrueHemeViewModel @Inject constructor(
 
 
     fun getBatteryCapacity(context: Context): Int {
-        val batteryManager =
-            context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
         val currentCapacity =
             batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
 
@@ -510,8 +498,7 @@ class TrueHemeViewModel @Inject constructor(
 
     fun getBatteryMaxCapacity(context: Context): Float {
         val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-        val designCapacity =
-            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+        val designCapacity = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
         val currentCapacity =
             batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
 
@@ -528,8 +515,7 @@ class TrueHemeViewModel @Inject constructor(
                 hemoCubeTestData.forEach { data ->
                     data.localFlag = true
                     hemoCubeDao.updateCSVFieldById(
-                        data._id,
-                        true
+                        data._id, true
                     )
                 }
             }

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

@@ -11,7 +11,7 @@
  * // from ShanMukha Innovations Pvt. Ltd.
  */
 
-package com.example.hpostesting.presentation.hemocube
+package com.example.hpostesting.presentation.trueheme_test
 
 import android.content.Context
 import android.os.Bundle

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

@@ -11,7 +11,7 @@
  * // from ShanMukha Innovations Pvt. Ltd.
  */
 
-package com.example.hpostesting.presentation.hemocube
+package com.example.hpostesting.presentation.trueheme_test
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -33,7 +33,7 @@ import java.util.Locale
 
 class DigitalCardFragment : Fragment() {
     private lateinit var binding: FragmentDigitalCardBinding
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private val trueHemeTestViewModel: TrueHemeTestViewModel by activityViewModels()
     private lateinit var sharedPreferences: SharedPreferences
     private val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
 

app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestActivity.kt

@@ -11,7 +11,7 @@
  * // from ShanMukha Innovations Pvt. Ltd.
  */
 
-package com.example.hpostesting.presentation.hemocube
+package com.example.hpostesting.presentation.trueheme_test
 
 import android.annotation.SuppressLint
 import android.app.PendingIntent
@@ -25,7 +25,6 @@ import android.content.SharedPreferences
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
-import android.icu.text.SimpleDateFormat
 import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
@@ -37,27 +36,20 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.constant.DataHolder
 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.util.UsbService
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
-import com.google.firebase.remoteconfig.ktx.remoteConfig
-import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
-import java.util.Calendar
-import java.util.Locale
 
 @AndroidEntryPoint
-open class HemocubeActivity : AppCompatActivity() {
-    private val remoteConfig: FirebaseRemoteConfig = Firebase.remoteConfig
+open class TrueHemeTestActivity : AppCompatActivity() {
     private lateinit var binding: ActivityHemocubeBinding
-    private val viewModel by viewModels<HemoCubeViewModel>()
+    private val viewModel by viewModels<TrueHemeTestViewModel>()
     private var myMenu: Menu? = null
     lateinit var sharedPreferences: SharedPreferences
     private lateinit var mDriver: UsbSerialDriver
@@ -117,95 +109,6 @@ open class HemocubeActivity : AppCompatActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         setupListener()
         connectUsb(false)
-        val configSettings = remoteConfigSettings {
-            minimumFetchIntervalInSeconds = 10//3600
-        }
-        sharedPreferences = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
-        remoteConfig.setConfigSettingsAsync(configSettings)
-        remoteConfig.setDefaultsAsync(R.xml.remote_config_defaults)
-
-        remoteConfig.fetchAndActivate()
-            .addOnCompleteListener(this) { task ->
-                if (task.isSuccessful) {
-                    val normalMin2mm = remoteConfig.getDouble("normalMin2mm")
-                    val normalMax2mm = remoteConfig.getDouble("normalMax2mm")
-                    val negativeBorderlineMin2mm = remoteConfig.getDouble("negativeBorderlineMin2mm")
-                    val negativeBorderlineMax2mm = remoteConfig.getDouble("negativeBorderlineMax2mm")
-                    val positiveForSickleCellMin2mm = remoteConfig.getDouble("positiveForSickleCellMin2mm")
-                    val positiveForSickleCellMax2mm = remoteConfig.getDouble("positiveForSickleCellMax2mm")
-                    val sickleCellTraitMin2mm = remoteConfig.getDouble("sickleCellTraitMin2mm")
-                    val sickleCellTraitMax2mm = remoteConfig.getDouble("sickleCellTraitMax2mm")
-                    val sickleCellDiseaseMin2mm = remoteConfig.getDouble("sickleCellDiseaseMin2mm")
-                    val sickleCellDiseaseMax2mm = remoteConfig.getDouble("sickleCellDiseaseMax2mm")
-                    val positiveBoderLine2mm1 = remoteConfig.getDouble("positiveBoderLine2mm1")
-                    val positiveBoderLine2mm2 = remoteConfig.getDouble("positiveBoderLine2mm2")
-                    val negativeBoderLine2mm1 = remoteConfig.getDouble("negativeBoderLine2mm1")
-                    val negativeBoderLine2mm2 = remoteConfig.getDouble("negativeBoderLine2mm2")
-
-                    val normalMin10mm = remoteConfig.getDouble("normalMin10mm")
-                    val normalMax10mm = remoteConfig.getDouble("normalMax10mm")
-                    val negativeBorderlineMin10mm = remoteConfig.getDouble("negativeBorderlineMin10mm")
-                    val negativeBorderlineMax10mm = remoteConfig.getDouble("negativeBorderlineMax10mm")
-                    val positiveForSickleCellMin10mm = remoteConfig.getDouble("positiveForSickleCellMin10mm")
-                    val positiveForSickleCellMax10mm = remoteConfig.getDouble("positiveForSickleCellMax10mm")
-                    val sickleCellTraitMin10mm = remoteConfig.getDouble("sickleCellTraitMin10mm")
-                    val sickleCellTraitMax10mm = remoteConfig.getDouble("sickleCellTraitMax10mm")
-                    val sickleCellDiseaseMin10mm = remoteConfig.getDouble("sickleCellDiseaseMin10mm")
-                    val sickleCellDiseaseMax10mm = remoteConfig.getDouble("sickleCellDiseaseMax10mm")
-                    val positiveBoderLine10mm1 = remoteConfig.getDouble("positiveBoderLine10mm1")
-                    val positiveBoderLine10mm2 = remoteConfig.getDouble("positiveBoderLine10mm2")
-                    val negativeBoderLine10mm1 = remoteConfig.getDouble("negativeBoderLine10mm1")
-                    val negativeBoderLine10mm2 = remoteConfig.getDouble("negativeBoderLine10mm2")
-
-                    val bufferMinLed1 = remoteConfig.getDouble("bufferMinLed1")
-                    val bufferMaxLed1 = remoteConfig.getDouble("bufferMaxLed1")
-                    val bufferMinLed2 = remoteConfig.getDouble("bufferMinLed2")
-                    val bufferMaxLed2 = remoteConfig.getDouble("bufferMaxLed2")
-                    val time = SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                        ).format(Calendar.getInstance().time).toString()
-                    with(sharedPreferences.edit()) {
-                        putString(Constants.LAST_UPDATED, time)
-                        putString("bufferMinLed1", bufferMinLed1.toString())
-                        putString("bufferMaxLed1", bufferMaxLed1.toString())
-                        putString("bufferMinLed2", bufferMinLed2.toString())
-                        putString("bufferMaxLed2", bufferMaxLed2.toString())//buffer
-                        putString("normalMin2mm", normalMin2mm.toString())//2mm
-                        putString("normalMax2mm", normalMax2mm.toString())
-                        putString("negativeBorderlineMin2mm", negativeBorderlineMin2mm.toString())
-                        putString("negativeBorderlineMax2mm", negativeBorderlineMax2mm.toString())
-                        putString("positiveForSickleCellMin2mm", positiveForSickleCellMin2mm.toString())
-                        putString("positiveForSickleCellMax2mm", positiveForSickleCellMax2mm.toString())
-                        putString("sickleCellTraitMin2mm", sickleCellTraitMin2mm.toString())
-                        putString("sickleCellTraitMax2mm", sickleCellTraitMax2mm.toString())
-                        putString("sickleCellDiseaseMin2mm", sickleCellDiseaseMin2mm.toString())
-                        putString("sickleCellDiseaseMax2mm", sickleCellDiseaseMax2mm.toString())
-                        putString("positiveBoderLine2mm1", positiveBoderLine2mm1.toString())
-                        putString("positiveBoderLine2mm2", positiveBoderLine2mm2.toString())
-                        putString("negativeBoderLine2mm1", negativeBoderLine2mm1.toString())
-                        putString("negativeBoderLine2mm2", negativeBoderLine2mm2.toString())//2mm
-                        putString("normalMin10mm", normalMin10mm.toString())//10mm
-                        putString("normalMax10mm", normalMax10mm.toString())
-                        putString("negativeBorderlineMin10mm", negativeBorderlineMin10mm.toString())
-                        putString("negativeBorderlineMax10mm", negativeBorderlineMax10mm.toString())
-                        putString("positiveForSickleCellMin10mm", positiveForSickleCellMin10mm.toString())
-                        putString("positiveForSickleCellMax10mm", positiveForSickleCellMax10mm.toString())
-                        putString("sickleCellTraitMin10mm", sickleCellTraitMin10mm.toString())
-                        putString("sickleCellTraitMax10mm", sickleCellTraitMax10mm.toString())
-                        putString("sickleCellDiseaseMin10mm", sickleCellDiseaseMin10mm.toString())
-                        putString("sickleCellDiseaseMax10mm", sickleCellDiseaseMax10mm.toString())
-                        putString("positiveBoderLine10mm1", positiveBoderLine10mm1.toString())
-                        putString("positiveBoderLine10mm2", positiveBoderLine10mm2.toString())
-                        putString("negativeBoderLine10mm1", negativeBoderLine10mm1.toString())
-                        putString("negativeBoderLine10mm2", negativeBoderLine10mm2.toString())//10mm
-                        apply()
-                    }
-                    Toast.makeText(this@HemocubeActivity, "Config params updated", Toast.LENGTH_SHORT).show()
-                    Log.d(TAG, "Config params updated")
-                } else {
-                    Log.d(TAG, "Config params Fetch failed")
-                }
-            }
     }
 
     private fun setupListener() {
@@ -289,7 +192,7 @@ open class HemocubeActivity : AppCompatActivity() {
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
 
-        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeFragment())
+        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, TrueHemeTestFragment())
             .commit()
     }
 
@@ -304,7 +207,7 @@ open class HemocubeActivity : AppCompatActivity() {
 //    }
 override fun onBackPressed() {
     val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
-    if (fragment is HemoCubeFragment) {
+    if (fragment is TrueHemeTestFragment) {
         if (fragment.handleBackButtonPress()) {
             // If the fragment handled the back press, return to avoid calling super.onBackPressed
             return

app/src/main/java/com/example/hpostesting/presentation/trueheme_test/TrueHemeTestViewModel.kt

@@ -11,7 +11,7 @@
  * // from ShanMukha Innovations Pvt. Ltd.
  */
 
-package com.example.hpostesting.presentation.hemocube
+package com.example.hpostesting.presentation.trueheme_test
 
 import android.content.Context
 import android.content.Intent
@@ -27,7 +27,6 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import com.example.hpostesting.util.CsvWriter
 import com.example.hpostesting.data.constant.DataHolder
-import com.example.hpostesting.util.NetworkStatusLiveData
 import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
@@ -50,6 +49,7 @@ import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.CheckUpdateWorker
 import com.example.hpostesting.domain.LogFileManager
+import com.example.hpostesting.util.NetworkMonitor
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -66,12 +66,13 @@ import javax.inject.Inject
 
 @Suppress("MemberVisibilityCanBePrivate")
 @HiltViewModel
-class HemoCubeViewModel @Inject constructor(
+class TrueHemeTestViewModel @Inject constructor(
     val hemoCubeDao: HemoCubeDao,
     private val hemoCubeBufferDao: HemoCubeBufferDao,
     private val repository: Repository,
     private val logFileManager: LogFileManager,
     private val localFileDataSource: LocalFileDataSource,
+    networkMonitor: NetworkMonitor,
     context: Context,
 ) : ViewModel() {
     private var testUpload: Boolean = false
@@ -87,6 +88,9 @@ class HemoCubeViewModel @Inject constructor(
 //    init {
 //        startPeriodicCheckUpdate()
 //    }
+    init {
+        networkMonitor.startMonitoring()
+    }
 
     val loginResponse = MutableLiveData<Result<LoginResponse>>()
 
@@ -103,7 +107,7 @@ class HemoCubeViewModel @Inject constructor(
 
     // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
 
-    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    private val _networkStatusLiveData =networkMonitor.isConnected
     val allUserData = hemoCubeDao.getAll()
     val allLocalData = hemoCubeDao.getAll()
     val allPendingUserToUpload = hemoCubeDao.getPendingUser()
@@ -496,7 +500,6 @@ class HemoCubeViewModel @Inject constructor(
         testDetails?.centerName = sharedPreference.getString(Constants.CENTER_NAME, "").toString()
         testDetails?.district = sharedPreference.getString(Constants.DISTRICT, "").toString()
         testDetails?.ipAddress = sharedPreference.getString(Constants.IP_ADDRESS, "").toString()
-        testDetails?.configUpdatedRecent = sharedPreference.getString(Constants.LAST_UPDATED, "NA").toString()
     }
 
     private fun addResultTestToDb(quickCapture: Boolean) {
@@ -792,4 +795,11 @@ class HemoCubeViewModel @Inject constructor(
             "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
         ).format(Calendar.getInstance().time)
     }
+    fun updateLocalData() {
+        viewModelScope.launch {
+            parseData()
+            hemoCubeDao.updateTest(testDetails!!)
+        }
+    }
+
 }

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

@@ -18,7 +18,7 @@ import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.main_base.DashboardActivity
 import io.nats.client.AuthHandler
 import io.nats.client.Connection
 import io.nats.client.Message

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

@@ -0,0 +1,117 @@
+package com.example.hpostesting.util
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import java.net.HttpURLConnection
+import java.net.URL
+import javax.inject.Inject
+import javax.inject.Singleton
+
+
+@Singleton
+class NetworkMonitor @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    private var isMonitoringStarted = false
+    private val connectivityManager =
+        context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+    private val _isConnected = MutableLiveData(false)
+    val isConnected: LiveData<Boolean> get() = _isConnected
+
+    private val networkScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
+        override fun onAvailable(network: Network) {
+            performPingCheck()
+        }
+
+        override fun onLost(network: Network) {
+            _isConnected.postValue(false)
+        }
+
+        override fun onCapabilitiesChanged(
+            network: Network, networkCapabilities: NetworkCapabilities
+        ) {
+            // Recheck connectivity when capabilities change (e.g., network becomes validated)
+            performPingCheck()
+        }
+    }
+
+    @SuppressLint("NewApi")
+    fun startMonitoring() {
+        if (isMonitoringStarted) return  // Already started, do nothing.
+        isMonitoringStarted = true
+        // Check initial connectivity status
+        val network = connectivityManager.activeNetwork
+        val capabilities = connectivityManager.getNetworkCapabilities(network)
+        val isInitiallyConnected = capabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) == true
+
+        if (isInitiallyConnected) {
+            performPingCheck()
+        } else {
+            _isConnected.postValue(false)
+        }
+
+        val networkRequest =
+            NetworkRequest.Builder().addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                .build()
+
+        connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
+        // Start periodic checks:
+        startPeriodicPingCheck()
+    }
+
+    fun stopMonitoring() {   // never needed to call
+        try {
+            connectivityManager.unregisterNetworkCallback(networkCallback)
+        } catch (_: IllegalArgumentException) {
+            // Ignore if callback was not registered
+        }
+        networkScope.cancel()
+    }
+
+    private fun performPingCheck() {
+        networkScope.launch {
+            try {
+                val url = URL("https://www.google.com")
+                val connection = url.openConnection() as HttpURLConnection
+                connection.connectTimeout = 2000
+                connection.readTimeout = 2000
+                connection.setRequestProperty("Connection", "close")
+                connection.connect()
+
+                // Consider any 2xx response as successful
+                val isReachable = connection.responseCode in 200..299
+                _isConnected.postValue(isReachable)
+                connection.disconnect()
+            } catch (e: Exception) {
+                _isConnected.postValue(false)
+            }
+        }
+    }
+
+    private fun startPeriodicPingCheck(intervalMillis: Long = 1 * 60_000L) {
+        networkScope.launch {
+            while (isActive) {
+                performPingCheck()
+                delay(intervalMillis)
+            }
+        }
+    }
+
+}

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

@@ -1,75 +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.util
-
-
-import android.content.Context
-import android.net.ConnectivityManager
-import android.net.Network
-import android.net.NetworkCapabilities
-import android.net.NetworkRequest
-import android.os.Build
-import androidx.annotation.RequiresApi
-import androidx.lifecycle.LiveData
-
-class NetworkStatusLiveData(context: Context) : LiveData<Boolean>() {
-
-    private val connectivityManager: ConnectivityManager =
-        context.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
-        override fun onAvailable(network: Network) {
-            postValue(true)
-        }
-
-        override fun onLost(network: Network) {
-            postValue(false)
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    override fun onActive() {
-        super.onActive()
-        postValue(isNetworkAvailable())
-        registerNetworkCallback()
-    }
-
-    override fun onInactive() {
-        super.onInactive()
-        unregisterNetworkCallback()
-    }
-
-    private fun registerNetworkCallback() {
-        val networkRequest = NetworkRequest.Builder()
-            .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
-            .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
-            .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
-            .build()
-
-        connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
-    }
-
-    private fun unregisterNetworkCallback() {
-        connectivityManager.unregisterNetworkCallback(networkCallback)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun isNetworkAvailable(): Boolean {
-        val network = connectivityManager.activeNetwork
-        val networkCapabilities = connectivityManager.getNetworkCapabilities(network)
-        return networkCapabilities != null &&
-                networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
-                networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-    }
-}

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

@@ -0,0 +1,5 @@
+<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,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"/>
+    
+</vector>

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

@@ -0,0 +1,5 @@
+<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="M7,5h10v2h2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99L7,1c-1.1,0 -2,0.9 -2,2v4h2L7,5zM15.41,16.59L20,12l-4.59,-4.59L14,8.83 17.17,12 14,15.17l1.41,1.42zM10,15.17L6.83,12 10,8.83 8.59,7.41 4,12l4.59,4.59L10,15.17zM17,19L7,19v-2L5,17v4c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2v-4h-2v2z"/>
+    
+</vector>

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

@@ -0,0 +1,5 @@
+<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="M2.88,7.88l1.54,1.54C4.15,10.23 4,11.1 4,12c0,4.41 3.59,8 8,8s8,-3.59 8,-8s-3.59,-8 -8,-8c-0.9,0 -1.77,0.15 -2.58,0.42L7.89,2.89C9.15,2.32 10.54,2 12,2c5.52,0 10,4.48 10,10s-4.48,10 -10,10S2,17.52 2,12C2,10.53 2.32,9.14 2.88,7.88zM7,5.5C7,6.33 6.33,7 5.5,7S4,6.33 4,5.5S4.67,4 5.5,4S7,4.67 7,5.5zM12.03,8.99h-0.07l-1.16,3.31h2.39L12.03,8.99zM12,18c3.31,0 6,-2.69 6,-6s-2.69,-6 -6,-6s-6,2.69 -6,6S8.69,18 12,18zM11.29,7.5h1.43l3.01,8h-1.39l-0.72,-2.04h-3.23L9.66,15.5H8.28L11.29,7.5z"/>
+    
+</vector>

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

@@ -0,0 +1,5 @@
+<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="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
+    
+</vector>

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

@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.example.hpostesting.presentation.hemocube.DigitalCardFragment">
+    tools:context="com.example.hpostesting.presentation.trueheme_test.DigitalCardFragment">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/userCard"

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

@@ -22,7 +22,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:context="com.example.hpostesting.presentation.dashboard.GalleryFragment">
+        tools:context="com.example.hpostesting.presentation.main_base.PanelFragment">
 
     <TextView
         android:id="@+id/tv_subtitle4"
@@ -55,7 +55,21 @@
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
 
 
-    <Button
+        <Button
+            android:id="@+id/btn_print_report"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="24dp"
+            android:clickable="false"
+            android:text="Print Report"
+            android:textColor="@color/white"
+            app:cornerRadius="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+
+        <Button
         android:id="@+id/btn_diagnostics"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -67,7 +81,7 @@
         app:cornerRadius="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+        app:layout_constraintTop_toBottomOf="@id/btn_print_report" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_auto_dac"
@@ -153,6 +167,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_update_values"
             android:layout_width="match_parent"
@@ -160,12 +175,13 @@
             android:layout_marginHorizontal="16dp"
             android:layout_marginTop="24dp"
             android:clickable="false"
-            android:text="Update values"
+            android:text="Update valueLs"
             android:textColor="@color/white"
             app:cornerRadius="16dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btn_reset_password" />
+
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_firefox"
         android:layout_width="match_parent"

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

@@ -14,7 +14,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.example.hpostesting.presentation.hemocube.HemoCubeFragment">
+    tools:context="com.example.hpostesting.presentation.trueheme_test.TrueHemeTestFragment">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_parent"
@@ -225,6 +225,19 @@
                 app:cornerRadius="16dp"
                  />
 
+            <Button
+            android:id="@+id/btn_goback"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="24dp"
+            android:clickable="false"
+            android:text="Go back"
+            android:textColor="@color/white"
+            app:cornerRadius="16dp"
+            />
+
         </LinearLayout>
 
         <TextView

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

@@ -16,7 +16,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context="com.example.hpostesting.presentation.dashboard.ui.LoginFragment">
+    tools:context="com.example.hpostesting.presentation.main_base.ui.LoginFragment">
 
 
     <ScrollView

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

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:padding="12dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <EditText
+        android:id="@+id/searchBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Search by Sample ID or result"
+        android:imeOptions="actionSearch"
+        android:inputType="text" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="8dp">
+
+        <Spinner
+            android:id="@+id/filterSpinner"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:entries="@array/filter_options" />
+
+        <Button
+            android:id="@+id/calendarButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Select Date"
+            android:visibility="gone"
+            android:layout_marginStart="8dp"
+            style="@style/Widget.Material3.Button.OutlinedButton" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/selectedCountText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Selected: 0"
+        android:layout_marginTop="8dp"
+        android:textStyle="bold" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/bufferRecyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_marginTop="8dp" />
+
+    <Button
+        android:id="@+id/generateReportButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Generate Report"
+        android:visibility="gone"/>
+
+</LinearLayout>

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

@@ -15,7 +15,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.example.hpostesting.presentation.dashboard.SlideshowFragment">
+    tools:context="com.example.hpostesting.presentation.main_base.SlideshowFragment">
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_parent"
         android:layout_width="match_parent"
@@ -88,24 +88,12 @@
             app:layout_constraintBottom_toBottomOf="@id/spinnerCuvette"
             app:layout_constraintStart_toEndOf="@id/spinnerCuvette"
             app:layout_constraintTop_toTopOf="@id/spinnerCuvette" />
-        <TextView
-            android:id="@+id/last_updated"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="Last"
-            android:textColor="@color/black"
-            android:textSize="17sp"
-            app:layout_constraintTop_toBottomOf="@id/btn_add_size"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="30dp"/>
 
         <FrameLayout
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@+id/last_updated"
+            app:layout_constraintTop_toBottomOf="@+id/btn_add_size"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:layout_marginTop="10dp"/>

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

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cardView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="4dp"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="4dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp">
+
+        <TextView
+            android:id="@+id/sampleId"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Kit No: Sample123"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <View
+            android:id="@+id/selectionIndicator"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@drawable/ic_baseline_check_circle_24"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/testTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/sampleId"
+            android:layout_marginTop="4dp"
+            android:text="Time: 2024-01-15 10:30"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/result"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/testTime"
+            android:layout_marginTop="4dp"
+            android:text="Result: Positive"
+            android:textSize="14sp" />
+
+    </RelativeLayout>
+
+</androidx.cardview.widget.CardView>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />

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

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

app/src/main/res/navigation/dashboard_navigation.xml

@@ -20,7 +20,7 @@
 
     <fragment
         android:id="@+id/nav_home"
-        android:name="com.example.hpostesting.presentation.dashboard.HomeFragment"
+        android:name="com.example.hpostesting.presentation.main_base.HomeFragment"
         android:label="@string/menu_home"
         app:popUpToInclusive="true"
         app:popUpTo="@id/nav_home"
@@ -36,23 +36,23 @@
 
     <fragment
         android:id="@+id/nav_profile"
-        android:name="com.example.hpostesting.presentation.dashboard.GalleryFragment"
+        android:name="com.example.hpostesting.presentation.main_base.PanelFragment"
         android:label="@string/profile"
         tools:layout="@layout/fragment_gallery" />
 
     <fragment
         android:id="@+id/nav_settings"
-        android:name="com.example.hpostesting.presentation.dashboard.SlideshowFragment"
+        android:name="com.example.hpostesting.presentation.main_base.SlideshowFragment"
         android:label="@string/action_settings"
         tools:layout="@layout/fragment_slideshow" />
     <fragment
         android:id="@+id/nav_about"
-        android:name="com.example.hpostesting.presentation.dashboard.AboutFragment"
+        android:name="com.example.hpostesting.presentation.main_base.AboutFragment"
         android:label="@string/action_about"
         tools:layout="@layout/fragment_about" />
     <fragment
         android:id="@+id/nav_activity"
-        android:name="com.example.hpostesting.presentation.dashboard.ActivitiesFragment"
+        android:name="com.example.hpostesting.presentation.main_base.ActivitiesFragment"
         android:label="@string/action_activity"
         tools:layout="@layout/fragment_activities" />
     <activity
@@ -61,7 +61,7 @@
         android:label="MainActivity" />
     <fragment
         android:id="@+id/loginFragment"
-        android:name="com.example.hpostesting.presentation.dashboard.ui.LoginFragment"
+        android:name="com.example.hpostesting.presentation.main_base.ui.LoginFragment"
         android:label="@string/login"
         tools:layout="@layout/fragment_login" >
     <action

app/src/main/res/navigation/navigation_graph.xml

@@ -20,7 +20,7 @@
 
     <fragment
         android:id="@+id/hemoCubeFragment"
-        android:name="com.example.hpostesting.presentation.hemocube.HemoCubeFragment"
+        android:name="com.example.hpostesting.presentation.trueheme_test.TrueHemeTestFragment"
         android:label="fragment_hemo_cube_reference"
         tools:layout="@layout/fragment_hemo_cube_reference" >
         <action
@@ -29,7 +29,7 @@
     </fragment>
     <fragment
         android:id="@+id/digitalCardFragment"
-        android:name="com.example.hpostesting.presentation.hemocube.DigitalCardFragment"
+        android:name="com.example.hpostesting.presentation.trueheme_test.DigitalCardFragment"
         android:label="fragment_digital_card"
         tools:layout="@layout/fragment_digital_card" />
 </navigation>

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

@@ -307,5 +307,6 @@
     <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>
+    <string name="cuvette_presentnt">Test Done, Cuvette Present, Please Remove Cuvette And Goback</string>
 
 </resources>

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

@@ -306,7 +306,7 @@
     <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>
-
+    <string name="cuvette_presentnt">Test Done, Cuvette Present, Please Remove Cuvette And Goback</string>
     <!-- Add translations for other strings -->
 
 </resources>

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

@@ -25,6 +25,7 @@
         <item>ka</item>
         <!-- Use language codes (e.g., en, kn) as values -->
     </string-array>
+
     <string-array name="district">
         <item>Mysuru</item>
         <item>Kodagu</item>
@@ -32,4 +33,13 @@
         <item>Other</item>
     </string-array>
 
+
+        <string-array name="filter_options">
+            <item>Today</item>
+            <item>Yesterday</item>
+            <item>All</item>
+            <item>Custom Date</item>
+        </string-array>
+
+
 </resources>

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

@@ -306,6 +306,7 @@
     <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_presentnt">Test Done, Cuvette Present, Please Remove Cuvette And Goback</string>
     <string name="cuvette_absentt">Cuvette Absent,Now You Can Submit</string>
 
 </resources>

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

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

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

@@ -16,12 +16,12 @@ package com.example.hpostesting
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.example.hpostesting.util.NetworkStatusLiveData
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.presentation.autodac.AutoDacViewModel
+import com.example.hpostesting.util.NetworkMonitor
 import io.mockk.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -43,7 +43,7 @@ class AutoDacViewModelTest {
     private val repository = mockk<Repository>()
     private val context = mockk<Context>()
     private val sharedPreferences = mockk<SharedPreferences>()
-    private val networkStatusLiveData = mockk<NetworkStatusLiveData>()
+    private val networkStatusLiveData = mockk<NetworkMonitor>()
 
     @Before
     fun setup() {
@@ -54,7 +54,7 @@ class AutoDacViewModelTest {
         every { context.getSystemService(any()) } returns networkStatusLiveData
 
         // Mocking the NetworkStatusLiveData
-        every { networkStatusLiveData.observe(any(), any()) } just Runs
+        every { networkStatusLiveData.startMonitoring() } just Runs
 
         every { hemoCubeDao.getAll() } returns mockk()
 //        every { repository.addDiagnostics(any()) } returns Response.Success(Unit)

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

@@ -20,7 +20,7 @@ import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.login.LoginResponse
 import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.LogFileManager
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.util.TestCoroutineRule
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -59,7 +59,7 @@ class HemocubeViewModelTest {
     @MockK(relaxed = true)
     lateinit var observer: Observer<Result<LoginResponse>>
 
-    private lateinit var viewModel: HemoCubeViewModel
+    private lateinit var viewModel: TrueHemeTestViewModel
 
     @Before
     fun setup() {

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

@@ -14,7 +14,7 @@
 package com.example.hpostesting
 
 import android.content.SharedPreferences
-import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
+import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestFragment
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertNull
 import org.junit.Before
@@ -24,17 +24,17 @@ import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.MockitoAnnotations
 
-class HemoCubeFragmentTest {
+class TrueHemeTestFragmentTest {
 
     @Mock
     private lateinit var mockSharedPreferences: SharedPreferences
 
-    private lateinit var hemoCubeFragment: HemoCubeFragment
+    private lateinit var trueHemeTestFragment: TrueHemeTestFragment
 
     @Before
     fun setUp() {
         MockitoAnnotations.initMocks(this)
-        hemoCubeFragment = HemoCubeFragment()
+        trueHemeTestFragment = TrueHemeTestFragment()
     }
 
     @Test
@@ -48,7 +48,7 @@ class HemoCubeFragmentTest {
         ).thenReturn("dummy_value")
 
         // Act
-        val deviceId = hemoCubeFragment.extractV2HardwareId("SNS HPP1-9000 SNE")
+        val deviceId = trueHemeTestFragment.extractV2HardwareId("SNS HPP1-9000 SNE")
 
         // Assert
         assertEquals("HPP1-9000", deviceId)
@@ -81,11 +81,11 @@ class HemoCubeFragmentTest {
         val readingsPerSample = 1
 
         // Act
-        val result = hemoCubeFragment.allReadingsComplete(repeatReadingCount, readingsPerSample)
+        val result = trueHemeTestFragment.allReadingsComplete(repeatReadingCount, readingsPerSample)
 
         // Assert
         assertEquals(true, result)
-        assertEquals(hemoCubeFragment.allReadingsComplete(0, 1), false)
+        assertEquals(trueHemeTestFragment.allReadingsComplete(0, 1), false)
     }
 
     @Test
@@ -94,7 +94,7 @@ class HemoCubeFragmentTest {
         val input = "Some text SN ABC123 some more text"
 
         // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
+        val result = trueHemeTestFragment.extractV1HardwareId(input)
 
         // Assert
         assertEquals("ABC123", result)
@@ -106,7 +106,7 @@ class HemoCubeFragmentTest {
         val input = "Some text without SN"
 
         // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
+        val result = trueHemeTestFragment.extractV1HardwareId(input)
 
         // Assert
         assertNull(result)
@@ -118,7 +118,7 @@ class HemoCubeFragmentTest {
         val input = ""
 
         // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
+        val result = trueHemeTestFragment.extractV1HardwareId(input)
 
         // Assert
         assertNull(result)
@@ -130,7 +130,7 @@ class HemoCubeFragmentTest {
         val input: String? = null
 
         // Act
-        val result = input?.let { hemoCubeFragment.extractV1HardwareId(it) }
+        val result = input?.let { trueHemeTestFragment.extractV1HardwareId(it) }
 
         // Assert
         assertNull(result)
@@ -158,7 +158,7 @@ class HemoCubeFragmentTest {
         """.trimIndent()
 
         // Act
-        val result = hemoCubeFragment.extractV1HardwareId(input)
+        val result = trueHemeTestFragment.extractV1HardwareId(input)
 
         // Assert
         assertEquals("HCV-000-3001", result)
@@ -170,7 +170,7 @@ class HemoCubeFragmentTest {
         val input = "SNS ABC123 SNE"
 
         // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)
 
         // Assert
         assertEquals("ABC123", result)
@@ -182,7 +182,7 @@ class HemoCubeFragmentTest {
         val input = "No hardware ID in this input"
 
         // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)
 
         // Assert
         assertNull(result)
@@ -194,7 +194,7 @@ class HemoCubeFragmentTest {
         val input = "SNS   XYZ789    SNE"
 
         // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)
 
         // Assert
         assertEquals("XYZ789", result)
@@ -218,7 +218,7 @@ class HemoCubeFragmentTest {
                 "REND\n"
 
         // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)
 
         // Assert
         assertEquals("HCV-000-3013", result)
@@ -241,7 +241,7 @@ class HemoCubeFragmentTest {
                 "REND\n"
 
         // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)
 
         // Assert
         assertEquals("HPP1-4001", result)
@@ -264,7 +264,7 @@ class HemoCubeFragmentTest {
                 "REND\n"
 
         // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)
 
         // Assert
         assertEquals("HPP1-000-4001", result)
@@ -287,7 +287,7 @@ class HemoCubeFragmentTest {
                 "REND\n"
 
         // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)
 
         // Assert
         assertEquals("HPP-000-4001", result)
@@ -310,7 +310,7 @@ class HemoCubeFragmentTest {
                 "REND\n"
 
         // Act
-        val result = hemoCubeFragment.extractV2HardwareId(input)
+        val result = trueHemeTestFragment.extractV2HardwareId(input)
 
         // Assert
         assertEquals("HPP-000-5001", result)
@@ -318,111 +318,123 @@ class HemoCubeFragmentTest {
 
     @Test
     fun testDeviceRatioClassificationNormalWithStartRange() {
-        val ratio = 0.16
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val ratio = 0.08
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
         assertEquals("Normal", result)
     }
 
     @Test
     fun testDeviceRatioClassificationNormal() {
         val ratio = 0.22
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
         assertEquals("Normal", result)
     }
 
     @Test
     fun testDeviceRatioClassificationNegativeBorderline() {
         val ratio = 0.235
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
+        assertEquals("Negative Borderline", result)
+    }
+    @Test
+    fun testDeviceRatioClassificationNegativeBorderlineUpperBound() {
+        val ratio = 0.265
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
         assertEquals("Negative Borderline", result)
     }
 
     @Test
     fun testDeviceRatioClassificationSickleCellTraitLowerBound() {
-        val ratio = 0.251
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
-        assertEquals("Negative Borderline", result)
+        val ratio = 0.271
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
+        assertEquals("Sickle Cell Trait", result)
     }
 
     @Test
     fun testDeviceRatioClassificationSickleCellTraitUpperBound() {
         val ratio = 0.309
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
         assertEquals("Sickle Cell Trait", result)
     }
 
     @Test
     fun testDeviceRatioClassificationPositiveForSickleCell() {
+        val ratio = 0.312
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
+        assertEquals("Positive for Sickle Cell. HPLC for Confirmation", result)
+    }
+    @Test
+    fun testDeviceRatioClassificationPositiveForSickleCellUpperBound() {
         val ratio = 0.39
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
         assertEquals("Positive for Sickle Cell. HPLC for Confirmation", result)
     }
 
     @Test
     fun testDeviceRatioClassificationSickleCellDiseaseLowerBound() {
         val ratio = 0.391
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
         assertEquals("Sickle Cell Disease", result)
     }
 
     @Test
     fun testDeviceRatioClassificationSickleCellDisease() {
-        val ratio = 0.45
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val ratio = 0.691
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
         assertEquals("Sickle Cell Disease", result)
     }
 
     @Test
     fun testDeviceRatioClassificationInvalid() {
         val ratio: Double? = null
-        val result = hemoCubeFragment.deviceRatioClassification(ratio)
+        val result = trueHemeTestFragment.deviceRatioClassification("10mm",ratio)
         assertEquals("Invalid", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineNormal() {
         val result =
-            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.5)
+            trueHemeTestFragment.findResultWithAdditionalMethods("10mm",0.5, "Negative Borderline", 2.5)
         assertEquals("Normal", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellTrait1() {
         val result =
-            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.2)
-        assertEquals("Negative borderline. Confirm with HPLC", result)
+            trueHemeTestFragment.findResultWithAdditionalMethods("10mm",0.5, "Negative Borderline", 2.2)
+        assertEquals("Normal", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellTrait2() {
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(
-            0.5,
+        val result = trueHemeTestFragment.findResultWithAdditionalMethods(
+            "10mm",0.5,
             "Positive for Sickle Cell. HPLC for Confirmation",
             1.4
         )
-        assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
+        assertEquals("Sickle Cell Trait", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellDisease() {
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(
-            0.5,
+        val result = trueHemeTestFragment.findResultWithAdditionalMethods(
+            "10mm",0.5,
             "Positive for Sickle Cell. HPLC for Confirmation",
             1.33
         )
-        assertEquals("Positive for Sickle Cell. Confirm with HPLC", result)
+        assertEquals("Sickle Cell Trait", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_NormalDeviceRatio_ReturnsNormalBelowSlopeRatioThreshold() {
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 30.0)
+        val result = trueHemeTestFragment.findResultWithAdditionalMethods("10mm",0.5, "Normal", 30.0)
         assertEquals("Normal", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_NBL_ReturnsNBL() {
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(
-            0.5,
+        val result = trueHemeTestFragment.findResultWithAdditionalMethods(
+            "10mm",0.5,
             "Negative Borderline, Repeat Test",
             70.0
         )
@@ -432,14 +444,14 @@ class HemoCubeFragmentTest {
     @Test
     fun findResultWithAdditionalMethods_SCT_ReturnsSCT() {
         val result =
-            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Trait", 70.0)
+            trueHemeTestFragment.findResultWithAdditionalMethods("10mm",0.5, "Sickle Cell Trait", 70.0)
         assertEquals("Sickle Cell Trait", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_PBL_ReturnsPBL() {
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(
-            0.5,
+        val result = trueHemeTestFragment.findResultWithAdditionalMethods(
+            "10mm",0.5,
             "Positive for Sickle Cell. HPLC for Confirmation",
             1.67
         )
@@ -449,7 +461,7 @@ class HemoCubeFragmentTest {
     @Test
     fun findResultWithAdditionalMethods_SCD_ReturnsSCD() {
         val result =
-            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Disease", 70.0)
+            trueHemeTestFragment.findResultWithAdditionalMethods("10mm",0.5, "Sickle Cell Disease", 70.0)
         assertEquals("Sickle Cell Disease", result)
     }
 
@@ -461,7 +473,7 @@ class HemoCubeFragmentTest {
         val led2Average = 0.2
 
         // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+        val result = trueHemeTestFragment.reclassifyWithBorderlineMethod2(
             deviceRatio,
             deviceRatioClass,
             led2Average
@@ -479,7 +491,7 @@ class HemoCubeFragmentTest {
         val led2Average = 0.14
 
         // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+        val result = trueHemeTestFragment.reclassifyWithBorderlineMethod2(
             deviceRatio,
             deviceRatioClass,
             led2Average
@@ -497,7 +509,7 @@ class HemoCubeFragmentTest {
         val led2Average = 0.18
 
         // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+        val result = trueHemeTestFragment.reclassifyWithBorderlineMethod2(
             deviceRatio,
             deviceRatioClass,
             led2Average
@@ -515,7 +527,7 @@ class HemoCubeFragmentTest {
         val led2Average = 0.195
 
         // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+        val result = trueHemeTestFragment.reclassifyWithBorderlineMethod2(
             deviceRatio,
             deviceRatioClass,
             led2Average
@@ -533,7 +545,7 @@ class HemoCubeFragmentTest {
         val led2Average = 0.189
 
         // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+        val result = trueHemeTestFragment.reclassifyWithBorderlineMethod2(
             deviceRatio,
             deviceRatioClass,
             led2Average

build.gradle

@@ -25,4 +25,3 @@ plugins {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-