From 9c0694584cd33af15985a51dc7f0746b2e126e0b Mon Sep 17 00:00:00 2001
From: "smileomi18@gmail.com" <smi@glab22>
Date: Fri, 23 Jun 2023 10:51:30 +0530
Subject: [PATCH] 20/06/2023 -test session bug resolve

---
 .idea/gradle.xml                              |  4 +-
 .idea/misc.xml                                |  6 ++
 .../shelved.patch                             | 13 ++++
 .../shelved.patch                             | 77 +++++++++++++++++++
 ...e_Update_at_21-06-2023_11_16__Changes_.xml |  4 +
 ..._Update_at_21-06-2023_11_16__Changes_1.xml |  4 +
 .idea/vcs.xml                                 |  6 ++
 .../registration/AbhaRegistrationFragment.kt  | 14 ++--
 .../registration/CaptureUserImageFragment.kt  |  9 +++
 .../ReviewDetailsRegistrationFragment.kt      |  8 ++
 .../UserDetailsRegistrationFragment.kt        | 22 ++++--
 .../fragment_user_details_registration.xml    | 64 +++++++++++++--
 12 files changed, 210 insertions(+), 21 deletions(-)
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]/shelved.patch
 create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1/shelved.patch
 create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_.xml
 create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_1.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 662fec0..92a5e6c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,8 +7,8 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$PROJECT_DIR$/../../andriod studio gradle/gradle-7.3" />
-        <option name="gradleJvm" value="17" />
+        <option name="gradleHome" value="$USER_HOME$/andriod studio gradle/gradle-7.3" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..fb0d77e
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]/shelved.patch
new file mode 100644
index 0000000..81da1e4
--- /dev/null
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]/shelved.patch
@@ -0,0 +1,13 @@
+Index: .idea/misc.xml
+===================================================================
+diff --git a/.idea/misc.xml b/.idea/misc.xml
+--- a/.idea/misc.xml	
++++ b/.idea/misc.xml	
+@@ -1,6 +1,6 @@
+ <project version="4">
+   <component name="ExternalStorageConfigurationManager" enabled="true" />
+-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
++  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+     <output url="file://$PROJECT_DIR$/build/classes" />
+   </component>
+   <component name="ProjectType">
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1/shelved.patch
new file mode 100644
index 0000000..cb3673a
--- /dev/null
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1/shelved.patch
@@ -0,0 +1,77 @@
+Index: app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
+--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt	
++++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt	
+@@ -68,6 +68,7 @@
+                 aadharID.setText(user.AadharId)
+                 etAbhaId.setText(user.AbhaId)
+                 etName.setText(user.name)
++
+             }
+         }
+ 
+Index: .idea/deploymentTargetDropDown.xml
+===================================================================
+diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
+deleted file mode 100644
+--- a/.idea/deploymentTargetDropDown.xml	
++++ /dev/null	
+@@ -1,17 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<project version="4">
+-  <component name="deploymentTargetDropDown">
+-    <runningDeviceTargetSelectedWithDropDown>
+-      <Target>
+-        <type value="RUNNING_DEVICE_TARGET" />
+-        <deviceKey>
+-          <Key>
+-            <type value="VIRTUAL_DEVICE_PATH" />
+-            <value value="C:\Users\moham\.android\avd\BillPay.avd" />
+-          </Key>
+-        </deviceKey>
+-      </Target>
+-    </runningDeviceTargetSelectedWithDropDown>
+-    <timeTargetWasSelectedWithDropDown value="2023-06-19T10:21:12.395164900Z" />
+-  </component>
+-</project>
+\ No newline at end of file
+Index: .idea/vcs.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/vcs.xml b/.idea/vcs.xml
+new file mode 100644
+--- /dev/null	
++++ b/.idea/vcs.xml	
+@@ -0,0 +1,6 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project version="4">
++  <component name="VcsDirectoryMappings">
++    <mapping directory="" vcs="Git" />
++  </component>
++</project>
+\ No newline at end of file
+Index: .idea/gradle.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/gradle.xml b/.idea/gradle.xml
+--- a/.idea/gradle.xml	
++++ b/.idea/gradle.xml	
+@@ -7,8 +7,8 @@
+         <option name="testRunner" value="GRADLE" />
+         <option name="distributionType" value="DEFAULT_WRAPPED" />
+         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+-        <option name="gradleHome" value="$PROJECT_DIR$/../../andriod studio gradle/gradle-7.3" />
+-        <option name="gradleJvm" value="17" />
++        <option name="gradleHome" value="$USER_HOME$/andriod studio gradle/gradle-7.3" />
++        <option name="gradleJvm" value="Embedded JDK" />
+         <option name="modules">
+           <set>
+             <option value="$PROJECT_DIR$" />
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_.xml
new file mode 100644
index 0000000..6e7cf62
--- /dev/null
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_.xml
@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]" date="1687326381685" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 21-06-2023 11:16 [Changes]" />
+</changelist>
\ No newline at end of file
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_1.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_1.xml
new file mode 100644
index 0000000..90bf95d
--- /dev/null
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_1.xml
@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1" date="1687326391788" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_21-06-2023_11_16_[Changes]1/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 21-06-2023 11:16 [Changes]" />
+</changelist>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
index b481995..2725c59 100644
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
@@ -68,6 +68,8 @@ class AbhaRegistrationFragment : BaseFragment() {
                 aadharID.setText(user.AadharId)
                 etAbhaId.setText(user.AbhaId)
                 etName.setText(user.name)
+                centerName.setText(user.CenterName)
+
             }
         }
 
@@ -83,9 +85,7 @@ class AbhaRegistrationFragment : BaseFragment() {
                     AadharId = aadharId
                     AbhaId = abhaId
                     CenterName = centerName
-                    _id =
-                        aadharId + userName.substring(0, 3).uppercase() + centerName.substring(0, 3)
-                            .uppercase()
+                    _id = aadharId + userName.substring(0, 3).uppercase() + centerName.substring(0, 3).uppercase()
                 }
 
                 viewModel.insert(userData)
@@ -180,7 +180,7 @@ class AbhaRegistrationFragment : BaseFragment() {
                 return false
             }
             if (!checkCenterName(centerName)) {
-                etName.error = "Center name can't be empty"
+                etCenterName.error = "Center name can't be empty or less than 3 characters"
                 return false
             }
         }
@@ -188,11 +188,11 @@ class AbhaRegistrationFragment : BaseFragment() {
     }
 
     private fun checkAbhaIDNumber(abhaId: String): Boolean {
-        return abhaId.isNotEmpty() || abhaId.length == 14
+        return abhaId.isNotEmpty() && abhaId.length >= 14
     }
 
     private fun checkAadharIDNumber(aadharId: String): Boolean {
-        return aadharId.isNotEmpty() || aadharId.length == 12
+        return aadharId.isNotEmpty() && aadharId.length >= 12
     }
 
     private fun checkUserName(userName: String): Boolean {
@@ -200,7 +200,7 @@ class AbhaRegistrationFragment : BaseFragment() {
     }
 
     private fun checkCenterName(centerName: String): Boolean {
-        return centerName.isNotEmpty()
+        return centerName.isNotEmpty() && centerName.length >= 3
     }
 
     private fun navigateToUserDetailsFragment(userId: String) {
diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/CaptureUserImageFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/CaptureUserImageFragment.kt
index c96ce79..b685550 100644
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/CaptureUserImageFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/CaptureUserImageFragment.kt
@@ -72,6 +72,10 @@ class CaptureUserImageFragment : Fragment() {
             userData = user
             if (userData.userImage.isNotEmpty()) {
                 binding.userImage.loadImageFromUri(Uri.parse(user.userImage))
+                binding.btnSubmit.isEnabled = true
+                binding.btnSubmit.setOnClickListener {
+                    navigate()
+                }
             }
         }
     }
@@ -100,6 +104,7 @@ class CaptureUserImageFragment : Fragment() {
 
                 if (grantedPermissions.isNotEmpty()) {
                     binding.userImage.setOnClickListener {
+
                         takePicture()
                     }
                 }
@@ -119,6 +124,10 @@ class CaptureUserImageFragment : Fragment() {
     private fun submitImage(uri: Uri) {
         userData.userImage = uri.toString()
         viewModel.insert(userData)
+        navigate()
+    }
+
+    private fun navigate() {
         val action = CaptureUserImageFragmentDirections
             .actionCaptureUserImageFragment2ToReviewDetailsRegistrationFragment(args.userId)
         findNavController().navigate(action)
diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt
index a0012b5..12564de 100644
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt
@@ -124,11 +124,19 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
                 binding.tvIsUnderMedication.text = requireContext().getString(
                     R.string.is_patient_under_any_medication_details, "Yes"
                 )
+            } else {
+                binding.tvIsUnderMedication.text = requireContext().getString(
+                    R.string.is_patient_under_any_medication_details, "No"
+                )
             }
             if (userData.isUnderTransfusion!!) {
                 binding.tvIsUnderTransfusion.text = requireContext().getString(
                     R.string.is_patient_undergoing_any_blood_transfusion_details, "Yes"
                 )
+            }else{
+                binding.tvIsUnderTransfusion.text = requireContext().getString(
+                    R.string.is_patient_undergoing_any_blood_transfusion_details, "No"
+                )
             }
 
             if (userData.sickleCellHistory != "") {
diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt
index 259f9bd..d689d9a 100644
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.RadioButton
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -14,6 +15,7 @@ import com.example.hposregistration.databinding.FragmentUserDetailsRegistrationB
 import com.example.hposregistration.ui.viewmodels.RegistrationViewModel
 import dagger.hilt.android.AndroidEntryPoint
 
+
 @AndroidEntryPoint
 class UserDetailsRegistrationFragment : Fragment() {
 
@@ -66,8 +68,17 @@ class UserDetailsRegistrationFragment : Fragment() {
             user.state.let { etState.setText(it) }
             user.pinCode.let { etPincode.setText(it) }
             user.bloodGroup.let { etBloodGroup.setText(it, false) }
-            cbItem1.isChecked = user.isUnderMedication ?: false
-            cbItem2.isChecked = user.isUnderTransfusion ?: false
+            user.isUnderMedication.let {
+                if (it != null) {
+                    yes.isChecked = it
+                }
+            }
+            user.isUnderTransfusion.let {
+                if (it != null) {
+                    yes1.isChecked = it
+                }
+            }
+            user.sickleCellHistory.let { etFamilyHistory.setText(it) }
         }
     }
 
@@ -194,11 +205,8 @@ class UserDetailsRegistrationFragment : Fragment() {
             } else {
                 userData.bloodGroup = bloodGroup
             }
-
-            userData.isUnderMedication = cbItem1.isChecked
-            userData.isUnderTransfusion = cbItem2.isChecked
-
-
+            userData.isUnderMedication = yes.isChecked
+            userData.isUnderTransfusion = yes1.isChecked
             val familyHistory = etFamilyHistory.text.toString()
             if (familyHistory.isEmpty()) {
                 etFamilyHistory.error = "Please enter your family history"
diff --git a/app/src/main/res/layout/fragment_user_details_registration.xml b/app/src/main/res/layout/fragment_user_details_registration.xml
index 7d74bb6..499ea60 100644
--- a/app/src/main/res/layout/fragment_user_details_registration.xml
+++ b/app/src/main/res/layout/fragment_user_details_registration.xml
@@ -8,7 +8,9 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        tools:layout_editor_absoluteX="-16dp"
+        tools:layout_editor_absoluteY="158dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -314,7 +316,7 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <com.google.android.material.checkbox.MaterialCheckBox
+            <TextView
                 android:id="@+id/cb_item1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -324,14 +326,66 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/til_blood_group" />
 
-            <com.google.android.material.checkbox.MaterialCheckBox
+            <RadioGroup
+                android:id="@+id/radioGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="24dp"
+                android:orientation="horizontal"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/cb_item1">
+
+                <RadioButton
+                    android:id="@+id/yes"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="Yes"
+                    android:textSize="16dp" />
+
+                <RadioButton
+                    android:id="@+id/no"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:text="No"
+                    android:textSize="16dp" />
+            </RadioGroup>
+
+            <TextView
                 android:id="@+id/cb_item2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="24dp"
                 android:text="@string/is_patient_undergoing_any_blood_transfusion"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/cb_item1" />
+                app:layout_constraintTop_toBottomOf="@id/radioGroup" />
+
+            <RadioGroup
+                android:id="@+id/radioGroup1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="24dp"
+                android:orientation="horizontal"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/cb_item2">
+
+                <RadioButton
+                    android:id="@+id/yes1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="Yes"
+                    android:textSize="16dp" />
+
+                <RadioButton
+                    android:id="@+id/no1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:text="No"
+                    android:textSize="16dp" />
+            </RadioGroup>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/til_familyHistory"
@@ -342,7 +396,7 @@
                 android:layout_marginTop="16dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/cb_item2">
+                app:layout_constraintTop_toBottomOf="@id/radioGroup1">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_familyHistory"