kit scan qr code scanning is added, some issues are still resolving only

kit scan actvity changes did for v0 , commented the code for v2
buffer value changes added for existing and new buffer
2024-04-10 12:30:07 +05:30 · 2024-04-04 15:12:13 +05:30 · 2024-03-16 13:52:17 +05:30 · 2024-03-16 13:37:30 +05:30 · 2024-03-16 12:54:12 +05:30 · 2024-03-16 11:59:39 +05:30
122 changed files with 2013 additions and 1179 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
        applicationId "in.sminnovations.hpostesting.dev"
        minSdk 21
        targetSdk 34
-        versionCode 114
-        versionName "2.1.114"
+        versionCode 121
+        versionName "2.1.121"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -129,7 +129,7 @@ dependencies {

    // Barcode scanner
    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
-
+    implementation 'com.github.yuriy-budiyev:code-scanner:2.3.0'
    // Google ML Kit using play services
    implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'

--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,14 +6,15 @@
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-
    <uses-permission
        android:name="android.permission.BATTERY_STATS"
        tools:ignore="ProtectedPermissions" />
-
-    <uses-feature android:name="android.hardware.camera" />
-
    <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -30,10 +31,14 @@
        android:fullBackupContent="@xml/backup_rules"
        android:icon="@mipmap/hpos_icon"
        android:label="@string/app_name"
+        android:largeHeap="true"
        android:roundIcon="@mipmap/hpos_icon_round"
        android:supportsRtl="true"
        android:theme="@style/Theme.HPOSTesting"
        tools:targetApi="31">
+        <activity
+            android:name="com.example.hpostesting.presentation.ScannerKitActvity"
+            android:exported="false" />
        <activity
            android:name="com.example.hpostesting.presentation.deviceinfo.DeviceActivity"
            android:exported="false" />
@@ -59,21 +64,20 @@
        <activity
            android:name="com.example.hpostesting.presentation.calibration.CalibrationActivity"
            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar"/>
-
+            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.assurance.AssuranceControlsActivity"
            android:exported="false"
-            android:theme="@style/Theme.HPOS.NoActionBar"/>
-
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.HPOS.NoActionBar" />
        <activity
            android:name="com.example.hpostesting.presentation.hemocube.HemocubeActivity"
            android:exported="false"
            android:noHistory="true"
            android:parentActivityName="com.example.hpostesting.presentation.MainActivity"
+            android:screenOrientation="portrait"
            android:theme="@style/Theme.HPOS.NoActionBar"
            android:windowSoftInputMode="adjustPan" />
-
        <activity
            android:name="com.example.hpostesting.presentation.trueheme.TrueHemeActivity"
            android:exported="false"
@@ -81,7 +85,6 @@
            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"
@@ -91,29 +94,31 @@
            android:windowSoftInputMode="adjustPan" />
        <activity
            android:name="com.example.hpostesting.presentation.KitScanActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
            android:exported="false"
            android:noHistory="true"
-            android:theme="@style/Theme.HPOS.NoActionBar" />
+            android:theme="@style/Theme.HPOS.NoActionBar"
+            android:windowSoftInputMode="stateHidden" />
        <activity
            android:name="com.example.hpostesting.presentation.dashboard.DashboardActivity"
            android:exported="false"
            android:label="@string/title_activity_dashboard"
-            android:theme="@style/Theme.HPOS.NoActionBar"
            android:screenOrientation="portrait"
+            android:theme="@style/Theme.HPOS.NoActionBar"
            tools:ignore="AppLinkUrlError,MissingClass">
-
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
+
                <category android:name="android.intent.category.DEFAULT" />
+
                <data android:scheme="content" />
                <data android:scheme="file" />
                <data android:mimeType="application/vnd.android.package-archive" />
            </intent-filter>
        </activity>

-
        <service
-            android:name="com.example.hpostesting.presentation.testRight.UsbService"
+            android:name="com.example.hpostesting.util.UsbService"
            android:enabled="true"
            android:exported="false" />

@@ -123,8 +128,9 @@
            android:noHistory="true"
            android:theme="@style/AppTheme.NoActionBar">
            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
        <activity
@@ -147,6 +153,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" />
@@ -160,8 +167,7 @@
            android:name="com.journeyapps.barcodescanner.CaptureActivity"
            android:screenOrientation="portrait"
            android:stateNotNeeded="true"
-            tools:replace="android:screenOrientation" />
-<!--        ${applicationId}-->
+            tools:replace="android:screenOrientation" /> <!-- ${applicationId} -->
        <provider
            android:name="androidx.core.content.FileProvider"
            android:authorities="${applicationId}.fileprovider"
@@ -171,7 +177,6 @@
                android:name="android.support.FILE_PROVIDER_PATHS"
                android:resource="@xml/file_paths" />
        </provider>
-
    </application>

 </manifest>
--- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
@@ -8,7 +8,7 @@ object Constants {
    const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb"
    const val ABHA_APP_PACKAGE = "in.ndhm.phr"

-    const val MOLBIO_INTEGRATION = false
+    const val MOLBIO_INTEGRATION = true
    const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
    const val deviceProvisionPassword = "f2ab0e7f9d69"
    const val DEVICE_ID_API = "deviceIDAPI"
@@ -38,6 +38,7 @@ object Constants {
    const val DEVICE_TYPE_HEMOCUBE = "HEMOCUBE"
    const val DEVICE_TYPE_TEST_RIGHT = "TEST_RIGHT"
    const val DEVICE_TYPE_TRUEHEME = "TRUEHEME"
+    const val DEVICE_VERSION_TYPE = "V0"

    const val DEVICE_VENDOR_ID = 1027
    const val HOMO_CUBE_ID = 29987
@@ -55,6 +56,7 @@ object Constants {
    const val USER_ID = "usernameId"

    const val QUICK_CAPTURE_SOLUTION = "SOLUTION"
+    const val QUICK_CAPTURE_FOR_ADMIN = "ADMIN"
    const val QUICK_CAPTURE_CONCENTRATION = "CONCENTRATION"
    const val QUICK_CAPTURE_VOLUME = "VOLUME"
    const val QUICK_CAPTURE_READING_PER_SAMPLE = "READING_PER_SAMPLE"
@@ -223,6 +225,16 @@ object Constants {
        "HCV-001-0048",
        "HCV-001-0049",
        "HCV-001-0050",
+        "HCV-000-6001",
+        "HCV-000-6002",
+        "HCV-000-6003",
+        "HCV-000-6004",
+        "HCV-000-6005",
+        "HCV-000-6006",
+        "HCV-000-6007",
+        "HCV-000-6008",
+        "HCV-000-6009",
+        "HCV-000-6010",
    )

    const val password = "SMI@12345"
--- a/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/DataHolder.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.data.constant

 import androidx.lifecycle.MutableLiveData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
--- a/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/HemoCubeCommands.kt
@@ -15,4 +15,5 @@ enum class HemoCubeCommands(val command: String) {
    SECOND_GAIN_COMMAND("U\r"),
    THIRD_GAIN_COMMAND("V\r"),
    FORTH_GAIN_COMMAND("W\r"),
+    CHECK_CUVETTE_COMMAND("L\r"),
 }
--- a/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/TestStatus.kt
@@ -10,8 +10,12 @@ enum class TestStatus(val code: Double) {
    FIRST_EMPTY_AIR_READING_PRINT_COMPLETED(4.4),
    EPROM_ADC_RETRIEVAL_STARTED(4.5),
    EPROM_ADC_RETRIEVAL_COMPLETED(4.6),
-    BUFFER_STARTED(4.7),
-    BUFFER_COMPLETED(5.0),
+    CUVETTE_ABSENT(4.7),
+    CUVETTE_PRESENT(4.8),
+    CUVETTE_ABSENTS(7.7),
+    CUVETTE_PRESENTS(7.8),
+    BUFFER_STARTED(4.9),
+    BUFFER_COMPLETED(5.1),
    BUFFER_PRINT_STARTED(6.0),
    BUFFER_PRINT_COMPLETED(7.0),
    SAMPLE_STARTED(8.0),
--- a/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/HemoCubeDao.kt
@@ -5,6 +5,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Update
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
@Dao
@@ -12,6 +13,12 @@ interface HemoCubeDao {
    @Query("SELECT * from hemo_cube_test_table")
    fun getAll(): LiveData<List<HemoCubeTestData>>

+    @Query("SELECT * from hemo_cube_test_table WHERE molbioFlag=false")
+    fun getMolbioPending(): List<HemoCubeTestData>
+
+    @Query("SELECT * from hemo_cube_test_table WHERE localFlag=false")
+    fun getFirebasePending():List<HemoCubeTestData>
+
    @Insert(onConflict = OnConflictStrategy.REPLACE)
    suspend fun insertAll(hemoCubeTestData: HemoCubeTestData)

@@ -30,7 +37,7 @@ interface HemoCubeDao {
    @Query("UPDATE hemo_cube_test_table SET isCSVCreated = :newValue WHERE _id = :id")
    suspend fun updateCSVFieldById(id: String, newValue: Boolean)

-    @Query("SELECT * from hemo_cube_test_table WHERE molbioFlag = :status")
-    suspend fun getPendingUser(status: Boolean): List<HemoCubeTestData>
+    @Query("SELECT * from hemo_cube_test_table WHERE localFlag = 0")
+    fun getPendingUser(): LiveData<List<HemoCubeTestData>>

 }
--- a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
@@ -10,7 +10,7 @@ import com.example.hpostesting.data.model.patient.UserData

@Database(
    entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
-    version = 27,
+    version = 30,
    exportSchema = false
 )
@TypeConverters(Converters::class)
--- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt
+++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSource.kt
@@ -11,4 +11,6 @@ interface LocalFileDataSource {
    fun exportDataToCSV(
        fileName: String, dataList: List<HemoCubeTestData>,
    ): Boolean
+    fun backUpDataToCSV(fileName: String, dataList: List<HemoCubeTestData>)
+
 }
--- a/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/data/datasource/LocalFileDataSourceImpl.kt
@@ -89,8 +89,9 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
            )
            csvWriter.writeNext(header)

-            // Write data rows
-            for (data in dataList) {
+            // Filter and write data rows where testStatus is true
+            val filteredDataList = dataList.filter { it.testStatus == true }
+            for (data in filteredDataList) {
                val row = arrayOf(
                    data._id,
                    data.name,
@@ -152,6 +153,127 @@ class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
        }
    }

+    override fun backUpDataToCSV(fileName: String, dataList: List<HemoCubeTestData>) {
+        try {
+            val filePath = File(getExternalStorageDirectory(), fileName)
+            val writer = FileWriter(filePath)
+            val csvWriter = CSVWriter(writer)
+            // Write CSV header
+            val header = arrayOf(
+                "_id",
+                "name",
+                "incubationTime",
+                "bloodGroup",
+                "birthYear", // Include other fields from the data class
+                "state",
+                "abhaId",
+                "userImageURL",
+                "location",
+                "reportUploadTime",
+                "testType",
+                "testTime",
+                "testStatus",
+                "gender",
+                "localFlag", // Add more fields as necessary
+                "deviceId",
+                "appVersion",
+                "deviceSerialNumber",
+                "deviceType",
+                "kitSerial",
+                "resultData",
+                "led1Buffer",
+                "led2Buffer",
+                "led3Buffer",
+                "led4Buffer",
+                "led1Sample",
+                "led2Sample",
+                "led3Sample",
+                "led4Sample",
+                "led1Average",
+                "led2Average",
+                "led3Average",
+                "led4Average",
+                "abs1",
+                "abs2",
+                "abs3",
+                "abs4",
+                "deviceRatio",
+                "calculatedRatio",
+                "predictedDenovixRatio",
+                "coefficients",
+                "classificationResult",
+                "prdClassification",
+                "errorMessages",
+                "batteryLevel",
+                "batteryCapacity",
+                "batteryMaxCapacity",
+                "batteryTemperature",
+                "batteryVoltage"
+            )
+            csvWriter.writeNext(header)
+
+            // Filter and write data rows where testStatus is true
+            val filteredDataList = dataList.filter { it.testStatus == true }
+            for (data in filteredDataList) {
+                val row = arrayOf(
+                    data._id,
+                    data.name,
+                    data.incubationTime,
+                    data.bloodGroup,
+                    data.birthYear, // Include other fields similarly
+                    data.state,
+                    data.abhaId,
+                    data.userImageURL,
+                    data.location?.toString(),
+                    data.reportUploadTime ?: "",
+                    data.testType ?: "",
+                    data.testTime ?: "",
+                    data.testStatus?.toString() ?: "",
+                    data.gender,
+                    data.localFlag.toString(),
+                    data.deviceId ?: "",
+                    data.appVersion ?: "",
+                    data.deviceSerialNumber,
+                    data.deviceType,
+                    data.kitSerial,
+                    data.resultData,
+                    data.led1Buffer?.toString() ?: "",
+                    data.led2Buffer?.toString() ?: "",
+                    data.led3Buffer?.toString() ?: "",
+                    data.led4Buffer?.toString() ?: "",
+                    data.led1Sample?.toString() ?: "",
+                    data.led2Sample?.toString() ?: "",
+                    data.led3Sample?.toString() ?: "",
+                    data.led4Sample?.toString() ?: "",
+                    data.led1Average?.toString() ?: "",
+                    data.led2Average?.toString() ?: "",
+                    data.led3Average?.toString() ?: "",
+                    data.led4Average?.toString() ?: "",
+                    data.abs1?.toString() ?: "",
+                    data.abs2?.toString() ?: "",
+                    data.abs3?.toString() ?: "",
+                    data.abs4?.toString() ?: "",
+                    data.deviceRatio?.toString() ?: "",
+                    data.calculatedRatio?.toString() ?: "",
+                    data.predictedDenovixRatio?.toString() ?: "",
+                    data.coefficients ?: "",
+                    data.classificationResult,
+                    data.prdClassification,
+                    data.errorMessages,
+                    data.batteryLevel,
+                    data.batteryCapacity,
+                    data.batteryMaxCapacity,
+                    data.batteryTemperature,
+                    data.batteryVoltage
+                )
+                csvWriter.writeNext(row)
+            }
+            writer.close()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+    }
+
    private fun getExternalStorageDirectory(): File {
        val folder = File(Environment.getExternalStorageDirectory(), "HposFolder")

--- a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
@@ -5,7 +5,8 @@ import androidx.room.PrimaryKey

@Entity(tableName = "hemo_cube_test_table")
 data class HemoCubeTestData(
-    @PrimaryKey
+    @PrimaryKey(autoGenerate = true)
+    var sampleid: Int = 0,
    var _id: String = "",
    var name: String = "",
    var incubationTime: String = "",
@@ -89,6 +90,7 @@ data class HemoCubeTestData(
    var quickCapture: Boolean = false,
    var solution: String? = "",
    var concentration: String? = "",
+    var filter: String? = "",
    var volume: String? = "",
    var isCSVCreated: Boolean = false,
 )
--- a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt
@@ -1,7 +1,7 @@
 package com.example.hpostesting.data.repository

 import android.net.Uri
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
 import com.example.hpostesting.data.model.PendingUploads
@@ -109,20 +109,7 @@ class DatabaseRepository @Inject constructor(
    }

    override 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)
-        }
+        TODO("Not yet implemented")
    }

    override suspend fun addTestToDatabaseforBufferCheck(data: BufferCheckData?): Response<String> {
@@ -247,4 +234,22 @@ class DatabaseRepository @Inject constructor(
    override fun <UserData> addTestToDatabase(testDetails: UserData): Any {
        TODO("Not yet implemented")
    }
+
+    override suspend fun addTestToDatabasefornew(data: HemoCubeTestData?): 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)
+            }
+        }
+
 }
--- a/app/src/main/java/com/example/hpostesting/data/repository/Repository.kt
+++ b/app/src/main/java/com/example/hpostesting/data/repository/Repository.kt
@@ -1,6 +1,6 @@
 package com.example.hpostesting.data.repository

-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
@@ -25,6 +25,7 @@ import okhttp3.ResponseBody

 interface Repository {
    suspend fun addTestToDatabase(data: HemoCubeTestData?): Response<String>
+    suspend fun addTestToDatabasefornew(data: HemoCubeTestData?): Response<String>

    suspend fun addTestToDatabase(data: UserData?): Response<String>

--- a/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
+++ b/app/src/main/java/com/example/hpostesting/domain/di/AppModule.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.domain.di
+package com.example.hpostesting.di

 import android.app.Application
 import android.content.Context
@@ -7,7 +7,7 @@ import android.content.res.AssetManager
 import androidx.room.Room
 import com.example.hpostesting.data.api.MolbioAuthApi
 import com.example.hpostesting.data.api.MolbioResultApi
-import com.example.hpostesting.data.api.PropertyProvider
+import com.example.hpostesting.util.PropertyProvider
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
 import com.example.hpostesting.data.dao.MyDatabase
@@ -22,8 +22,8 @@ import com.example.hpostesting.domain.LogFileManager
 import com.example.hpostesting.domain.LogFileManagerImpl
 import com.example.hpostesting.domain.SaveRawData
 import com.example.hpostesting.domain.SaveRawDataTest
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.UsbServiceListenerImpl
+import com.example.hpostesting.presentation.utils.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListenerImpl
 import com.example.hpostesting.util.PropertyProviderImpl
 import dagger.Module
 import dagger.Provides
@@ -147,7 +147,7 @@ object AppModule {
    @Provides
    @Singleton
    fun provideRetrofit(
-        propertyProvider: PropertyProvider,@Named("Auth") client: OkHttpClient
+        propertyProvider: PropertyProvider, @Named("Auth") client: OkHttpClient
    ): Retrofit {
        return Retrofit.Builder().baseUrl(propertyProvider.getProperty("BASE_URL")).client(client)
            .addConverterFactory(GsonConverterFactory.create()).build()
--- a/app/src/main/java/com/example/hpostesting/encryption/Encryption.kt
+++ b/app/src/main/java/com/example/hpostesting/encryption/Encryption.kt
@@ -0,0 +1,42 @@
+package com.example.hpostesting.encryption
+
+import android.util.Base64
+import javax.crypto.Cipher
+import javax.crypto.SecretKeyFactory
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.PBEKeySpec
+import javax.crypto.spec.SecretKeySpec
+
+object Encryption {
+    private const val AES_MODE = "AES/CBC/PKCS5Padding"
+    private const val KEY_SPEC_ALGORITHM = "PBKDF2WithHmacSHA1"
+    private const val SALT = "Bigtec"
+    private const val ITERATION_COUNT = 10000
+    private const val KEY_LENGTH = 256
+    private val FIXED_IV = byteArrayOf(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15)
+
+    fun encrypt(textToEncrypt: String, password: String): String {
+        val salt = SALT.toByteArray()
+        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
+        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
+        val tmp = factory.generateSecret(spec)
+        val key = SecretKeySpec(tmp.encoded, "AES")
+        val cipher = Cipher.getInstance(AES_MODE)
+        cipher.init(Cipher.ENCRYPT_MODE, key, IvParameterSpec(FIXED_IV))
+        val encryptedBytes = cipher.doFinal(textToEncrypt.toByteArray(Charsets.UTF_8))
+        return Base64.encodeToString(encryptedBytes, Base64.NO_WRAP)
+    }
+
+    fun decrypt(encryptedText: String, password: String): String {
+        val salt = SALT.toByteArray()
+        val encryptedBytes = Base64.decode(encryptedText, Base64.NO_WRAP)
+        val factory = SecretKeyFactory.getInstance(KEY_SPEC_ALGORITHM)
+        val spec = PBEKeySpec(password.toCharArray(), salt, ITERATION_COUNT, KEY_LENGTH)
+        val tmp = factory.generateSecret(spec)
+        val key = SecretKeySpec(tmp.encoded, "AES")
+        val cipher = Cipher.getInstance(AES_MODE)
+        cipher.init(Cipher.DECRYPT_MODE, key, IvParameterSpec(FIXED_IV))
+        val decryptedBytes = cipher.doFinal(encryptedBytes)
+        return String(decryptedBytes, Charsets.UTF_8)
+    }
+}
--- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
@@ -1,5 +1,6 @@
 package com.example.hpostesting.presentation

+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -9,8 +10,9 @@ import android.util.Log
 import android.view.View
 import android.widget.EditText
 import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
@@ -32,7 +34,7 @@ import com.zebra.scannercontrol.SDKHandler
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityKitScanBinding

-class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
+class KitScanActivity : AppCompatActivity() {

    private val TAG = "KitScanActivity"
    private lateinit var binding: ActivityKitScanBinding
@@ -42,22 +44,36 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
    var sdkHandler: SDKHandler? = null
    var editBarcode: EditText? = null
    var mScannerInfoList = ArrayList<DCSScannerInfo>()
+    companion object {
+        const val QR_REQUEST_CODE = 1
+    }
+//    private val barcodeLauncher = registerForActivityResult(
+//        ScanContract()
+//    ) { result: ScanIntentResult ->
+//        Log.d(TAG, result.contents)
+//        if (result.contents.isNullOrEmpty()) {
+//            Toast.makeText(this, R.string.cancelled_unable_scan, Toast.LENGTH_LONG).show()
+//        } else {
+//            Log.d(TAG, result.contents)
+//            processScannedData(result.contents)
+//        }
+//    }
+//
+//    private fun processScannedData(contents: String) {
+//        binding.nameEditText.setText(contents)
+//    }

-    private val barcodeLauncher = registerForActivityResult(
-        ScanContract()
-    ) { result: ScanIntentResult ->
-        if (result.contents.isNullOrEmpty()) {
-            Toast.makeText(this, R.string.cancelled_unable_scan, Toast.LENGTH_LONG).show()
-        } else {
-            Log.d(TAG, result.contents)
-            processScannedData(result.contents)
+    // In your calling activity
+    var resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {    // Handle the result
+            val qrCode = result.data?.getStringExtra("QRCode")
+            Toast.makeText(this, "scanned kit text:$qrCode",
+                Toast.LENGTH_LONG).show()
+//                val editText = findViewById<com.google.android.material.textfield.TextInputEditText>(R.id.name_edit_text)
+            binding.nameEditText.setText(qrCode)
+            // Use data to retrieve extra
        }
    }
-
-    private fun processScannedData(contents: String) {
-        binding.nameEditText.setText(contents)
-    }
-
    override fun attachBaseContext(newBase: Context?) {
        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
        LanguageManager.setLocale(newBase, languageCode)
@@ -65,33 +81,33 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
    }


-    override fun dcssdkEventScannerAppeared(dcsScannerInfo: DCSScannerInfo?) {}
-
-    override fun dcssdkEventScannerDisappeared(i: Int) {}
-
-    override fun dcssdkEventCommunicationSessionEstablished(dcsScannerInfo: DCSScannerInfo?) {}
-
-    override fun dcssdkEventCommunicationSessionTerminated(i: Int) {}
-//    override fun dcssdkEventBarcode(p0: ByteArray?, p1: Int, p2: Int) {
-//        TODO("Not yet implemented")
+//    override fun dcssdkEventScannerAppeared(dcsScannerInfo: DCSScannerInfo?) {}
+//
+//    override fun dcssdkEventScannerDisappeared(i: Int) {}
+//
+//    override fun dcssdkEventCommunicationSessionEstablished(dcsScannerInfo: DCSScannerInfo?) {}
+//
+//    override fun dcssdkEventCommunicationSessionTerminated(i: Int) {}
+////    override fun dcssdkEventBarcode(p0: ByteArray?, p1: Int, p2: Int) {
+////        TODO("Not yet implemented")
+////    }
+//
+//
+//    override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {}
+//
+//    override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {}
+//
+//    override fun dcssdkEventBinaryData(bytes: ByteArray?, i: Int) {}
+//
+//    override fun dcssdkEventFirmwareUpdate(firmwareUpdateEvent: FirmwareUpdateEvent?) {}
+//
+//    override fun dcssdkEventAuxScannerAppeared(
+//        dcsScannerInfo: DCSScannerInfo?,
+//        dcsScannerInfo1: DCSScannerInfo?,
+//    ) {
 //    }
-
-
-    override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventBinaryData(bytes: ByteArray?, i: Int) {}
-
-    override fun dcssdkEventFirmwareUpdate(firmwareUpdateEvent: FirmwareUpdateEvent?) {}
-
-    override fun dcssdkEventAuxScannerAppeared(
-        dcsScannerInfo: DCSScannerInfo?,
-        dcsScannerInfo1: DCSScannerInfo?,
-    ) {
-    }
-
-    override fun dcssdkEventConfigurationUpdate(configurationUpdateEvent: ConfigurationUpdateEvent?) {}
+//
+//    override fun dcssdkEventConfigurationUpdate(configurationUpdateEvent: ConfigurationUpdateEvent?) {}

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -151,8 +167,9 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        setSupportActionBar(binding.toolbar)

        binding.btnScanNow.setOnClickListener {
-//            startScanningNow()
-            pullTrigger()
+//            startForResult.launch(Intent(this, ScannerKitActvity::class.java))
+            val intent = Intent(this, ScannerKitActvity::class.java)
+            resultLauncher.launch(intent)
        }

        binding.btnGo.setOnClickListener {
@@ -207,26 +224,26 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        }

        //Setting up the SDK handler
-        sdkHandler = SDKHandler(this)
-        //Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications.
-        sdkHandler!!.dcssdkSetDelegate(this)
-        //this command is telling the sdk that we're going to be connecting to the scanner via USB
-        sdkHandler!!.dcssdkSetOperationalMode(DCSSDKDefs.DCSSDK_MODE.DCSSDK_OPMODE_SNAPI)
-
-        //deciding what kind of notifications we want to receive. Explained more in the function
-        //first we use bitmapping to set these values into the notifications_mask.
-        var notifications_mask = 0
-        // We would like to subscribe to all barcode events
-        notifications_mask =
-            notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
-        sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
-        mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
-        Log.e("scannersize", sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
-        if (mScannerInfoList.isNotEmpty()) {
-            sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
-        } else {
-            Toast.makeText(this,"Scanner Is not available In this device", Toast.LENGTH_LONG).show()
-        }
+//        sdkHandler = SDKHandler(this)
+//        //Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications.
+//        sdkHandler!!.dcssdkSetDelegate(this)
+//        //this command is telling the sdk that we're going to be connecting to the scanner via USB
+//        sdkHandler!!.dcssdkSetOperationalMode(DCSSDKDefs.DCSSDK_MODE.DCSSDK_OPMODE_SNAPI)
+//
+//        //deciding what kind of notifications we want to receive. Explained more in the function
+//        //first we use bitmapping to set these values into the notifications_mask.
+//        var notifications_mask = 0
+//        // We would like to subscribe to all barcode events
+//        notifications_mask =
+//            notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value
+//        sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask)
+//        mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList())
+//        Log.e("scannersize", sdkHandler!!.dcssdkGetAvailableScannersList().size.toString())
+//        if (mScannerInfoList.isNotEmpty()) {
+//            sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID)
+//        } else {
+//            Toast.makeText(this,"Scanner Is not available In this device", Toast.LENGTH_LONG).show()
+//        }
    }

    private fun pullTrigger() {
@@ -257,14 +274,14 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
    }

    //this function is called if barcode is detected.
-    override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) {
-        val result = String(barcodeData!!)
-        Log.d("BARCODE", result)
-        runOnUiThread {
-            val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
-            binding.nameEditText.text = editableResult
-        }
-    }
+//    override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) {
+//        val result = String(barcodeData!!)
+//        Log.d("BARCODE", result)
+//        runOnUiThread {
+//            val editableResult: Editable = Editable.Factory.getInstance().newEditable(result)
+//            binding.nameEditText.text = editableResult
+//        }
+//    }

    private fun checkHemoCubeKitData(): Boolean {
        return sharedPreference.getString(Constants.KIT_NUMBER, "")
@@ -303,21 +320,21 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
        }
    }

-    private fun startScanningNow() {
-        val options = ScanOptions()
-        options.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
-        options.setPrompt("Scan a barcode")
-        options.setCameraId(0) // Use a specific camera of the device
-
-        options.setBeepEnabled(true)
-        options.setBarcodeImageEnabled(true)
-
-        options.setPrompt("Start Scanning")
-        options.setOrientationLocked(false)
-//        options.setTimeout(10000) // in ms
-
-        barcodeLauncher.launch(options)
-    }
+//    private fun startScanningNow() {
+//        val options = ScanOptions()
+//        options.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
+//        options.setPrompt("Scan a barcode")
+//        options.setCameraId(0) // Use a specific camera of the device
+//
+//        options.setBeepEnabled(true)
+//        options.setBarcodeImageEnabled(true)
+//
+//        options.setPrompt("Start Scanning")
+//        options.setOrientationLocked(false)
+////        options.setTimeout(10000) // in ms
+//
+//        barcodeLauncher.launch(options)
+//    }

    private fun checkDataNotNull(): Boolean {
        return if (DataHolder.selectedTest?._id == null) {
@@ -333,4 +350,13 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate {
            true
        }
    }
+
+//    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+//        super.onActivityResult(requestCode, resultCode, data)
+//        if (requestCode == QR_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
+//            val qrCode = data?.getStringExtra("QRCode")
+////                val editText = findViewById<com.google.android.material.textfield.TextInputEditText>(R.id.name_edit_text)
+//                binding.nameEditText.setText(qrCode)
+//            }
+//    }
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt
@@ -17,7 +17,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.get
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.data.model.patient.UserData
--- a/app/src/main/java/com/example/hpostesting/presentation/MainViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/MainViewModel.kt
@@ -1,7 +0,0 @@
-package com.example.hpostesting.presentation
-
-import androidx.lifecycle.ViewModel
-
-class MainViewModel : ViewModel() {
-
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/ScannerKitActvity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/ScannerKitActvity.kt
@@ -0,0 +1,73 @@
+package com.example.hpostesting.presentation
+
+import android.app.Activity
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.widget.Toast
+import com.budiyev.android.codescanner.AutoFocusMode
+import com.budiyev.android.codescanner.CodeScanner
+import com.budiyev.android.codescanner.CodeScannerView
+import com.budiyev.android.codescanner.DecodeCallback
+import com.budiyev.android.codescanner.ErrorCallback
+import com.budiyev.android.codescanner.ScanMode
+import `in`.sminnovations.hpostesting.R
+
+class ScannerKitActvity : AppCompatActivity() {
+    private lateinit var codeScanner: CodeScanner
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_scanner_kit_actvity)
+        val scannerView = findViewById<CodeScannerView>(R.id.scanner_view)
+
+        codeScanner = CodeScanner(this, scannerView)
+
+        // Parameters (default values)
+        codeScanner.camera = CodeScanner.CAMERA_BACK // or CAMERA_FRONT or specific camera id
+        codeScanner.formats = CodeScanner.ALL_FORMATS // list of type BarcodeFormat,
+        // ex. listOf(BarcodeFormat.QR_CODE)
+        codeScanner.autoFocusMode = AutoFocusMode.SAFE // or CONTINUOUS
+        codeScanner.scanMode = ScanMode.SINGLE // or CONTINUOUS or PREVIEW
+        codeScanner.isAutoFocusEnabled = true // Whether to enable auto focus or not
+        codeScanner.isFlashEnabled = false // Whether to enable flash or not
+
+        // Callbacks
+        codeScanner.decodeCallback = DecodeCallback {
+            runOnUiThread {
+                Toast.makeText(this, "scanned text: ${it.text}",
+                    Toast.LENGTH_LONG).show()
+            }
+            val resultIntent = Intent()
+            resultIntent.putExtra("QRCode", it.text)
+            setResult(Activity.RESULT_OK, resultIntent)
+
+
+        }
+        codeScanner.errorCallback = ErrorCallback { // or ErrorCallback.SUPPRESS
+            runOnUiThread {
+                Toast.makeText(this, "Camera initialization error: ${it.message}",
+                    Toast.LENGTH_LONG).show()
+            }
+        }
+
+        scannerView.setOnClickListener {
+            codeScanner.startPreview()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        codeScanner.startPreview()
+    }
+
+    override fun onPause() {
+        codeScanner.releaseResources()
+        super.onPause()
+    }
+
+    override fun onBackPressed() {
+        // You can do additional work here before calling super
+        super.onBackPressed() // This calls finish() behind the scenes for you
+    }
+
+}
--- a/app/src/main/java/com/example/hpostesting/presentation/SplashActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/SplashActivity.kt
@@ -13,7 +13,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.util.MyUtils
--- a/app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/OfflineUserListAdapter.kt
@@ -11,7 +11,7 @@ import androidx.navigation.findNavController
 import androidx.recyclerview.widget.AsyncListDiffer
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
--- a/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/adapter/UserListAdapter.kt
@@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
--- a/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt
@@ -13,9 +13,8 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Spinner
 import android.widget.Toast
-import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.UserData
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
@@ -45,7 +44,6 @@ class AssuranceControlsFragment : Fragment() {

    private fun initViews() {
 //        binding.btnSubmit.visibility = View.GONE
-
        val solutionSpinner: Spinner = binding.spinnerSolutions
        val solutionOptions = arrayOf("Select solution", "Tartrazine", "Acid Red")
        val solutionAdapter =
@@ -124,6 +122,27 @@ class AssuranceControlsFragment : Fragment() {
            }
        }

+
+        val adminspinner: Spinner = binding.spinnerAdmin
+        val adminOptions = arrayOf("Select options", "Sickle-Cert-Buffer", "1 Abs Holo Filter", "0.25 Abs Holo Filter", "Air Blank")
+        val adminAdapter =
+            ArrayAdapter(requireContext(), R.layout.simple_spinner_item, adminOptions)
+        adminAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        adminspinner.adapter =adminAdapter
+        adminspinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?,
+                view: View?,
+                position: Int,
+                id: Long,
+            ) {
+                val selectedValue: String = adminOptions[position]
+
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+            }
+        }
        // load saved values
        val savedSolution =
            sharedPreferences.getString(Constants.QUICK_CAPTURE_SOLUTION, "").toString()
@@ -140,11 +159,18 @@ class AssuranceControlsFragment : Fragment() {
        val volumePosition = getPositionOfValue(savedVolume, volumeOptions.toList())
        volumeSpinner.setSelection(volumePosition)

+
+        val foradmin =
+            sharedPreferences.getString(Constants.QUICK_CAPTURE_FOR_ADMIN, "").toString()
+        val adminPosition = getPositionOfValue(foradmin, adminOptions.toList())
+        adminspinner.setSelection(adminPosition)
+
        binding.btnSubmit.setOnClickListener {
            val selectedSolution = binding.spinnerSolutions.selectedItem.toString()
            val selectedConcentration = binding.spinnerConcentration.selectedItem.toString()

-            // Check if any of the selections are default values
+
+//             Check if any of the selections are default values
            if (selectedSolution == "Select solution") {
                Toast.makeText(requireContext(), "Please select a solution", Toast.LENGTH_LONG).show()
                return@setOnClickListener // Prevent further execution
@@ -154,6 +180,21 @@ class AssuranceControlsFragment : Fragment() {
                Toast.makeText(requireContext(), "Please select a concentration", Toast.LENGTH_LONG).show()
                return@setOnClickListener // Prevent further execution
            }
+            //for vizagh
+//            val selectedadminOption = binding.spinnerAdmin.selectedItem.toString()
+//            if (selectedadminOption == "Select options") {
+//                Toast.makeText(requireContext(), "Please select a option", Toast.LENGTH_LONG).show()
+//                return@setOnClickListener // Prevent further execution
+//            }
+//            DataHolder.hemoCubeTestData!!.filter = binding.spinnerAdmin.selectedItem.toString()
+//            if(binding.spinnerAdmin.selectedItem.toString().equals("Select options")){
+//                Toast.makeText(requireContext(), "Please select a option", Toast.LENGTH_LONG).show()
+//            }else {
+//                DataHolder.hemoCubeTestData!!.name = DataHolder.hemoCubeTestData!!.filter.toString()
+//            }
+
+
+
            DataHolder.hemoCubeTestData!!.quickCapture = true
            val currentUnixTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                Instant.now().epochSecond
@@ -163,11 +204,14 @@ class AssuranceControlsFragment : Fragment() {
            DataHolder.hemoCubeTestData!!._id = currentUnixTime.toString() + "SMI"
            DataHolder.hemoCubeTestData!!.solution = binding.spinnerSolutions.selectedItem.toString()
            DataHolder.hemoCubeTestData!!.concentration = binding.spinnerConcentration.selectedItem.toString()
-            DataHolder.hemoCubeTestData!!.name = "${DataHolder.hemoCubeTestData!!.solution} ${DataHolder.hemoCubeTestData!!.concentration} ${DataHolder.hemoCubeTestData!!.volume}"
+
+

            DataHolder.selectedTest = UserData()
            DataHolder.selectedTest?._id = DataHolder.hemoCubeTestData!!._id
            DataHolder.selectedTest?.name = DataHolder.hemoCubeTestData!!.name
+            DataHolder.selectedTest?.name = binding.spinnerSolutions.selectedItem.toString() + " " +binding.spinnerConcentration.selectedItem.toString()
+

            with(sharedPreferences.edit()) {
                putString(Constants.QUICK_CAPTURE_SOLUTION, DataHolder.hemoCubeTestData!!.solution)
@@ -176,6 +220,7 @@ class AssuranceControlsFragment : Fragment() {
                    DataHolder.hemoCubeTestData!!.concentration
                )
                putString(Constants.QUICK_CAPTURE_VOLUME, DataHolder.hemoCubeTestData!!.volume)
+                putString(Constants.QUICK_CAPTURE_FOR_ADMIN, DataHolder.hemoCubeTestData!!.filter)
                apply()
            }

--- a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacActivity.kt
@@ -20,10 +20,10 @@ 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.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/autodac/AutoDacFragment.kt
@@ -14,7 +14,7 @@ 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.example.hpostesting.presentation.utils.UsbServiceListener
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentAutoDacBinding
--- a/app/src/main/java/com/example/hpostesting/presentation/blank/BlankActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankActivity.kt
@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankActivity {
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/blank/BlankFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankFragment.kt
@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankFragment {
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/blank/BlankViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/blank/BlankViewModel.kt
@@ -1,4 +0,0 @@
-package com.example.hpostesting.presentation.blank
-
-class BlankViewModel {
-}
--- a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemoCubeBufferCheckFragment.kt
@@ -15,7 +15,7 @@ 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.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.google.firebase.crashlytics.ktx.crashlytics
--- a/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemocubeBufferCheckActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/buffercheck/HemocubeBufferCheckActivity.kt
@@ -20,11 +20,11 @@ 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.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationActivity.kt
@@ -20,10 +20,10 @@ 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.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/calibration/CalibrationFragment.kt
@@ -17,7 +17,7 @@ import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.calibration.CalibrationData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ActivitiesFragment.kt
@@ -0,0 +1,59 @@
+package com.example.hpostesting.presentation.dashboard
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.BatteryManager
+import android.os.Bundle
+import android.util.Log
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.data.model.patient.HemoCubeTestData
+import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
+import com.example.hpostesting.presentation.adapter.UserListAdapter
+import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
+import com.example.hpostesting.presentation.testRight.TestRightViewModel
+import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentActivitiesBinding
+import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
+
+class ActivitiesFragment : Fragment() {
+    private lateinit var binding: FragmentActivitiesBinding
+    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private lateinit var adapter: OfflineUserListAdapter
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+    ): View {
+        binding = FragmentActivitiesBinding.inflate(inflater, container, false)
+
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        hemoCubeViewModel.allPendingUserToUpload.observe(viewLifecycleOwner) { userData ->
+
+            if (userData.isNotEmpty()) {
+                binding.rvOrderOffline.visibility = View.VISIBLE
+                binding.noDataText.visibility = View.GONE
+                val bm =
+                    requireContext().getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+                val batLevel: Int = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
+                adapter = OfflineUserListAdapter(binding.root, batLevel)
+                adapter.differ.submitList(userData)
+                binding.rvOrderOffline.adapter = adapter
+            }else{
+                binding.rvOrderOffline.visibility = View.GONE
+                binding.noDataText.visibility = View.VISIBLE
+                Log.d("Activities","Nothing to show")
+            }
+        }
+    }
+
+}
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
@@ -1,11 +1,10 @@
 package com.example.hpostesting.presentation.dashboard

-import android.app.DownloadManager
-import android.content.BroadcastReceiver
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
 import android.content.SharedPreferences
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -21,23 +20,21 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.NatsManager
+import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
+import com.example.hpostesting.presentation.utils.NatsManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.jig.JigActivity
 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.firestore.ktx.firestore
-import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.AndroidEntryPoint
+import `in`.sminnovations.hpostesting.BuildConfig
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
-import okhttp3.ResponseBody
 import java.io.File

 interface NatsMessageCallback {
@@ -53,7 +50,7 @@ open interface IDataCollector: NatsMessageCallback {
 class DashboardActivity : AppCompatActivity(), IDataCollector {

    val TAG = "DashboardActivity"
-    private var isRegistered= false
+    private var isRegistered = false
    private lateinit var appBarConfiguration: AppBarConfiguration
    private lateinit var binding: ActivityDashboardBinding
    lateinit var sharedPreferences: SharedPreferences
@@ -62,7 +59,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
    private var downloadId: Long = 0
    // TODO: Remove hemocube viewmodel
    private val hemocubeViewModel: HemoCubeViewModel by viewModels()
-
+    private lateinit var sharedPreference: SharedPreferences
    override fun attachBaseContext(newBase: Context?) {
        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
        LanguageManager.setLocale(newBase, languageCode)
@@ -75,6 +72,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        Log.d(TAG, "Received message on topic $topic: $message")
    }

+    @SuppressLint("SetWorldReadable")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

@@ -86,6 +84,9 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            nats.connect()
        }
+        val versionName =  getAppVersion(this@DashboardActivity) + " [ " + getAppEnvironment(this@DashboardActivity) + " ]"
+        binding.appBarDashboard.versionName.text = versionName
+

        val deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "")

@@ -96,15 +97,22 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
            when (result) {
                is Result.Success -> {
                    // Handle success
-                    val apkUrl = result.data
-//                    val apkUrl = "https://dl.dropboxusercontent.com/s/fi/1c3nn7t0co431hicl3hrt/app-debug.apk?rlkey=e4uf13ty1dpcked614vy1aaqp&dl=0"
-                    initiateUpdate(apkUrl.toString())
-                    Log.d("ApI", "APK URL: $apkUrl")
-//                    Toast.makeText(
-//                        this,
-//                        "APK UPLOAD ${result.data}",
-//                        Toast.LENGTH_SHORT
-//                    ).show()
+                    val apk = result.data
+                    val file = File(getExternalFilesDir("Updates"), "update.apk")
+                    file.setReadable(true, false) // Ensure the file is readable
+                    apk.byteStream().use { input ->
+                        file.outputStream().use { output ->
+                            input.copyTo(output)
+                        }
+                    }
+                    Log.d("Responsebodyformat", "Responsebodyformat: ")
+                   installApk(file)
+                    Log.e("ApI", "APK URL: $apk")
+                    Toast.makeText(
+                        this,
+                        "${result.data}",
+                        Toast.LENGTH_SHORT
+                    ).show()
                }

                is Result.Error -> {
@@ -129,7 +137,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {

        appBarConfiguration = AppBarConfiguration(
            setOf(
-                R.id.nav_home, R.id.nav_profile, R.id.nav_settings
+                R.id.nav_home, R.id.nav_profile, R.id.nav_activity,R.id.nav_settings
            ), drawerLayout
        )
        setupActionBarWithNavController(navController, appBarConfiguration)
@@ -154,55 +162,15 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
        return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
    }

-    private fun initiateUpdate(url: String) {
-        val apkUrl = url
-        if (!isValidHttpUrl(apkUrl)) {
-            return
-        }
-
-        val request = DownloadManager.Request(Uri.parse(apkUrl))
-        request.setTitle("App Update")
-        request.setDescription("Downloading update...")
-        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-        request.setDestinationInExternalFilesDir(this, "Updates", "update.apk")
-
-        val downloadManager = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        downloadId = downloadManager.enqueue(request)
-
-        // Register a BroadcastReceiver to receive the download complete event
-        val filter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            isRegistered = true
-            registerReceiver(downloadReceiver, filter, RECEIVER_EXPORTED)
-        }
-    }
-    private fun extractApkUrl(responseBody: ResponseBody): String {
-        return responseBody.string()
-    }
-    private fun isValidHttpUrl(url: String): Boolean {
-        return url.startsWith("http://") || url.startsWith("https://")
-    }
-    private val downloadReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
-            if (id == downloadId) {
-                installApk()
-            }
-        }
-    }
-
-    private fun installApk() {
-        val file = File(getExternalFilesDir("Updates"), "update.apk")
-        file.setReadable(true, false) // Ensure the file is readable

+    private fun installApk(file: File) {
        val pInfo = baseContext.packageManager.getPackageInfo(baseContext.packageName, 0)
        val uri: Uri = FileProvider.getUriForFile(
            this,
-            "in.sminnovations.hpostesting.dev.fileprovider",
+            "${BuildConfig.APPLICATION_ID}.fileprovider",
            file
        )

-        // Create an intent to install the APK
        val installIntent = Intent(Intent.ACTION_INSTALL_PACKAGE)
        installIntent.data = uri
        installIntent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
@@ -218,14 +186,13 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
    }

    override fun onDestroy() {
-        try {
-            if (isRegistered){
-                unregisterReceiver(downloadReceiver)
+        if(isRegistered) {
+            try {
+//                unregisterReceiver(downloadReceiver)
+            } catch (e: Exception) {
+                Log.d("HomeFragment", e.toString())
            }
-        }catch (e: IllegalArgumentException){
-            Log.e("HOmeFragment",e.toString())
        }
-
        super.onDestroy()
    }

@@ -278,6 +245,30 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
    override fun setResponse(response: String) {
        responses = responses+response+"\n"
        println(responses)
-        Log.d("DashBoardActResponse",response)
+//        if (response.contains("checkUpdate")) {
+//            hemocubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
+//        }
+    }
+
+    private fun createDeviceUpdateRequestData(): DeviceUpdateRequest {
+        return DeviceUpdateRequest(
+            serial_no = sharedPreference.getString(Constants.DEVICE_ID, "")
+        )
+    }
+    private fun getAppVersion(context: Context): String {
+        return try {
+            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            pInfo.versionName
+        } catch (e: PackageManager.NameNotFoundException) {
+            "N/A"
+        }
+    }
+    private fun getAppEnvironment(context: Context): String {
+        return try {
+            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
+            pInfo.packageName.substringAfterLast('.')
+        } catch (e: PackageManager.NameNotFoundException) {
+            "N/A"
+        }
    }
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceActivity.kt
@@ -21,13 +21,13 @@ 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.api.DeviceCommunicationHandler
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
+import com.example.hpostesting.presentation.utils.UsbServiceListener
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceFragment.kt
@@ -12,7 +12,7 @@ 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.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionActivity.kt
@@ -20,13 +20,13 @@ 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.api.DeviceCommunicationHandler
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.UsbServiceListener
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.presentation.utils.DeviceCommunicationHandler
+import com.example.hpostesting.presentation.utils.UsbServiceListener
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
+import android.os.Environment
+import android.provider.Settings
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -12,16 +14,20 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.encryption.Encryption
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
+import com.google.android.gms.ads.identifier.AdvertisingIdClient
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDeviceProvisionBinding
+import java.io.File
+import java.io.FileOutputStream

 class DeviceProvisionFragment : Fragment() {
    private var resultData: String = ""
@@ -116,9 +122,16 @@ class DeviceProvisionFragment : Fragment() {
                                password = response.data.data?.credentials?.password.toString(),
                                deviceProvisionResponse = response.data.data.toString(),
                                natsToken = response.data.data?.device?.deviceUser?.natsToken.toString(),
-                                natsTokenExpiry = response.data.data?.device?.deviceUser?.natsTokenExpiry.toString()
+                                natsTokenExpiry = response.data.data?.device?.deviceUser?.natsTokenExpiry.toString(),
+                                globalUpdateIgnore = false,
+                                globalUpdateDone = false,
+                                deviceUpdateAvailable = false
                            )
                        )
+                        encryptAndSaveToFile(
+                            response.data.data?.credentials?.username.toString(),
+                            response.data.data?.credentials?.password.toString()
+                        )
 //                        viewModel.addDeviceId(DeviceData(deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()))
                        Log.e("idpass", response.toString())
                        Log.e("idpass", response.data.data?.credentials?.username.toString())
@@ -218,4 +231,25 @@ class DeviceProvisionFragment : Fragment() {
            }
        }
    }
-}
+
+    private fun encryptAndSaveToFile(username: String, password: String) {
+        val messageToEncrypt = "$username\n$password"
+        val encryptionKey =
+            Settings.Secure.getString(context?.contentResolver, Settings.Secure.ANDROID_ID)
+        val encryptedString = Encryption.encrypt(messageToEncrypt, encryptionKey)
+        Log.d("DEVICE ID/encryptionKey", encryptionKey)
+        val target = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+        val file = File(target, "credentials.txt")
+
+        if (!file.exists()) {
+            file.createNewFile()
+        }
+
+
+        file.writeText(encryptedString)
+
+        Log.d("Encrypted Message", encryptedString)
+
+    }
+}
+
--- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionViewModel.kt
@@ -3,7 +3,7 @@ package com.example.hpostesting.presentation.deviceprovision
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionRequest
 import com.example.hpostesting.data.model.deviceprovision.DeviceProvisionResponse
--- a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsActivity.kt
@@ -20,10 +20,10 @@ 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.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsFragment.kt
@@ -13,15 +13,15 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.MutableLiveData
-import com.example.hpostesting.data.Result
-import com.example.hpostesting.data.Result.Success
+import com.example.hpostesting.util.Result
+import com.example.hpostesting.util.Result.Success
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.model.devicediagnostics.AdditionalDetails
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.diagnostics.DiagnosticsData
 import com.example.hpostesting.data.model.patient.DeviceData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase
 import `in`.sminnovations.hpostesting.databinding.FragmentDiagnosticsBinding
--- a/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/diagnostics/DiagnosticsViewModel.kt
@@ -3,7 +3,7 @@ package com.example.hpostesting.presentation.diagnostics
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.model.Response
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsRequest
 import com.example.hpostesting.data.model.devicediagnostics.DeviceDiagnosticsResponse
@@ -25,7 +25,7 @@ class DiagnosticsViewModel @Inject constructor(

    val deviceData = MutableLiveData<DeviceData?>()
    val fireBaseUpload = MutableLiveData<String>()
-    val deviceDiagnosticsResponse = MutableLiveData<com.example.hpostesting.data.Result<DeviceDiagnosticsResponse>>()
+    val deviceDiagnosticsResponse = MutableLiveData<Result<DeviceDiagnosticsResponse>>()
 //    private val batteryStatus: Intent? =
 //        IntentFilter(Intent.ACTION_BATTERY_CHANGED).let { ifilter ->
 //            context.registerReceiver(null, ifilter)
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt
@@ -10,7 +10,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import `in`.sminnovations.hpostesting.databinding.FragmentDigitalCardBinding
 import java.text.SimpleDateFormat
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -4,7 +4,9 @@ import android.annotation.SuppressLint
 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
@@ -13,15 +15,15 @@ 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.Result
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.TestStatus
 import com.example.hpostesting.data.model.TestState
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
@@ -34,7 +36,10 @@ import kotlin.math.log10

@Suppress("MemberVisibilityCanBePrivate")
 class HemoCubeFragment : Fragment() {
-
+    private var checkCuvette = false
+    private var checkCuvetteSam = false
+    private var borderlineMetric = 0.0
+    private var sampleClick = false
    private lateinit var binding: FragmentHemoCubeReferenceBinding
    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
    private lateinit var sharedPreferences: SharedPreferences
@@ -110,37 +115,67 @@ class HemoCubeFragment : Fragment() {
        binding.nameEditText.visibility = View.GONE
        binding.tvTitle.visibility = View.GONE
        binding.btnGo.visibility = View.GONE
-        binding.btnPlacebuffer.visibility = View.GONE
+//        binding.btnPlacebuffer.visibility = View.GONE

        binding.tvName.text = "Name: ${testDetails?.name}\n ID: ${testDetails?._id}"
        binding.tvSubtitle4.text = "Config"

-        binding.btnSamplestart.setOnClickListener {
-            activity?.runOnUiThread {
-                binding.tvSubtitle4.visibility = View.VISIBLE
-//                binding.tvSubtitle4.text = "Sample Started"
+
+        if (isBufferValueAvailable()) {
+            binding.btnPlacebuffer.apply {
+                setBackgroundColor(Color.GREEN) // Set button background color to green
+                text = "Fresh Buffer" // Change button text to "Buffer Exists"
+            }
+        }else{
+            binding.btnPlacebuffer.apply {
+                setBackgroundColor(Color.RED) // Set button background color to green
+                text = "No Buffer" // Change button text to "Buffer Exists"
            }
-            startSampleProcess()
-            it.visibility = View.GONE
        }

-        binding.btnPlacebuffer.setOnClickListener {
-            if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
-                showBufferAlertDialog()
-            } else {
+
+        binding.btnSamplestart.setOnClickListener {
+            sampleClick = true
+           // if(checkCuvetteSam){
                activity?.runOnUiThread {
                    binding.tvSubtitle4.visibility = View.VISIBLE
-//                    binding.tvSubtitle4.text = "Buffer Started"
+//                binding.tvSubtitle4.text = "Sample Started"
                }
+                startSampleProcess()
+//                it.visibility = View.GONE
+//            }else{
+//                checkCuvettePresence()
+//            }
+        }
+        binding.btnRetryCheckCuvette.setOnClickListener {
+
+            checkCuvettePresence()
+        }
+        binding.btnPlacebuffer.setOnClickListener {
+          //  if(checkCuvette){
+
+                startBufferProcess()
+//                if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
+////                    showBufferAlertDialog()
+//                } else {
+                    activity?.runOnUiThread {
+                        binding.tvSubtitle4.visibility = View.VISIBLE
+//                    binding.tvSubtitle4.text = "Buffer Started"
+                    }
+
+                    //  checkAndStartProcess()
+
+//                    it.visibility = View.GONE
+//                }
+//            }else{
+//                checkCuvettePresence()
+//            }

-                checkAndStartProcess()
-                it.visibility = View.GONE
-            }
        }

        if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
            activity?.runOnUiThread {
-                binding.tvDeviceMessages.visibility = View.VISIBLE
+                binding.tvDeviceMessages.visibility = View.GONE
            }
        }
    }
@@ -149,6 +184,7 @@ class HemoCubeFragment : Fragment() {
        hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
            if (result == "Success") {
                uploadedToCloud = true
+                var accessToken = sharedPreferences.getString(Constants.ACCESS_TOKEN, "").toString()
                showToast(R.string.test_upload)
                if (Constants.MOLBIO_INTEGRATION) {
                    hemoCubeViewModel.resultUpload.observe(viewLifecycleOwner) {
@@ -161,6 +197,8 @@ class HemoCubeFragment : Fragment() {
                                    )
                                }
                                handleReadingFinish()
+                                hemoCubeViewModel.uploadLogs()
+                                hemoCubeViewModel.downloadClientCertificate()
                            }

                            is Result.Error -> {
@@ -169,10 +207,11 @@ class HemoCubeFragment : Fragment() {
                                it.exception.let { message ->
                                    Toast.makeText(
                                        activity,
-                                        "An error occurred: $message",
+                                        "$message",
                                        Toast.LENGTH_LONG
                                    )
                                        .show()
+                                    Log.d("resultuploadfail1", message.toString())
                                }
                                handleReadingFinish()
                            }
@@ -256,9 +295,9 @@ class HemoCubeFragment : Fragment() {
        currentResultData = ""
    }

-    private fun checkAndStartProcess() {
-        startBufferProcess()
-    }
+//    private fun checkAndStartProcess() {
+//        startBufferProcess()
+//    }

    private fun isBufferValueAvailable(): Boolean {
        return try {
@@ -309,7 +348,7 @@ class HemoCubeFragment : Fragment() {

                override fun onClickPositiveButton() {
                    activity?.runOnUiThread {
-                        binding.btnPlacebuffer.visibility = View.GONE
+//                        binding.btnPlacebuffer.visibility = View.GONE
                        binding.btnSamplestart.visibility = View.VISIBLE
                        binding.tvSubtitle4.text = getString(R.string.place_sample)
                    }
@@ -386,7 +425,7 @@ class HemoCubeFragment : Fragment() {
        resultData += stringData
        currentResultData += stringData
        hemoCubeViewModel.deviceMessages.postValue(currentResultData)
-
+        Log.e("testStatus",this.testStatusCode.toString())
        when {
            resultData.contains("SNE") && this.testStatusCode < TestStatus.CONFIG_COMPLETED.code -> {
                processV2HardwareId(resultData)
@@ -413,20 +452,62 @@ class HemoCubeFragment : Fragment() {
            (resultData.contains("#RC") && this.testStatusCode < TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code) -> {
                this.testStatusCode = TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code
                hemoCubeViewModel.messages.postValue("EPROM ADC Loaded")
-                showStartBufferButton()
+                //checkCuvettePresence()
+            }
+            resultData.contains("#CIN") && sampleClick && this.testStatusCode < TestStatus.CUVETTE_PRESENTS.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
+                this.testStatusCode = TestStatus.CUVETTE_PRESENTS.code
+                activity?.runOnUiThread {
+                    checkCuvetteSam = true
+                    binding.btnRetryCheckCuvette.visibility = View.GONE
+                    binding.btnPlacebuffer.visibility = View.GONE
+                    binding.btnSamplestart.visibility = View.VISIBLE
+                }
+            }
+            resultData.contains("#AIN") && sampleClick && this.testStatusCode <= TestStatus.CUVETTE_ABSENTS.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
+                this.testStatusCode = TestStatus.CUVETTE_ABSENTS.code
+                showRetryButtonForCuvette()
            }

+            resultData.contains("#CIN") && this.testStatusCode < TestStatus.CUVETTE_PRESENT.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
+                this.testStatusCode = TestStatus.CUVETTE_PRESENT.code
+                activity?.runOnUiThread {
+                    checkCuvette = true
+                    binding.btnRetryCheckCuvette.visibility = View.GONE
+                    binding.btnPlacebuffer.visibility = View.VISIBLE
+                    binding.btnSamplestart.visibility = View.VISIBLE
+                }
+            }
+            resultData.contains("#AIN") && this.testStatusCode <= TestStatus.CUVETTE_ABSENT.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
+                this.testStatusCode = TestStatus.CUVETTE_ABSENT.code
+                showRetryButtonForCuvette()
+            }
            resultData.contains("#BS") && this.testStatusCode < TestStatus.BUFFER_STARTED.code -> {
                hemoCubeViewModel.messages.postValue(getString(R.string.buffer_started))
                this.testStatusCode = TestStatus.BUFFER_STARTED.code
+                activity?.runOnUiThread {
+                    binding.btnPlacebuffer.visibility = View.GONE
+                    binding.btnSamplestart.isClickable = false
+                    binding.btnSamplestart.isEnabled = false
+                }
            }

            resultData.contains("#BC") && this.testStatusCode < TestStatus.BUFFER_COMPLETED.code -> {
-                this.testStatusCode = TestStatus.BUFFER_COMPLETED.code
                activity?.runOnUiThread {
+                    resultData = ""
+                   // resultData.replace("#AIN","#BAIN",false)
+                    Log.d("resultDataBC",resultData)
                    binding.tvSubtitle4.text = getString(R.string.buffer_completed)
-                    binding.btnSamplestart.visibility = View.VISIBLE
+//                    binding.btnSamplestart.visibility = View.VISIBLE
+                    binding.btnPlacebuffer.visibility = View.GONE
+                    binding.btnSamplestart.isClickable = true
+                    binding.btnSamplestart.isEnabled = true
                }
+                this.testStatusCode = TestStatus.BUFFER_COMPLETED.code
+
            }

            (resultData.contains("#SS") || resultData.contains("#SS1")) && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> {
@@ -434,11 +515,15 @@ class HemoCubeFragment : Fragment() {
                activity?.runOnUiThread {
                    binding.tvSubtitle4.text = getString(R.string.sample_started)
                    binding.btnSamplestart.visibility = View.GONE
+                    binding.btnPlacebuffer.visibility = View.GONE
                }
            }

            (resultData.contains("#SC") || resultData.contains("#SC1")) && this.testStatusCode < TestStatus.SAMPLE_COMPLETED.code -> {
                this.testStatusCode = TestStatus.SAMPLE_COMPLETED.code
+                activity?.runOnUiThread {
+                    binding.btnSamplestart.visibility = View.GONE
+                }
                hemoCubeViewModel.messages.postValue(
                    getString(R.string.sample_completed) + "\n" + getString(R.string.gathering_data)
                )
@@ -595,6 +680,15 @@ class HemoCubeFragment : Fragment() {
        }
    }

+    private fun showRetryButtonForCuvette() {
+        activity?.runOnUiThread {
+//            binding.btnPlacebuffer.visibility = View.GONE
+            binding.btnRetryCheckCuvette.visibility = View.VISIBLE
+            binding.btnPlacebuffer.visibility = View.GONE
+            binding.btnSamplestart.visibility = View.GONE
+        }
+    }
+
    fun finishReading() {
        repeatReadingCount += 1
        isTestOngoing = false
@@ -681,9 +775,20 @@ class HemoCubeFragment : Fragment() {

    fun showStartBufferButton() {
        activity?.runOnUiThread {
+            binding.btnRetryCheckCuvette.visibility = View.GONE
+
            binding.btnPlacebuffer.visibility = View.VISIBLE
        }
-        hemoCubeViewModel.messages.postValue(getString(R.string.start))
+//        hemoCubeViewModel.messages.postValue(getString(R.string.start))
+    }
+
+    fun showStartSampleButton() {
+        activity?.runOnUiThread {
+            binding.btnRetryCheckCuvette.visibility = View.GONE
+
+            binding.btnSamplestart.visibility = View.VISIBLE
+        }
+//        hemoCubeViewModel.messages.postValue(getString(R.string.start))
    }

    fun extractV1HardwareId(input: String): String? {
@@ -764,9 +869,17 @@ class HemoCubeFragment : Fragment() {
            val led2Average = log10(led2BufferForDevice.div(led2SampleForDevice))
            val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice))
            val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice))
-            val deviceRatio = led2Average / led1Average
-            val borderlineMetric = (led1Average - led2Average) / deviceRatio
+            //used for latest trueheme and v1
+            val deviceRatio: Double
+            if(Constants.DEVICE_VERSION_TYPE == "V0"){
+                //used for latest v0 devices
+                 deviceRatio = led4Average / led1Average
+                borderlineMetric = (led1Average - led4Average) / deviceRatio

+            }else {
+                 deviceRatio = led2Average / led1Average
+                 borderlineMetric = (led1Average - led2Average) / deviceRatio
+            }
            if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0)
                    ?.get(0)!!
                || led2BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(
@@ -1133,13 +1246,29 @@ class HemoCubeFragment : Fragment() {
        Toast.makeText(requireContext(), getString(messageResId), Toast.LENGTH_SHORT).show()
    }

-    private fun startBufferProcess() {
-        hemoCubeViewModel.progressBar.postValue(true)
+    private fun checkCuvettePresence() {
+        Toast.makeText(requireContext(),"Please wait...",Toast.LENGTH_LONG).show()

        activity?.runOnUiThread {
-            binding.btnPlacebuffer.visibility = View.GONE
+            binding.btnRetryCheckCuvette.visibility = View.GONE
        }

+        hemoCubeViewModel.progressBar.postValue(true)
+
+        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.CHECK_CUVETTE_COMMAND,
+            object : UsbServiceListener {
+                override fun onUsbRead(data: ByteArray?) {}
+
+                override fun onUsbError(e: Exception?) {
+                    hemoCubeViewModel.progressBar.postValue(false)
+                }
+            })
+    }
+    private fun startBufferProcess() {
+        hemoCubeViewModel.progressBar.postValue(true)
+//        activity?.runOnUiThread {
+//            binding.btnPlacebuffer.visibility = View.GONE
+//        }
        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_BUFFER_COMMAND,
            object : UsbServiceListener {
                override fun onUsbRead(data: ByteArray?) {}
@@ -1151,16 +1280,17 @@ class HemoCubeFragment : Fragment() {
    }

    private fun startSampleProcess() {
-        hemoCubeViewModel.progressBar.postValue(true)
+            hemoCubeViewModel.progressBar.postValue(true)

-        (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_SAMPLE,
-            object : UsbServiceListener {
-                override fun onUsbRead(data: ByteArray?) {}
+            (activity as HemocubeActivity).mService.sendAndListenToHemoCube(HemoCubeCommands.START_SAMPLE,
+                object : UsbServiceListener {
+                    override fun onUsbRead(data: ByteArray?) {}
+
+                    override fun onUsbError(e: Exception?) {
+                        hemoCubeViewModel.progressBar.postValue(false)
+                    }
+                })

-                override fun onUsbError(e: Exception?) {
-                    hemoCubeViewModel.progressBar.postValue(false)
-                }
-            })
    }

    private fun sendFirstGainCommand() {
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
@@ -12,10 +12,10 @@ import androidx.lifecycle.viewModelScope
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import com.example.hpostesting.data.CsvWriter
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.CsvWriter
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.NetworkStatusLiveData
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
@@ -38,6 +38,7 @@ import com.example.hpostesting.data.repository.Repository
 import com.example.hpostesting.domain.CheckUpdateWorker
 import com.example.hpostesting.domain.LogFileManager
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
@@ -88,7 +89,8 @@ class HemoCubeViewModel @Inject constructor(

    private val _networkStatusLiveData = NetworkStatusLiveData(context)
    val allUserData = hemoCubeDao.getAll()
-    val allPendingUserToUpload = MutableLiveData<List<HemoCubeTestData>>()
+    val allLocalData = hemoCubeDao.getAll()
+    val allPendingUserToUpload = hemoCubeDao.getPendingUser()
    val allKitTestData = hemoCubeBufferDao.getAll()
    val deviceData = MutableLiveData<DeviceData?>()

@@ -111,7 +113,7 @@ class HemoCubeViewModel @Inject constructor(
            testDetails?.kitSerial = kitSerial
        }
        testDetails?.testStatus = testStatus
-
+       // localFileDataSource.backUpDataToCSV("",testDetails)
        try {
            if (isOnline) {
                parseData()
@@ -143,6 +145,98 @@ class HemoCubeViewModel @Inject constructor(
        }
    }

+
+    fun uploadResultfornew(molbioV2ResultRequest: MolbioV2ResultRequest) = viewModelScope.launch {
+        resultUpload.postValue(Result.Loading())
+        repository.uploadResults(molbioV2ResultRequest).let {
+            resultUpload.postValue(it)
+        }
+    }
+
+
+    fun sendDataToMolbio() = viewModelScope.launch(Dispatchers.IO) {
+
+        Log.d("molbio","getting in sendMolbio")
+        val resultList = MolbioV2ResultRequest(mutableListOf())
+        val pendingData = hemoCubeDao.getMolbioPending()
+        Log.d("molbio","pending size"+pendingData.size)
+        pendingData.forEach { userData ->
+            if (userData.testStatus == true) {
+                val currentTimeFormatted = SimpleDateFormat(
+                    "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
+                    Locale.getDefault()
+                ).format(Calendar.getInstance().time)
+                val bufferIntensityThreshold =
+                    Constants.BUFFER_INTENSITY_THRESHOLDS[userData.deviceId]?.toString()
+                        ?: "defaultThreshold" // Handle possible nulls safely
+                resultList.results?.add(
+                    MolbioV2Result(
+                        rawData = userData,
+                        analysisId = userData._id,
+                        analysisDate = currentTimeFormatted,
+                        analysisStatus = userData.classificationResult
+                            ?: "defaultStatus", // Handle possible nulls
+                        thresholds = bufferIntensityThreshold,
+                        interpretation = userData.classificationResult
+                            ?: "defaultInterpretation", // Handle possible nulls
+                        testId = userData._id,
+                        testTime = currentTimeFormatted,
+                        collectionTime = currentTimeFormatted,
+                        expiryTime = currentTimeFormatted
+                    )
+                )
+            }
+        }
+
+        resultList.results?.forEach { result ->
+            result.rawData?.let { sanitizeDoubleValues(it) }
+        }
+
+        if (resultList.results?.isNotEmpty() == true) {
+            uploadMoblioBulkResults(resultList)
+        }
+    }
+
+
+    fun uploadMoblioBulkResults(molbioV2ResultRequest: MolbioV2ResultRequest) = viewModelScope.launch {
+        Log.d("molbio","upload called")
+        repository.uploadResults(molbioV2ResultRequest).let {
+            when (it) {
+                is Result.Success -> {
+                    it.data.data?.forEach { id ->
+                        id.rawData?.let { it1 ->
+                            updateMolbioFlag(
+                                it1._id
+                            )
+                        }
+                    }
+                }
+                is Result.Error -> {
+                    Log.d("result","result upload error")
+                }
+                else -> {
+                    Log.d("result","result upload else")
+                }
+            }
+        }
+    }
+
+
+    fun sendDataToFirebase() = viewModelScope.launch ( Dispatchers.IO ) {
+        val pendingData = hemoCubeDao.getFirebasePending()
+        pendingData.forEach{
+                userData ->
+            if (userData != null) {
+                if (!userData.localFlag && userData.testStatus == true) {
+                    bulkAddResultTestToDb(userData)
+                }
+            }
+        }
+
+    }
+
+
+
    fun checkUpdate(checkUpdateRequest: CheckUpdateRequest) = viewModelScope.launch {
        checkUpdate.postValue(Result.Loading())
        repository.checkUpdate(checkUpdateRequest).let {
@@ -187,9 +281,9 @@ class HemoCubeViewModel @Inject constructor(
            }
        }
    }
-    fun uploadPendingUser() = viewModelScope.launch {
-        allPendingUserToUpload.postValue(hemoCubeDao.getPendingUser(false))
-    }
+//    fun getPendingUser() = viewModelScope.launch {
+//        allPendingUserToUpload.postValue(hemoCubeDao.getPendingUser(true))
+//    }

    fun uploadHemoCubeResultToDatabaseForBufferCheck(
        isOnline: Boolean,
@@ -305,6 +399,8 @@ class HemoCubeViewModel @Inject constructor(
        testDetails?.solution = DataHolder.hemoCubeTestData?.solution
        testDetails?.concentration = DataHolder.hemoCubeTestData?.concentration
        testDetails?.volume = DataHolder.hemoCubeTestData?.volume
+        testDetails?.filter = DataHolder.hemoCubeTestData?.filter
+
    }

    private fun addResultTestToDb() {
@@ -325,20 +421,24 @@ class HemoCubeViewModel @Inject constructor(
                        fireBaseUpload.postValue("Success")
                        testDetails.localFlag = true
                        if (Constants.MOLBIO_INTEGRATION) {
+                            // Sanitize testDetails before using it in the API call
+                            val sanitizedTestDetails = sanitizeDoubleValues(testDetails)
+
+                            // Now, use sanitizedTestDetails for the API call
                            uploadResult(
                                MolbioV2ResultRequest(
                                    mutableListOf(
                                        MolbioV2Result(
-                                            rawData = testDetails,
-                                            analysisId = testDetails._id,
-                                            analysisDate = testDetails.testTime,
-                                            analysisStatus = testDetails.classificationResult,
-                                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[testDetails.deviceId].toString(),
-                                            interpretation = testDetails.classificationResult,
-                                            testId = testDetails._id,
-                                            testTime = testDetails.testTime,
-                                            collectionTime = testDetails.testTime,
-                                            expiryTime = testDetails.testTime,
+                                            rawData = sanitizedTestDetails,
+                                            analysisId = sanitizedTestDetails._id,
+                                            analysisDate = sanitizedTestDetails.testTime,
+                                            analysisStatus = sanitizedTestDetails.classificationResult,
+                                            thresholds = Constants.BUFFER_INTENSITY_THRESHOLDS[sanitizedTestDetails.deviceId]?.toString(),
+                                            interpretation = sanitizedTestDetails.classificationResult,
+                                            testId = sanitizedTestDetails._id,
+                                            testTime = sanitizedTestDetails.testTime,
+                                            collectionTime = sanitizedTestDetails.testTime,
+                                            expiryTime = sanitizedTestDetails.testTime,
                                        )
                                    )
                                )
@@ -380,6 +480,19 @@ class HemoCubeViewModel @Inject constructor(
        }
    }

+    fun sanitizeDoubleValues(hemoCubeTestData: HemoCubeTestData): HemoCubeTestData {
+        hemoCubeTestData::class.java.declaredFields.forEach { field ->
+            if (field.type == Double::class.javaObjectType || field.type == Double::class.javaPrimitiveType) {
+                field.isAccessible = true
+                val value = field.get(hemoCubeTestData) as Double?
+                if (value != null && (value.isInfinite() || value.isNaN())) {
+                    field.set(hemoCubeTestData, 0.0) // Replace with a suitable default value
+                }
+            }
+        }
+        return hemoCubeTestData
+    }
+
    private fun updateLocalFlag(userId: String) = viewModelScope.launch {
        hemoCubeDao.updateFieldById(id = userId, true)
    }
@@ -533,7 +646,7 @@ class HemoCubeViewModel @Inject constructor(
            val fileName = "HPOS${getCurrentDate()}.csv"
            if (localFileDataSource.exportDataToCSV(fileName, hemoCubeTestData)) {
                hemoCubeTestData.forEach { data ->
-                    data.localFlag = true
+                   // data.localFlag = true
                    hemoCubeDao.updateCSVFieldById(
                        data._id,
                        true
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt
@@ -11,19 +11,21 @@ import android.content.ServiceConnection
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbDeviceConnection
 import android.hardware.usb.UsbManager
+import android.os.Build
 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.annotation.RequiresApi
 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.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
@@ -43,6 +45,7 @@ open class HemocubeActivity : AppCompatActivity() {
    private val TAG = "HemoCube"

    private val broadcastReceiver = object : BroadcastReceiver() {
+        @RequiresApi(Build.VERSION_CODES.O)
        override fun onReceive(context: Context, intent: Intent) {

            synchronized(this) {
@@ -82,6 +85,7 @@ open class HemocubeActivity : AppCompatActivity() {
        super.attachBaseContext(newBase)
    }

+    @RequiresApi(Build.VERSION_CODES.O)
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        binding = ActivityHemocubeBinding.inflate(layoutInflater)
@@ -106,6 +110,7 @@ open class HemocubeActivity : AppCompatActivity() {
        }
    }

+    @RequiresApi(Build.VERSION_CODES.O)
    open fun connectUsb(permissionGranted: Boolean) {
        Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted")
        val manager = getSystemService(Context.USB_SERVICE) as UsbManager
@@ -125,6 +130,7 @@ open class HemocubeActivity : AppCompatActivity() {
        }
    }

+    @RequiresApi(Build.VERSION_CODES.O)
    @SuppressLint("MutableImplicitPendingIntent")
    private fun requestUserPermission(manager: UsbManager, device: UsbDevice) {
        val mPendingIntent: PendingIntent
@@ -142,15 +148,21 @@ open class HemocubeActivity : AppCompatActivity() {
        }

        val filter = IntentFilter(Constants.HEMOCUBE_USB_PERMISSION)
-        registerReceiver(broadcastReceiver, filter)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerReceiver(broadcastReceiver, filter, RECEIVER_EXPORTED)
+        }else{
+            registerReceiver(broadcastReceiver, filter)
+        }
        manager.requestPermission(device, mPendingIntent)
    }

+
    fun setupService() {
        val intent = Intent(this, UsbService::class.java)
        bindService(intent, connection, Context.BIND_AUTO_CREATE)
    }

+    @RequiresApi(Build.VERSION_CODES.O)
    open fun reconnectDevice() {
        mService.disconnect()
        unbindService(connection)
--- a/app/src/main/java/com/example/hpostesting/presentation/jig/JigActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/jig/JigActivity.kt
@@ -21,10 +21,10 @@ 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.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightActivity.kt
@@ -19,8 +19,9 @@ 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.DataHolder
 import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
@@ -132,7 +133,7 @@ class TestRightActivity : AppCompatActivity() {
                this,
                0,
                Intent(Constants.ACTION_USB_PERMISSION),
-                PendingIntent.FLAG_MUTABLE
+                PendingIntent.FLAG_IMMUTABLE
            )
        } else {
            mPendingIntent = PendingIntent.getBroadcast(
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpReference.kt
@@ -10,11 +10,11 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.TestRightCommands
 import com.example.hpostesting.data.model.ErrorMessage
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightExpSample.kt
@@ -10,13 +10,13 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.TestRightCommands
 import com.example.hpostesting.data.model.ErrorMessage
 import com.example.hpostesting.data.model.test.TestType
 import com.example.hpostesting.presentation.MainActivity
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.utils.MyDialogListener
 import com.example.hpostesting.presentation.utils.UIUtils
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightResults.kt
@@ -11,7 +11,7 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.test.TestRightResultType
 import com.example.hpostesting.data.model.test.TestType
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt
@@ -5,8 +5,8 @@ import android.net.Uri
 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.DataHolder
+import com.example.hpostesting.util.NetworkStatusLiveData
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.UserDao
 import com.example.hpostesting.data.model.CalculationVariableForTest
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeActivity.kt
@@ -20,12 +20,12 @@ 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.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.LanguageManager
 import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
-import com.example.hpostesting.presentation.testRight.UsbService
+import com.example.hpostesting.util.UsbService
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialProber
 import dagger.hilt.android.AndroidEntryPoint
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeFragment.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -13,15 +14,15 @@ 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.Result
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.constant.HemoCubeCommands
 import com.example.hpostesting.data.constant.TestStatus
 import com.example.hpostesting.data.model.TestState
 import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.toHemoCubeTestData
-import com.example.hpostesting.presentation.UsbServiceListener
+import com.example.hpostesting.presentation.utils.UsbServiceListener
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import com.example.hpostesting.presentation.utils.MyDialogListener
@@ -1155,6 +1156,8 @@ class TrueHemeFragment : Fragment() {
    }

    private fun reconnect() {
-        (activity as HemocubeActivity).reconnectDevice()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            (activity as HemocubeActivity).reconnectDevice()
+        }
    }
 }
--- a/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeViewModel.kt
@@ -12,10 +12,10 @@ import androidx.lifecycle.viewModelScope
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import com.example.hpostesting.data.CsvWriter
-import com.example.hpostesting.data.DataHolder
-import com.example.hpostesting.data.NetworkStatusLiveData
-import com.example.hpostesting.data.Result
+import com.example.hpostesting.util.CsvWriter
+import com.example.hpostesting.data.constant.DataHolder
+import com.example.hpostesting.util.NetworkStatusLiveData
+import com.example.hpostesting.util.Result
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.dao.HemoCubeBufferDao
 import com.example.hpostesting.data.dao.HemoCubeDao
--- a/app/src/main/java/com/example/hpostesting/presentation/utils/DeviceCommunicationHandler.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/utils/DeviceCommunicationHandler.kt
@@ -1,12 +1,6 @@
-package com.example.hpostesting.data.api
+package com.example.hpostesting.presentation.utils

 import com.example.hpostesting.data.constant.HemoCubeCommands
-import com.example.hpostesting.presentation.UsbServiceListener
-
-interface PropertyProvider {
-
-    fun getProperty(key: String): String
-}

 interface DeviceCommunicationHandler {
    fun sendAndListenToDevice(command: HemoCubeCommands, listener: UsbServiceListener)
--- a/app/src/main/java/com/example/hpostesting/presentation/utils/NatsManager.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/utils/NatsManager.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.presentation
+package com.example.hpostesting.presentation.utils

 import android.content.Context
 import android.os.Build
--- a/app/src/main/java/com/example/hpostesting/presentation/utils/UsbServiceListener.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/utils/UsbServiceListener.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.presentation
+package com.example.hpostesting.presentation.utils

 interface UsbServiceListener {
    fun onUsbRead(data: ByteArray?)
--- a/app/src/main/java/com/example/hpostesting/presentation/utils/UsbServiceListenerImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/utils/UsbServiceListenerImpl.kt
@@ -1,8 +1,9 @@
-package com.example.hpostesting.presentation
+package com.example.hpostesting.presentation.utils

 import android.content.Context
 import android.util.Log
 import android.widget.Toast
+import com.example.hpostesting.presentation.utils.UsbServiceListener

 class UsbServiceListenerImpl(private val context: Context): UsbServiceListener {
    override fun onUsbRead(data: ByteArray?) {
--- a/app/src/main/java/com/example/hpostesting/test.kt
+++ b/app/src/main/java/com/example/hpostesting/test.kt
@@ -1,11 +0,0 @@
-package com.example.hpostesting
-
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-fun main(){
-    val dateFormat = SimpleDateFormat("MM:HHddMMyyyy", Locale.getDefault())
-    val currentDate = Date()
-    print(dateFormat.format(currentDate))
-}
--- a/app/src/main/java/com/example/hpostesting/util/CsvWriter.kt
+++ b/app/src/main/java/com/example/hpostesting/util/CsvWriter.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util

 import android.content.Context
 import android.os.Environment
--- a/app/src/main/java/com/example/hpostesting/data/InternetConnectionLiveData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/InternetConnectionLiveData.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util


 import android.content.Context
--- a/app/src/main/java/com/example/hpostesting/util/PreferenceUtility.kt
+++ b/app/src/main/java/com/example/hpostesting/util/PreferenceUtility.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util

 import android.content.Context
 import android.content.SharedPreferences
--- a/app/src/main/java/com/example/hpostesting/util/PropertyProvider.kt
+++ b/app/src/main/java/com/example/hpostesting/util/PropertyProvider.kt
@@ -0,0 +1,7 @@
+package com.example.hpostesting.util
+
+interface PropertyProvider {
+
+    fun getProperty(key: String): String
+}
+
--- a/app/src/main/java/com/example/hpostesting/util/PropertyProviderImpl.kt
+++ b/app/src/main/java/com/example/hpostesting/util/PropertyProviderImpl.kt
@@ -1,7 +1,6 @@
 package com.example.hpostesting.util

 import android.content.res.AssetManager
-import com.example.hpostesting.data.api.PropertyProvider
 import java.io.InputStream
 import java.util.Properties

--- a/app/src/main/java/com/example/hpostesting/util/Result.kt
+++ b/app/src/main/java/com/example/hpostesting/util/Result.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.data
+package com.example.hpostesting.util

 sealed class Result<out T : Any> {
    data class Success<out T : Any>(val data: T) : Result<T>()
--- a/app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/UsbService.kt
@@ -1,4 +1,4 @@
-package com.example.hpostesting.presentation.testRight
+package com.example.hpostesting.util

 import android.app.Service
 import android.content.Intent
@@ -9,7 +9,7 @@ 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.example.hpostesting.presentation.utils.UsbServiceListener
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import com.hoho.android.usbserial.driver.UsbSerialPort
 import com.hoho.android.usbserial.util.SerialInputOutputManager
--- a/app/src/main/res/drawable/baground_auto_dac.xml
+++ b/app/src/main/res/drawable/baground_auto_dac.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/card_blue_app" />
-            <corners android:radius="20dp" />
-        </shape>
-    </item>
-</selector>
--- a/app/src/main/res/drawable/baseline_logout_24.xml
+++ b/app/src/main/res/drawable/baseline_logout_24.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FF1010" android:viewportHeight="24"
+    android:tint="#EF0A0A" android:viewportHeight="24"
    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M17,7l-1.41,1.41L18.17,11H8v2h10.17l-2.58,2.58L17,17l5,-5zM4,5h8V3H4c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h8v-2H4V5z"/>
 </vector>
--- a/app/src/main/res/drawable/baseline_qr_code_scanner_24_x.png
+++ b/app/src/main/res/drawable/baseline_qr_code_scanner_24_x.png
--- a/app/src/main/res/drawable/bloodgroup_button.xml
+++ b/app/src/main/res/drawable/bloodgroup_button.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="15dp" />
-    <solid android:color="#D7FF0000" />
-</shape>
--- a/app/src/main/res/drawable/border.xml
+++ b/app/src/main/res/drawable/border.xml
@@ -3,8 +3,7 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    tools:ignore="ExtraText">
    <solid android:color="@android:color/transparent" />
-    <corners android:radius="10dp" />
    <stroke
        android:color="#000000"
-    android:width="1dp" />
+    android:width="2dp" />
 </shape>
--- a/app/src/main/res/drawable/button_new.xml
+++ b/app/src/main/res/drawable/button_new.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorControlHighlight">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
-            <corners android:radius="20dp" />
-            <stroke android:color="@color/red" android:width="1dp" />
-        </shape>
-    </item>
-</ripple>
--- a/app/src/main/res/drawable/pannel_button.xml
+++ b/app/src/main/res/drawable/pannel_button.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Drop Shadow -->
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#4D000000" /> <!-- Semi-transparent black color -->
-            <corners android:radius="20dp" />
-        </shape>
-    </item>
-
-    <!-- Original Shape with Blue Color -->
-    <item android:top="5dp" android:right="5dp" android:left="5dp" android:bottom="5dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/card_blue_app" />
-            <corners android:radius="20dp" />
-        </shape>
-    </item>
-</layer-list>
--- a/app/src/main/res/drawable/rounded_corner_background.xml
+++ b/app/src/main/res/drawable/rounded_corner_background.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-        <solid android:color="@color/new_blue" />
-        <corners android:radius="10dp" /> <!-- Adjust the radius as needed -->
-    </shape>
--- a/app/src/main/res/drawable/shows_activity_24.xml
+++ b/app/src/main/res/drawable/shows_activity_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
+    
+</vector>
--- a/app/src/main/res/layout/activity_buffer_check.xml
+++ b/app/src/main/res/layout/activity_buffer_check.xml
@@ -15,7 +15,7 @@
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            android:background="?attr/colorPrimary"
-            app:titleTextColor="@color/blue_text_color"
+            app:titleTextColor="#FFFFFF"
            android:elevation="4dp"
            app:menu="@menu/my_menu"
            android:theme="@style/ToolbarTheme"
--- a/app/src/main/res/layout/activity_dashboard.xml
+++ b/app/src/main/res/layout/activity_dashboard.xml
@@ -19,7 +19,6 @@
        android:layout_gravity="start"
        android:fitsSystemWindows="true"
        app:headerLayout="@layout/nav_header_dashboard"
-        app:menu="@menu/activity_main_drawer"
-        app:itemIconTint="@color/blue_text_color" />
+        app:menu="@menu/activity_main_drawer" />

 </androidx.drawerlayout.widget.DrawerLayout>
--- a/app/src/main/res/layout/activity_hemocube.xml
+++ b/app/src/main/res/layout/activity_hemocube.xml
@@ -13,7 +13,7 @@
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            android:background="?attr/colorPrimary"
-            app:titleTextColor="@color/blue_text_color"
+            app:titleTextColor="#FFFFFF"
            android:elevation="4dp"
            app:menu="@menu/my_menu"
            android:theme="@style/ToolbarTheme"
--- a/app/src/main/res/layout/activity_kit_scan.xml
+++ b/app/src/main/res/layout/activity_kit_scan.xml
@@ -3,8 +3,7 @@
    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=".presentation.KitScanActivity">
+    android:layout_height="match_parent">

    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/app_bar_layout"
@@ -32,7 +31,6 @@
        android:layout_marginHorizontal="24dp"
        android:layout_marginTop="16dp"
        android:text="@string/scan_qr_code_of_the_kit"
-        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/app_bar_layout" />

@@ -41,12 +39,11 @@
        android:layout_width="258dp"
        android:layout_height="56dp"
        android:layout_margin="24dp"
-        android:drawableLeft="@drawable/baseline_qr_code_scanner_24_x"
+        android:drawableLeft="@drawable/baseline_qr_code_scanner_24"
        android:text="@string/scan_now"
        android:textColor="@color/black"
        app:backgroundTint="@color/blue_app_light"
        app:cornerRadius="100dp"
-        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/tv_title" />

@@ -77,7 +74,7 @@
            android:layout_centerVertical="true"
            android:layout_marginLeft="16dp"
            android:layout_toLeftOf="@id/tvText1"
-            android:background="@color/red" />
+            android:background="@color/gray" />

        <View
            android:layout_width="match_parent"
@@ -85,7 +82,7 @@
            android:layout_centerVertical="true"
            android:layout_marginRight="16dp"
            android:layout_toRightOf="@id/tvText1"
-            android:background="@color/red" />
+            android:background="@color/gray" />

    </RelativeLayout>

@@ -98,7 +95,6 @@
        android:layout_marginHorizontal="24dp"
        android:layout_marginTop="48dp"
        android:text="@string/enter_kit_serial_number_manually"
-        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/seperator1" />

@@ -124,15 +120,13 @@

    </com.google.android.material.textfield.TextInputLayout>

-    <androidx.appcompat.widget.AppCompatButton
+    <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"
-        android:textColor="@color/red"
-        android:background="@drawable/button_new"
        app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="1.0"
--- a/app/src/main/res/layout/activity_scanner_kit_actvity.xml
+++ b/app/src/main/res/layout/activity_scanner_kit_actvity.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.budiyev.android.codescanner.CodeScannerView
+        android:id="@+id/scanner_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:autoFocusButtonColor="@android:color/white"
+        app:autoFocusButtonVisible="true"
+        app:flashButtonColor="@android:color/white"
+        app:flashButtonVisible="true"
+        app:frameColor="@android:color/white"
+        app:frameCornersSize="50dp"
+        app:frameCornersRadius="0dp"
+        app:frameAspectRatioWidth="1"
+        app:frameAspectRatioHeight="1"
+        app:frameSize="0.75"
+        app:frameThickness="2dp"
+        app:frameVerticalBias="0.5"
+        app:maskColor="#77000000"/>
+</FrameLayout>
--- a/app/src/main/res/layout/activity_scanner_kit_actvity2.xml
+++ b/app/src/main/res/layout/activity_scanner_kit_actvity2.xml
@@ -0,0 +1,9 @@
+<?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.ScannerKitActvity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/activity_test_right.xml
+++ b/app/src/main/res/layout/activity_test_right.xml
@@ -15,7 +15,7 @@
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            android:background="?attr/colorPrimary"
-            app:titleTextColor="@color/blue_text_color"
+            app:titleTextColor="#FFFFFF"
            android:elevation="4dp"
            app:menu="@menu/my_menu"
            android:theme="@style/ToolbarTheme"
--- a/app/src/main/res/layout/activity_trueheme.xml
+++ b/app/src/main/res/layout/activity_trueheme.xml
@@ -13,7 +13,7 @@
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            android:background="?attr/colorPrimary"
-            app:titleTextColor="@color/blue_text_color"
+            app:titleTextColor="#FFFFFF"
            android:elevation="4dp"
            app:menu="@menu/my_menu"
            android:theme="@style/ToolbarTheme"
--- a/app/src/main/res/layout/app_bar_dashboard.xml
+++ b/app/src/main/res/layout/app_bar_dashboard.xml
@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    tools:context=".presentation.dashboard.DashboardActivity">
+    >

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
@@ -14,10 +14,19 @@
        <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            app:titleTextColor="@color/blue_text_color"
            android:layout_height="?attr/actionBarSize"
-            android:background="@color/new_blue"
-            app:popupTheme="@style/Theme.HPOS.PopupOverlay" />
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/Theme.HPOS.PopupOverlay" >
+            <TextView
+                android:id="@+id/version_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="--"
+                android:textStyle="bold"
+                android:layout_gravity="end"
+                android:textSize="18sp"
+                android:layout_marginEnd="15dp"/>
+        </androidx.appcompat.widget.Toolbar>

    </com.google.android.material.appbar.AppBarLayout>

--- a/app/src/main/res/layout/fragment_activities.xml
+++ b/app/src/main/res/layout/fragment_activities.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    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">
+    <TextView
+        android:id="@+id/titleText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:gravity="center"
+        android:text="Upload Pending List(Local data)"
+        android:layout_marginTop="5dp"
+        android:textSize="21sp"
+        android:textColor="@color/black"
+        />
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_order_offline"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/titleText"
+        android:layout_alignParentStart="true"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/offline_user_list_view" />
+
+    <TextView
+        android:id="@+id/noDataText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="All up-to-date"
+        android:textSize="22sp"
+        android:textColor="@color/black"
+        />
+
+</RelativeLayout>
--- a/app/src/main/res/layout/fragment_assurance_controls.xml
+++ b/app/src/main/res/layout/fragment_assurance_controls.xml
@@ -39,6 +39,7 @@
    <Spinner
        android:id="@+id/spinner_solutions"
        android:layout_width="0dp"
+        android:visibility="visible"
        android:layout_height="wrap_content"
        android:layout_marginTop="40dp"
        android:background="@drawable/spinner_border"
@@ -50,6 +51,7 @@
    <Spinner
        android:id="@+id/spinner_concentration"
        android:layout_width="0dp"
+        android:visibility="visible"
        android:layout_height="wrap_content"
        android:layout_marginTop="48dp"
        android:background="@drawable/spinner_border"
@@ -59,6 +61,20 @@
        app:layout_constraintTop_toBottomOf="@id/spinner_solutions" />


+
+    <Spinner
+        android:id="@+id/spinner_admin"
+        android:layout_width="0dp"
+        android:visibility="gone"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="52dp"
+        android:background="@drawable/spinner_border"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/spinner_concentration" />
+
+
    <Spinner
        android:id="@+id/spinner_volume"
        android:layout_width="0dp"
@@ -71,7 +87,8 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/spinner_concentration" />

-    <androidx.appcompat.widget.AppCompatButton
+
+    <Button
        android:id="@+id/btn_submit"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@@ -80,9 +97,8 @@
        android:clickable="false"
        android:gravity="center"
        android:text="Continue"
-        android:textColor="@color/red"
+        android:textColor="@color/white"
        app:cornerRadius="16dp"
-        android:background="@drawable/button_new"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/et_readings_per_sample" />
--- a/app/src/main/res/layout/fragment_auto_dac.xml
+++ b/app/src/main/res/layout/fragment_auto_dac.xml
@@ -47,48 +47,41 @@
        style="@style/title1_1"
        android:layout_width="0dp"
        android:layout_height="380dp"
-        android:background="@drawable/baground_auto_dac"
        android:layout_marginHorizontal="24dp"
        android:layout_marginTop="16dp"
        android:gravity="center"
        android:text="Start"
        android:textColor="@color/black"
-        android:textSize="16sp"
+        android:textSize="11sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />


-    <androidx.appcompat.widget.AppCompatButton
+    <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:paddingRight="5dp"
-        android:paddingLeft="5dp"
-        android:background="@drawable/button_new"
        android:gravity="center"
        android:text="Start Auto DAC"
-        android:textColor="@color/red"
+        android:textColor="@color/white"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />

-    <androidx.appcompat.widget.AppCompatButton
+    <Button
        android:id="@+id/btn_read_dac"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="16dp"
-        android:paddingRight="5dp"
-        android:paddingLeft="5dp"
        android:layout_marginTop="24dp"
        android:clickable="false"
        android:gravity="center"
        android:text="Read Current DAC Values"
-        android:textColor="@color/red"
-        android:background="@drawable/button_new"
+        android:textColor="@color/white"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
--- a/app/src/main/res/layout/fragment_blank.xml
+++ b/app/src/main/res/layout/fragment_blank.xml
@@ -50,45 +50,38 @@
        android:layout_marginHorizontal="24dp"
        android:layout_marginTop="16dp"
        android:gravity="center"
-        android:background="@drawable/baground_auto_dac"
        android:text="Start"
        android:textColor="@color/black"
-        android:textSize="16sp"
+        android:textSize="11sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />


-    <androidx.appcompat.widget.AppCompatButton
+    <Button
        android:id="@+id/btn_submit"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="16dp"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
        android:layout_marginTop="24dp"
        android:clickable="false"
        android:gravity="center"
-        android:background="@drawable/button_new"
        android:text="Start Auto DAC"
-        android:textColor="@color/red"
+        android:textColor="@color/white"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />

-    <androidx.appcompat.widget.AppCompatButton
+    <Button
        android:id="@+id/btn_read_dac"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="16dp"
        android:layout_marginTop="24dp"
-        android:paddingRight="5dp"
-        android:paddingLeft="5dp"
        android:clickable="false"
        android:gravity="center"
-        android:background="@drawable/button_new"
        android:text="Read Current DAC Values"
-        android:textColor="@color/red"
+        android:textColor="@color/white"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
--- a/app/src/main/res/layout/fragment_calibration.xml
+++ b/app/src/main/res/layout/fragment_calibration.xml
@@ -37,8 +37,6 @@
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="24dp"
        android:layout_marginTop="16dp"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
        android:orientation="horizontal"
        android:background="@drawable/border"
        app:layout_constraintEnd_toEndOf="parent"
@@ -72,10 +70,8 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="36dp"
+        android:layout_marginTop="16dp"
        android:orientation="horizontal"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
        android:background="@drawable/border"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -108,10 +104,8 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="36dp"
+        android:layout_marginTop="16dp"
        android:orientation="horizontal"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
        android:background="@drawable/border"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -144,10 +138,8 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="36dp"
+        android:layout_marginTop="16dp"
        android:orientation="horizontal"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
        android:background="@drawable/border"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -182,7 +174,7 @@
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="24dp"

-        android:layout_marginTop="36dp"
+        android:layout_marginTop="16dp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/llLed4Fields" />
@@ -193,30 +185,26 @@
        android:layout_width="0dp"
        android:layout_height="50dp"
        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="60dp"
+        android:layout_marginTop="8dp"
        android:gravity="center"
        android:text="Start"
-        android:background="@drawable/baground_auto_dac"
        android:textColor="@color/black"
        android:textSize="16sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />

-    <androidx.appcompat.widget.AppCompatButton
+    <Button
        android:id="@+id/btn_submit"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="60dp"
+        android:layout_marginTop="10dp"
        android:clickable="false"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
        android:gravity="center"
        android:text="Save"
-        android:background="@drawable/button_new"
        app:cornerRadius="100dp"
-        android:textColor="@color/red"
+        android:textColor="@color/white"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -13,7 +13,6 @@
        android:layout_marginHorizontal="24dp"
        android:layout_marginTop="50dp"
        android:gravity="center"
-        android:background="@drawable/baground_auto_dac"
        android:text="Start"
        android:textColor="@color/black"
        android:textSize="16sp"
--- a/app/src/main/res/layout/fragment_diagnostics.xml
+++ b/app/src/main/res/layout/fragment_diagnostics.xml
@@ -51,7 +51,6 @@
        android:layout_marginTop="16dp"
        android:gravity="center"
        android:text="Start"
-        android:background="@drawable/baground_auto_dac"
        android:textColor="@color/red"
        android:textSize="22sp"
        app:layout_constraintEnd_toEndOf="parent"
@@ -59,7 +58,7 @@
        app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />


-    <androidx.appcompat.widget.AppCompatButton
+    <Button
        android:id="@+id/btn_submit"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -67,9 +66,8 @@
        android:layout_marginTop="24dp"
        android:clickable="false"
        android:gravity="center"
-        android:background="@drawable/button_new"
        android:text="Start"
-        android:textColor="@color/red"
+        android:textColor="@color/white"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
--- a/app/src/main/res/layout/fragment_gallery.xml
+++ b/app/src/main/res/layout/fragment_gallery.xml
@@ -26,130 +26,121 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

-        <GridLayout
+
+    <Button
+        android:id="@+id/btn_submit"
+        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"
+        app:cornerRadius="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
+
+
+    <Button
+        android:id="@+id/btn_diagnostics"
+        android:layout_width="match_parent"
+        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:cornerRadius="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_auto_dac"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="24dp"
+        android:clickable="false"
+        android:text="@string/auto_dac"
+        android:textColor="@color/white"
+        app:cornerRadius="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_diagnostics" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_calibration"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="24dp"
+        android:clickable="false"
+        android:text="@string/calibration"
+        android:textColor="@color/white"
+        app:cornerRadius="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_auto_dac" />
+
+        
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_deviceInfo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="24dp"
+        android:clickable="false"
+        android:text="@string/deviceinfo"
+        android:textColor="@color/white"
+        app:cornerRadius="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_calibration" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_deviceProvision"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:columnCount="2"
-            android:rowCount="4"
-            android:layout_margin="5dp"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:visibility="visible"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="24dp"
+            android:clickable="false"
+            android:text="@string/deviceProvision"
+            android:textColor="@color/white"
+            app:cornerRadius="16dp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_subtitle4"
-           >
+            app:layout_constraintTop_toBottomOf="@id/btn_deviceInfo" />

+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_firefox"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="24dp"
+        android:clickable="false"
+        android:text="@string/Firefox"
+        android:textColor="@color/white"
+        app:cornerRadius="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />

-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_submit"
-                android:layout_width="160dp"
-                android:layout_height="120dp"
-                android:textSize="14dp"
-                android:layout_margin="8sp"
-                android:layout_gravity="center"
-                android:clickable="false"
-                android:background="@drawable/pannel_button"
-                android:text="@string/check_buffer"
-                android:textColor="@color/blue_text_color" />
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_files"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="24dp"
+        android:clickable="false"
+        android:text="@string/Files"
+        android:textColor="@color/white"
+        app:cornerRadius="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btn_firefox" />

-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_diagnostics"
-                android:layout_width="160dp"
-                android:layout_height="120dp"
-                android:layout_margin="8sp"
-                android:textSize="14dp"
-                android:layout_gravity="center"
-                android:text="diagnostics"
-                android:clickable="false"
-                android:background="@drawable/pannel_button"
-                android:textColor="@color/blue_text_color" />
-
-
-
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_auto_dac"
-                android:layout_width="160dp"
-                android:layout_height="120dp"
-                android:textSize="14dp"
-                android:layout_gravity="center"
-                android:layout_margin="8sp"
-                android:clickable="false"
-                android:text="@string/auto_dac"
-                android:background="@drawable/pannel_button"
-                android:textColor="@color/blue_text_color"
-                app:cornerRadius="16dp" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_calibration"
-                android:layout_width="160dp"
-                android:layout_height="120dp"
-                android:textSize="14dp"
-                android:layout_gravity="center"
-                android:layout_margin="8sp"
-                android:clickable="false"
-                android:text="@string/calibration"
-                android:background="@drawable/pannel_button"
-                android:textColor="@color/blue_text_color"
-                app:cornerRadius="16dp" />
-
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_deviceInfo"
-                android:layout_width="160dp"
-                android:layout_gravity="center"
-                android:textSize="14dp"
-                android:layout_height="120dp"
-                android:layout_margin="8sp"
-                android:clickable="false"
-                android:text="@string/deviceinfo"
-                android:background="@drawable/pannel_button"
-                android:textColor="@color/blue_text_color"
-                app:cornerRadius="16dp" />
-
-            <Button
-                android:id="@+id/btn_deviceProvision"
-                android:layout_width="160dp"
-                android:layout_height="120dp"
-                android:layout_margin="8sp"
-                android:textSize="14dp"
-                android:layout_gravity="center"
-                android:text="@string/deviceProvision"
-                android:background="@drawable/pannel_button"
-                android:textColor="@color/blue_text_color"
-                android:visibility="visible"
-                app:cornerRadius="16dp" />
-
-            <Button
-                android:id="@+id/btn_firefox"
-                android:layout_width="160dp"
-                android:layout_height="120dp"
-                android:textSize="14dp"
-                android:layout_margin="8sp"
-                android:clickable="false"
-                android:layout_gravity="center"
-                android:text="@string/Firefox"
-                android:background="@drawable/pannel_button"
-                android:textColor="@color/blue_text_color"
-                app:cornerRadius="16dp" />
-
-            <Button
-                android:id="@+id/btn_files"
-                android:layout_width="160dp"
-                android:layout_height="120dp"
-                android:layout_margin="8sp"
-                android:textSize="14dp"
-                android:layout_gravity="center"
-                android:clickable="false"
-                android:text="@string/Files"
-                android:background="@drawable/pannel_button"
-                android:textColor="@color/blue_text_color"
-                app:cornerRadius="16dp"
-                tools:layout_editor_absoluteX="208dp"
-                tools:layout_editor_absoluteY="240dp" />
-
-
-        </GridLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout
-     >
+</androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
--- a/app/src/main/res/layout/fragment_hemo_cube_buffer_check.xml
+++ b/app/src/main/res/layout/fragment_hemo_cube_buffer_check.xml
@@ -98,7 +98,7 @@
        <!--            app:layout_constraintTop_toBottomOf="@id/btn_submit" />-->


-        <androidx.appcompat.widget.AppCompatButton
+        <Button
            android:id="@+id/btn_submit"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -106,8 +106,7 @@
            android:layout_marginTop="24dp"
            android:clickable="false"
            android:text="@string/submit"
-            android:textColor="@color/red"
-            android:background="@drawable/button_new"
+            android:textColor="@color/white"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
--- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml
+++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
@@ -108,8 +108,8 @@
            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_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            tools:ignore="MissingConstraints" />

@@ -135,66 +135,79 @@

        </com.google.android.material.textfield.TextInputLayout>

-        <androidx.appcompat.widget.AppCompatButton
+        <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"
-            android:textColor="@color/red"
-            android:background="@drawable/button_new"
            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_samplestart"
+        <LinearLayout
+            android:id="@+id/ll_btns"
            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:cornerRadius="16dp"
+            android:orientation="vertical"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_placebuffer" />
+            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4">

+            <Button
+                android:id="@+id/btn_placebuffer"
+                android:layout_width="150dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="24dp"
+                android:visibility="visible"
+                android:clickable="false"
+                android:text="@string/place_buffer"
+                android:textColor="@color/white"
+                app:cornerRadius="16dp"
+                />

+            <Button
+                android:id="@+id/btn_samplestart"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="5dp"
+                android:clickable="false"
+                android:text="@string/Start_Sample"
+                android:textColor="@color/white"
+                app:cornerRadius="16dp"
+              />

-        <androidx.appcompat.widget.AppCompatButton
-            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:background="@drawable/button_new"
-            android:textColor="@color/red"
-            app:cornerRadius="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+            <Button
+                android:id="@+id/btn_retry_check_cuvette"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="24dp"
+                android:clickable="false"
+                android:text="@string/retry"
+                android:textColor="@color/white"
+                app:cornerRadius="16dp"
+              />

-        <Button
-            android:id="@+id/btn_submit"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/submit"
-            android:textColor="@color/white"
-            app:cornerRadius="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
+            <Button
+                android:id="@+id/btn_submit"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="24dp"
+                android:clickable="false"
+                android:text="@string/submit"
+                android:textColor="@color/white"
+                app:cornerRadius="16dp"
+                 />
+
+        </LinearLayout>

        <TextView
            android:id="@+id/error_message"
@@ -209,7 +222,7 @@
            android:textSize="12sp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+            app:layout_constraintTop_toBottomOf="@id/ll_btns" />

        <TextView
            android:id="@+id/tv_device_messages"
@@ -220,9 +233,9 @@
            android:text="no device message"
            android:textColor="@color/black"
            android:textSize="11sp"
-            android:visibility="gone"
+            android:visibility="visible"
            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/error_message" />
+            app:layout_constraintTop_toBottomOf="@id/ll_btns" />

        <Button
            android:visibility="gone"
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -38,10 +38,20 @@
        android:visibility="gone"
        android:padding="24dp">

+        <ImageView
+            android:id="@+id/btnLogout1"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="10dp"
+            android:src="@drawable/baseline_logout_24"
+            app:layout_constraintTop_toTopOf="@+id/internetNotAvailableCL"
+            app:layout_constraintEnd_toEndOf="parent"
+            />
+
        <TextView
            android:id="@+id/tv_title_no_internet"
            style="@style/title1"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:gravity="center"
            android:layout_marginTop="24dp"
@@ -125,16 +135,35 @@
 <!--            app:layout_constraintBottom_toBottomOf="@+id/rv_order_offline"-->
 <!--            app:layout_constraintStart_toStartOf="parent" />-->

+        <TextView
+            android:id="@+id/label1"
+            style="@style/title1_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/new_kit"
+            app:layout_constraintBottom_toTopOf="@+id/btnNewKitoffline"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/btnNewKitoffline"
+            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>

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/internetAvailableCL"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:padding="24dp"
        android:visibility="visible"
-        tools:layout_editor_absoluteX="162dp"
-        tools:layout_editor_absoluteY="-82dp">
+        android:padding="24dp">

        <TextView
            android:id="@+id/tv_title"
@@ -155,7 +184,6 @@
            app:layout_constraintBottom_toBottomOf="@+id/tv_title"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="@+id/tv_title" />
-
        <ImageView
            android:id="@+id/btnLogout"
            android:layout_width="30dp"
@@ -214,9 +242,8 @@
        <RadioGroup
            android:id="@+id/radioGroup"
            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
            android:orientation="horizontal"
+            android:layout_height="wrap_content"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/cardView4">
@@ -253,58 +280,52 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/radioGroup"
-            tools:listitem="@layout/user_item_view" />
+            tools:listitem="@layout/user_item_view"/>


        <TextView
            android:id="@+id/labelQuickCapture"
            style="@style/title1_1"
+            android:visibility="gone"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="Quick Capture"
-            android:visibility="gone"
            app:layout_constraintBottom_toTopOf="@+id/btnQuickCapture"
            app:layout_constraintEnd_toEndOf="parent" />

-        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
            android:id="@+id/btnQuickCapture"
+            android:visibility="gone"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_margin="8dp"
            android:backgroundTint="@color/primary"
-            android:text="Quick Capture"
-            android:visibility="visible"
+            android:contentDescription="Capture measurements quickly"
+            android:src="@drawable/flask"
            app:elevation="1dp"
-            app:icon="@drawable/flask"
-            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintBottom_toTopOf="@+id/label"
+            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent" />


        <TextView
            android:id="@+id/label"
            style="@style/title1_1"
-            android:layout_width="2dp"
-            android:layout_height="6dp"
-            android:layout_marginBottom="8dp"
-            android:background="@drawable/rounded_corner_background"
-            android:paddingLeft="15dp"
-            android:paddingRight="15dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
            android:text="@string/new_kit"
-            android:visibility="gone"
            app:layout_constraintBottom_toTopOf="@+id/btnNewKit"
            app:layout_constraintEnd_toEndOf="parent" />

-        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+        <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"
-            android:text="@string/new_kit"
            app:elevation="1dp"
-            app:icon="@drawable/ic_add"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent" />

--- a/app/src/main/res/layout/fragment_jig.xml
+++ b/app/src/main/res/layout/fragment_jig.xml
@@ -38,7 +38,6 @@
        android:layout_marginHorizontal="24dp"
        android:layout_marginTop="16dp"
        android:text="Scan to get the code"
-        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />

@@ -59,12 +58,11 @@
        android:layout_width="258dp"
        android:layout_height="56dp"
        android:layout_margin="24dp"
-        android:drawableLeft="@drawable/baseline_qr_code_scanner_24_x"
+        android:drawableLeft="@drawable/baseline_qr_code_scanner_24"
        android:text="@string/scan_now"
        android:textColor="@color/black"
        app:backgroundTint="@color/blue_app_light"
        app:cornerRadius="100dp"
-        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/tv_title" />

@@ -92,9 +90,9 @@
        android:clickable="false"
        android:gravity="center"
        android:text="Refresh"
-        android:textColor="@color/white"
        android:visibility="visible"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:textColor="@color/white"
+        app:layout_constraintEnd_toEndOf="@id/btn_scan_now"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/btn_scan_now" />

--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -52,10 +52,6 @@
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_marginTop="24dp"
-                app:boxCornerRadiusBottomEnd="10dp"
-                app:boxCornerRadiusBottomStart="10dp"
-                app:boxCornerRadiusTopEnd="10dp"
-                app:boxCornerRadiusTopStart="10dp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/imageView">
@@ -74,10 +70,6 @@
                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
-                app:boxCornerRadiusBottomEnd="10dp"
-                app:boxCornerRadiusBottomStart="10dp"
-                app:boxCornerRadiusTopEnd="10dp"
-                app:boxCornerRadiusTopStart="10dp"
                android:layout_marginTop="16dp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
@@ -92,14 +84,12 @@
                    android:maxLength="12" />
            </com.google.android.material.textfield.TextInputLayout>

-            <androidx.appcompat.widget.AppCompatButton
+            <com.google.android.material.button.MaterialButton
                android:id="@+id/btnLogin"
-                android:layout_width="150dp"
-                android:layout_height="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                android:layout_marginTop="16dp"
                android:text="@string/login"
-                android:background="@drawable/button_new"
-                android:textColor="@color/red"
                app:cornerRadius="16dp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/fragment_register_one_scan_abha.xml
+++ b/app/src/main/res/layout/fragment_register_one_scan_abha.xml
@@ -16,7 +16,6 @@
            android:layout_marginHorizontal="24dp"
            android:layout_marginTop="16dp"
            android:text="@string/scan_patient_abha_id_card"
-            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

@@ -26,12 +25,11 @@
            android:layout_height="56dp"
            android:layout_marginHorizontal="24dp"
            android:layout_marginTop="16dp"
-            android:drawableLeft="@drawable/baseline_qr_code_scanner_24_x"
+            android:drawableLeft="@drawable/baseline_qr_code_scanner_24"
            android:text="@string/scan_now"
            android:textColor="@color/black"
            app:backgroundTint="@color/blue_app_light"
            app:cornerRadius="100dp"
-            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/tv_title" />

@@ -62,7 +60,7 @@
                android:layout_centerVertical="true"
                android:layout_marginLeft="16dp"
                android:layout_toLeftOf="@id/tvText1"
-                android:background="@color/red" />
+                android:background="@color/gray" />

            <View
                android:layout_width="match_parent"
@@ -70,7 +68,7 @@
                android:layout_centerVertical="true"
                android:layout_marginRight="16dp"
                android:layout_toRightOf="@id/tvText1"
-                android:background="@color/red" />
+                android:background="@color/gray" />

        </RelativeLayout>

@@ -83,7 +81,6 @@
            android:layout_marginHorizontal="24dp"
            android:layout_marginTop="48dp"
            android:text="@string/enter_abha_number_manualy"
-            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/seperator1" />

@@ -108,15 +105,13 @@
                android:inputType="number" />
        </com.google.android.material.textfield.TextInputLayout>

-        <androidx.appcompat.widget.AppCompatButton
+        <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"
-            android:background="@drawable/button_new"
-            android:textColor="@color/red"
            app:layout_constraintBottom_toBottomOf="@id/et_abha_id"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHorizontal_bias="1.0"
@@ -149,7 +144,7 @@
                android:layout_centerVertical="true"
                android:layout_marginLeft="16dp"
                android:layout_toLeftOf="@id/tvText2"
-                android:background="@color/red" />
+                android:background="@color/gray" />

            <View
                android:layout_width="match_parent"
@@ -157,7 +152,7 @@
                android:layout_centerVertical="true"
                android:layout_marginRight="16dp"
                android:layout_toRightOf="@id/tvText2"
-                android:background="@color/red" />
+                android:background="@color/gray" />

        </RelativeLayout>

@@ -169,7 +164,6 @@
            android:layout_marginHorizontal="24dp"
            android:layout_marginTop="48dp"
            android:text="Create ABHA ID card"
-            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/seperator2" />

@@ -183,7 +177,6 @@
            android:textColor="@color/black"
            app:backgroundTint="@color/blue_app_light"
            app:cornerRadius="100dp"
-            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/tv_title3" />

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mariya	b897e7c583	kit scan qr code scanning is added, some issues are still resolving only	2024-04-10 12:30:07 +05:30
Mariya	3ef27be203	kit scan actvity changes did for v0 , commented the code for v2	2024-04-04 15:12:13 +05:30
Mariya	718b26c92d	buffer value changes added for existing and new buffer	2024-03-16 13:52:17 +05:30
Mariya	c61ed451f9	changes made for v0 and V1 version	2024-03-16 13:37:30 +05:30
Mariya	91361c7964	changes made for button separation for sample and buffer for better work flow	2024-03-16 12:54:12 +05:30
Mariya	007db1ca7d	Merge remote-tracking branch 'origin/dev-new-command-l-and-changes' into dev	2024-03-16 11:59:39 +05:30
Mariya	b8721b7f27	L command for limit switch is added and now testing is completed	2024-03-15 17:20:32 +05:30
Mariya	ab26d0228d	L command for limit switch is added and now testing is on going	2024-03-15 17:01:15 +05:30
Mariya	d2f9c3c3a7	changes for v1 for nagpur	2024-03-14 14:58:28 +05:30
Mariya	d012b9edda	separated buttons for buffer and sample , in the result screen, instead of dialogue box of existing buffer, it will changes the color of butter button, if it buffer is already available into green , if not the button will be red	2024-03-13 16:34:17 +05:30
Mariya	721ac5d53c	changes related to Limit switch added for start buffer only	2024-03-12 16:52:24 +05:30
chandrashekhar reddy	75acfc34bd	testing L command changed the flow in HemoCubeFragment	2024-03-12 16:32:21 +05:30
Mariya	d365bbcfe0	added changes related to new listed features for v2.0 admin AssuranceControlsFragment	2024-03-12 16:31:31 +05:30
chandrashekhar reddy	31ed1edd0b	testing L command changed the TestStatus	2024-03-12 14:05:52 +05:30
chandrashekhar reddy	d62fafb129	changed the usb service location	2024-03-12 13:53:22 +05:30
Mariya	2fbad8968e	Merge branch 'dev-molbio-result-upload-jithu' into dev	2024-03-11 17:43:49 +05:30
Mariya	4b059bc953	fixed some issues	2024-03-11 17:33:34 +05:30
Mariya	320ceae26a	fixed issues while merging	2024-03-11 17:23:28 +05:30
sanjay	08a781a706	Merge remote-tracking branch 'origin/dev-molbio-result-upload-jithu' into dev-molbio-result-upload-jithu # Conflicts: # app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt	2024-03-11 17:13:15 +05:30
sanjay	8c4fedfe28	code to decrypt and login using locally saved credentials	2024-03-11 17:08:02 +05:30
Mariya	ecd7f20b08	fixed issues while merging	2024-03-11 16:24:05 +05:30
Mariya	71818e1115	Merge branch 'dev' into dev-molbio-result-upload-jithu # Conflicts: # app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt	2024-03-11 15:14:44 +05:30
chandrashekhar reddy	8ba574aeac	Added L command testing in HemoCubeFragment	2024-03-11 13:34:00 +05:30
chandrashekhar reddy	d8cb0bd96e	Added L command testing ain in HemoCubeFragment	2024-03-11 13:14:27 +05:30
chandrashekhar reddy	75c6269e4a	Added L command in HemoCubeFragment	2024-03-11 13:04:42 +05:30
Mariya	d7c1508397	changed the condition for fetching device provision details from firebase	2024-03-11 13:01:58 +05:30
chandrashekhar reddy	1e4f801774	Added L command in HemoCubeFragment	2024-03-11 13:01:22 +05:30
chandrashekhar reddy	d701ee4f6d	removed the finish for btnNewKit in HomeFragment	2024-03-09 16:20:29 +05:30
chandrashekhar reddy	e4b237bb9a	Added new screen ActivitiesFragment to check upload pending list and added version name in DashboardActivity, so it will be easy to know which version currently in use	2024-03-09 16:13:54 +05:30
chandrashekhar reddy	372489330a	Added new screen ActivitiesFragment to check upload pending list and added version name in DashboardActivity, so it will be easy to know which version currently in use	2024-03-09 15:20:49 +05:30
chandrashekhar reddy	0c10e5a920	Merge remote-tracking branch 'origin/dev' into dev	2024-03-09 12:27:22 +05:30
chandrashekhar reddy	045bda26ff	Rearranging the project structure, so it will east to understand and following proper clean code rules	2024-03-09 12:26:59 +05:30
Mariya	b31e5e6c06	removed getting null values from result upload	2024-03-07 13:30:38 +05:30
sanjay	3913aedefc	encryption code integrated	2024-03-07 12:13:12 +05:30
Mariya	53c36d3cf9	added different id and set as primary key for testing twice with same sample Id and uploading the result, offline ,issue fixed, and set ADMIN as user that can only download and export CSV file, for collecting user Data	2024-03-07 12:11:27 +05:30
sanjay	b554f64b51	setting up encryption	2024-03-07 09:55:56 +05:30
jithu	95bb428041	data upload duplication fixed-molbio & firebase	2024-03-05 17:20:18 +05:30
chandrashekhar reddy	f922f585b5	Merge remote-tracking branch 'origin/dev' into dev	2024-03-05 14:46:12 +05:30
chandrashekhar reddy	1742363f1a	added deviceUpdateGlobal field in HomeFragment	2024-03-05 14:45:47 +05:30
Mariya	ba9564d867	added new kit button and logout button for offline test	2024-03-05 14:44:06 +05:30
Mariya	1aaf2ba485	sanitize the results values if the result is NaN or infinity	2024-03-04 18:02:07 +05:30
Mariya	85756a7052	commented code for unregistereceiver	2024-03-04 16:47:55 +05:30
Mariya Varghese	0141c2791e	Merge branch 'dev-check-apk-update' into 'dev' app update and other api calls managing for molbio See merge request sminnovations/hpos!39	2024-03-04 11:12:21 +00:00
Mariya Varghese	a52538e72d	Merge branch 'dev' into 'dev-check-apk-update' # Conflicts: # app/build.gradle # app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt # app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt # app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt # build.gradle # gradle/wrapper/gradle-wrapper.properties	2024-03-04 11:11:13 +00:00
chandrashekhar reddy	78cc79eef8	changes in HomeFragment added deviceId global and added default values	2024-03-04 15:37:32 +05:30
Mariya	c9d0c440e3	added code for sanitize result upload values if if the result is NAN or infinity for molbio integration	2024-03-04 14:48:43 +05:30
chandrashekhar reddy	99da2fc094	error in HomeFragment and DashboardActivity solved registering broadcast receiver was giving issue solved by adding checks	2024-03-04 14:26:44 +05:30
Mariya	20f408230e	api calls managing, and error resolving for molbio	2024-03-02 19:37:24 +05:30
Mariya	c8d5d41c81	api calls maintaining for molbio	2024-03-02 15:41:17 +05:30
Mariya	210c9fed5d	added code for usb permission	2024-03-01 16:21:27 +05:30
Mariya	b68ec45642	reduced number of api calls in home screen	2024-03-01 13:37:16 +05:30
Mariya	1e5afa0a5c	reduced number api calls for bigtec	2024-03-01 12:38:19 +05:30
Mariya	80ab69c772	added code for uploading logs only once	2024-02-29 14:18:09 +05:30
Mariya	f7dc879c75	added code related offline bulkupload	2024-02-28 15:17:36 +05:30
Mariya	e8b5d12db5	removed unwanted toast messages	2024-02-28 15:12:21 +05:30
Mariya	626dd380ab	Apk update successfully added	2024-02-28 14:46:06 +05:30
Mariya	70b0b93f57	Apk Update Code Added	2024-02-27 20:44:32 +05:30
Mariya	5cdc156f33	Apk Update Code Added	2024-02-27 16:49:25 +05:30
Mariya	71d298cd69	Apk Update Code Added	2024-02-27 14:59:03 +05:30
Mariya	bb6f4ee859	Apk Update Code Added	2024-02-27 12:43:14 +05:30