Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
#	app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt

app/src/main/AndroidManifest.xml

@@ -137,13 +137,6 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
-<!--                <category android:name="android.intent.category.HOME" />-->
-<!--                <category android:name="android.intent.category.DEFAULT" />-->
-<!--                <category android:name="android.intent.category.MONKEY"/>-->
-<!--                <category android:name="android.intent.category.LAUNCHER_APP" />-->
-<!--            </intent-filter>-->
         </activity>
         <activity
             android:name="com.example.hpostesting.presentation.testRight.TestRightActivity"

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

@@ -259,6 +259,8 @@ object Constants {
     const val BUFFER_VALUE_3 = "BufferValue3"
     const val BUFFER_VALUE_4 = "BufferValue4"
     const val DEVICE_ID = "DEVICE_ID"
+    const val LABNAME = "LAB_NAME"
+
     const val IS_TOKEN_AVAILABLE = "IS_TOKEN_AVAILABLE"
     const val BUFFER_LED_LOWER_BOUND = 21000
     const val BUFFER_LED_UPPER_BOUND = 23500

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

@@ -23,7 +23,7 @@ import com.example.hpostesting.data.model.patient.UserData
 
 @Database(
     entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
-    version = 31,
+    version = 32,
     exportSchema = false
 )
 @TypeConverters(Converters::class)

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

@@ -106,4 +106,5 @@ data class HemoCubeTestData(
     var filter: String? = "",
     var volume: String? = "",
     var isCSVCreated: Boolean = false,
+    var labName: String? = ""
 )

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

@@ -645,7 +645,9 @@ class HomeFragment : Fragment() {
             requireActivity().packageName, 0
         )
         val version = pInfo.versionName
+        var labname = sharedPreference.getString(Constants.LABNAME,"")
         return LoginRequest(
+            password = password, serialNumber = userID, username = userID, version = version, lab = labname
             password = password, serialNumber = userID, username = userID, version = version, latitude = DataHolder.location!!.latitude.toString(), longitude = DataHolder.location!!.longitude.toString(), location = DataHolder.location.toString()
         )
     }

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

@@ -14,18 +14,68 @@
 package com.example.hpostesting.presentation.dashboard
 
 import android.content.Context
+import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import com.example.hpostesting.data.constant.Constants
+import com.example.hpostesting.data.constant.DataHolder
 import com.example.hpostesting.data.constant.LanguageManager
+import com.example.hpostesting.data.model.TestState
+import com.example.hpostesting.data.model.patient.toHemoCubeTestData
 import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
+import `in`.sminnovations.hpostesting.databinding.FragmentSlideshowBinding
 
 private var isLanguageChanged = false
 
-class SlideshowFragment : PreferenceFragmentCompat() {
+class SlideshowFragment : Fragment(){
+    private lateinit var binding: FragmentSlideshowBinding
+    private lateinit var sharedPreferences: SharedPreferences
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+    ): View {
+        binding = FragmentSlideshowBinding.inflate(inflater, container, false)
+        sharedPreferences =
+            requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.nameEditText.setText(sharedPreferences.getString(Constants.LABNAME,""))
+
+
+        binding.btnGo.setOnClickListener {
+            var labname = binding.nameEditText.text.toString()
+            DataHolder.hemoCubeTestData?.apply {
+                this.labName = labname
+            }
+
+            with(sharedPreferences.edit()) {
+                putString(Constants.LABNAME, labname)
+                apply()
+            }
+
+            Toast.makeText(
+                requireContext(),
+                "Lab Name is Added successfully.",
+                Toast.LENGTH_SHORT
+            ).show()
+        }
+        childFragmentManager.beginTransaction().replace(binding.container.id,PrefsFragment()).commit()
+    }
+}
+class PrefsFragment: PreferenceFragmentCompat(){
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
 
@@ -56,19 +106,17 @@ class SlideshowFragment : PreferenceFragmentCompat() {
         preferenceScreen.addPreference(languagePreference)
         preferenceScreen.addPreference(appVersionPreference)
         setPreferenceScreen(preferenceScreen)
-
         if (isLanguageChanged) {
             Toast.makeText(requireContext(), R.string.language_update, Toast.LENGTH_SHORT).show()
         }
-    }
 
+    }
     private fun updateLanguage(context: Context, languageCode: String) {
         LanguageManager.persistLanguagePreference(context, languageCode)
         LanguageManager.setLocale(context, languageCode)
         requireActivity().recreate() // Recreate activity to apply language changes
         isLanguageChanged = true
     }
-
     private fun getAppVersion(context: Context): String {
         return try {
             val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)

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

@@ -471,7 +471,7 @@ class HemoCubeFragment : Fragment() {
                     binding.btnPlacebuffer.visibility = View.VISIBLE
                     binding.btnSamplestart.visibility = View.VISIBLE
                 }
-                getTemp()
+//                getTemp()
             }
             (resultData.contains("#AC") && this.testStatusCode < TestStatus.TEMPERATURE_CHECK.code) -> {
                 this.testStatusCode = TestStatus.TEMPERATURE_CHECK.code
@@ -1019,6 +1019,7 @@ class HemoCubeFragment : Fragment() {
                 led3Buffer = led3BufferForDevice
                 led4Buffer = led4BufferForDevice
                 appVersion = version
+                labName = sharedPreferences.getString(Constants.LABNAME,"")
                 this.led1Sample = led1SampleForDevice
                 this.led2Sample = led2SampleForDevice
                 this.led3Sample = led3SampleForDevice

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

@@ -413,6 +413,7 @@ class HemoCubeViewModel @Inject constructor(
         testDetails?.concentration = DataHolder.hemoCubeTestData?.concentration
         testDetails?.volume = DataHolder.hemoCubeTestData?.volume
         testDetails?.filter = DataHolder.hemoCubeTestData?.filter
+        testDetails?.labName = DataHolder.hemoCubeTestData?.labName
 
     }
 

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

@@ -12,11 +12,60 @@
   ~ // from ShanMukha Innovations Pvt. Ltd.
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     tools:context="com.example.hpostesting.presentation.dashboard.SlideshowFragment">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/lab_name"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toStartOf="@id/btn_go"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/name_edit_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLength="17"
+            android:inputType="text"
+            android:hint="@string/lab_name" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_go"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="24dp"
+        android:text="@string/add"
+        app:cornerRadius="16dp"
+        app:layout_constraintBottom_toBottomOf="@id/lab_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toEndOf="@id/lab_name"
+        app:layout_constraintTop_toTopOf="@id/lab_name" />
+
+
+        <FrameLayout
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/lab_name"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="10dp"/>
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

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

@@ -292,6 +292,7 @@
     <string name="Firefox">Firefox</string>
     <string name="Files">Files</string>
     <string name="usb_terminal">Usb Terminal</string>
+    <string name="lab_name">Lab Name</string>
     <string name="menu_about">About</string>
     <string name="action_about">About</string>
 </resources>

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

@@ -293,6 +293,7 @@
     <string name="usb_terminal">Usb Terminal</string>
     <string name="menu_about">About</string>
     <string name="action_about">About</string>
+    <string name="lab_name">Lab Name</string>
     <!-- Add translations for other strings -->
 
 </resources>

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

@@ -294,4 +294,5 @@
     <string name="usb_terminal">Usb Terminal</string>
     <string name="menu_about">About</string>
     <string name="action_about">About</string>
+    <string name="lab_name">Lab Name</string>
 </resources>