resolve merge conflicts

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

@@ -1636,4 +1636,13 @@ object Constants {
             listOf(24500, 26250),
         )
     )
+
+
+    val COEFFICIENTS: Map<String, List<List<Double>>> = mapOf(
+        "HC-V1-005" to listOf(
+            listOf(1.5,0.0),
+            listOf(0.0,0.0)
+        )
+    )
+
 }

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

@@ -14,7 +14,4 @@ class LocalFileRepository(private val localFileDataSource: LocalFileDataSource)
 
     fun saveTextToDisk(filepath: String, contents: String) =
         localFileDataSource.saveTextToDisk(filepath, contents)
-
-
-
 }

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

@@ -1,7 +1,7 @@
 package com.example.hpostesting.presentation.adapter
 
-import android.content.Context
 import android.annotation.SuppressLint
+import android.content.Context
 import android.content.res.Resources
 import android.view.LayoutInflater
 import android.view.View
@@ -28,7 +28,8 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
     RecyclerView.Adapter<OfflineUserListAdapter.OfflineUserListViewHolder>() {
 
     inner class OfflineUserListViewHolder(val binding: OfflineUserListViewBinding) :
-        RecyclerView.ViewHolder(binding.root)
+        RecyclerView.ViewHolder(binding.root) {
+    }
 
     private val differCallback = object : DiffUtil.ItemCallback<HemoCubeTestData>() {
         override fun areItemsTheSame(
@@ -56,12 +57,27 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
         return differ.currentList.size
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: OfflineUserListViewHolder, position: Int) {
         val userList = differ.currentList[position]
         holder.binding.apply {
             userID.text = "User ID: ${userList._id}"
             bloodGroup.text = "Blood group: ${userList.bloodGroup}"
-            time.text = "Time: ${userList.incubationTime}"
+            time.text = "Time: ${isBetween15And30Minutes(userList.incubationTime)} \n Started at: ${
+                SimpleDateFormat("HH:mm:ss").format(
+                    SimpleDateFormat(
+                        "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+                    ).parse(userList.incubationTime)!!
+                )
+            }"
+
+            if (userList.testStatus!!) {
+                teststatus.text = view.context.getString(R.string.test_concluded)
+
+            } else {
+                teststatus.text = view.context.getString(R.string.test_pending)
+            }
+
             userCard.setOnClickListener {
                 if (false) {
                     Toast.makeText(
@@ -112,6 +128,7 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
                     }
                 }
             }
+
         }
     }
 
@@ -125,4 +142,21 @@ class OfflineUserListAdapter(private val view: View, private val batLevel: Int)
 
         return diffMillis / (60 * 1000)
     }
+
+
+    private fun showWarningToast(resId: Int) {
+        val contextToUse = view.context ?: return
+
+        val message = try {
+            contextToUse.getString(resId)
+        } catch (e: Resources.NotFoundException) {
+            "Resource not found for ID: $resId"
+        }
+
+        Toast.makeText(
+            contextToUse,
+            message,
+            Toast.LENGTH_SHORT
+        ).show()
+    }
 }

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

@@ -415,7 +415,7 @@ class HemoCubeFragment : Fragment() {
                     getString(R.string.power_bank)
                 )
             }
-            
+
             currentResultData.contains("#SS2") && this.testStatusCode < TestStatus.FIRST_GAIN_STARTED.code -> {
                 this.testStatusCode = TestStatus.FIRST_GAIN_STARTED.code
                 hemoCubeViewModel.messages.postValue("1.3X Gain Started")

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

@@ -204,6 +204,8 @@ class HemoCubeViewModel @Inject constructor(
                             bufferCheckData.localFlag = true
                             hemoCubeBufferDao.insertAll(bufferCheckData)
                         }
+
+                        else -> {}
                     }
                 } catch (e: Exception) {
                     Log.e("Testdb", "Exception during data upload: ${e.message}")

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

@@ -34,7 +34,7 @@ class UsbService : Service() {
     fun connect(driver: UsbSerialDriver, connection: UsbDeviceConnection) {
         mPort = driver.ports[0] // Most devices have just one port (port 0)
         mPort.open(connection)
-        mPort.setParameters(9600, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
+        mPort.setParameters(115200, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE)
         isUsbConnected = true
         Log.d(TAG, "My Usb Connected ${mPort.driver}")
 

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

@@ -31,17 +31,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title" />
 
-<!--        <TextView-->
+        <!--        <TextView-->
-<!--            android:id="@+id/tv_subtitle3"-->
+        <!--            android:id="@+id/tv_subtitle3"-->
-<!--            style="@style/title2"-->
+        <!--            style="@style/title2"-->
-<!--            android:layout_width="0dp"-->
+        <!--            android:layout_width="0dp"-->
-<!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginHorizontal="24dp"-->
+        <!--            android:layout_marginHorizontal="24dp"-->
-<!--            android:layout_marginTop="16dp"-->
+        <!--            android:layout_marginTop="16dp"-->
-<!--            android:text="@string/step5"-->
+        <!--            android:text="@string/step5"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
+        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->
+        <!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->
 
         <TextView
             android:id="@+id/tv_name"
@@ -261,5 +261,5 @@
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-    </layout>
+</layout>