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 @@ - - + + - + 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 @@ accessibility_service_description ForegroundServiceChannel All apps - (Select default contact) + (Select default number) Reset Update Patients Home Address