added separate buttons for place buffer and sample in new branch, and also buffer made compulsory for every test

- create index

.idea/misc.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">

app/.gitignore

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

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "in.sminnovations.hpostesting"
         minSdk 21
         targetSdk 34
-        versionCode 2
+        versionCode 10
-        versionName "2.0.1"
+        versionName "2.1.10"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -42,6 +42,7 @@ android {
     }
     buildFeatures {
         viewBinding true
+        buildConfig = true
     }
     lint {
         abortOnError false
@@ -51,11 +52,11 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
 
     //firebase
     implementation platform('com.google.firebase:firebase-bom:32.1.0')
@@ -65,10 +66,13 @@ dependencies {
     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.6.0'
+    implementation 'com.google.android.gms:play-services-auth:20.7.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-beta10'
+    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta10")
+
 
     // Testing
     testImplementation 'junit:junit:4.13.2'
@@ -76,7 +80,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
 
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
     implementation 'com.opencsv:opencsv:4.6'
     implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
 
@@ -92,17 +96,17 @@ dependencies {
     implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
 
     //Room
-    implementation "androidx.room:room-ktx:2.6.0-alpha03"
+    implementation "androidx.room:room-ktx:2.6.0-beta01"
-    implementation "androidx.room:room-runtime:2.6.0-alpha03"
+    implementation "androidx.room:room-runtime:2.6.0-beta01"
-    kapt ("androidx.room:room-compiler:2.6.0-alpha03")
+    kapt ("androidx.room:room-compiler:2.6.0-beta01")
 
     //image
     implementation 'com.github.bumptech.glide:glide:4.13.2'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
 
     // Navigation Component
-    implementation "androidx.navigation:navigation-fragment-ktx:2.7.0"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.2"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.0"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.2"
 
     //Dagger - Hilt
     implementation "com.google.dagger:hilt-android:2.46"

app/release/output-metadata.json

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

app/src/main/AndroidManifest.xml

@@ -27,14 +27,7 @@
         android:theme="@style/Theme.HPOSTesting"
         tools:targetApi="31">
         <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.hemocube.hb.HBHemoCubeActivity"
             android:exported="false"
             android:noHistory="true"
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"

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

@@ -5,6 +5,8 @@ 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
@@ -15,5 +17,14 @@ 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,7 +1,6 @@
 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
@@ -24,8 +23,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

@@ -55,7 +55,4 @@ object Constants {
     const val KIT_COUNT = "KitCount"
     const val BUFFER_VALUE_1 = "BufferValue1"
     const val BUFFER_VALUE_2 = "BufferValue2"
-
-    const val HB_BUFFER_VALUE_1 = "HBBufferValue1"
-    const val HB_KIT_NUMBER = "HBKitNumber"
 }

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

@@ -4,5 +4,5 @@ enum class HemoCubeCommands(val command: String) {
     startBuffer("B\r"),
     getBuffer("Q\r"),
     startSample("S\r"),
-    getSample("R\r"),
+    getSample("P\r"),
 }

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

@@ -1,24 +0,0 @@
-package com.example.hpostesting.data.dao
-
-import androidx.lifecycle.LiveData
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import com.example.hpostesting.data.model.patient.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,15 +9,15 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 @Dao
 interface HemoCubeDao {
-    @Query("SELECT * from HemocubeTest_table")
+    @Query("SELECT * from hemo_cube_test_table")
     fun getAll(): LiveData<List<HemoCubeTestData>>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(hemoCubeTestData: HemoCubeTestData)
 
-    @Query("SELECT * FROM hemocubetest_table WHERE _id = :id")
+    @Query("SELECT * FROM hemo_cube_test_table WHERE _id = :id")
     suspend fun getUserByID(id: String): HemoCubeTestData
 
-    @Query("DELETE FROM hemocubetest_table WHERE _id = :id")
+    @Query("DELETE FROM hemo_cube_test_table WHERE _id = :id")
     suspend fun deleteById(id: String)
 }

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

@@ -1,22 +1,19 @@
 package com.example.hpostesting.data.dao
 
+import android.content.Context
 import androidx.room.Database
+import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import com.example.hpostesting.data.model.patient.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.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.google.android.datatransport.runtime.dagger.Provides
+import javax.inject.Singleton
 
-@Database(
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 3, exportSchema = false)
-    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/patient/DeviceData.kt

@@ -14,8 +14,6 @@ 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

@@ -1,28 +0,0 @@
-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,7 +3,7 @@ package com.example.hpostesting.data.model.patient
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
-@Entity(tableName = "HemocubeTest_table")
+@Entity(tableName = "hemo_cube_test_table")
 data class HemoCubeTestData(
     @PrimaryKey
     var _id: String = "",
@@ -17,6 +17,7 @@ data class HemoCubeTestData(
     var testStatus: Boolean? = false,
     var localFlag: Boolean = false,
     var deviceId: String? = "",
+    var appVersion:String? = "",
     var deviceSerialNumber: String = "",
     var deviceType: String = "HEMOCUBE",
     var kitSerial: String = "",
@@ -29,5 +30,5 @@ data class HemoCubeTestData(
     var led2Average: Double? = null,
     var deviceRatio: Double? = null,
     var calculatedRatio: Double? = null,
-    var appVersion: String? = ""
+    var classificationResult: String = ""
 )

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

@@ -45,12 +45,3 @@ fun UserData.toHemoCubeTestData() = HemoCubeTestData(
     testStatus = testStatus,
     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,6 +2,5 @@ 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

@@ -1,18 +1,24 @@
 package com.example.hpostesting.data.repository
 
+import android.content.Context
 import android.net.Uri
+import androidx.room.Room
+import com.example.hpostesting.data.dao.MyDatabase
 import com.example.hpostesting.data.model.PendingUploads
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.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.android.datatransport.runtime.dagger.Provides
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.ktx.storage
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.tasks.await
+import kotlinx.coroutines.withContext
 import java.io.File
+import javax.inject.Singleton
 
 class DatabaseRepository : Repository {
 
@@ -21,31 +27,14 @@ class DatabaseRepository : Repository {
 
     suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
         return try {
-            val userdata =
+            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
-                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
             if (userdata.documents.isNotEmpty()) {
                 userdata.documents.forEach {
                     db.collection("patientData").document(it.id).update("testStatus", true)
                 }
             }
-            db.collection("testData").add(data).await()
+            db.collection("testData").add(data!!).await()
-            Response.Success(data._id)
+            Response.Success(data!!._id)
-        } catch (e: Exception) {
-            Response.Error(e)
-        }
-    }
-
-    suspend fun addTestToDatabase(data: HBHemoCubeTestData?): Response<String> {
-        return try {
-            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) {
             Response.Error(e)
         }
@@ -54,29 +43,43 @@ class DatabaseRepository : Repository {
 
     suspend fun addTestToDatabase(data: UserData?): Response<String> {
         return try {
-            val userdata =
+            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
-                db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
             if (userdata.documents.isNotEmpty()) {
                 userdata.documents.forEach {
                     db.collection("patientData").document(it.id).update("testStatus", true)
                 }
             }
-            db.collection("testData").add(data).await()
+            db.collection("testData").add(data!!).await()
-            Response.Success(data._id)
+            Response.Success(data!!._id)
         } catch (e: Exception) {
             Response.Error(e)
         }
     }
 
 
+
+
+
     suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean> {
-        return try {
+        try {
 
             val file = Uri.fromFile(File(filePath))
             val riversRef = storage.reference.child("$patientID/${file.lastPathSegment}")
             riversRef.putFile(file).await()
-            Response.Success(true)
+            return Response.Success(true)
 
+        } catch (e: Exception) {
+            e.printStackTrace()
+            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) {
             e.printStackTrace()
             Response.Error(e)
@@ -127,4 +130,5 @@ class DatabaseRepository : Repository {
     }
 
 
+
 }

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

@@ -3,7 +3,6 @@ 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
@@ -45,12 +44,6 @@ object AppModule {
         return myDatabase.hemoCubeDao()
     }
 
-    @Provides
-    @Singleton
-    fun provideMyHBHemo(myDatabase: MyDatabase): HBHemoCubeDao {
-        return myDatabase.hbHemoCubeDao()
-    }
-
     @Provides
     @Singleton
     fun provideContext(application: Application): Context {

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

@@ -5,14 +5,16 @@ 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.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.hemocube.HemoCubeActivity
+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
@@ -26,8 +28,6 @@ class KitScanActivity : AppCompatActivity() {
 
     private lateinit var sharedPreference: SharedPreferences
 
-    private var hbTest = ""
-
     private val barcodeLauncher = registerForActivityResult(
         ScanContract()
     ) { result: ScanIntentResult ->
@@ -50,31 +50,33 @@ 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)
@@ -83,6 +85,17 @@ class KitScanActivity : AppCompatActivity() {
                     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/")
 
@@ -116,11 +129,6 @@ class KitScanActivity : AppCompatActivity() {
                 && 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 {
         if (s.length != 17) {
             binding.nameEditText.error = getString(R.string.invalid_kit)
@@ -131,28 +139,16 @@ 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()
                 }
             }
         }

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

@@ -20,7 +20,10 @@ import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestType
+import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.android.gms.location.*
+import com.google.android.material.snackbar.Snackbar
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityMainBinding
@@ -83,6 +86,11 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+        if (DataHolder.selectedTest == null) {
+            startActivity(Intent(this, DashboardActivity::class.java))
+            finish()
+        }
+
 
 //        val crashButton = Button(this)
 //        crashButton.text = "Test Crash"
@@ -159,12 +167,14 @@ 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) {
@@ -234,18 +244,46 @@ class MainActivity : AppCompatActivity() {
             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.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() {

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

@@ -39,7 +39,7 @@ class SplashActivity : AppCompatActivity() {
         binding = ActivitySplashBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        setupFirestoreCache()
+//        setupFirestoreCache()
         setupStaticConstants()
 
         requestPermissions()
@@ -50,12 +50,12 @@ class SplashActivity : AppCompatActivity() {
             Settings.Secure.getString(applicationContext.contentResolver, Settings.Secure.ANDROID_ID)
     }
 
-    private fun setupFirestoreCache() {
+//    private fun setupFirestoreCache() {
-        val settings = FirebaseFirestoreSettings.Builder()
+//        val settings = FirebaseFirestoreSettings.Builder()
-            .setCacheSizeBytes(FirebaseFirestoreSettings.CACHE_SIZE_UNLIMITED)
+//            .setCacheSizeBytes(FirebaseFirestoreSettings.CACHE_SIZE_UNLIMITED)
-            .build()
+//            .build()
-        Firebase.firestore.firestoreSettings = settings
+//        Firebase.firestore.firestoreSettings = settings
-    }
+//    }
 
     private fun requestPermissions() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {

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

@@ -1,7 +1,6 @@
 package com.example.hpostesting.presentation.adapter
 
 import android.annotation.SuppressLint
-import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,8 +10,6 @@ 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
@@ -56,10 +53,7 @@ class UserListAdapter(
                         ).show()
                     } else {
                         DataHolder.selectedTest = model
-                        DataHolder.selectedTestType = TestType.HB
+                        view.findNavController().navigate(R.id.action_nav_home_to_mainActivity)
-                        val intent = Intent(view.context, KitScanActivity::class.java)
-                        intent.putExtra("Test", "HB")
-                        view.context.startActivity(intent)
                     }
                 }
             }

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

@@ -2,6 +2,7 @@ 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
@@ -10,6 +11,8 @@ 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 dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
@@ -25,7 +28,6 @@ class DashboardActivity : AppCompatActivity() {
 
         binding = ActivityDashboardBinding.inflate(layoutInflater)
         setContentView(binding.root)
-
         setSupportActionBar(binding.appBarDashboard.toolbar)
 
         val drawerLayout: DrawerLayout = binding.drawerLayout
@@ -53,4 +55,31 @@ class DashboardActivity : AppCompatActivity() {
         return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
     }
 
+
+    override fun onResume() {
+        super.onResume()
+        // Copy and paste this into any part of your app - for example, in your main
+// activity's onResume method.
+//        val firebaseAppDistribution = FirebaseAppDistribution.getInstance()
+//        firebaseAppDistribution.updateIfNewReleaseAvailable()
+//            .addOnProgressListener { updateProgress ->
+//                Toast.makeText(this, "Updating", 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.
+//                        }
+//                    }
+//                }
+//            }
+    }
+
+
 }

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

@@ -20,6 +20,7 @@ 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.firestore.Query
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.AndroidEntryPoint
@@ -37,8 +38,16 @@ class HomeFragment : Fragment() {
     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)
         DataHolder.selectedTest = null
 
@@ -90,6 +99,7 @@ class HomeFragment : Fragment() {
         }
     }
     private fun loadUserData() {
+//        val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false).orderBy("createdAt", Query.Direction.DESCENDING)
         val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false)
         query.get().addOnSuccessListener {
             if (it.documents.isEmpty()) {
@@ -154,8 +164,10 @@ class HomeFragment : Fragment() {
                         binding.aadharIdRadioButton.isChecked -> "aadharId"
                         else -> null
                     }
+
                     field?.let { getData(query, it) }
                     false
+
                 } else {
                     loadUserData()
                     false
@@ -252,7 +264,7 @@ class HomeFragment : Fragment() {
 
     private fun deleteHemoCubeIncompleteRegistrations(userDataList: List<HemoCubeTestData>) {
         userDataList.forEach { userData ->
-            if (userData.testTime?.isEmpty() == false) {
+            if (userData.testTime?.isEmpty() == true) {
                 hemoCubeViewModel.deleteById(userData._id)
             }
         }

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

@@ -9,6 +9,7 @@ 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
@@ -20,7 +21,7 @@ class SlideshowFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         val slideshowViewModel =
             ViewModelProvider(this).get(SlideshowViewModel::class.java)
@@ -28,6 +29,12 @@ 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/hemocube/HemoCubeFragment.kt

@@ -10,6 +10,7 @@ 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
@@ -21,15 +22,17 @@ 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.firestore.BuildConfig
+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 `in`.sminnovations.hpostesting.BuildConfig
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
+import kotlinx.coroutines.withContext
 import kotlin.math.log10
 
 class HemoCubeFragment : Fragment() {
@@ -42,9 +45,9 @@ class HemoCubeFragment : Fragment() {
     private var resultData: String = ""
     private var isUsingExistingBuffer = false
     private var isTestOngoing = false
-    private var bloodGroup: String = ""
+    private var startListening = MutableLiveData<Boolean>(false)
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
     ): View {
         binding = FragmentHemoCubeReferenceBinding.inflate(inflater, container, false)
         sharedPreferences =
@@ -56,24 +59,18 @@ class HemoCubeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         initViews()
         observeViewModel()
-        checkAndStartProcess()
+//        checkAndStartProcess()
     }
 
     private fun initViews() {
         binding.btnSubmit.setOnClickListener {
-//            val bloodGroupText = binding.etBloodGroup.text.toString()
+            val bloodGroupText = binding.etBloodGroup.text.toString()
-//            if (bloodGroupText.isNullOrBlank() || bloodGroupText == "Select Blood Group") {
+            if (bloodGroupText.isEmpty()) {
-//                binding.etBloodGroup.error = "Please enter your blood group"
+                binding.etBloodGroup.error = "Please enter your blood group"
-//                Toast.makeText(context, "Please enter your blood group", Toast.LENGTH_SHORT).show()
+            } else {
-//            } 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
@@ -83,10 +80,25 @@ class HemoCubeFragment : Fragment() {
         binding.btnSubmit.isEnabled = false
         binding.btnSubmit.isClickable = false
 
+
+        binding.btnSamplestart.setOnClickListener {
+            startSampleProcess()
+            it.visibility = View.GONE
+        }
+
+        binding.btnPlacebuffer.setOnClickListener {
+            checkAndStartProcess()
+            it.visibility = View.GONE
+        }
+
+
+
+
         binding.btnKit.setOnClickListener {
             if (isTestOngoing) {
                 val title = "WARNING"
-                val message = "There is a on going test, do you want to stop it"
+                val message =
+                    "There is a on going test, do you want to stop it. if Yes please disconnect the device and connect it again, once you reached to kitDetails Screen"
                 val negativeText = getString(R.string.no)
                 val positiveText = "Yes"
 
@@ -104,26 +116,37 @@ class HemoCubeFragment : Fragment() {
                             resetKitCount()
                             val intent = Intent(context, KitScanActivity::class.java)
                             startActivity(intent)
-                            (activity as HemoCubeActivity).finish()
+                            (activity as HemocubeActivity).finish()
                         }
                     })
+            } else {
+                resetKitCount()
+                val intent = Intent(context, KitScanActivity::class.java)
+                startActivity(intent)
+                (activity as HemocubeActivity).finish()
             }
         }
     }
 
-    private fun checkBloodGroup() {
+    private suspend fun checkBloodGroup() {
         binding.apply {
-//             bloodGroup = etBloodGroup.text.toString()
+            val bloodGroup = etBloodGroup.text.toString()
+            if (bloodGroup.isEmpty()) {
+                etBloodGroup.error = "Please enter your blood group"
+            } else {
                 val db: FirebaseFirestore = Firebase.firestore
-
+                val userdata = db.collection("patientData")
-            // Launch a new coroutine scope
+                    .whereEqualTo("_id", hemoCubeViewModel.testDetails?._id).get().await()
-            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)
+                    withContext(Dispatchers.Main) {
+                        val i = Intent(
+                            requireContext().applicationContext, DashboardActivity::class.java
+                        )
+                        startActivity(i)
+                        (activity as HemocubeActivity).finish()
+                    }
                 }
             }
         }
@@ -133,7 +156,9 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 showToast("Test Results Uploaded Successfully")
-                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
+                lifecycleScope.launch {
+                    checkBloodGroup()
+                }
             }
             if (result == "Local") {
                 showToast("Internet not available, test details stored locally")
@@ -143,29 +168,54 @@ class HemoCubeFragment : Fragment() {
             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 ->
-            hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID,""))
+            apply {
+                DataHolder.hemoCubeTestData?.let {
+                    currentDeviceData?.coefficients?.let { coefficients ->
+                        val coefficient1 = coefficients[0]
+                        val coefficient2 = coefficients[1]
+                        val result = coefficient1 * coefficient2
+                        showToast("coefficients: $coefficient1, $coefficient2")
+                    }
+                }
                 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() {
-        if (isBufferValueAvailable()) {
+//        if (isBufferValueAvailable()) {
-            showBufferAlertDialog()
+//            showBufferAlertDialog()
-        } else {
+//        } else {
             listenToHemoCube()
             startBufferProcess()
-        }
+//        }
     }
 
     private fun isBufferValueAvailable(): Boolean {
@@ -214,7 +264,10 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.progressBar.postValue(true)
 
         val fullReadOutput = StringBuilder()
-        (activity as HemoCubeActivity).mService.listenToHemoCube(object : UsbServiceListener {
+        startListening.postValue(true)
+
+        try {
+            (activity as HemocubeActivity).mService.listenToHemoCube(object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
                         val stringData = String(it)
@@ -227,6 +280,10 @@ class HemoCubeFragment : Fragment() {
                     hemoCubeViewModel.progressBar.postValue(false)
                 }
             })
+        } catch (e: Exception) {
+            showToast("test is going on")
+            Firebase.crashlytics.recordException(e)
+        }
     }
 
     private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
@@ -238,9 +295,18 @@ class HemoCubeFragment : Fragment() {
         resultData += fullReadOutput.toString()
 
         when {
-            stringData.contains("ERROR 500") -> showError500Dialog()
+            stringData.contains("ERROR 500") ->
+//                showError500Dialog()
+                  checkAndStartProcess()
             stringData.contains("ERROR 501") -> showError501Dialog()
-            stringData.contains("#Buffer Completed") -> showStartSampleDialog()
+            stringData.contains("#Buffer Completed") ->
+                //                showStartSampleDialog()
+                activity?.runOnUiThread {
+                    binding.btnSamplestart.visibility = View.VISIBLE
+                    binding.btnSamplestart.isClickable = true
+                }
+
+
             stringData.contains("#Sample Completed") -> {
                 activity?.runOnUiThread {
                     binding.btnSubmit.isEnabled = true
@@ -268,6 +334,25 @@ class HemoCubeFragment : Fragment() {
         }
     }
 
+
+    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))
+                    }
+                })
+        }
+    }
+
+
     private fun showError500Dialog() {
         UIUtils.createAlertDialog(requireContext(),
             "BUFFER ERROR",
@@ -284,6 +369,19 @@ class HemoCubeFragment : Fragment() {
             })
     }
 
+    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",
@@ -311,6 +409,7 @@ class HemoCubeFragment : Fragment() {
                     override fun onClickNegativeButton() {}
 
                     override fun onClickPositiveButton() {
+                        listenToHemoCube()
                         startSampleProcess()
                     }
                 })
@@ -332,23 +431,37 @@ 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 version = BuildConfig.VERSION_NAME
+//                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) {
+//
+//                            }
+//                        }
+//                    }
+//                }
                 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.classificationResult = findResult(calculatedRatio)
+                    hemoCubeViewModel.messages.postValue(this.classificationResult)
                     this.resultData = fullReadOutput
                     if (!isBufferValueAvailable()) {
                         with(sharedPreferences.edit()) {
@@ -357,16 +470,50 @@ class HemoCubeFragment : Fragment() {
                             apply()
                         }
                     }
+                    activity?.runOnUiThread {
+                        binding.progressBar.visibility = View.VISIBLE
+                    }
                     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.085)
+                    return "Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume"
+                if (calculatedRatio in 0.085..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) {
@@ -376,8 +523,7 @@ class HemoCubeFragment : Fragment() {
     private fun startBufferProcess() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemoCubeActivity).mService.sendAndListenToHemoCube(
+        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startBuffer,
-            HemoCubeCommands.startBuffer,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
 
@@ -390,8 +536,7 @@ class HemoCubeFragment : Fragment() {
     private fun startSampleProcess() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemoCubeActivity).mService.sendAndListenToHemoCube(
+        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.startSample,
-            HemoCubeCommands.startSample,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
 
@@ -404,8 +549,7 @@ class HemoCubeFragment : Fragment() {
     private fun fetchResult() {
         hemoCubeViewModel.progressBar.postValue(true)
 
-        (activity as HemoCubeActivity).mService.sendAndListenToHemoCube(
+        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.getSample,
-            HemoCubeCommands.getSample,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {}
 

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

@@ -33,7 +33,8 @@ class HemoCubeViewModel @Inject constructor(
     val progressBar = MutableLiveData(false)
     val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
     val messages = MutableLiveData<String>()
-    private val sharedPreference: SharedPreferences = context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+    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)
 
@@ -52,8 +53,10 @@ class HemoCubeViewModel @Inject constructor(
 
             try {
                 if (isOnline) {
+                    parseData()
                     addResultTestToDb()
                 } else {
+                    parseData()
                     testDetails?.testTime = SimpleDateFormat(
                         "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
                     ).format(Calendar.getInstance().time)
@@ -69,7 +72,8 @@ class HemoCubeViewModel @Inject constructor(
         deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
     }
 
-    private fun addResultTestToDb() {
+    private fun parseData() {
+        testDetails?.deviceRatio = DataHolder.hemocubeResult
         testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
         testDetails?.location = DataHolder.location
         testDetails?.testTime = SimpleDateFormat(
@@ -77,7 +81,8 @@ class HemoCubeViewModel @Inject constructor(
         ).format(Calendar.getInstance().time)
         testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion
         testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId
-        testDetails?.deviceSerialNumber = sharedPreference.getString(Constants.USER_ID, "").toString()
+        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
@@ -87,7 +92,10 @@ class HemoCubeViewModel @Inject constructor(
         testDetails?.led2Average = DataHolder.hemoCubeTestData?.led2Average
         testDetails?.deviceRatio = DataHolder.hemoCubeTestData?.deviceRatio
         testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio
+        testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
+    }
 
+    private fun addResultTestToDb() {
         viewModelScope.launch {
             try {
                 testDetails!!.reportUploadTime = SimpleDateFormat(
@@ -109,7 +117,6 @@ class HemoCubeViewModel @Inject constructor(
                         Log.e("Testdb", "Error uploading data to Firestore: $response")
                         fireBaseUpload.postValue("Error")
                     }
-
                 }
             } catch (e: Exception) {
                 Log.e("Testdb", "Exception during data upload: ${e.message}")
@@ -126,6 +133,7 @@ class HemoCubeViewModel @Inject constructor(
             when (repository.addTestToDatabase(userData)) {
                 is Response.Success -> {
                     fireBaseUpload.postValue("Success")
+                    deleteById(userData._id)
                 }
 
                 else -> {}

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
-class HemoCubeActivity : AppCompatActivity() {
+open class HemocubeActivity : AppCompatActivity() {
     private lateinit var binding: ActivityHemocubeBinding
     private val viewModel by viewModels<HemoCubeViewModel>()
     private var myMenu: Menu? = null
@@ -97,7 +97,7 @@ class HemoCubeActivity : AppCompatActivity() {
         }
     }
 
-    private fun connectUsb(permissionGranted: Boolean) {
+    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)
@@ -118,13 +118,13 @@ class HemoCubeActivity : AppCompatActivity() {
 
 
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent =
+        val mPendingIntent: PendingIntent
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-                PendingIntent.getBroadcast(
+            mPendingIntent = PendingIntent.getBroadcast(
                 this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
             )
         } else {
-                PendingIntent.getBroadcast(
+            mPendingIntent = PendingIntent.getBroadcast(
                 this,
                 0,
                 Intent(Constants.HOMOCUBE_USB_PERMISSION),
@@ -137,12 +137,18 @@ class HemoCubeActivity : AppCompatActivity() {
         manager.requestPermission(device, mPendingIntent)
     }
 
-    private fun setupService() {
+    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
 
@@ -150,6 +156,17 @@ 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/hb/HBHemoCubeActivity.kt

@@ -1,171 +0,0 @@
-package com.example.hpostesting.presentation.hemocube.hb
-
-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.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
-class HBHemoCubeActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityHemocubeBinding
-    private val viewModel by viewModels<HBHemoCubeViewModel>()
-    private var myMenu: Menu? = null
-
-    private lateinit var mDriver: UsbSerialDriver
-    private var mConnection: UsbDeviceConnection? = null
-    lateinit var mService: UsbService
-
-    private val TAG = "HemoCube"
-
-    private val broadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-
-            synchronized(this) {
-                val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
-
-                if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
-                    device?.apply {
-                        connectUsb(true)
-                        DataHolder.usbConnected.postValue(true)
-                    }
-                } else {
-                    onErrorReported("permission denied for device")
-                    DataHolder.usbConnected.postValue(true)
-                }
-            }
-
-        }
-    }
-    private val connection = object : ServiceConnection {
-        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            val binder = service as UsbService.UsbServiceBinder
-            mService = binder.getService()
-            viewModel.isServiceConnected = true
-            mConnection.let { mService.connect(mDriver, mConnection!!) }
-            moveToNext()
-        }
-
-        override fun onServiceDisconnected(arg0: ComponentName) {
-            viewModel.isServiceConnected = false
-        }
-    }
-
-    override fun 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, "Device is Disconnected", Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    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)
-
-        if (availableDrivers.isEmpty()) {
-            onErrorReported("No Device is Connected")
-        } else {
-            mDriver = availableDrivers[0]
-            mConnection = manager.openDevice(mDriver.device)
-
-            if (mConnection == null) {
-                requestUserPermission(manager, mDriver.device)
-            } else {
-                setupService()
-            }
-        }
-    }
-
-
-    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_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)
-    }
-
-    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) {
-            mService.disconnect()
-            unbindService(connection)
-            viewModel.isServiceConnected = false
-        }
-    }
-}

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

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

@@ -1,138 +0,0 @@
-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/res/layout/fragment_gallery.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-   >
+    tools:context=".presentation.dashboard.GalleryFragment">
 
     <TextView
         android:id="@+id/text_gallery"

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="HB TESTING INSTRUCTIONS"
+            android:text="@string/Instructions"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -58,6 +58,40 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
 
+
+
+
+        <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"
@@ -69,7 +103,29 @@
             android:textColor="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
+            app:layout_constraintTop_toBottomOf="@id/til_blood_group" />
+
+        <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"
@@ -82,22 +138,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
-        <TextView
-            android:id="@+id/result"
-            style="@style/title1_1"
-            android:layout_width="0dp"
-            android:layout_height="80dp"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            tools:text="HB Est. : 16.254 g/dl"
-            android:textColor="@color/red"
-            android:textSize="28sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
-
-
 <!--        <Button-->
 <!--            android:id="@+id/btn_buffer"-->
 <!--            android:layout_width="wrap_content"-->

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

@@ -112,6 +112,8 @@
     <string name="sickle_cert">Sickle Cert</string>
     <string name="sickle_find">Sickle Find</string>
     <string name="submit">Submit</string>
+    <string name="place_buffer">Start Buffer</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>