From 1d387e0f54de9c947b8a6c44608f0f6bcbe93e38 Mon Sep 17 00:00:00 2001
From: Aditya_WDI <adityagaikwad@wdimails.com>
Date: Tue, 5 Sep 2023 16:59:58 +0530
Subject: [PATCH] .

---
 .idea/deploymentTargetDropDown.xml                 |  6 +++---
 .../fragments/PatientDashboardFragment.java        | 14 +++++++++-----
 .../fragments/contacts/CreateContactFragment.java  |  3 +--
 app/src/main/res/layout/activity_personal_info.xml |  2 ++
 .../main/res/layout/create_contact_view_holder.xml |  1 +
 app/src/main/res/values/strings.xml                |  2 +-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 327134a..4e16f1f 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -6,13 +6,13 @@
         <type value="RUNNING_DEVICE_TARGET" />
         <deviceKey>
           <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="RZCW41EJRPN" />
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\adity\.android\avd\Samsung_Z3_flip_API_34.avd" />
           </Key>
         </deviceKey>
       </Target>
     </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-09-05T09:33:27.588016500Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-09-05T10:50:12.835061Z" />
     <runningDeviceTargetsSelectedWithDialog>
       <Target>
         <type value="RUNNING_DEVICE_TARGET" />
diff --git a/app/src/main/java/com/ssb/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java b/app/src/main/java/com/ssb/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java
index 6505d3a..c621d90 100644
--- a/app/src/main/java/com/ssb/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java
@@ -108,12 +108,16 @@ public class PatientDashboardFragment extends Fragment {
             // fake sign out
             // TODO: 08-08-2023 remove this
 
-            AppUtil.patientSignOut(requireContext());
+            AppUtil.showAlert(requireContext(),
+                    "Test mode", "Do you want to log out?",
+                    "LOG OUT", ((dialogInterface, i) -> {
+                        AppUtil.patientSignOut(requireContext());
 
-            Intent intent = new Intent(requireActivity(), WelcomeActivity.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-            startActivity(intent);
-            requireActivity().finish();
+                        Intent intent = new Intent(requireActivity(), WelcomeActivity.class);
+                        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                        startActivity(intent);
+                        requireActivity().finish();
+                    }), "Cancel", ((dialogInterface, i) -> {}));
         });
 
         binding.closeReminder.setOnClickListener(v -> removeReminder());
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
index dacac33..d93967c 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
@@ -344,8 +344,6 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
             binding.caregiverCheckView.setVisibility(View.VISIBLE);
             this.mustBeeCaregiver = true;
             binding.caregiverCheck.setChecked(true);
-        } else {
-            binding.caregiverCheckView.setVisibility(View.GONE);
         }
 
         // checking if there is any SOS contact already in list
@@ -372,6 +370,7 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
 
         } else {
             binding.sosCheckView.setVisibility(View.VISIBLE);
+            binding.defaultSos.setVisibility(View.VISIBLE);
         }
 
         progressDialog.dismiss();
diff --git a/app/src/main/res/layout/activity_personal_info.xml b/app/src/main/res/layout/activity_personal_info.xml
index 87df472..fd2a4dd 100644
--- a/app/src/main/res/layout/activity_personal_info.xml
+++ b/app/src/main/res/layout/activity_personal_info.xml
@@ -328,6 +328,7 @@
                         android:textColorHint="#A1A1A1"
 
                         app:spinner_arrow_drawable="@drawable/ic_down"
+                        app:spinner_arrow_show="false"
 
                         app:spinner_popup_max_height="200dp"
                         app:spinner_arrow_animate="true"
@@ -441,6 +442,7 @@
                         android:textColorHint="#A1A1A1"
 
                         app:spinner_arrow_drawable="@drawable/ic_down"
+                        app:spinner_arrow_show="false"
 
                         app:spinner_popup_max_height="200dp"
                         app:spinner_arrow_animate="true"
diff --git a/app/src/main/res/layout/create_contact_view_holder.xml b/app/src/main/res/layout/create_contact_view_holder.xml
index 3a99c77..4bb5285 100644
--- a/app/src/main/res/layout/create_contact_view_holder.xml
+++ b/app/src/main/res/layout/create_contact_view_holder.xml
@@ -98,6 +98,7 @@
 
         <ImageView
             android:id="@+id/delete"
+            android:visibility="gone"
             android:contentDescription="@string/delete"
             android:layout_width="@dimen/_15sdp"
             android:layout_height="25dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fcdf5a1..93d16e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -387,7 +387,7 @@
     <string name="accessibility_service_description">accessibility_service_description</string>
     <string name="default_notification_channel_id">ForegroundServiceChannel</string>
     <string name="all_apps">All apps</string>
-    <string name="select_default_contact">(Select default contact)</string>
+    <string name="select_default_contact">(Select default number)</string>
     <string name="reset">Reset</string>
     <string name="update">Update</string>
     <string name="patients_home_address">Patients Home Address</string>