BloodGroup changes

.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

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

app/.gitignore

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

app/build.gradle

@@ -6,20 +6,19 @@ 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"
         minSdk 21
-        targetSdk 34
-        versionCode 24
-        versionName "2.1.24"
+        targetSdk 33
+        versionCode 2
+        versionName "2.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -40,53 +39,46 @@ 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
     }
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
 
     //firebase
     implementation platform('com.google.firebase:firebase-bom:32.1.0')
-    implementation("com.google.firebase:firebase-perf-ktx")
-    implementation("com.google.firebase:firebase-crashlytics-ktx")
-    implementation("com.google.firebase:firebase-analytics-ktx")
     implementation 'com.google.firebase:firebase-firestore-ktx'
     implementation 'com.google.firebase:firebase-auth-ktx'
     implementation 'com.google.firebase:firebase-storage-ktx'
     implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
-    implementation 'com.google.android.gms:play-services-auth:20.7.0'
+    implementation 'com.google.android.gms:play-services-auth:20.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'
-    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta11'
-    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta11")
-
 
     // Testing
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    testImplementation 'org.mockito:mockito-core:3.12.0'
-    testImplementation "androidx.arch.core:core-testing:2.2.0"
 
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
+
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
     implementation 'com.opencsv:opencsv:4.6'
-    implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
+    implementation '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'
@@ -95,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-rc01"
-    implementation "androidx.room:room-runtime:2.6.0-rc01"
-    kapt ("androidx.room:room-compiler:2.6.0-rc01")
+    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.3"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.3"
+    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,32 +25,16 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.HPOSTesting"
         tools:targetApi="31">
-        <activity
-            android:name="com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity"
-            android:exported="false" />
-        <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.buffercheck.HemocubeBufferCheckActivity"
-            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
@@ -76,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" /> -->
@@ -93,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" />
@@ -107,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,30 +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 com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.FirebaseFirestoreSettings
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import javax.inject.Singleton
 
 @HiltAndroidApp
 class HPOSTestingApplication: Application() {
     val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
-    override fun onCreate() {
-        super.onCreate()
-        val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-        val firestoreSettings = FirebaseFirestoreSettings.Builder()
-            .setPersistenceEnabled(true) // Enable offline persistence if needed
-            .build()
-
-        val firestore = FirebaseFirestore.getInstance()
-        firestore.firestoreSettings = firestoreSettings
-    }
 }

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

@@ -1,7 +1,6 @@
 package com.example.hpostesting.data
 
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.model.patient.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/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,33 +35,7 @@ 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",
-        "HC-V1-007",
-        "HC-V1-008",
-        "HC-V1-009",
-        "HC-V1-010",
-        "HC-V1-011",
-        "HC-V1-012",
-        "HC-V1-013",
-        "HC-V1-014",
-        "HC-V1-015",
-        "HC-V1-016",
-        "HC-V1-017",
-        "HC-V1-018",
-        "HC-V1-019",
-        "HC-V1-020",
     )
 
     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 DEVICE_ID = "DEVICE_ID"
 }

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

@@ -1,9 +0,0 @@
-package com.example.hpostesting.data.constant
-
-enum class HemoCubeCommands(val command: String) {
-    startBuffer("B\r"),
-    runDiagnostics("D\r"),
-    startSample("S\r"),
-    getSample("P\r"),
-    getDeviceId("I\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,26 +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 hemo_cube_test_table")
-    fun getAll(): LiveData<List<HemoCubeTestData>>
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAll(hemoCubeTestData: HemoCubeTestData)
-
-    @Query("SELECT * FROM hemo_cube_test_table WHERE _id = :id")
-    suspend fun getUserByID(id: String): HemoCubeTestData
-
-    @Query("DELETE FROM hemo_cube_test_table WHERE _id = :id")
-    suspend fun deleteById(id: String)
-
-    @Query("UPDATE hemo_cube_test_table SET localFlag = :newValue WHERE _id = :id")
-    suspend fun updateFieldById(id: String, newValue: Boolean)
-}

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

@@ -1,19 +1,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/diagnostics/DiagnosticsData.kt

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

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

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

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

@@ -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,35 +0,0 @@
-package com.example.hpostesting.data.model.patient
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "hemo_cube_test_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,
-    var coefficients: String? = "",
-    var classificationResult: 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/UserData.kt

@@ -9,7 +9,6 @@ data class UserData(
     @PrimaryKey
     var _id: String = "",
     var name: String = "",
-    var incubationTime: String = "",
     var birthYear: String = "",
     var userImageURL: String = "",
     var location: Location? = null,
@@ -37,12 +36,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/model/test/ViewModelModule.kt

@@ -1,29 +0,0 @@
-package com.example.hpostesting.di
-
-import android.content.Context
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.data.dao.UserDao
-import com.example.hpostesting.domain.SaveRawData
-import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.presentation.testRight.TestRightViewModel
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ViewModelComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
-
-@Module
-@InstallIn(ViewModelComponent::class)
-object ViewModelModule {
-
-    @Provides
-    fun provideTestRightViewModel(
-        saveRawData: SaveRawData,
-        saveRawDataTest: SaveRawDataTest,
-        databaseRepository: DatabaseRepository,
-        userDao: UserDao,
-        context: Context
-    ): TestRightViewModel {
-        return TestRightViewModel(saveRawData, saveRawDataTest, databaseRepository, userDao, context)
-    }
-}

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

@@ -3,12 +3,7 @@ package com.example.hpostesting.data.repository
 import android.net.Uri
 import com.example.hpostesting.data.model.PendingUploads
 import com.example.hpostesting.data.model.Response
-import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
-import com.example.hpostesting.data.model.patient.BufferCheckData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
-import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
@@ -21,57 +16,21 @@ class DatabaseRepository : Repository {
     private val db: FirebaseFirestore = Firebase.firestore
     private val storage = Firebase.storage
 
-    suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String> {
+    suspend fun addTestToDatabase(data: UserData): Response<String> {
         return try {
-            val userdata = db.collection("patientData").whereEqualTo("_id", data!!._id).get().await()
+            val userdata = db.collection("patientData").whereEqualTo("_id", data._id).get().await()
             if (userdata.documents.isNotEmpty()) {
                 userdata.documents.forEach {
                     db.collection("patientData").document(it.id).update("testStatus", true)
                 }
             }
-            db.collection("testData").add(data!!).await()
-            Response.Success(data!!._id)
+            db.collection("testData").add(data).await()
+            Response.Success(data._id)
         } catch (e: Exception) {
             Response.Error(e)
         }
     }
 
-    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) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
-    suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String> {
-        return try {
-            db.collection("buffers").add(data!!).await()
-            Response.Success(data!!.kitno)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
-    suspend fun addDiagnostics(data: DiagnosticsData?): Response<String> {
-        return try {
-            db.collection("diagnostics").add(data!!).await()
-            Response.Success(data!!.deviceId)
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
-            Response.Error(e)
-        }
-    }
-
     suspend fun uploadFileToStorage(patientID: String, filePath: String): Response<Boolean> {
         try {
 
@@ -79,8 +38,9 @@ class DatabaseRepository : Repository {
             val riversRef = storage.reference.child("$patientID/${file.lastPathSegment}")
             riversRef.putFile(file).await()
             return Response.Success(true)
+
         } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
+            e.printStackTrace()
             return Response.Error(e)
         }
     }
@@ -92,7 +52,7 @@ class DatabaseRepository : Repository {
 
             Response.Success(true)
         } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
+            e.printStackTrace()
             Response.Error(e)
         }
     }
@@ -111,7 +71,7 @@ class DatabaseRepository : Repository {
             pendingList
 
         } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
+            e.printStackTrace()
             pendingList
         }
     }
@@ -122,24 +82,9 @@ class DatabaseRepository : Repository {
 
             Response.Success(true)
         } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
+            e.printStackTrace()
             Response.Error(e)
         }
     }
 
-    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 }
-    }
-
-    override fun <UserData> addTestToDatabase(testDetails: UserData): Any {
-        TODO("Not yet implemented")
-    }
 }

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

@@ -1,6 +1,5 @@
 package com.example.hpostesting.data.repository
 
 interface Repository {
-    abstract fun <UserData> addTestToDatabase(testDetails: UserData): Any
 //    suspend fun addToDatabase(data: PatientDetails)
 }

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

@@ -3,7 +3,6 @@ package com.example.hpostesting.domain.di
 import android.app.Application
 import android.content.Context
 import androidx.room.Room
-import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
 import com.example.hpostesting.data.dao.UserDao
 import com.example.hpostesting.data.datasource.LocalFileDataSource
@@ -27,9 +26,7 @@ object AppModule {
     fun provideMyDatabase(@ApplicationContext context: Context): MyDatabase {
         return Room.databaseBuilder(
             context, MyDatabase::class.java, "my_database"
-        )
-            .fallbackToDestructiveMigration()
-            .build()
+        ).build()
     }
 
     @Provides
@@ -38,12 +35,6 @@ object AppModule {
         return myDatabase.userDao()
     }
 
-    @Provides
-    @Singleton
-    fun provideMyHemo(myDatabase: MyDatabase): HemoCubeDao {
-        return myDatabase.hemoCubeDao()
-    }
-
     @Provides
     @Singleton
     fun provideContext(application: Application): Context {

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

@@ -1,21 +1,14 @@
 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.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import com.example.hpostesting.presentation.testRight.TestRightActivity
-import com.google.android.material.snackbar.Snackbar
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanIntentResult
 import com.journeyapps.barcodescanner.ScanOptions
@@ -27,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 ->
@@ -48,56 +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()
-//            }
-//        }
-
-
-        try {
-            if (checkHemoCubeKitData()) {
-                DataHolder.selectedTest!!.kitSerial =
-                    sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-                moveToNext()
-            } else {
-                // Handle the case when checkHemoCubeKitData() returns false
-                with(sharedPreference.edit()) {
-                    putString(Constants.KIT_NUMBER, "")
-                    putInt(Constants.KIT_COUNT, 0)
-                    putString(Constants.BUFFER_VALUE_1, "")
-                    putString(Constants.BUFFER_VALUE_2, "")
-                    apply()
-                }
-            }
-        } catch (e: NullPointerException) {
-            // Handle the NullPointerException here
-            e.printStackTrace() // You can log the exception for debugging
-            FirebaseCrashlytics.getInstance().recordException(e)
-            val errorMessage = "An error occurred: ${e.message}"
-            val rootView = findViewById<View>(android.R.id.content)
-            Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
-            // Optionally, show a user-friendly error message to the user
-            // Toast.makeText(applicationContext, "An error occurred", Toast.LENGTH_SHORT).show()
-        }
-
-
         binding.nameEditText.setText("SMI/SC/")
 
         setSupportActionBar(binding.toolbar)
@@ -109,40 +57,9 @@ class KitScanActivity : AppCompatActivity() {
 
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
-            if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
-                if (DataHolder.selectedTest == null) {
-                    with(sharedPreference.edit()) {
-                        putString(
-                            Constants.KIT_NUMBER, binding.nameEditText.text.toString()
-                        )
-                        putInt(Constants.KIT_COUNT, 1)
-                        apply()
-                    }
-                    Toast.makeText(
-                        applicationContext,
-                        "Kit number is updated, Please Select user before starting test",
-                        Toast.LENGTH_SHORT
-                    ).show()
-
-                    val i = Intent(applicationContext, DashboardActivity::class.java)
-                    startActivity(i)
-                    finish()
-                }
-            } else {
-                Toast.makeText(this, "Invalid KIT Number", Toast.LENGTH_LONG).show()
-                return@setOnClickListener
-            }
-            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(
-                    serialNumber
-                )
-            ) {
+            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(serialNumber)) {
                 DataHolder.kitSerial = binding.nameEditText.text.toString()
                 DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
-                with(sharedPreference.edit()) {
-                    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()
@@ -150,15 +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
         }
@@ -166,20 +76,8 @@ class KitScanActivity : AppCompatActivity() {
     }
 
     private fun moveToNext() {
-
-        DataHolder.deviceType.observe(this) { deviceType ->
-            when (deviceType) {
-                Constants.DEVICE_TYPE_HOMOCUBE -> {
-                    val i = Intent(applicationContext, HemocubeActivity::class.java)
-                    startActivity(i)
-                }
-
-                Constants.DEVICE_TYPE_TEST_RIGHT -> {
-                    val i = Intent(applicationContext, TestRightActivity::class.java)
-                    startActivity(i)
-                }
-            }
-        }
+        val i = Intent(applicationContext, TestRightActivity::class.java)
+        startActivity(i)
     }
 
     private fun startScanningNow() {
@@ -201,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,10 +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.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.google.android.gms.location.*
-import com.google.android.material.snackbar.Snackbar
-import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.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
@@ -31,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()
         }
     }
 
@@ -59,94 +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
-            }
-        }
-
-        if (DataHolder.selectedTest == null) {
-            startActivity(Intent(this, DashboardActivity::class.java))
-            finish()
-        }
+        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
         }
     }
 
@@ -155,14 +104,12 @@ class MainActivity : AppCompatActivity() {
             DataHolder.selectedTestType = TestType.SICKLECERT
             val i = Intent(applicationContext, KitScanActivity::class.java)
             startActivity(i)
-            finish()
         }
 
         binding.cvItem2.setOnClickListener {
             DataHolder.selectedTestType = TestType.SICKLEFIND
             val i = Intent(applicationContext, KitScanActivity::class.java)
             startActivity(i)
-            finish()
         }
 
         DataHolder.usbConnected.observe(this) {
@@ -232,46 +179,16 @@ class MainActivity : AppCompatActivity() {
             return
         }
 
-//        fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
-//            location?.let {
-//                DataHolder.selectedTest!!.location =
-//                    UserData.Location(location.latitude, location.longitude)
-//                DataHolder.location =
-//                    UserData.Location(location.latitude, location.longitude)
-//            } ?: run {
-//                requestLocationUpdates()
-//            }
-//        }.addOnFailureListener { exception: Exception ->
-//            exception.printStackTrace()
-//        }
-
-
         fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
-            location?.let {
-                if (DataHolder.selectedTest != null) {
+                location?.let {
                     DataHolder.selectedTest!!.location =
                         UserData.Location(location.latitude, location.longitude)
-                } else {
-                    startActivity(Intent(this, DashboardActivity::class.java))
-                    finish()
+                } ?: run {
+                    requestLocationUpdates()
                 }
-                DataHolder.location =
-                    UserData.Location(location.latitude, location.longitude)
-            } ?: run {
-                requestLocationUpdates()
+            }.addOnFailureListener { exception: Exception ->
+                exception.printStackTrace()
             }
-        }.addOnFailureListener { exception: Exception ->
-            // Handle the exception here
-            exception.printStackTrace()
-            FirebaseCrashlytics.getInstance().recordException(exception)
-            // Display an error message to the user using a Snackbar
-            val errorMessage = "An error occurred: ${exception.message}"
-            val rootView = findViewById<View>(android.R.id.content)
-            Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
-        }
-
-
-
     }
 
     private fun requestLocationUpdates() {

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

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

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

@@ -1,10 +1,6 @@
 package com.example.hpostesting.presentation.adapter
 
 import android.annotation.SuppressLint
-import android.app.AlertDialog
-import android.content.Context
-import android.content.Context.INPUT_METHOD_SERVICE
-import android.view.inputmethod.InputMethodManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,30 +10,17 @@ 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
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Date
-import java.util.Locale
-import android.widget.AutoCompleteTextView
-import androidx.core.content.ContextCompat.getSystemService
-import androidx.core.content.getSystemService
-import androidx.fragment.app.FragmentActivity
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.google.firebase.firestore.FirebaseFirestore
 
 class UserListAdapter(
-
-    private val context: Context,
-    private val hemoCubeViewModel: HemoCubeViewModel,
     options: FirestoreRecyclerOptions<UserData>,
-    private val view: View,
-    private val batLevel: Int,
-    private val requireActivity: FragmentActivity
-) : FirestoreRecyclerAdapter<UserData, UserListAdapter.OrderItemViewHolder>(options) {
+    private val view: View
+) :
+    FirestoreRecyclerAdapter<UserData, UserListAdapter.OrderItemViewHolder>(options) {
 
     class OrderItemViewHolder(val binding: UserItemViewBinding) :
         RecyclerView.ViewHolder(binding.root)
@@ -51,23 +34,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}"
-            if (model.incubationTime == "") {
-                btnBlood.visibility = View.VISIBLE
-            } else {
-                userId.text =
-                    "User ID:${model._id} \n Time: ${isBetween15And30Minutes(model.incubationTime)} \n Started at: ${
-                        SimpleDateFormat("HH:mm:ss").format(
-                            SimpleDateFormat(
-                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                            ).parse(model.incubationTime)!!
-                        )
-                    }"
-                btnBlood.visibility = View.GONE
-            }
-
-
+            userName.text = model.name
+            userId.text = model._id
             Glide.with(view).load(model.userImageURL).into(userImage)
             if (model.testStatus!!) {
                 teststatus.text = "Test concluded"
@@ -75,129 +43,7 @@ class UserListAdapter(
             } else {
                 teststatus.text = "Test is Pending"
             }
-
-            holder.binding.btnBlood.setOnClickListener {
-                val view: View? = requireActivity.currentFocus
-
-                // on below line checking if view is not null.
-                if (view != null) {
-                    // on below line we are creating a variable
-                    // for input manager and initializing it.
-                    val inputMethodManager =
-                        context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
-
-                    // on below line hiding our keyboard.
-                    inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
-                }
-                val inflater = LayoutInflater.from(context)
-                val dialogView = inflater.inflate(R.layout.dialog_custom, null)
-
-                val builder = AlertDialog.Builder(context)
-                    .setView(dialogView)
-                    .setTitle("Add Blood Group")
-
-                val etBloodGroup = dialogView.findViewById<AutoCompleteTextView>(R.id.et_blood_group)
-
-                builder.setPositiveButton("OK") { dialog, which ->
-                    val bloodGroup = etBloodGroup.text.toString()
-                    if (bloodGroup.equals("Select Blood Group") || bloodGroup.isNullOrBlank()) {
-                        etBloodGroup.error = "Please enter your blood group"
-                        Toast.makeText(
-                            context,
-                            "Please enter your blood group",
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    } else {
-                        // Check if hemoCubeViewModel and testDetails are not null
-                        val db: FirebaseFirestore = FirebaseFirestore.getInstance()
-
-                        db.collection("patientData")
-                            .whereEqualTo("_id", model._id)
-                            .get()
-                            .addOnSuccessListener { userdata ->
-                                try {
-                                    val document = userdata.documents[0]
-                                    db.collection("patientData")
-                                        .document(document.id)
-                                        .update("bloodGroup", bloodGroup,
-                                            "incubationTime", SimpleDateFormat(
-                                                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                                            ).format(Calendar.getInstance().time).toString()
-                                        )
-                                        .addOnSuccessListener {
-                                            Toast.makeText(
-                                                context,
-                                                "Blood group updated successfully",
-                                                Toast.LENGTH_SHORT
-                                            ).show()
-                                            btnBlood.visibility = View.GONE
-                                        }
-                                        .addOnFailureListener { e ->
-                                            Toast.makeText(
-                                                context,
-                                                "Failed to update blood group: ${e.message}",
-                                                Toast.LENGTH_SHORT
-                                            ).show()
-                                        }
-                                } catch (e: IndexOutOfBoundsException) {
-                                    // Handle the case where no documents are found for the specified ID
-                                    Toast.makeText(
-                                        context,
-                                        "No user data found for the specified ID",
-                                        Toast.LENGTH_SHORT
-                                    ).show()
-                                }
-
-                            }
-                            .addOnFailureListener { e ->
-                                Toast.makeText(
-                                    context,
-                                    "Error fetching user data: ${e.message}",
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                    }
-                    // Handle the selected blood group here
-                }
-
-                builder.setNegativeButton("Cancel") { dialog, which ->
-                    dialog.dismiss()
-                }
-
-                val alertDialog = builder.create()
-                alertDialog.show()
-            }
-
-            btnStartIncubation.setOnClickListener {
-//                it.visibility = View.GONE
-//                Firebase.firestore.collection("patientData").whereEqualTo("_id", model._id).get()
-//                    .addOnSuccessListener { data ->
-//                        if (data.documents.isNotEmpty()) {
-//                            data.documents.forEach { userData ->
-//                                Firebase.firestore.collection("patientData").document(userData.id)
-//                                    .update(
-//                                        "incubationTime", SimpleDateFormat(
-//                                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-//                                        ).format(Calendar.getInstance().time).toString()
-//                                    ).addOnSuccessListener {
-//                                        Toast.makeText(
-//                                            view.context, "Incubation started", Toast.LENGTH_SHORT
-//                                        ).show()
-//                                        startListening()
-//                                    }
-//                            }
-//                        }
-//                    }
-            }
             userCard.setOnClickListener {
-                if (batLevel < 40) {
-                    Toast.makeText(
-                        view.context,
-                        "Battery level is low than 40%, please charge the device to continue testing",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    return@setOnClickListener
-                }
                 if (model.testStatus != null) {
                     if (model.testStatus!!) {
                         Toast.makeText(
@@ -206,47 +52,11 @@ class UserListAdapter(
                             Toast.LENGTH_SHORT
                         ).show()
                     } else {
-                        if (model.incubationTime != "") {
-                            if (isBetween15And30Minutes(model.incubationTime) < 15) {
-                                Toast.makeText(
-                                    view.context,
-                                    "Incubation has not completed 15 minutes",
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            } else if (isBetween15And30Minutes(model.incubationTime) > 30) {
-                                Toast.makeText(
-                                    view.context,
-                                    "Incubation crossed 30 minutes, need to repeat the incubation",
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            } else {
-                                DataHolder.selectedTest = model
-                                view.findNavController()
-                                    .navigate(R.id.action_nav_home_to_mainActivity)
-                            }
-                        } else {
-                            Toast.makeText(
-                                view.context,
-                                "Incubation not started for this user",
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
+                        DataHolder.selectedTest = model
+                        view.findNavController().navigate(R.id.action_nav_home_to_mainActivity)
                     }
                 }
             }
         }
     }
-
-
-
-    private fun isBetween15And30Minutes(createdAt: String): Long {
-        val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-        val createdAtDate: Date = formatter.parse(createdAt)!!
-
-        val currentTime = Calendar.getInstance().time
-
-        val diffMillis = currentTime.time - createdAtDate.time
-
-        return diffMillis / (60 * 1000)
-    }
 }

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

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

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

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

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

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

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

@@ -1,13 +1,11 @@
 package com.example.hpostesting.presentation.dashboard
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.example.hpostesting.presentation.buffercheck.HemocubeBufferCheckActivity
-import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
+import androidx.lifecycle.ViewModelProvider
 import `in`.sminnovations.hpostesting.databinding.FragmentGalleryBinding
 
 class GalleryFragment : Fragment() {
@@ -23,8 +21,6 @@ class GalleryFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-//        val galleryViewModel =
-//            ViewModelProvider(this).get(GalleryViewModel::class.java)
 
         _binding = FragmentGalleryBinding.inflate(inflater, container, false)
         val root: View = binding.root
@@ -33,15 +29,6 @@ class GalleryFragment : Fragment() {
 //        galleryViewModel.text.observe(viewLifecycleOwner) {
 ////            textView.text = it
 //        }
-        binding.btnSubmit.setOnClickListener {
-            startActivity(Intent(requireContext(), HemocubeBufferCheckActivity::class.java))
-        }
-
-        binding.btnDiagnostics.setOnClickListener {
-            startActivity(Intent(requireContext(), DiagnosticsActivity::class.java))
-        }
-
-
         return root
     }
 

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

@@ -2,11 +2,8 @@ package com.example.hpostesting.presentation.dashboard
 
 import android.app.AlertDialog
 import android.content.Context
-import android.content.Context.BATTERY_SERVICE
 import android.content.DialogInterface
-import android.content.Intent
 import android.content.SharedPreferences
-import android.os.BatteryManager
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -17,50 +14,30 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.presentation.KitScanActivity
 import com.example.hpostesting.presentation.adapter.UserListAdapter
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.TestRightViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
-import com.google.firebase.perf.ktx.performance
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
-import java.text.SimpleDateFormat
-import java.util.Date
 import java.util.Locale
 
 @AndroidEntryPoint
 class HomeFragment : Fragment() {
+
     private var _binding: FragmentHomeBinding? = null
     private val binding get() = _binding!!
-    private val viewModel: TestRightViewModel<Any?> by activityViewModels()
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private val viewModel: TestRightViewModel by activityViewModels()
     private lateinit var rvAdapter: UserListAdapter
-    private var batLevel: Int = 0 // Initialize with a default value, or obtain the actual battery level
-
-
     private lateinit var sharedPreference: SharedPreferences
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         _binding = FragmentHomeBinding.inflate(inflater, container, false)
-
-        // Check if _binding is null
-        if (_binding == null) {
-            // Handle the case where binding could not be initialized
-            // You may want to log an error or return a default view in this case
-            return super.onCreateView(inflater, container, savedInstanceState)
-        }
-
-        sharedPreference =
-            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+        sharedPreference = requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         DataHolder.selectedTest = null
 
         return binding.root
@@ -71,9 +48,6 @@ class HomeFragment : Fragment() {
         viewModel.allUserData.observe(viewLifecycleOwner) { userData ->
             deleteIncompleteRegistrations(userData)
         }
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userData ->
-            deleteHemoCubeIncompleteRegistrations(userData)
-        }
         viewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isConnected ->
             if (isConnected) {
                 binding.internetAvailableCL.visibility = View.VISIBLE
@@ -87,34 +61,12 @@ class HomeFragment : Fragment() {
                 setUserId()
             }
         }
-        hemoCubeViewModel.fireBaseBulkUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                Toast.makeText(
-                    requireContext(),
-                    "Test Results Uploaded Successfully",
-                    Toast.LENGTH_SHORT
-                ).show()
-            }
-            if (result == "Error") {
-                Toast.makeText(requireContext(), "Test Results Upload Failed", Toast.LENGTH_SHORT)
-                    .show()
-            }
-        }
         binding.btnLogout.setOnClickListener {
             logoutUser(requireContext())
         }
         binding.uploadData.setOnClickListener {
             showUploadDialog(requireContext())
         }
-        binding.btnNewKit.setOnClickListener {
-            with(sharedPreference.edit()) {
-                putString(Constants.KIT_NUMBER, "")
-                putInt(Constants.KIT_COUNT, 0)
-                apply()
-            }
-            startActivity(Intent(requireContext(), KitScanActivity::class.java))
-            requireActivity().finish()
-        }
     }
 
     private fun setUserId() {
@@ -133,38 +85,20 @@ class HomeFragment : Fragment() {
     }
 
     private fun loadUserData() {
-        try {
-            val dateFormat = SimpleDateFormat("yyyy-MM-dd")
-            val currentDate = Date()
-            val formattedDate = dateFormat.format(currentDate)
-            val query = Firebase.firestore.collection("patientData")
-                .whereGreaterThanOrEqualTo("createdAt", formattedDate)
-                .orderBy("createdAt", Query.Direction.DESCENDING)
-//        val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false)
-            query.get().addOnSuccessListener {
-                if (it.documents.isEmpty()) {
-                    binding.pendingTest.visibility = View.VISIBLE
-                } else {
-                    binding.pendingTest.visibility = View.GONE
-                }
+        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 recyclerViewOptions =
-                FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
-                    .build()
-
-            val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
-            val batLevel: Int = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-
-                    rvAdapter = view?.let {
-                        UserListAdapter(requireContext(), hemoCubeViewModel, recyclerViewOptions,
-                            it, batLevel, requireActivity())
-                    }!!
-            binding.rvOrder.adapter = rvAdapter
-
-            rvAdapter.startListening()
-        } catch (e: Exception) {
-            Firebase.crashlytics.recordException(e)
         }
+        val recyclerViewOptions =
+            FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
+                .build()
+        rvAdapter = UserListAdapter(recyclerViewOptions, binding.root)
+        binding.rvOrder.adapter = rvAdapter
+        rvAdapter.startListening()
     }
 
     private fun saveUserId(userId: String) {
@@ -173,16 +107,19 @@ class HomeFragment : Fragment() {
             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()
         }
@@ -191,39 +128,26 @@ class HomeFragment : Fragment() {
         dialog.show()
     }
 
-    private fun getData(search: String?, field: String) {
-        val userSearchTrace = Firebase.performance.newTrace("user_search_trace")
-        userSearchTrace.start()
 
-        search?.replaceFirstChar {
+
+    private fun getData(search: String?, field: String) {
+        val capitalizedSearch = search?.replaceFirstChar {
             if (search.lowercase()
                     .startsWith(it.lowercase())
             ) it.titlecase(Locale.getDefault()) else it.toString()
 
         }
-        val currentDate = Date()
-        val dateFormat = SimpleDateFormat("yyyyMMdd")
-        val partition = dateFormat.format(currentDate)
-        val searchTerm = partition + search
-        val searchField = field + "Search"
-        val query = Firebase.firestore.collection("patientData").orderBy(searchField).startAt(searchTerm)
-            .endAt(searchTerm + "\uf8ff")
-        query.get().addOnSuccessListener {
-            userSearchTrace.stop()
-        }
+
+        val query = Firebase.firestore.collection("patientData").orderBy(field).startAt(search)
+            .endAt(search + "\uf8ff")
+
         val recyclerViewOptions =
             FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
                 .build()
-        val bm = requireContext().getSystemService(BATTERY_SERVICE) as BatteryManager
-        batLevel = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
 
-        rvAdapter = view?.let {
-            UserListAdapter(requireContext(), hemoCubeViewModel, recyclerViewOptions, it, batLevel, requireActivity())
-        }!!
+        rvAdapter = UserListAdapter(recyclerViewOptions, binding.root)
         binding.rvOrder.adapter = rvAdapter
         rvAdapter.startListening()
-
-        userSearchTrace.stop()
     }
 
     private fun setSearch() {
@@ -237,10 +161,8 @@ class HomeFragment : Fragment() {
                         binding.aadharIdRadioButton.isChecked -> "aadharId"
                         else -> null
                     }
-
                     field?.let { getData(query, it) }
                     false
-
                 } else {
                     loadUserData()
                     false
@@ -270,11 +192,6 @@ class HomeFragment : Fragment() {
             val uploadDataVisibility = if (userDataList.isEmpty()) View.GONE else View.VISIBLE
             binding.uploadData.visibility = uploadDataVisibility
         }
-
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            val uploadDataVisibility = if (userDataList.any { !it.localFlag }) View.VISIBLE else View.GONE
-            binding.uploadData.visibility = uploadDataVisibility
-        }
     }
 
     private fun showUploadDialog(context: Context) {
@@ -305,38 +222,22 @@ class HomeFragment : Fragment() {
                 }
                 dialog.dismiss()
                 Toast.makeText(
-                    requireContext(), R.string.upload_success_message, Toast.LENGTH_SHORT
+                    requireContext(),
+                    R.string.upload_success_message,
+                    Toast.LENGTH_SHORT
                 ).show()
             }
         }
-
-        hemoCubeViewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            userDataList.forEach { userData ->
-                if (!userData.localFlag) {
-                    userData.localFlag = true
-                    hemoCubeViewModel.bulkAddResultTestToDb(userData)
-                }
-            }
-            dialog.dismiss()
-        }
     }
 
     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() == true) {
-                hemoCubeViewModel.deleteById(userData._id)
-            }
-        }
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

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

@@ -9,7 +9,6 @@ import androidx.lifecycle.ViewModelProvider
 import com.example.hpostesting.presentation.dashboard.ui.slideshow.SlideshowViewModel
 import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
 
-
 class SlideshowFragment : Fragment() {
 
     private var _binding: FragmentSlideshowBinding? = null
@@ -21,7 +20,7 @@ class SlideshowFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
+        savedInstanceState: Bundle?
     ): View {
         val slideshowViewModel =
             ViewModelProvider(this).get(SlideshowViewModel::class.java)
@@ -29,12 +28,6 @@ class SlideshowFragment : Fragment() {
         _binding = FragmentSlideshowBinding.inflate(inflater, container, false)
         val root: View = binding.root
 
-        val pInfo = requireActivity().packageManager.getPackageInfo(
-            requireActivity().packageName, 0
-        )
-        val version = pInfo.versionName
-        binding.textSlideshow.text = version
-
 //        val textView: TextView = binding.textSlideshow
 //        slideshowViewModel.text.observe(viewLifecycleOwner) {
 //            textView.text = it

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

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

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

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

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

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

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

@@ -1,511 +0,0 @@
-package com.example.hpostesting.presentation.hemocube
-
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.graphics.Color
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.MutableLiveData
-import 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.UsbServiceListener
-import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.utils.MyDialogListener
-import com.example.hpostesting.presentation.utils.UIUtils
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.perf.ktx.performance
-import `in`.sminnovations.hpostesting.R
-import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
-import kotlin.math.log10
-
-class HemoCubeFragment : Fragment() {
-
-    private lateinit var binding: FragmentHemoCubeReferenceBinding
-    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
-    private lateinit var sharedPreferences: SharedPreferences
-    val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
-    private var isOnline = false
-    private var currentDeviceData: DeviceData? = null
-    private var resultData: String = ""
-    private var isUsingExistingBuffer = false
-    private var isTestOngoing = false
-    private var startListening = MutableLiveData<Boolean>(false)
-    val testingTrace = Firebase.performance.newTrace("testing_trace")
-
-    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 {
-            activity?.runOnUiThread {
-                binding.progressBar.visibility = View.VISIBLE
-            }
-            hemoCubeViewModel.uploadHemoCubeResultToDatabase(
-                isOnline, true, sharedPreferences.getString(Constants.KIT_NUMBER, "")
-            )
-        }
-        if (isTestOngoing) {
-//            binding.btnKit.visibility = View.GONE
-//            binding.btnKit.isEnabled = false
-//            binding.btnKit.isClickable = false
-        }
-
-        binding.tvTitle2.visibility = View.GONE
-        binding.etAbhaId.visibility = View.GONE
-        binding.nameEditText.visibility = View.GONE
-        binding.tvTitle.visibility = View.GONE
-        binding.btnGo.visibility = View.GONE
-        binding.btnSubmit.isEnabled = false
-        binding.btnSubmit.isClickable = false
-
-
-        binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}"
-        Log.e("nametext", binding.tvName.text.toString())
-    }
-
-    private fun observeViewModel() {
-        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
-            if (result == "Success") {
-                showToast("Test Results Uploaded Successfully")
-                val i = Intent(
-                    requireContext().applicationContext, DashboardActivity::class.java
-                )
-                startActivity(i)
-                (activity as HemocubeActivity).finish()
-            }
-            if (result == "Local") {
-                showToast("Internet not available, test details stored locally")
-                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
-            }
-            if (result == "Error") {
-                showToast("Error uploading data, test details stored locally")
-                startActivity(Intent(requireActivity(), DashboardActivity::class.java))
-            }
-
-            binding.progressBar.visibility = View.GONE
-        }
-
-        hemoCubeViewModel.getDeviceData(sharedPreferences.getString(Constants.USER_ID, ""))
-
-        hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
-            currentDeviceData = it
-        }
-
-        hemoCubeViewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
-            apply {
-                DataHolder.hemoCubeTestData?.let {
-                    currentDeviceData?.coefficients?.let { coefficients ->
-                        val coefficient1 = coefficients[0]
-                        val coefficient2 = coefficients[1]
-                        val result = coefficient1 * coefficient2
-                    }
-                }
-                isOnline = isNetworkAvailable
-            }
-        }
-
-        hemoCubeViewModel.messages.observe(viewLifecycleOwner) {
-            binding.tvSubtitle4.text = it
-        }
-//        startListening.observe(viewLifecycleOwner) {
-//            if (it) {
-//                lifecycleScope.launch {
-//                    delay(1000)
-//                    if (binding.tvSubtitle4.text.toString().isEmpty()) {
-//                        (activity as HemocubeActivity).reconnectDevice()
-//                        if (isBufferValueAvailable()) {
-//                            showBufferAlertDialog()
-//                        } else {
-//                            listenToHemoCube()
-//                            startBufferProcess()
-//                        }
-//                    }
-//                }
-//            }
-//        }
-    }
-
-    private fun checkAndStartProcess() {
-        if (isBufferValueAvailable()) {
-            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()
-        startListening.postValue(true)
-
-        try {
-            (activity as HemocubeActivity).mService.listenToHemoCube(object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {
-                    data?.let {
-                        val stringData = String(it)
-                        fullReadOutput.append(stringData)
-                        handleUsbData(stringData, fullReadOutput)
-                    }
-                }
-
-                override fun onUsbError(e: Exception?) {
-                    hemoCubeViewModel.progressBar.postValue(false)
-                }
-            })
-        } catch (e: Exception) {
-            showToast("test is going on")
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-
-    private fun handleUsbData(stringData: String, fullReadOutput: StringBuilder) {
-        if (stringData.contains("#")) {
-            hemoCubeViewModel.messages.postValue(stringData)
-            isTestOngoing = true
-        }
-
-        resultData += stringData
-
-        when {
-            stringData.contains("#Buffer Completed") -> showStartSampleDialog()
-            stringData.contains("#Sample Completed") -> {
-                fetchResult()
-                testingTrace.stop()
-            }
-
-            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 showError() {
-        activity?.runOnUiThread {
-            UIUtils.createAlertDialog(requireContext(),
-                "Device Error",
-                "Something is wrong with the device, please disconnect and reconnect the device and test the user again",
-                getString(R.string.noo),
-                "Yes",
-                object : MyDialogListener {
-                    override fun onClickNegativeButton() {}
-
-                    override fun onClickPositiveButton() {
-                        startActivity(Intent(requireActivity(), DashboardActivity::class.java))
-                    }
-                })
-        }
-    }
-
-    fun handleBackButtonPress() {
-        if (isTestOngoing) {
-            // If the test is ongoing, don't allow the back button action
-            // You can optionally show a message to the user indicating why the back button is disabled
-            // For example, show a Toast or Snackbar.
-            showToast("Test is ongoing. Cannot go back.")
-        } else {
-            // If the test is not ongoing, you can trigger the back action of the hosting activity
-            activity?.onBackPressed()
-        }
-    }
-
-    private fun showStartSampleDialog() {
-        activity?.runOnUiThread {
-            UIUtils.createAlertDialog(requireContext(),
-                "Start Sample",
-                "Do you want to start sample reading?",
-                getString(R.string.no),
-                "Yes",
-                object : MyDialogListener {
-                    override fun onClickNegativeButton() {}
-
-                    override fun onClickPositiveButton() {
-                        listenToHemoCube()
-                        startSampleProcess()
-                    }
-                })
-        }
-    }
-
-    fun handleValidResult(validString: String, fullReadOutput: String) {
-        try {
-            val result = validString.split(" ")
-            val deviceLog = resultData
-            if (result.size == 8) {
-                val deviceSerialNo = result[2]
-                with(sharedPreferences.edit()) {
-                    putString(Constants.DEVICE_ID, deviceSerialNo)
-                    apply()
-                }
-                val loginId = sharedPreferences.getString(Constants.USER_ID, "").toString()
-                if (checkDeviceIdMismatch(deviceSerialNo, loginId)) {
-                    activity?.runOnUiThread {
-                        binding.errorMessage.text = "Warning: Login Id is different"
-                        binding.errorMessage.visibility = View.VISIBLE
-                    }
-                }
-                val led1BufferForDevice = if (isUsingExistingBuffer) {
-                    sharedPreferences.getString(Constants.BUFFER_VALUE_1, "")?.toDoubleOrNull()
-                } else {
-                    result[3].toDoubleOrNull()
-                }
-                val led2BufferForDevice = if (isUsingExistingBuffer) {
-                    sharedPreferences.getString(Constants.BUFFER_VALUE_2, "")?.toDoubleOrNull()
-                } else {
-                    result[4].toDoubleOrNull()
-                }
-                val pInfo = requireActivity().packageManager.getPackageInfo(
-                    requireActivity().packageName, 0
-                )
-                val version = pInfo.versionName
-                val led1Sample = result[5].toDoubleOrNull()
-                val led2Sample = result[6].toDoubleOrNull()
-                val led1Average = log10(led1BufferForDevice?.div(led1Sample!!) ?: 0.0)
-                val led2Average = log10(led2BufferForDevice?.div(led2Sample!!) ?: 0.0)
-                val deviceRatio = led1Average / led2Average
-//                if (led1BufferForDevice!! > 20000 && led1BufferForDevice < 24000 && led2BufferForDevice!! > 20000 && led2BufferForDevice < 24000) {
-//                    if (led1Sample!! < led1BufferForDevice && led1Sample < 24000 && led2Sample!! < led2BufferForDevice && led2Sample < 24000) {
-//                        if (deviceRatio < 0.08) {
-//                            if (deviceRatio > 1.07) {
-//
-//                            }
-//                        }
-//                    }
-//                }
-
-                if (led1Average < 0 || led2Average < 0) {
-                    activity?.runOnUiThread{
-                        binding.errorMessage.text = "Warning: Negative Abs. Retake Blank Reading"
-                        binding.errorMessage.visibility = View.VISIBLE
-                    }
-                }
-
-                DataHolder.hemoCubeTestData?.apply {
-                    deviceId = deviceSerialNo
-                    led1Buffer = led1BufferForDevice
-                    led2Buffer = led2BufferForDevice
-                    appVersion = version
-                    this.led1Sample = led1Sample
-                    this.led2Sample = led2Sample
-                    this.led1Average = led1Average
-                    this.led2Average = led2Average
-                    this.deviceRatio = deviceRatio
-                    this.calculatedRatio = calculateRatio(deviceRatio)
-                    this.coefficients = currentDeviceData?.coefficients?.get(0).toString() + ", " + currentDeviceData?.coefficients?.get(1).toString()
-                    this.classificationResult = findResult(calculatedRatio)
-                    hemoCubeViewModel.messages.postValue(this.classificationResult)
-                    this.resultData = deviceLog
-                    if (!isUsingExistingBuffer) {
-                        with(sharedPreferences.edit()) {
-                            putString(Constants.BUFFER_VALUE_1, led1Buffer.toString())
-                            putString(Constants.BUFFER_VALUE_2, led2Buffer.toString())
-                            apply()
-                        }
-                    }
-                    activity?.runOnUiThread {
-                        binding.btnSubmit.visibility = View.VISIBLE
-                        binding.btnSubmit.isEnabled = true
-                        binding.btnSubmit.isClickable = true
-                        binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
-                    }
-                }
-            }
-        } catch (e: Exception) {
-            Toast.makeText(
-                requireContext(),
-                "Error while processing device data",
-                Toast.LENGTH_SHORT
-            ).show()
-            Firebase.crashlytics.recordException(e)
-        }
-    }
-
-    private fun findResult(calculatedRatio: Double?): String {
-        try {
-            if (calculatedRatio != null) {
-                if (calculatedRatio < 0.05)
-                    return "Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume"
-                if (calculatedRatio in 0.05..0.155)
-                    return "Normal"
-                if (calculatedRatio in 0.155..0.175)
-                    return "Negative Borderline. Repeat Test"
-                if (calculatedRatio in 0.175..0.22)
-                    return "Sickle Cell Trait"
-                if (calculatedRatio in 0.22..0.25)
-                    return "Positive for Sickle Cell. HPLC for Confirmation"
-                if (calculatedRatio in 0.25..0.35)
-                    return "Sickle Cell Disease"
-                if (calculatedRatio > 0.35)
-                    return "Inconclusive. Repeat with test with lower volume of blood"
-            } else {
-                return "NULL"
-            }
-        } catch (e: Exception) {
-            showToast("error while performing classification")
-            Firebase.crashlytics.recordException(e)
-            return "ERROR"
-        }
-        return "NULL"
-    }
-
-    private fun showToast(message: String) {
-        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() {
-        testingTrace.start()
-        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 checkDeviceIdMismatch(deviceId: String, loginId: String): Boolean {
-        if (!deviceId.isNullOrEmpty() && !loginId.isNullOrEmpty() && deviceId.last() != loginId.last())
-            return true
-        return false
-    }
-}

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

@@ -1,189 +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.BufferCheckData
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
-import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.data.repository.DatabaseRepository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-import javax.inject.Inject
-
-@HiltViewModel
-class 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>()
-    val fireBaseBulkUpload = MutableLiveData<String>()
-    fun uploadHemoCubeResultToDatabase(isOnline: Boolean, testStatus: Boolean, kitSerial: String?) =
-        viewModelScope.launch {
-            if (kitSerial != null) {
-                testDetails?.kitSerial = kitSerial
-            }
-            testDetails?.testStatus = testStatus
-
-            try {
-                if (isOnline) {
-                    parseData()
-                    addResultTestToDb()
-                } else {
-                    parseData()
-                    testDetails?.testTime = SimpleDateFormat(
-                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                    ).format(Calendar.getInstance().time)
-                    hemoCubeDao.insertAll(testDetails!!)
-                    fireBaseUpload.postValue("Local")
-                }
-            } catch (e: Exception) {
-                Log.e("Testdb", "Upload failed: ${e.message}")
-            }
-        }
-
-
-
-    fun uploadHemoCubeResultToDatabaseforbuffercheckN(bufferCheckData: BufferCheckData) =
-     viewModelScope.launch {
-        addResultTestToDbforbuffercheck(bufferCheckData)
-    }
-
-    fun getDeviceData(deviceId: String?) = viewModelScope.launch {
-        deviceData.postValue(deviceId?.let { repository.getDeviceDataById(it) })
-    }
-
-    private fun parseData() {
-        testDetails?.deviceRatio = DataHolder.hemocubeResult
-        testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
-        testDetails?.location = DataHolder.location
-        testDetails?.testTime = SimpleDateFormat(
-            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-        ).format(Calendar.getInstance().time)
-        testDetails?.appVersion = DataHolder.hemoCubeTestData?.appVersion
-        testDetails?.deviceId = DataHolder.hemoCubeTestData?.deviceId
-        testDetails?.deviceSerialNumber =
-            sharedPreference.getString(Constants.USER_ID, "").toString()
-        testDetails?.kitSerial = sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
-        testDetails?.led1Buffer = DataHolder.hemoCubeTestData?.led1Buffer
-        testDetails?.led2Buffer = DataHolder.hemoCubeTestData?.led2Buffer
-        testDetails?.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
-        testDetails?.coefficients = DataHolder.hemoCubeTestData?.coefficients
-        testDetails?.classificationResult = DataHolder.hemoCubeTestData?.classificationResult!!
-    }
-
-    private fun addResultTestToDb() {
-        viewModelScope.launch {
-            try {
-                testDetails!!.reportUploadTime = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                ).format(Calendar.getInstance().time)
-
-                when (val response = repository.addTestToDatabase(testDetails)) {
-                    is Response.Success -> {
-                        val kitCount = sharedPreference.getInt(Constants.KIT_COUNT, 0)
-                        with(sharedPreference.edit()) {
-                            putInt(Constants.KIT_COUNT, kitCount.plus(1))
-                            apply()
-                        }
-                        Log.i("Testdb", "Data uploaded to Firestore successfully")
-                        fireBaseUpload.postValue("Success")
-                        testDetails.localFlag = true
-                        hemoCubeDao.insertAll(testDetails)
-                    }
-
-                    is Response.Error -> {
-                        Log.e("Testdb", "Error uploading data to Firestore: $response")
-                        fireBaseUpload.postValue("Error")
-                        hemoCubeDao.insertAll(testDetails)
-                    }
-                }
-            } catch (e: Exception) {
-                Log.e("Testdb", "Exception during data upload: ${e.message}")
-                fireBaseUpload.postValue("Error")
-            }
-        }
-    }
-
-
-    private fun addResultTestToDbforbuffercheck(bufferCheckData: BufferCheckData) {
-        viewModelScope.launch {
-            try {
-
-                when (val response = repository.addTestToDatabaseforBufferCheck(bufferCheckData)) {
-                    is Response.Success -> {
-                        Log.i("Testdb", "Data uploaded to Firestore successfully")
-                        fireBaseUpload.postValue("Success")
-                    }
-
-                    is Response.Error -> {
-                        Log.e("Testdb", "Error uploading data to Firestore: $response")
-                        fireBaseUpload.postValue("Error")
-                    }
-                }
-            } 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 -> {
-                    fireBaseBulkUpload.postValue("Success")
-                    updateLocalFlag(userData._id)
-                }
-
-                else -> {
-                    fireBaseBulkUpload.postValue("Error")
-                }
-            }
-        }
-    }
-
-    private fun updateLocalFlag(userId: String) = viewModelScope.launch {
-        hemoCubeDao.updateFieldById(id = userId, true)
-    }
-
-    fun deleteById(userId: String) = viewModelScope.launch {
-        hemoCubeDao.deleteById(id = userId)
-    }
-}

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

@@ -1,188 +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
-open 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"
-
-    private val broadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-
-            synchronized(this) {
-                val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE)
-
-                if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
-                    device?.apply {
-                        connectUsb(true)
-                        DataHolder.usbConnected.postValue(true)
-                    }
-                } else {
-                    onErrorReported("permission denied for device")
-                    DataHolder.usbConnected.postValue(true)
-                }
-            }
-
-        }
-    }
-    private val connection = object : ServiceConnection {
-        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            val binder = service as UsbService.UsbServiceBinder
-            mService = binder.getService()
-            viewModel.isServiceConnected = true
-            mConnection.let { mService.connect(mDriver, mConnection!!) }
-            moveToNext()
-        }
-
-        override fun onServiceDisconnected(arg0: ComponentName) {
-            viewModel.isServiceConnected = false
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityHemocubeBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        setSupportActionBar(binding.myToolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        setupListener()
-        connectUsb(false)
-    }
-
-    private fun setupListener() {
-        DataHolder.usbConnected.observe(this) {
-            Log.d("USB OBSERVE", "HemoCube called -> $it")
-            if (it) {
-                myMenu?.get(0)?.icon =
-                    ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_24)
-            } else {
-                myMenu?.get(0)?.icon =
-                    ContextCompat.getDrawable(this, R.drawable.ic_baseline_usb_off_24)
-                Toast.makeText(this, "Device is Disconnected", Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    open fun connectUsb(permissionGranted: Boolean) {
-        Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
-        val manager = getSystemService(Context.USB_SERVICE) as UsbManager
-        val availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager)
-
-        if (availableDrivers.isEmpty()) {
-            onErrorReported("No Device is Connected")
-        } else {
-            mDriver = availableDrivers[0]
-            mConnection = manager.openDevice(mDriver.device)
-
-            if (mConnection == null) {
-                requestUserPermission(manager, mDriver.device)
-            } else {
-                setupService()
-            }
-        }
-    }
-
-
-    private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
-        val mPendingIntent: PendingIntent
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE
-            )
-        } else {
-            mPendingIntent = PendingIntent.getBroadcast(
-                this,
-                0,
-                Intent(Constants.HOMOCUBE_USB_PERMISSION),
-                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
-            )
-        }
-
-        val filter = IntentFilter(Constants.HOMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
-        manager.requestPermission(device, mPendingIntent)
-    }
-
-    fun setupService() {
-        val intent = Intent(this, UsbService::class.java)
-        bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-
-    open fun reconnectDevice() {
-        mService.disconnect()
-        unbindService(connection)
-        viewModel.isServiceConnected = false
-        connectUsb(true)
-    }
-
-    private fun moveToNext() {
-        if (supportFragmentManager.isDestroyed) return
-
-        supportFragmentManager.beginTransaction().replace(binding.fghemocube.id, HemoCubeFragment())
-            .commit()
-    }
-
-
-    override fun onBackPressed() {
-        val fragment = supportFragmentManager.findFragmentById(R.id.fghemocube)
-        if (fragment is HemoCubeFragment) {
-            fragment.handleBackButtonPress()
-        } else {
-            super.onBackPressed()
-        }
-    }
-
-
-    fun onErrorReported(msg: String) {
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
-        if (!isFinishing) onBackPressed()
-    }
-
-    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

@@ -32,7 +32,7 @@ import `in`.sminnovations.hpostesting.databinding.ActivityTestRightBinding
 class TestRightActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityTestRightBinding
-    private val viewModel by viewModels<TestRightViewModel<Any?>>()
+    private val viewModel by viewModels<TestRightViewModel>()
     private var myMenu: Menu? = null
 
     private lateinit var mDriver: UsbSerialDriver
@@ -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<Any?> by activityViewModels()
+    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

@@ -27,7 +27,7 @@ import `in`.sminnovations.hpostesting.databinding.FragmentTestRightExpSampleBind
 class TestRightExpSample : Fragment() {
 
     private lateinit var binding: FragmentTestRightExpSampleBinding
-    private val viewModel: TestRightViewModel<Any?> by activityViewModels()
+    private val viewModel: TestRightViewModel by activityViewModels()
 
     private val TAG = "TestRightExpSample"
 
@@ -35,7 +35,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 +75,10 @@ class TestRightExpSample : Fragment() {
         }
 
         binding.btnSubmit.setOnClickListener {
+//            val details = validateAndReturnTestData()
+//            if (details != null) {
+//                viewModel.patientDetails = details
+
             UIUtils.createAlertDialog(
                 requireContext(),
                 "WARNING",
@@ -98,13 +111,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 +144,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 +183,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 +219,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 +244,33 @@ class TestRightExpSample : Fragment() {
     }
 
     private fun showResultsAfterAcquiring() {
+//        viewModel.mapWavelengthToAbsorbance()
+//        viewModel.calculateResults()
+
         viewModel.progressBar.postValue(false)
+//        binding.progressBar.visibility = View.GONE
         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

@@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.dao.UserDao
 import com.example.hpostesting.data.model.test.TestRightResultType
 import com.example.hpostesting.data.model.test.TestType
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
@@ -32,12 +33,13 @@ import kotlinx.coroutines.withContext
 class TestRightResults : Fragment() {
 
     private lateinit var binding: FragmentTestRightResultsBinding
-    private val viewModel: TestRightViewModel<Any?> by activityViewModels()
+    private val viewModel: TestRightViewModel by activityViewModels()
     private lateinit var sharedPreference: SharedPreferences
-
+    private var bloodGroup: String = ""
     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)
@@ -63,22 +65,32 @@ class TestRightResults : Fragment() {
     private fun setupListeners() {
         binding.ivHome.setOnClickListener {
             CoroutineScope(Dispatchers.IO).launch {
-                checkBloodGroup()
+                val bloodGroupText = binding.etBloodGroup.text.toString()
+                if (bloodGroupText.isNullOrBlank() || bloodGroupText == "Select Blood Group") {
+                    withContext(Dispatchers.Main) {
+                        binding.etBloodGroup.error = "Please enter your blood group"
+                    }
+                    withContext(Dispatchers.Main) {
+                        Toast.makeText(context, "Please enter your blood group", Toast.LENGTH_SHORT).show()
+                    }
+                } else {
+                    withContext(Dispatchers.Main) {
+                        binding.etBloodGroup.error = null
+                    }
+                    bloodGroup = bloodGroupText
+                    checkBloodGroup()
+                }
             }
         }
-        binding.ivNext.setOnClickListener {
+    binding.ivNext.setOnClickListener {
             val i = Intent(requireContext().applicationContext, DashboardActivity::class.java)
             startActivity(i)
-//            moveToSamplePage()
         }
     }
 
     private suspend fun checkBloodGroup() {
         binding.apply {
-            val bloodGroup = etBloodGroup.text.toString()
-            if (bloodGroup.isEmpty()) {
-                etBloodGroup.error = "Please enter your blood group"
-            } else {
+                 bloodGroup = etBloodGroup.text.toString()
                 val db: FirebaseFirestore = Firebase.firestore
                 val userdata =
                     db.collection("patientData").whereEqualTo("_id", viewModel.testDetails?._id)
@@ -94,7 +106,8 @@ class TestRightResults : Fragment() {
                         startActivity(i)
                     }
                 }
-            }
+
+
         }
     }
 
@@ -114,6 +127,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) {
@@ -163,4 +206,6 @@ class TestRightResults : Fragment() {
                 .commit()
         }
     }
+
+
 }

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

@@ -2,6 +2,7 @@ package com.example.hpostesting.presentation.testRight
 
 import android.content.Context
 import android.net.Uri
+import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -26,7 +27,6 @@ import com.example.hpostesting.domain.TestRightResultCalculation
 import com.example.hpostesting.util.MyUtils
 import com.google.firebase.storage.FirebaseStorage
 import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.scopes.ViewModelScoped
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import java.io.File
@@ -39,16 +39,14 @@ import kotlin.math.log10
 import kotlin.math.pow
 
 @HiltViewModel
-@ViewModelScoped
 class TestRightViewModel @Inject constructor(
     private val saveRawData: SaveRawData,
     private val saveRawDataTest: SaveRawDataTest,
     private val repository: DatabaseRepository,
     private val userDao: UserDao,
-    context: Context?
+    context: Context
 ) : ViewModel() {
 
-
     var isServiceConnected = false
     val progressBar = MutableLiveData(false)
 
@@ -57,15 +55,17 @@ class TestRightViewModel @Inject constructor(
 
     val fireBaseUpload = MutableLiveData<String>()
 
-    var testDetails = DataHolder.selectedTest
+    val testDetails = DataHolder.selectedTest
 
-    private val _networkStatusLiveData = context?.let { NetworkStatusLiveData(it) }
-    val networkStatusLiveData: NetworkStatusLiveData?
+    private val _networkStatusLiveData = NetworkStatusLiveData(context)
+    val networkStatusLiveData: LiveData<Boolean>
         get() = _networkStatusLiveData
 
     val allUserData = userDao.getAll()
 
     private 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>>()
@@ -73,6 +73,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) {
@@ -442,7 +444,7 @@ class TestRightViewModel @Inject constructor(
                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
             ).format(Calendar.getInstance().time)
             when (repository.addTestToDatabase(testDetails)) {
-                is Response.Success<*> -> {
+                is Response.Success -> {
                     fireBaseUpload.postValue("Success")
                 }
 
@@ -451,45 +453,43 @@ class TestRightViewModel @Inject constructor(
         }
     }
 
-    fun uploadResultToDatabase(context: Context, isOnline: Boolean, deviceSerialNumber: String) =
-        viewModelScope.launch {
-            val csvFilePath = MyUtils.getAppFolderPath(context) + getCSVFileName()
-            val logTxtFilePath = MyUtils.getAppFolderPath(context) + getLogFileName()
-            testDetails?.csvPath = csvFilePath
-            testDetails?.reportPath = logTxtFilePath
-            testDetails?.deviceSerialNumber = deviceSerialNumber
-            if (isOnline) {
-                val storageRef = FirebaseStorage.getInstance().reference
-                val storageTestDetailsRef = storageRef.child("${testDetails?._id}/")
+    fun uploadResultToDatabase(context: Context, isOnline: Boolean,deviceSerialNumber: String) = viewModelScope.launch {
+        val csvFilePath = MyUtils.getAppFolderPath(context) + getCSVFileName()
+        val logTxtFilePath = MyUtils.getAppFolderPath(context) + getLogFileName()
+        testDetails?.csvPath = csvFilePath
+        testDetails?.reportPath = logTxtFilePath
+        testDetails?.deviceSerialNumber = deviceSerialNumber
+        if (isOnline) {
+            val storageRef = FirebaseStorage.getInstance().reference
+            val storageTestDetailsRef = storageRef.child("${testDetails?._id}/")
 
-                try {
-                    val csvFileUri = Uri.fromFile(File(csvFilePath))
-                    val logTxtFileUri = Uri.fromFile(File(logTxtFilePath))
+            try {
+                val csvFileUri = Uri.fromFile(File(csvFilePath))
+                val logTxtFileUri = Uri.fromFile(File(logTxtFilePath))
 
-                    val csvUploadTask =
-                        storageTestDetailsRef.child(csvFileUri.lastPathSegment!!)
-                            .putFile(csvFileUri)
-                            .await()
-                    val logUploadTask = storageTestDetailsRef.child(logTxtFileUri.lastPathSegment!!)
-                        .putFile(logTxtFileUri).await()
+                val csvUploadTask =
+                    storageTestDetailsRef.child(csvFileUri.lastPathSegment!!).putFile(csvFileUri)
+                        .await()
+                val logUploadTask = storageTestDetailsRef.child(logTxtFileUri.lastPathSegment!!)
+                    .putFile(logTxtFileUri).await()
 
-                    val csvUri = csvUploadTask.storage.downloadUrl.await().toString()
-                    val logUri = logUploadTask.storage.downloadUrl.await().toString()
-                    val serialNumber = Constants.STATICID.firstOrNull { it == deviceSerialNumber }
-                    testDetails?.csvPath = csvUri
-                    testDetails?.reportPath = logUri
+                val csvUri = csvUploadTask.storage.downloadUrl.await().toString()
+                val logUri = logUploadTask.storage.downloadUrl.await().toString()
+                val serialNumber = Constants.STATICID.firstOrNull { it == deviceSerialNumber }
+                testDetails?.csvPath = csvUri
+                testDetails?.reportPath = logUri
 
-                    addResultTestToDb()
-                } catch (exception: Exception) {
-                    // Handle the exception appropriately (e.g., log the error, display an error message)
-                }
-            } else {
-                testDetails?.testTime = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                ).format(Calendar.getInstance().time)
-                userDao.insertAll(testDetails!!)
+                addResultTestToDb()
+            } catch (exception: Exception) {
+                // Handle the exception appropriately (e.g., log the error, display an error message)
             }
+        } else {
+            testDetails?.testTime = SimpleDateFormat(
+                "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+            ).format(Calendar.getInstance().time)
+            userDao.insertAll(testDetails!!)
         }
+    }
 
     fun bulkUploadResultToDatabase(userData: UserData) = viewModelScope.launch {
         val storageRef = FirebaseStorage.getInstance().reference
@@ -524,7 +524,7 @@ class TestRightViewModel @Inject constructor(
                 "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
             ).format(Calendar.getInstance().time)
             when (repository.addTestToDatabase(userData)) {
-                is Response.Success<*> -> {
+                is Response.Success -> {
                     fireBaseUpload.postValue("Success")
                 }
 
@@ -536,4 +536,6 @@ class TestRightViewModel @Inject constructor(
     fun deleteById(userId: String) = viewModelScope.launch {
         userDao.deleteById(id = userId)
     }
+
+
 }

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

@@ -7,14 +7,17 @@ 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
@@ -25,13 +28,13 @@ class UsbService : Service() {
     }
 
     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)
@@ -51,6 +54,7 @@ class UsbService : Service() {
             })
         usbIoManager.start();
     }
+
     fun disconnect() {
         if(isUsbConnected){
             mPort.close()
@@ -58,6 +62,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 +110,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/drawable/ic_add.xml

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

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

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

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

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

app/src/main/res/layout/activity_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/dialog_custom.xml

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

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

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

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

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

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

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

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

@@ -1,253 +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"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title" />
-
-<!--        <TextView-->
-<!--            android:id="@+id/tv_subtitle3"-->
-<!--            style="@style/title2"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginHorizontal="24dp"-->
-<!--            android:layout_marginTop="16dp"-->
-<!--            android:text="@string/step5"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->
-
-        <TextView
-            android:id="@+id/tv_name"
-            style="@style/title2"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:gravity="center"
-            android:padding="12dp"
-            android:layout_marginTop="26dp"
-            android:textFontWeight="700"
-            android:text="Name: SMI\n ID: 1672282828"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="MissingConstraints" />
-
-        <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="72dp"
-            android:gravity="center"
-            android:textColor="@color/red"
-            android:textSize="18sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/et_abha_id" />
-
-
-        <!--        <Button-->
-        <!--            android:visibility="gone"-->
-        <!--            android:id="@+id/btn_samplestart"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="16dp"-->
-        <!--            android:layout_marginTop="24dp"-->
-        <!--            android:clickable="false"-->
-        <!--            android:text="@string/Start_Sample"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/til_blood_group" />-->
-
-
-        <!--        <Button-->
-        <!--            android:id="@+id/btn_placebuffer"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginHorizontal="16dp"-->
-        <!--            android:layout_marginTop="24dp"-->
-        <!--            android:clickable="false"-->
-        <!--            android:text="@string/place_buffer"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@id/btn_submit" />-->
-
-
-        <TextView
-            android:id="@+id/tv_title2"
-            style="@style/title1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="48dp"
-            android:text="@string/enter_kit_serial_number_manually"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="MissingConstraints" />
-
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/et_abha_id"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="20dp"
-            app:layout_constraintEnd_toStartOf="@id/btn_go"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title2">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/name_edit_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLength="17"
-                android:inputType="text"
-                android:hint="@string/serial_number" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_go"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="24dp"
-            android:text="@string/go"
-            app:cornerRadius="16dp"
-            app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toEndOf="@id/et_abha_id"
-            app:layout_constraintTop_toTopOf="@id/et_abha_id" />
-
-
-        <Button
-            android:visibility="gone"
-            android:id="@+id/btn_submit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/submit"
-            android:textColor="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
-
-        <TextView
-            android:id="@+id/error_message"
-            style="@style/title1_1"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="172dp"
-            android:gravity="center"
-            android:textColor="@color/red"
-            android:textSize="18sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
-
-<!--        <com.google.android.material.textfield.TextInputLayout-->
-<!--            android:id="@+id/til_blood_group"-->
-<!--            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginHorizontal="24dp"-->
-<!--            android:layout_marginTop="16dp"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4">-->
-
-<!--            <AutoCompleteTextView-->
-<!--                android:id="@+id/et_blood_group"-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:hint="@string/select_blood_group"-->
-<!--                android:inputType="none"-->
-<!--                android:labelFor="@id/til_blood_group"-->
-<!--                app:simpleItems="@array/blood_group" />-->
-
-<!--        </com.google.android.material.textfield.TextInputLayout>-->
-
-<!--        <Button-->
-<!--            android:id="@+id/btn_kit"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_margin="10dp"-->
-<!--            android:text="@string/new_kit"-->
-<!--            android:textColor="@color/white"-->
-<!--            app:layout_constraintBottom_toBottomOf="parent"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent" />-->
-
-        <!--        <Button-->
-        <!--            android:id="@+id/btn_buffer"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:text="@string/new_buffer"-->
-        <!--            android:textColor="@color/white"-->
-        <!--            android:layout_margin="10dp"-->
-        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintEnd_toStartOf="@id/btn_kit"/>-->
-
-        <!--        <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

@@ -70,6 +70,7 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/internetAvailableCL"
         android:layout_width="match_parent"
@@ -194,27 +195,6 @@
             app:layout_constraintTop_toBottomOf="@+id/radioGroup"
             tools:listitem="@layout/user_item_view"/>
 
-        <TextView
-            android:id="@+id/label"
-            style="@style/title1_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/new_kit"
-            app:layout_constraintBottom_toTopOf="@+id/btnNewKit"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/btnNewKit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:backgroundTint="@color/primary"
-            android:contentDescription="@string/new_kit"
-            android:src="@drawable/ic_add"
-            app:elevation="1dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -1,99 +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/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" />
 
-            <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"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <Button
-                android:id="@+id/btn_startIncubation"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
-                android:text="@string/start_incubation"
-                android:visibility="gone"
-                android:textColor="@color/white"
-                app:layout_constraintStart_toEndOf="@+id/btn_blood"
-                app:layout_constraintBottom_toBottomOf="@+id/btn_blood" />
-            <Button
-                android:id="@+id/btn_blood"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
-                android:text="@string/blood_group"
-                android:textColor="@color/white"
-                app:layout_constraintEnd_toStartOf="@+id/btn_startIncubation"
-                app:layout_constraintTop_toBottomOf="@id/teststatus" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </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,11 +110,6 @@
     <string name="sickle_cert">Sickle Cert</string>
     <string name="sickle_find">Sickle Find</string>
     <string name="submit">Submit</string>
-    <string name="diagnostics">Device Diagnostics</string>
-    <string name="place_buffer">Start Buffer</string>
-    <string name="Start_Sample">Start Sample</string>
-    <string name="new_kit">New Kit</string>
-    <string name="new_buffer">New Buffer</string>
     <string name="name_error_2">Invalid character, Allowed characters are Letters, Numbers and ( ) _ - , . only</string>
     <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>
@@ -149,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>
@@ -193,7 +185,5 @@
     <string name="test_completed">Test Completed</string>
     <string name="select_blood_group">Select Blood Group</string>
     <string name="all_registered_user_are_tested_successfully">All registered user are tested successfully</string>
-    <string name="start_incubation">Incubate</string>
-    <string name="check_buffer">Check Buffer</string>
 
 </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;-->

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

@@ -1,60 +0,0 @@
-package com.example.hpostesting
-
-import android.content.SharedPreferences
-import android.view.View
-import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
-import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
-import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
-import org.junit.Before
-import org.junit.Test
-import org.mockito.ArgumentMatchers.any
-import org.mockito.ArgumentMatchers.anyString
-import org.mockito.Mock
-import org.mockito.Mockito.verify
-import org.mockito.Mockito.`when`
-import org.mockito.MockitoAnnotations
-
-class HemocubeViewModelTest {
-    @Mock
-    private lateinit var mockSharedPreferences: SharedPreferences
-
-    @Mock
-    private lateinit var mockActivity: HemocubeActivity // Replace with your actual Activity class
-
-    @Mock
-    private lateinit var mockBinding: FragmentHemoCubeReferenceBinding // Replace with your actual Binding class
-
-    private lateinit var hemoCubeFragment: HemoCubeFragment
-
-    @Before
-    fun setUp() {
-        MockitoAnnotations.initMocks(this)
-        hemoCubeFragment = HemoCubeFragment()
-    }
-
-    @Test
-    fun `handleValidResult with valid input`() {
-
-        val validString = "valid string"
-        val fullReadOutput = "full read output"
-        `when`(mockSharedPreferences.getString(anyString(), anyString())).thenReturn("dummy_value")
-        `when`(mockActivity.runOnUiThread(any())).thenAnswer {
-            val runnable = it.getArgument(0, Runnable::class.java)
-            runnable.run()
-        }
-
-        // Act
-        hemoCubeFragment.handleValidResult(validString, fullReadOutput)
-
-        // Assert
-        // Add appropriate assertions based on the behavior you expect
-        verify(mockSharedPreferences).edit()
-        verify(mockBinding).btnSubmit.visibility = View.VISIBLE
-        verify(mockBinding).btnSubmit.isEnabled = true
-        // Add more verifications as needed
-    }
-
-
-    // Add more test cases for different scenarios if needed
-}

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

@@ -1,49 +1,17 @@
 package com.example.hpostesting
 
-import android.content.Context
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
-import com.example.hpostesting.data.dao.UserDao
-import com.example.hpostesting.data.model.patient.UserData
-import com.example.hpostesting.data.repository.DatabaseRepository
-import com.example.hpostesting.domain.SaveRawData
-import com.example.hpostesting.domain.SaveRawDataTest
+import com.example.hpostesting.data.model.PatientData
+import com.example.hpostesting.data.model.test.TestRightResultType
 import com.example.hpostesting.presentation.testRight.TestRightViewModel
 import junit.framework.Assert.assertEquals
-import org.junit.Before
 import org.junit.Test
-import org.mockito.Mock
-import org.mockito.MockitoAnnotations
 import java.math.RoundingMode
 import java.text.DecimalFormat
 
 class TestRightViewModelTest {
-
-    @Mock
-    lateinit var mockContext: Context
-
-    @Mock
-    lateinit var mockRepository: DatabaseRepository
-
-    @Mock
-    lateinit var mockSaveRawData: SaveRawData
-
-    @Mock
-    lateinit var mockSaveRawDataTest: SaveRawDataTest
-
-    @Mock
-    lateinit var mockUserDao: UserDao
-
-    lateinit var viewModel: TestRightViewModel<Any?>
-
-    @Before
-    fun setUp() {
-        // Initialize mocks
-        MockitoAnnotations.initMocks(this)
-
-        // Create the ViewModel with mock dependencies
-        viewModel = TestRightViewModel(mockSaveRawData,mockSaveRawDataTest,mockRepository,mockUserDao,mockContext)
-    }
+    private val viewModel = TestRightViewModel()
     private val data = InputData()
 
     @Test
@@ -95,11 +63,8 @@ class TestRightViewModelTest {
         viewModel.mapDeviceConstants(data.inputRead)
         viewModel.mapPixelNumberToWavelength()
         viewModel.mapIntensityValues(TestDataGenerator().getInputReferenceMapIntensityValues(), true)
-        val mapIntensityValues = viewModel.mapIntensityValues(
-            TestDataGenerator().getInputSampleMapIntensityValues(),
-            false
-        )
-        viewModel.testDetails = UserData("Surya", "2", "Male")
+        viewModel.mapIntensityValues(TestDataGenerator().getInputSampleMapIntensityValues(), false)
+        viewModel.patientDetails = PatientData("Surya", 2, "Male", TestRightResultType.UNDEFINED)
         viewModel.mapWavelengthToAbsorbance()
 
         val wavelengthList = TestDataGenerator().getOutputMapPixelNumberToWavelength()

build.gradle

@@ -4,8 +4,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.0.2'
-        classpath 'com.google.gms:google-services:4.4.0'
-        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.1'
+        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.0'
     }
     repositories {
         mavenCentral()
@@ -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) {