Check negative absorbance

.gitignore

@@ -1,7 +1,13 @@
 *.iml
 .gradle
 /local.properties
-/.idea
+/.idea/misc.xml
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
 .DS_Store
 /build
 /captures

.idea/gradle.xml

@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/misc.xml

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

app/build.gradle

@@ -6,18 +6,17 @@ plugins {
     id 'com.google.gms.google-services'
     id 'androidx.navigation.safeargs.kotlin'
     id 'kotlin-kapt'
-    id 'com.google.firebase.crashlytics'
 }
 //apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 33
     namespace 'in.sminnovations.hpostesting'
 
     defaultConfig {
-        applicationId "in.sminnovations.hpostesting"
+        applicationId "in.sminnovations.hpostesting.prod"
         minSdk 21
-        targetSdk 34
+        targetSdk 33
         versionCode 2
         versionName "2.0.1"
 
@@ -40,13 +39,14 @@ android {
     dataBinding {
         enabled = true
     }
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+    }
     buildFeatures {
         viewBinding true
-        buildConfig = true
-    }
-    lint {
-        abortOnError false
-        checkReleaseBuilds false
     }
 }
 
@@ -60,16 +60,13 @@ dependencies {
 
     //firebase
     implementation platform('com.google.firebase:firebase-bom:32.1.0')
-    implementation("com.google.firebase:firebase-crashlytics-ktx")
-    implementation("com.google.firebase:firebase-analytics-ktx")
     implementation 'com.google.firebase:firebase-firestore-ktx'
     implementation 'com.google.firebase:firebase-auth-ktx'
     implementation 'com.google.firebase:firebase-storage-ktx'
     implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
-    implementation 'com.google.android.gms:play-services-auth:20.6.0'
+    implementation 'com.google.android.gms:play-services-auth:20.5.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'
 
     // Testing
     testImplementation 'junit:junit:4.13.2'
@@ -79,9 +76,9 @@ dependencies {
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
     implementation 'com.opencsv:opencsv:4.6'
-    implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
+    implementation 'com.github.mik3y:usb-serial-for-android:3.4.6'
 
-    implementation "androidx.fragment:fragment-ktx:1.6.1"
+    implementation "androidx.fragment:fragment-ktx:1.6.0"
 
     // CSV read, write
     implementation 'com.opencsv:opencsv:4.6'
@@ -90,20 +87,20 @@ dependencies {
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
     // Google ML Kit usign play services
-    implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
+    implementation 'com.google.android.gms:play-services-code-scanner:16.0.0'
 
     //Room
-    implementation "androidx.room:room-ktx:2.6.0-beta01"
-    implementation "androidx.room:room-runtime:2.6.0-beta01"
-    kapt ("androidx.room:room-compiler:2.6.0-beta01")
+    implementation "androidx.room:room-ktx:2.6.0-alpha01"
+    implementation "androidx.room:room-runtime:2.6.0-alpha01"
+    kapt ("androidx.room:room-compiler:2.6.0-alpha01")
 
     //image
     implementation 'com.github.bumptech.glide:glide:4.13.2'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
 
     // Navigation Component
-    implementation "androidx.navigation:navigation-fragment-ktx:2.7.1"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.1"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.0-beta01"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.0-beta01"
 
     //Dagger - Hilt
     implementation "com.google.dagger:hilt-android:2.46"

app/src/main/AndroidManifest.xml

@@ -14,10 +14,6 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
-    <uses-feature android:name="android.hardware.usb.host" />
-
-    <uses-permission android:name="android.permission.USB_PERMISSION" />
-
     <application
         android:name="com.example.hpostesting.HPOSTestingApplication"
         android:allowBackup="true"
@@ -29,27 +25,16 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.HPOSTesting"
         tools:targetApi="31">
-        <activity
-            android:name="com.example.hpostesting.presentation.BloodCollectingMethodActivity"
-            android:exported="true"
-            android:noHistory="true"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
-        <activity
-            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.KitScanActivity"
-            android:exported="false"
             android:noHistory="true"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
+            android:exported="false"
+            android:theme="@style/Theme.HPOS.NoActionBar"/>
         <activity
             android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
             android:exported="false"
             android:label="@string/title_activity_dashboard"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.HPOS.NoActionBar" />
 
         <service
@@ -71,10 +56,11 @@
         <activity
             android:name="com.example.hpostesting.presentation.testRight.TestRightActivity"
             android:exported="false"
-            android:noHistory="true"
             android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
-            android:theme="@style/Theme.HPOS.NoActionBar"
-            android:windowSoftInputMode="adjustPan">
+            android:screenOrientation="portrait"
+            android:noHistory="true"
+            android:windowSoftInputMode="adjustPan"
+            android:theme="@style/Theme.HPOS.NoActionBar">
 
             <!-- <intent-filter> -->
             <!-- <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> -->
@@ -88,6 +74,7 @@
         <activity
             android:name="com.example.hpostesting.presentation.MainActivity"
             android:exported="true"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
@@ -102,6 +89,7 @@
             android:screenOrientation="portrait"
             android:stateNotNeeded="true"
             tools:replace="android:screenOrientation" />
+
     </application>
 
 </manifest>

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

@@ -1,19 +1,12 @@
 package com.example.hpostesting
 
 import android.app.Application
-import android.content.Context
-import androidx.room.Room
-import com.example.hpostesting.data.dao.MyDatabase
-import com.google.android.datatransport.runtime.dagger.Provides
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import javax.inject.Singleton
 
 @HiltAndroidApp
 class HPOSTestingApplication: Application() {
     val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
-
 }

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.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestRightDeviceConstants
 import com.example.hpostesting.data.model.test.TestType
@@ -9,8 +8,12 @@ import com.example.hpostesting.data.model.test.TestType
 object DataHolder {
 
     var selectedTestType: TestType = TestType.SICKLECERT
+
     val usbConnected = MutableLiveData(true)
+
     var mobileUniqueId: String? = null
+
+    var isStoragePermissionGranted = false
     var isAppFolderCreated = false
     var appFolderPath = ""
     var isReferenceTaken = false
@@ -18,13 +21,20 @@ object DataHolder {
 
     var deviceConstant: TestRightDeviceConstants? = null
     var deviceSerialNumber: String = "ABCD"
-    val deviceType = MutableLiveData<String>()
+
+    /* Contains wavelength -> pixel no.*/
     val wavelengthToPixelArray = ArrayList<Double>()
+
+    /* (For reference/baseline) Contains pixel no. -> Intensity of light falling on that pixel */
     val intensityReferenceArray = ArrayList<Double>()
+
     var selectedTest: UserData? = null
-    var hemoCubeTestData: HemoCubeTestData? = 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/FileUploader.kt

@@ -1,46 +0,0 @@
-package com.example.hpostesting.data
-
-import android.util.Log
-import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.util.MyUtils
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-
-class FileUploader {
-
-    private val TAG = "FileUploader"
-    val repository = DatabaseRepository()
-
-    suspend fun start() {
-
-        val listOfFiles = repository.getAllFromPendingQueue()
-
-        for (each in listOfFiles){
-            // Checking internet connectivity & mobile as same or not
-            if (MyUtils.isInternetConnected() && each.mobileId == DataHolder.mobileUniqueId) {
-
-                Log.d(TAG, "uploading file ${each.pendingId}")
-                GlobalScope.launch {
-                    val response = repository.uploadFileToStorage(each.patientId, each.filePath)
-
-                    when (response) {
-                        is Response.Success -> {
-                            Log.d(TAG, "File Uploaded ${each.pendingId}")
-                            repository.removeFromPendingQueue(each.pendingId)
-                        }
-
-                        is Response.Error -> {
-                            Log.d(TAG, response.exception.toString())
-                        }
-                    }
-                }.join()
-
-            } else {
-                return
-            }
-        }
-        return
-    }
-
-}

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

@@ -0,0 +1,8 @@
+package com.example.hpostesting.data
+
+sealed class Result<out T : Any> {
+
+    data class Success<out T : Any>(val data: T) : Result<T>()
+    data class Error(val exception: Exception) : Result<Nothing>()
+    class Loading<T : Any> : Result<T>()
+}

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

@@ -0,0 +1,31 @@
+package com.example.hpostesting.data.api
+
+import com.example.hpostesting.data.model.patient.MolbioLogin
+import com.example.hpostesting.data.model.patient.UploadResponse
+import com.google.gson.JsonObject
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.Header
+import retrofit2.http.Headers
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.PUT
+import retrofit2.http.Part
+
+interface MolbioApi {
+    @Headers("Content-Type: application/json")
+    @POST("devices/login")
+    suspend fun login(@Body jsonObject: JsonObject): MolbioLogin
+
+
+    @Multipart
+    @PUT("results/upload")
+    fun uploadPdf(@Header("Authorization") auth:String, @Part file: MultipartBody.Part, @Part("DeviceId") name: RequestBody): Call<JsonObject>
+
+    @Multipart
+    @PUT("results/upload")
+    suspend fun uploadNewPdf(@Header("Authorization") auth:String,@Part("") count:RequestBody,@Part("") userId:RequestBody,@Part file_csv: MultipartBody.Part,@Part file_log:MultipartBody.Part,@Part("DeviceId") name:RequestBody): UploadResponse
+
+}

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

@@ -2,7 +2,6 @@ package com.example.hpostesting.data.constant
 
 object Constants {
     const val ACTION_USB_PERMISSION = "shanmukha.in.sickle_cell.USB_PERMISSION"
-    const val HOMOCUBE_USB_PERMISSION = "shanmukha.in.sickle_cell_homocube.USB_PERMISSION"
 
     const val ABHA_APP_PACKAGE = "in.ndhm.phr"
 
@@ -23,12 +22,7 @@ object Constants {
     const val MAX_WAVELENGTH_RANGE_TO_RECORD = 750
 
     const val DEVICE_PRODUCT_ID = 24597
-    const val DEVICE_TYPE_HOMOCUBE = "HOMOCUBE"
-    const val DEVICE_TYPE_TEST_RIGHT = "TEST_RIGHT"
-
     const val DEVICE_VENDOR_ID = 1027
-    const val HOMO_CUBE_ID = 29987
-    const val VENDOR_ID = 6790
 
     const val ERROR_NORMAL = 400
     const val ERROR_CRITICAL = 401
@@ -41,22 +35,11 @@ object Constants {
         "VIZ-1000-0004",
         "VIZ-1000-0005",
         "VIZ-1000-0006",
-        "HC-V1-001",
-        "HC-V1-002",
-        "HC-V1-003",
-        "HC-V1-004",
-        "HC-V1-005",
-        "HC-V1-006",
     )
 
     const val password = "SMI@12345"
 
-    const val KIT_NUMBER = "KitNumber"
-    const val KIT_COUNT = "KitCount"
-    const val BUFFER_VALUE_1 = "BufferValue1"
-    const val BUFFER_VALUE_2 = "BufferValue2"
+    const val BASE_URL =  "https://datacollection.micropcr.com/v1/"
 
-    const val BLOOD_COLLECTING_METHOD = "bloodCollectingMethod"
-    const val VENOUS_BLOOD = "venousBlood"
-    const val FINGER_PRICK_BLOOD = "fingerPrickBlood"
+    const val TOKEN = "molbioToken"
 }

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

@@ -1,8 +0,0 @@
-package com.example.hpostesting.data.constant
-
-enum class HemoCubeCommands(val command: String) {
-    startBuffer("B\r"),
-    getBuffer("Q\r"),
-    startSample("S\r"),
-    getSample("P\r"),
-}

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

@@ -2,7 +2,6 @@ package com.example.hpostesting.data.dao
 
 import androidx.room.TypeConverter
 import com.example.hpostesting.data.model.patient.UserData
-import com.google.common.reflect.TypeToken
 import com.google.gson.Gson
 
 class Converters {
@@ -16,6 +15,7 @@ class Converters {
             null
         }
     }
+
     @TypeConverter
     fun toString(location: UserData.Location?): String? {
         return if (location != null) {
@@ -24,15 +24,4 @@ class Converters {
             null
         }
     }
-
-    @TypeConverter
-    fun fromList(list: List<Double>): String {
-        return Gson().toJson(list)
-    }
-
-    @TypeConverter
-    fun toList(json: String): List<Double> {
-        val type = object : TypeToken<List<Double>>() {}.type
-        return Gson().fromJson(json, type)
-    }
 }

app/src/main/java/com/example/hpostesting/data/dao/DeviceDao.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.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.data.model.patient.UserData
-@Dao
-interface DeviceDao {
-    @Query("SELECT * from device_table")
-    fun getAll(): LiveData<List<HemoCubeTestData>>
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAll(deviceData: DeviceData)
-
-    @Query("SELECT * FROM device_table WHERE deviceId = :id")
-    suspend fun getUserByID(id: String): HemoCubeTestData
-
-    @Query("DELETE FROM device_table WHERE deviceId = :id")
-    suspend fun deleteById(id: String)
-}

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

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

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

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

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

@@ -1,19 +0,0 @@
-package com.example.hpostesting.data.model.patient
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import com.google.firebase.firestore.PropertyName
-
-@Entity(tableName = "device_table")
-data class DeviceData(
-    @PrimaryKey
-    var _id: String = "",
-    @get:PropertyName("deviceId") @set:PropertyName("deviceId")
-    var deviceId: String = "",
-    @get:PropertyName("deviceType") @set:PropertyName("deviceType")
-    var deviceType: String = "",
-    @get:PropertyName("coefficients") @set:PropertyName("coefficients")
-    var coefficients: List<Double> = emptyList(),
-    @get:PropertyName("calibratedAt") @set:PropertyName("calibratedAt")
-    var calibratedAt: String = ""
-)

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

@@ -1,33 +0,0 @@
-package com.example.hpostesting.data.model.patient
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "HemocubeTest_table")
-data class HemoCubeTestData(
-    @PrimaryKey
-    var _id: String = "",
-    var name: String = "",
-    var birthYear: String = "",
-    var userImageURL: String = "",
-    var location: UserData.Location? = null,
-    var reportUploadTime: String? = "",
-    var testType: String? = "HEMOCUBE",
-    var testTime: String? = "",
-    var testStatus: Boolean? = false,
-    var localFlag: Boolean = false,
-    var deviceId: String? = "",
-    var appVersion:String? = "",
-    var deviceSerialNumber: String = "",
-    var deviceType: String = "HEMOCUBE",
-    var kitSerial: String = "",
-    var resultData: String = "",
-    var led1Buffer: Double? = null,
-    var led2Buffer: Double? = null,
-    var led1Sample: Double? = null,
-    var led2Sample: Double? = null,
-    var led1Average: Double? = null,
-    var led2Average: Double? = null,
-    var deviceRatio: Double? = null,
-    var calculatedRatio: Double? = null
-)

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

@@ -0,0 +1,5 @@
+package com.example.hpostesting.data.model.patient
+
+data class MolbioLogin(
+    val token: String
+)

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

@@ -45,6 +45,12 @@ data class PatientDetails(
         OTHER
     }
 
+//    enum class BloodGroup {
+//        O_POSITIVE, O_NEGATIVE,
+//        A_POSITIVE, A_NEGATIVE,
+//        B_POSITIVE, B_NEGATIVE,
+//        AB_POSITIVE, AB_NEGATIVE,
+//    }
 
     data class Address(
         var house: String?,

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

@@ -0,0 +1,5 @@
+package com.example.hpostesting.data.model.patient
+
+data class UploadResponse(
+    val success: Boolean
+)

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

@@ -23,7 +23,8 @@ data class UserData(
     var csvPath: String = "",
     var reportPath: String = "",
     var result: TestRightResultType? = null,
-    var resultRatio: Double? = null
+    var resultRatio: Double? = null,
+    var uploadFlag: Boolean? = false
 ) {
     enum class Gender {
         MALE,
@@ -36,12 +37,3 @@ data class UserData(
         var longitude: Double? = null
     )
 }
-
-fun UserData.toHemoCubeTestData() = HemoCubeTestData(
-    _id = _id,
-    name = name,
-    birthYear = birthYear,
-    userImageURL = userImageURL,
-    testStatus = testStatus,
-    location = location
-)

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

@@ -1,65 +1,78 @@
 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.api.MolbioApi
 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.HemoCubeTestData
+import com.example.hpostesting.data.model.patient.MolbioLogin
+import com.example.hpostesting.data.model.patient.UploadResponse
 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 com.google.gson.JsonObject
 import kotlinx.coroutines.tasks.await
-import kotlinx.coroutines.withContext
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
 import java.io.File
+import java.net.ConnectException
+import java.net.SocketTimeoutException
+import javax.inject.Inject
 import javax.inject.Singleton
 
-class DatabaseRepository : Repository {
+
+class NetworkException(message: String, cause: Throwable) : Exception(message, cause)
+
+@Singleton
+class DatabaseRepository @Inject constructor(
+    private val molbioApi: MolbioApi
+) : Repository {
 
     private val db: FirebaseFirestore = Firebase.firestore
     private val storage = Firebase.storage
 
-    suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
+    private suspend fun <T : Any> safeApiCall(apiCall: suspend () -> T): com.example.hpostesting.data.Result<T> {
         return try {
-            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+            val response = apiCall.invoke()
+            com.example.hpostesting.data.Result.Success(response)
+        } catch (e: SocketTimeoutException) {
+            com.example.hpostesting.data.Result.Error(NetworkException("Network timeout", e))
+        } catch (e: ConnectException) {
+            com.example.hpostesting.data.Result.Error(
+                NetworkException(
+                    "Network connection failed",
+                    e
+                )
+            )
+        } catch (e: Exception) {
+            com.example.hpostesting.data.Result.Error(e)
+        }
+    }
+
+    suspend fun login(jsonObject: JsonObject):  com.example.hpostesting.data.Result<MolbioLogin> {
+        return safeApiCall { molbioApi.login(jsonObject) }
+    }
+
+    suspend fun uploadPdf(token:String,count:RequestBody,userId:RequestBody,file_csv:MultipartBody.Part,log_csv:MultipartBody.Part,deviceId:RequestBody): com.example.hpostesting.data.Result<UploadResponse> {
+        return safeApiCall { molbioApi.uploadNewPdf(token,count,userId,file_csv,log_csv,deviceId) }
+    }
+
+    suspend fun addTestToDatabase(data: UserData): 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)
+            db.collection("testData").add(data).await()
+            Response.Success(data._id)
         } catch (e: Exception) {
             Response.Error(e)
         }
     }
 
-
-    suspend fun addTestToDatabase(data: UserData?): 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)
-        }
-    }
-
-
-
-
-
     suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean> {
         try {
 
@@ -116,19 +129,4 @@ class DatabaseRepository : Repository {
         }
     }
 
-    suspend fun getDeviceData(): List<DeviceData> {
-        return db.collection("devices").get().await().toObjects(DeviceData::class.java)
-    }
-
-
-    suspend fun getDeviceDataById(deviceId: String): DeviceData? {
-        val querySnapshot = db.collection("devices").get().await()
-        val allDeviceDataList = querySnapshot.toObjects(DeviceData::class.java)
-
-        // Find the DeviceData object with the specified deviceId
-        return allDeviceDataList.find { it.deviceId == deviceId }
-    }
-
-
-
 }

app/src/main/java/com/example/hpostesting/domain/UploadJobScheduler.kt

@@ -0,0 +1,55 @@
+package com.example.hpostesting.domain
+
+import android.app.job.JobParameters
+import android.app.job.JobService
+import android.content.Context
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.lifecycle.ViewModelProvider
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.presentation.testRight.TestRightViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class MyJobScheduler : JobService(){
+
+    @Inject
+    lateinit var sharedPreference: SharedPreferences
+    private lateinit var viewModel: TestRightViewModel
+
+    override fun onCreate() {
+        super.onCreate()
+        viewModel = ViewModelProvider.AndroidViewModelFactory.getInstance(application)
+            .create(TestRightViewModel::class.java)
+    }
+
+    override fun onStartJob(p0: JobParameters?): Boolean {
+        Log.d("jober","job started")
+        sharedPreference = this.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+        viewModel.networkStatusLiveData.observeForever {
+            if (it) {
+                fetchInternalDataAndUpload()
+            }
+        }
+        return false
+    }
+
+    private fun fetchInternalDataAndUpload() {
+        val token = sharedPreference.getString(Constants.TOKEN,"")
+        viewModel.allUserData.observeForever {userList ->
+            userList.forEach {user ->
+                if (user.uploadFlag == false) {
+                    viewModel.bulkUploadResultToDatabase(user, token)
+                }
+            }
+        }
+    }
+
+
+    override fun onStopJob(p0: JobParameters?): Boolean {
+        Log.d("jober_stop","Job stopped")
+        return false
+    }
+
+}

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

@@ -2,12 +2,14 @@ package com.example.hpostesting.domain.di
 
 import android.app.Application
 import android.content.Context
+import android.content.SharedPreferences
+import androidx.lifecycle.ViewModelProvider
 import androidx.room.Room
-import com.example.hpostesting.data.dao.HemoCubeDao
+import com.example.hpostesting.data.api.MolbioApi
+import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.MyDatabase
 import com.example.hpostesting.data.dao.UserDao
 import com.example.hpostesting.data.datasource.LocalFileDataSource
-import com.example.hpostesting.data.repository.DatabaseRepository
 import com.example.hpostesting.data.repository.LocalFileRepository
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
@@ -16,6 +18,8 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
 import javax.inject.Singleton
 
 @Module
@@ -27,9 +31,7 @@ object AppModule {
     fun provideMyDatabase(@ApplicationContext context: Context): MyDatabase {
         return Room.databaseBuilder(
             context, MyDatabase::class.java, "my_database"
-        )
-            .fallbackToDestructiveMigration()
-            .build()
+        ).build()
     }
 
     @Provides
@@ -38,12 +40,6 @@ object AppModule {
         return myDatabase.userDao()
     }
 
-    @Provides
-    @Singleton
-    fun provideMyHemo(myDatabase: MyDatabase): HemoCubeDao {
-        return myDatabase.hemoCubeDao()
-    }
-
     @Provides
     @Singleton
     fun provideContext(application: Application): Context {
@@ -66,7 +62,28 @@ object AppModule {
 
     @Provides
     @Singleton
-    fun provideDatabaseRepository(): DatabaseRepository {
-        return DatabaseRepository()
+    fun provideRetrofit(): Retrofit =
+        Retrofit
+            .Builder()
+            .baseUrl(Constants.BASE_URL)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+
+
+    @Provides
+    @Singleton
+    fun provideMolbioApi(retrofit: Retrofit): MolbioApi =
+        retrofit.create(MolbioApi::class.java)
+
+    @Provides
+    @Singleton
+    fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
+        return context.getSharedPreferences("my_preferences", Context.MODE_PRIVATE)
+    }
+
+    @Provides
+    @Singleton
+    fun provideViewModelFactory(application: Application): ViewModelProvider.Factory {
+        return ViewModelProvider.AndroidViewModelFactory.getInstance(application)
     }
 }

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

@@ -1,57 +0,0 @@
-package com.example.hpostesting.presentation
-
-import android.content.Intent
-import android.os.Bundle
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
-import com.example.hpostesting.presentation.testRight.TestRightActivity
-import `in`.sminnovations.hpostesting.databinding.ActivityBloodCollectingMethodBinding
-
-class BloodCollectingMethodActivity : AppCompatActivity() {
-
-    private lateinit var binding: ActivityBloodCollectingMethodBinding
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityBloodCollectingMethodBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        init()
-    }
-
-    private fun init() {
-        setSupportActionBar(binding.toolbar)
-        binding.btnGo.setOnClickListener {
-            DataHolder.usbConnected.observe(this) {
-                if (it) {
-                    if (binding.venousBloodRadioButton.isChecked) {
-                        moveToNext(Constants.VENOUS_BLOOD)
-                    } else {
-                        moveToNext(Constants.FINGER_PRICK_BLOOD)
-                    }
-                } else {
-                    Toast.makeText(this, "No Device Connected", Toast.LENGTH_SHORT).show()
-                }
-            }
-        }
-    }
-
-    private fun moveToNext(bloodCollectingMethod: String) {
-        DataHolder.deviceType.observe(this) { deviceType ->
-            when (deviceType) {
-                Constants.DEVICE_TYPE_HOMOCUBE -> {
-                    val intent = Intent(applicationContext, HemocubeActivity::class.java)
-                    intent.putExtra(Constants.BLOOD_COLLECTING_METHOD, bloodCollectingMethod)
-                    startActivity(intent)
-                }
-
-                Constants.DEVICE_TYPE_TEST_RIGHT -> {
-                    val intent = Intent(applicationContext, TestRightActivity::class.java)
-                    intent.putExtra(Constants.BLOOD_COLLECTING_METHOD, bloodCollectingMethod)
-                    startActivity(intent)
-                }
-            }
-        }
-    }
-}

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

@@ -1,8 +1,6 @@
 package com.example.hpostesting.presentation
 
-import android.content.Context
 import android.content.Intent
-import android.content.SharedPreferences
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
@@ -10,6 +8,7 @@ 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.testRight.TestRightActivity
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanIntentResult
 import com.journeyapps.barcodescanner.ScanOptions
@@ -21,8 +20,6 @@ class KitScanActivity : AppCompatActivity() {
     private val TAG = "KitScanActivity"
     private lateinit var binding: ActivityKitScanBinding
 
-    private lateinit var sharedPreference: SharedPreferences
-
     private val barcodeLauncher = registerForActivityResult(
         ScanContract()
     ) { result: ScanIntentResult ->
@@ -42,28 +39,13 @@ class KitScanActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         binding = ActivityKitScanBinding.inflate(layoutInflater)
-        sharedPreference = this.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         setContentView(binding.root)
 
-        if (DataHolder.sampleReadCounter <= Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE && DataHolder.isReferenceTaken) {
+        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()
-            }
-        }
-
         binding.nameEditText.setText("SMI/SC/")
 
         setSupportActionBar(binding.toolbar)
@@ -78,11 +60,6 @@ class KitScanActivity : AppCompatActivity() {
             if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(serialNumber)) {
                 DataHolder.kitSerial = binding.nameEditText.text.toString()
                 DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
-                with(sharedPreference.edit()) {
-                    putString(Constants.KIT_NUMBER, binding.nameEditText.text.toString())
-                    putInt(Constants.KIT_COUNT, 1)
-                    apply()
-                }
                 moveToNext()
             } else {
                 Toast.makeText(this, "Invalid KIT Number", Toast.LENGTH_LONG).show()
@@ -90,14 +67,8 @@ class KitScanActivity : AppCompatActivity() {
         }
     }
 
-    private fun checkHemoCubeKitData(): Boolean {
-        return sharedPreference.getString(Constants.KIT_NUMBER, "")
-            ?.isNotBlank() == true && sharedPreference.getInt(Constants.KIT_COUNT, 0) > 0
-                && sharedPreference.getInt(Constants.KIT_COUNT, 0) < 35
-    }
-
     private fun isSerialValid(s: String): Boolean {
-        if (s.length != 17) {
+        if (s.length != 17){
             binding.nameEditText.error = getString(R.string.invalid_kit)
             return false
         }
@@ -105,7 +76,7 @@ class KitScanActivity : AppCompatActivity() {
     }
 
     private fun moveToNext() {
-        val i = Intent(applicationContext, BloodCollectingMethodActivity::class.java)
+        val i = Intent(applicationContext, TestRightActivity::class.java)
         startActivity(i)
     }
 
@@ -128,7 +99,9 @@ class KitScanActivity : AppCompatActivity() {
     private fun checkDataNotNull(): Boolean {
         return if (DataHolder.selectedTest?._id == null) {
             Toast.makeText(
-                applicationContext, "Please Select patient before starting test", Toast.LENGTH_SHORT
+                applicationContext,
+                "Please Select patient before starting test",
+                Toast.LENGTH_SHORT
             ).show()
 
             val i = Intent(applicationContext, DashboardActivity::class.java)

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

@@ -1,16 +1,16 @@
 package com.example.hpostesting.presentation
 
 import android.Manifest
-import android.content.*
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.hardware.usb.UsbManager
 import android.location.Location
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
@@ -20,7 +20,11 @@ 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.google.android.gms.location.*
+import com.google.android.gms.location.FusedLocationProviderClient
+import com.google.android.gms.location.LocationCallback
+import com.google.android.gms.location.LocationRequest
+import com.google.android.gms.location.LocationResult
+import com.google.android.gms.location.LocationServices
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityMainBinding
@@ -28,18 +32,22 @@ import `in`.sminnovations.hpostesting.databinding.ActivityMainBinding
 class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
+
     private var myMenu: Menu? = null
+
     private val TAG = "MainActivity"
+
     private lateinit var fusedLocationClient: FusedLocationProviderClient
     private lateinit var locationCallback: LocationCallback
 
-    private val usbReceiver = object : BroadcastReceiver() {
+    private var mUsbReceiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent) {
-            when (intent.action) {
-                UsbManager.ACTION_USB_DEVICE_DETACHED -> DataHolder.usbConnected.value = false
-                UsbManager.ACTION_USB_DEVICE_ATTACHED -> DataHolder.usbConnected.value = true
+            val action = intent.action
+            if (UsbManager.ACTION_USB_DEVICE_DETACHED == action) {
+                DataHolder.usbConnected.value = false
+            } else if (UsbManager.ACTION_USB_DEVICE_ATTACHED == action) {
+                DataHolder.usbConnected.value = true
             }
-            checkAndUpdateUsbConnection()
         }
     }
 
@@ -56,101 +64,38 @@ class MainActivity : AppCompatActivity() {
         locationCallback = object : LocationCallback() {
             override fun onLocationResult(locationResult: LocationResult) {
                 locationResult.lastLocation?.let { location ->
-                    DataHolder.location =
-                        UserData.Location(location.latitude, location.longitude)
-                    DataHolder.selectedTest?.location =
-                        UserData.Location(location.latitude, location.longitude)
+                    DataHolder.selectedTest!!.location = UserData.Location(location.latitude, location.longitude)
                     Log.i("Location", DataHolder.location.toString())
                 }
             }
         }
 
-        val usbFilter = IntentFilter().apply {
+        val filter = IntentFilter().apply {
             addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
             addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED)
         }
-        registerReceiver(usbReceiver, usbFilter)
-
-        DataHolder.deviceType.observe(this) { deviceType ->
-            with(binding) {
-                if (deviceType == Constants.DEVICE_TYPE_HOMOCUBE) {
-                    cvItem1.visibility = View.VISIBLE
-                    cvItem3.visibility = View.VISIBLE
-                    cvItem2.visibility = View.GONE
-                    cvItem4.visibility = View.GONE
-                }
-                DataHolder.usbConnected.value = true
-            }
-        }
-
-
-//        val crashButton = Button(this)
-//        crashButton.text = "Test Crash"
-//        crashButton.setOnClickListener {
-//            throw RuntimeException("Test Crash") // Force a crash
-//        }
-//
-//        addContentView(crashButton, ViewGroup.LayoutParams(
-//            ViewGroup.LayoutParams.MATCH_PARENT,
-//            ViewGroup.LayoutParams.WRAP_CONTENT))
-
+        registerReceiver(mUsbReceiver, filter)
     }
 
     private fun checkAndUpdateUsbConnection() {
         val availableDrivers = UsbSerialProber.getDefaultProber()
             .findAllDrivers(getSystemService(Context.USB_SERVICE) as UsbManager)
-
-        val deviceType = when {
-            availableDrivers.isNotEmpty() -> {
-                val device = availableDrivers[0].device
-                when {
-                    device.productId == Constants.HOMO_CUBE_ID && device.vendorId == Constants.VENDOR_ID -> {
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
-                        binding.cvItem2.visibility = View.GONE
-                        binding.cvItem4.visibility = View.GONE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE)
-                        Constants.DEVICE_TYPE_HOMOCUBE
-                    }
-
-                    device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> {
-                        Log.d(
-                            TAG,
-                            "Device matched -> product = ${device.productId}, vendor = ${device.vendorId}"
-                        )
-                        binding.cvItem1.visibility = View.VISIBLE
-                        binding.cvItem3.visibility = View.VISIBLE
-                        binding.cvItem2.visibility = View.VISIBLE
-                        binding.cvItem4.visibility = View.VISIBLE
-                        DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_TEST_RIGHT)
-                        Constants.DEVICE_TYPE_TEST_RIGHT
-                    }
-
-                    else -> {
-                        Log.d(
-                            TAG,
-                            "Device NOT matched -> product = ${device.productId}, vendor = ${device.vendorId}"
-                        )
-                        val message =
-                            if (device.productId == Constants.DEVICE_PRODUCT_ID) "Device Not Compatible" else "Device Not Connected"
-                        Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
-                        DataHolder.usbConnected.value = false
-                        null
-                    }
-                }
-            }
-
-            else -> {
-                Log.d(TAG, "Device NOT Connected")
-                Toast.makeText(this, "Device Not Connected", Toast.LENGTH_SHORT).show()
-                DataHolder.usbConnected.value = false
-                null
-            }
-        }
-
-        deviceType?.let {
+        if (availableDrivers.isNotEmpty() && availableDrivers[0].device.productId == Constants.DEVICE_PRODUCT_ID && availableDrivers[0].device.vendorId == Constants.DEVICE_VENDOR_ID) {
+            Log.d(
+                TAG,
+                "Device matched -> product = ${availableDrivers[0].device.productId}, vendor = ${availableDrivers[0].device.vendorId}"
+            )
             DataHolder.usbConnected.value = true
-            DataHolder.deviceType.postValue(it)
+        } else if (availableDrivers.isNotEmpty()) {
+            Log.d(
+                TAG,
+                "Device NOT matched -> product = ${availableDrivers[0].device.productId}, vendor = ${availableDrivers[0].device.vendorId}"
+            )
+            Toast.makeText(this, "Device Not Compatible", Toast.LENGTH_SHORT).show()
+            DataHolder.usbConnected.value = false
+        } else {
+            Log.d(TAG, "Device NOT Connected")
+            DataHolder.usbConnected.value = false
         }
     }
 
@@ -235,17 +180,15 @@ class MainActivity : AppCompatActivity() {
         }
 
         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()
+                location?.let {
+                    DataHolder.selectedTest!!.location =
+                        UserData.Location(location.latitude, location.longitude)
+                } ?: run {
+                    requestLocationUpdates()
+                }
+            }.addOnFailureListener { exception: Exception ->
+                exception.printStackTrace()
             }
-        }.addOnFailureListener { exception: Exception ->
-            exception.printStackTrace()
-        }
     }
 
     private fun requestLocationUpdates() {

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

@@ -10,16 +10,12 @@ 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.presentation.testRight.TestRightViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.UserItemViewBinding
 
-class UserListAdapter(
-    options: FirestoreRecyclerOptions<UserData>,
-    private val view: View
-) :
+class UserListAdapter(options: FirestoreRecyclerOptions<UserData>, private val view: View) :
     FirestoreRecyclerAdapter<UserData, UserListAdapter.OrderItemViewHolder>(options) {
 
     class OrderItemViewHolder(val binding: UserItemViewBinding) :
@@ -34,8 +30,8 @@ class UserListAdapter(
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) {
         holder.binding.apply {
-            userName.text = "Name: ${model.name}"
-            userId.text = "User ID:${model._id}"
+            userName.text = model.name
+            userId.text = model._id
             Glide.with(view).load(model.userImageURL).into(userImage)
             if (model.testStatus!!) {
                 teststatus.text = "Test concluded"

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

@@ -19,7 +19,6 @@ class DashboardActivity : AppCompatActivity() {
 
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityDashboardBinding
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

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

@@ -6,7 +6,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-//import com.example.hpostesting.presentation.dashboard.ui.gallery.GalleryViewModel
 import `in`.sminnovations.hpostesting.databinding.FragmentGalleryBinding
 
 class GalleryFragment : Fragment() {
@@ -22,10 +21,8 @@ class GalleryFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-//        val galleryViewModel =
-//            ViewModelProvider(this).get(GalleryViewModel::class.java)
 
-//        _binding = FragmentGalleryBinding.inflate(inflater, container, false)
+        _binding = FragmentGalleryBinding.inflate(inflater, container, false)
         val root: View = binding.root
 
 //        val textView: TextView = binding.textGallery

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.DialogInterface
 import android.content.SharedPreferences
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,15 +14,15 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 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.ktx.firestore
 import com.google.firebase.ktx.Firebase
+import com.google.gson.JsonObject
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
@@ -29,39 +30,37 @@ import java.util.Locale
 
 @AndroidEntryPoint
 class HomeFragment : Fragment() {
+
     private var _binding: FragmentHomeBinding? = null
     private val binding get() = _binding!!
     private val viewModel: TestRightViewModel by activityViewModels()
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
     private lateinit var rvAdapter: UserListAdapter
     private lateinit var sharedPreference: SharedPreferences
+    private var loginCount = 1
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
         _binding = FragmentHomeBinding.inflate(inflater, container, false)
-        sharedPreference = requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+        sharedPreference =
+            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         DataHolder.selectedTest = null
 
         return binding.root
     }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         viewModel.allUserData.observe(viewLifecycleOwner) { userData ->
-            if (userData.isNotEmpty()) {
-
-            }
             deleteIncompleteRegistrations(userData)
         }
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
-            deleteHemoCubeIncompleteRegistrations(userData)
-        }
         viewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isConnected ->
             if (isConnected) {
                 binding.internetAvailableCL.visibility = View.VISIBLE
                 binding.internetNotAvailableCL.visibility = View.GONE
+                login()
                 loadUserData()
                 setSearch()
-                checkForLocalDBData()
+//                checkForLocalDBData()
             } else {
                 binding.internetAvailableCL.visibility = View.GONE
                 binding.internetNotAvailableCL.visibility = View.VISIBLE
@@ -72,9 +71,58 @@ class HomeFragment : Fragment() {
             logoutUser(requireContext())
         }
         binding.uploadData.setOnClickListener {
-            showUploadDialog(requireContext())
+            showUploadDialog()
+        }
+//
+//        val jobScheduler = getSystemService(Context.JOB_SCHEDULER_SERVICE) as JobScheduler
+//
+//        val jobInfo = JobInfo.Builder(1, ComponentName(this, MyJobScheduler::class.java))
+//            .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+//            .setPersisted(true)
+//            .setPeriodic(30 * 60 * 1000)
+//            .build()
+//        jobScheduler.schedule(jobInfo)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        val jsonObject = JsonObject()
+        jsonObject.addProperty("Username", "hposdevice")
+        jsonObject.addProperty("Password", "sickle")
+        viewModel.loginResponse.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Result.Success -> {
+                    val editor = sharedPreference.edit()
+                    editor.putString(Constants.TOKEN, response.data.token)
+                    editor.apply()
+                    Log.d("login_api", "called")
+                    //   showUploadDialog()
+                }
+
+                is Result.Error -> {
+                    if (loginCount < 3) {
+                        viewModel.login(jsonObject)
+                        loginCount++
+                    }
+                    Log.d("API Error", response.exception.message.toString())
+                }
+
+                is Result.Loading -> {
+                    Toast.makeText(requireContext(), "Loading", Toast.LENGTH_SHORT).show()
+                }
+
+                else -> {}
+            }
         }
     }
+
+    private fun login() {
+        val jsonObject = JsonObject()
+        jsonObject.addProperty("Username", "hposdevice")
+        jsonObject.addProperty("Password", "sickle")
+        viewModel.login(jsonObject)
+    }
+
     private fun setUserId() {
         binding.btnSubmit.setOnClickListener {
             val userId = binding.userId.text.toString()
@@ -89,15 +137,9 @@ class HomeFragment : Fragment() {
             }
         }
     }
+
     private fun loadUserData() {
-        val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false)
-        query.get().addOnSuccessListener {
-            if (it.documents.isEmpty()) {
-                binding.pendingTest.visibility = View.VISIBLE
-            } else {
-                binding.pendingTest.visibility = View.GONE
-            }
-        }
+        val query = Firebase.firestore.collection("patientData")
         val recyclerViewOptions =
             FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
                 .build()
@@ -105,21 +147,27 @@ class HomeFragment : Fragment() {
         binding.rvOrder.adapter = rvAdapter
         rvAdapter.startListening()
     }
+
     private fun saveUserId(userId: String) {
         with(sharedPreference.edit()) {
             putString(Constants.USER_ID, userId)
             apply()
         }
     }
+
     private fun logoutUser(context: Context) {
         val builder = AlertDialog.Builder(context)
         builder.setTitle("Log Out")
         builder.setMessage("Do you want to LogOut the Application?")
+
+        // Positive button
         builder.setPositiveButton("Yes") { dialog, _ ->
             saveUserId("")
             findNavController().navigate(R.id.action_nav_home_to_loginFragment)
             dialog.dismiss()
         }
+
+        // Negative button
         builder.setNegativeButton("No") { dialog, _ ->
             dialog.dismiss()
         }
@@ -127,6 +175,8 @@ class HomeFragment : Fragment() {
         val dialog = builder.create()
         dialog.show()
     }
+
+
     private fun getData(search: String?, field: String) {
         val capitalizedSearch = search?.replaceFirstChar {
             if (search.lowercase()
@@ -134,15 +184,19 @@ class HomeFragment : Fragment() {
             ) it.titlecase(Locale.getDefault()) else it.toString()
 
         }
+
         val query = Firebase.firestore.collection("patientData").orderBy(field).startAt(search)
             .endAt(search + "\uf8ff")
+
         val recyclerViewOptions =
             FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
                 .build()
+
         rvAdapter = UserListAdapter(recyclerViewOptions, binding.root)
         binding.rvOrder.adapter = rvAdapter
         rvAdapter.startListening()
     }
+
     private fun setSearch() {
         binding.searchProduct.setOnQueryTextListener(object :
             androidx.appcompat.widget.SearchView.OnQueryTextListener {
@@ -161,6 +215,7 @@ class HomeFragment : Fragment() {
                     false
                 }
             }
+
             override fun onQueryTextChange(query: String?): Boolean {
                 return if (!query.isNullOrEmpty()) {
                     val field = when {
@@ -178,19 +233,16 @@ class HomeFragment : Fragment() {
             }
         })
     }
+
     private fun checkForLocalDBData() {
         viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
             binding.uploadData.visibility = uploadDataVisibility
         }
-
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
-            binding.uploadData.visibility = uploadDataVisibility
-        }
     }
-    private fun showUploadDialog(context: Context) {
-        val builder = AlertDialog.Builder(context)
+
+    private fun showUploadDialog() {
+        val builder = AlertDialog.Builder(requireContext())
         builder.setTitle(R.string.upload_db_registration_title)
         builder.setMessage(R.string.upload_db_registration_message)
 
@@ -207,36 +259,17 @@ class HomeFragment : Fragment() {
     }
 
     private fun uploadLocalDBData(dialog: DialogInterface) {
+        val token = sharedPreference.getString(Constants.TOKEN, "")
         viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             if (userDataList.isEmpty()) {
                 dialog.dismiss()
             } else {
                 userDataList.forEach { userData ->
-                    viewModel.bulkUploadResultToDatabase(userData)
-                    viewModel.deleteById(userData._id)
+                    viewModel.bulkUploadResultToDatabase(userData, token!!)
                 }
                 dialog.dismiss()
                 Toast.makeText(
-                    requireContext(),
-                    R.string.upload_success_message,
-                    Toast.LENGTH_SHORT
-                ).show()
-            }
-        }
-
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            if (userDataList.isEmpty()) {
-                dialog.dismiss()
-            } else {
-                userDataList.forEach { userData ->
-                    userData.localFlag = true
-                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                }
-                dialog.dismiss()
-                Toast.makeText(
-                    requireContext(),
-                    R.string.upload_success_message,
-                    Toast.LENGTH_SHORT
+                    requireContext(), R.string.upload_success_message, Toast.LENGTH_SHORT
                 ).show()
             }
         }
@@ -244,20 +277,12 @@ class HomeFragment : Fragment() {
 
     private fun deleteIncompleteRegistrations(userDataList: List<UserData>) {
         userDataList.forEach { userData ->
-            if (userData.csvPath.isEmpty()) {
+            if (userData._id.isEmpty()) {
                 viewModel.deleteById(userData._id)
             }
         }
     }
 
-    private fun deleteHemoCubeIncompleteRegistrations(userDataList: List<HemoCubeTestData>) {
-        userDataList.forEach { userData ->
-            if (userData.testTime?.isEmpty() == false) {
-                hemoCubeViewModel.deleteById(userData._id)
-            }
-        }
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

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

@@ -1,556 +0,0 @@
-package com.example.hpostesting.presentation.hemocube
-
-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 androidx.lifecycle.lifecycleScope
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.presentation.KitScanActivity
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.utils.MyDialogListener
-import com.example.hpostesting.presentation.utils.UIUtils
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-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.launch
-import kotlinx.coroutines.tasks.await
-import kotlinx.coroutines.withContext
-import kotlin.math.log10
-
-class HemoCubeFragment : Fragment() {
-
-    private lateinit var binding: FragmentHemoCubeReferenceBinding
-    private val hemoCubeViewModel: HemoCubeViewModel 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 {
-            val bloodGroupText = binding.etBloodGroup.text.toString()
-            if (bloodGroupText.isEmpty()) {
-                binding.etBloodGroup.error = "Please enter your blood group"
-            } else {
-                fetchResult()
-            }
-        }
-        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 HemocubeActivity).finish()
-                        }
-                    })
-            }
-        }
-    }
-
-    private suspend fun checkBloodGroup() {
-        binding.apply {
-            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")
-                    .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()
-                    }
-                }
-            }
-        }
-    }
-
-    private fun observeViewModel() {
-        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                showToast("Test Results Uploaded Successfully")
-                lifecycleScope.launch {
-                    checkBloodGroup()
-                }
-            }
-            if (result == "Local") {
-                showToast("Internet not available, test details stored locally")
-                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
-            }
-
-            binding.progressBar.visibility = View.GONE
-        }
-
-        hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
-
-        hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-            showToast(calculateRatio(0.17).toString())
-
-        }
-
-        hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
-            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.BUFFER_VALUE_1, ""
-            ) != "" && sharedPreferences.getString(Constants.BUFFER_VALUE_2, "") != ""
-        ) {
-            sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")
-                ?.toDouble()!! > 0.0 && sharedPreferences.getString(Constants.BUFFER_VALUE_2, "")
-                ?.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()
-                }
-
-                override fun onClickPositiveButton() {
-                    listenToHemoCube()
-                    startSampleProcess()
-                    isUsingExistingBuffer = true
-                }
-            })
-    }
-
-    private fun listenToHemoCube() {
-        if (DataHolder.hemoCubeTestData == null) {
-            DataHolder.hemoCubeTestData = DataHolder.selectedTest?.toHemoCubeTestData()
-        }
-
-        hemoCubeViewModel.progressBar.postValue(true)
-
-        val fullReadOutput = StringBuilder()
-        (activity as HemocubeActivity).mService.listenToHemoCube(object : UsbServiceListener {
-            override fun onUsbRead(data: ByteArray?) {
-                data?.let {
-                    val stringData = String(it)
-                    fullReadOutput.append(stringData)
-                    handleUsbData(stringData, fullReadOutput)
-                }
-            }
-
-            override fun onUsbError(e: Exception?) {
-                hemoCubeViewModel.progressBar.postValue(false)
-            }
-        })
-    }
-
-    private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
-        if (stringData.contains("#")) {
-            hemoCubeViewModel.messages.postValue(stringData)
-            isTestOngoing = true
-        }
-
-        resultData += fullReadOutput.toString()
-
-        when {
-            stringData.contains("#Buffer Completed") -> showStartSampleDialog()
-            stringData.contains("#Sample Completed") -> {
-                activity?.runOnUiThread {
-                    binding.btnSubmit.isEnabled = true
-                    binding.btnSubmit.isClickable = true
-                }
-            }
-
-            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 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() {
-
-                    }
-                })
-        }
-    }
-
-    private fun handleValidResult(validString: String, fullReadOutput: String) {
-        try {
-            val result = validString.split(" ")
-            if (result.size != 8) return
-
-            val deviceSerialNo = result[2]
-            val led1BufferForDevice =
-                getLedBufferValue(isUsingExistingBuffer, Constants.BUFFER_VALUE_1, result[3])
-            val led2BufferForDevice =
-                getLedBufferValue(isUsingExistingBuffer, Constants.BUFFER_VALUE_2, result[4])
-            val version = BuildConfig.VERSION_NAME
-            val led1Sample = result[5].toDoubleOrNull()
-            val led2Sample = result[6].toDoubleOrNull()
-
-            val led1Average = calculateAverage(led1BufferForDevice, led1Sample)
-            val led2Average = calculateAverage(led2BufferForDevice, led2Sample)
-            val deviceRatio = led1Average / led2Average
-            val calculatedRatio = calculateRatio(deviceRatio)
-            val isBufferValid = validateBuffer(led1BufferForDevice, led2BufferForDevice)
-            val isSampleValid =
-                validateSample(led1Sample, led1BufferForDevice, led2Sample, led2BufferForDevice)
-            val isCalculatedRatioValid = validateCalculatedRatio(deviceRatio)
-
-            when {
-                !isBufferValid -> showError(
-                    "Buffer error",
-                    "Check for Empty curved, disconnected and reconnect the device, and please retest this sample again with a new blank"
-                )
-
-                !isSampleValid -> showError(
-                    "Sample error",
-                    "Check for Empty curved, disconnected and reconnect the device, and please retest this sample again with a new blank"
-                )
-
-                !validateBloodVolume(led1Average, led2Average) -> {
-                    showError(
-                        "Low Blood Volume",
-                        "Please retest this sample with a higher volume of blood"
-                    )
-                }
-
-                !validateHighBloodVolume(led1Average, led2Average) -> {
-                    showError(
-                        "High Blood Volume",
-                        "Please retest this sample by diluting the sample in the buffer"
-                    )
-                }
-
-                !isCalculatedRatioValid -> showError(
-                    "calculated Ratio error",
-                    "Check for Empty curved, disconnected and reconnect the device, and please retest this sample again with a new blank"
-                )
-
-                else -> processValidData(
-                    deviceSerialNo,
-                    led1BufferForDevice,
-                    led2BufferForDevice,
-                    version,
-                    led1Sample,
-                    led2Sample,
-                    led1Average,
-                    led2Average,
-                    deviceRatio,
-                    fullReadOutput,
-                    calculatedRatio
-                )
-            }
-
-        } catch (_: Exception) {
-            // handle exception or log it if necessary
-        }
-    }
-
-    private fun getLedBufferValue(
-        usingExistingBuffer: Boolean, bufferConstant: String, resultValue: String
-    ): Double? {
-        return if (usingExistingBuffer) {
-            sharedPreferences.getString(bufferConstant, "")?.toDoubleOrNull()
-        } else {
-            resultValue.toDoubleOrNull()
-        }
-    }
-
-    private fun calculateAverage(bufferForDevice: Double?, sample: Double?): Double {
-        return log10(bufferForDevice?.div(sample ?: 1.0) ?: 0.0)
-    }
-
-    private fun validateBuffer(led1Buffer: Double?, led2Buffer: Double?): Boolean {
-        return led1Buffer!! in 20001.0..23999.0 && led2Buffer!! in 20001.0..23999.0
-    }
-
-    private fun validateSample(
-        sample1: Double?, buffer1: Double?, sample2: Double?, buffer2: Double?
-    ): Boolean {
-        return sample1 != null && sample1 < buffer1!! && sample1 < 24000 && sample2 != null && sample2 < buffer2!! && sample2 < 24000
-    }
-
-    private fun validateBloodVolume(average1: Double, average2: Double): Boolean {
-        return average1 > 0.08 && average2 > 0.08
-    }
-
-    private fun validateCalculatedRatio(deviceRatio: Double): Boolean {
-        return deviceRatio > 0.08 && deviceRatio < 0.3
-    }
-
-    private fun validateHighBloodVolume(average1: Double, average2: Double): Boolean {
-        return average1 < 1.07 && average2 < 1.07
-    }
-
-    private fun showError(title: String, message: String) {
-        customErrorDialogBox(title, message)
-    }
-
-    private fun processValidData(
-        deviceId: String,
-        led1Buffer: Double?,
-        led2Buffer: Double?,
-        appVersion: String,
-        led1Sample: Double?,
-        led2Sample: Double?,
-        led1Average: Double,
-        led2Average: Double,
-        deviceRatio: Double,
-        resultData: String,
-        calculatedRatio: Double
-    ) {
-        val threshold =
-            if ((activity as HemocubeActivity).bloodCollectingMethod == Constants.FINGER_PRICK_BLOOD) 0.05 else 0.06
-
-        if (led1Average > threshold) {
-            DataHolder.hemoCubeTestData?.apply {
-                this.deviceId = deviceId
-                this.led1Buffer = led1Buffer
-                this.led2Buffer = led2Buffer
-                this.appVersion = appVersion
-                this.led1Sample = led1Sample
-                this.led2Sample = led2Sample
-                this.led1Average = led1Average
-                this.led2Average = led2Average
-                this.deviceRatio = deviceRatio
-                this.calculatedRatio = calculatedRatio
-                this.resultData = resultData
-
-                if (!isBufferValueAvailable()) {
-                    with(sharedPreferences.edit()) {
-                        putString(Constants.BUFFER_VALUE_1, led1Buffer.toString())
-                        putString(Constants.BUFFER_VALUE_2, led2Buffer.toString())
-                        apply()
-                    }
-                }
-                hemoCubeViewModel.uploadHemoCubeResultToDatabase(
-                    isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
-                )
-            }
-        } else {
-            showError(
-                "Low Blood Volume",
-                "Please repeat the test with 10 µl of blood added to 1 ml of buffer"
-            )
-        }
-    }
-
-    private fun customErrorDialogBox(title: String, message: String) {
-        activity?.runOnUiThread {
-            MaterialAlertDialogBuilder(requireContext()).setTitle(title).setMessage(message)
-                .setPositiveButton("OK") { dialog, _ ->
-                    if (title == "Buffer error" || title == "Sample error") {
-                        with(sharedPreferences.edit()) {
-                            putString(Constants.BUFFER_VALUE_1, "")
-                            putString(Constants.BUFFER_VALUE_2, "")
-                            apply()
-                        }
-                        finishTestingActivity()
-                    } else {
-                        finishTestingActivity()
-                    }
-                    dialog.dismiss()
-                }.show()
-        }
-    }
-
-    private fun finishTestingActivity() {
-        val i = Intent(requireContext().applicationContext, DashboardActivity::class.java)
-        startActivity(i)
-        (activity as HemocubeActivity).finish()
-    }
-
-    private fun showToast(message: String) {
-        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
-    }
-
-    private fun startBufferProcess() {
-        hemoCubeViewModel.progressBar.postValue(true)
-
-        (activity as HemocubeActivity).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 HemocubeActivity).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 HemocubeActivity).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?.coefficients?.get(0) ?: 0.0
-        val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 0.0
-        return coefficient1 * ratio + coefficient2
-    }
-
-    private fun parseResult(frames: List<String>): String {
-        val lines = mutableListOf<String>()
-        for (frame in frames.reversed()) {
-            if (frame.contains("REND") || frame.contains("RESULT")) lines += frame
-            if (frame.contains("RESULT")) {
-                break
-            }
-        }
-        val line = lines.reversed().joinToString("").trim()
-        if (line.contains("RESULT") && line.split(" ").size == 8) {
-            return line
-        }
-        return ""
-    }
-
-    private fun isValidResult(line: String): String {
-        return if (line.contains("RESULT") && line.split(" ").size == 8) {
-            line
-        } else {
-            ""
-        }
-    }
-
-    private fun resetKitCount() {
-        with(sharedPreferences.edit()) {
-            putString(Constants.KIT_NUMBER, "")
-            putInt(Constants.KIT_COUNT, 0)
-            apply()
-        }
-    }
-}

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

@@ -1,145 +0,0 @@
-package com.example.hpostesting.presentation.hemocube
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.dao.HemoCubeDao
-import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.data.repository.DatabaseRepository
-import 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 HemoCubeViewModel @Inject constructor(
-    private val hemoCubeDao: HemoCubeDao,
-    private val repository: DatabaseRepository,
-    context: Context,
-) : ViewModel() {
-    var isServiceConnected = false
-    val progressBar = MutableLiveData(false)
-    val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
-    val messages = MutableLiveData<String>()
-    private val sharedPreference: SharedPreferences = context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
-
-    // Get the device ID of the device you want to retrieve data for (e.g., the first device in the list)
-
-    private val _networkStatusLiveData = NetworkStatusLiveData(context)
-    val allUserData = hemoCubeDao.getAll()
-    val deviceData = MutableLiveData<DeviceData?>()
-    val networkStatusLiveData: LiveData<Boolean>
-        get() = _networkStatusLiveData
-    val fireBaseUpload = MutableLiveData<String>()
-    fun uploadHemoCubeResultToDatabase(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)
-                    hemoCubeDao.insertAll(testDetails!!)
-                    fireBaseUpload.postValue("Local")
-                }
-            } catch (e: Exception) {
-                Log.e("Testdb", "Upload failed: ${e.message}")
-            }
-        }
-
-    fun getDeviceData(deviceId: String?) = viewModelScope.launch {
-        deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
-    }
-
-    private fun addResultTestToDb() {
-        testDetails?.deviceRatio = DataHolder.hemocubeResult
-        testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
-        testDetails?.location = DataHolder.location
-        testDetails?.testTime = SimpleDateFormat(
-            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-        ).format(Calendar.getInstance().time)
-        testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion
-        testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId
-        testDetails?.deviceSerialNumber = sharedPreference.getString(Constants.USER_ID, "").toString()
-        testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-        testDetails?.led1Buffer = DataHolder.hemoCubeTestData?.led1Buffer
-        testDetails?.led2Buffer = DataHolder.hemoCubeTestData?.led2Buffer
-        testDetails?.led1Sample = DataHolder.hemoCubeTestData?.led1Sample
-        testDetails?.led2Sample = DataHolder.hemoCubeTestData?.led2Sample
-        testDetails?.led1Average = DataHolder.hemoCubeTestData?.led1Average
-        testDetails?.led2Average = DataHolder.hemoCubeTestData?.led2Average
-        testDetails?.deviceRatio = DataHolder.hemoCubeTestData?.deviceRatio
-        testDetails?.calculatedRatio = DataHolder.hemoCubeTestData?.calculatedRatio
-
-        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) ?: 0)
-                            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")
-                    }
-
-                    else -> {
-                        Log.e("Testdb", "Unknown response from repository: $response")
-                        fireBaseUpload.postValue("Unknown")
-                    }
-                }
-            } 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 {
-        hemoCubeDao.deleteById(id = userId)
-    }
-}

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

@@ -1,178 +0,0 @@
-package com.example.hpostesting.presentation.hemocube
-
-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 HemocubeActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityHemocubeBinding
-    private val viewModel by viewModels<HemoCubeViewModel>()
-    private var myMenu: Menu? = null
-
-    private lateinit var mDriver: UsbSerialDriver
-    private var mConnection: UsbDeviceConnection? = null
-    lateinit var mService: UsbService
-
-    private val TAG = "HemoCube"
-
-    var bloodCollectingMethod = ""
-
-    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)
-        bloodCollectingMethod = intent.getStringExtra(Constants.BLOOD_COLLECTING_METHOD).toString()
-        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_MUTABLE
-            )
-        } else {
-            PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HOMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
-
-        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
-        manager.requestPermission(device, mPendingIntent)
-    }
-
-    private fun setupService() {
-        val intent = Intent(this, UsbService::class.java)
-//        startService(intent)
-        bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-
-    private fun moveToNext() {
-        if (supportFragmentManager.isDestroyed)
-            return
-
-        supportFragmentManager.beginTransaction()
-            .replace(binding.fghemocube.id, HemoCubeFragment()).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/testRight/TestRightActivity.kt

@@ -103,6 +103,17 @@ class TestRightActivity : AppCompatActivity() {
         }
     }
 
+//    private fun testing() {
+//        supportFragmentManager.beginTransaction()
+//            .replace(binding.flMain.id, TestRightExpSample()).commit()
+//    }
+
+    // Todo: Comment this
+//    private fun connectUsb(permissionGranted: Boolean) {
+//        setupService()
+//    }
+
+    // Todo: Uncomment this
     private fun connectUsb(permissionGranted: Boolean) {
         Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
         val manager = getSystemService(Context.USB_SERVICE) as UsbManager
@@ -113,6 +124,12 @@ class TestRightActivity : AppCompatActivity() {
         } else {
             mDriver = availableDrivers[0]
 
+            if (mDriver.device.productId != Constants.DEVICE_PRODUCT_ID || mDriver.device.vendorId != Constants.DEVICE_VENDOR_ID){
+                Toast.makeText(this, "Device Connected is not supported", Toast.LENGTH_SHORT).show()
+                onBackPressed()
+                return
+            }
+
             viewModel.testDetails?.deviceId = mDriver.device.serialNumber.toString()
             DataHolder.deviceSerialNumber = mDriver.device.serialNumber.toString()
             mConnection = manager.openDevice(mDriver.device)
@@ -125,7 +142,12 @@ class TestRightActivity : AppCompatActivity() {
         }
     }
 
+    /*
+     * Request user permission. The response will be received in the BroadcastReceiver
+     */
     private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
+//        Log.d(TAG, "requestUserPermissions() called -> vendor id = ${device.vendorId} & product id = ${device.productId}")
+
         val mPendingIntent: PendingIntent
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             mPendingIntent = PendingIntent.getBroadcast(
@@ -174,6 +196,11 @@ class TestRightActivity : AppCompatActivity() {
 
     fun onErrorReported(msg: String) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
+//        Snackbar.make(binding.clParent, msg, Snackbar.LENGTH_LONG)
+//            .setAction("CLOSE") { Toast.makeText(this, "Will soon", Toast.LENGTH_SHORT).show() }
+//            .setActionTextColor(resources.getColor(R.color.white))
+//            .show()
+
         if (!isFinishing)
             onBackPressed()
     }
@@ -183,6 +210,16 @@ class TestRightActivity : AppCompatActivity() {
         myMenu = menu
         return true
     }
+
+//    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+//        R.id.action_usb -> {
+////            Toast.makeText(this, "USB Connected", Toast.LENGTH_SHORT).show()
+////            myMenu?.get(0)?.icon = ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_off_24)
+//            true
+//        }
+//        else -> {super.onOptionsItemSelected(item)}
+//    }
+
     override fun onDestroy() {
         super.onDestroy()
         if (viewModel.isServiceConnected) {
@@ -191,4 +228,10 @@ class TestRightActivity : AppCompatActivity() {
             viewModel.isServiceConnected = false
         }
     }
+
+//    fun View.setAllEnabled(enabled: Boolean) {
+//        isEnabled = enabled
+//        if (this is ViewGroup) children.forEach { child -> child.setAllEnabled(enabled) }
+//    }
+
 }

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

@@ -24,12 +24,17 @@ import `in`.sminnovations.hpostesting.databinding.FragmentTestRightExpReferenceB
 
 @AndroidEntryPoint
 class TestRightExpReference : Fragment() {
+
     private lateinit var binding: FragmentTestRightExpReferenceBinding
     private val viewModel: TestRightViewModel by activityViewModels()
+
     private val TAG = "TestRightExpReference"
+
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
     ): View {
+        // Inflate the layout for this fragment
         binding = FragmentTestRightExpReferenceBinding.inflate(inflater, container, false)
         return binding.root
     }
@@ -37,17 +42,25 @@ class TestRightExpReference : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupListeners()
+
+//        if (DataHolder.isReferenceTaken)
+//            moveToSamplePage()
+//
+//        DataHolder.sampleReadCounter <= Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE
+
         if (DataHolder.deviceConstant == null) {
             viewModel.progressBar.postValue(true)
             Handler(Looper.getMainLooper()).postDelayed(
-                { sendCmdToFetchDeviceConstant() }, Constants.DELAY_BETWEEN_COMMANDS
+                { sendCmdToFetchDeviceConstant() },
+                Constants.DELAY_BETWEEN_COMMANDS
             )
         }
     }
 
     private fun setupListeners() {
         binding.btnSetReference.setOnClickListener {
-            UIUtils.createAlertDialog(requireContext(),
+            UIUtils.createAlertDialog(
+                requireContext(),
                 getString(R.string.have_you_placed),
                 getString(R.string.please_place),
                 getString(R.string.no),
@@ -56,7 +69,6 @@ class TestRightExpReference : Fragment() {
                     override fun onClickNegativeButton() {
 
                     }
-
                     override fun onClickPositiveButton() {
                         startTakingReference()
                     }
@@ -64,15 +76,16 @@ class TestRightExpReference : Fragment() {
         }
 
         viewModel.errorTriggered.observe(viewLifecycleOwner) {
-            if (it != null) {
+            if (it != null){
                 UIUtils.onShowErrorToast(requireContext(), it.message)
-                if (it.code == Constants.ERROR_CRITICAL) {
+                if (it.code == Constants.ERROR_CRITICAL){
                     activity?.onBackPressed()
                 }
             }
         }
 
         viewModel.progressBar.observe(viewLifecycleOwner) {
+//            Log.d(TAG, "SURYA OBSERVER Activated outcome = $it")
             if (it) {
                 binding.progressBar.visibility = View.VISIBLE
                 binding.clParent.alpha = 0.5f
@@ -83,6 +96,7 @@ class TestRightExpReference : Fragment() {
                 binding.btnSetReference.isEnabled = true
             }
         }
+
     }
 
     /**
@@ -93,17 +107,19 @@ class TestRightExpReference : Fragment() {
      * 4. command print
      */
     private fun startTakingReference() {
+//        requireActivity().runOnUiThread {
         sendCmdToSetLed()
+//        }
     }
 
+    //    private fun sendCmdToFetchDeviceConstant(recursive: Boolean) {
     private fun sendCmdToFetchDeviceConstant() {
         Log.d(TAG, "sendCmdToFetchDeviceConstant() called")
 
         viewModel.progressBar.postValue(true)
         val fullReadOutput = StringBuilder()
 
-        (activity as TestRightActivity).mService.eventDrivenWrite(
-            TestRightCommands.read,
+        (activity as TestRightActivity).mService.eventDrivenWrite(TestRightCommands.read,
             object : UsbServiceListener {
                 override fun onUsbRead(data: ByteArray?) {
                     data?.let {
@@ -113,7 +129,8 @@ class TestRightExpReference : Fragment() {
 
                         if (stringData.contains("OK", true)) {
                             Log.d(
-                                TAG, "onUsbRead() called in sendCmdToFetchDeviceConstant() found OK"
+                                TAG,
+                                "onUsbRead() called in sendCmdToFetchDeviceConstant() found OK"
                             )
                             viewModel.mapDeviceConstants(fullReadOutput.toString())
                             viewModel.progressBar.postValue(false)
@@ -121,11 +138,7 @@ class TestRightExpReference : Fragment() {
                             Log.d(TAG, "results = FINE")
                             viewModel.progressBar.postValue(false)
 
-                            viewModel.errorTriggered.postValue(
-                                ErrorMessage(
-                                    "Please Try Again!!", Constants.ERROR_CRITICAL
-                                )
-                            )
+                            viewModel.errorTriggered.postValue(ErrorMessage("Please Try Again!!", Constants.ERROR_CRITICAL))
 
                         }
                     }
@@ -133,11 +146,7 @@ class TestRightExpReference : Fragment() {
 
                 override fun onUsbError(e: Exception?) {
                     Log.e(TAG, "onUsbIoError() called in sendCmdToFetchDeviceConstant() -> $e")
-                    viewModel.errorTriggered.postValue(
-                        ErrorMessage(
-                            "Please Try Again this step", Constants.ERROR_NORMAL
-                        )
-                    )
+                    viewModel.errorTriggered.postValue(ErrorMessage("Please Try Again this step", Constants.ERROR_NORMAL))
 
                     viewModel.progressBar.postValue(false)
                 }
@@ -162,7 +171,8 @@ class TestRightExpReference : Fragment() {
                                 Runnable {
                                     viewModel.progressBar.postValue(false)
                                     sendCmdToAutoset()
-                                }, Constants.DELAY_BETWEEN_COMMANDS
+                                },
+                                Constants.DELAY_BETWEEN_COMMANDS
                             )
                         }
                     }
@@ -193,7 +203,8 @@ class TestRightExpReference : Fragment() {
                                 Runnable {
                                     viewModel.progressBar.postValue(false)
                                     sendCmdToRun()
-                                }, Constants.DELAY_BETWEEN_COMMANDS
+                                },
+                                Constants.DELAY_BETWEEN_COMMANDS
                             )
 
                         }
@@ -226,10 +237,12 @@ class TestRightExpReference : Fragment() {
                                 Runnable {
                                     viewModel.progressBar.postValue(false)
                                     sendCmdToFetchLightIntensities()
-                                }, Constants.DELAY_BETWEEN_COMMANDS
+                                },
+                                Constants.DELAY_BETWEEN_COMMANDS
                             )
                         }
                     }
+//                    }
                 }
 
                 override fun onUsbError(e: Exception?) {
@@ -251,15 +264,18 @@ class TestRightExpReference : Fragment() {
                     data?.let {
                         val stringData = String(it)
                         fullReadOutput.append(stringData)
-                        if (stringData.trim().isNotEmpty() && fullReadOutput.substring(
-                                Math.max(
-                                    fullReadOutput.length - 15, 0
-                                )
-                            ).contains("OK [0]", true)
-                        ) {
+
+//                        Log.d(TAG, stringData)
+//                        if (stringData.contains("OK", true)) {
+//                        if (fullReadOutput.substring(Math.max(fullReadOutput.length - 15, 0)).contains("OK", true)) {
+                        if (stringData.trim().isNotEmpty() && fullReadOutput.substring(Math.max(fullReadOutput.length - 15, 0)).contains("OK [0]", true)) {
 
                             Log.d(TAG, "onUsbRead() called in sendCmdToFetchLightIntensities()")
+//                            Log.d(TAG, fullReadOutput.toString())
+
                             viewModel.mapIntensityValues(fullReadOutput.toString(), true)
+//                            viewModel.saveLogTest(requireContext().applicationContext, true, fullReadOutput.toString())
+
                             DataHolder.isReferenceTaken = true
 
                             Handler(Looper.getMainLooper()).postDelayed(
@@ -274,11 +290,7 @@ class TestRightExpReference : Fragment() {
 
                 override fun onUsbError(e: Exception?) {
                     Log.e(TAG, "onUsbIoError() called in sendCmdToFetchLightIntensities() -> $e")
-                    viewModel.errorTriggered.postValue(
-                        ErrorMessage(
-                            "Please Try Again this step", Constants.ERROR_NORMAL
-                        )
-                    )
+                    viewModel.errorTriggered.postValue(ErrorMessage("Please Try Again this step", Constants.ERROR_NORMAL))
 
                     viewModel.progressBar.postValue(false)
                 }

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

@@ -8,6 +8,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.example.hpostesting.data.DataHolder
@@ -35,7 +36,16 @@ class TestRightExpSample : Fragment() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        // Inflate the layout for this fragment
         binding = FragmentTestRightExpSampleBinding.inflate(inflater, container, false)
+//        if (DataHolder.sampleReadCounter > Constants.MAXIMUM_TEST_ALLOWED_BEFORE_REFERENCE) {
+//            binding.btnUpdateReference.enable()
+//            binding.clInstructions.setAllEnabled(false)
+//        } else {
+//            binding.btnUpdateReference.disable()
+//            binding.clInstructions.setAllEnabled(false)
+//        }
+
         return binding.root
     }
 
@@ -66,6 +76,10 @@ class TestRightExpSample : Fragment() {
         }
 
         binding.btnSubmit.setOnClickListener {
+//            val details = validateAndReturnTestData()
+//            if (details != null) {
+//                viewModel.patientDetails = details
+
             UIUtils.createAlertDialog(
                 requireContext(),
                 "WARNING",
@@ -98,13 +112,24 @@ class TestRightExpSample : Fragment() {
             val i = Intent(requireContext(), MainActivity::class.java)
             startActivity(i)
         }
+
+//        binding.etNameBlock.setOnClickListener { binding.etName.isErrorEnabled = false }
+//        binding.etAgeBlock.setOnClickListener { binding.etAge.isErrorEnabled = false }
+//        binding.etGenderBlock.setOnClickListener { binding.ddGender.isErrorEnabled = false }
     }
+
+//    private fun validateAndReturnTestData(): TestDetails? {
+//
+//        return PatientData(name.toString(), age.toString().toInt(), gender.toString(), TestRightResultType.UNDEFINED)
+//    }
+
     /**
      * Executing the commands sequentially each after successfully executing one.
      * 1. command run
      * 2. command print
      */
     private fun startAcquiring() {
+//        binding.progressBar.visibility = View.VISIBLE
         sendCmdToRun()
     }
 
@@ -120,6 +145,9 @@ class TestRightExpSample : Fragment() {
                         val stringData = String(it)
                         fullReadOutput.append(stringData)
                         Log.d(TAG, stringData)
+//                        if (stringData.contains("OK", true)) {
+//                        if (stringData.contains("OK", true) || fullReadOutput.substring(Math.max(fullReadOutput.length - 15, 0)).contains("OK", true)) {
+//                        if (fullReadOutput.substring(Math.max(fullReadOutput.length - 15, 0)).contains("OK", true)) {
                         if (fullReadOutput.substring(Math.max(fullReadOutput.length - 15, 0)).contains("OK [0]", true)) {
                             Log.d(TAG, "onUsbRead() called in sendCmdToRun()")
                             Handler(Looper.getMainLooper()).postDelayed(
@@ -156,10 +184,17 @@ class TestRightExpSample : Fragment() {
                         val stringData = String(it)
                         fullReadOutput.append(stringData)
                         Log.d(TAG, stringData)
+//                        if (stringData.contains("OK", true)) {
+//                        if (stringData.contains("OK", true) || stringData.contains("O", true) || stringData.contains("K", true)) {
+//                        if (stringData.contains("OK", true) || fullReadOutput.substring(Math.max(fullReadOutput.length - 15, 0)).contains("OK", true)) {
+//                        if (fullReadOutput.substring(Math.max(fullReadOutput.length - 15, 0)).contains("OK", true)) {
                         if (stringData.trim().isNotEmpty() && fullReadOutput.substring(Math.max(fullReadOutput.length - 15, 0)).contains("OK [0]", true)) {
                             Log.d(TAG, "onUsbRead() called in sendCmdToFetchLightIntensities()")
 
                             viewModel.mapIntensityValues(fullReadOutput.toString(), false)
+//                            viewModel.saveLogTest(requireContext().applicationContext, false, fullReadOutput.toString())
+
+//                            showResultsAfterAcquiring()
                             Handler(Looper.getMainLooper()).postDelayed(
                                 {
                                     checkIfToRunAgain()
@@ -185,11 +220,15 @@ class TestRightExpSample : Fragment() {
 
 
         viewModel.mapWavelengthToAbsorbance()
+        // Todo: Save CSV + Test CSV
+
         if (DataHolder.selectedTestType == TestType.SICKLECERT) {
             viewModel.calculateResults()
         } else {
             viewModel.calculateResultsForSickleFind()
         }
+        // Todo: Save Log
+
         saveDataLocally()
 
         if (viewModel.numberOfSampleRun < Constants.NO_OF_TIMES_TO_RUN_SAMPLE) {
@@ -206,13 +245,36 @@ class TestRightExpSample : Fragment() {
     }
 
     private fun showResultsAfterAcquiring() {
-        viewModel.progressBar.postValue(false)
-        parentFragmentManager.beginTransaction().replace(R.id.fl_main, TestRightResults())
-            .commit()
+//        viewModel.mapWavelengthToAbsorbance()
+//        viewModel.calculateResults()
+
+        if (viewModel.calculationData.absorbanceOne!! < 0 || viewModel.calculationData.absorbanceTwo!! < 0) {
+            Toast.makeText(requireContext(), "  ", Toast.LENGTH_SHORT).show()
+            viewModel.progressBar.postValue(false)
+        } else {
+            parentFragmentManager.beginTransaction().replace(R.id.fl_main, TestRightResults())
+                .commit()
+        }
     }
 
     private fun saveDataLocally() {
+        // OLD ------------------------------
+//        val patientName = viewModel.testDetails?.patientName
+//        if (patientName.length > 5){
+//            patientName = patientName.substring(0, 5)
+//        }
+//        val id = PreferenceUtility.generateId(requireContext())
+
+//        val prefixCsv: String = if (DataHolder.selectedTestType == TestType.SICKLECERT)
+//            "HPOSSC_${DataHolder.deviceSerialNumber}_${patientName}_"
+//        else
+//            "HPOSSF_${DataHolder.deviceSerialNumber}_${patientName}_"
+
+//        val fileNameCsv = prefixCsv + id + fileExtensionCsv
+
+        // NEW ------------------------------
         viewModel.saveCsv(requireContext().applicationContext, viewModel.getCSVFileName())
+//        viewModel.saveCsvForTesting(requireContext().applicationContext, viewModel.getDetailedCSVFileName())
         viewModel.saveLogWithPatient(requireContext().applicationContext, viewModel.getLogFileName())
     }
 

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

@@ -38,6 +38,7 @@ class TestRightResults : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
+        // Inflate the layout for this fragment
         binding = FragmentTestRightResultsBinding.inflate(inflater, container, false)
         sharedPreference =
             requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
@@ -50,12 +51,20 @@ class TestRightResults : Fragment() {
         updateResults()
 
         viewModel.fireBaseUpload.observe(viewLifecycleOwner) {
-            if (it == "Success") {
-                Toast.makeText(
-                    requireContext(), "Test Results Upload Successfully", Toast.LENGTH_SHORT
-                ).show()
+            when (it) {
+                "Success" -> {
+                    Toast.makeText(
+                        requireContext(), "Test Results Upload Successfully", Toast.LENGTH_SHORT
+                    ).show()
+                    binding.progressBar.visibility = View.GONE
+                }
+                "Loading" -> {
+                    binding.progressBar.visibility = View.VISIBLE
+                }
+                else -> {
+                    Toast.makeText(requireContext(), "Test upload failed, please try again $it", Toast.LENGTH_SHORT).show()
+                }
             }
-            binding.progressBar.visibility = View.GONE
         }
 
     }
@@ -84,17 +93,15 @@ class TestRightResults : Fragment() {
                     db.collection("patientData").whereEqualTo("_id", viewModel.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)
+                    userdata.documents.forEach {
+                        db.collection("patientData").document(it.id).update("bloodGroup", bloodGroup)
                     }
                 }
             }
+            withContext(Dispatchers.Main) {
+                val i = Intent(requireContext().applicationContext, DashboardActivity::class.java)
+                startActivity(i)
+            }
         }
     }
 
@@ -114,6 +121,36 @@ class TestRightResults : Fragment() {
 
 
         if (DataHolder.selectedTestType == TestType.SICKLECERT) {
+//            when (viewModel.testDetails?.result) {
+//                TestRightResultType.NORMAL -> {
+//                    binding.resultNormal.visibility = View.VISIBLE
+//                }
+//
+//                TestRightResultType.SICKLECELLDISEASE -> {
+//                    binding.resultDisease.visibility = View.VISIBLE
+//                }
+//
+//                TestRightResultType.SICKLECELLTRAIT -> {
+//                    binding.resultTrait.visibility = View.VISIBLE
+//                }
+//
+//                TestRightResultType.POSITIVEBORDERLINE -> {
+//                    binding.resultPositiveBorderline.visibility = View.VISIBLE
+//                    binding.tvRecommended.visibility = View.VISIBLE
+//                }
+//
+//                TestRightResultType.NEGATIVEBORDERLINE -> {
+//                    binding.resultNegativeBorderline.visibility = View.VISIBLE
+//                    binding.tvRecommended.visibility = View.VISIBLE
+//                }
+//                else -> {
+////                    binding.resultUndefined.visibility = View.VISIBLE
+//                    Toast.makeText(
+//                        requireContext().applicationContext, "Please Test Again", Toast.LENGTH_LONG
+//                    ).show()
+//                    moveToSamplePage()
+//                }
+//            }
             binding.resultNormal.visibility = View.VISIBLE
         } else {
             when (viewModel.testDetails?.result) {
@@ -137,11 +174,16 @@ class TestRightResults : Fragment() {
         }
         viewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
             val deviceStaticId = sharedPreference.getString(Constants.USER_ID, "")
+            val token = sharedPreference.getString(Constants.TOKEN,"")
             if (isNetworkAvailable) {
-                viewModel.uploadResultToDatabase(requireContext(), true, deviceStaticId!!)
+                if (token != null) {
+                    viewModel.uploadResultToDatabase(requireContext(), true, deviceStaticId!!,token)
+                }
                 binding.progressBar.visibility = View.VISIBLE
             } else {
-                viewModel.uploadResultToDatabase(requireContext(), false, deviceStaticId!!)
+                if (token != null) {
+                    viewModel.uploadResultToDatabase(requireContext(), false, deviceStaticId!!,token)
+                }
                 Toast.makeText(
                     requireContext(),
                     "Internet not available, Test Data added to Local DB",
@@ -163,4 +205,6 @@ class TestRightResults : Fragment() {
                 .commit()
         }
     }
+
+
 }

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

@@ -2,18 +2,19 @@ package com.example.hpostesting.presentation.testRight
 
 import android.content.Context
 import android.net.Uri
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.NetworkStatusLiveData
+import com.example.hpostesting.data.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.UserDao
 import com.example.hpostesting.data.model.CalculationVariableForTest
 import com.example.hpostesting.data.model.ErrorMessage
 import com.example.hpostesting.data.model.Response
+import com.example.hpostesting.data.model.patient.MolbioLogin
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.data.model.test.TestRightCalculationData
 import com.example.hpostesting.data.model.test.TestRightDeviceConstants
@@ -26,9 +27,13 @@ import com.example.hpostesting.domain.SickleFindResultCaluculationWithMaxImpl
 import com.example.hpostesting.domain.TestRightResultCalculation
 import com.example.hpostesting.util.MyUtils
 import com.google.firebase.storage.FirebaseStorage
+import com.google.gson.JsonObject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
+import okhttp3.MediaType
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Calendar
@@ -53,17 +58,19 @@ class TestRightViewModel @Inject constructor(
     val errorTriggered = MutableLiveData<ErrorMessage>()
     var numberOfSampleRun = 0
 
+    val loginResponse = MutableLiveData<Result<MolbioLogin>>()
+
     val fireBaseUpload = MutableLiveData<String>()
-
     val testDetails = DataHolder.selectedTest
-
     private val _networkStatusLiveData = NetworkStatusLiveData(context)
     val networkStatusLiveData: LiveData<Boolean>
         get() = _networkStatusLiveData
 
     val allUserData = userDao.getAll()
 
-    private lateinit var calculationData: TestRightCalculationData
+    lateinit var calculationData: TestRightCalculationData
+
+    /* (For exp sample) Contains pixel no. -> Intensity of light falling on that pixel */
     val intensitySampleArray = ArrayList<Double>()
 
     val wavelengthToAbsorbance = ArrayList<ArrayList<Double>>()
@@ -71,6 +78,8 @@ class TestRightViewModel @Inject constructor(
     val calculationVariableList = ArrayList<CalculationVariableForTest>()
 
     fun mapDeviceConstants(string: String) {
+//        Log.d(TAG, "mapDeviceConstants() called")
+//        Log.d(TAG, "mapDeviceConstants() value -> $string")
         if (string.isNotEmpty()) {
             val listOfStrings = string.split(",")
             if (listOfStrings.size >= 4) {
@@ -431,7 +440,7 @@ class TestRightViewModel @Inject constructor(
         return prefixTxt + fileExtensionTxt
     }
 
-    private fun addResultTestToDb() {
+    private fun addResultTestToDb(csvFilePath: String, logTxtFilePath: String, token: String) {
         testDetails?.testTime = SimpleDateFormat(
             "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
         ).format(Calendar.getInstance().time)
@@ -441,15 +450,51 @@ class TestRightViewModel @Inject constructor(
             ).format(Calendar.getInstance().time)
             when (repository.addTestToDatabase(testDetails)) {
                 is Response.Success -> {
-                    fireBaseUpload.postValue("Success")
+                    uploadToMolbio(csvFilePath, logTxtFilePath, token)
                 }
-
                 else -> {}
             }
         }
     }
 
-    fun uploadResultToDatabase(context: Context, isOnline: Boolean,deviceSerialNumber: String) = viewModelScope.launch {
+    private fun uploadToMolbio(csvFilePath: String, logTxtFilePath: String, token: String) = viewModelScope.launch {
+        val csv_file = File(csvFilePath)
+        val log_file=File(logTxtFilePath)
+
+        val csv_reqBody = RequestBody.create(MediaType.parse("text/csv"), csv_file)
+        val log_reqBody = RequestBody.create(MediaType.parse("text/txt"), log_file)
+        val deviceId= testDetails?.deviceSerialNumber?.let {
+            RequestBody.create(MediaType.parse("text/plain"),
+                it
+            )
+        }
+        val userId= testDetails?._id?.let { RequestBody.create(MediaType.parse("text/plain"), it) }
+        val csv_formData = MultipartBody.Part.createFormData("csv_file", csv_file.name, csv_reqBody)
+        val log_formData = MultipartBody.Part.createFormData("csv_file", log_file.name, log_reqBody)
+        val count = "1".let {
+            RequestBody.create(MediaType.parse("text/plain"),
+            it
+            )
+        }
+        repository.uploadPdf(token, count, userId!!, csv_formData, log_formData, deviceId!!).let { upload ->
+            when(upload) {
+                is Result.Success -> {
+                    fireBaseUpload.postValue("Success")
+                }
+                is Result.Error -> {
+                    fireBaseUpload.postValue(upload.exception.message)
+                }
+
+                else -> {
+
+                }
+            }
+        }
+
+    }
+
+    fun uploadResultToDatabase(context: Context, isOnline: Boolean, deviceSerialNumber: String, token: String) = viewModelScope.launch {
+        fireBaseUpload.postValue("Loading")
         val csvFilePath = MyUtils.getAppFolderPath(context) + getCSVFileName()
         val logTxtFilePath = MyUtils.getAppFolderPath(context) + getLogFileName()
         testDetails?.csvPath = csvFilePath
@@ -474,8 +519,7 @@ class TestRightViewModel @Inject constructor(
                 val serialNumber = Constants.STATICID.firstOrNull { it == deviceSerialNumber }
                 testDetails?.csvPath = csvUri
                 testDetails?.reportPath = logUri
-
-                addResultTestToDb()
+                addResultTestToDb(csvFilePath, logTxtFilePath, token)
             } catch (exception: Exception) {
                 // Handle the exception appropriately (e.g., log the error, display an error message)
             }
@@ -483,11 +527,14 @@ class TestRightViewModel @Inject constructor(
             testDetails?.testTime = SimpleDateFormat(
                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
             ).format(Calendar.getInstance().time)
-            userDao.insertAll(testDetails!!)
+            userDao.insertAll(testDetails!!).let {
+                fireBaseUpload.postValue("Success")
+            }
         }
     }
 
-    fun bulkUploadResultToDatabase(userData: UserData) = viewModelScope.launch {
+    fun bulkUploadResultToDatabase(userData: UserData, token: String?) = viewModelScope.launch {
+        fireBaseUpload.postValue("Loading")
         val storageRef = FirebaseStorage.getInstance().reference
         val storageTestDetailsRef = storageRef.child("${testDetails?._id}/")
         try {
@@ -504,24 +551,31 @@ class TestRightViewModel @Inject constructor(
             val csvUri = csvUploadTask.storage.downloadUrl.await().toString()
             val logUri = logUploadTask.storage.downloadUrl.await().toString()
 
+            val csvFilePath = userData.csvPath
+            val logTxtFilePath = userData.reportPath
+
             userData.csvPath = csvUri
             userData.reportPath = logUri
 
-
-            bulkAddResultTestToDb(userData)
+            bulkAddResultTestToDb(userData, csvFilePath, logTxtFilePath, token)
         } catch (exception: Exception) {
             // Handle the exception appropriately (e.g., log the error, display an error message)
         }
     }
 
-    private fun bulkAddResultTestToDb(userData: UserData) {
+    private fun bulkAddResultTestToDb(
+        userData: UserData,
+        csvFilePath: String,
+        logTxtFilePath: String,
+        token: String?
+    ) {
         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")
+                    uploadToMolbio(csvFilePath, logTxtFilePath, token!!)
                 }
 
                 else -> {}
@@ -532,4 +586,13 @@ class TestRightViewModel @Inject constructor(
     fun deleteById(userId: String) = viewModelScope.launch {
         userDao.deleteById(id = userId)
     }
+
+    fun login(jsonObject: JsonObject) = viewModelScope.launch {
+        loginResponse.postValue(Result.Loading())
+        repository.login(jsonObject).let {
+            loginResponse.postValue(it)
+        }
+    }
+
+
 }

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

@@ -7,40 +7,46 @@ import android.os.Binder
 import android.os.IBinder
 import android.util.Log
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.TestRightCommands
 import com.example.hpostesting.presentation.UsbServiceListener
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialPort
 import com.hoho.android.usbserial.util.SerialInputOutputManager
 import java.io.IOException
+
+
 class UsbService : Service() {
+
+    // Binder to be given to clients
     private val binder = UsbServiceBinder()
     private lateinit var mPort: UsbSerialPort
     private var isUsbConnected = false
     private val TAG = "UsbService"
 
     inner class UsbServiceBinder : Binder() {
+        // Return this instance of UsbService so clients can call public methods
         fun getService(): UsbService = this@UsbService
     }
 
     override fun onBind(intent: Intent): IBinder {
+        Log.d("surya", "onBind() called")
         return binder
     }
 
     var listener: UsbServiceListener? = null
-    var bus: UsbServiceListener? = null
-
     fun connect(driver: UsbSerialDriver, connection: UsbDeviceConnection) {
+        // Todo: Uncomment this
         mPort = driver.ports[0] // Most devices have just one port (port 0)
         mPort.open(connection)
         mPort.setParameters(115200, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
+//
         isUsbConnected = true
         Log.d(TAG, "My Usb Connected ${mPort.driver}")
 
         val usbIoManager = SerialInputOutputManager(mPort,
             object : SerialInputOutputManager.Listener{
                 override fun onNewData(data: ByteArray?) {
+//                    Log.e(TAG, "onNewData() called inside eventDrivenWrite()")
                     listener?.onUsbRead(data)
                 }
                 override fun onRunError(e: Exception?) {
@@ -51,6 +57,7 @@ class UsbService : Service() {
             })
         usbIoManager.start();
     }
+
     fun disconnect() {
         if(isUsbConnected){
             mPort.close()
@@ -58,6 +65,45 @@ class UsbService : Service() {
             Log.d(TAG, "My Usb disconnected:: ${mPort.driver}")
         }
     }
+
+    // Todo: comment this
+//    fun eventDrivenWrite(command: TestRightCommands, listener: UsbServiceListener) {
+//        this.listener = listener
+//        try {
+//            when (command) {
+//                TestRightCommands.autoset -> {
+//                    this.listener!!.onUsbRead("OK".toByteArray())
+//                }
+//                TestRightCommands.led2Set50 -> {
+//                    this.listener!!.onUsbRead("OK".toByteArray())
+//                }
+//                TestRightCommands.run -> {
+//                    this.listener!!.onUsbRead("OK [0]".toByteArray())
+//                }
+//                TestRightCommands.read -> {
+//                    this.listener!!.onUsbRead(InputData().inputRead.toByteArray())
+//                }
+//                TestRightCommands.printAll -> {
+//                    if (DataHolder.testExp) {
+//                        for (each in InputData().printForReference.lines()) {
+//                            this.listener!!.onUsbRead((each + "\n").toByteArray())
+//                        }
+//                    } else {
+//                        for (each in InputData().printForSample.lines()) {
+//                            this.listener!!.onUsbRead((each + "\n").toByteArray())
+//                        }
+//                    }
+//                }
+//                else -> {
+//                    this.listener!!.onUsbRead("OK".toByteArray())
+//                }
+//            }
+//        } catch (e: IOException) {
+//            listener.onUsbError(e)
+//        }
+//    }
+
+    // Todo: Uncomment this
     fun eventDrivenWrite(command: TestRightCommands, listener: UsbServiceListener) {
         this.listener = listener
         try {
@@ -67,21 +113,19 @@ class UsbService : Service() {
         }
     }
 
-    fun listenToHemoCube(listener: UsbServiceListener) {
-        this.listener = listener
-        try {
+//    fun write(command: TestRightCommands){
+//        mPort.write(command.command.toByteArray(), Constants.WRITE_TIMEOUT_MILLIS)
+//    }
 
-        } catch (e: IOException) {
-            listener.onUsbError(e)
-        }
-    }
+//    fun read(){
+//        val byteArray = ByteArray(3700)
+//        val len = mPort.read(byteArray, Constants.READ_TIMEOUT_MILLIS)
+//
+//        Log.d(TAG, "length is $len")
+//        val byteArrayCropped = ByteArray(len)
+//        System.arraycopy(byteArray, 0, byteArrayCropped, 0, len)
+//
+//        listener?.onUsbRead(byteArrayCropped)
+//    }
 
-    fun sendAndListenToHemoCube(command: HemoCubeCommands, listener: UsbServiceListener) {
-        try {
-            this.bus = listener
-            mPort.write(command.command.toByteArray(), Constants.WRITE_TIMEOUT_MILLIS)
-        } catch (e: IOException) {
-            listener.onUsbError(e)
-        }
-    }
 }

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

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.example.hpostesting.presentation.BloodCollectingMethodActivity">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:theme="@style/Theme.HPOS.AppBarOverlay">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/Theme.HPOS.PopupOverlay" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <TextView
-        android:id="@+id/tv_title"
-        style="@style/title1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="16dp"
-        android:text="@string/select_blood_collecting_method"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/app_bar_layout" />
-
-    <RadioGroup
-        android:id="@+id/bloodTypeRadioGroup"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_title">
-
-        <RadioButton
-            android:id="@+id/venousBloodRadioButton"
-            style="@style/title1_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/venous_blood" />
-
-        <RadioButton
-            android:id="@+id/fingerPrickBloodRadioButton"
-            style="@style/title1_1"
-            android:checked="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/finger_prick_blood" />
-
-    </RadioGroup>
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_go"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="24dp"
-        android:text="@string/go"
-        app:cornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/bloodTypeRadioGroup" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

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

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.example.hpostesting.presentation.KitScanActivity">
+    tools:context=".presentation.KitScanActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"

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

@@ -1,148 +0,0 @@
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.example.hpostesting.presentation.hemocube.HemoCubeFragment">
-
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_parent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/tv_title"
-            style="@style/title1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/Instructions"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_subtitle2"
-            style="@style/title2"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/step4"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title" />
-
-        <TextView
-            android:id="@+id/tv_subtitle3"
-            style="@style/title2"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/step5"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
-
-        <TextView
-            android:id="@+id/tv_subtitle4"
-            style="@style/title1_1"
-            android:layout_width="0dp"
-            android:layout_height="80dp"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:textColor="@color/red"
-            android:textSize="22sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
-
-        <Button
-            android:id="@+id/btn_submit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/submit"
-            android:textColor="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            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"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:text="@string/new_kit"
-            android:textColor="@color/white"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-<!--        <Button-->
-<!--            android:id="@+id/btn_buffer"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:text="@string/new_buffer"-->
-<!--            android:textColor="@color/white"-->
-<!--            android:layout_margin="10dp"-->
-<!--            app:layout_constraintBottom_toBottomOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintEnd_toStartOf="@id/btn_kit"/>-->
-
-        <!--        <Button-->
-        <!--            android:id="@+id/btn_read"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:text="@string/read"-->
-        <!--            android:layout_margin="16dp"-->
-        <!--            android:clickable="false"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/btn_set_reference"-->
-        <!--            app:layout_constraintStart_toStartOf="parent" />-->
-
-        <!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-        <ProgressBar
-            android:id="@+id/progressBar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:elevation="12dp"
-            android:indeterminate="true"
-            android:indeterminateDrawable="@drawable/progressbar_drawable"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>

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

@@ -5,19 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/pendingTest"
-        style="@style/title1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:visibility="gone"
-        android:text="@string/all_registered_user_are_tested_successfully"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/internetNotAvailableCL"
         android:layout_width="match_parent"
@@ -70,6 +57,7 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/internetAvailableCL"
         android:layout_width="match_parent"

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

@@ -1,80 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/userCard"
+    android:id="@+id/userCard"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="24dp"
+    app:cardBackgroundColor="@color/primary_light"
+    app:cardCornerRadius="25dp"
+    app:cardElevation="0dp"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        app:cardBackgroundColor="@color/primary_light"
-        app:cardCornerRadius="25dp"
-        app:cardElevation="0dp"
-        app:layout_constraintTop_toTopOf="parent">
+        android:padding="12dp">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
+        <ImageView
+            android:id="@+id/userImage"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/userName"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="12dp">
+            android:fontFamily="@font/poppins_bold"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/userImage" />
 
-            <ImageView
-                android:id="@+id/userImage"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@drawable/ic_launcher_foreground" />
+        <TextView
+            android:id="@+id/userId"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/poppins_bold"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/userName" />
 
-            <TextView
-                android:id="@+id/userName"
-                style="@style/title1_1"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:gravity="start"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/userImage"
-                app:layout_constraintTop_toTopOf="@+id/userImage"
-                tools:text="Name: MohamedKaif" />
-
-            <TextView
-                android:id="@+id/userId"
-                style="@style/title1_1"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="4dp"
-                android:gravity="start"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/userImage"
-                app:layout_constraintTop_toBottomOf="@id/userName"
-                tools:text="UserID: MohamedKaif" />
-
-            <TextView
-                android:id="@+id/teststatus"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                style="@style/title1_1"
-                android:layout_marginTop="4dp"
-                android:layout_marginStart="16dp"
-                android:gravity="start"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/userImage"
-                app:layout_constraintTop_toBottomOf="@id/userId"
-                tools:text="Test Status: Completed"/>
+        <TextView
+            android:id="@+id/teststatus"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/poppins_bold"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/userId" />
 
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -47,5 +47,4 @@
         app:popUpTo="@id/mobile_navigation"
         app:popUpToInclusive="true"/>
     </fragment>
-
 </navigation>

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

@@ -44,8 +44,6 @@
     <string name="please_place">Please place the cuvette containing sample for reference before running</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="noo"></string>
-
 
     <string name="connect">Connect</string>
     <string name="connected">Connected</string>
@@ -112,8 +110,6 @@
     <string name="sickle_cert">Sickle Cert</string>
     <string name="sickle_find">Sickle Find</string>
     <string name="submit">Submit</string>
-    <string name="new_kit">New Kit</string>
-    <string name="new_buffer">New Buffer</string>
     <string name="name_error_2">Invalid character, Allowed characters are Letters, Numbers and ( ) _ - , . only</string>
     <string name="recommended">\*Result to be confirmed with laboratory test</string>
     <string name="recommended_age">\*Result to be confirmed with laboratory test as age of the patient is less than 5 years</string>
@@ -146,7 +142,6 @@
     <string name="action_settings">Settings</string>
 
     <string name="menu_home">Home</string>
-    <string name="show_hemocube_result">Show Result</string>
     <string name="menu_gallery">Gallery</string>
     <string name="menu_settings">Settings</string>
     <string name="profile">Profile</string>
@@ -189,9 +184,5 @@
     <string name="upload_success_message">Upload done successfully</string>
     <string name="test_completed">Test Completed</string>
     <string name="select_blood_group">Select Blood Group</string>
-    <string name="all_registered_user_are_tested_successfully">All registered user are tested successfully</string>
-    <string name="venous_blood">Venous Blood</string>
-    <string name="finger_prick_blood">Finger Prick Blood</string>
-    <string name="select_blood_collecting_method">Select blood collecting method</string>
 
 </resources>

app/src/main/res/xml/device_filter.xml

@@ -10,7 +10,6 @@
 <!--    <usb-device vendor-id="1027" product-id="24593" /> &lt;!&ndash; 0x6011: FT4232H &ndash;&gt;-->
 <!--    <usb-device vendor-id="1027" product-id="24596" /> &lt;!&ndash; 0x6014: FT232H &ndash;&gt;-->
     <usb-device vendor-id="1027" product-id="24597" /> <!-- 0x6015: FT230X, FT231X, FT234XD -->
-    <usb-device vendor-id="6790" product-id="29987" /> <!-- 0x6015: FT230X, FT231X, FT234XD -->
 
     <!-- 0x10C4 / 0xEA??: Silabs CP210x -->
 <!--    <usb-device vendor-id="4292" product-id="60000" /> &lt;!&ndash; 0xea60: CP2102 and other CP210x single port devices &ndash;&gt;-->

build.gradle

@@ -19,7 +19,6 @@ plugins {
     id 'androidx.navigation.safeargs' version '2.7.0-beta01' apply false
     id 'com.google.dagger.hilt.android' version '2.46' apply false
     id "com.google.gms.google-services" version "4.3.15" apply false
-    id 'com.google.firebase.crashlytics' version "2.9.8" apply false
 }
 
 task clean(type: Delete) {