add quick capture and solution dropdowns

app/build.gradle

@@ -16,7 +16,7 @@ android {
 
     // prod - production, preprod - preproduction, quality - qc, dev - development
     defaultConfig {
-        applicationId "in.sminnovations.hpostesting.preprod"
+        applicationId "in.sminnovations.hpostesting.dev"
         minSdk 21
         targetSdk 34
         versionCode 91

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

@@ -8,7 +8,7 @@ import com.example.hpostesting.data.model.patient.DeviceData
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 
-@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 20, exportSchema = false)
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 21, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao

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

@@ -76,5 +76,9 @@ data class HemoCubeTestData(
     var batteryMaxCapacity: String = "",
     var batteryTemperature: String = "",
     var batteryVoltage: String = "",
-    var molbioFlag: Boolean = false
+    var molbioFlag: Boolean = false,
+    var quickCapture: Boolean = false,
+    var solution: String? = "",
+    var concentration: String? = "",
+    var volume: String? = "",
 )

app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsActivity.kt

@@ -1,5 +1,8 @@
 package com.example.hpostesting.presentation.assurance
 
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.databinding.ActivityAssuranceControlsBinding
@@ -7,6 +10,19 @@ import `in`.sminnovations.hpostesting.databinding.ActivityAssuranceControlsBindi
 @AndroidEntryPoint
 class AssuranceControlsActivity: AppCompatActivity() {
     private lateinit var binding: ActivityAssuranceControlsBinding
+    private lateinit var sharedPreference: SharedPreferences
 
-    
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityAssuranceControlsBinding.inflate(layoutInflater)
+        sharedPreference = this.getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
+        setContentView(binding.root)
+
+        if (savedInstanceState == null) {
+            supportFragmentManager.beginTransaction()
+                .replace(binding.fgAssuranceControls.id, AssuranceControlsFragment())
+                .commit()
+        }
+    }
 }

app/src/main/java/com/example/hpostesting/presentation/assurance/AssuranceControlsFragment.kt

@@ -1,13 +1,24 @@
 package com.example.hpostesting.presentation.assurance
 
+import android.R
 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
 import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Spinner
+import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
+import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.model.patient.UserData
+import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import `in`.sminnovations.hpostesting.databinding.FragmentAssuranceControlsBinding
+import java.time.Instant
 
 class AssuranceControlsFragment: Fragment() {
     private lateinit var binding: FragmentAssuranceControlsBinding
@@ -21,4 +32,97 @@ class AssuranceControlsFragment: Fragment() {
             requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         return binding.root
     }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initViews()
+    }
+
+    private fun initViews() {
+//        binding.btnSubmit.visibility = View.GONE
+
+        val solutionSpinner: Spinner = binding.spinnerSolutions
+        val solutionOptions = arrayOf("Select solution", "KMnO4", "Tartrazine", "AR", "HB", "Blood")
+        val solutionAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
+        solutionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        solutionSpinner.adapter = solutionAdapter
+        solutionSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?,
+                view: View?,
+                position: Int,
+                id: Long
+            ) {
+                val selectedValue: String = solutionOptions[position]
+                if (!selectedValue.equals("Select solution")) {
+                    DataHolder.hemoCubeTestData!!.solution = selectedValue
+                }
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+            }
+        }
+
+        val concentrationSpinner: Spinner = binding.spinnerConcentration
+        val concentrationOptions = arrayOf("Select concentration", "250umol", "350umol", "450umol", "550umol", "650umol")
+        val concentrationAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, concentrationOptions)
+        concentrationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        concentrationSpinner.adapter = concentrationAdapter
+        concentrationSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?,
+                view: View?,
+                position: Int,
+                id: Long
+            ) {
+                val selectedValue: String = concentrationOptions[position]
+                if (!selectedValue.equals("Select concentration")) {
+                    DataHolder.hemoCubeTestData!!.concentration = selectedValue
+                }
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+            }
+        }
+
+        val volumeSpinner: Spinner = binding.spinnerVolume
+        val volumeOptions = arrayOf("Select volume", "1uml", "2uml", "4uml", "4.5uml", "5uml")
+        val volumeAdapter = ArrayAdapter(requireContext(), R.layout.simple_spinner_item, volumeOptions)
+        volumeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        volumeSpinner.adapter = volumeAdapter
+        volumeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?,
+                view: View?,
+                position: Int,
+                id: Long
+            ) {
+                val selectedValue: String = volumeOptions[position]
+                if (!selectedValue.equals("Select volume")) {
+                    DataHolder.hemoCubeTestData!!.volume = selectedValue
+                }
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+            }
+        }
+
+        binding.btnSubmit.setOnClickListener {
+            DataHolder.hemoCubeTestData!!.quickCapture = true
+            val currentUnixTime = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                Instant.now().epochSecond
+            } else {
+                ""
+            }
+            DataHolder.hemoCubeTestData!!._id = currentUnixTime.toString() + "SMI"
+            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
+
+            val i = Intent(requireContext(), HemocubeActivity::class.java)
+            startActivity(i)
+        }
+    }
 }

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

@@ -28,6 +28,7 @@ import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
 import com.example.hpostesting.presentation.KitScanActivity
 import com.example.hpostesting.presentation.adapter.OfflineUserListAdapter
 import com.example.hpostesting.presentation.adapter.UserListAdapter
+import com.example.hpostesting.presentation.assurance.AssuranceControlsActivity
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.TestRightViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
@@ -72,6 +73,7 @@ class HomeFragment : Fragment() {
 
         sharedPreference = requireContext().getSharedPreferences("HEMOCUBE", Context.MODE_PRIVATE)
         DataHolder.selectedTest = null
+        DataHolder.hemoCubeTestData = HemoCubeTestData()
 
         return binding.root
     }
@@ -138,6 +140,12 @@ class HomeFragment : Fragment() {
             startActivity(Intent(requireContext(), KitScanActivity::class.java))
             requireActivity().finish()
         }
+        binding.btnQuickCapture.setOnClickListener {
+            val i = Intent(
+                requireContext().applicationContext, AssuranceControlsActivity::class.java
+            )
+            startActivity(i)
+        }
     }
 
     private fun checkForTokenAndUpdate() {

app/src/main/res/drawable/spinner_border.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+    <item android:drawable="@android:drawable/btn_dropdown" />
+</layer-list>

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

@@ -20,29 +20,64 @@
         app:layout_constraintTop_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+
     <EditText
         android:id="@+id/et_readings_per_sample"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
         android:layout_weight="1"
-        android:layout_marginTop="8dp"
         android:hint="Readings per sample"
         android:importantForAutofill="no"
         android:inputType="number"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />
 
+    <Spinner
+        android:id="@+id/spinner_solutions"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
+        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/et_readings_per_sample" />
+
+    <Spinner
+        android:id="@+id/spinner_concentration"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="48dp"
+        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_solutions" />
+
+
+    <Spinner
+        android:id="@+id/spinner_volume"
+        android:layout_width="0dp"
+        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" />
 
     <Button
         android:id="@+id/btn_submit"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="352dp"
         android:clickable="false"
         android:gravity="center"
-        android:text="Save"
+        android:text="Continue"
         android:textColor="@color/white"
         app:cornerRadius="16dp"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -220,33 +220,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/error_message" />
 
-<!--        <Spinner-->
-<!--            android:id="@+id/spinner_solutions"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginTop="16dp"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/tv_subtitle2" />-->
-
-<!--        <Spinner-->
-<!--            android:id="@+id/spinner_concentration"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginTop="16dp"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/spinner_solutions" />-->
-
-<!--        <Spinner-->
-<!--            android:id="@+id/spinner_volume"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginTop="16dp"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/spinner_concentration" />-->
-
         <Button
             android:visibility="gone"
             android:id="@+id/btn_digitalCard"

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

@@ -226,6 +226,30 @@
             app:layout_constraintTop_toBottomOf="@+id/radioGroup"
             tools:listitem="@layout/user_item_view"/>
 
+
+        <TextView
+            android:id="@+id/labelQuickCapture"
+            style="@style/title1_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Quick Capture"
+            app:layout_constraintBottom_toTopOf="@+id/btnQuickCapture"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/btnQuickCapture"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:backgroundTint="@color/primary"
+            android:contentDescription="Capture measurements quickly"
+            android:src="@drawable/flask"
+            app:elevation="1dp"
+            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"