changes made for dropdownlist for pq , for iocl 122 version added, for E command , RS AND RC changed to ES and EC

app/build.gradle

@@ -16,11 +16,11 @@ android {
 
     // dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production
     defaultConfig {
-        applicationId "in.sminnovations.hpostesting.dev"
+        applicationId "in.sminnovations.hpostesting.iocl"
         minSdk 21
         targetSdk 34
-        versionCode 121
-        versionName "2.1.121"
+        versionCode 122
+        versionName "2.1.122"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/google-services.json

@@ -1,205 +1,26 @@
 {
   "project_info": {
-    "project_number": "650071678820",
-    "project_id": "hpos-af3cc",
-    "storage_bucket": "hpos-af3cc.appspot.com"
+    "project_number": "630821402019",
+    "project_id": "iocl-iisc",
+    "storage_bucket": "iocl-iisc.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f1435a1c07f710036c6471",
+        "mobilesdk_app_id": "1:630821402019:android:ed56bae066ac32b51dd616",
         "android_client_info": {
-          "package_name": "com.example.hposconsentform"
+          "package_name": "in.sminnovations.hpostesting.iocl"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+          "current_key": "AIzaSyABIdxI89eTZ8BqU2cIoJOgJ1lS1cFLCtQ"
         }
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:7865bef608cdee6f6c6471",
-        "android_client_info": {
-          "package_name": "com.smi.counselling"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:2925e9ce3417d2386c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hemocube"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-srhm9spm9hjn4frcd3r6o02gdhdbtd15.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "in.sminnovations.hemocube",
-            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
-          }
-        },
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hposregistration"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-70kp5jvjda4r5diqch2kn4lc40p4f42g.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "in.sminnovations.hposregistration",
-            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
-          }
-        },
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-l87dnr0bdj95get0khgnvfv2an1k6ogq.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "in.sminnovations.hpostesting",
-            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
-          }
-        },
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:a53292637abb7c0d6c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting.dev"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     }

app/src/main/AndroidManifest.xml

@@ -138,9 +138,17 @@
             android:exported="true"
             android:noHistory="true"
             android:theme="@style/AppTheme.NoActionBar">
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.MAIN"/>-->
+<!--                <category android:name="android.intent.category.LAUNCHER"/>-->
+<!--            </intent-filter>-->
+
             <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.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

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

@@ -26,6 +26,7 @@ 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.constant.DataHolder
 import com.example.hpostesting.data.constant.Constants
@@ -58,7 +59,7 @@ 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 solutionOptions = arrayOf("Select solution", "Tartrazine", "Acid Red","Sickle-Cert-Buffer", "1 Abs Holo Filter", "0.25 Abs Holo Filter", "Air Blank")
         val solutionAdapter =
             ArrayAdapter(requireContext(), R.layout.simple_spinner_item, solutionOptions)
         solutionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
@@ -70,9 +71,27 @@ class AssuranceControlsFragment : Fragment() {
                 position: Int,
                 id: Long,
             ) {
-                val selectedValue: String = solutionOptions[position]
-                if (!selectedValue.equals("Select solution")) {
-                    DataHolder.hemoCubeTestData!!.solution = selectedValue
+                val selectedSolution: String = solutionOptions[position]
+                if (selectedSolution != "Select solution") {
+                    DataHolder.hemoCubeTestData!!.solution = selectedSolution
+
+                    // Update visibility and name based on selected solution
+                    if(selectedSolution == "Tartrazine" || selectedSolution == "Acid Red"){
+                        activity?.runOnUiThread {
+                            binding.spinnerConcentration.visibility = View.VISIBLE
+                            // Ensure the name is updated only after concentration is selected.
+                            // You might need to adjust this logic based on how and when you want to update the name.
+                            // For now, it simply shows that the visibility is being handled.
+                        }
+                    } else {
+                        activity?.runOnUiThread {
+                            binding.spinnerConcentration.visibility = View.GONE
+                        }
+                    }
+                } else {
+                    activity?.runOnUiThread {
+                        binding.spinnerConcentration.visibility = View.GONE
+                    }
                 }
             }
 
@@ -184,17 +203,26 @@ class AssuranceControlsFragment : Fragment() {
             val selectedadminOption = binding.spinnerAdmin.selectedItem.toString()
 
             // 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
-//            }
-//
-//            if (selectedConcentration == "Select concentration") {
-//                Toast.makeText(requireContext(), "Please select a concentration", Toast.LENGTH_LONG).show()
-//                return@setOnClickListener // Prevent further execution
-//            }
+            if (selectedSolution == "Select solution") {
+                Toast.makeText(requireContext(), "Please select a solution", Toast.LENGTH_LONG).show()
+                return@setOnClickListener // Prevent further execution
+            }else{
+                DataHolder.hemoCubeTestData!!.name = selectedSolution
+            }
 
-            if (selectedadminOption == "Select options") {
+            if (selectedConcentration == "Select concentration" && binding.spinnerConcentration.isVisible) {
+                Toast.makeText(requireContext(), "Please select a concentration", Toast.LENGTH_LONG).show()
+                return@setOnClickListener // Prevent further execution
+            }else if(binding.spinnerConcentration.isVisible){
+                DataHolder.hemoCubeTestData!!.name = "$selectedSolution $selectedConcentration"
+            }else{
+                DataHolder.hemoCubeTestData!!.name = selectedSolution
+            }
+
+
+
+
+            if (selectedadminOption == "Select options" && binding.spinnerAdmin.isVisible) {
                 Toast.makeText(requireContext(), "Please select a option", Toast.LENGTH_LONG).show()
                 return@setOnClickListener // Prevent further execution
             }
@@ -208,11 +236,11 @@ class AssuranceControlsFragment : Fragment() {
             DataHolder.hemoCubeTestData!!.solution = binding.spinnerSolutions.selectedItem.toString()
             DataHolder.hemoCubeTestData!!.concentration = binding.spinnerConcentration.selectedItem.toString()
             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()
-            }
+//            if(binding.spinnerAdmin.selectedItem.toString().equals("Select options") && binding.spinnerAdmin.isVisible){
+//                Toast.makeText(requireContext(), "Please select a option", Toast.LENGTH_LONG).show()
+//            }else {
+//                DataHolder.hemoCubeTestData!!.name = DataHolder.hemoCubeTestData!!.filter.toString()
+//            }
 
 
 

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

@@ -463,7 +463,7 @@ class HemoCubeFragment : Fragment() {
                 fetchResult()
             }
 //#EC for v0 and v1 and #RC for v2
-            (resultData.contains("#RC") && this.testStatusCode < TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code) -> {
+            (resultData.contains("#EC") && this.testStatusCode < TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code) -> {
                 this.testStatusCode = TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code
                 hemoCubeViewModel.messages.postValue("EPROM ADC Loaded")
                 //checkCuvettePresence()

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

@@ -52,7 +52,7 @@
     <Spinner
         android:id="@+id/spinner_solutions"
         android:layout_width="0dp"
-        android:visibility="gone"
+        android:visibility="visible"
         android:layout_height="wrap_content"
         android:layout_marginTop="40dp"
         android:background="@drawable/spinner_border"
@@ -78,7 +78,7 @@
     <Spinner
         android:id="@+id/spinner_admin"
         android:layout_width="0dp"
-        android:visibility="visible"
+        android:visibility="gone"
         android:layout_height="wrap_content"
         android:layout_marginTop="52dp"
         android:background="@drawable/spinner_border"