Changes

.idea/misc.xml

@@ -0,0 +1,42 @@
+<project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/ic_baseline_auto_graph_24.xml" value="0.1555" />
+        <entry key="app/src/main/res/drawable/ic_baseline_cancel_24.xml" value="0.1965" />
+        <entry key="app/src/main/res/drawable/ic_baseline_check_circle_24.xml" value="0.243" />
+        <entry key="app/src/main/res/drawable/ic_baseline_dot_24.xml" value="0.1785" />
+        <entry key="app/src/main/res/drawable/ic_baseline_file_download_24.xml" value="0.243" />
+        <entry key="app/src/main/res/drawable/ic_baseline_home_24.xml" value="0.243" />
+        <entry key="app/src/main/res/drawable/ic_baseline_new_label_24.xml" value="0.243" />
+        <entry key="app/src/main/res/drawable/ic_baseline_usb_24.xml" value="0.157" />
+        <entry key="app/src/main/res/drawable/ic_baseline_usb_off_24.xml" value="0.157" />
+        <entry key="app/src/main/res/drawable/progressbar_drawable.xml" value="0.1885" />
+        <entry key="app/src/main/res/drawable/result_background_green.xml" value="0.243" />
+        <entry key="app/src/main/res/drawable/result_background_red.xml" value="0.1785" />
+        <entry key="app/src/main/res/drawable/result_background_tellow.xml" value="0.1785" />
+        <entry key="app/src/main/res/font/inter_bold.xml" value="0.33487179487179486" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.165" />
+        <entry key="app/src/main/res/layout/activity_splash.xml" value="0.24375" />
+        <entry key="app/src/main/res/layout/activity_test_right.xml" value="0.24375" />
+        <entry key="app/src/main/res/layout/fragment_graph.xml" value="0.19791666666666666" />
+        <entry key="app/src/main/res/layout/fragment_test_right_exp_reference.xml" value="0.25" />
+        <entry key="app/src/main/res/layout/fragment_test_right_exp_sample.xml" value="0.24583333333333332" />
+        <entry key="app/src/main/res/layout/fragment_test_right_exp_scanner.xml" value="0.24583333333333332" />
+        <entry key="app/src/main/res/layout/fragment_test_right_process.xml" value="0.24375" />
+        <entry key="app/src/main/res/layout/fragment_test_right_results.xml" value="0.30512820512820515" />
+        <entry key="app/src/main/res/layout/table_item.xml" value="0.22407407407407406" />
+        <entry key="app/src/main/res/menu/menu.xml" value="0.25" />
+        <entry key="app/src/main/res/menu/my_menu.xml" value="0.25" />
+        <entry key="app/src/main/res/mipmap-anydpi-v26/hpos_icon.xml" value="0.1505" />
+        <entry key="app/src/main/res/mipmap-anydpi-v26/hpos_icon_round.xml" value="0.1505" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

app/.gitignore

@@ -1,3 +1,3 @@
 /build
-/google-services*
+/google-services.json
 /idea

app/build.gradle

@@ -14,13 +14,12 @@ android {
     compileSdk 34
     namespace 'in.sminnovations.hpostesting'
 
-    // prod - production, preprod - preproduction, quality - qc,
     defaultConfig {
         applicationId "in.sminnovations.hpostesting"
         minSdk 21
         targetSdk 34
-        versionCode 44
-        versionName "2.1.44"
+        versionCode 2
+        versionName "2.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -43,64 +42,45 @@ android {
     }
     buildFeatures {
         viewBinding true
-        buildConfig = true
     }
     lint {
         abortOnError false
         checkReleaseBuilds false
     }
-    packagingOptions {
-        exclude 'mockito-extensions/org.mockito.plugins.MockMaker'
-    }
 }
 
 dependencies {
-    implementation "com.google.dagger:hilt-android:2.46"
-    kapt "com.google.dagger:hilt-android-compiler:2.46"
 
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
-    implementation 'androidx.fragment:fragment-ktx:1.6.2'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
 
     //firebase
     implementation platform('com.google.firebase:firebase-bom:32.1.0')
-    implementation("com.google.firebase:firebase-perf-ktx")
     implementation("com.google.firebase:firebase-crashlytics-ktx")
     implementation("com.google.firebase:firebase-analytics-ktx")
     implementation 'com.google.firebase:firebase-firestore-ktx'
     implementation 'com.google.firebase:firebase-auth-ktx'
     implementation 'com.google.firebase:firebase-storage-ktx'
     implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
-    implementation 'com.google.android.gms:play-services-auth:20.7.0'
+    implementation 'com.google.android.gms:play-services-auth:20.6.0'
     implementation 'com.google.android.gms:play-services-location:21.0.1'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
     implementation 'com.google.android.things:androidthings:1.0'
-    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta11'
-    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta11")
-    implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'androidx.preference:preference-ktx:1.2.1'
-
 
     // Testing
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    // Mockito dependencies
-    testImplementation 'org.mockito:mockito-core:3.12.4'
-    androidTestImplementation 'org.mockito:mockito-android:3.12.4'
-    androidTestImplementation 'org.mockito:mockito-inline:3.12.4'
-    testImplementation "androidx.arch.core:core-testing:2.2.0"
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
 
 
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
     implementation 'com.opencsv:opencsv:4.6'
     implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
 
-    implementation "androidx.fragment:fragment-ktx:1.6.2"
+    implementation "androidx.fragment:fragment-ktx:1.6.1"
 
     // CSV read, write
     implementation 'com.opencsv:opencsv:4.6'
@@ -112,22 +92,22 @@ dependencies {
     implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
 
     //Room
-    implementation "androidx.room:room-ktx:2.6.0"
-    implementation "androidx.room:room-runtime:2.6.0"
-    kapt ("androidx.room:room-compiler:2.6.0")
+    implementation "androidx.room:room-ktx:2.6.0-alpha03"
+    implementation "androidx.room:room-runtime:2.6.0-alpha03"
+    kapt ("androidx.room:room-compiler:2.6.0-alpha03")
 
     //image
     implementation 'com.github.bumptech.glide:glide:4.13.2'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
 
     // Navigation Component
-    implementation "androidx.navigation:navigation-fragment-ktx:2.7.5"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.5"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.0"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.0"
 
     //Dagger - Hilt
     implementation "com.google.dagger:hilt-android:2.46"
     kapt "com.google.dagger:hilt-android-compiler:2.46"
-    kapt "androidx.hilt:hilt-compiler:1.1.0"
+    kapt "androidx.hilt:hilt-compiler:1.0.0"
 
     // Retrofit + GSON
     implementation "com.squareup.retrofit2:retrofit:2.9.0"

app/release/output-metadata.json

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

app/src/main/AndroidManifest.xml

@@ -5,9 +5,6 @@
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission
-        android:name="android.permission.BATTERY_STATS"
-        tools:ignore="ProtectedPermissions" />
 
     <uses-feature android:name="android.hardware.camera" />
 
@@ -16,11 +13,8 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
     <uses-feature android:name="android.hardware.usb.host" />
-
     <uses-permission android:name="android.permission.USB_PERMISSION" />
-
     <application
         android:name="com.example.hpostesting.HPOSTestingApplication"
         android:allowBackup="true"
@@ -33,20 +27,14 @@
         android:theme="@style/Theme.HPOSTesting"
         tools:targetApi="31">
         <activity
-            android:name="com.example.hpostesting.presentation.hemocube.DigitalCardActivity"
-            android:exported="false" />
-        <activity
-            android:name="com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity"
-            android:exported="false" />
-        <activity
-            android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
+            android:name="com.example.hpostesting.presentation.hemocube.HemoCubeActivity"
             android:exported="false"
             android:noHistory="true"
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
             android:theme="@style/Theme.HPOS.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name="com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity"
+            android:name="com.example.hpostesting.presentation.hemocube.hb.HBHemoCubeActivity"
             android:exported="false"
             android:noHistory="true"
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
@@ -61,8 +49,7 @@
             android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
             android:exported="false"
             android:label="@string/title_activity_dashboard"
-            android:theme="@style/Theme.HPOS.NoActionBar"
-            tools:ignore="MissingClass" />
+            android:theme="@style/Theme.HPOS.NoActionBar" />
 
         <service
             android:name="com.example.hpostesting.presentation.testRight.UsbService"

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

@@ -5,8 +5,6 @@ import android.content.Context
 import androidx.room.Room
 import com.example.hpostesting.data.dao.MyDatabase
 import com.google.android.datatransport.runtime.dagger.Provides
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.FirebaseFirestoreSettings
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -17,14 +15,5 @@ import javax.inject.Singleton
 class HPOSTestingApplication: Application() {
     val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
-    override fun onCreate() {
-        super.onCreate()
-        val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-        val firestoreSettings = FirebaseFirestoreSettings.Builder()
-            .setPersistenceEnabled(true) // Enable offline persistence if needed
-            .build()
 
-        val firestore = FirebaseFirestore.getInstance()
-        firestore.firestoreSettings = firestoreSettings
-    }
 }

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

@@ -1,6 +1,7 @@
 package com.example.hpostesting.data
 
 import androidx.lifecycle.MutableLiveData
+import com.example.hpostesting.data.model.patient.HBHemoCubeTestData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestRightDeviceConstants
@@ -23,8 +24,8 @@ object DataHolder {
     val intensityReferenceArray = ArrayList<Double>()
     var selectedTest: UserData? = null
     var hemoCubeTestData: HemoCubeTestData? = null
+    var HbHemoCubeTestData: HBHemoCubeTestData? = null
     var kitSerial: String = ""
     var location: UserData.Location? = null
     var testExp: Boolean = true
-    var hemocubeResult: Double? = null
 }

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

@@ -47,22 +47,6 @@ object Constants {
         "HC-V1-004",
         "HC-V1-005",
         "HC-V1-006",
-        "HC-V1-007",
-        "HC-V1-008",
-        "HC-V1-009",
-        "HC-V1-010",
-        "HC-V1-011",
-        "HC-V1-012",
-        "HC-V1-013",
-        "HC-V1-014",
-        "HC-V1-015",
-        "HC-V1-016",
-        "HC-V1-017",
-        "HC-V1-018",
-        "HC-V1-019",
-        "HC-V1-020",
-        "HCV-000-3001",
-        "HCV-000-3002",
     )
 
     const val password = "SMI@12345"
@@ -71,52 +55,7 @@ object Constants {
     const val KIT_COUNT = "KitCount"
     const val BUFFER_VALUE_1 = "BufferValue1"
     const val BUFFER_VALUE_2 = "BufferValue2"
-    const val BUFFER_VALUE_3 = "BufferValue3"
-    const val BUFFER_VALUE_4 = "BufferValue4"
-    const val DEVICE_ID = "DEVICE_ID"
-
-    const val BUFFER_LED_LOWER_BOUND = 21000
-    const val BUFFER_LED_UPPER_BOUND = 24500
-
-    val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
-        "HCV-000-3001" to listOf(
-            listOf(1.313, -0.89),           // LED1, 435nm
-            listOf(0.581462456, -0.58502),  // LED2, 415nm
-            listOf(0.2012, 0.0092),         // LED3, 555nm
-            listOf(1.0, 0.0)                // LED4
-        ),
-        "HCV-000-3002" to listOf(
-            listOf(0.723142, -0.09135),         // LED1, 435nm
-            listOf(0.581462456, -0.58502),      // LED2, 415nm
-            listOf(0.1964, 0.011565),           // LED3, 555nm
-            listOf(1.0, 0.0)                    // LED4
-        ),
-    )
-
-    const val INCUBATION_TIME_MIN = 0
-    const val INCUBATION_TIME_MAX = 1400
-
-    val BUFFER_INTENSITY_THRESHOLDS: Map<String, List<List<Int>>> = mapOf<String, List<List<Int>>>(
-        "HCV-000-3001" to listOf(
-            listOf(20000, 25074),
-            listOf(20000, 24596),
-            listOf(20000, 26065),
-            listOf(20000, 27093),
-        ),
-        "HCV-000-3002" to listOf(
-            listOf(24500, 26250),
-            listOf(24500, 26250),
-            listOf(24500, 26250),
-            listOf(24500, 26250),
-        )
-    )
-
-
-    val COEFFICIENTS: Map<String, List<List<Double>>> = mapOf(
-        "HC-V1-005" to listOf(
-            listOf(1.5,0.0),
-            listOf(0.0,0.0)
-        )
-    )
 
+    const val HB_BUFFER_VALUE_1 = "HBBufferValue1"
+    const val HB_KIT_NUMBER = "HBKitNumber"
 }

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

@@ -2,8 +2,7 @@ package com.example.hpostesting.data.constant
 
 enum class HemoCubeCommands(val command: String) {
     startBuffer("B\r"),
-    runDiagnostics("D\r"),
+    getBuffer("Q\r"),
     startSample("S\r"),
-    getSample("P\r"),
-    getDeviceId("I\r"),
+    getSample("R\r"),
 }

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

@@ -0,0 +1,24 @@
+package com.example.hpostesting.data.dao
+
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.example.hpostesting.data.model.patient.HBHemoCubeTestData
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.UserData
+@Dao
+interface HBHemoCubeDao {
+    @Query("SELECT * from HBHemoCubeTest_table")
+    fun getAll(): LiveData<List<HBHemoCubeTestData>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAll(hbHemoCubeTestData: HBHemoCubeTestData)
+
+    @Query("SELECT * FROM HBHemoCubeTest_table WHERE _id = :id")
+    suspend fun getUserByID(id: String): HBHemoCubeTestData
+
+    @Query("DELETE FROM HBHemoCubeTest_table WHERE _id = :id")
+    suspend fun deleteById(id: String)
+}

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

@@ -9,18 +9,15 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 @Dao
 interface HemoCubeDao {
-    @Query("SELECT * from hemo_cube_test_table")
+    @Query("SELECT * from HemocubeTest_table")
     fun getAll(): LiveData<List<HemoCubeTestData>>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(hemoCubeTestData: HemoCubeTestData)
 
-    @Query("SELECT * FROM hemo_cube_test_table WHERE _id = :id")
+    @Query("SELECT * FROM hemocubetest_table WHERE _id = :id")
     suspend fun getUserByID(id: String): HemoCubeTestData
 
-    @Query("DELETE FROM hemo_cube_test_table WHERE _id = :id")
+    @Query("DELETE FROM hemocubetest_table WHERE _id = :id")
     suspend fun deleteById(id: String)
-
-    @Query("UPDATE hemo_cube_test_table SET localFlag = :newValue WHERE _id = :id")
-    suspend fun updateFieldById(id: String, newValue: Boolean)
 }

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

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

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

@@ -1,9 +0,0 @@
-package com.example.hpostesting.data.model.diagnostics
-
-data class DiagnosticsData (
-    var deviceId: String = "",
-    var appVersion: String? = "",
-    var deviceType: String = "HEMOCUBE",
-    var deviceData: String = "",
-    var runTime: String = ""
-)

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

@@ -1,21 +0,0 @@
-package com.example.hpostesting.data.model.patient
-
-data class BufferCheckData(
-    var kitno: String = "",
-    var deviceId: String? = "",
-    var appVersion:String? = "",
-    var deviceSerialNumber: String = "",
-    var deviceType: String = "HEMOCUBE",
-    var resultData: String = "",
-    var led1Buffer: Double? = null,
-    var led2Buffer: Double? = null,
-    var led1Sample: Double? = null,
-    var led2Sample: Double? = null,
-    var led1Average: Double? = null,
-    var led2Average: Double? = null,
-    var deviceRatio: Double? = null,
-    var calculatedRatio: Double? = null,
-    var coefficients: String? = "",
-    var classificationResult: String = "",
-    var testTime: String = ""
-)

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

@@ -14,6 +14,8 @@ data class DeviceData(
     var deviceType: String = "",
     @get:PropertyName("coefficients") @set:PropertyName("coefficients")
     var coefficients: List<Double> = emptyList(),
+    @get:PropertyName("hbCoefficients") @set:PropertyName("hbCoefficients")
+    var hbCoefficients: List<Double> = emptyList(),
     @get:PropertyName("calibratedAt") @set:PropertyName("calibratedAt")
     var calibratedAt: String = ""
 )

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

@@ -0,0 +1,28 @@
+package com.example.hpostesting.data.model.patient
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "HBHemoCubeTest_table")
+data class HBHemoCubeTestData(
+    @PrimaryKey
+    var _id: String = "",
+    var name: String = "",
+    var birthYear: String = "",
+    var userImageURL: String = "",
+    var location: UserData.Location? = null,
+    var reportUploadTime: String? = "",
+    var testType: String? = "HB EST",
+    var testTime: String? = "",
+    var testStatus: Boolean? = false,
+    var localFlag: Boolean = false,
+    var deviceId: String? = "",
+    var deviceSerialNumber: String = "",
+    var deviceType: String = "HEMOCUBE",
+    var kitSerial: String = "",
+    var resultData: String = "",
+    var led1Buffer: Double? = null,
+    var led1Sample: Double? = null,
+    var led1Average: Double? = null,
+    var hbEstimation: Double? = null
+)

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

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

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

@@ -9,12 +9,8 @@ data class UserData(
     @PrimaryKey
     var _id: String = "",
     var name: String = "",
-    var incubationTime: String = "",
     var birthYear: String = "",
-    var abhaId: String = "",
-    var bloodGroup: String = "",
     var userImageURL: String = "",
-    var gender: String ="",
     var location: Location? = null,
     var createdBy: String? = "",
     var reportUploadTime: String? = "",
@@ -22,14 +18,12 @@ data class UserData(
     var testStatus: Boolean? = false,
     var mobileId: String = "",
     var deviceId: String = "",
-    var state: String = "",
     var deviceSerialNumber: String = "",
     var kitSerial: String = "",
     var csvPath: String = "",
     var reportPath: String = "",
     var result: TestRightResultType? = null,
-    var resultRatio: Double? = null,
-    var prdClassification: String = ""
+    var resultRatio: Double? = null
 ) {
     enum class Gender {
         MALE,
@@ -49,11 +43,14 @@ fun UserData.toHemoCubeTestData() = HemoCubeTestData(
     birthYear = birthYear,
     userImageURL = userImageURL,
     testStatus = testStatus,
-    location = location,
-    gender = gender,
-    state = state,
-    abhaId = abhaId,
-    bloodGroup = bloodGroup,
-    prdClassification = prdClassification,
-    testTime = testTime
+    location = location
+)
+
+fun UserData.toHBHemoCubeTestData() = HBHemoCubeTestData(
+    _id = _id,
+    name = name,
+    birthYear = birthYear,
+    userImageURL = userImageURL,
+    testStatus = testStatus,
+    location = location
 )

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

@@ -2,5 +2,6 @@ package com.example.hpostesting.data.model.test
 
 enum class TestType {
     SICKLECERT,
-    SICKLEFIND
+    SICKLEFIND,
+    HB
 }

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

@@ -3,97 +3,82 @@ package com.example.hpostesting.data.repository
 import android.net.Uri
 import com.example.hpostesting.data.model.PendingUploads
 import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
+import com.example.hpostesting.data.model.patient.HBHemoCubeTestData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
-import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.ktx.storage
 import kotlinx.coroutines.tasks.await
 import java.io.File
-import javax.inject.Inject
 
-class DatabaseRepository @Inject constructor() : Repository {
+class DatabaseRepository : Repository {
 
     private val db: FirebaseFirestore = Firebase.firestore
     private val storage = Firebase.storage
 
-    override suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
+    suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
         return try {
-            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+            val userdata =
+                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
             if (userdata.documents.isNotEmpty()) {
                 userdata.documents.forEach {
                     db.collection("patientData").document(it.id).update("testStatus", true)
                 }
             }
-            db.collection("testData").add(data!!).await()
-            Response.Success(data!!._id)
+            db.collection("testData").add(data).await()
+            Response.Success(data._id)
         } catch (e: Exception) {
             Response.Error(e)
         }
     }
 
-    override suspend fun addTestToDatabase(data: UserData?): Response<String> {
+    suspend fun addTestToDatabase(data: HBHemoCubeTestData?): Response<String> {
         return try {
-            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+            val userdata =
+                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
             if (userdata.documents.isNotEmpty()) {
                 userdata.documents.forEach {
                     db.collection("patientData").document(it.id).update("testStatus", true)
                 }
             }
-            db.collection("testData").add(data!!).await()
-            Response.Success(data!!._id)
+            db.collection("testData").add(data).await()
+            Response.Success(data._id)
         } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
             Response.Error(e)
         }
     }
 
-    override suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String> {
+
+    suspend fun addTestToDatabase(data: UserData?): Response<String> {
         return try {
-            db.collection("buffers").add(data!!).await()
-            Response.Success(data!!.kitno)
+            val userdata =
+                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+            if (userdata.documents.isNotEmpty()) {
+                userdata.documents.forEach {
+                    db.collection("patientData").document(it.id).update("testStatus", true)
+                }
+            }
+            db.collection("testData").add(data).await()
+            Response.Success(data._id)
         } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
             Response.Error(e)
         }
     }
 
-    override suspend fun addDiagnostics(data: DiagnosticsData?): Response<String> {
+
+    suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean> {
         return try {
-            db.collection("diagnostics").add(data!!).await()
-            Response.Success(data!!.deviceId)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
-    override suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean> {
-        try {
 
             val file = Uri.fromFile(File(filePath))
             val riversRef = storage.reference.child("$patientID/${file.lastPathSegment}")
             riversRef.putFile(file).await()
-            return Response.Success(true)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            return Response.Error(e)
-        }
-    }
-
-    suspend fun addToPendingQueue(pendingUploads: PendingUploads): Response<Boolean> {
-        return try {
-            db.collection("pendingUploads").document(pendingUploads.pendingId).set(pendingUploads)
-                .await()
-
             Response.Success(true)
+
         } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
+            e.printStackTrace()
             Response.Error(e)
         }
     }
@@ -112,7 +97,7 @@ class DatabaseRepository @Inject constructor() : Repository {
             pendingList
 
         } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
+            e.printStackTrace()
             pendingList
         }
     }
@@ -123,7 +108,7 @@ class DatabaseRepository @Inject constructor() : Repository {
 
             Response.Success(true)
         } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
+            e.printStackTrace()
             Response.Error(e)
         }
     }
@@ -132,11 +117,14 @@ class DatabaseRepository @Inject constructor() : Repository {
         return db.collection("devices").get().await().toObjects(DeviceData::class.java)
     }
 
-    override suspend fun getDeviceDataById(deviceId: String): DeviceData? {
+
+    suspend fun getDeviceDataById(deviceId: String): DeviceData? {
         val querySnapshot = db.collection("devices").get().await()
         val allDeviceDataList = querySnapshot.toObjects(DeviceData::class.java)
 
         // Find the DeviceData object with the specified deviceId
         return allDeviceDataList.find { it.deviceId == deviceId }
     }
+
+
 }

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

@@ -1,22 +1,5 @@
 package com.example.hpostesting.data.repository
 
-import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.BufferCheckData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.data.model.patient.UserData
-
 interface Repository {
-    suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String>
-
-    suspend fun addTestToDatabase(data: UserData?): Response<String>
-
-    suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String>
-
-    suspend fun addDiagnostics(data: DiagnosticsData?): Response<String>
-
-    suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean>
-
-    suspend fun getDeviceDataById(deviceId: String): DeviceData?
+//    suspend fun addToDatabase(data: PatientDetails)
 }

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

@@ -3,13 +3,13 @@ package com.example.hpostesting.domain.di
 import android.app.Application
 import android.content.Context
 import androidx.room.Room
+import com.example.hpostesting.data.dao.HBHemoCubeDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
 import com.example.hpostesting.data.dao.UserDao
 import com.example.hpostesting.data.datasource.LocalFileDataSource
 import com.example.hpostesting.data.repository.DatabaseRepository
 import com.example.hpostesting.data.repository.LocalFileRepository
-import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
 import dagger.Module
@@ -45,6 +45,12 @@ object AppModule {
         return myDatabase.hemoCubeDao()
     }
 
+    @Provides
+    @Singleton
+    fun provideMyHBHemo(myDatabase: MyDatabase): HBHemoCubeDao {
+        return myDatabase.hbHemoCubeDao()
+    }
+
     @Provides
     @Singleton
     fun provideContext(application: Application): Context {
@@ -70,10 +76,4 @@ object AppModule {
     fun provideDatabaseRepository(): DatabaseRepository {
         return DatabaseRepository()
     }
-
-    @Provides
-    @Singleton
-    fun provideRepository(): Repository {
-        return DatabaseRepository()
-    }
 }

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

@@ -1,21 +1,18 @@
 package com.example.hpostesting.presentation
 
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.util.Log
-import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
-
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.hemocube.HemoCubeActivity
+import com.example.hpostesting.presentation.hemocube.hb.HBHemoCubeActivity
 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
@@ -29,11 +26,13 @@ class KitScanActivity : AppCompatActivity() {
 
     private lateinit var sharedPreference: SharedPreferences
 
+    private var hbTest = ""
+
     private val barcodeLauncher = registerForActivityResult(
         ScanContract()
     ) { result: ScanIntentResult ->
         if (result.contents.isNullOrEmpty()) {
-            Toast.makeText(this, R.string.cancelled_unable_scan, Toast.LENGTH_LONG).show()
+            Toast.makeText(this, "Cancelled: Unable to scan, Try Again!!", Toast.LENGTH_LONG).show()
         } else {
             Log.d(TAG, result.contents)
             processScannedData(result.contents)
@@ -51,53 +50,40 @@ class KitScanActivity : AppCompatActivity() {
         sharedPreference = this.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         setContentView(binding.root)
 
+        hbTest = intent.getStringExtra("Test").toString()
+
+        if (hbTest.isNotEmpty()) {
+            if (checkHBHemoCubeKitData()) {
+                val i = Intent(applicationContext, HBHemoCubeActivity::class.java)
+                startActivity(i)
+                finish()
+            } else {
+                with(sharedPreference.edit()) {
+                    putString(Constants.HB_KIT_NUMBER, "")
+                    apply()
+                }
+            }
+        }
+
         if (DataHolder.sampleReadCounter <= Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE && DataHolder.isReferenceTaken) {
             DataHolder.selectedTest!!.kitSerial = DataHolder.kitSerial
             moveToNext()
         }
 
-//        if (checkHemoCubeKitData()) {
-//            DataHolder.selectedTest!!.kitSerial =
-//                sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-//            moveToNext()
-//        } else {
-//            with(sharedPreference.edit()) {
-//                putString(Constants.KIT_NUMBER, "")
-//                putInt(Constants.KIT_COUNT, 0)
-//                putString(Constants.BUFFER_VALUE_1, "")
-//                putString(Constants.BUFFER_VALUE_2, "")
-//                apply()
-//            }
-//        }
-
-
-        try {
-            if (checkHemoCubeKitData()) {
-                DataHolder.selectedTest!!.kitSerial =
-                    sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-                moveToNext()
-            } else {
-                // Handle the case when checkHemoCubeKitData() returns false
-                with(sharedPreference.edit()) {
-                    putString(Constants.KIT_NUMBER, "")
-                    putInt(Constants.KIT_COUNT, 0)
-                    putString(Constants.BUFFER_VALUE_1, "")
-                    putString(Constants.BUFFER_VALUE_2, "")
-                    apply()
-                }
+        if (checkHemoCubeKitData()) {
+            DataHolder.selectedTest!!.kitSerial =
+                sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
+            moveToNext()
+        } else {
+            with(sharedPreference.edit()) {
+                putString(Constants.KIT_NUMBER, "")
+                putInt(Constants.KIT_COUNT, 0)
+                putString(Constants.BUFFER_VALUE_1, "")
+                putString(Constants.BUFFER_VALUE_2, "")
+                apply()
             }
-        } catch (e: NullPointerException) {
-            // Handle the NullPointerException here
-            e.printStackTrace() // You can log the exception for debugging
-            FirebaseCrashlytics.getInstance().recordException(e)
-            val errorMessage = "An error occurred: ${e.message}"
-            val rootView = findViewById<View>(android.R.id.content)
-            Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
-            // Optionally, show a user-friendly error message to the user
-            // Toast.makeText(applicationContext, "An error occurred", Toast.LENGTH_SHORT).show()
         }
 
-
         binding.nameEditText.setText("SMI/SC/")
 
         setSupportActionBar(binding.toolbar)
@@ -109,42 +95,7 @@ class KitScanActivity : AppCompatActivity() {
 
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
-            if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
-                if (DataHolder.selectedTest == null) {
-                    with(sharedPreference.edit()) {
-                        putString(
-                            Constants.KIT_NUMBER, binding.nameEditText.text.toString()
-                        )
-                        putInt(Constants.KIT_COUNT, 1)
-                        apply()
-                    }
-                    Toast.makeText(
-                        applicationContext,
-                        R.string.kit_updated,
-                        Toast.LENGTH_SHORT
-                    ).show()
-
-                    val i = Intent(applicationContext, DashboardActivity::class.java)
-                    startActivity(i)
-                    finish()
-                } else {
-                    DataHolder.kitSerial = binding.nameEditText.text.toString()
-                    DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
-                    with(sharedPreference.edit()) {
-                        putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
-                        putInt(Constants.KIT_COUNT, 1)
-                        apply()
-                    }
-                    moveToNext()
-                }
-            } else {
-                Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
-                return@setOnClickListener
-            }
-            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(
-                    serialNumber
-                )
-            ) {
+            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(serialNumber)) {
                 DataHolder.kitSerial = binding.nameEditText.text.toString()
                 DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
                 with(sharedPreference.edit()) {
@@ -154,16 +105,20 @@ class KitScanActivity : AppCompatActivity() {
                 }
                 moveToNext()
             } else {
-                Toast.makeText(this, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
+                Toast.makeText(this, "Invalid KIT Number", Toast.LENGTH_LONG).show()
             }
         }
     }
 
     private fun checkHemoCubeKitData(): Boolean {
         return sharedPreference.getString(Constants.KIT_NUMBER, "")
-            ?.isNotBlank() == true && sharedPreference.getInt(
-            Constants.KIT_COUNT, 0
-        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < 35
+            ?.isNotBlank() == true && sharedPreference.getInt(Constants.KIT_COUNT, 0) > 0
+                && sharedPreference.getInt(Constants.KIT_COUNT, 0) < 35
+    }
+
+    private fun checkHBHemoCubeKitData(): Boolean {
+        return sharedPreference.getString(Constants.HB_KIT_NUMBER, "")
+            ?.isNotBlank() == true
     }
 
     private fun isSerialValid(s: String): Boolean {
@@ -176,16 +131,28 @@ class KitScanActivity : AppCompatActivity() {
 
     private fun moveToNext() {
 
+        if (hbTest.isNotEmpty()) {
+            with(sharedPreference.edit()) {
+                putString(Constants.HB_KIT_NUMBER, binding.nameEditText.text.toString())
+                apply()
+            }
+            val i = Intent(applicationContext, HBHemoCubeActivity::class.java)
+            startActivity(i)
+            finish()
+        }
+
         DataHolder.deviceType.observe(this) { deviceType ->
             when (deviceType) {
                 Constants.DEVICE_TYPE_HOMOCUBE -> {
-                    val i = Intent(applicationContext, HemocubeActivity::class.java)
+                    val i = Intent(applicationContext, HemoCubeActivity::class.java)
                     startActivity(i)
+                    finish()
                 }
 
                 Constants.DEVICE_TYPE_TEST_RIGHT -> {
                     val i = Intent(applicationContext, TestRightActivity::class.java)
                     startActivity(i)
+                    finish()
                 }
             }
         }
@@ -210,7 +177,7 @@ class KitScanActivity : AppCompatActivity() {
     private fun checkDataNotNull(): Boolean {
         return if (DataHolder.selectedTest?._id == null) {
             Toast.makeText(
-                applicationContext, R.string.select_patient, Toast.LENGTH_SHORT
+                applicationContext, "Please Select patient before starting test", Toast.LENGTH_SHORT
             ).show()
 
             val i = Intent(applicationContext, DashboardActivity::class.java)

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

@@ -1,6 +1,5 @@
 package com.example.hpostesting.presentation
 
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.Manifest
 import android.content.*
 import android.content.pm.PackageManager
@@ -10,6 +9,8 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
@@ -20,8 +21,6 @@ import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestType
 import com.google.android.gms.location.*
-import com.google.android.material.snackbar.Snackbar
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityMainBinding
@@ -84,10 +83,17 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        if (DataHolder.selectedTest == null) {
-            startActivity(Intent(this, DashboardActivity::class.java))
-            finish()
-        }
+
+//        val crashButton = Button(this)
+//        crashButton.text = "Test Crash"
+//        crashButton.setOnClickListener {
+//            throw RuntimeException("Test Crash") // Force a crash
+//        }
+//
+//        addContentView(crashButton, ViewGroup.LayoutParams(
+//            ViewGroup.LayoutParams.MATCH_PARENT,
+//            ViewGroup.LayoutParams.WRAP_CONTENT))
+
     }
 
     private fun checkAndUpdateUsbConnection() {
@@ -136,7 +142,7 @@ class MainActivity : AppCompatActivity() {
 
             else -> {
                 Log.d(TAG, "Device NOT Connected")
-                Toast.makeText(this, R.string.device_not, Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Device Not Connected", Toast.LENGTH_SHORT).show()
                 DataHolder.usbConnected.value = false
                 null
             }
@@ -153,14 +159,12 @@ class MainActivity : AppCompatActivity() {
             DataHolder.selectedTestType = TestType.SICKLECERT
             val i = Intent(applicationContext, KitScanActivity::class.java)
             startActivity(i)
-            finish()
         }
 
         binding.cvItem2.setOnClickListener {
             DataHolder.selectedTestType = TestType.SICKLEFIND
             val i = Intent(applicationContext, KitScanActivity::class.java)
             startActivity(i)
-            finish()
         }
 
         DataHolder.usbConnected.observe(this) {
@@ -224,52 +228,24 @@ class MainActivity : AppCompatActivity() {
             ) != PackageManager.PERMISSION_GRANTED
         ) {
             // Handle location permission request if needed
-            Toast.makeText(this, R.string.enable_location, Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "Please enable location services", Toast.LENGTH_SHORT).show()
             requestCoarseLocationPermission()
             requestFineLocationPermission()
             return
         }
 
-//        fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
-//            location?.let {
-//                DataHolder.selectedTest!!.location =
-//                    UserData.Location(location.latitude, location.longitude)
-//                DataHolder.location =
-//                    UserData.Location(location.latitude, location.longitude)
-//            } ?: run {
-//                requestLocationUpdates()
-//            }
-//        }.addOnFailureListener { exception: Exception ->
-//            exception.printStackTrace()
-//        }
-
-
         fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
             location?.let {
-                if (DataHolder.selectedTest != null) {
-                    DataHolder.selectedTest!!.location =
-                        UserData.Location(location.latitude, location.longitude)
-                } else {
-                    startActivity(Intent(this, DashboardActivity::class.java))
-                    finish()
-                }
+                DataHolder.selectedTest!!.location =
+                    UserData.Location(location.latitude, location.longitude)
                 DataHolder.location =
                     UserData.Location(location.latitude, location.longitude)
             } ?: run {
                 requestLocationUpdates()
             }
         }.addOnFailureListener { exception: Exception ->
-            // Handle the exception here
             exception.printStackTrace()
-            FirebaseCrashlytics.getInstance().recordException(exception)
-            // Display an error message to the user using a Snackbar
-            val errorMessage = "An error occurred: ${exception.message}"
-            val rootView = findViewById<View>(android.R.id.content)
-            Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
         }
-
-
-
     }
 
     private fun requestLocationUpdates() {
@@ -311,7 +287,7 @@ class MainActivity : AppCompatActivity() {
                     requestFineLocationPermission()
                 } else {
                     // Coarse location permission denied
-                    Toast.makeText(this, R.string.coarse_location_denied, Toast.LENGTH_SHORT)
+                    Toast.makeText(this, "Coarse location permission denied", Toast.LENGTH_SHORT)
                         .show()
                 }
             }
@@ -322,7 +298,7 @@ class MainActivity : AppCompatActivity() {
                     getLocation()
                 } else {
                     // Fine location permission denied
-                    Toast.makeText(this, R.string.location_denied, Toast.LENGTH_SHORT)
+                    Toast.makeText(this, "Fine location permission denied", Toast.LENGTH_SHORT)
                         .show()
                 }
             }

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

@@ -1,6 +1,5 @@
 package com.example.hpostesting.presentation
 
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -14,8 +13,11 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.util.MyUtils
-import `in`.sminnovations.hpostesting.R
+import com.google.firebase.firestore.FirebaseFirestoreSettings
+import com.google.firebase.firestore.ktx.firestore
+import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.ActivitySplashBinding
 
 class SplashActivity : AppCompatActivity() {
@@ -37,7 +39,7 @@ class SplashActivity : AppCompatActivity() {
         binding = ActivitySplashBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-//        setupFirestoreCache()
+        setupFirestoreCache()
         setupStaticConstants()
 
         requestPermissions()
@@ -48,12 +50,12 @@ class SplashActivity : AppCompatActivity() {
             Settings.Secure.getString(applicationContext.contentResolver, Settings.Secure.ANDROID_ID)
     }
 
-//    private fun setupFirestoreCache() {
-//        val settings = FirebaseFirestoreSettings.Builder()
-//            .setCacheSizeBytes(FirebaseFirestoreSettings.CACHE_SIZE_UNLIMITED)
-//            .build()
-//        Firebase.firestore.firestoreSettings = settings
-//    }
+    private fun setupFirestoreCache() {
+        val settings = FirebaseFirestoreSettings.Builder()
+            .setCacheSizeBytes(FirebaseFirestoreSettings.CACHE_SIZE_UNLIMITED)
+            .build()
+        Firebase.firestore.firestoreSettings = settings
+    }
 
     private fun requestPermissions() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
@@ -75,7 +77,7 @@ class SplashActivity : AppCompatActivity() {
                     } else {
                         Toast.makeText(
                             this,
-                            R.string.permission_grant,
+                            "You must grant permission to access all files to use the app",
                             Toast.LENGTH_SHORT
                         ).show()
                         finish()
@@ -137,7 +139,7 @@ class SplashActivity : AppCompatActivity() {
         if (allGranted) {
             moveToLandingPage()
         } else {
-            Toast.makeText(this, R.string.permission_required, Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "All permissions are required to use the app.", Toast.LENGTH_SHORT).show()
             finish()
         }
     }

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

@@ -1,147 +0,0 @@
-package com.example.hpostesting.presentation.adapter
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.res.Resources
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.navigation.findNavController
-import androidx.recyclerview.widget.AsyncListDiffer
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.data.model.patient.UserData
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.OfflineUserListViewBinding
-import org.apache.commons.collections4.MapUtils.getString
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Date
-import java.util.Locale
-
-
-class OfflineUserListAdapter(private val view: View, private val batLevel: Int) :
-    RecyclerView.Adapter<OfflineUserListAdapter.OfflineUserListViewHolder>() {
-
-    inner class OfflineUserListViewHolder(val binding: OfflineUserListViewBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-
-    }
-
-    private val differCallback = object : DiffUtil.ItemCallback<HemoCubeTestData>() {
-        override fun areItemsTheSame(
-            oldItem: HemoCubeTestData, newItem: HemoCubeTestData
-        ): Boolean {
-            return oldItem._id == newItem._id
-        }
-
-        override fun areContentsTheSame(
-            oldItem: HemoCubeTestData, newItem: HemoCubeTestData
-        ): Boolean {
-            return oldItem == newItem
-        }
-    }
-
-    val differ = AsyncListDiffer(this, differCallback)
-    private val context: Context? = null
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OfflineUserListViewHolder {
-        return OfflineUserListViewHolder(
-            OfflineUserListViewBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        )
-    }
-
-    override fun getItemCount(): Int {
-        return differ.currentList.size
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: OfflineUserListViewHolder, position: Int) {
-        val userList = differ.currentList[position]
-        holder.binding.apply {
-            userID.text = "User ID: ${userList._id}"
-            bloodGroup.text = "Blood group: ${userList.bloodGroup}"
-            time.text = "Time: ${isBetween15And30Minutes(userList.incubationTime)} \n Started at: ${
-                SimpleDateFormat("HH:mm:ss").format(
-                    SimpleDateFormat(
-                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                    ).parse(userList.incubationTime)!!
-                )
-            }"
-
-            if (userList.testStatus!!) {
-                teststatus.text = view.context.getString(R.string.test_concluded)
-
-            } else {
-                teststatus.text = view.context.getString(R.string.test_pending)
-            }
-
-            userCard.setOnClickListener {
-                if (batLevel < 40) {
-                    showWarningToast(R.string.low_battery_warning)
-                } else {
-                    if (userList.testStatus != null) {
-                        if (userList.testStatus!!) {
-                            showWarningToast(R.string.test_already_conducted)
-                        } else {
-                            if (userList.incubationTime != "") {
-                                val incubationTimeDiff = isBetween15And30Minutes(userList.incubationTime)
-                                if (incubationTimeDiff < 15) {
-                                    showWarningToast(R.string.incubation_not_completed)
-                                } else if (incubationTimeDiff > 30) {
-                                    showWarningToast(R.string.incubation_crossed_30_minutes)
-                                } else {
-                                    DataHolder.selectedTest = UserData(
-                                        _id = userList._id,
-                                        bloodGroup = userList.bloodGroup,
-                                        incubationTime = userList.incubationTime
-                                    )
-                                    view.findNavController()
-                                        .navigate(R.id.action_nav_home_to_mainActivity)
-                                }
-                            } else {
-                                showWarningToast(R.string.incubation_not_started)
-                            }
-                        }
-                    }
-                }
-            }
-
-        }
-    }
-
-    private fun isBetween15And30Minutes(createdAt: String): Long {
-        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-        val createdAtDate: Date = formatter.parse(createdAt)!!
-
-        val currentTime = Calendar.getInstance().time
-
-        val diffMillis = currentTime.time - createdAtDate.time
-
-        return diffMillis / (60 * 1000)
-    }
-
-
-    private fun showWarningToast(resId: Int) {
-        val contextToUse = view.context ?: return
-
-        val message = try {
-            contextToUse.getString(resId)
-        } catch (e: Resources.NotFoundException) {
-            "Resource not found for ID: $resId"
-        }
-
-        Toast.makeText(
-            contextToUse,
-            message,
-            Toast.LENGTH_SHORT
-        ).show()
-    }
-
-
-
-
-}

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

@@ -1,10 +1,7 @@
 package com.example.hpostesting.presentation.adapter
 
 import android.annotation.SuppressLint
-import android.app.AlertDialog
-import android.content.Context
-import android.content.Context.INPUT_METHOD_SERVICE
-import android.view.inputmethod.InputMethodManager
+import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,30 +11,19 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.model.patient.UserData
+import com.example.hpostesting.data.model.test.TestType
+import com.example.hpostesting.presentation.KitScanActivity
+import com.example.hpostesting.presentation.testRight.TestRightViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.UserItemViewBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Date
-import java.util.Locale
-import android.widget.AutoCompleteTextView
-import androidx.core.content.ContextCompat.getSystemService
-import androidx.core.content.getSystemService
-import androidx.fragment.app.FragmentActivity
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.google.firebase.firestore.FirebaseFirestore
 
 class UserListAdapter(
-
-    private val context: Context,
-    private val hemoCubeViewModel: HemoCubeViewModel,
     options: FirestoreRecyclerOptions<UserData>,
-    private val view: View,
-    private val batLevel: Int,
-    private val requireActivity: FragmentActivity
-) : FirestoreRecyclerAdapter<UserData, UserListAdapter.OrderItemViewHolder>(options) {
+    private val view: View
+) :
+    FirestoreRecyclerAdapter<UserData, UserListAdapter.OrderItemViewHolder>(options) {
 
     class OrderItemViewHolder(val binding: UserItemViewBinding) :
         RecyclerView.ViewHolder(binding.root)
@@ -53,206 +39,30 @@ class UserListAdapter(
         holder.binding.apply {
             userName.text = "Name: ${model.name}"
             userId.text = "User ID:${model._id}"
-            if (model.incubationTime == "") {
-                btnBlood.visibility = View.VISIBLE
-            } else {
-                userId.text =
-                    "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)} \n Started at: ${
-                        SimpleDateFormat("HH:mm:ss").format(
-                            SimpleDateFormat(
-                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                            ).parse(model.incubationTime)!!
-                        )
-                    }"
-                btnBlood.visibility = View.GONE
-            }
-
-
             Glide.with(view).load(model.userImageURL).into(userImage)
             if (model.testStatus!!) {
-                teststatus.text = view.context.getString(R.string.test_concluded)
+                teststatus.text = "Test concluded"
 
             } else {
-                teststatus.text = view.context.getString(R.string.test_pending)
-            }
-
-            holder.binding.btnBlood.setOnClickListener {
-                val view: View? = requireActivity.currentFocus
-
-                // on below line checking if view is not null.
-                if (view != null) {
-                    // on below line we are creating a variable
-                    // for input manager and initializing it.
-                    val inputMethodManager =
-                        context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
-
-                    // on below line hiding our keyboard.
-                    inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
-                }
-                val inflater = LayoutInflater.from(context)
-                val dialogView = inflater.inflate(R.layout.dialog_custom, null)
-
-                val builder = AlertDialog.Builder(context)
-                    .setView(dialogView)
-                    .setTitle("Add Blood Group")
-
-                val etBloodGroup = dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
-
-                builder.setPositiveButton("OK") { dialog, which ->
-                    val bloodGroup = etBloodGroup.text.toString()
-                    if (bloodGroup.equals("Select Blood Group") || bloodGroup.isNullOrBlank()) {
-                        if (view != null) {
-                            etBloodGroup.error =view.context.getString(R.string.blood_group_error)
-                        }
-                        if (view != null) {
-                            Toast.makeText(context, view.context.getString(R.string.blood_group_toast), Toast.LENGTH_SHORT).show()
-                        }
-                    } else {
-                        // Check if hemoCubeViewModel and testDetails are not null
-                        val db: FirebaseFirestore = FirebaseFirestore.getInstance()
-
-                        db.collection("patientData")
-                            .whereEqualTo("_id", model._id)
-                            .get()
-                            .addOnSuccessListener { userdata ->
-                                try {
-                                    val document = userdata.documents[0]
-                                    db.collection("patientData")
-                                        .document(document.id)
-                                        .update("bloodGroup", bloodGroup,
-                                            "incubationTime", SimpleDateFormat(
-                                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                                            ).format(Calendar.getInstance().time).toString()
-                                        )
-                                        .addOnSuccessListener {
-                                            if (view != null) {
-                                                Toast.makeText(
-                                                    view.context,
-                                                    context?.getString(R.string.blood_group_updated_successfully),
-                                                    Toast.LENGTH_SHORT
-                                                ).show()
-                                            }
-                                            btnBlood.visibility = View.GONE
-                                        }
-                                        .addOnFailureListener { e ->
-                                            if (view != null) {
-                                                Toast.makeText(
-                                                    view.context,
-                                                    context?.getString(R.string.failed_to_update_blood_group),
-                                                    Toast.LENGTH_SHORT
-                                                ).show()
-                                            }
-                                        }
-                                } catch (e: IndexOutOfBoundsException) {
-                                    // Handle the case where no documents are found for the specified ID
-                                    if (view != null) {
-                                        Toast.makeText(
-                                            view.context,
-                                            context?.getString(R.string.no_user_data_found),
-                                            Toast.LENGTH_SHORT
-                                        ).show()
-                                    }
-                                }
-
-                            }
-                            .addOnFailureListener { e ->
-                                Toast.makeText(
-                                    context,
-                                    "Error fetching user data: ${e.message}",
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                    }
-                    // Handle the selected blood group here
-                }
-
-                builder.setNegativeButton("Cancel") { dialog, which ->
-                    dialog.dismiss()
-                }
-
-                val alertDialog = builder.create()
-                alertDialog.show()
-            }
-
-            btnStartIncubation.setOnClickListener {
-//                it.visibility = View.GONE
-//                Firebase.firestore.collection("patientData").whereEqualTo("_id", model._id).get()
-//                    .addOnSuccessListener { data ->
-//                        if (data.documents.isNotEmpty()) {
-//                            data.documents.forEach { userData ->
-//                                Firebase.firestore.collection("patientData").document(userData.id)
-//                                    .update(
-//                                        "incubationTime", SimpleDateFormat(
-//                                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-//                                        ).format(Calendar.getInstance().time).toString()
-//                                    ).addOnSuccessListener {
-//                                        Toast.makeText(
-//                                            view.context, "Incubation started", Toast.LENGTH_SHORT
-//                                        ).show()
-//                                        startListening()
-//                                    }
-//                            }
-//                        }
-//                    }
+                teststatus.text = "Test is Pending"
             }
             userCard.setOnClickListener {
-                if (batLevel < 40) {
-                    Toast.makeText(
-                        view.context,
-                        context?.getString(R.string.low_battery_warning),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    return@setOnClickListener
-                }
                 if (model.testStatus != null) {
                     if (model.testStatus!!) {
                         Toast.makeText(
                             view.context,
-                            context?.getString(R.string.test_already_conducted),
+                            "Test has been already conducted for this user",
                             Toast.LENGTH_SHORT
                         ).show()
                     } else {
-                        if (model.incubationTime != "") {
-                            if (isBetween15And30Minutes(model.incubationTime) < 15) {
-                                Toast.makeText(
-                                    view.context,
-                                    context?.getString(R.string.incubation_not_completed),
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            } else if (isBetween15And30Minutes(model.incubationTime) > 30) {
-                                Toast.makeText(
-                                    view.context,
-                                    context?.getString(R.string.incubation_crossed_30_minutes),
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            } else {
-                                DataHolder.selectedTest = model
-                                view.findNavController()
-                                    .navigate(R.id.action_nav_home_to_mainActivity)
-                            }
-                        } else {
-                            Toast.makeText(
-                                view.context,
-                                context?.getString(R.string.incubation_not_started),
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
+                        DataHolder.selectedTest = model
+                        DataHolder.selectedTestType = TestType.HB
+                        val intent = Intent(view.context, KitScanActivity::class.java)
+                        intent.putExtra("Test", "HB")
+                        view.context.startActivity(intent)
                     }
                 }
             }
         }
     }
-
-
-
-    private fun isBetween15And30Minutes(createdAt: String): Long {
-        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-        val createdAtDate: Date = formatter.parse(createdAt)!!
-
-        val currentTime = Calendar.getInstance().time
-
-        val diffMillis = currentTime.time - createdAtDate.time
-
-        return diffMillis / (60 * 1000)
-    }
 }

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

@@ -1,354 +0,0 @@
-package com.example.hpostesting.presentation.buffercheck
-
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.data.model.patient.BufferCheckData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.utils.MyDialogListener
-import com.example.hpostesting.presentation.utils.UIUtils
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
-import kotlin.math.log10
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-
-class HemoCubeBufferCheckFragment : Fragment() {
-
-    private lateinit var binding: FragmentHemoCubeReferenceBinding
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
-    private lateinit var sharedPreferences: SharedPreferences
-    private var currentDeviceData: DeviceData? = null
-    private var resultData: String = ""
-    private var kitno: String = ""
-    private var isOnline = false
-    private val messages = MutableLiveData<String>()
-    private var isTestOngoing = false
-    private var startListening = MutableLiveData(false)
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
-    ): View {
-        binding = FragmentHemoCubeReferenceBinding.inflate(inflater, container, false)
-        sharedPreferences =
-            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initViews()
-        observeViewModel()
-    }
-
-    private fun initViews() {
-
-        binding.nameEditText.setText("SMI/SC/")
-        binding.tvTitle.visibility = View.GONE
-        binding.tvName.visibility = View.GONE
-
-        binding.btnGo.setOnClickListener {
-            val serialNumber = binding.nameEditText.text.toString().trim()
-            if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
-                kitno = serialNumber
-                listenToHemoCube()
-                startBufferProcess()
-            } else {
-                Toast.makeText(context, R.string.invalid_kit_number, Toast.LENGTH_LONG).show()
-                return@setOnClickListener
-            }
-            activity?.runOnUiThread {
-                binding.tvSubtitle2.visibility = View.GONE
-                binding.etAbhaId.visibility = View.GONE
-                binding.tvTitle.visibility = View.GONE
-                binding.tvTitle2.visibility = View.GONE
-                binding.btnGo.visibility = View.GONE
-            }
-        }
-
-
-
-        activity?.runOnUiThread {
-            binding.btnSubmit.isEnabled = true
-            binding.btnSubmit.isClickable = true
-        }
-        binding.btnSubmit.setOnClickListener {
-
-        }
-        binding.btnSubmit.isEnabled = false
-        binding.btnSubmit.isClickable = false
-    }
-
-    private fun observeViewModel() {
-        hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-        }
-
-        hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
-            if (isNetworkAvailable) {
-                hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
-            } else {
-                Toast.makeText(
-                    requireContext(), R.string.internt_not, Toast.LENGTH_SHORT
-                ).show()
-            }
-            isOnline = isNetworkAvailable
-        }
-        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                showToast(R.string.kit_uploaded)
-            }
-            if (result == "Local") {
-                showToast(R.string.kit_upload_failed)
-            }
-
-            binding.progressBar.visibility = View.GONE
-        }
-
-        messages.observe(viewLifecycleOwner) {
-            binding.tvSubtitle4.text = it
-        }
-    }
-
-    private fun listenToHemoCube() {
-        if (DataHolder.hemoCubeTestData == null) {
-            DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData()
-        }
-
-        val fullReadOutput = StringBuilder()
-        startListening.postValue(true)
-
-        try {
-            (activity as HemocubeBufferCheckActivity).mService.listenToHemoCube(object :
-                UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        fullReadOutput.append(stringData)
-                        handleUsbData(stringData, fullReadOutput)
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                }
-            })
-        } catch (e: Exception) {
-            showToast(R.string.test_ongoing)
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-
-    private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
-        if (stringData.contains("#")) {
-            messages.postValue(stringData)
-            isTestOngoing = true
-        }
-
-        resultData += fullReadOutput.toString()
-
-        when {
-            stringData.contains("#Buffer Completed") -> showStartSampleDialog()
-            stringData.contains("#Sample Completed") -> {
-                activity?.runOnUiThread {
-                    binding.btnSubmit.isEnabled = true
-                    binding.btnSubmit.isClickable = true
-                }
-                fetchResult()
-            }
-
-            stringData.contains("RESULT") || resultData.contains("REND") -> {
-                var validString: String
-                val results: List<String>
-                if (stringData.contains("RESULT")) {
-                    validString = isValidResult(stringData)
-                    if (validString.isEmpty()) {
-                        results = resultData.split("\n")
-                        validString = parseResult(results)
-                    }
-                } else {
-                    results = resultData.split("\n")
-                    validString = parseResult(results)
-                }
-                if (validString.isNotEmpty()) {
-                    handleValidResult(validString)
-                }
-            }
-        }
-    }
-
-    private fun showStartSampleDialog() {
-        activity?.runOnUiThread {
-            UIUtils.createAlertDialog(requireContext(),
-                "Start Sample",
-                "Do you want to start sample reading?",
-                getString(R.string.no),
-                "Yes",
-                object : MyDialogListener {
-                    override fun onClickNegativeButton() {}
-
-                    override fun onClickPositiveButton() {
-                        listenToHemoCube()
-                        startSampleProcess()
-                    }
-                })
-        }
-    }
-
-    private fun handleValidResult(validString: String) {
-        try {
-            val result = validString.split(" ")
-            if (result.size == 8) {
-                val deviceId = result[2]
-                val led1BufferForDevice = result[3].toDoubleOrNull()
-                val led2BufferForDevice = result[4].toDoubleOrNull()
-                val led1Sample = result[5].toDoubleOrNull()
-                val led2Sample = result[6].toDoubleOrNull()
-                val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0)
-                val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0)
-                val deviceRatio = led1Average / led2Average
-                val calculateRatio = calculateRatio(deviceRatio)
-                val classificationResult = findResult(calculateRatio)
-                messages.postValue(classificationResult)
-                val bufferData = BufferCheckData(
-                    deviceId= deviceId,
-                    kitno = kitno,
-                    led1Buffer = led1BufferForDevice,
-                    led2Buffer = led2BufferForDevice,
-                    led1Average = led1Average,
-                    led2Average = led2Average,
-                    led1Sample = led1Sample,
-                    led2Sample = led2Sample,
-                    deviceRatio = deviceRatio,
-                    calculatedRatio = calculateRatio,
-                    coefficients = currentDeviceData?.coefficients?.get(0).toString() + ", " + currentDeviceData?.coefficients?.get(1).toString(),
-                    classificationResult = classificationResult,
-                    deviceSerialNumber = sharedPreferences.getString(Constants.USER_ID, "").toString(),
-                    testTime = SimpleDateFormat(
-                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                    ).format(Calendar.getInstance().time)
-                )
-                hemoCubeViewModel.uploadHemoCubeResultToDatabaseforbuffercheckN(bufferData)
-            }
-        } catch (e: Exception) {
-            Toast.makeText(
-                requireContext(), "Error while processing device data", Toast.LENGTH_SHORT
-            ).show()
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-
-    private fun findResult(calculatedRatio: Double?): String {
-        try {
-            if (calculatedRatio != null) {
-                if (calculatedRatio < 0.085) return "Kit Failed"
-                if (calculatedRatio in 0.085..0.155) return "Kit Passed"
-                if (calculatedRatio in 0.155..0.175) return "Kit Failed"
-                if (calculatedRatio in 0.175..0.22) return "Kit Failed"
-                if (calculatedRatio in 0.22..0.25) return "Kit Failed"
-                if (calculatedRatio in 0.25..0.35) return "Kit Failed"
-                if (calculatedRatio > 0.35) return "Kit Failed"
-            } else {
-                return "NULL"
-            }
-        } catch (e: Exception) {
-            showToast(R.string.error_classification)
-            Firebase.crashlytics.recordException(e)
-            return "ERROR"
-        }
-        return "NULL"
-    }
-
-    private fun showToast(messageResId: Int) {
-        Toast.makeText(requireContext(), getString(messageResId), Toast.LENGTH_SHORT).show()
-    }
-
-
-    private fun startBufferProcess() {
-
-        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startBuffer,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
-
-                override fun onUsbError(e: Exception?) {
-                }
-            })
-    }
-
-    private fun startSampleProcess() {
-
-        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startSample,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
-
-                override fun onUsbError(e: Exception?) {
-                }
-            })
-    }
-
-    private fun fetchResult() {
-
-        (activity as HemocubeBufferCheckActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.getSample,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
-
-                override fun onUsbError(e: Exception?) {
-                }
-            })
-    }
-
-    private fun calculateRatio(ratio: Double): Double {
-        val coefficient1 = currentDeviceData?.coefficients?.get(0) ?: 0.0
-        val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 1.0
-        return coefficient1 * ratio + coefficient2
-    }
-
-    private fun parseResult(frames: List<String>): String {
-        val lines = mutableListOf<String>()
-        for (frame in frames.reversed()) {
-            if (frame.contains("REND") || frame.contains("RESULT")) lines += frame
-            if (frame.contains("RESULT")) {
-                break
-            }
-        }
-        val line = lines.reversed().joinToString("").trim()
-        if (line.contains("RESULT") && line.split(" ").size == 8) {
-            return line
-        }
-        return ""
-    }
-
-    private fun isSerialValid(s: String): Boolean {
-        if (s.length != 17) {
-            binding.nameEditText.error = getString(R.string.invalid_kit)
-            return false
-        }
-        return true
-    }
-
-
-    private fun isValidResult(line: String): String {
-        return if (line.contains("RESULT") && line.split(" ").size == 8) {
-            line
-        } else {
-            ""
-        }
-    }
-}

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

@@ -1,164 +0,0 @@
-package com.example.hpostesting.presentation.buffercheck
-
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.ServiceConnection
-import android.hardware.usb.UsbDevice
-import android.hardware.usb.UsbDeviceConnection
-import android.hardware.usb.UsbManager
-import android.os.Bundle
-import android.os.IBinder
-import android.util.Log
-import android.view.Menu
-import android.widget.Toast
-import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.testRight.UsbService
-import com.hoho.android.usbserial.driver.UsbSerialDriver
-import com.hoho.android.usbserial.driver.UsbSerialProber
-import dagger.hilt.android.AndroidEntryPoint
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
-
-@AndroidEntryPoint
-open class HemocubeBufferCheckActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityHemocubeBinding
-    private val viewModel by viewModels<HemoCubeViewModel>()
-    private var myMenu: Menu? = null
-
-    private lateinit var mDriver: UsbSerialDriver
-    private var mConnection: UsbDeviceConnection? = null
-    lateinit var mService: UsbService
-
-    private val TAG = "HemoCube"
-
-    private val broadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-
-            synchronized(this) {
-                val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
-
-                if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
-                    device?.apply {
-                        connectUsb(true)
-                        DataHolder.usbConnected.postValue(true)
-                    }
-                } else {
-                    DataHolder.usbConnected.postValue(true)
-                }
-            }
-
-        }
-    }
-    private val connection = object : ServiceConnection {
-        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            val binder = service as UsbService.UsbServiceBinder
-            mService = binder.getService()
-            viewModel.isServiceConnected = true
-            mConnection.let { mService.connect(mDriver, mConnection!!) }
-            moveToNext()
-        }
-
-        override fun onServiceDisconnected(arg0: ComponentName) {
-            viewModel.isServiceConnected = false
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityHemocubeBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        setSupportActionBar(binding.myToolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        setupListener()
-        connectUsb(false)
-    }
-
-    private fun setupListener() {
-        DataHolder.usbConnected.observe(this) {
-            Log.d("USB OBSERVE", "HemoCube called -> $it")
-            if (it) {
-                myMenu?.get(0)?.icon =
-                    ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_24)
-            } else {
-                myMenu?.get(0)?.icon =
-                    ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_off_24)
-                Toast.makeText(this, R.string.device_disconnected, Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    open fun connectUsb(permissionGranted: Boolean) {
-        Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
-        val manager = getSystemService(Context.USB_SERVICE) as UsbManager
-        val availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager)
-
-        if (availableDrivers.isEmpty()) {
-            Toast.makeText(this, R.string.no_device_found, Toast.LENGTH_SHORT).show()
-        } else {
-            mDriver = availableDrivers[0]
-            mConnection = manager.openDevice(mDriver.device)
-
-            if (mConnection == null) {
-                requestUserPermission(manager, mDriver.device)
-            } else {
-                setupService()
-            }
-        }
-    }
-
-
-    private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            PendingIntent.getBroadcast(
-                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-            )
-        } else {
-            PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HOMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
-
-        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
-        manager.requestPermission(device, mPendingIntent)
-    }
-
-    private fun setupService() {
-        val intent = Intent(this, UsbService::class.java)
-        bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-
-    private fun moveToNext() {
-        if (supportFragmentManager.isDestroyed) return
-
-        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeBufferCheckFragment())
-            .commit()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.my_menu, menu)
-        return true
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        if (viewModel.isServiceConnected) {
-            mService.disconnect()
-            unbindService(connection)
-            viewModel.isServiceConnected = false
-        }
-    }
-}

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

@@ -2,7 +2,6 @@ package com.example.hpostesting.presentation.dashboard
 
 import android.os.Bundle
 import android.view.Menu
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.findNavController
@@ -11,9 +10,6 @@ import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.navigation.NavigationView
-import com.google.firebase.appdistribution.FirebaseAppDistribution
-import com.google.firebase.appdistribution.FirebaseAppDistributionException
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
@@ -29,6 +25,7 @@ class DashboardActivity : AppCompatActivity() {
 
         binding = ActivityDashboardBinding.inflate(layoutInflater)
         setContentView(binding.root)
+
         setSupportActionBar(binding.appBarDashboard.toolbar)
 
         val drawerLayout: DrawerLayout = binding.drawerLayout
@@ -56,43 +53,4 @@ class DashboardActivity : AppCompatActivity() {
         return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
     }
 
-    override fun onResume() {
-        super.onResume()
-
-        val firebaseAppDistribution = FirebaseAppDistribution.getInstance()
-        firebaseAppDistribution.updateIfNewReleaseAvailable()
-            .addOnProgressListener { updateProgress ->
-
-                if (updateProgress.apkBytesDownloaded > 0) {
-                    Toast.makeText(
-                        this,
-                        "${updateProgress.updateStatus}. ${updateProgress.apkBytesDownloaded / 1048576} /${updateProgress.apkFileTotalBytes / 1048576} MB",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            }
-            .addOnFailureListener { e ->
-                // (Optional) Handle errors.
-                if (e is FirebaseAppDistributionException) {
-                    when (e.errorCode) {
-                        FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> {
-                            // SDK did nothing. This is expected when building for Play.
-                        }
-
-                        else -> {
-                            // Handle other errors.
-                            Toast.makeText(
-                                this,
-                                "AppDistribution error, status: ${e.errorCode}",
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
-                    }
-                    FirebaseCrashlytics.getInstance().recordException(e)
-                }
-            }
-            .addOnSuccessListener {
-//                Toast.makeText(this, "App Update: Success!", Toast.LENGTH_SHORT).show()
-            }
-    }
 }

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

@@ -1,13 +1,12 @@
 package com.example.hpostesting.presentation.dashboard
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity
-import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
+import androidx.lifecycle.ViewModelProvider
+//import com.example.hpostesting.presentation.dashboard.ui.gallery.GalleryViewModel
 import `in`.sminnovations.hpostesting.databinding.FragmentGalleryBinding
 
 class GalleryFragment : Fragment() {
@@ -33,15 +32,6 @@ class GalleryFragment : Fragment() {
 //        galleryViewModel.text.observe(viewLifecycleOwner) {
 ////            textView.text = it
 //        }
-        binding.btnSubmit.setOnClickListener {
-            startActivity(Intent(requireContext(), HemocubeBufferCheckActivity::class.java))
-        }
-
-        binding.btnDiagnostics.setOnClickListener {
-            startActivity(Intent(requireContext(), DiagnosticsActivity::class.java))
-        }
-
-
         return root
     }
 

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

@@ -2,11 +2,8 @@ package com.example.hpostesting.presentation.dashboard
 
 import android.app.AlertDialog
 import android.content.Context
-import android.content.Context.BATTERY_SERVICE
 import android.content.DialogInterface
-import android.content.Intent
 import android.content.SharedPreferences
-import android.os.BatteryManager
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -19,23 +16,15 @@ import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.presentation.KitScanActivity
-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 com.firebase.ui.firestore.FirestoreRecyclerOptions
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
-import com.google.firebase.perf.ktx.performance
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Date
 import java.util.Locale
 
 @AndroidEntryPoint
@@ -45,51 +34,26 @@ class HomeFragment : Fragment() {
     private val viewModel: TestRightViewModel by activityViewModels()
     private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
     private lateinit var rvAdapter: UserListAdapter
-    private var batLevel: Int =
-        0 // Initialize with a default value, or obtain the actual battery level
-    private lateinit var adapter: OfflineUserListAdapter
-
-
     private lateinit var sharedPreference: SharedPreferences
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         _binding = FragmentHomeBinding.inflate(inflater, container, false)
-
-        // Check if _binding is null
-        if (_binding == null) {
-            // Handle the case where binding could not be initialized
-            // You may want to log an error or return a default view in this case
-            return super.onCreateView(inflater, container, savedInstanceState)
-        }
-
-        sharedPreference =
-            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+        sharedPreference = requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         DataHolder.selectedTest = null
 
         return binding.root
     }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         viewModel.allUserData.observe(viewLifecycleOwner) { userData ->
+            if (userData.isNotEmpty()) {
+
+            }
             deleteIncompleteRegistrations(userData)
         }
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
             deleteHemoCubeIncompleteRegistrations(userData)
-            if (userData.isNotEmpty()) {
-                val userList = mutableListOf<HemoCubeTestData>()
-                userData.forEach {
-                    if (it.testStatus == false) {
-                        userList.add(it)
-                    }
-                }
-                val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
-                val batLevel: Int = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-                adapter = OfflineUserListAdapter(binding.root, batLevel)
-                adapter.differ.submitList(userList)
-                binding.rvOrderOffline.adapter = adapter
-            }
         }
         viewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isConnected ->
             if (isConnected) {
@@ -104,52 +68,20 @@ class HomeFragment : Fragment() {
                 setUserId()
             }
         }
-        hemoCubeViewModel.fireBaseBulkUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                Toast.makeText(
-                    requireContext(),
-                    R.string.test_upload,
-                    Toast.LENGTH_SHORT
-                ).show()
-            }
-            if (result == "Error") {
-                Toast.makeText(requireContext(), R.string.test_upload_failed, Toast.LENGTH_SHORT)
-                    .show()
-            }
-        }
         binding.btnLogout.setOnClickListener {
             logoutUser(requireContext())
         }
         binding.uploadData.setOnClickListener {
             showUploadDialog(requireContext())
         }
-        binding.btnNewKit.setOnClickListener {
-            with(sharedPreference.edit()) {
-                putString(Constants.KIT_NUMBER, "")
-                putInt(Constants.KIT_COUNT, 0)
-                apply()
-            }
-            startActivity(Intent(requireContext(), KitScanActivity::class.java))
-            requireActivity().finish()
-        }
     }
-
     private fun setUserId() {
         binding.btnSubmit.setOnClickListener {
             val userId = binding.userId.text.toString()
-            val bloodGroup = binding.etBloodGroup.text
-
-            if (userId.length >= 18 && !bloodGroup.equals("Select Blood Group") || !bloodGroup.isNullOrBlank()) {
-                hemoCubeViewModel.addUser(
-                    HemoCubeTestData(
-                        _id = userId, bloodGroup = bloodGroup.toString(), incubationTime = SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                        ).format(Calendar.getInstance().time).toString()
-                    )
-                )
-//                val userData = UserData(_id = userId)
-//                DataHolder.selectedTest = userData
-//                findNavController().navigate(R.id.action_nav_home_to_mainActivity)
+            if (userId.length >= 18) {
+                val userData = UserData(_id = userId)
+                DataHolder.selectedTest = userData
+                findNavController().navigate(R.id.action_nav_home_to_mainActivity)
             } else {
                 val errorMessage = getString(R.string.user_id_error_message)
                 Toast.makeText(requireContext(), errorMessage, Toast.LENGTH_SHORT).show()
@@ -157,111 +89,60 @@ class HomeFragment : Fragment() {
             }
         }
     }
-
     private fun loadUserData() {
-        try {
-            val dateFormat = SimpleDateFormat("yyyy-MM-dd")
-            val currentDate = Date()
-            val formattedDate = dateFormat.format(currentDate)
-//            val query = Firebase.firestore.collection("patientData")
-//                .whereGreaterThanOrEqualTo("createdAt", formattedDate)
-//                .orderBy("createdAt", Query.Direction.DESCENDING)
         val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false)
-            query.get().addOnSuccessListener {
-                if (it.documents.isEmpty()) {
-                    binding.pendingTest.visibility = View.VISIBLE
-                } else {
-                    binding.pendingTest.visibility = View.GONE
-                }
+        query.get().addOnSuccessListener {
+            if (it.documents.isEmpty()) {
+                binding.pendingTest.visibility = View.VISIBLE
+            } else {
+                binding.pendingTest.visibility = View.GONE
             }
-            val recyclerViewOptions =
-                FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
-                    .build()
-
-            val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
-            val batLevel: Int = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-
-            rvAdapter = view?.let {
-                UserListAdapter(
-                    requireContext(), hemoCubeViewModel, recyclerViewOptions,
-                    it, batLevel, requireActivity()
-                )
-            }!!
-            binding.rvOrder.adapter = rvAdapter
-
-            rvAdapter.startListening()
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
         }
+        val recyclerViewOptions =
+            FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
+                .build()
+        rvAdapter = UserListAdapter(recyclerViewOptions, binding.root)
+        binding.rvOrder.adapter = rvAdapter
+        rvAdapter.startListening()
     }
-
     private fun saveUserId(userId: String) {
         with(sharedPreference.edit()) {
             putString(Constants.USER_ID, userId)
             apply()
         }
     }
-
     private fun logoutUser(context: Context) {
         val builder = AlertDialog.Builder(context)
-        builder.setTitle(R.string.log_out)
-        builder.setMessage(R.string.do_log_out)
-        builder.setPositiveButton(R.string.yes) { dialog, _ ->
+        builder.setTitle("Log Out")
+        builder.setMessage("Do you want to LogOut the Application?")
+        builder.setPositiveButton("Yes") { dialog, _ ->
             saveUserId("")
             findNavController().navigate(R.id.action_nav_home_to_loginFragment)
             dialog.dismiss()
         }
-        builder.setNegativeButton(R.string.no) { dialog, _ ->
+        builder.setNegativeButton("No") { dialog, _ ->
             dialog.dismiss()
         }
 
         val dialog = builder.create()
         dialog.show()
     }
-
     private fun getData(search: String?, field: String) {
-        val userSearchTrace = Firebase.performance.newTrace("user_search_trace")
-        userSearchTrace.start()
-
-        search?.replaceFirstChar {
+        val capitalizedSearch = search?.replaceFirstChar {
             if (search.lowercase()
                     .startsWith(it.lowercase())
             ) it.titlecase(Locale.getDefault()) else it.toString()
 
         }
-        val currentDate = Date()
-        val dateFormat = SimpleDateFormat("yyyyMMdd")
-        val partition = dateFormat.format(currentDate)
-        val searchTerm = partition + search
-        val searchField = field + "Search"
-        val query =
-            Firebase.firestore.collection("patientData").orderBy(searchField).startAt(searchTerm)
-                .endAt(searchTerm + "\uf8ff")
-        query.get().addOnSuccessListener {
-            userSearchTrace.stop()
-        }
+        val query = Firebase.firestore.collection("patientData").orderBy(field).startAt(search)
+            .endAt(search + "\uf8ff")
         val recyclerViewOptions =
             FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
                 .build()
-        val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
-        batLevel = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-
-        rvAdapter = view?.let {
-            UserListAdapter(
-                requireContext(),
-                hemoCubeViewModel,
-                recyclerViewOptions,
-                it,
-                batLevel,
-                requireActivity()
-            )
-        }!!
+        rvAdapter = UserListAdapter(recyclerViewOptions, binding.root)
         binding.rvOrder.adapter = rvAdapter
         rvAdapter.startListening()
-
-        userSearchTrace.stop()
     }
-
     private fun setSearch() {
         binding.searchProduct.setOnQueryTextListener(object :
             androidx.appcompat.widget.SearchView.OnQueryTextListener {
@@ -273,16 +154,13 @@ class HomeFragment : Fragment() {
                         binding.aadharIdRadioButton.isChecked -> "aadharId"
                         else -> null
                     }
-
                     field?.let { getData(query, it) }
                     false
-
                 } else {
                     loadUserData()
                     false
                 }
             }
-
             override fun onQueryTextChange(query: String?): Boolean {
                 return if (!query.isNullOrEmpty()) {
                     val field = when {
@@ -300,7 +178,6 @@ class HomeFragment : Fragment() {
             }
         })
     }
-
     private fun checkForLocalDBData() {
         viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
@@ -308,12 +185,10 @@ class HomeFragment : Fragment() {
         }
 
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val uploadDataVisibility =
-                if (userDataList.any { !it.localFlag && it.testStatus == true}) View.VISIBLE else View.GONE
+            val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
             binding.uploadData.visibility = uploadDataVisibility
         }
     }
-
     private fun showUploadDialog(context: Context) {
         val builder = AlertDialog.Builder(context)
         builder.setTitle(R.string.upload_db_registration_title)
@@ -342,19 +217,28 @@ class HomeFragment : Fragment() {
                 }
                 dialog.dismiss()
                 Toast.makeText(
-                    requireContext(), R.string.upload_success_message, Toast.LENGTH_SHORT
+                    requireContext(),
+                    R.string.upload_success_message,
+                    Toast.LENGTH_SHORT
                 ).show()
             }
         }
 
         hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            userDataList.forEach { userData ->
-                if (!userData.localFlag) {
+            if (userDataList.isEmpty()) {
+                dialog.dismiss()
+            } else {
+                userDataList.forEach { userData ->
                     userData.localFlag = true
                     hemoCubeViewModel.bulkAddResultTestToDb(userData)
                 }
+                dialog.dismiss()
+                Toast.makeText(
+                    requireContext(),
+                    R.string.upload_success_message,
+                    Toast.LENGTH_SHORT
+                ).show()
             }
-            dialog.dismiss()
         }
     }
 
@@ -368,7 +252,7 @@ class HomeFragment : Fragment() {
 
     private fun deleteHemoCubeIncompleteRegistrations(userDataList: List<HemoCubeTestData>) {
         userDataList.forEach { userData ->
-            if (userData._id.isEmpty()) {
+            if (userData.testTime?.isEmpty() == false) {
                 hemoCubeViewModel.deleteById(userData._id)
             }
         }

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

@@ -1,4 +1,5 @@
 package com.example.hpostesting.presentation.dashboard
+
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -6,10 +7,10 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import com.example.hpostesting.presentation.dashboard.ui.slideshow.SlideshowViewModel
-
 import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
 
 class SlideshowFragment : Fragment() {
+
     private var _binding: FragmentSlideshowBinding? = null
 
     // This property is only valid between onCreateView and
@@ -19,7 +20,7 @@ class SlideshowFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
+        savedInstanceState: Bundle?
     ): View {
         val slideshowViewModel =
             ViewModelProvider(this).get(SlideshowViewModel::class.java)
@@ -27,12 +28,6 @@ class SlideshowFragment : Fragment() {
         _binding = FragmentSlideshowBinding.inflate(inflater, container, false)
         val root: View = binding.root
 
-        val pInfo = requireActivity().packageManager.getPackageInfo(
-            requireActivity().packageName, 0
-        )
-        val version = pInfo.versionName
-        binding.textSlideshow.text = version
-
 //        val textView: TextView = binding.textSlideshow
 //        slideshowViewModel.text.observe(viewLifecycleOwner) {
 //            textView.text = it

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

@@ -47,10 +47,10 @@ class LoginFragment : Fragment() {
                 performLogin(loginId, password)
             } else {
                 if (loginId.isBlank()) {
-                    binding.loginId.error = R.string.enter_proper_login_id.toString()
+                    binding.loginId.error = "Please enter a proper Login ID"
                 }
                 if (password.isBlank()) {
-                    binding.password.error = R.string.enter_proper_password.toString()
+                    binding.password.error = "Please enter a proper password"
                 }
             }
         }
@@ -72,10 +72,10 @@ class LoginFragment : Fragment() {
                 navigateToHomeFragment()
                 return
             } else {
-                Toast.makeText(requireContext(), R.string.wrong_password, Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), "Wrong Password", Toast.LENGTH_SHORT).show()
             }
         }
-        Toast.makeText(requireContext(), R.string.wrong_user_id, Toast.LENGTH_SHORT).show()
+        Toast.makeText(requireContext(), "Wrong UserID", Toast.LENGTH_SHORT).show()
     }
 
     private fun saveUserId(userId: String) {

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

@@ -1,197 +0,0 @@
-package com.example.hpostesting.presentation.diagnostics
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
-import `in`.sminnovations.hpostesting.databinding.FragmentDiagnosticsBinding
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-
-class DiagnosticsFragment : Fragment() {
-
-    private lateinit var binding: FragmentDiagnosticsBinding
-    private val diagnosticsViewModel: DiagnosticsViewModel by activityViewModels()
-    private lateinit var sharedPreferences: SharedPreferences
-    private var currentDeviceData: DeviceData? = null
-    private var resultData: String = ""
-    private val messages = MutableLiveData<String>()
-    private var startListening = MutableLiveData(false)
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
-    ): View {
-        binding = FragmentDiagnosticsBinding.inflate(inflater, container, false)
-        sharedPreferences =
-            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initViews()
-        observeViewModel()
-    }
-
-
-    private fun initViews() {
-        binding.btnSubmit.visibility = View.GONE
-        listenToHemoCube()
-        getDeviceId()
-        binding.btnSubmit.setOnClickListener {
-            binding.btnSubmit.visibility = View.GONE
-            runDeviceDiagnostics()
-        }
-    }
-
-
-    private fun observeViewModel() {
-
-        diagnosticsViewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-        }
-
-        messages.observe(viewLifecycleOwner) {
-            binding.tvSubtitle4.text = it
-            Log.e("diagnostics",binding.tvSubtitle4.text.toString())
-        }
-
-        diagnosticsViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                showToast("Diagnostics data uploaded successfully")
-            }
-            if (result == "Local") {
-                showToast("Diagnostics uploading failed, note it down manually")
-            }
-
-            binding.progressBar.visibility = View.GONE
-        }
-    }
-
-    private fun getDeviceId() {
-        diagnosticsViewModel.progressBar.postValue(true)
-        (activity as DiagnosticsActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.getDeviceId,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        diagnosticsViewModel.messages.postValue(stringData)
-                        binding.tvSubtitle4.text = stringData
-                    }
-                }
-                override fun onUsbError(e: Exception?) {
-                    diagnosticsViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun runDeviceDiagnostics() {
-        diagnosticsViewModel.progressBar.postValue(true)
-        (activity as DiagnosticsActivity).mService.sendAndListenToHemoCube(
-            HemoCubeCommands.runDiagnostics,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-
-
-                }
-                override fun onUsbError(e: Exception?) {
-                    diagnosticsViewModel.progressBar.postValue(false)
-                }
-            })
-    }
-
-    private fun listenToHemoCube() {
-
-        val fullReadOutput = StringBuilder()
-        startListening.postValue(true)
-
-        try {
-            (activity as DiagnosticsActivity).mService.listenToHemoCube(object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        diagnosticsViewModel.messages.postValue(stringData)
-                        fullReadOutput.append(stringData)
-                        resultData += stringData
-                        binding.tvSubtitle4.text = resultData
-                        if (stringData.contains("SN")) {
-                            val slData = stringData.split(" ")
-                            if (slData.size > 1) {
-                                val hardwareId = slData[1].trim()
-                                with(sharedPreferences.edit()) {
-                                    putString(Constants.DEVICE_ID, hardwareId)
-                                    apply()
-                                }
-                            }
-                            activity?.runOnUiThread {
-                                binding.btnSubmit.visibility = View.VISIBLE
-                            }
-                        }
-                    }
-
-                    if (resultData.contains("END") || fullReadOutput.contains("END")) {
-                        diagnosticsViewModel.addDiagnosticsDataToDb(DiagnosticsData(
-                            deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString(),
-                            deviceData = resultData,
-                            runTime = SimpleDateFormat(
-                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                            ).format(Calendar.getInstance().time)
-                        ))
-                    }
-//                    val inputData = mutableListOf<String>()
-//                    while (true) {
-//                        if (fullReadOutput.toString().lowercase() == "end") {
-//                            break
-//                        }
-//                        inputData.add(fullReadOutput.toString())
-//                    }
-//
-//                    val parsedData = parseData(inputData)
-//                    Log.i("D-Data", parsedData.toString())
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    diagnosticsViewModel.progressBar.postValue(false)
-                }
-            })
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-
-
-    fun parseData(inputData: List<String>): List<Pair<String, String>> {
-        val pattern = Regex("([A-Z]+)\\s(\\d+)")
-        val parsedData = mutableListOf<Pair<String, String>>()
-
-        for (item in inputData) {
-            val matchResult = pattern.find(item)
-            if (matchResult != null) {
-                val (letters, numbers) = matchResult.destructured
-                parsedData.add(Pair(letters, numbers))
-            }
-        }
-
-        return parsedData
-    }
-
-    private fun showToast(message: String) {
-        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
-    }
-}

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

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

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

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

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

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

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

@@ -29,7 +29,7 @@ import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
 
 @AndroidEntryPoint
-open class HemocubeActivity : AppCompatActivity() {
+class HemoCubeActivity : AppCompatActivity() {
     private lateinit var binding: ActivityHemocubeBinding
     private val viewModel by viewModels<HemoCubeViewModel>()
     private var myMenu: Menu? = null
@@ -97,7 +97,7 @@ open class HemocubeActivity : AppCompatActivity() {
         }
     }
 
-    open fun connectUsb(permissionGranted: Boolean) {
+    private fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
         val availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager)
@@ -118,37 +118,31 @@ open class HemocubeActivity : AppCompatActivity() {
 
 
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-            )
-        } else {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HOMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
+        val mPendingIntent: PendingIntent =
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+                PendingIntent.getBroadcast(
+                    this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
+                )
+            } else {
+                PendingIntent.getBroadcast(
+                    this,
+                    0,
+                    Intent(Constants.HOMOCUBE_USB_PERMISSION),
+                    PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+                )
+            }
 
         val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
         registerReceiver(broadcastReceiver, filter)
         manager.requestPermission(device, mPendingIntent)
     }
 
-    fun setupService() {
+    private fun setupService() {
         val intent = Intent(this, UsbService::class.java)
+//        startService(intent)
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
-    open fun reconnectDevice() {
-        mService.disconnect()
-        unbindService(connection)
-        viewModel.isServiceConnected = false
-        connectUsb(true)
-    }
-
     private fun moveToNext() {
         if (supportFragmentManager.isDestroyed) return
 
@@ -156,17 +150,6 @@ open class HemocubeActivity : AppCompatActivity() {
             .commit()
     }
 
-
-    override fun onBackPressed() {
-        val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
-        if (fragment is HemoCubeFragment) {
-            fragment.handleBackButtonPress()
-        } else {
-            super.onBackPressed()
-        }
-    }
-
-
     fun onErrorReported(msg: String) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
         if (!isFinishing) onBackPressed()

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

@@ -3,30 +3,33 @@ package com.example.hpostesting.presentation.hemocube
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
-import android.graphics.Color
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.lifecycleScope
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
+import com.example.hpostesting.presentation.KitScanActivity
 import com.example.hpostesting.presentation.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
-import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.firestore.BuildConfig
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
-import com.google.firebase.perf.ktx.performance
+//import `in`.sminnovations.hpostesting.BuildConfig
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.tasks.await
 import kotlin.math.log10
 
 class HemoCubeFragment : Fragment() {
@@ -34,19 +37,14 @@ class HemoCubeFragment : Fragment() {
     private lateinit var binding: FragmentHemoCubeReferenceBinding
     private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
     private lateinit var sharedPreferences: SharedPreferences
-    val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
     private var isOnline = false
     private var currentDeviceData: DeviceData? = null
     private var resultData: String = ""
-    private var deviceSerialNo: String = ""
-    private var coefficient: String? = ""
     private var isUsingExistingBuffer = false
     private var isTestOngoing = false
-    private var startListening = MutableLiveData<Boolean>(false)
-    val testingTrace = Firebase.performance.newTrace("testing_trace")
-
+    private var bloodGroup: String = ""
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
         binding = FragmentHemoCubeReferenceBinding.inflate(inflater, container, false)
         sharedPreferences =
@@ -63,103 +61,102 @@ class HemoCubeFragment : Fragment() {
 
     private fun initViews() {
         binding.btnSubmit.setOnClickListener {
-            activity?.runOnUiThread {
-                binding.progressBar.visibility = View.VISIBLE
-            }
-            hemoCubeViewModel.uploadHemoCubeResultToDatabase(
-                isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
-            )
+//            val bloodGroupText = binding.etBloodGroup.text.toString()
+//            if (bloodGroupText.isNullOrBlank() || bloodGroupText == "Select Blood Group") {
+//                binding.etBloodGroup.error = "Please enter your blood group"
+//                Toast.makeText(context, "Please enter your blood group", Toast.LENGTH_SHORT).show()
+//            } else {
+//                binding.etBloodGroup.error = null
+//                bloodGroup = bloodGroupText
+//                checkBloodGroup()
+//            }
+            it.isEnabled = false
+            binding.progressBar.visibility = View.VISIBLE
+            fetchResult()
         }
         if (isTestOngoing) {
-//            binding.btnKit.visibility = View.GONE
-//            binding.btnKit.isEnabled = false
-//            binding.btnKit.isClickable = false
+            binding.btnKit.visibility = View.GONE
+            binding.btnKit.isEnabled = false
+            binding.btnKit.isClickable = false
+
         }
+        binding.btnSubmit.isEnabled = false
+        binding.btnSubmit.isClickable = false
 
-        binding.tvTitle2.visibility = View.GONE
-        binding.etAbhaId.visibility = View.GONE
-        binding.nameEditText.visibility = View.GONE
-        binding.tvTitle.visibility = View.GONE
-        binding.btnGo.visibility = View.GONE
-//        binding.btnSubmit.isEnabled = false
-//        binding.btnSubmit.isClickable = false
+        binding.btnKit.setOnClickListener {
+            if (isTestOngoing) {
+                val title = "WARNING"
+                val message = "There is a on going test, do you want to stop it"
+                val negativeText = getString(R.string.no)
+                val positiveText = "Yes"
 
-        binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}"
-        Log.e("nametext", binding.tvName.text.toString())
+                UIUtils.createAlertDialog(requireContext(),
+                    title,
+                    message,
+                    negativeText,
+                    positiveText,
+                    object : MyDialogListener {
+                        override fun onClickNegativeButton() {
+
+                        }
+
+                        override fun onClickPositiveButton() {
+                            resetKitCount()
+                            val intent = Intent(context, KitScanActivity::class.java)
+                            startActivity(intent)
+                            (activity as HemoCubeActivity).finish()
+                        }
+                    })
+            }
+        }
+    }
+
+    private fun checkBloodGroup() {
+        binding.apply {
+//             bloodGroup = etBloodGroup.text.toString()
+             val db: FirebaseFirestore = Firebase.firestore
+
+            // Launch a new coroutine scope
+            lifecycleScope.launch {
+                val userdata =
+                    db.collection("patientData").whereEqualTo("_id", hemoCubeViewModel.testDetails?._id)
+                        .get().await()
+                if (userdata.documents.isNotEmpty()) {
+                    db.collection("patientData").document(userdata.documents[0].id)
+                        .update("bloodGroup", bloodGroup)
+                }
+            }
+        }
     }
 
     private fun observeViewModel() {
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 showToast("Test Results Uploaded Successfully")
-                val i = Intent(
-                    requireContext().applicationContext, DashboardActivity::class.java
-                )
-                startActivity(i)
-                (activity as HemocubeActivity).finish()
+                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
             }
             if (result == "Local") {
                 showToast("Internet not available, test details stored locally")
                 startActivity(Intent(requireActivity(), DashboardActivity::class.java))
             }
-            if (result == "Error") {
-                showToast("Error uploading data, test details stored locally")
-                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
-            }
 
             binding.progressBar.visibility = View.GONE
         }
 
-        hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
-
         hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
             currentDeviceData = it
+            showToast(calculateRatio(0.17).toString())
+
         }
 
         hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
-            apply {
-//                if (isNetworkAvailable) {
-                    // Online mode
-                    DataHolder.hemoCubeTestData?.let {
-                        currentDeviceData?.coefficients?.let { coefficients ->
-                            val coefficient1 = coefficients[0]
-                            val coefficient2 = coefficients[1]
-                            val result = coefficient1 * coefficient2
-                            // Process result in online mode
-                        }
-                    }
-//                } else {
-//                    // Offline mode
-//                    val coefficient1 = Constants.COEFFICIENTS[deviceSerialNo]?.get(0)?.get(0).toString().toDoubleOrNull() ?: 0.0
-//                    val coefficient2 = Constants.COEFFICIENTS[deviceSerialNo]?.get(1)?.get(0).toString().toDoubleOrNull() ?: 0.0
-//                    val result = coefficient1 * coefficient2
-//
-//                    // Process result in offline mode
-//                }
-
-                isOnline = isNetworkAvailable
-            }
+            hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID,""))
+            isOnline = isNetworkAvailable
         }
 
         hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
             binding.tvSubtitle4.text = it
         }
-//        startListening.observe(viewLifecycleOwner) {
-//            if (it) {
-//                lifecycleScope.launch {
-//                    delay(1000)
-//                    if (binding.tvSubtitle4.text.toString().isEmpty()) {
-//                        (activity as HemocubeActivity).reconnectDevice()
-//                        if (isBufferValueAvailable()) {
-//                            showBufferAlertDialog()
-//                        } else {
-//                            listenToHemoCube()
-//                            startBufferProcess()
-//                        }
-//                    }
-//                }
-//            }
-//        }
     }
 
     private fun checkAndStartProcess() {
@@ -217,26 +214,19 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.progressBar.postValue(true)
 
         val fullReadOutput = StringBuilder()
-        startListening.postValue(true)
-
-        try {
-            (activity as HemocubeActivity).mService.listenToHemoCube(object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        fullReadOutput.append(stringData)
-                        handleUsbData(stringData, fullReadOutput)
-                    }
+        (activity as HemoCubeActivity).mService.listenToHemoCube(object : UsbServiceListener {
+            override fun onUsbRead(data: ByteArray?) {
+                data?.let {
+                    val stringData = String(it)
+                    fullReadOutput.append(stringData)
+                    handleUsbData(stringData, fullReadOutput)
                 }
+            }
 
-                override fun onUsbError(e: Exception?) {
-                    hemoCubeViewModel.progressBar.postValue(false)
-                }
-            })
-        } catch (e: Exception) {
-            showToast("test is going on")
-            Firebase.crashlytics.recordException(e)
-        }
+            override fun onUsbError(e: Exception?) {
+                hemoCubeViewModel.progressBar.postValue(false)
+            }
+        })
     }
 
     private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
@@ -245,13 +235,17 @@ class HemoCubeFragment : Fragment() {
             isTestOngoing = true
         }
 
-        resultData += stringData
+        resultData += fullReadOutput.toString()
 
         when {
+            stringData.contains("ERROR 500") -> showError500Dialog()
+            stringData.contains("ERROR 501") -> showError501Dialog()
             stringData.contains("#Buffer Completed") -> showStartSampleDialog()
             stringData.contains("#Sample Completed") -> {
-                fetchResult()
-                testingTrace.stop()
+                activity?.runOnUiThread {
+                    binding.btnSubmit.isEnabled = true
+                    binding.btnSubmit.isClickable = true
+                }
             }
 
             stringData.contains("RESULT") || resultData.contains("REND") -> {
@@ -274,34 +268,36 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
+    private fun showError500Dialog() {
+        UIUtils.createAlertDialog(requireContext(),
+            "BUFFER ERROR",
+            "Do you want to continue with existing buffer?",
+            getString(R.string.noo),
+            "Yes",
+            object : MyDialogListener {
+                override fun onClickNegativeButton() {}
 
-    private fun showError() {
-        activity?.runOnUiThread {
-            UIUtils.createAlertDialog(requireContext(),
-                "Device Error",
-                "Something is wrong with the device, please disconnect and reconnect the device and test the user again",
-                getString(R.string.noo),
-                "Yes",
-                object : MyDialogListener {
-                    override fun onClickNegativeButton() {}
-
-                    override fun onClickPositiveButton() {
-                        startActivity(Intent(requireActivity(), DashboardActivity::class.java))
-                    }
-                })
-        }
+                override fun onClickPositiveButton() {
+                    listenToHemoCube()
+                    startBufferProcess()
+                }
+            })
     }
 
-    fun handleBackButtonPress() {
-        if (isTestOngoing) {
-            // If the test is ongoing, don't allow the back button action
-            // You can optionally show a message to the user indicating why the back button is disabled
-            // For example, show a Toast or Snackbar.
-            showToast("Test is ongoing. Cannot go back.")
-        } else {
-            // If the test is not ongoing, you can trigger the back action of the hosting activity
-            activity?.onBackPressed()
-        }
+    private fun showError501Dialog() {
+        UIUtils.createAlertDialog(requireContext(),
+            "SAMPLE ERROR",
+            "Do you want to continue with Sample?",
+            getString(R.string.noo),
+            "Yes",
+            object : MyDialogListener {
+                override fun onClickNegativeButton() {}
+
+                override fun onClickPositiveButton() {
+                    listenToHemoCube()
+                    startSampleProcess()
+                }
+            })
     }
 
     private fun showStartSampleDialog() {
@@ -315,30 +311,17 @@ class HemoCubeFragment : Fragment() {
                     override fun onClickNegativeButton() {}
 
                     override fun onClickPositiveButton() {
-                        listenToHemoCube()
                         startSampleProcess()
                     }
                 })
         }
     }
 
-    fun handleValidResult(validString: String, fullReadOutput: String) {
+    private fun handleValidResult(validString: String, fullReadOutput: String) {
         try {
             val result = validString.split(" ")
-            val deviceLog = resultData
             if (result.size == 8) {
                 val deviceSerialNo = result[2]
-                with(sharedPreferences.edit()) {
-                    putString(Constants.DEVICE_ID, deviceSerialNo)
-                    apply()
-                }
-                val loginId = sharedPreferences.getString(Constants.USER_ID, "").toString()
-                if (checkDeviceIdMismatch(deviceSerialNo, loginId)) {
-                    activity?.runOnUiThread {
-                        binding.errorMessage.text = "Warning: Login Id is different"
-                        binding.errorMessage.visibility = View.VISIBLE
-                    }
-                }
                 val led1BufferForDevice = if (isUsingExistingBuffer) {
                     sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")?.toDoubleOrNull()
                 } else {
@@ -349,105 +332,41 @@ class HemoCubeFragment : Fragment() {
                 } else {
                     result[4].toDoubleOrNull()
                 }
-                val pInfo = requireActivity().packageManager.getPackageInfo(
-                    requireActivity().packageName, 0
-                )
-                val version = pInfo.versionName
                 val led1Sample = result[5].toDoubleOrNull()
                 val led2Sample = result[6].toDoubleOrNull()
                 val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0)
                 val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0)
                 val deviceRatio = led1Average / led2Average
-                val coefficientsList = Constants.COEFFICIENTS[deviceSerialNo]
-//                if (coefficientsList != null) {
-                val coefficient1 = coefficientsList?.get(0)?.get(0).toString()
-                val coefficient2 = coefficientsList?.get(1)?.get(0).toString()
-                val coefficientsString = "$coefficient1,$coefficient2"
-
-//                if (led1BufferForDevice!! > 20000 && led1BufferForDevice < 24000 && led2BufferForDevice!! > 20000 && led2BufferForDevice < 24000) {
-//                    if (led1Sample!! < led1BufferForDevice && led1Sample < 24000 && led2Sample!! < led2BufferForDevice && led2Sample < 24000) {
-//                        if (deviceRatio < 0.08) {
-//                            if (deviceRatio > 1.07) {
-//
-//                            }
-//                        }
-//                    }
-//                }
-
-                if (led1Average < 0 || led2Average < 0) {
-                    activity?.runOnUiThread{
-                        binding.errorMessage.text = "Warning: Negative Abs. Retake Blank Reading"
-                        binding.errorMessage.visibility = View.VISIBLE
-                    }
-                }
-
+                val version = BuildConfig.VERSION_NAME
                 DataHolder.hemoCubeTestData?.apply {
                     deviceId = deviceSerialNo
+                    appVersion = version
                     led1Buffer = led1BufferForDevice
                     led2Buffer = led2BufferForDevice
-                    appVersion = version
                     this.led1Sample = led1Sample
                     this.led2Sample = led2Sample
                     this.led1Average = led1Average
                     this.led2Average = led2Average
                     this.deviceRatio = deviceRatio
                     this.calculatedRatio = calculateRatio(deviceRatio)
-//                    this.coefficients = currentDeviceData?.coefficients?.get(0).toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
-                    this.coefficients = coefficientsString
-                    this.classificationResult = findResult(calculatedRatio)
-                    hemoCubeViewModel.messages.postValue(this.classificationResult)
-                    this.resultData = deviceLog
-                    if (!isUsingExistingBuffer) {
+                    this.resultData = fullReadOutput
+                    if (!isBufferValueAvailable()) {
                         with(sharedPreferences.edit()) {
                             putString(Constants.BUFFER_VALUE_1, led1Buffer.toString())
                             putString(Constants.BUFFER_VALUE_2, led2Buffer.toString())
                             apply()
                         }
                     }
-                    activity?.runOnUiThread {
-                        binding.btnSubmit.visibility = View.VISIBLE
-                        binding.btnSubmit.isEnabled = true
-                        binding.btnSubmit.isClickable = true
-                        binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
-                    }
+                    hemoCubeViewModel.uploadHemoCubeResultToDatabase(
+                        isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
+                    )
                 }
             }
-        } catch (e: Exception) {
-            Toast.makeText(
-                requireContext(),
-                "Error while processing device data",
-                Toast.LENGTH_SHORT
-            ).show()
-            Firebase.crashlytics.recordException(e)
-        }
-    }
 
-    private fun findResult(calculatedRatio: Double?): String {
-        try {
-            if (calculatedRatio != null) {
-                if (calculatedRatio < 0.05)
-                    return "Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume"
-                if (calculatedRatio in 0.05..0.155)
-                    return "Normal"
-                if (calculatedRatio in 0.155..0.175)
-                    return "Negative Borderline. Repeat Test"
-                if (calculatedRatio in 0.175..0.22)
-                    return "Sickle Cell Trait"
-                if (calculatedRatio in 0.22..0.25)
-                    return "Positive for Sickle Cell. HPLC for Confirmation"
-                if (calculatedRatio in 0.25..0.35)
-                    return "Sickle Cell Disease"
-                if (calculatedRatio > 0.35)
-                    return "Inconclusive. Repeat with test with lower volume of blood"
-            } else {
-                return "NULL"
-            }
         } catch (e: Exception) {
-            showToast("error while performing classification")
-            Firebase.crashlytics.recordException(e)
-            return "ERROR"
+
         }
-        return "NULL"
+
     }
 
     private fun showToast(message: String) {
@@ -457,7 +376,8 @@ class HemoCubeFragment : Fragment() {
     private fun startBufferProcess() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startBuffer,
+        (activity as HemoCubeActivity).mService.sendAndListenToHemoCube(
+            HemoCubeCommands.startBuffer,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
 
@@ -468,10 +388,10 @@ class HemoCubeFragment : Fragment() {
     }
 
     private fun startSampleProcess() {
-        testingTrace.start()
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startSample,
+        (activity as HemoCubeActivity).mService.sendAndListenToHemoCube(
+            HemoCubeCommands.startSample,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
 
@@ -484,7 +404,8 @@ class HemoCubeFragment : Fragment() {
     private fun fetchResult() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.getSample,
+        (activity as HemoCubeActivity).mService.sendAndListenToHemoCube(
+            HemoCubeCommands.getSample,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
 
@@ -495,12 +416,11 @@ class HemoCubeFragment : Fragment() {
     }
 
     private fun calculateRatio(ratio: Double): Double {
-        val coefficient1: Double = (Constants.COEFFICIENTS[deviceSerialNo]?.get(0) ?: 0.0) as Double
-        val coefficient2: Double = (Constants.COEFFICIENTS[deviceSerialNo]?.get(1) ?: 0.0) as Double
+        val coefficient1 = currentDeviceData?.coefficients?.get(0) ?: 0.0
+        val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 0.0
         return coefficient1 * ratio + coefficient2
     }
 
-
     private fun parseResult(frames: List<String>): String {
         val lines = mutableListOf<String>()
         for (frame in frames.reversed()) {
@@ -524,9 +444,11 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
-    private fun checkDeviceIdMismatch(deviceId: String, loginId: String): Boolean {
-        if (!deviceId.isNullOrEmpty() && !loginId.isNullOrEmpty() && deviceId.last() != loginId.last())
-            return true
-        return false
+    private fun resetKitCount() {
+        with(sharedPreferences.edit()) {
+            putString(Constants.KIT_NUMBER, "")
+            putInt(Constants.KIT_COUNT, 0)
+            apply()
+        }
     }
 }

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

@@ -1,13 +1,8 @@
 package com.example.hpostesting.presentation.hemocube
 
-import android.app.Application
 import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
 import android.content.SharedPreferences
-import android.os.BatteryManager
 import android.util.Log
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -17,13 +12,10 @@ import com.example.hpostesting.data.NetworkStatusLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.patient.BufferCheckData
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.data.repository.Repository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
@@ -34,250 +26,114 @@ import javax.inject.Inject
 @HiltViewModel
 class HemoCubeViewModel @Inject constructor(
     private val hemoCubeDao: HemoCubeDao,
-    private val repository: Repository,
+    private val repository: DatabaseRepository,
     context: Context,
 ) : ViewModel() {
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
-        val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
-        val messages = MutableLiveData<String>()
-        private val sharedPreference: SharedPreferences =
-            context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+    val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
+    val messages = MutableLiveData<String>()
+    private val sharedPreference: SharedPreferences = context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
 
-        // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
+    // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
 
-        private val _networkStatusLiveData = NetworkStatusLiveData(context)
-        val allUserData = hemoCubeDao.getAll()
-        val deviceData = MutableLiveData<DeviceData?>()
-        val networkStatusLiveData: LiveData<Boolean>
-            get() = _networkStatusLiveData
-        val fireBaseUpload = MutableLiveData<String>()
-        val fireBaseBulkUpload = MutableLiveData<String>()
-
-        private val batteryStatus: Intent? =
-            IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
-                context.registerReceiver(null, ifilter)
+    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    val allUserData = hemoCubeDao.getAll()
+    val deviceData = MutableLiveData<DeviceData?>()
+    val networkStatusLiveData: LiveData<Boolean>
+        get() = _networkStatusLiveData
+    val fireBaseUpload = MutableLiveData<String>()
+    fun uploadHemoCubeResultToDatabase(isOnline: Boolean, testStatus: Boolean, kitSerial: String?) =
+        viewModelScope.launch {
+            if (kitSerial != null) {
+                testDetails?.kitSerial = kitSerial
             }
+            testDetails?.testStatus = testStatus
 
-        fun uploadHemoCubeResultToDatabase(
-            isOnline: Boolean,
-            testStatus: Boolean,
-            kitSerial: String?
-        ) =
-            viewModelScope.launch {
-                if (kitSerial != null) {
-                    testDetails?.kitSerial = kitSerial
-                }
-                testDetails?.testStatus = testStatus
-
-                try {
-                    if (isOnline) {
-                        parseData()
-                        addResultTestToDb()
-                    } else {
-                        parseData()
-                        testDetails?.testTime = SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                        ).format(Calendar.getInstance().time)
-                        hemoCubeDao.insertAll(testDetails!!)
-                        fireBaseUpload.postValue("Local")
-                    }
-                } catch (e: Exception) {
-                    Log.e("Testdb", "Upload failed: ${e.message}")
-                }
-            }
-
-
-        fun uploadHemoCubeResultToDatabaseforbuffercheckN(bufferCheckData: BufferCheckData) =
-            viewModelScope.launch {
-                addResultTestToDbforbuffercheck(bufferCheckData)
-            }
-
-        fun getDeviceData(deviceId: String?) = viewModelScope.launch {
-            deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
-        }
-
-        private fun parseData() {
-            testDetails?.deviceRatio = DataHolder.hemocubeResult
-            testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
-            testDetails?.location = DataHolder.location
-            testDetails?.testTime = SimpleDateFormat(
-                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-            ).format(Calendar.getInstance().time)
-            testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion
-            testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId
-            testDetails?.deviceSerialNumber =
-                sharedPreference.getString(Constants.USER_ID, "").toString()
-            testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-            testDetails?.led1Buffer = DataHolder.hemoCubeTestData?.led1Buffer
-            testDetails?.led2Buffer = DataHolder.hemoCubeTestData?.led2Buffer
-            testDetails?.led3Buffer = DataHolder.hemoCubeTestData?.led3Buffer
-            testDetails?.led4Buffer = DataHolder.hemoCubeTestData?.led4Buffer
-            testDetails?.led1Sample = DataHolder.hemoCubeTestData?.led1Sample
-            testDetails?.led2Sample = DataHolder.hemoCubeTestData?.led2Sample
-            testDetails?.led3Sample = DataHolder.hemoCubeTestData?.led3Sample
-            testDetails?.led4Sample = DataHolder.hemoCubeTestData?.led4Sample
-            testDetails?.led1Average = DataHolder.hemoCubeTestData?.led1Average
-            testDetails?.led2Average = DataHolder.hemoCubeTestData?.led2Average
-            testDetails?.led3Average = DataHolder.hemoCubeTestData?.led3Average
-            testDetails?.led4Average = DataHolder.hemoCubeTestData?.led4Average
-            testDetails?.abs1 = DataHolder.hemoCubeTestData?.abs1
-            testDetails?.abs2 = DataHolder.hemoCubeTestData?.abs2
-            testDetails?.abs3 = DataHolder.hemoCubeTestData?.abs3
-            testDetails?.abs4 = DataHolder.hemoCubeTestData?.abs4
-            testDetails?.deviceRatio = DataHolder.hemoCubeTestData?.deviceRatio
-            testDetails?.predictedDenovixRatio = DataHolder.hemoCubeTestData?.predictedDenovixRatio
-            testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio
-            testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
-            testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
-            testDetails?.prdClassification =
-                DataHolder.hemoCubeTestData?.prdClassification.toString()
-            testDetails?.batteryLevel = DataHolder.hemoCubeTestData?.batteryLevel.toString()
-            testDetails?.batteryCapacity = DataHolder.hemoCubeTestData?.batteryCapacity.toString()
-            testDetails?.batteryMaxCapacity =
-                DataHolder.hemoCubeTestData?.batteryMaxCapacity.toString()
-            testDetails?.batteryTemperature =
-                DataHolder.hemoCubeTestData?.batteryTemperature.toString()
-            testDetails?.batteryVoltage = DataHolder.hemoCubeTestData?.batteryVoltage.toString()
-        }
-
-        private fun addResultTestToDb() {
-            viewModelScope.launch {
-                try {
-                    testDetails!!.reportUploadTime = SimpleDateFormat(
+            try {
+                if (isOnline) {
+                    addResultTestToDb()
+                } else {
+                    testDetails?.testTime = SimpleDateFormat(
                         "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                     ).format(Calendar.getInstance().time)
-
-                    when (val response = repository.addTestToDatabase(testDetails)) {
-                        is Response.Success -> {
-                            val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
-                            with(sharedPreference.edit()) {
-                                putInt(Constants.KIT_COUNT, kitCount.plus(1))
-                                apply()
-                            }
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
-                            fireBaseUpload.postValue("Success")
-                            testDetails.localFlag = true
-                            hemoCubeDao.insertAll(testDetails)
-                        }
-
-                        is Response.Error -> {
-                            Log.e("Testdb", "Error uploading data to Firestore: $response")
-                            fireBaseUpload.postValue("Error")
-                            hemoCubeDao.insertAll(testDetails)
-                        }
-
-                        else -> {}
-                    }
-                } catch (e: Exception) {
-                    Log.e("Testdb", "Exception during data upload: ${e.message}")
-                    fireBaseUpload.postValue("Error")
+                    hemoCubeDao.insertAll(testDetails!!)
+                    fireBaseUpload.postValue("Local")
                 }
+            } catch (e: Exception) {
+                Log.e("Testdb", "Upload failed: ${e.message}")
             }
         }
 
+    fun getDeviceData(deviceId: String?) = viewModelScope.launch {
+        deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
+    }
 
-        private fun addResultTestToDbforbuffercheck(bufferCheckData: BufferCheckData) {
-            viewModelScope.launch {
-                try {
+    private fun addResultTestToDb() {
+        testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
+        testDetails?.location = DataHolder.location
+        testDetails?.testTime = SimpleDateFormat(
+            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+        ).format(Calendar.getInstance().time)
+        testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion
+        testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId
+        testDetails?.deviceSerialNumber = sharedPreference.getString(Constants.USER_ID, "").toString()
+        testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
+        testDetails?.led1Buffer = DataHolder.hemoCubeTestData?.led1Buffer
+        testDetails?.led2Buffer = DataHolder.hemoCubeTestData?.led2Buffer
+        testDetails?.led1Sample = DataHolder.hemoCubeTestData?.led1Sample
+        testDetails?.led2Sample = DataHolder.hemoCubeTestData?.led2Sample
+        testDetails?.led1Average = DataHolder.hemoCubeTestData?.led1Average
+        testDetails?.led2Average = DataHolder.hemoCubeTestData?.led2Average
+        testDetails?.deviceRatio = DataHolder.hemoCubeTestData?.deviceRatio
+        testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio
 
-                    when (val response =
-                        repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
-                        is Response.Success -> {
-                            Log.i("Testdb", "Data uploaded to Firestore successfully")
-                            fireBaseUpload.postValue("Success")
-                        }
-
-                        is Response.Error -> {
-                            Log.e("Testdb", "Error uploading data to Firestore: $response")
-                            fireBaseUpload.postValue("Error")
-                        }
-
-                        else -> {}
-                    }
-                } catch (e: Exception) {
-                    Log.e("Testdb", "Exception during data upload: ${e.message}")
-                    fireBaseUpload.postValue("Error")
-                }
-            }
-        }
-
-        fun bulkAddResultTestToDb(userData: HemoCubeTestData) {
-            viewModelScope.launch {
-                userData.reportUploadTime = SimpleDateFormat(
+        viewModelScope.launch {
+            try {
+                testDetails!!.reportUploadTime = SimpleDateFormat(
                     "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                 ).format(Calendar.getInstance().time)
-                when (repository.addTestToDatabase(userData)) {
+
+                when (val response = repository.addTestToDatabase(testDetails)) {
                     is Response.Success -> {
-                        fireBaseBulkUpload.postValue("Success")
-                        updateLocalFlag(userData._id)
+                        val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
+                        with(sharedPreference.edit()) {
+                            putInt(Constants.KIT_COUNT, kitCount.plus(1))
+                            apply()
+                        }
+                        Log.i("Testdb", "Data uploaded to Firestore successfully")
+                        fireBaseUpload.postValue("Success")
                     }
 
-                    else -> {
-                        fireBaseBulkUpload.postValue("Error")
+                    is Response.Error -> {
+                        Log.e("Testdb", "Error uploading data to Firestore: $response")
+                        fireBaseUpload.postValue("Error")
                     }
+
                 }
+            } catch (e: Exception) {
+                Log.e("Testdb", "Exception during data upload: ${e.message}")
+                fireBaseUpload.postValue("Error")
             }
         }
-
-        private fun updateLocalFlag(userId: String) = viewModelScope.launch {
-            hemoCubeDao.updateFieldById(id = userId, true)
-        }
-
-        fun addUser(userData: HemoCubeTestData) = viewModelScope.launch {
-            hemoCubeDao.insertAll(userData)
-        }
-
-        fun deleteById(userId: String) = viewModelScope.launch {
-            hemoCubeDao.deleteById(id = userId)
-        }
-
-        fun getBatteryLevel(): Float? {
-            val batteryPct: Float? = batteryStatus?.let { intent ->
-                val level: Int = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1)
-                val scale: Int = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1)
-                level * 100 / scale.toFloat()
-            }
-
-            return batteryPct
-        }
-
-        fun getBatteryTemperature(): Float? {
-            val batteryTemp: Float? = batteryStatus?.let { intent ->
-                val temperature = intent?.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0) ?: 0
-                temperature.toFloat() / 10
-            }
-
-            return batteryTemp
-        }
-
-        fun getBatteryVoltage(context: Context): Float {
-            val batteryIntent =
-                context.registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
-            val voltage = batteryIntent?.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0) ?: 0
-
-            // milli-volts to volts
-            return voltage.toFloat() / 1000
-        }
-
-        fun getBatteryCapacity(context: Context): Int {
-            val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-            val currentCapacity =
-                batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-
-            return currentCapacity
-        }
-
-        fun getBatteryMaxCapacity(context: Context): Float {
-            val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-            val designCapacity =
-                batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-            val currentCapacity =
-                batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-
-            // Calculate the estimated maximum battery capacity in mAh
-            val maxCapacity = currentCapacity.toFloat() / designCapacity.toFloat() * 100
-
-            return maxCapacity
-        }
     }
+
+    fun bulkAddResultTestToDb(userData: HemoCubeTestData) {
+        viewModelScope.launch {
+            userData.reportUploadTime = SimpleDateFormat(
+                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+            ).format(Calendar.getInstance().time)
+            when (repository.addTestToDatabase(userData)) {
+                is Response.Success -> {
+                    fireBaseUpload.postValue("Success")
+                }
+
+                else -> {}
+            }
+        }
+    }
+
+    fun deleteById(userId: String) = viewModelScope.launch {
+        hemoCubeDao.deleteById(id = userId)
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.example.hpostesting.presentation.diagnostics
+package com.example.hpostesting.presentation.hemocube.hb
 
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
@@ -10,30 +10,28 @@ import android.content.ServiceConnection
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
 import android.view.Menu
 import android.widget.Toast
 import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.ActivityDiagnosticsBinding
+import `in`.sminnovations.hpostesting.databinding.ActivityHemocubeBinding
 
 @AndroidEntryPoint
-class DiagnosticsActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityDiagnosticsBinding
-    val viewModel: DiagnosticsViewModel by viewModels()
+class HBHemoCubeActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityHemocubeBinding
+    private val viewModel by viewModels<HBHemoCubeViewModel>()
     private var myMenu: Menu? = null
 
     private lateinit var mDriver: UsbSerialDriver
@@ -61,8 +59,6 @@ class DiagnosticsActivity : AppCompatActivity() {
 
         }
     }
-
-
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as UsbService.UsbServiceBinder
@@ -79,13 +75,12 @@ class DiagnosticsActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityDiagnosticsBinding.inflate(layoutInflater)
+        binding = ActivityHemocubeBinding.inflate(layoutInflater)
         setContentView(binding.root)
-//        setSupportActionBar(binding.myToolbar)
+        setSupportActionBar(binding.myToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         setupListener()
         connectUsb(false)
-
     }
 
     private fun setupListener() {
@@ -101,7 +96,8 @@ class DiagnosticsActivity : AppCompatActivity() {
             }
         }
     }
-    open fun connectUsb(permissionGranted: Boolean) {
+
+    private fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
         val availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager)
@@ -121,50 +117,49 @@ class DiagnosticsActivity : AppCompatActivity() {
     }
 
 
-    fun onErrorReported(msg: String) {
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
-        if (!isFinishing) onBackPressed()
-    }
-
-
-    private fun moveToNext() {
-        if (supportFragmentManager.isDestroyed) return
-
-        supportFragmentManager.beginTransaction().replace(binding.fgDiagnostics.id, DiagnosticsFragment())
-            .commit()
-    }
-
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-            )
-        } else {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HOMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
+        val mPendingIntent: PendingIntent =
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+                PendingIntent.getBroadcast(
+                    this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE
+                )
+            } else {
+                PendingIntent.getBroadcast(
+                    this,
+                    0,
+                    Intent(Constants.HOMOCUBE_USB_PERMISSION),
+                    PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+                )
+            }
 
         val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
         registerReceiver(broadcastReceiver, filter)
         manager.requestPermission(device, mPendingIntent)
     }
 
-
-    fun setupService() {
+    private fun setupService() {
         val intent = Intent(this, UsbService::class.java)
+//        startService(intent)
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
 
+    private fun moveToNext() {
+        if (supportFragmentManager.isDestroyed) return
+
+        supportFragmentManager.beginTransaction()
+            .replace(binding.fghemocube.id, HBHemoCubeFragment()).commit()
+    }
+
+    fun onErrorReported(msg: String) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
+        if (!isFinishing) onBackPressed()
+    }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.my_menu, menu)
         return true
     }
+
     override fun onDestroy() {
         super.onDestroy()
         if (viewModel.isServiceConnected) {
@@ -173,4 +168,4 @@ class DiagnosticsActivity : AppCompatActivity() {
             viewModel.isServiceConnected = false
         }
     }
-}
+}

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

@@ -0,0 +1,400 @@
+package com.example.hpostesting.presentation.hemocube.hb
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.HemoCubeCommands
+import com.example.hpostesting.data.model.patient.DeviceData
+import com.example.hpostesting.data.model.patient.toHBHemoCubeTestData
+import com.example.hpostesting.presentation.KitScanActivity
+import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.example.hpostesting.presentation.utils.MyDialogListener
+import com.example.hpostesting.presentation.utils.UIUtils
+import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
+import kotlin.math.log10
+
+class HBHemoCubeFragment : Fragment() {
+
+    private lateinit var binding: FragmentHemoCubeReferenceBinding
+    private val hemoCubeViewModel: HBHemoCubeViewModel by activityViewModels()
+    private lateinit var sharedPreferences: SharedPreferences
+    private var isOnline = false
+    private var currentDeviceData: DeviceData? = null
+    private var resultData: String = ""
+    private var isUsingExistingBuffer = false
+    private var isTestOngoing = false
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentHemoCubeReferenceBinding.inflate(inflater, container, false)
+        sharedPreferences =
+            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initViews()
+        observeViewModel()
+        checkAndStartProcess()
+    }
+
+    private fun initViews() {
+        binding.btnSubmit.setOnClickListener {
+            it.isEnabled = false
+            binding.progressBar.visibility = View.VISIBLE
+            hemoCubeViewModel.uploadHBHemoCubeResultToDatabase(
+                isOnline, true, sharedPreferences.getString(Constants.HB_KIT_NUMBER, "")
+            )
+        }
+        if (isTestOngoing) {
+            binding.btnKit.visibility = View.GONE
+            binding.btnKit.isEnabled = false
+            binding.btnKit.isClickable = false
+
+        }
+        binding.btnSubmit.isEnabled = false
+        binding.btnSubmit.isClickable = false
+
+        binding.btnKit.setOnClickListener {
+            if (isTestOngoing) {
+                val title = "WARNING"
+                val message = "There is a on going test, do you want to stop it"
+                val negativeText = getString(R.string.no)
+                val positiveText = "Yes"
+
+                UIUtils.createAlertDialog(requireContext(),
+                    title,
+                    message,
+                    negativeText,
+                    positiveText,
+                    object : MyDialogListener {
+                        override fun onClickNegativeButton() {
+
+                        }
+
+                        override fun onClickPositiveButton() {
+                            resetKitCount()
+                            val intent = Intent(context, KitScanActivity::class.java)
+                            startActivity(intent)
+                            (activity as HBHemoCubeActivity).finish()
+                        }
+                    })
+            }
+        }
+    }
+
+    private fun observeViewModel() {
+        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
+            if (result == "Success") {
+                showToast("Test Results Uploaded Successfully")
+                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
+            }
+            if (result == "Local") {
+                showToast("Internet not available, test details stored locally")
+                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
+            }
+
+            binding.progressBar.visibility = View.GONE
+        }
+
+        hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
+            currentDeviceData = it
+        }
+
+        hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
+            hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
+            isOnline = isNetworkAvailable
+        }
+
+        hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
+            binding.tvSubtitle4.text = it
+        }
+    }
+
+    private fun checkAndStartProcess() {
+        if (isBufferValueAvailable()) {
+            showBufferAlertDialog()
+        } else {
+            listenToHemoCube()
+            startBufferProcess()
+        }
+    }
+
+    private fun isBufferValueAvailable(): Boolean {
+        return if (sharedPreferences.getString(Constants.HB_BUFFER_VALUE_1, "") != "") {
+            sharedPreferences.getString(Constants.HB_BUFFER_VALUE_1, "")
+                ?.toDouble()!! > 0.0
+        } else {
+            false
+        }
+    }
+
+    private fun showBufferAlertDialog() {
+        val title = "WARNING"
+        val message = "Do you want to continue with existing buffer?"
+        val negativeText = getString(R.string.no)
+        val positiveText = "Yes"
+
+        UIUtils.createAlertDialog(requireContext(),
+            title,
+            message,
+            negativeText,
+            positiveText,
+            object : MyDialogListener {
+                override fun onClickNegativeButton() {
+                    listenToHemoCube()
+                    startBufferProcess()
+                    with(sharedPreferences.edit()) {
+                        putString(Constants.HB_BUFFER_VALUE_1, "")
+                        apply()
+                    }
+                }
+
+                override fun onClickPositiveButton() {
+                    listenToHemoCube()
+                    startSampleProcess()
+                    isUsingExistingBuffer = true
+                }
+            })
+    }
+
+    private fun listenToHemoCube() {
+        if (DataHolder.HbHemoCubeTestData == null) {
+            DataHolder.HbHemoCubeTestData = DataHolder.selectedTest?.toHBHemoCubeTestData()
+        }
+
+        hemoCubeViewModel.progressBar.postValue(true)
+
+        val fullReadOutput = StringBuilder()
+        (activity as HBHemoCubeActivity).mService.listenToHemoCube(object : UsbServiceListener {
+            override fun onUsbRead(data: ByteArray?) {
+                data?.let {
+                    val stringData = String(it)
+                    fullReadOutput.append(stringData)
+                    handleUsbData(stringData, fullReadOutput)
+                }
+            }
+
+            override fun onUsbError(e: Exception?) {
+                hemoCubeViewModel.progressBar.postValue(false)
+            }
+        })
+    }
+
+    private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
+        if (stringData.contains("#")) {
+            hemoCubeViewModel.messages.postValue(stringData)
+            isTestOngoing = true
+        }
+
+        resultData += fullReadOutput.toString()
+
+        when {
+            stringData.contains("ERROR 500") -> showError500Dialog()
+            stringData.contains("ERROR 501") -> showError501Dialog()
+            stringData.contains("#Buffer Completed") -> showStartSampleDialog()
+            stringData.contains("#Sample Completed") -> {
+                activity?.runOnUiThread {
+                    binding.btnSubmit.isEnabled = true
+                    binding.btnSubmit.isClickable = true
+                    fetchResult()
+                }
+            }
+
+            stringData.contains("RESULT") || resultData.contains("REND") -> {
+                var validString: String
+                val results: List<String>
+                if (stringData.contains("RESULT")) {
+                    validString = isValidResult(stringData)
+                    if (validString.isEmpty()) {
+                        results = resultData.split("\n")
+                        validString = parseResult(results)
+                    }
+                } else {
+                    results = resultData.split("\n")
+                    validString = parseResult(results)
+                }
+                if (validString.isNotEmpty()) {
+                    handleValidResult(validString, resultData)
+                }
+            }
+        }
+    }
+
+    private fun showError500Dialog() {
+        UIUtils.createAlertDialog(requireContext(),
+            "BUFFER ERROR",
+            "Do you want to continue with existing buffer?",
+            getString(R.string.noo),
+            "Yes",
+            object : MyDialogListener {
+                override fun onClickNegativeButton() {}
+
+                override fun onClickPositiveButton() {
+                    listenToHemoCube()
+                    startBufferProcess()
+                }
+            })
+    }
+
+    private fun showError501Dialog() {
+        UIUtils.createAlertDialog(requireContext(),
+            "SAMPLE ERROR",
+            "Do you want to continue with Sample?",
+            getString(R.string.noo),
+            "Yes",
+            object : MyDialogListener {
+                override fun onClickNegativeButton() {}
+
+                override fun onClickPositiveButton() {
+                    listenToHemoCube()
+                    startSampleProcess()
+                }
+            })
+    }
+
+    private fun showStartSampleDialog() {
+        activity?.runOnUiThread {
+            UIUtils.createAlertDialog(requireContext(),
+                "Start Sample",
+                "Do you want to start sample reading?",
+                getString(R.string.no),
+                "Yes",
+                object : MyDialogListener {
+                    override fun onClickNegativeButton() {}
+
+                    override fun onClickPositiveButton() {
+                        startSampleProcess()
+                    }
+                })
+        }
+    }
+
+    private fun handleValidResult(validString: String, fullReadOutput: String) {
+        try {
+            val result = validString.split(" ")
+            if (result.size == 6) {
+                val deviceSerialNo = result[2]
+                val led1BufferForDevice = if (isUsingExistingBuffer) {
+                    sharedPreferences.getString(Constants.HB_BUFFER_VALUE_1, "")?.toDoubleOrNull()
+                } else {
+                    result[3].toDoubleOrNull()
+                }
+                val led1Sample = result[4].toDoubleOrNull()
+                val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0)
+
+                binding.result.text = "HB Est. - ${((led1Average-0.0177)/0.0237).toString().substring(0, 6)}"
+                DataHolder.HbHemoCubeTestData?.apply {
+                    deviceId = deviceSerialNo
+                    led1Buffer = led1BufferForDevice
+                    this.led1Sample = led1Sample
+                    this.led1Average = led1Average
+                    this.hbEstimation = ((led1Average-0.0177)/0.0237)
+                    this.resultData = fullReadOutput
+                    if (!isBufferValueAvailable()) {
+                        with(sharedPreferences.edit()) {
+                            putString(Constants.HB_BUFFER_VALUE_1, led1Buffer.toString())
+                            apply()
+                        }
+                    }
+                }
+            }
+
+        } catch (_: Exception) {
+
+        }
+
+    }
+
+    private fun showToast(message: String) {
+        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
+    }
+
+    private fun startBufferProcess() {
+        hemoCubeViewModel.progressBar.postValue(true)
+
+        (activity as HBHemoCubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startBuffer,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {}
+
+                override fun onUsbError(e: Exception?) {
+                    hemoCubeViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+
+    private fun startSampleProcess() {
+        hemoCubeViewModel.progressBar.postValue(true)
+
+        (activity as HBHemoCubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startSample,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {}
+
+                override fun onUsbError(e: Exception?) {
+                    hemoCubeViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+
+    private fun fetchResult() {
+        hemoCubeViewModel.progressBar.postValue(true)
+
+        (activity as HBHemoCubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.getSample,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {}
+
+                override fun onUsbError(e: Exception?) {
+                    hemoCubeViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+
+    private fun calculateRatio(ratio: Double): Double {
+        val coefficient1 = currentDeviceData?.hbCoefficients?.get(0) ?: 0.0
+        val coefficient2 = currentDeviceData?.hbCoefficients?.get(1) ?: 0.0
+        return coefficient1 * ratio + coefficient2
+    }
+
+    private fun parseResult(frames: List<String>): String {
+        val lines = mutableListOf<String>()
+        for (frame in frames.reversed()) {
+            if (frame.contains("REND") || frame.contains("RESULT")) lines += frame
+            if (frame.contains("RESULT")) {
+                break
+            }
+        }
+        val line = lines.reversed().joinToString("").trim()
+        if (line.contains("RESULT") && line.split(" ").size == 6) {
+            return line
+        }
+        return ""
+    }
+
+    private fun isValidResult(line: String): String {
+        return if (line.contains("RESULT") && line.split(" ").size == 6) {
+            line
+        } else {
+            ""
+        }
+    }
+
+    private fun resetKitCount() {
+        with(sharedPreferences.edit()) {
+            putString(Constants.KIT_NUMBER, "")
+            putInt(Constants.KIT_COUNT, 0)
+            apply()
+        }
+    }
+}

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

@@ -0,0 +1,138 @@
+package com.example.hpostesting.presentation.hemocube.hb
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.NetworkStatusLiveData
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.dao.HBHemoCubeDao
+import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.model.patient.DeviceData
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.toHBHemoCubeTestData
+import com.example.hpostesting.data.repository.DatabaseRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
+import javax.inject.Inject
+
+@HiltViewModel
+class HBHemoCubeViewModel @Inject constructor(
+    private val hbHemoCubeDao: HBHemoCubeDao,
+    private val repository: DatabaseRepository,
+    context: Context,
+) : ViewModel() {
+    var isServiceConnected = false
+    val progressBar = MutableLiveData(false)
+    val testDetails = DataHolder.selectedTest?.toHBHemoCubeTestData()
+    val messages = MutableLiveData<String>()
+    private val sharedPreference: SharedPreferences =
+        context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+
+    // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
+
+    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    val allUserData = hbHemoCubeDao.getAll()
+    val deviceData = MutableLiveData<DeviceData?>()
+    val networkStatusLiveData: LiveData<Boolean>
+        get() = _networkStatusLiveData
+    val fireBaseUpload = MutableLiveData<String>()
+    fun uploadHBHemoCubeResultToDatabase(
+        isOnline: Boolean, testStatus: Boolean, kitSerial: String?
+    ) = viewModelScope.launch {
+        if (kitSerial != null) {
+            testDetails?.kitSerial = kitSerial
+        }
+        testDetails?.testStatus = testStatus
+
+        try {
+            if (isOnline) {
+                addResultTestToDb()
+            } else {
+                testDetails?.testTime = SimpleDateFormat(
+                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                ).format(Calendar.getInstance().time)
+                hbHemoCubeDao.insertAll(testDetails!!)
+                fireBaseUpload.postValue("Local")
+            }
+        } catch (e: Exception) {
+            Log.e("Testdb", "Upload failed: ${e.message}")
+        }
+    }
+
+    fun getDeviceData(deviceId: String?) = viewModelScope.launch {
+        deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
+    }
+
+    private fun addResultTestToDb() {
+        testDetails?.resultData = DataHolder.HbHemoCubeTestData?.resultData.toString()
+        testDetails?.location = DataHolder.location
+        testDetails?.testTime = SimpleDateFormat(
+            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+        ).format(Calendar.getInstance().time)
+
+        testDetails?.deviceId = DataHolder.HbHemoCubeTestData?.deviceId
+        testDetails?.deviceSerialNumber =
+            sharedPreference.getString(Constants.USER_ID, "").toString()
+        testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
+        testDetails?.led1Buffer = DataHolder.HbHemoCubeTestData?.led1Buffer
+        testDetails?.led1Sample = DataHolder.HbHemoCubeTestData?.led1Sample
+        testDetails?.led1Average = DataHolder.HbHemoCubeTestData?.led1Average
+        testDetails?.hbEstimation = DataHolder.HbHemoCubeTestData?.hbEstimation
+
+        viewModelScope.launch {
+            try {
+                testDetails!!.reportUploadTime = SimpleDateFormat(
+                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                ).format(Calendar.getInstance().time)
+
+                when (val response = repository.addTestToDatabase(testDetails)) {
+                    is Response.Success -> {
+                        val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
+                        with(sharedPreference.edit()) {
+                            putInt(Constants.KIT_COUNT, kitCount.plus(1))
+                            apply()
+                        }
+                        Log.i("Testdb", "Data uploaded to Firestore successfully")
+                        fireBaseUpload.postValue("Success")
+                    }
+
+                    is Response.Error -> {
+                        Log.e("Testdb", "Error uploading data to Firestore: $response")
+                        fireBaseUpload.postValue("Error")
+                    }
+
+                }
+            } catch (e: Exception) {
+                Log.e("Testdb", "Exception during data upload: ${e.message}")
+                fireBaseUpload.postValue("Error")
+            }
+        }
+    }
+
+    fun bulkAddResultTestToDb(userData: HemoCubeTestData) {
+        viewModelScope.launch {
+            userData.reportUploadTime = SimpleDateFormat(
+                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+            ).format(Calendar.getInstance().time)
+            when (repository.addTestToDatabase(userData)) {
+                is Response.Success -> {
+                    fireBaseUpload.postValue("Success")
+                }
+
+                else -> {}
+            }
+        }
+    }
+
+    fun deleteById(userId: String) = viewModelScope.launch {
+        hbHemoCubeDao.deleteById(id = userId)
+    }
+}

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

@@ -1,6 +1,5 @@
 package com.example.hpostesting.presentation.testRight
 
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -15,6 +14,7 @@ import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.test.TestRightResultType
 import com.example.hpostesting.data.model.test.TestType
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.util.MyUtils.calculateAgeFromYOB
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.ktx.firestore

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

@@ -2,6 +2,7 @@ package com.example.hpostesting.presentation.testRight
 
 import android.content.Context
 import android.net.Uri
+import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel

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

@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#000000" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/black" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>

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

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_parent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/my_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:titleTextColor="#FFFFFF"
-            android:elevation="4dp"
-            app:menu="@menu/my_menu"
-            android:theme="@style/ToolbarTheme"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
-
-        <FrameLayout
-            android:id="@+id/fg_hc_buffer_check"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/my_toolbar"
-            app:layout_constraintBottom_toBottomOf="parent"
-            tools:context=".presentation.buffercheck.HemocubeBufferCheckActivity">
-
-        </FrameLayout>
-
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

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

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_parent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-<!--        <androidx.appcompat.widget.Toolbar-->
-<!--            android:id="@+id/my_toolbar"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="?attr/actionBarSize"-->
-<!--            android:background="?attr/colorPrimary"-->
-<!--            app:titleTextColor="#FFFFFF"-->
-<!--            android:elevation="4dp"-->
-<!--            app:menu="@menu/my_menu"-->
-<!--            android:theme="@style/ToolbarTheme"-->
-<!--            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toTopOf="parent"/>-->
-
-        <FrameLayout
-            android:id="@+id/fg_diagnostics"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            tools:context=".presentation.diagnostics.DiagnosticsActivity">
-
-        </FrameLayout>
-
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

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

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_parent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.appcompat.widget.Toolbar
-            android:visibility="gone"
-            android:id="@+id/my_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:titleTextColor="#FFFFFF"
-            android:elevation="4dp"
-            app:menu="@menu/my_menu"
-            android:theme="@style/ToolbarTheme"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <FrameLayout
-            android:id="@+id/fghemocube"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@id/my_toolbar"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent">
-
-            <!-- NavHostFragment for navigation -->
-
-        </FrameLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

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

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_parent"
         android:layout_width="match_parent"
@@ -19,17 +21,21 @@
             android:theme="@style/ToolbarTheme"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <FrameLayout
             android:id="@+id/fghemocube"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@id/my_toolbar"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/my_toolbar"
+            app:layout_constraintBottom_toBottomOf="parent"
             tools:context=".presentation.hemocube.HemocubeActivity">
+
         </FrameLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

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

@@ -18,6 +18,4 @@
         app:layout_constraintTop_toTopOf="parent"
         app:navGraph="@navigation/dashboard_navigation" />
 
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/til_blood_group"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <AutoCompleteTextView
-            android:id="@+id/et_blood_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/select_blood_group"
-            android:inputType="none"
-            android:labelFor="@id/til_blood_group"
-            app:simpleItems="@array/blood_group" />
-    </com.google.android.material.textfield.TextInputLayout>
-</LinearLayout>

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

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.example.hpostesting.presentation.diagnostics.DiagnosticsFragment">
-
-
-    <!--        <TextView-->
-    <!--            android:id="@+id/tv_title"-->
-    <!--            style="@style/title1"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:layout_marginHorizontal="24dp"-->
-    <!--            android:text="@string/diagnostics"-->
-    <!--            android:layout_marginTop="16dp"-->
-    <!--            app:layout_constraintStart_toStartOf="parent"-->
-    <!--            app:layout_constraintTop_toTopOf="parent" />-->
-
-    <TextView
-        android:id="@+id/tv_subtitle2"
-        style="@style/title2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="16dp"
-        android:text="@string/diagnostics"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tv_subtitle3"
-        style="@style/title2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-
-        android:layout_marginTop="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
-
-    <TextView
-        android:id="@+id/tv_subtitle4"
-        style="@style/title1_1"
-        android:layout_width="0dp"
-        android:layout_height="380dp"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="16dp"
-        android:gravity="center"
-        android:text="Start"
-        android:textColor="@color/red"
-        android:textSize="22sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
-
-
-    <Button
-        android:id="@+id/btn_submit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:gravity="center"
-        android:text="Start"
-        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
-
-    <!--        <Button-->
-    <!--            android:id="@+id/btn_read"-->
-    <!--            android:layout_width="wrap_content"-->
-    <!--            android:layout_height="wrap_content"-->
-    <!--            android:text="@string/read"-->
-    <!--            android:layout_margin="16dp"-->
-    <!--            android:clickable="false"-->
-    <!--            app:layout_constraintTop_toBottomOf="@id/btn_set_reference"-->
-    <!--            app:layout_constraintStart_toStartOf="parent" />-->
-
-    <!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:elevation="12dp"
-        android:indeterminate="true"
-        android:indeterminateDrawable="@drawable/progressbar_drawable"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    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">
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/userCard"
-        android:layout_width="match_parent"
-        android:layout_height="350dp"
-        android:layout_marginTop="24dp"
-        app:cardBackgroundColor="#C0C0C0"
-        app:cardCornerRadius="25dp"
-        app:cardElevation="0dp"
-        app:layout_constraintTop_toTopOf="parent">
-
-
-        <FrameLayout
-            android:id="@+id/fragment_container_layout"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:background="@android:color/background_light"/>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="22dp">
-
-            <ImageView
-                android:id="@+id/userImage"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:src="@drawable/karnataka" />
-
-            <ImageView
-                android:id="@+id/userName"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintTop_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/userImage"
-                app:layout_constraintTop_toTopOf="@+id/userImage"
-                android:src="@drawable/sickle_cell_gov_logo"/>
-
-
-            <ImageView
-                android:id="@+id/userImage3"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/userName"
-                app:layout_constraintTop_toTopOf="@+id/userName"
-                android:src="@drawable/indianoil"/>
-
-
-
-
-            <androidx.cardview.widget.CardView
-                android:id="@+id/userdetails"
-                android:layout_width="150dp"
-                android:layout_height="120dp"
-                android:layout_marginTop="24dp"
-                app:cardBackgroundColor="#FFFFFF"
-                app:cardCornerRadius="5dp"
-                app:layout_constraintTop_toBottomOf="@id/userImage"
-                app:cardElevation="0dp"
-                tools:ignore="MissingConstraints">
-
-                <TextView
-                    android:id="@+id/name"
-                    style="@style/title1_1"
-                    android:layout_width="80dp"
-                    android:layout_height="20dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="10dp"
-                    android:gravity="center"
-                    android:textColor="@color/black"
-                    android:textSize="10sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/userImage"
-                    android:text="name: Mariya" />
-
-
-                <TextView
-                    android:id="@+id/dob"
-                    style="@style/title1_1"
-                    android:layout_width="80dp"
-                    android:layout_height="20dp"
-                    android:layout_marginStart="16dp"
-                    android:gravity="center"
-                    android:layout_marginTop="30dp"
-                    android:textColor="@color/black"
-                    android:textSize="10sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/name"
-                    app:layout_constraintTop_toBottomOf="@id/name"
-                    android:text="DOB: 1998" />
-
-
-                <TextView
-                    android:id="@+id/gender"
-                    style="@style/title1_1"
-                    android:layout_width="80dp"
-                    android:layout_height="20dp"
-                    android:layout_marginStart="16dp"
-                    android:gravity="center"
-                    android:layout_marginTop="50dp"
-                    android:textColor="@color/black"
-                    android:textSize="10sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/dob"
-                    app:layout_constraintTop_toBottomOf="@id/dob"
-                    android:text="gender: female" />
-
-
-                <TextView
-                    android:id="@+id/State"
-                    style="@style/title1_1"
-                    android:layout_width="130dp"
-                    android:layout_height="20dp"
-
-                    android:gravity="center"
-                    android:layout_marginTop="70dp"
-                    android:textColor="@color/black"
-                    android:textSize="10sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/gender"
-                    app:layout_constraintTop_toBottomOf="@id/gender"
-                    android:text="State: Kerala" />
-
-            </androidx.cardview.widget.CardView>
-            <androidx.cardview.widget.CardView
-                android:id="@+id/userdetails2"
-                android:layout_width="150dp"
-                android:layout_marginStart="10dp"
-                android:layout_height="120dp"
-                android:layout_marginTop="24dp"
-                app:cardBackgroundColor="#FFFFFF"
-                app:cardCornerRadius="5dp"
-                app:layout_constraintTop_toBottomOf="@id/userImage3"
-                app:layout_constraintStart_toEndOf="@+id/userdetails"
-                app:cardElevation="0dp">
-
-                <TextView
-                    android:id="@+id/abhaid"
-                    style="@style/title1_1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="20dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="10dp"
-                    android:gravity="start"
-                    android:textColor="@color/black"
-                    android:textSize="10sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/userImage3"
-                    android:text="ABHA-ID: XXXX-8734" />
-
-                <TextView
-                    android:id="@+id/blood"
-                    style="@style/title1_1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="20dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="30dp"
-                    android:gravity="start"
-                    android:textColor="@color/black"
-                    android:textSize="10sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/userImage3"
-                    android:text="Blood Group: O +ve" />
-                <TextView
-                    android:id="@+id/sicklecell"
-                    style="@style/title1_1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="20dp"
-                    android:layout_marginStart="6dp"
-                    android:layout_marginTop="50dp"
-                    android:gravity="start"
-                    android:textColor="@color/black"
-                    android:textSize="10sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/userImage3"
-                    android:text="Sickle-Cell: Normal (HbA)" />
-                <TextView
-                    android:id="@+id/issueDate"
-                    style="@style/title1_1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="20dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="70dp"
-                    android:gravity="start"
-                    android:textColor="@color/black"
-                    android:textSize="10sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/userImage3"
-                    android:text="Issue Date: Oct 2,2023" />
-
-
-            </androidx.cardview.widget.CardView>
-
-
-            <Button
-                android:id="@+id/digitalcard"
-                android:backgroundTint="#00008B"
-                app:cardBackgroundColor="#00008B"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
-                android:layout_marginTop="20dp"
-                android:text="@string/digital_card"
-                android:textColor="@color/white"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/userdetails" />
-
-            <ProgressBar
-                android:id="@+id/progressBar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:elevation="12dp"
-                android:indeterminate="true"
-                android:indeterminateDrawable="@drawable/progressbar_drawable"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -4,33 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.example.hpostesting.presentation.dashboard.GalleryFragment">
+   >
 
-    <Button
-        android:id="@+id/btn_submit"
-        android:layout_width="wrap_content"
+    <TextView
+        android:id="@+id/text_gallery"
+        style="@style/title1"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/check_buffer"
-        android:textColor="@color/white"
+        android:layout_margin="24dp"
+        android:textAlignment="center"
+        android:textSize="20sp"
+        android:text="@string/to_be_launched_in_next_version_of_the_app"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
-
-    <Button
-        android:id="@+id/btn_diagnostics"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/diagnostics"
-        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,187 +0,0 @@
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.example.hpostesting.presentation.buffercheck.HemoCubeBufferCheckFragment">
-
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_parent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/tv_title"
-            style="@style/title1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/Instructions"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_subtitle2"
-            style="@style/title2"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/step4"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title" />
-
-        <!--        <TextView-->
-        <!--            android:id="@+id/tv_subtitle3"-->
-        <!--            style="@style/title2"-->
-        <!--            android:layout_width="0dp"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="24dp"-->
-        <!--            android:layout_marginTop="16dp"-->
-        <!--            android:text="@string/step5"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->
-
-        <TextView
-            android:id="@+id/tv_name"
-            style="@style/title2"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btn_submit" />
-
-        <TextView
-            android:id="@+id/tv_subtitle4"
-            style="@style/title1_1"
-            android:layout_width="0dp"
-            android:layout_height="80dp"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:textColor="@color/red"
-            android:textSize="18sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
-
-
-        <!--        <Button-->
-        <!--            android:visibility="gone"-->
-        <!--            android:id="@+id/btn_samplestart"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="16dp"-->
-        <!--            android:layout_marginTop="24dp"-->
-        <!--            android:clickable="false"-->
-        <!--            android:text="@string/Start_Sample"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/til_blood_group" />-->
-
-
-        <!--        <Button-->
-        <!--            android:id="@+id/btn_placebuffer"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="16dp"-->
-        <!--            android:layout_marginTop="24dp"-->
-        <!--            android:clickable="false"-->
-        <!--            android:text="@string/place_buffer"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/btn_submit" />-->
-
-
-        <Button
-            android:id="@+id/btn_submit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/submit"
-            android:textColor="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
-
-        <!--        <com.google.android.material.textfield.TextInputLayout-->
-        <!--            android:id="@+id/til_blood_group"-->
-        <!--            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"-->
-        <!--            android:layout_width="match_parent"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="24dp"-->
-        <!--            android:layout_marginTop="16dp"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4">-->
-
-        <!--            <AutoCompleteTextView-->
-        <!--                android:id="@+id/et_blood_group"-->
-        <!--                android:layout_width="match_parent"-->
-        <!--                android:layout_height="wrap_content"-->
-        <!--                android:hint="@string/select_blood_group"-->
-        <!--                android:inputType="none"-->
-        <!--                android:labelFor="@id/til_blood_group"-->
-        <!--                app:simpleItems="@array/blood_group" />-->
-
-        <!--        </com.google.android.material.textfield.TextInputLayout>-->
-
-        <!--        <Button-->
-        <!--            android:id="@+id/btn_kit"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_margin="10dp"-->
-        <!--            android:text="@string/new_kit"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent" />-->
-
-        <!--        <Button-->
-        <!--            android:id="@+id/btn_buffer"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:text="@string/new_buffer"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            android:layout_margin="10dp"-->
-        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintEnd_toStartOf="@id/btn_kit"/>-->
-
-        <!--        <Button-->
-        <!--            android:id="@+id/btn_read"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:text="@string/read"-->
-        <!--            android:layout_margin="16dp"-->
-        <!--            android:clickable="false"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/btn_set_reference"-->
-        <!--            app:layout_constraintStart_toStartOf="parent" />-->
-
-        <!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-        <ProgressBar
-            android:id="@+id/progressBar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:elevation="12dp"
-            android:indeterminate="true"
-            android:indeterminateDrawable="@drawable/progressbar_drawable"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>

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

@@ -16,7 +16,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="16dp"
-            android:text="@string/Instructions"
+            android:text="HB TESTING INSTRUCTIONS"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -27,36 +27,22 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="24dp"
             android:layout_marginTop="16dp"
+            android:text="@string/step4"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title" />
 
-        <!--        <TextView-->
-        <!--            android:id="@+id/tv_subtitle3"-->
-        <!--            style="@style/title2"-->
-        <!--            android:layout_width="0dp"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="24dp"-->
-        <!--            android:layout_marginTop="16dp"-->
-        <!--            android:text="@string/step5"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->
-
         <TextView
-            android:id="@+id/tv_name"
+            android:id="@+id/tv_subtitle3"
             style="@style/title2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="24dp"
-            android:gravity="center"
-            android:padding="12dp"
-            android:layout_marginTop="26dp"
-            android:textFontWeight="700"
-            android:text="Name: SMI\n ID: 1672282828"
+            android:layout_marginTop="16dp"
+            android:text="@string/step5"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="MissingConstraints" />
+            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
 
         <TextView
             android:id="@+id/tv_subtitle4"
@@ -64,93 +50,15 @@
             android:layout_width="0dp"
             android:layout_height="80dp"
             android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="72dp"
+            android:layout_marginTop="16dp"
             android:gravity="center"
             android:textColor="@color/red"
-            android:textSize="18sp"
+            android:textSize="22sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/et_abha_id" />
-
-
-        <!--        <Button-->
-        <!--            android:visibility="gone"-->
-        <!--            android:id="@+id/btn_samplestart"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="16dp"-->
-        <!--            android:layout_marginTop="24dp"-->
-        <!--            android:clickable="false"-->
-        <!--            android:text="@string/Start_Sample"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/til_blood_group" />-->
-
-
-        <!--        <Button-->
-        <!--            android:id="@+id/btn_placebuffer"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="16dp"-->
-        <!--            android:layout_marginTop="24dp"-->
-        <!--            android:clickable="false"-->
-        <!--            android:text="@string/place_buffer"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/btn_submit" />-->
-
-
-        <TextView
-            android:id="@+id/tv_title2"
-            style="@style/title1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="48dp"
-            android:text="@string/enter_kit_serial_number_manually"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="MissingConstraints" />
-
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/et_abha_id"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="20dp"
-            app:layout_constraintEnd_toStartOf="@id/btn_go"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title2">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/name_edit_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLength="17"
-                android:inputType="text"
-                android:hint="@string/serial_number" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_go"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="24dp"
-            android:text="@string/go"
-            app:cornerRadius="16dp"
-            app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toEndOf="@id/et_abha_id"
-            app:layout_constraintTop_toTopOf="@id/et_abha_id" />
-
+            app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
 
         <Button
-            android:visibility="gone"
             android:id="@+id/btn_submit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -163,64 +71,43 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
 
+        <Button
+            android:id="@+id/btn_kit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="@string/new_kit"
+            android:textColor="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
         <TextView
-            android:id="@+id/error_message"
+            android:id="@+id/result"
             style="@style/title1_1"
-            android:visibility="gone"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="80dp"
             android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="172dp"
+            android:layout_marginTop="16dp"
             android:gravity="center"
+            tools:text="HB Est. : 16.254 g/dl"
             android:textColor="@color/red"
-            android:textSize="18sp"
+            android:textSize="28sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btn_submit" />
 
-        <!--        <com.google.android.material.textfield.TextInputLayout-->
-        <!--            android:id="@+id/til_blood_group"-->
-        <!--            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"-->
-        <!--            android:layout_width="match_parent"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="24dp"-->
-        <!--            android:layout_marginTop="16dp"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4">-->
-
-        <!--            <AutoCompleteTextView-->
-        <!--                android:id="@+id/et_blood_group"-->
-        <!--                android:layout_width="match_parent"-->
-        <!--                android:layout_height="wrap_content"-->
-        <!--                android:hint="@string/select_blood_group"-->
-        <!--                android:inputType="none"-->
-        <!--                android:labelFor="@id/til_blood_group"-->
-        <!--                app:simpleItems="@array/blood_group" />-->
-
-        <!--        </com.google.android.material.textfield.TextInputLayout>-->
 
         <!--        <Button-->
-        <!--            android:id="@+id/btn_kit"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_margin="10dp"-->
-        <!--            android:text="@string/new_kit"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent" />-->
-
-        <!--        <Button-->
-        <!--            android:id="@+id/btn_buffer"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:text="@string/new_buffer"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            android:layout_margin="10dp"-->
-        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintEnd_toStartOf="@id/btn_kit"/>-->
+<!--            android:id="@+id/btn_buffer"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:text="@string/new_buffer"-->
+<!--            android:textColor="@color/white"-->
+<!--            android:layout_margin="10dp"-->
+<!--            app:layout_constraintBottom_toBottomOf="parent"-->
+<!--            app:layout_constraintStart_toStartOf="parent"-->
+<!--            app:layout_constraintEnd_toStartOf="@id/btn_kit"/>-->
 
         <!--        <Button-->
         <!--            android:id="@+id/btn_read"-->
@@ -248,6 +135,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

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

@@ -22,7 +22,7 @@
         android:id="@+id/internetNotAvailableCL"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="visible"
+        android:visibility="gone"
         android:padding="24dp">
 
         <TextView
@@ -57,27 +57,6 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/til_blood_group"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="24dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/til_name">
-
-            <AutoCompleteTextView
-                android:id="@+id/et_blood_group"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/select_blood_group"
-                android:inputType="none"
-                android:labelFor="@id/til_blood_group"
-                app:simpleItems="@array/blood_group" />
-        </com.google.android.material.textfield.TextInputLayout>
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_submit"
             android:layout_width="match_parent"
@@ -87,18 +66,7 @@
             app:cornerRadius="100dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/til_blood_group" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_order_offline"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btn_submit"
-            tools:listitem="@layout/offline_user_list_view" />
+            app:layout_constraintTop_toBottomOf="@+id/til_name" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -106,7 +74,7 @@
         android:id="@+id/internetAvailableCL"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
+        android:visibility="visible"
         android:padding="24dp">
 
         <TextView
@@ -226,27 +194,6 @@
             app:layout_constraintTop_toBottomOf="@+id/radioGroup"
             tools:listitem="@layout/user_item_view"/>
 
-        <TextView
-            android:id="@+id/label"
-            style="@style/title1_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/new_kit"
-            app:layout_constraintBottom_toTopOf="@+id/btnNewKit"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/btnNewKit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:backgroundTint="@color/primary"
-            android:contentDescription="@string/new_kit"
-            android:src="@drawable/ic_add"
-            app:elevation="1dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -1,14 +1,12 @@
-<!-- SlideshowFragment layout -->
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.example.hpostesting.presentation.dashboard.SlideshowFragment">
+    tools:context=".presentation.dashboard.SlideshowFragment">
 
     <TextView
-        android:visibility="gone"
         android:id="@+id/text_slideshow"
         style="@style/title1"
         android:layout_width="match_parent"
@@ -21,16 +19,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
-    <!-- Language Settings -->
-    <FrameLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/text_slideshow"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-
-
-    </FrameLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,23 +0,0 @@
-<!-- language_spinner_preference.xml -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <!-- Select Language -->
-    <TextView
-        android:id="@+id/textSelectLanguage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Select Language"
-        android:textStyle="bold"
-        android:textSize="18sp"/>
-
-    <!-- Language Spinner -->
-    <Spinner
-        android:id="@+id/languageSpinner"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"/>
-</LinearLayout>

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

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/userCard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        app:cardBackgroundColor="@color/primary_light"
-        app:cardCornerRadius="25dp"
-        app:cardElevation="0dp"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="12dp">
-
-            <TextView
-                android:id="@+id/userID"
-                style="@style/title1_1"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:gravity="start"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="Name: MohamedKaif" />
-
-            <TextView
-                android:id="@+id/bloodGroup"
-                style="@style/title1_1"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="4dp"
-                android:gravity="start"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/userID"
-                tools:text="UserID: MohamedKaif" />
-            <TextView
-                android:id="@+id/teststatus"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                style="@style/title1_1"
-                android:layout_marginTop="4dp"
-                android:layout_marginStart="16dp"
-                android:gravity="start"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/bloodGroup"
-                tools:text="Test Status: Completed"/>
-
-            <TextView
-                android:id="@+id/time"
-                style="@style/title1_1"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="4dp"
-                android:gravity="start"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/teststatus"
-                tools:text="startedAt: yyyy-MM-dd HH:mm:ss" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -72,25 +72,6 @@
                 app:layout_constraintTop_toBottomOf="@id/userId"
                 tools:text="Test Status: Completed"/>
 
-            <Button
-                android:id="@+id/btn_startIncubation"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
-                android:text="@string/start_incubation"
-                android:visibility="gone"
-                android:textColor="@color/white"
-                app:layout_constraintStart_toEndOf="@+id/btn_blood"
-                app:layout_constraintBottom_toBottomOf="@+id/btn_blood" />
-            <Button
-                android:id="@+id/btn_blood"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
-                android:text="@string/blood_group"
-                android:textColor="@color/white"
-                app:layout_constraintEnd_toStartOf="@+id/btn_startIncubation"
-                app:layout_constraintTop_toBottomOf="@id/teststatus" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/navigation_graph"
-    app:startDestination="@id/hemoCubeFragment">
-
-    <fragment
-        android:id="@+id/hemoCubeFragment"
-        android:name="com.example.hpostesting.presentation.hemocube.HemoCubeFragment"
-        android:label="fragment_hemo_cube_reference"
-        tools:layout="@layout/fragment_hemo_cube_reference" >
-        <action
-            android:id="@+id/action_hemoCubeFragment_to_digitalCardFragment"
-            app:destination="@id/digitalCardFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/digitalCardFragment"
-        android:name="com.example.hpostesting.presentation.hemocube.DigitalCardFragment"
-        android:label="fragment_digital_card"
-        tools:layout="@layout/fragment_digital_card" />
-</navigation>

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

@@ -1,259 +0,0 @@
-<resources>
-    <string name="app_name">HPOS Testing</string>
-
-    <string-array name="instrument">
-        <item>TestRight</item>
-        <item>Denovix</item>
-    </string-array>
-
-    <string-array name="gender">
-        <item>Male</item>
-        <item>Female</item>
-        <item>Other</item>
-    </string-array>
-
-    <string-array name="yes_no">
-        <item>Yes</item>
-        <item>No</item>
-    </string-array>
-
-    <string-array name="category">
-        <item>GEN</item>
-        <item>OBC</item>
-        <item>SC</item>
-        <item>ST</item>
-    </string-array>
-
-    <string-array name="blood_group">
-        <item>O+ve</item>
-        <item>O-ve</item>
-        <item>A+ve</item>
-        <item>A-ve</item>
-        <item>B+ve</item>
-        <item>B-ve</item>
-        <item>AB+ve</item>
-        <item>AB-ve</item>
-    </string-array>
-
-    <string name="hello_blank_fragment">नमस्ते खाली फ्रेगमेंट</string>
-    <string name="select_the_test">टेस्ट का चयन करें</string>
-    <string name="set_reference">संदर्भ सेट करें</string>
-
-    <!-- Alert Dialog -->
-    <string name="have_you_placed">क्या आपने संदर्भ नमूने की कुवेट रख दी है?</string>
-    <string name="please_place">कृपया चलने से पहले संदर्भ के रूप में नमूने की कुवेट रखें</string>
-    <string name="yes">हाँ</string>
-    <string name="no">नहीं</string>
-    <string name="noo"></string>
-
-    <string name="connect">कनेक्ट</string>
-    <string name="connected">कनेक्ट किया गया</string>
-    <string name="read">पढ़ें</string>
-    <string name="update_reference">संदर्भ अपडेट करें</string>
-
-    <string name="have_you_placed_sample">क्या आपने नमूने के साथ कुवेट रख दी है?</string>
-    <string name="please_place_sample">कृपया चलने से पहले नमूने की कुवेट रखें</string>
-    <string name="yes_and_run">हाँ, चलाएं</string>
-
-
-    <!--  Instructions Text  -->
-    <string name="Instructions">परीक्षण निर्देश</string>
-    <string name="step1"><b><u>कदम 1</u>  : </b> संदर्भ/बेसलाइन सैम्पल को संदर्भ के लिए रखें, जिसमें कुवेट है।</string>
-    <string name="step2"><b><u>कदम 2</u>  : </b> डिवाइस को मूल्य पढ़ने के लिए नीचे बटन दबाएं।</string>
-
-    <string name="step3"><b><u>कदम 1</u>  : </b> शुरू करने के लिए सैम्पल विवरण दर्ज करें।</string>
-    <string name="step4"><b><u>कदम 1</u>  : </b> एक्सपेरिमेंट के लिए सैम्पल भरी ब्लड सैम्पल को संदर्भ के लिए कुवेट में रखें।</string>
-    <string name="step5"><b><u>कदम 2</u>  : </b> डिवाइस को मूल्य पढ़ने के लिए नीचे बटन दबाएं।</string>
-
-    <string name="login_id">लॉगिन आईडी</string>
-    <string name="password">पासवर्ड</string>
-    <string name="login">लॉगिन</string>
-    <string name="acquire">प्राप्त करें</string>
-    <string name="enter_patient_details">रोगी विवरण दर्ज करें</string>
-    <string name="patient_name">रोगी का नाम</string>
-    <string name="age">आयु (वर्षों में)</string>
-    <string name="gender">लिंग</string>
-    <string name="name_error">नाम खाली नहीं हो सकता</string>
-    <string name="age_error">आयु खाली नहीं हो सकती</string>
-    <string name="gender_error">लिंग खाली नहीं हो सकती</string>
-    <string name="age_error_out_of_bound">आयु वैध होनी चाहिए</string>
-
-
-    <string name="yob_error">जन्म की वर्ष साल नहीं हो सकता</string>
-    <string name="yob_error_2">अमान्य जन्म की वर्ष</string>
-    <string name="mobile_error">मोबाइल नंबर खाली नहीं हो सकता</string>
-    <string name="mobile_error_invalid">मोबाइल नंबर अमान्य है (10 अंक दर्ज करें)</string>
-    <string name="this_error">यह खाली नहीं हो सकता</string>
-
-    <string name="test_results">परीक्षण परिणाम</string>
-    <string name="name_in_textview"><b>नाम</b> : %1$s</string>
-    <string name="gender_in_textview"><b>लिंग</b> : %1$s</string>
-    <string name="age_in_textview"><b>आयु</b> : %1$s वर्ष</string>
-    <string name="results_in_textview"><b>परिणाम</b> :</string>
-    <string name="negative">नेगेटिव</string>
-    <string name="download_report">रिपोर्ट डाउनलोड करें</string>
-    <string name="home">होम</string>
-    <string name="new_test">नया परीक्षण</string>
-    <string name="start_now">अब शुरू करें</string>
-    <string name="hemo_cube">हेमो क्यूब</string>
-    <string name="hb">एचबी</string>
-    <string name="normal">सामान्य</string>
-    <string name="sickle_cell_disease">सिक्ल सेल रोग</string>
-    <string name="sickle_cell_trait">सिक्ल सेल ट्रेट</string>
-    <string name="undefined">अनिर्धारित</string>
-    <string name="sicklecell_nconfirmatory">सिक्लसेल\nनिश्चित</string>
-    <string name="sicklecell_screening">सिक्लसेल स्क्रीनिंग</string>
-    <string name="thalassemia">थैलसेमिया</string>
-    <string name="usb_connection">यूएसबी कनेक्शन</string>
-    <string name="high_performance_optical_spectroscopy">उच्च प्रदर्शन ऑप्टिकल स्पेक्ट्रोस्कोपी</string>
-    <string name="sickle_cert">सिक्ल प्रमाणपत्र</string>
-    <string name="sickle_find">सिक्ल फाइंड</string>
-    <string name="submit">सबमिट करें</string>
-    <string name="diagnostics">डिवाइस नुस्खा</string>
-    <string name="place_buffer">स्थान</string>
-    <string name="Start_Sample">सैम्पल शुरू करें</string>
-    <string name="new_kit">नया किट</string>
-    <string name="new_buffer">नया बफर</string>
-    <string name="name_error_2">अमान्य वर्ण, अनुमत अक्षर हैं अक्षर, संख्या और ( ) _ - , . केवल</string>
-    <string name="recommended">\*परिणाम को प्रमाणित करने के लिए प्रयोगशाला परीक्षण के साथ</string>
-    <string name="recommended_age">\*परिणाम को प्रमाणित करने के लिए प्रयोगशाला परीक्षण के साथ, चिकित्सक की आयु 5 वर्षों से कम है</string>
-    <string name="positive_borderline">सकारात्मक सीमारेखा</string>
-    <string name="negative_borderline">नकारात्मक सीमारेखा</string>
-    <string name="is_patient_under_any_medication">क्या रोगी को कोई दवा या उपचार हो रहा है?</string>
-    <string name="is_patient_undergoing_any_blood_transfusion">क्या रोगी को कोई रक्त प्रसूति हो रही है?</string>
-    <string name="scan_aadhaar_card">स्कैन आधार कार्ड</string>
-    <string name="patient_details">रोगी विवरण</string>
-    <string name="or">या</string>
-    <string name="scan_abha_card">स्कैन अभा कार्ड</string>
-    <string name="list_of_patients">रोगियों की सूची</string>
-    <string name="no_patient_records_found_to_test_please_add_one_from_below">परीक्षण के लिए कोई रोगी रिकॉर्ड नहीं मिला। कृपया नीचे से एक जोड़ें।</string>
-    <string name="add">जोड़ें</string>
-    <string name="test">परीक्षण</string>
-    <string name="pending">बकाया</string>
-    <string name="scan_patient_abha_id_card">रोगी अभा आईडी कार्ड स्कैन करें</string>
-    <string name="scan_now">अब स्कैन करें</string>
-    <string name="enter_abha_number_manualy">अभा नंबर हैंडपंजी से दर्ज करें</string>
-    <string name="abha_id">अभा आईडी</string>
-    <string name="patient_id_in_tv"><b>उपयोगकर्ता आईडी</b> : %1$s</string>
-    <string name="go">जाएं</string>
-    <string name="click_here">यहां क्लिक करें</string>
-    <string name="title_activity_dashboard">डैशबोर्ड गतिविधि</string>
-    <string name="navigation_drawer_open">नेविगेशन ड्रॉयर खोलें</string>
-    <string name="navigation_drawer_close">नेविगेशन ड्रॉयर बंद करें</string>
-    <string name="nav_header_title">एचपीओएस</string>
-    <string name="nav_header_subtitle">sminnovations.in</string>
-    <string name="nav_header_desc">नेविगेशन हैडर</string>
-    <string name="action_settings">सेटिंग्स</string>
-
-    <string name="menu_home">होम</string>
-    <string name="show_hemocube_result">परिणाम दिखाएं</string>
-    <string name="menu_gallery">गैलरी</string>
-    <string name="menu_settings">सेटिंग्स</string>
-    <string name="profile">प्रोफ़ाइल</string>
-    <string name="year_of_birth">जन्म की वर्ष</string>
-    <string name="father_s_name_husband_s_name">पिता का नाम / पति का नाम</string>
-    <string name="is_patient_married_yes_no">क्या रोगी विवाहित है? (हां/नहीं)</string>
-    <string name="category">श्रेणी</string>
-    <string name="blood_group">रक्त समूह</string>
-    <string name="digital_card">डिजिटल सलाहकार कार्ड</string>
-    <string name="patient_medical_records">रोगी चिकित्सा रिकॉर्ड</string>
-    <string name="patient_address_details">रोगी का पता</string>
-    <string name="district">जिला</string>
-    <string name="city_town">शहर / गाँव</string>
-    <string name="state">राज्य</string>
-    <string name="pincode">पिनकोड</string>
-    <string name="threedots">...</string>
-    <string name="create_abha_id_card">अभा आईडी कार्ड बनाएं</string>
-    <string name="official_abha_app">आधिकारिक अभा एप्लिकेशन</string>
-    <string name="scan_patient_aadhaar_card">रोगी का आधार कार्ड स्कैन करें</string>
-    <string name="enter_aadhaar_number_manualy">आधार नंबर हैंडपंजी से दर्ज करें</string>
-    <string name="aadhaar_number">आधार नंबर</string>
-    <string name="aadhaar_in_tv"><b>आधार नंबर</b></string>
-    <string name="please_use_official_abha_app_to_create_abha_id_and_come_back">कृपया "आधिकारिक अभा एप्लिकेशन" का उपयोग करें अभा आईडी बनाने के लिए, और वापस आएं।</string>
-    <string name="please_enter_aadhaar">कृपया जारी रखने के लिए आधार नंबर दर्ज करें</string>
-    <string name="scan_qr_code_of_the_kit">किट का क्यूआर कोड स्कैन करें</string>
-    <string name="enter_kit_serial_number_manually">किट सीरियल नंबर हैंडपंजी से दर्ज करें</string>
-    <string name="serial_number">सीरियल नंबर</string>
-    <string name="set_baseline_reference_again">क्या फिर से आधार लाइन सेट करना है?</string>
-    <string name="baseline_instruction">आधार निर्देश</string>
-    <string name="to_be_launched_in_next_version_of_the_app">अगले संस्करण में लॉन्च किया जाएगा</string>
-    <string name="invalid_kit">अमान्य किट सीरियल नंबर, सही उदाहरण, SMI/SC/019/01/001</string>
-    <string name="user_list">उपयोगकर्ता सूची</string>
-    <string name="user_id">उपयोगकर्ता आईडी</string>
-    <string name="aadhar_id">आधार आईडी</string>
-    <string name="internet_not_available_please_enter_the_user_id_manually">इंटरनेट उपलब्ध नहीं है, कृपया उपयोगकर्ता आईडी और रक्त समूह मैन्युअली प्रविष्ट करें</string>
-    <string name="user_id_error_message">उपयोगकर्ता आईडी 18 अंकों की होनी चाहिए और कृपया रक्त समूह का चयन करें</string>
-    <string name="upload_db_registration_title">डीबी टेस्ट अपलोड करें</string>
-    <string name="upload_db_registration_message">क्या आप स्थानीय डीबी टेस्ट को क्लाउड पर अपलोड करना चाहते हैं?</string>
-    <string name="upload">अपलोड</string>
-    <string name="cancel">रद्द करें</string>
-    <string name="upload_success_message">अपलोड सफलता पूर्वक हुआ</string>
-    <string name="test_completed">टेस्ट पूरा हुआ</string>
-    <string name="select_blood_group">रक्त समूह चयन करें</string>
-    <string name="all_registered_user_are_tested_successfully">सभी पंजीकृत उपयोगकर्ता सफलता पूर्वक टेस्ट हो चुके हैं</string>
-    <string name="start_incubation">अंडान</string>
-    <string name="check_buffer">बफर जाँचें</string>
-    <string name="low_battery_warning">बैटरी स्तर 40% से कम है, कृपया उपकरण को चार्ज करें जारी रखने के लिए</string>
-    <string name="test_already_conducted">इस उपयोगकर्ता के लिए पहले ही टेस्ट हो चुका है</string>
-    <string name="incubation_not_completed">अंडान 15 मिनट पूर्ण नहीं हुआ है</string>
-    <string name="incubation_crossed_30_minutes">अंडान 30 मिनटों को पार कर गया है, अंडान फिर से करना होगा</string>
-    <string name="incubation_not_started">इस उपयोगकर्ता के लिए अंडान शुरू नहीं हुआ है</string>
-    <string name="test_concluded">टेस्ट समाप्त हुआ</string>
-    <string name="test_pending">टेस्ट लंबित है</string>
-    <string name="blood_group_error">कृपया अपना रक्त समूह दर्ज करें</string>
-    <string name="blood_group_toast">कृपया अपना रक्त समूह दर्ज करें</string>
-    <string name="blood_group_updated_successfully">रक्त समूह सफलता पूर्वक अपडेट किया गया है</string>
-    <string name="failed_to_update_blood_group">रक्त समूह अपडेट करने में विफल: %1$s</string>
-    <string name="no_user_data_found">निर्दिष्ट आईडी के लिए कोई उपयोगकर्ता डेटा नहीं मिला</string>
-    <string name="device_disconnected">उपकरण डिस्कनेक्ट किया गया है</string>
-    <string name="no_device_found">कोई डिवाइस नहीं मिली</string>
-    <string name="invalid_kit_number">अमान्य किट नंबर</string>
-    <string name="internt_not">इंटरनेट उपलब्ध नहीं है</string>
-    <string name="internt_not_local">इंटरनेट उपलब्ध नहीं है, टेस्ट विवरण स्थानीय रूप से सहेजे गए हैं</string>
-    <string name="error_local">डेटा अपलोड करने में त्रुटि, टेस्ट विवरण स्थानीय रूप से सहेजे गए हैं</string>
-    <string name="error_exist">मौजूदा बफर प्राप्त करते समय त्रुटि</string>
-    <string name="do_exist">क्या आप मौजूदा बफर के साथ जारी रखना चाहते हैं?</string>
-    <string name="kit_uploaded">किट परिणाम सफलता पूर्वक अपलोड हुआ</string>
-    <string name="kit_upload_failed">किट परिणाम अपलोड करने में विफल, इसे मैन्युअली नोट करें</string>
-    <string name="test_ongoing">टेस्ट जारी है</string>
-    <string name="test_go_noback">टेस्ट जारी है, पीछे नहीं जा सकते</string>
-    <string name="error_classification">वर्गीकरण करते समय त्रुटि</string>
-    <string name="test_upload">टेस्ट परिणाम सफलता पूर्वक अपलोड हुआ</string>
-    <string name="test_upload_failed">टेस्ट परिणाम अपलोड करने में विफल</string>
-    <string name="log_out">लॉग आउट</string>
-    <string name="do_log_out">क्या आप ऐप्लिकेशन से लॉगआउट करना चाहते हैं?</string>
-    <string name="cancelled_unable_scan">रद्द किया गया: स्कैन करने में असमर्थ, पुनः प्रयास करें!!</string>
-    <string name="kit_updated">किट नंबर अपडेट किया गया है, कृपया टेस्ट शुरू करने से पहले उपयोगकर्ता का चयन करें</string>
-    <string name="select_patient">कृपया टेस्ट शुरू करने से पहले रोगी का चयन करें</string>
-    <string name="enable_location">कृपया स्थान सेवाएं सक्षम करें</string>
-    <string name="location_denied">फाइन स्थान अनुमति निरस्त</string>
-    <string name="coarse_location_denied">कोर्स स्थान अनुमति निरस्त</string>
-    <string name="permission_grant">आपको एप्लिकेशन का उपयोग करने के लिए सभी फ़ाइलों तक पहुँच की अनुमति देनी होगी</string>
-    <string name="permission_required">एप्लिकेशन का उपयोग करने के लिए सभी अनुमतियाँ आवश्यक हैं</string>
-    <string name="device_not">उपकरण कनेक्ट नहीं है।</string>
-    <string name="enter_proper_login_id">कृपया सही लॉगिन आईडी दर्ज करें</string>
-    <string name="enter_proper_password">कृपया सही पासवर्ड दर्ज करें</string>
-    <string name="wrong_password">गलत पासवर्ड</string>
-    <string name="wrong_user_id">गलत उपयोगकर्ता आईडी</string>
-    <string name="error_invalid_test">अमान्य टेस्ट. डी-ऑक्सीजनेशन समस्या</string>
-    <string name="error_negative_abs">त्रुटि: नेगेटिव ऍब्स॰. ब्लैंक रीडिंग पुनः लें</string>
-    <string name="error_improper_buffer_high">त्रुटि: अमान्य टेस्ट. बफर रीडिंग सही नहीं (उच्च)</string>
-    <string name="error_improper_buffer_low">त्रुटि: अमान्य टेस्ट. बफर रीडिंग सही नहीं (न्यून)</string>
-    <string name="error_processing_device_data">उपकरण डेटा प्रोसेस करते समय त्रुटि</string>
-    <string name="error_repeat_test_lower_volume">अमान्य. वाल्यूम कम है - पुनः टेस्ट करें</string>
-    <string name="error_repeat_test_higher_volume">अमान्य. बहुत कम एब्स॰ - उच्च वाल्यूम के साथ पुनः टेस्ट करें</string>
-    <string name="positive_for_sickle_cell">सिकल सेल के लिए सकारात्मक. पुनः सत्यापन के लिए HPLC</string>
-    <string name="something_wrong_with_device">डिवाइस में कुछ गड़बड़ है, कृपया डिवाइस को बहुत और टेस्ट करने के लिए बाहर निकालें और फिर से कनेक्ट करें</string>
-    <string name="processing_result">प्रोसेसिंग परिणाम</string>
-    <string name="data_collected_processing_data">डेटा संग्रहित हो रहा है, डेटा प्रोसेसिंग हो रहा है</string>
-    <string name="sample_completed">सैम्पल पूरा हुआ</string>
-    <string name="gathering_data">डेटा एकत्र किया जा रहा है</string>
-    <string name="sample_started">सैम्पल शुरू हुआ</string>
-    <string name="buffer_completed">बफर पूरा हुआ</string>
-    <string name="buffer_started">बफर शुरू हुआ</string>
-    <string name="start">शुरू</string>
-    <string name="place_sample">सैम्पल रखें</string>
-    <string name="invalid">अमान्य</string>
-    <string name="error">त्रुटि</string>
-
-</resources>

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

@@ -1,259 +0,0 @@
-<resources>
-    <string name="app_name">HPOS ಪರೀಕ್ಷೆ</string>
-
-    <string-array name="instrument">
-        <item>TestRight</item>
-        <item>Denovix</item>
-    </string-array>
-
-    <string-array name="gender">
-        <item>ಪುರುಷ</item>
-        <item>ಹೆಣ್ಣು</item>
-        <item>ಇತರ</item>
-    </string-array>
-
-    <string-array name="yes_no">
-        <item>ಹೌದು</item>
-        <item>ಇಲ್ಲ</item>
-    </string-array>
-
-
-    <string-array name="category">
-        <item>GEN</item>
-        <item>OBC</item>
-        <item>SC</item>
-        <item>ST</item>
-    </string-array>
-
-    <string-array name="blood_group">
-        <item>O+ve</item>
-        <item>O-ve</item>
-        <item>A+ve</item>
-        <item>A-ve</item>
-        <item>B+ve</item>
-        <item>B-ve</item>
-        <item>AB+ve</item>
-        <item>AB-ve</item>
-    </string-array>
-
-    <string name="hello_blank_fragment">ಹಲೋ ಖಾಲಿ ಫ್ರ್ಯಾಗ್ಮೆಂಟ್</string>
-    <string name="select_the_test">ಪರೀಕ್ಷೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="set_reference">ಸಂದರ್ಭ ಹೊಂದಿಸಿ</string>
-
-    <!--  Alert Dialog  -->
-    <string name="have_you_placed">ನೀವು ಆಧಾರ ನಮೂದಿಸಿದ್ದೀರಾ?</string>
-    <string name="please_place">ದಯವಿಟ್ಟು ಚಲಾಯಿಸುವ ಮೊದಲು ನಮೂದಿಸಿದ ನಮೂನೆಯ ಕೂವೆಟ್ಟನ್ನು ಇಟ್ಟುಕೊಳ್ಳಿ</string>
-    <string name="yes">ಹೌದು</string>
-    <string name="no">ಇಲ್ಲ</string>
-    <string name="noo"></string>
-
-
-    <string name="connect">ಸಂಪರ್ಕಿಸಿ</string>
-    <string name="connected">ಸಂಪರ್ಕಿಸಿದೆ</string>
-    <string name="read">ಓದಿ</string>
-    <string name="update_reference">ರೇಫರೆನ್ಸ್ ಅಪ್‌ಡೇಟ್ ಮಾಡಿ</string>
-
-
-    <string name="have_you_placed_sample">ನೀವು ನಮೂನೆಯ ಕೂವೆಟ್ ಇಟ್ಟಿದ್ದೀರಾ?</string>
-    <string name="please_place_sample">ದಯವಿಟ್ಟು ಚಲಾಯಿಸುವ ಮೊದಲು ನಮೂದಿಸಿದ ನಮೂನೆಯ ಕೂವೆಟ್ಟನ್ನು ಇಟ್ಟುಕೊಳ್ಳಿ</string>
-    <string name="yes_and_run">ಹೌದು, ರನ್</string>
-
-
-    <!--  Instructions Text  -->
-    <string name="Instructions">ಪರೀಕ್ಷಣ ನಿರ್ದೇಶಗಳು</string>
-    <string name="step1"><b><u>ಹೆಜ್ಜೆ 1</u>  : </b> ಆಧಾರ/ಬೇಸ್ಲೈನ್ ನಮೂನೆಯನ್ನು ಹೊಂದಿಸಲು ಕೂವೆಟ್ಟನ್ನು ಇಟ್ಟುಕೊಳ್ಳಿ</string>
-    <string name="step2"><b><u>ಹೆಜ್ಜೆ 2</u>  : </b> ಡೆವೈಸ್ ಮೌಲ್ಯಗಳನ್ನು ಓದಲು ಬಟನ್ ಕೆಳಗೆ ಒತ್ತಿ</string>
-    <string name="step3"><b><u>ಹೆಜ್ಜೆ 1</u>  : </b> ಪ್ರಾರಂಭಿಸಲು ನಮೂನೆ ವಿವರಗಳನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="step4"><b><u>ಹೆಜ್ಜೆ 1</u>  : </b> ರಸದ ನಮೂನೆಯನ್ನು ಪರೀಕ್ಷೆಗಾಗಿ ಇಟ್ಟುಕೊಳ್ಳಿ</string>
-    <string name="step5"><b><u>ಹೆಜ್ಜೆ 2</u>  : </b> ಡೆವೈಸ್ ಮೌಲ್ಯಗಳನ್ನು ಓದಲು ಬಟನ್ ಕೆಳಗೆ ಒತ್ತಿ</string>
-
-    <string name="login_id">ಲಾಗಿನ್ ಐಡಿ</string>
-    <string name="password">ಪಾಸ್‌ವರ್ಡ್</string>
-    <string name="login">ಲಾಗಿನ್</string>
-    <string name="acquire">ಸಹಿಸಿ</string>
-    <string name="enter_patient_details">ರೋಗಿಯ ವಿವರಗಳನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="patient_name">ರೋಗಿಯ ಹೆಸರು</string>
-    <string name="age">ವಯಸ್ಸು ವರ್ಷಗಳಲ್ಲಿ</string>
-    <string name="gender">ಲಿಂಗ</string>
-
-    <string name="name_error">ಹೆಸರು ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="age_error">ವಯಸ್ಸು ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="gender_error">ಲಿಂಗ ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="age_error_out_of_bound">ವಯಸ್ಸು ಯಾವುದೇ ಸಾಧ್ಯವಿಲ್ಲ</string>
-    <string name="yob_error">ಹುಟ್ಟಿದ ವರ್ಷ ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="yob_error_2">ಅಮಾನ್ಯ ಹುಟ್ಟಿದ ವರ್ಷ</string>
-    <string name="mobile_error">ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="mobile_error_invalid">ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಅಮಾನ್ಯ (10 ಅಂಕಗಳನ್ನು ನಮೂದಿಸಿ)</string>
-    <string name="this_error">ಇದು ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="test_results">ಪರೀಕ್ಷಾ ಫಲಿತಾಂಶಗಳು</string>
-    <string name="name_in_textview"><b>ಹೆಸರು</b> : %1$s</string>
-    <string name="gender_in_textview"><b>ಲಿಂಗ</b> : %1$s</string>
-    <string name="age_in_textview"><b>ವಯಸ್ಸು</b> : %1$s ವರ್ಷಗಳು</string>
-    <string name="results_in_textview"><b>ಫಲಿತಾಂಶಗಳು</b> :</string>
-    <string name="negative">ನೆಗೆಟಿವ್\ \ </string>
-    <string name="download_report">ವರದಿ\nಡೌನ್‌ಲೋಡ್ ಮಾಡಿ</string>
-    <string name="home">ಹೋಮ್</string>
-    <string name="new_test">ಹೊಸ ಪರೀಕ್ಷೆ</string>
-    <string name="start_now">ಈಗ ಪ್ರಾರಂಭಿಸಿ</string>
-    <string name="hemo_cube">ಹೆಮೋ ಕ್ಯೂಬ್</string>
-    <string name="hb">ಹೆಮೊಗ್ಲೊಬಿನ್</string>
-    <string name="normal">ಸಾಮಾನ್ಯ\ \ </string>
-    <string name="sickle_cell_disease">ಸಿಕ್ಲ್ ಸೆಲ್ ರೋಗ\ \ </string>
-    <string name="sickle_cell_trait">ಸಿಕ್ಲ್ ಸೆಲ್ ಗುಣ\ \ </string>
-    <string name="undefined">ಅವ್ಯಾಖ್ಯಾತ\ \ </string>
-    <string name="sicklecell_nconfirmatory">ಸಿಕ್ಲ್‌ಸೆಲ್\nದೃಢೀಕರಣ</string>
-    <string name="sicklecell_screening">ಸಿಕ್ಲ್ ಸೆಲ್ ಸ್ಕ್ರೀನಿಂಗ್</string>
-    <string name="thalassemia">ಥ್ಯಾಲಸೀಮಿಯಾ</string>
-    <string name="usb_connection">USB ಕನೆಕ್ಷನ್</string>
-    <string name="high_performance_optical_spectroscopy">ಹೈ ಪರಫಾರ್ಮೆನ್ಸ್\nಆಪ್ಟಿಕಲ್ ಸ್ಪೆಕ್ಟ್ರೋಸ್ಕೊಪಿ</string>
-    <string name="sickle_cert">ಸಿಕ್ಲ್ ಸರ್ಟಿಫಿಕೇಟ್</string>
-    <string name="sickle_find">ಸಿಕ್ಲ್ ಹುಡುಕಿ</string>
-    <string name="submit">ಸಲ್ಲಿಸಿ</string>
-    <string name="diagnostics">ಡೆವೈಸ್ ಟೆಸ್ಟ್</string>
-    <string name="place_buffer">ಪ್ರಾರಂಭಿಸಿ</string>
-    <string name="Start_Sample">ನಮೂನೆ ಪ್ರಾರಂಭಿಸಿ</string>
-    <string name="new_kit">ಹೊಸ ಕಿಟ್</string>
-    <string name="new_buffer">ಹೊಸ ಬಫರ್</string>
-    <string name="name_error_2">ಅಮಾನ್ಯ ಅಕ್ಷರ, ಅನುಮತವಾದ ಅಕ್ಷರಗಳು ಅಕ್ಷರಗಳು, ಸಂಖ್ಯೆಗಳು ಮತ್ತು ( ) _ - , . ಮಾತ್ರ</string>
-    <string name="recommended">\*ಫಲಿತಾಂಶವನ್ನು ಪ್ರಯೋಗಶಾಲೆಯ ಪರೀಕ್ಷಾದಿಂದ ದೃಢೀಕರಿಸಬೇಕು</string>
-    <string name="recommended_age">\*ಫಲಿತಾಂಶವನ್ನು ಪ್ರಯೋಗಶಾಲೆಯ ಪರೀಕ್ಷಾದಿಂದ ದೃಢೀಕರಿಸಬೇಕು ಏಕೆಂದರೆ ರೋಗಿಯ ವಯಸ್ಸು 5 ವರ್ಷಗಳಿಗಿಂತ ಕಡಿಮೆ</string>
-    <string name="positive_borderline">ಧನಸ್ಪರ್ಶ</string>
-    <string name="negative_borderline">ನೆಗೆಟಿವ್ ಬಾರ್ಡರ್‌ಲೈನ್</string>
-    <string name="is_patient_under_any_medication">ರೋಗಿ ಯಾವುದೇ ಔಷಧಿ ಅಥವಾ ಚಿಕಿತ್ಸೆಯಲ್ಲಿದ್ದಾನೆಯೇ?</string>
-    <string name="is_patient_undergoing_any_blood_transfusion">ರೋಗಿಗೆ ರಕ್ತ ಪ್ರವಾಹನೆ ನಡೆಯುತ್ತಿದೆಯೇ?</string>
-    <string name="scan_aadhaar_card">ಆಧಾರ್ ಕಾರ್ಡ್\nಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="patient_details">ರೋಗಿ ವಿವರಗಳು</string>
-    <string name="or">ಅಥವಾ</string>
-    <string name="scan_abha_card">ABHA ಕಾರ್ಡ್\nಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="list_of_patients">ರೋಗಿಗಳ ಪಟ್ಟಿ</string>
-    <string name="no_patient_records_found_to_test_please_add_one_from_below">ಪರೀಕ್ಷಿಸಲು ಯಾವುದೇ ರೋಗಿ ವಿವರಗಳು ಸಿಗಲಿಲ್ಲ. ದಯವಿಟ್ಟು ಕೆಳಗಿನಿಂದ ಒಂದನ್ನು ಸೇರಿಸಿ.</string>
-    <string name="add">ಸೇರಿಸಿ</string>
-    <string name="test">ಪರೀಕ್ಷೆ</string>
-    <string name="pending">ಬಾಕಿ</string>
-    <string name="scan_patient_abha_id_card">ABHA ಐಡಿ ಕಾರ್ಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="scan_now">ಈಗ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="enter_abha_number_manualy">ABHA ಸಂಖ್ಯೆಯನ್ನು ಕೈಯಿಂದ ನಮೂದಿಸಿ</string>
-    <string name="abha_id">ABHA ಐಡಿ</string>
-    <string name="patient_id_in_tv"><b>ಬಳಕೆದಾರ ಐಡಿ</b> : %1$s</string>
-    <string name="go">ಹೋಗಿ</string>
-    <string name="click_here">ಇಲ್ಲಿ ಕ್ಲಿಕ್ ಮಾಡಿ</string>
-    <string name="title_activity_dashboard">ಡ್ಯಾಶ್‌ಬೋರ್ಡ್ ಆರಂಭ</string>
-    <string name="navigation_drawer_open">ನೇವಿಗೇಷನ್ ಡ್ರಾಯರ್ ತೆರೆಯಲಿ</string>
-    <string name="navigation_drawer_close">ನೇವಿಗೇಷನ್ ಡ್ರಾಯರ್ ಮುಚ್ಚಲಿ</string>
-    <string name="nav_header_title">HPOS</string>
-    <string name="nav_header_subtitle">sminnovations.in</string>
-    <string name="nav_header_desc">ನೇವಿಗೇಷನ್ ಹೆಡರ್</string>
-    <string name="action_settings">ಸೆಟ್ಟಿಂಗ್ಗಳು</string>
-    <string name="menu_home">ಹೋಮ್</string>
-    <string name="show_hemocube_result">ಫಲಿತಾಂಶ ತೋರಿಸಿ</string>
-    <string name="menu_gallery">ಗ್ಯಾಲರಿ</string>
-    <string name="menu_settings">ಸೆಟ್ಟಿಂಗ್ಗಳು</string>
-    <string name="profile">ಪ್ರೊಫೈಲ್</string>
-    <string name="year_of_birth">ಹುಟ್ಟಿದ ವರ್ಷ</string>
-    <string name="father_s_name_husband_s_name">ತಂದೆಯ/ಗಂಡನ ಹೆಸರು</string>
-    <string name="is_patient_married_yes_no">ರೋಗಿ ಮದುವೆಯಾಗಿದ್ದಾನೆಯೇ? (ಹೌದು/ಇಲ್ಲ)</string>
-    <string name="category">ವರ್ಗ</string>
-    <string name="blood_group">ರಕ್ತ ಗುಂಪು</string>
-    <string name="digital_card">ಡಿಜಿಟಲ್ ಸಲಹಾ ಕಾರ್ಡ್</string>
-    <string name="patient_medical_records">ರೋಗಿ ವೈದ್ಯಕೀಯ ದಾಖಲೆಗಳು</string>
-    <string name="patient_address_details">ರೋಗಿಯ ವಿಳಾಸ ವಿವರಗಳು</string>
-    <string name="district">ಜಿಲ್ಲೆ</string>
-    <string name="city_town">ನಗರ/ಪಟ್ಟಣ</string>
-    <string name="state">ರಾಜ್ಯ</string>
-    <string name="pincode">ಪಿನ್‌ಕೋಡ್</string>
-    <string name="threedots">...</string>
-    <string name="create_abha_id_card">ABHA ಐಡಿ ಕಾರ್ಡ್ ರಚಿಸಿ</string>
-    <string name="official_abha_app">ಆಧಿಕಾರಿ ABHA ಆಪ್</string>
-    <string name="scan_patient_aadhaar_card">ರೋಗಿ ಆಧಾರ್ ಕಾರ್ಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="enter_aadhaar_number_manualy">ಆಧಾರ್ ಸಂಖ್ಯೆಯನ್ನು ಕೈಯಿಂದ ನಮೂದಿಸಿ</string>
-    <string name="aadhaar_number">ಆಧಾರ್ ಸಂಖ್ಯೆ</string>
-    <string name="aadhaar_in_tv"><b>ಆಧಾರ್ ಸಂಖ್ಯೆ</b></string>
-    <string name="please_use_official_abha_app_to_create_abha_id_and_come_back">ದಯವಿಟ್ಟು "ಆಧಿಕಾರಿ ABHA ಆಪ್" ಅನ್ನು ಬಳಸಿ ABHA ಐಡಿ ರಚಿಸಿ ಮತ್ತು ಹಿಂತಿರುಗಿ ಬನ್ನಿ.</string>
-    <string name="please_enter_aadhaar">ಮುಂದುವರಿಸಲು ದಯವಿಟ್ಟು ಆಧಾರ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="scan_qr_code_of_the_kit">ಕಿಟ್ ಯಾವಾಗಲೂ QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="enter_kit_serial_number_manually">ಕಿಟ್ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಯನ್ನು ಕೈಯಿಂದ ನಮೂದಿಸಿ</string>
-    <string name="serial_number">ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ</string>
-    <string name="set_baseline_reference_again">ಬೇಸ್ಲೈನ್/ಸಂದರ್ಭ ಹೊಂದಿಸಿರಾ?</string>
-    <string name="baseline_instruction">ಬೇಸ್ಲೈನ್ ನಿರ್ದೇಶನ</string>
-    <string name="to_be_launched_in_next_version_of_the_app">ಮುಂದಿನ ಆಪ್ ಆವೃತ್ತಿಯಲ್ಲಿ ಪ್ರಕಟಿಸಲಾಗಿದೆ</string>
-    <string name="invalid_kit">ಅಮಾನ್ಯ ಕಿಟ್ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ, ಶರಿಯಾದ ಉದಾಹರಣೆ, SMI/SC/019/01/001</string>
-    <string name="user_list">ಬಳಕೆದಾರ ಪಟ್ಟಿ</string>
-    <string name="user_id">ಬಳಕೆದಾರ ಐಡಿ</string>
-    <string name="aadhar_id">ಆಧಾರ್ ಐಡಿ</string>
-    <string name="internet_not_available_please_enter_the_user_id_manually">ಇಂಟರ್ನೆಟ್ ಇಲ್ಲದೆ, ದಯವಿಟ್ಟು ಬಳಕೆದಾರ ಐಡಿ ಮತ್ತು ರಕ್ತ ಗುಂಪುವನ್ನು ಕೈಯಿಂದ ನಮೂದಿಸಿ</string>
-    <string name="user_id_error_message">ಬಳಕೆದಾರ ಐಡಿ 18 ಅಂಕಗಳಿರಬೇಕು ಮತ್ತು ದಯವಿಟ್ಟು ರಕ್ತ ಗುಂಪುವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
-    <string name="upload_db_registration_title">ಸ್ಥಾನಿಕ DB ಪರೀಕ್ಷೆಗಳನ್ನು ಅಪ್ಲೋಡ್ ಮಾಡಿ</string>
-    <string name="upload_db_registration_message">ನೀವು ಸ್ಥಾನಿಕ DB ಪರೀಕ್ಷೆಗಳನ್ನು ಕ್ಲೌಡ್‌ಗೆ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಬಯಸುತ್ತೀರಾ?</string>
-    <string name="upload">ಅಪ್ಲೋಡ್ ಮಾಡಿ</string>
-    <string name="cancel">ರದ್ದು ಮಾಡಿ</string>
-    <string name="upload_success_message">ಯಶಸ್ವಿಯಾಗಿ ಅಪ್ಲೋಡ್ ಮಾಡಲಾಗಿದೆ</string>
-    <string name="test_completed">ಪರೀಕ್ಷೆ ಮುಗಿಯಿತು</string>
-    <string name="select_blood_group">ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="all_registered_user_are_tested_successfully">ಎಲ್ಲಾ ನೋಂದಣಿಗೆ ಬಂದ ಬಳಕೆದಾರರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಪರೀಕ್ಷಿಸಲಾಗಿದೆ</string>
-    <string name="start_incubation">ಇನ್ಕ್ಯೂಬೇಶನ್ ಆರಂಭ</string>
-    <string name="check_buffer">ಬಫರ್ ಚೆಕ್ ಮಾಡಿ</string>
-    <!-- Kannada Translations -->
-    <string name="low_battery_warning">ಬ್ಯಾಟರಿ ಸ್ತರ 40% ಕ್ಕಿಂತ ಕಡಿಮೆಯಾಗಿದೆ, ದಯವಿಟ್ಟು ಸಾಧನವನ್ನು ಮುಂದುವರಿಸಲು ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡಿ</string>
-    <string name="test_already_conducted">ಈ ಬಳಕೆದಾರನ ಮೇಲೆ ಪರೀಕ್ಷೆ ಇನ್ನು ಮುಗಿದಿದೆ</string>
-    <string name="incubation_not_completed">ಇನ್ಕ್ಯೂಬೇಷನ್ ಹತ್ತಿಲ್ಲ 15 ನಿಮಿಷಗಳ ಪೂರ್ತಿ ಆಗಿಲ್ಲ</string>
-    <string name="incubation_crossed_30_minutes">ಇನ್ಕ್ಯೂಬೇಷನ್ 30 ನಿಮಿಷಗಳನ್ನು ದಾಟಿದೆ, ಇನ್ನೊಮ್ಮೆ ಇನ್ಕ್ಯೂಬೇಷನ್ ಮಾಡಬೇಕಾಗಿದೆ</string>
-    <string name="incubation_not_started">ಈ ಬಳಕೆದಾರನ ಮೇಲೆ ಇನ್ಕ್ಯೂಬೇಷನ್ ಆರಂಭವಾಗಿಲ್ಲ</string>
-    <string name="test_concluded">ಪರೀಕ್ಷೆ ಮುಗಿಯಿತು</string>
-    <string name="test_pending">ಪರೀಕ್ಷೆ ಬಾಕಿ ಇದೆ</string>
-    <string name="blood_group_error">ದಯವಿಟ್ಟು ನಿಮ್ಮ ರಕ್ತ ಗುಂಡಾರವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="blood_group_toast">ದಯವಿಟ್ಟು ನಿಮ್ಮ ರಕ್ತ ಗುಂಡಾರವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="blood_group_updated_successfully">ರಕ್ತ ಗುಂಡಾರ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ</string>
-    <string name="failed_to_update_blood_group">ರಕ್ತ ಗುಂಡಾರ ನವೀಕರಿಸಲು ವಿಫಲವಾಗಿದೆ: %1$s</string>
-    <string name="no_user_data_found">ನೀರು ನಿರ್ದಿಷ್ಟ ಐಡಿಗೆ ಯಾವುದೇ ಬಳಕೆದಾರ ಡೇಟಾ ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="device_disconnected">ಸಾಧನ ಹಂಚಿಹೋಯಿತು</string>
-    <string name="no_device_found">ಯಾವುದೇ ಸಾಧನ ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="invalid_kit_number">ಅಮಾನ್ಯವಾದ ಕಿಟ್ ಸಂಖ್ಯೆ</string>
-    <string name="internt_not">ಇಂಟರ್ನೆಟ್ ಲಭ್ಯವಿಲ್ಲ</string>
-    <string name="internt_not_local">ಇಂಟರ್ನೆಟ್ ಲಭ್ಯವಿಲ್ಲ, ಪರೀಕ್ಷೆ ವಿವರಗಳನ್ನು ಸ್ಥಾನಿಕವಾಗಿ ಉಳಿಸಲಾಗಿದೆ</string>
-    <string name="error_local">ಡೇಟಾ ಅಪ್ಲೋಡ್ ಮಾಡುವಾಗ ತಪ್ಪಾಗಿದೆ, ಪರೀಕ್ಷೆ ವಿವರಗಳನ್ನು ಸ್ಥಾನಿಕವಾಗಿ ಉಳಿಸಲಾಗಿದೆ</string>
-    <string name="error_exist">ಇನ್ನೊಂದು ಬಫರ್ ಪಡೆಯುವಾಗ ತಪ್ಪಾಗಿದೆ</string>
-    <string name="do_exist">ನೀವು ಇನ್ನೊಂದು ಬಫರ್ ಜಾರಿಗೆ ಹೋಗಲು ಇಚ್ಛಿಸುತ್ತಾರಾ?</string>
-    <string name="test_go_noback">ಪರೀಕ್ಷೆ ಜರುಗುತ್ತಿದೆ, ಹಿಂತಿರುಗಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
-    <string name="kit_uploaded">ಕಿಟ್ ಪರಿಣಾಮ ಯಶಸ್ವಿಯಾಗಿ ಅಪ್ಲೋಡ್ ಆಗಿದೆ</string>
-    <string name="kit_upload_failed">ಕಿಟ್ ಪರಿಣಾಮ ಅಪ್ಲೋಡ್ ಆಗಲಿಲ್ಲ, ಅದನ್ನು ಕೈಯಾರೆ ಹೊಸದಾಗಿ ಬರೆಯಿರಿ</string>
-    <string name="test_ongoing">ಪರೀಕ್ಷೆ ಜರುಗುತ್ತಿದೆ</string>
-    <string name="error_classification">ವರ್ಗೀಕರಣ ನಡೆಸುವಾಗ ತಪ್ಪಾಗಿದೆ</string>
-    <string name="test_upload">ಪರೀಕ್ಷೆ ಫಲಿತಾಂಶ ಯಶಸ್ವಿಯಾಗಿ ಅಪ್ಲೋಡ್ ಆಗಿದೆ</string>
-    <string name="test_upload_failed">ಪರೀಕ್ಷೆ ಫಲಿತಾಂಶ ಅಪ್ಲೋಡ್ ಆಗಲಿಲ್ಲ</string>
-    <string name="log_out">ಲಾಗೌಟ್ ಮಾಡಿ</string>
-    <string name="do_log_out">ನೀವು ಅಪ್ಲಿಕೇಶನ್ ನಿಂದ ಲಾಗೌಟ್ ಮಾಡಲು ಬಯಸುತ್ತಿದ್ದೀರಾ?</string>
-    <string name="cancelled_unable_scan">ರದ್ದು ಮಾಡಲಾಗಿದೆ: ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ, ಮತ್ತೊಮ್ಮೆ ಪ್ರಯಾಸಿಸಿ!!</string>
-    <string name="kit_updated">ಕಿಟ್ ಸಂಖ್ಯೆ ನವೀಕರಿಸಲಾಗಿದೆ, ದಯವಿಟ್ಟು ಟೆಸ್ಟ್ ಆರಂಭಿಸುವ ಮೊದಲು ಬಳಸುವವನನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="select_patient">ದಯವಿಟ್ಟು ಟೆಸ್ಟ್ ಆರಂಭಿಸುವ ಮೊದಲು ರೋಗಿಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="enable_location">ದಯವಿಟ್ಟು ಸ್ಥಾನ ಸೇವೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
-    <string name="location_denied">ಸರಿಯಾದ ಸ್ಥಾನ ಅನುಮತಿ ನಿರಾಕರಿಸಲಾಗಿದೆ</string>
-    <string name="coarse_location_denied">ಅಲ್ಪ ಸರಿಯಾದ ಸ್ಥಾನ ಅನುಮತಿ ನಿರಾಕರಿಸಲಾಗಿದೆ</string>
-    <string name="permission_grant">ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಲು ಎಲ್ಲಾ ಫೈಲ್‌ಗಳಿಗೆ ಪ್ರವೇಶ ಅನುಮತಿ ನೀಡಬೇಕು</string>
-    <string name="permission_required">ಈ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಲು ಎಲ್ಲಾ ಅನುಮತಿಗಳು ಅಗತ್ಯವಿವೆ.</string>
-    <string name="device_not">ಡೆವೈಸ್ ಸಂಪರ್ಕಿಸಲಾಗಿಲ್ಲ.</string>
-    <string name="enter_proper_login_id">ದಯವಿಟ್ಟು ಸರಿಯಾದ ಲಾಗಿನ್ ಐಡಿ ನಮೂದಿಸಿ</string>
-    <string name="enter_proper_password">ದಯವಿಟ್ಟು ಸರಿಯಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿ</string>
-    <string name="wrong_password">ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್</string>
-    <string name="wrong_user_id">ತಪ್ಪಾದ ಬಳಕೆದಾರ ಐಡಿ</string>
-    <string name="error_invalid_test">ಅಮಾನ್ಯ ಟೆಸ್ಟ್. ಡಿ-ಆಕ್ಸಿಜನೇಷನ್ ಸಮಸ್ಯೆ</string>
-    <string name="error_negative_abs">ದೋಷ: ನೆಗೆಟಿವ್ ಆಬ್ಸ್. ಬ್ಲ್ಯಾಂಕ್ ರೀಡಿಂಗ್ ಪುನಃ ತೆಗೆದುಕೊಳ್ಳಿ</string>
-    <string name="error_improper_buffer_high">ದೋಷ: ಅಮಾನ್ಯ ಟೆಸ್ಟ್. ಬಫರ್ ರೀಡಿಂಗ್ ಅಸರವಿಲ್ಲ (ಹೈ)</string>
-    <string name="error_improper_buffer_low">ದೋಷ: ಅಮಾನ್ಯ ಟೆಸ್ಟ್. ಬಫರ್ ರೀಡಿಂಗ್ ಅಸರವಿಲ್ಲ (ಲೋ)</string>
-    <string name="error_processing_device_data">ಡೇಟಾ ಪ್ರಕ್ರಿಯಿಸುವಾಗ ದೋಷ</string>
-    <string name="error_repeat_test_lower_volume">ಅಮಾನ್ಯ. ರೇಟ್ ಹೆಚ್ಚುವ ಹೊರತು ಪುನಃ ಟೆಸ್ಟ್ ಮಾಡಿ</string>
-    <string name="error_repeat_test_higher_volume">ಅಮಾನ್ಯ. ಅತ್ಯಂತ ಕಡಿಮೆ ಅಭ್ಸರ್ಬೆನ್ಸ್ - ಹೆಚ್ಚು ಹೊರತು ಪುನಃ ಟೆಸ್ಟ್</string>
-    <string name="positive_for_sickle_cell">ಸಿಕ್ಲ್ ಸೆಲ್ ಸಾಕಾರಿ. HPLC ದೃಢೀಕರಣಕ್ಕಾಗಿ</string>
-    <string name="something_wrong_with_device">ಸಾಧನದಲ್ಲಿ ಏನಾದರೂ ತಪ್ಪಾಗಿದೆ, ದಯವಿಟ್ಟು ಸಾಧನವನ್ನು ಹತ್ತಿರಕ್ಕೆ ತರಿಸಿ ಮತ್ತೆ ಬಳಸಿ ಬಳಸಿ ಬಳಸಿ ಪರೀಕ್ಷಿಸಿ</string>
-    <string name="processing_result">ಪ್ರಕ್ರಿಯಿಸುತ್ತಿದೆ ಫಲಿತ</string>
-    <string name="data_collected_processing_data">ಸಮಿತಿ ಸೇರಿಸಿದ ಡೇಟಾ, ಡೇಟಾ ಪ್ರಕ್ರಿಯಿಸುತ್ತಿದೆ</string>
-    <string name="sample_completed">ನಮೂನೆ ಪೂರ್ಣಗೊಂಡಿದೆ</string>
-    <string name="gathering_data">ಡೇಟಾ ಸಂಗ್ರಹಿಸುತ್ತಿದೆ</string>
-    <string name="sample_started">ನಮೂನೆ ಪ್ರಾರಂಭವಾಗಿದೆ</string>
-    <string name="buffer_completed">ಬಫರ್ ಪೂರ್ಣಗೊಂಡಿದೆ</string>
-    <string name="buffer_started">ಬಫರ್ ಪ್ರಾರಂಭವಾಗಿದೆ</string>
-    <string name="start">ಆರಂಭ</string>
-    <string name="place_sample">ನಮೂನೆ ಇಟ್ಟುಕೊಳ್ಳಿ</string>
-    <string name="invalid">ಅಮಾನ್ಯ</string>
-    <string name="error">ದೋಷ</string>
-
-</resources>

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="languages">
-        <item>English</item>
-        <item>Kannada</item>
-        <!-- Add more languages as needed -->
-    </string-array>
-
-    <string-array name="language_values">
-        <item>en</item>
-        <item>ka</item>
-        <!-- Use language codes (e.g., en, kn) as values -->
-    </string-array>
-
-</resources>

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

@@ -67,6 +67,7 @@
     <!--    <string name="step4"><b><u>Step 1</u>  : </b> Place the cuvette containing sample for experiment.</string>-->
     <string name="step4"><b><u>Step 1</u>  : </b> Place the cuvette containing blood sample mixed with kit solution.</string>
     <string name="step5"><b><u>Step 2</u>  : </b> Press the button below to start the device reading values.</string>
+
     <string name="login_id">Login ID</string>
     <string name="password">Password</string>
     <string name="login">Login</string>
@@ -79,6 +80,7 @@
     <string name="age_error">Age can\'t be empty</string>
     <string name="gender_error">Gender can\'t be empty</string>
     <string name="age_error_out_of_bound">Age should be valid</string>
+
     <string name="yob_error">Year of birth can\'t be empty</string>
     <string name="yob_error_2">Invalid Year of Birth</string>
     <string name="mobile_error">Mobile Number can\'t be empty</string>
@@ -110,16 +112,13 @@
     <string name="sickle_cert">Sickle Cert</string>
     <string name="sickle_find">Sickle Find</string>
     <string name="submit">Submit</string>
-    <string name="diagnostics">Device Diagnostics</string>
-    <string name="place_buffer">Start</string>
-    <string name="Start_Sample">Start Sample</string>
     <string name="new_kit">New Kit</string>
     <string name="new_buffer">New Buffer</string>
     <string name="name_error_2">Invalid character, Allowed characters are Letters, Numbers and ( ) _ - , . only</string>
     <string name="recommended">\*Result to be confirmed with laboratory test</string>
     <string name="recommended_age">\*Result to be confirmed with laboratory test as age of the patient is less than 5 years</string>
     <string name="positive_borderline">Positive Borderline</string>
-    <string name="negative_borderline">Negative Borderline, Repeat Test</string>
+    <string name="negative_borderline">Negative Borderline</string>
     <string name="is_patient_under_any_medication">Is Patient under any medication or treatment?</string>
     <string name="is_patient_undergoing_any_blood_transfusion">Is Patient undergoing any blood transfusion?</string>
     <string name="scan_aadhaar_card">Scan Aadhaar\nCard</string>
@@ -145,6 +144,7 @@
     <string name="nav_header_subtitle">sminnovations.in</string>
     <string name="nav_header_desc">Navigation header</string>
     <string name="action_settings">Settings</string>
+
     <string name="menu_home">Home</string>
     <string name="show_hemocube_result">Show Result</string>
     <string name="menu_gallery">Gallery</string>
@@ -155,7 +155,6 @@
     <string name="is_patient_married_yes_no">Is Patient Married? (Yes/No)</string>
     <string name="category">Category</string>
     <string name="blood_group">Blood Group</string>
-    <string name="digital_card">Digital Counselling Card</string>
     <string name="patient_medical_records">Patient Medical Records</string>
     <string name="patient_address_details">Patient Address Details</string>
     <string name="district">District</string>
@@ -181,79 +180,15 @@
     <string name="user_list">User List</string>
     <string name="user_id">User ID</string>
     <string name="aadhar_id">Aadhar ID</string>
-    <string name="internet_not_available_please_enter_the_user_id_manually">Internet not available, please enter the user ID and blood group manually</string>
-    <string name="user_id_error_message">User ID should be 18 digits and please select the blood group</string>
-    <string name="upload_db_registration_title">Upload DB Tests</string>
-    <string name="upload_db_registration_message">Do you want to upload the local DB tests to the cloud?</string>
+    <string name="internet_not_available_please_enter_the_user_id_manually">Internet not available, please enter the user ID manually</string>
+    <string name="user_id_error_message">User ID should be 18 digits</string>
+    <string name="upload_db_registration_title">Upload DB Registration</string>
+    <string name="upload_db_registration_message">Do you want to upload the local DB Registration to the cloud?</string>
     <string name="upload">Upload</string>
     <string name="cancel">Cancel</string>
     <string name="upload_success_message">Upload done successfully</string>
     <string name="test_completed">Test Completed</string>
     <string name="select_blood_group">Select Blood Group</string>
     <string name="all_registered_user_are_tested_successfully">All registered user are tested successfully</string>
-    <string name="start_incubation">Incubate</string>
-    <string name="check_buffer">Check Buffer</string>
-    <string name="low_battery_warning">Battery level is low than 40%, please charge the device to continue testing</string>
-    <string name="test_already_conducted">Test has been already conducted for this user</string>
-    <string name="incubation_not_completed">Incubation has not completed 15 minutes</string>
-    <string name="incubation_crossed_30_minutes">Incubation crossed 30 minutes, need to repeat the incubation</string>
-    <string name="incubation_not_started">Incubation not started for this user</string>
-    <string name="test_concluded">Test concluded</string>
-    <string name="test_pending">Test is Pending</string>
-    <string name="blood_group_error">Please enter your blood group</string>
-    <string name="blood_group_toast">Please enter your blood group</string>
-    <string name="blood_group_updated_successfully">Blood group updated successfully</string>
-    <string name="failed_to_update_blood_group">Failed to update blood group: %1$s</string>
-    <string name="no_user_data_found">No user data found for the specified ID</string>
-    <string name="device_disconnected">Device is Disconnected</string>
-    <string name="no_device_found">No device found</string>
-    <string name="invalid_kit_number">Invalid KIT Number</string>
-    <string name="internt_not">Internet is Not Available</string>
-    <string name="internt_not_local">Internet not available, test details stored locally</string>
-    <string name="error_local">Error uploading data, test details stored locally</string>
-    <string name="error_exist">error while getting existing buffer</string>
-    <string name="do_exist">Do you want to continue with existing buffer?</string>
-    <string name="kit_uploaded">Kit result uploaded successfully</string>
-    <string name="kit_upload_failed">Kit result uploading failed, note it down manually</string>
-    <string name="test_ongoing">test is going on</string>
-    <string name="test_go_noback">test is going on, can\'t go back</string>
-    <string name="error_classification">error while performing classification</string>
-    <string name="test_upload">Test Results Uploaded Successfully</string>
-    <string name="test_upload_failed">Test Results Upload Failed</string>
-    <string name="log_out">LOG OUT</string>
-    <string name="do_log_out">Do you want to LogOut the Application?</string>
-    <string name="cancelled_unable_scan">Cancelled: Unable to scan, Try Again!!</string>
-    <string name="kit_updated">Kit number is updated, Please Select user before starting test</string>
-    <string name="select_patient">Please Select patient before starting test</string>
-    <string name="enable_location">Please enable location services</string>
-    <string name="location_denied">Fine location permission denied</string>
-    <string name="coarse_location_denied">Coarse location permission denied</string>
-    <string name="permission_grant">You must grant permission to access all files to use the app</string>
-    <string name="permission_required">All permissions are required to use the app.</string>
-    <string name="device_not">Device Not Connected.</string>
-    <string name="enter_proper_login_id">Please enter a proper Login ID</string>
-    <string name="enter_proper_password">Please enter a proper password</string>
-    <string name="wrong_password">Wrong Password</string>
-    <string name="wrong_user_id">Wrong UserID</string>
-    <string name="error_invalid_test">Invalid Test. Problem with de-oxygenation</string>
-    <string name="error_negative_abs">Error: Negative Abs. Retake Blank Reading</string>
-    <string name="error_improper_buffer_high">Error: Invalid Test. Improper buffer reading (high)</string>
-    <string name="error_improper_buffer_low">Error: Invalid Test. Improper buffer reading (low)</string>
-    <string name="error_processing_device_data">error while processing device data</string>
-    <string name="error_repeat_test_lower_volume">Inconclusive. Repeat with test with lower volume of blood</string>
-    <string name="error_repeat_test_higher_volume">Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume</string>
-    <string name="positive_for_sickle_cell">Positive for Sickle Cell. HPLC for Confirmation</string>
-    <string name="something_wrong_with_device">Something is wrong with the device, please disconnect and reconnect the device and test the user again</string>
-    <string name="processing_result">processing result</string>
-    <string name="data_collected_processing_data">Data collected, Processing data</string>
-    <string name="sample_completed">Sample Completed</string>
-    <string name="gathering_data">Gathering data</string>
-    <string name="sample_started">Sample Started</string>
-    <string name="buffer_completed">Buffer Completed</string>
-    <string name="buffer_started">Buffer Started</string>
-    <string name="start">Start</string>
-    <string name="place_sample">Place Sample</string>
-    <string name="invalid">Invalid</string>
-    <string name="error">Error</string>
 
 </resources>

app/src/main/res/xml/settings.xml

@@ -1,15 +0,0 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory
-        android:title="Language Settings">
-
-        <!-- Spinner to select language -->
-        <Preference
-            android:key="language_preference"
-            android:title="Select Language"
-            android:summary="Choose your preferred language"
-            android:dialogTitle="Select Language"
-            android:widgetLayout="@layout/language_spinner_preference"/>
-    </PreferenceCategory>
-
-</PreferenceScreen>

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

@@ -11,91 +11,91 @@ import java.math.RoundingMode
 import java.text.DecimalFormat
 
 class TestRightViewModelTest {
-//    private val viewModel = TestRightViewModel()
-//    private val data = InputData()
-//
+    private val viewModel = TestRightViewModel()
+    private val data = InputData()
+
+    @Test
+    fun test_mapDeviceConstants()  {
+        viewModel.mapDeviceConstants(data.inputRead)
+        assertEquals("0", DataHolder.deviceConstant!!.a)
+        assertEquals("1.69989422e-06", DataHolder.deviceConstant!!.b)
+        assertEquals("1.60642711e-01", DataHolder.deviceConstant!!.c)
+        assertEquals("3.85754470e+02", DataHolder.deviceConstant!!.d)
+    }
+
+    @Test
+    fun test_mapPixelNumberToWavelength() {
+        viewModel.mapDeviceConstants(data.inputRead)
+        viewModel.mapPixelNumberToWavelength()
+
+        val outputList = TestDataGenerator().getOutputMapPixelNumberToWavelength()
+
+        assertEquals(Constants.TEST_RIGHT_TOTAL_PIXEL, DataHolder.wavelengthToPixelArray.size)
+        assertEquals(Constants.TEST_RIGHT_TOTAL_PIXEL, outputList.size)
+
+        val df = DecimalFormat("#.###")
+        df.roundingMode = RoundingMode.FLOOR
+
+        for (i in 0 until Constants.TEST_RIGHT_TOTAL_PIXEL){
+            assertEquals(df.format(outputList[i]), df.format(DataHolder.wavelengthToPixelArray[i]))
+        }
+
+    }
+
 //    @Test
-//    fun test_mapDeviceConstants()  {
-//        viewModel.mapDeviceConstants(data.inputRead)
-//        assertEquals("0", DataHolder.deviceConstant!!.a)
-//        assertEquals("1.69989422e-06", DataHolder.deviceConstant!!.b)
-//        assertEquals("1.60642711e-01", DataHolder.deviceConstant!!.c)
-//        assertEquals("3.85754470e+02", DataHolder.deviceConstant!!.d)
-//    }
-//
-//    @Test
-//    fun test_mapPixelNumberToWavelength() {
-//        viewModel.mapDeviceConstants(data.inputRead)
-//        viewModel.mapPixelNumberToWavelength()
-//
-//        val outputList = TestDataGenerator().getOutputMapPixelNumberToWavelength()
-//
-//        assertEquals(Constants.TEST_RIGHT_TOTAL_PIXEL, DataHolder.wavelengthToPixelArray.size)
-//        assertEquals(Constants.TEST_RIGHT_TOTAL_PIXEL, outputList.size)
-//
-//        val df = DecimalFormat("#.###")
-//        df.roundingMode = RoundingMode.FLOOR
-//
-//        for (i in 0 until Constants.TEST_RIGHT_TOTAL_PIXEL){
-//            assertEquals(df.format(outputList[i]), df.format(DataHolder.wavelengthToPixelArray[i]))
-//        }
-//
-//    }
-//
-////    @Test
-////    fun test_mapIntensityValues() {
-////        val inputReference = TestDataGenerator().getInputReferenceMapIntensityValues()
-////        val inputSample = TestDataGenerator().getInputSampleMapIntensityValues()
-////
-////        viewModel.mapIntensityValues(inputReference, true)
-////        viewModel.mapIntensityValues(inputSample, false)
-////
-////        val outputReference = TestDataGenerator().getOutputReferenceMapIntensityValues()
-////        val outputSample = TestDataGenerator().getOutputSampleMapIntensityValues()
-////
-////        assertEquals(outputReference, DataHolder.intensityReferenceArray)
-////        assertEquals(outputSample, viewModel.intensitySampleArray)
-////    }
-//
-//    @Test
-//    fun test_mapWavelengthToAbsorbance() {
-//
-//        viewModel.mapDeviceConstants(data.inputRead)
-//        viewModel.mapPixelNumberToWavelength()
-//        viewModel.mapIntensityValues(TestDataGenerator().getInputReferenceMapIntensityValues(), true)
-//        viewModel.mapIntensityValues(TestDataGenerator().getInputSampleMapIntensityValues(), false)
-//        viewModel.patientDetails = PatientData("Surya", 2, "Male", TestRightResultType.UNDEFINED)
-//        viewModel.mapWavelengthToAbsorbance()
-//
-//        val wavelengthList = TestDataGenerator().getOutputMapPixelNumberToWavelength()
-//        val absorbanceList = TestDataGenerator().getOutputMapWavelengthToAbsorbance()
-//
-//        val df = DecimalFormat("#.###")
-//        df.roundingMode = RoundingMode.FLOOR
-//
-//        assertEquals(Constants.TEST_RIGHT_TOTAL_PIXEL, viewModel.wavelengthToAbsorbance.size)
-//        for (i in 0 until Constants.TEST_RIGHT_TOTAL_PIXEL){
-//            assertEquals(df.format(wavelengthList[i]), df.format(viewModel.wavelengthToAbsorbance[i][0]))
-//            assertEquals(df.format(absorbanceList[i]), df.format(viewModel.wavelengthToAbsorbance[i][1]))
-//        }
-//    }
-//
-//
-//    @Test
-//    fun testRightViewModel_calculateDataForCSV() {
-//
-//        viewModel.mapDeviceConstants(data.inputRead)
-//        viewModel.mapPixelNumberToWavelength()
-//        viewModel.mapIntensityValues(data.printForReference, true)
-//        viewModel.mapIntensityValues(data.printForSample, false)
-////        viewModel.patientDetails = PatientData("Surya", 2, "Male", null)
-////        viewModel.calculateResults()
-//        viewModel.mapWavelengthToAbsorbance()
-//
-//        for (each in viewModel.wavelengthToAbsorbance){
-//            println(each[0].toString() + " -> " + each[1])
-//        }
+//    fun test_mapIntensityValues() {
+//        val inputReference = TestDataGenerator().getInputReferenceMapIntensityValues()
+//        val inputSample = TestDataGenerator().getInputSampleMapIntensityValues()
+//
+//        viewModel.mapIntensityValues(inputReference, true)
+//        viewModel.mapIntensityValues(inputSample, false)
+//
+//        val outputReference = TestDataGenerator().getOutputReferenceMapIntensityValues()
+//        val outputSample = TestDataGenerator().getOutputSampleMapIntensityValues()
+//
+//        assertEquals(outputReference, DataHolder.intensityReferenceArray)
+//        assertEquals(outputSample, viewModel.intensitySampleArray)
 //    }
 
+    @Test
+    fun test_mapWavelengthToAbsorbance() {
+
+        viewModel.mapDeviceConstants(data.inputRead)
+        viewModel.mapPixelNumberToWavelength()
+        viewModel.mapIntensityValues(TestDataGenerator().getInputReferenceMapIntensityValues(), true)
+        viewModel.mapIntensityValues(TestDataGenerator().getInputSampleMapIntensityValues(), false)
+        viewModel.patientDetails = PatientData("Surya", 2, "Male", TestRightResultType.UNDEFINED)
+        viewModel.mapWavelengthToAbsorbance()
+
+        val wavelengthList = TestDataGenerator().getOutputMapPixelNumberToWavelength()
+        val absorbanceList = TestDataGenerator().getOutputMapWavelengthToAbsorbance()
+
+        val df = DecimalFormat("#.###")
+        df.roundingMode = RoundingMode.FLOOR
+
+        assertEquals(Constants.TEST_RIGHT_TOTAL_PIXEL, viewModel.wavelengthToAbsorbance.size)
+        for (i in 0 until Constants.TEST_RIGHT_TOTAL_PIXEL){
+            assertEquals(df.format(wavelengthList[i]), df.format(viewModel.wavelengthToAbsorbance[i][0]))
+            assertEquals(df.format(absorbanceList[i]), df.format(viewModel.wavelengthToAbsorbance[i][1]))
+        }
+    }
+
+
+    @Test
+    fun testRightViewModel_calculateDataForCSV() {
+
+        viewModel.mapDeviceConstants(data.inputRead)
+        viewModel.mapPixelNumberToWavelength()
+        viewModel.mapIntensityValues(data.printForReference, true)
+        viewModel.mapIntensityValues(data.printForSample, false)
+//        viewModel.patientDetails = PatientData("Surya", 2, "Male", null)
+//        viewModel.calculateResults()
+        viewModel.mapWavelengthToAbsorbance()
+
+        for (each in viewModel.wavelengthToAbsorbance){
+            println(each[0].toString() + " -> " + each[1])
+        }
+    }
+
 
 }

app/src/test/java/com/example/hpostesting/util/TestCoroutineRule.kt

@@ -1,28 +0,0 @@
-package com.example.hpostesting.util
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.TestCoroutineDispatcher
-import kotlinx.coroutines.test.TestCoroutineScope
-import kotlinx.coroutines.test.resetMain
-import kotlinx.coroutines.test.setMain
-import org.junit.rules.TestWatcher
-import org.junit.runner.Description
-
-@ExperimentalCoroutinesApi
-class TestCoroutineRule : TestWatcher(), TestCoroutineScope by TestCoroutineScope() {
-
-    private val testCoroutineDispatcher = TestCoroutineDispatcher()
-
-    override fun starting(description: Description?) {
-        super.starting(description)
-        Dispatchers.setMain(testCoroutineDispatcher)
-    }
-
-    override fun finished(description: Description?) {
-        super.finished(description)
-        Dispatchers.resetMain()
-        cleanupTestCoroutines()
-    }
-}

build.gradle

@@ -3,9 +3,9 @@ buildscript {
         kotlin_version = '1.8.21'
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
-        classpath 'com.google.gms:google-services:4.4.0'
-        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.0'
     }
     repositories {
         mavenCentral()