From f019e1897d70a7788a408560ba91313530ed22de Mon Sep 17 00:00:00 2001
From: "smileomi18@gmail.com" <smi@glab22>
Date: Fri, 15 Sep 2023 17:03:03 +0530
Subject: [PATCH 1/2] Added placebuffer and sample buttons for the new feature

---
 .../presentation/dashboard/HomeFragment.kt    |  3 +-
 .../presentation/hemocube/HemoCubeFragment.kt | 54 +++++++++++++------
 .../layout/fragment_hemo_cube_reference.xml   | 37 ++++++++++++-
 app/src/main/res/values/strings.xml           |  2 +
 4 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
index b379d90..c74b789 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
@@ -91,7 +91,8 @@ class HomeFragment : Fragment() {
         }
     }
     private fun loadUserData() {
-        val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false).orderBy("createdAt", Query.Direction.DESCENDING)
+//        val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false).orderBy("createdAt", Query.Direction.DESCENDING)
+        val query = Firebase.firestore.collection("patientData").whereEqualTo("testStatus", false)
         query.get().addOnSuccessListener {
             if (it.documents.isEmpty()) {
                 binding.pendingTest.visibility = View.VISIBLE
diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
index a58c53d..78b9c77 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -57,7 +57,7 @@ class HemoCubeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         initViews()
         observeViewModel()
-        checkAndStartProcess()
+//        checkAndStartProcess()
     }
 
     private fun initViews() {
@@ -78,6 +78,17 @@ class HemoCubeFragment : Fragment() {
         binding.btnSubmit.isEnabled = false
         binding.btnSubmit.isClickable = false
 
+
+        binding.btnSamplestart.setOnClickListener {
+            startSampleProcess()
+            it.visibility = View.GONE
+        }
+
+        binding.btnPlacebuffer.setOnClickListener {
+            checkAndStartProcess()
+            it.visibility = View.GONE
+        }
+
         binding.btnKit.setOnClickListener {
             if (isTestOngoing) {
                 val title = "WARNING"
@@ -155,7 +166,7 @@ class HemoCubeFragment : Fragment() {
 
         hemoCubeViewModel.deviceData.observe(viewLifecycleOwner) {
             currentDeviceData = it
-            showToast(calculateRatio(0.17).toString())
+//            showToast(calculateRatio(0.17).toString())
 
         }
 
@@ -169,12 +180,12 @@ class HemoCubeFragment : Fragment() {
     }
 
     private fun checkAndStartProcess() {
-        if (isBufferValueAvailable()) {
-            showBufferAlertDialog()
-        } else {
-            listenToHemoCube()
-            startBufferProcess()
-        }
+//        if (isBufferValueAvailable()) {
+//            showBufferAlertDialog()
+//        } else {
+        listenToHemoCube()
+        startBufferProcess()
+//        }
     }
 
     private fun isBufferValueAvailable(): Boolean {
@@ -249,7 +260,12 @@ class HemoCubeFragment : Fragment() {
         when {
             stringData.contains("ERROR 500") -> showError500Dialog()
             stringData.contains("ERROR 501") -> showError501Dialog()
-            stringData.contains("#Buffer Completed") -> showStartSampleDialog()
+            stringData.contains("#Buffer Completed") ->
+                activity?.runOnUiThread {
+                    binding.btnSamplestart.visibility = View.VISIBLE
+                    binding.btnSamplestart.isClickable = true
+                }
+
             stringData.contains("#Sample Completed") -> {
                 activity?.runOnUiThread {
                     binding.btnSubmit.isEnabled = true
@@ -320,7 +336,7 @@ class HemoCubeFragment : Fragment() {
                     override fun onClickNegativeButton() {}
 
                     override fun onClickPositiveButton() {
-
+                        startSampleProcess()
                     }
                 })
         }
@@ -366,7 +382,7 @@ class HemoCubeFragment : Fragment() {
                     this.led1Average = led1Average
                     this.led2Average = led2Average
                     this.deviceRatio = deviceRatio
-                    this.calculatedRatio = calculateRatio(deviceRatio)
+//                    this.calculatedRatio = calculateRatio(deviceRatio)
                     this.resultData = fullReadOutput
                     if (!isBufferValueAvailable()) {
                         with(sharedPreferences.edit()) {
@@ -382,7 +398,11 @@ class HemoCubeFragment : Fragment() {
             }
 
         } catch (_: Exception) {
-            Toast.makeText( requireContext(), "Error while processing device data", Toast.LENGTH_SHORT).show()
+            Toast.makeText(
+                requireContext(),
+                "Error while processing device data",
+                Toast.LENGTH_SHORT
+            ).show()
         }
 
     }
@@ -430,11 +450,11 @@ class HemoCubeFragment : Fragment() {
             })
     }
 
-    private fun calculateRatio(ratio: Double): Double {
-        val coefficient1 = currentDeviceData?.coefficients?.get(0) ?: 0.0
-        val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 0.0
-        return coefficient1 * ratio + coefficient2
-    }
+//    private fun calculateRatio(ratio: Double): Double {
+//        val coefficient1 = currentDeviceData?.coefficients?.get(0) ?: 0.0
+//        val coefficient2 = currentDeviceData?.coefficients?.get(1) ?: 0.0
+//        return coefficient1 * ratio + coefficient2
+//    }
 
     private fun parseResult(frames: List<String>): String {
         val lines = mutableListOf<String>()
diff --git a/app/src/main/res/layout/fragment_hemo_cube_reference.xml b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
index daa23b7..6e8a9d7 100644
--- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml
+++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml
@@ -58,6 +58,40 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" />
 
+
+
+
+        <Button
+            android:visibility="gone"
+            android:id="@+id/btn_samplestart"
+            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:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/til_blood_group" />
+
+
+
+        <Button
+            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:textColor="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+
+
+
         <Button
             android:id="@+id/btn_submit"
             android:layout_width="wrap_content"
@@ -69,8 +103,7 @@
             android:textColor="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/til_blood_group" />
-
+            app:layout_constraintTop_toBottomOf="@id/btn_samplestart" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/til_blood_group"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2106bca..da8b848 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,6 +112,8 @@
     <string name="sickle_cert">Sickle Cert</string>
     <string name="sickle_find">Sickle Find</string>
     <string name="submit">Submit</string>
+    <string name="place_buffer">Start Buffer</string>
+    <string name="Start_Sample">Start Sample</string>
     <string name="new_kit">New Kit</string>
     <string name="new_buffer">New Buffer</string>
     <string name="name_error_2">Invalid character, Allowed characters are Letters, Numbers and ( ) _ - , . only</string>

From 34bed4e5fe899aa7674a5d2e81f32f7894134486 Mon Sep 17 00:00:00 2001
From: "smileomi18@gmail.com" <smi@glab22>
Date: Fri, 15 Sep 2023 17:26:38 +0530
Subject: [PATCH 2/2] app version -updation- notifying user

---
 app/build.gradle                              |  3 ++
 .../dashboard/DashboardActivity.kt            | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 0bdbb66..2281917 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,6 +70,9 @@ dependencies {
     implementation 'com.google.android.gms:play-services-location:21.0.1'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
     implementation 'com.google.android.things:androidthings:1.0'
+    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta10'
+    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta10")
+
 
     // Testing
     testImplementation 'junit:junit:4.13.2'
diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
index cdd7d10..955edd4 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
@@ -2,6 +2,7 @@ package com.example.hpostesting.presentation.dashboard
 
 import android.os.Bundle
 import android.view.Menu
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.findNavController
@@ -10,6 +11,8 @@ import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.navigation.NavigationView
+import com.google.firebase.appdistribution.FirebaseAppDistribution
+import com.google.firebase.appdistribution.FirebaseAppDistributionException
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.ActivityDashboardBinding
@@ -53,4 +56,31 @@ class DashboardActivity : AppCompatActivity() {
         return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
     }
 
+
+    override fun onResume() {
+        super.onResume()
+        // Copy and paste this into any part of your app - for example, in your main
+// activity's onResume method.
+        val firebaseAppDistribution = FirebaseAppDistribution.getInstance()
+        firebaseAppDistribution.updateIfNewReleaseAvailable()
+            .addOnProgressListener { updateProgress ->
+                Toast.makeText(this, "Updating", Toast.LENGTH_SHORT).show()
+            }
+            .addOnFailureListener { e ->
+                // (Optional) Handle errors.
+                if (e is FirebaseAppDistributionException) {
+                    when (e.errorCode) {
+                        FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> {
+                            // SDK did nothing. This is expected when building for Play.
+                        }
+
+                        else -> {
+                            // Handle other errors.
+                        }
+                    }
+                }
+            }
+    }
+
+
 }
\ No newline at end of file