From 7e411fd994cf4405dc57cacb1439ed9bcace7487 Mon Sep 17 00:00:00 2001 From: Aditya_WDI Date: Mon, 31 Jul 2023 20:36:26 +0530 Subject: [PATCH] . --- app/src/main/AndroidManifest.xml | 1 - .../com/ssb/simplitend/apputils/AppUtil.java | 1 + .../ProfileProgressFragment.java | 7 +- .../RegisterCompleteFragment.java | 72 +++++++++++++++ .../medicalinfo/AddMedicalInfoFragment.java | 5 +- .../medreminder/AddReminderFragment.java | 4 + .../medreminder/mvvm/ReminderAdapter.java | 34 +++---- .../setuproutine/AddRoutineFragment.java | 58 +++++++++++- .../contacts/AddContactFragment.java | 23 ++++- .../contacts/ContactInfoFragment.java | 14 ++- .../contacts/ContactListFragment.java | 4 +- .../contacts/CreateContactFragment.java | 27 +++++- .../fragments/register/LocationFragment.java | 54 +++++++++-- .../fragments/register/RegisterFragment.java | 59 +++++++++--- .../{img_med_type_1.png => ic_capsules.png} | Bin .../{img_med_type_2.png => ic_pills.png} | Bin .../{img_med_type_1.png => ic_capsules.png} | Bin .../{img_med_type_2.png => ic_pills.png} | Bin .../{img_med_type_1.png => ic_capsules.png} | Bin .../{img_med_type_2.png => ic_pills.png} | Bin .../{img_med_type_1.png => ic_capsules.png} | Bin .../{img_med_type_2.png => ic_pills.png} | Bin .../{img_med_type_1.png => ic_capsules.png} | Bin .../{img_med_type_2.png => ic_pills.png} | Bin .../{img_med_type_1.png => ic_capsules.png} | Bin .../{img_med_type_2.png => ic_pills.png} | Bin .../{img_med_type_1.png => ic_capsules.png} | Bin .../{img_med_type_2.png => ic_pills.png} | Bin app/src/main/res/drawable/ic_drops.png | Bin 0 -> 19917 bytes app/src/main/res/drawable/ic_user_filled.png | Bin 0 -> 3820 bytes .../main/res/layout/contact_info_fragment.xml | 6 +- .../main/res/layout/contact_view_holder.xml | 4 +- app/src/main/res/layout/location_fragment.xml | 4 +- .../res/layout/profile_progress_fragment.xml | 32 +++---- .../layout/registeration_done_fragment.xml | 85 ++++++++++++++++++ .../main/res/layout/reminder_viewholder.xml | 2 +- .../main/res/navigation/welcome_nav_graph.xml | 16 +++- app/src/main/res/values-night/themes.xml | 8 +- app/src/main/res/values/strings.xml | 9 +- 39 files changed, 435 insertions(+), 94 deletions(-) create mode 100644 app/src/main/java/com/ssb/simplitend/patientprofile/RegisterCompleteFragment.java rename app/src/main/res/drawable-hdpi/{img_med_type_1.png => ic_capsules.png} (100%) rename app/src/main/res/drawable-hdpi/{img_med_type_2.png => ic_pills.png} (100%) rename app/src/main/res/drawable-ldpi/{img_med_type_1.png => ic_capsules.png} (100%) rename app/src/main/res/drawable-ldpi/{img_med_type_2.png => ic_pills.png} (100%) rename app/src/main/res/drawable-mdpi/{img_med_type_1.png => ic_capsules.png} (100%) rename app/src/main/res/drawable-mdpi/{img_med_type_2.png => ic_pills.png} (100%) rename app/src/main/res/drawable-tvdpi/{img_med_type_1.png => ic_capsules.png} (100%) rename app/src/main/res/drawable-tvdpi/{img_med_type_2.png => ic_pills.png} (100%) rename app/src/main/res/drawable-xhdpi/{img_med_type_1.png => ic_capsules.png} (100%) rename app/src/main/res/drawable-xhdpi/{img_med_type_2.png => ic_pills.png} (100%) rename app/src/main/res/drawable-xxhdpi/{img_med_type_1.png => ic_capsules.png} (100%) rename app/src/main/res/drawable-xxhdpi/{img_med_type_2.png => ic_pills.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{img_med_type_1.png => ic_capsules.png} (100%) rename app/src/main/res/drawable-xxxhdpi/{img_med_type_2.png => ic_pills.png} (100%) create mode 100644 app/src/main/res/drawable/ic_drops.png create mode 100644 app/src/main/res/drawable/ic_user_filled.png create mode 100644 app/src/main/res/layout/registeration_done_fragment.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ea59fd5..0774b88 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,7 +46,6 @@ diff --git a/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java b/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java index ec012d0..801c883 100644 --- a/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java +++ b/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java @@ -10,6 +10,7 @@ import android.os.Handler; import android.util.Log; import android.view.LayoutInflater; import android.view.View; +import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java index 4d7ba84..5e1c396 100644 --- a/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java +++ b/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java @@ -101,11 +101,8 @@ public class ProfileProgressFragment extends Fragment implements ProfileContract Navigation.findNavController(v).navigate(R.id.action_profileProgressFragment_to_routineFragment) ); - binding.skipToDashboard.setOnClickListener(v -> { - Intent intent = new Intent(requireActivity(), DashBoardActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); - startActivity(intent); - requireActivity().finish(); + binding.proceed.setOnClickListener(v -> { + Navigation.findNavController(v).navigate(R.id.action_profileProgressFragment_to_registerCompleteFragment); }); } diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/RegisterCompleteFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/RegisterCompleteFragment.java new file mode 100644 index 0000000..f35ea00 --- /dev/null +++ b/app/src/main/java/com/ssb/simplitend/patientprofile/RegisterCompleteFragment.java @@ -0,0 +1,72 @@ +package com.ssb.simplitend.patientprofile; + +import android.animation.Animator; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import com.daimajia.androidanimations.library.Techniques; +import com.daimajia.androidanimations.library.YoYo; +import com.ssb.simplitend.R; +import com.ssb.simplitend.apputils.AppUtil; +import com.ssb.simplitend.databinding.RegisterationDoneFragmentBinding; + +public class RegisterCompleteFragment extends Fragment { + + public RegisterationDoneFragmentBinding binding; + + public RegisterCompleteFragment(){ + // required + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + binding = RegisterationDoneFragmentBinding.inflate(inflater, container, false); + + binding.animIv.setAnimation(R.raw.done_anim_2); + binding.animIv.playAnimation(); + + binding.animIv.addAnimatorListener(new Animator.AnimatorListener() { + @Override + public void onAnimationStart(@NonNull Animator animator) { + + } + + @Override + public void onAnimationEnd(@NonNull Animator animator) { + binding.title.setText(getString(R.string.your_profile_is_100_complete)); + YoYo.with(Techniques.FadeIn) + .duration(100) + .playOn(binding.title); + } + + @Override + public void onAnimationCancel(@NonNull Animator animator) { + + } + + @Override + public void onAnimationRepeat(@NonNull Animator animator) { + + } + }); + + binding.proceed.setOnClickListener(v -> { + AppUtil.showAlert(requireContext(), + "Ask Caregiver to register", + "Kindly ask CareGiver to complete registeration.", + "OK", + ((dialogInterface, i) -> { + + }), null, null); + }); + + return binding.getRoot(); + } +} diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/medicalinfo/AddMedicalInfoFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/medicalinfo/AddMedicalInfoFragment.java index d235d46..f4a67d9 100644 --- a/app/src/main/java/com/ssb/simplitend/patientprofile/medicalinfo/AddMedicalInfoFragment.java +++ b/app/src/main/java/com/ssb/simplitend/patientprofile/medicalinfo/AddMedicalInfoFragment.java @@ -180,9 +180,10 @@ public class AddMedicalInfoFragment extends Fragment implements binding.primaryDoc.setError("Required"); } - if (binding.docContact.getText().toString().trim().isEmpty()){ + if (binding.docContact.getText().toString().trim().isEmpty() + || binding.docContact.getText().toString().trim().length() < 10){ allOkay = false; - binding.docContact.setError("Required"); + binding.docContact.setError("Invalid"); } if (binding.hospitalPref.getText().toString().trim().isEmpty()){ diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/AddReminderFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/AddReminderFragment.java index f8fefc5..2a7384f 100644 --- a/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/AddReminderFragment.java +++ b/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/AddReminderFragment.java @@ -170,6 +170,8 @@ public class AddReminderFragment extends Fragment implements CompoundButton.OnCh // this intent is to update the reminder reminderResult.is_update = "1"; reminderResult.patientRemainderId = reminder.id; + + reminderResult.reminder_marked = reminder.reminder_marked; } else { reminderResult.is_update = "0"; } @@ -503,6 +505,8 @@ public class AddReminderFragment extends Fragment implements CompoundButton.OnCh }); + dpd.getDatePicker().setMinDate(System.currentTimeMillis()); + dpd.show(); } diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/mvvm/ReminderAdapter.java b/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/mvvm/ReminderAdapter.java index 3d1da1f..882a354 100644 --- a/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/mvvm/ReminderAdapter.java +++ b/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/mvvm/ReminderAdapter.java @@ -13,7 +13,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.ssb.simplitend.R; import com.ssb.simplitend.databinding.ReminderViewholderBinding; import com.ssb.simplitend.patientprofile.medreminder.mvvm.models.ReminderResult; -import com.ssb.simplitend.patientprofile.setuproutine.mvvm.RoutineAdapter; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -107,29 +106,22 @@ public class ReminderAdapter extends ListAdapter 0) { + switch (reminder.medication_type.get(0).title){ + case "Capsule": + binding.medImg.setImageResource(R.drawable.ic_capsules); + break; + case "Pill": + binding.medImg.setImageResource(R.drawable.ic_pills); + break; + case "Drops": + binding.medImg.setImageResource(R.drawable.ic_drops); + break; + } }else{ - binding.medImg.setImageResource(R.drawable.img_med_type_2); + binding.medImg.setImageResource(R.drawable.ic_capsules); } -// binding.done.setOnClickListener(v -> { -// if (selection_state[position]){ -// // item selected. un-selecting now -// binding.sideBar.setBackgroundTintList(null); -// binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.white_bg)); -// binding.done.setImageResource(R.drawable.ic_done_accent); -// }else{ -// // item un-selected. selecting now -// binding.sideBar.setBackgroundTintList(AppCompatResources.getColorStateList(itemView.getContext(), R.color.color_primary)); -// binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.color_accent)); -// binding.done.setImageResource(R.drawable.ic_done_accent_2); -// } -// -// selection_state[position] = !selection_state[position]; -// }); - if (reminder.reminder_marked != null){ /* This routine is done for some day. diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/setuproutine/AddRoutineFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/setuproutine/AddRoutineFragment.java index a8aa538..d78bb02 100644 --- a/app/src/main/java/com/ssb/simplitend/patientprofile/setuproutine/AddRoutineFragment.java +++ b/app/src/main/java/com/ssb/simplitend/patientprofile/setuproutine/AddRoutineFragment.java @@ -147,11 +147,38 @@ public class AddRoutineFragment extends Fragment implements CompoundButton.OnChe binding.startTime.setOnClickListener(v -> { AppUtil.closeKeyboard(requireActivity()); - getTime(binding.startTime); + binding.startTime.setError(null); + + Date selected_date = null; + + if (!binding.startTime.getText().toString().trim().isEmpty()){ + SimpleDateFormat sdf = new SimpleDateFormat("hh:mm a", Locale.getDefault()); + try { + selected_date = sdf.parse(binding.startTime.getText().toString().trim()); + }catch (Exception e){ + // do nothing + } + } + + getTime(binding.startTime, selected_date); }); + binding.endTime.setOnClickListener(v -> { AppUtil.closeKeyboard(requireActivity()); - getTime(binding.endTime); + binding.endTime.setError(null); + + Date selected_date = null; + + if (!binding.endTime.getText().toString().trim().isEmpty()){ + SimpleDateFormat sdf = new SimpleDateFormat("hh:mm a", Locale.getDefault()); + try { + selected_date = sdf.parse(binding.endTime.getText().toString().trim()); + }catch (Exception e){ + // do nothing + } + } + + getTime(binding.endTime, selected_date); }); binding.addRoutine.setOnClickListener(v -> { @@ -205,6 +232,7 @@ public class AddRoutineFragment extends Fragment implements CompoundButton.OnChe // this intent is to update the reminder routineDetails.is_update = 1; routineDetails.patientRoutineId = routine.id; + routineDetails.routine_marked = routine.routine_marked; } else { routineDetails.is_update = 0; } @@ -241,6 +269,26 @@ public class AddRoutineFragment extends Fragment implements CompoundButton.OnChe binding.endTime.setError("Required"); } + if (allOkay){ + SimpleDateFormat sdf = new SimpleDateFormat("hh:mm a", Locale.getDefault()); + + try { + Date start_date = sdf.parse(binding.startTime.getText().toString().trim()); + Date end_date = sdf.parse(binding.endTime.getText().toString().trim()); + + if (start_date == null || end_date == null) throw new Exception(); + + if (start_date.getTime() >= end_date.getTime()){ + Toast.makeText(requireContext(), "Emd time should be greater than start time.", Toast.LENGTH_SHORT).show(); + allOkay = false; + } + + } catch (Exception e) { + // do nothing + } + + } + if (allOkay) { boolean anyOneSelected = false; for (int i = 0; i < week_state.length; i++) { @@ -279,10 +327,14 @@ public class AddRoutineFragment extends Fragment implements CompoundButton.OnChe // shows time picker and sets the time picked into @textview // shows time picker to pick time and set to textview - private void getTime(TextView textView) { + private void getTime(TextView textView, Date selected_date) { Calendar calendar = Calendar.getInstance(Locale.getDefault()); + if (selected_date != null){ + calendar.setTime(selected_date); + } + TimePickerDialog tpd = new TimePickerDialog(requireContext(), (view, hourOfDay, minute) -> { diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/AddContactFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/AddContactFragment.java index 1fb78d7..4c9185f 100644 --- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/AddContactFragment.java +++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/AddContactFragment.java @@ -1,6 +1,7 @@ package com.ssb.simplitend.welcome.fragments.contacts; import static com.ssb.simplitend.welcome.fragments.contacts.ContactInfoFragment.CONTACT_DATA_KEY; +import static com.ssb.simplitend.welcome.fragments.contacts.CreateContactFragment.TO_EDIT_KEY; import android.app.ProgressDialog; import android.os.Bundle; @@ -121,8 +122,26 @@ public class AddContactFragment extends Fragment implements WelcomeContracts.Con public void onContactClick(ContactData contactData, int position) { if (contactData.id == -1){ // a new contact should be added - Navigation.findNavController(binding.getRoot()) - .navigate(R.id.action_addContactFragment_to_contactListFragment); + + + AppUtil.showAlert(requireContext(), + "Select contact", + "Add from contacts or manually?", + "Contacts", + ((dialogInterface, i) -> { + Navigation.findNavController(binding.getRoot()) + .navigate(R.id.action_addContactFragment_to_contactListFragment); + }), + "Manually", + ((dialogInterface, i) -> { + Bundle bundle = new Bundle(); + bundle.putSerializable(TO_EDIT_KEY, false); + + Navigation.findNavController(binding.getRoot()) + .navigate(R.id.action_addContactFragment_to_createContactFragment, bundle); + }) + ); + }else{ // show contact details Bundle bundle = new Bundle(); diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactInfoFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactInfoFragment.java index af7aad8..18a6ea9 100644 --- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactInfoFragment.java +++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactInfoFragment.java @@ -83,7 +83,19 @@ public class ContactInfoFragment extends Fragment implements WelcomeContracts.De binding.name.setText(contactData.first_name); binding.phoneNumber.setText(contactData.phone_number); binding.email.setText(contactData.email_address); - binding.relationship.setText(contactData.relationship); + + if (contactData.relationship == null || contactData.relationship.trim().isEmpty()){ + binding.relationship.setVisibility(View.GONE); + binding.relationshipTag.setVisibility(View.GONE); + } + + if (contactData.is_sos.equals("1")){ + binding.relationship.setText(contactData.relationship + "( Emergency contact )"); + }else{ + binding.relationship.setText(contactData.relationship); + } + + } private void clickEvents() { diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactListFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactListFragment.java index 054a51e..e382100 100644 --- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactListFragment.java +++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactListFragment.java @@ -156,8 +156,6 @@ public class ContactListFragment extends Fragment { binding.contactRv.setLayoutManager(new LinearLayoutManager(requireContext())); binding.contactRv.setAdapter(contactListAdapter); - loadContacts(); - permissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestPermission(), granted -> { if (granted) { @@ -177,6 +175,8 @@ public class ContactListFragment extends Fragment { }); + loadContacts(); + } /* diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/CreateContactFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/CreateContactFragment.java index 19c6d08..9d0611b 100644 --- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/CreateContactFragment.java +++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/CreateContactFragment.java @@ -83,6 +83,9 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts. private ContactData contactData; + // Remote contact list + protected List contactList; + public CreateContactFragment() { // required empty const. } @@ -323,9 +326,10 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts. binding.name.setError("Required"); } - if (binding.phoneNumber.getText().toString().trim().isEmpty()) { + if (binding.phoneNumber.getText().toString().trim().isEmpty() || + binding.phoneNumber.getText().toString().trim().length() < 10) { allOkay = false; - binding.phoneNumber.setError("Required"); + binding.phoneNumber.setError("Invalid"); } else if (!Patterns.PHONE.matcher(binding.phoneNumber.getText().toString()).matches()) { allOkay = false; binding.phoneNumber.setError("Invalid number"); @@ -347,6 +351,20 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts. return allOkay; } + private boolean phoneAlreadyAdded() { + + for (ContactListResponse contact: contactList){ + String contact_number = countryCodeList.get(binding.countryCodes.getSelectedIndex()) + " " + + binding.phoneNumber.getText().toString(); + + if (contact.contact_data.phone_number.equals(contact_number)){ + return true; + } + } + + return false; + } + @Override public void gotoAddFragment(BottomSheetDialog bsd) { new Handler().postDelayed(() -> { @@ -367,6 +385,9 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts. @Override public void onResponse(List contactList) { Log.d(TAG, "onResponse: " + contactList); + + this.contactList = contactList; + if (contactList.size() == 0) { // there are no contacts in remote database // thus, this contact has to be a caregiver @@ -376,6 +397,8 @@ 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 diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/LocationFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/LocationFragment.java index 77c792e..36c8144 100644 --- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/LocationFragment.java +++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/LocationFragment.java @@ -10,11 +10,17 @@ import android.content.Intent; import android.location.Location; import android.location.LocationManager; import android.os.Bundle; +import android.os.SystemClock; import android.provider.Settings; import android.util.Log; +import android.view.KeyEvent; import android.view.LayoutInflater; +import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.view.WindowManager; +import android.view.inputmethod.InputMethodManager; +import android.widget.TextView; import android.widget.Toast; import androidx.activity.result.ActivityResultLauncher; @@ -112,6 +118,15 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback, return binding.getRoot(); } + @Override + public void onStop() { + super.onStop(); + if (getActivity() != null) { + getActivity().getWindow() + .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN); + } + } + @Override public void onDestroyView() { super.onDestroyView(); @@ -124,6 +139,8 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback, loadCountriesAndStates(); + inputFieldFocusManage(); + try { loadPatientAddressSavedState(); } catch (Exception e) { @@ -160,6 +177,17 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback, } + private void inputFieldFocusManage() { + + binding.town.setOnEditorActionListener((textView, i, keyEvent) -> { + AppUtil.closeKeyboard(requireActivity()); + binding.town.clearFocus(); + binding.countrySpinner.show(); + return true; + }); + + } + // load data from watcher private void loadPatientAddressSavedState() throws Exception { PatientData patientData = viewModel.getPatientData(); @@ -461,15 +489,15 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback, binding.countrySpinner.setItems(countryList); - - if (countryList.contains(UNITED_STATES)){ - binding.countrySpinner.selectItemByIndex(countryList.indexOf(UNITED_STATES)); - - if (country_N_states_map.containsKey(UNITED_STATES)) - { - binding.stateSpinner.setItems(country_N_states_map.get(UNITED_STATES)); - } - } + // selecting United States country as by default +// if (countryList.contains(UNITED_STATES)){ +// binding.countrySpinner.selectItemByIndex(countryList.indexOf(UNITED_STATES)); +// +// if (country_N_states_map.containsKey(UNITED_STATES)) +// { +// binding.stateSpinner.setItems(country_N_states_map.get(UNITED_STATES)); +// } +// } binding.stateSpinner.setDismissWhenNotifiedItemSelected(true); binding.countrySpinner.setDismissWhenNotifiedItemSelected(true); @@ -493,10 +521,18 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback, binding.stateSpinner.setItems(stateList); binding.stateSpinner.clearSelectedItem(); } + + binding.stateSpinner.requestFocus(); }); binding.stateSpinner.setOnSpinnerItemSelectedListener((OnSpinnerItemSelectedListener) (i, s, i1, t1) -> { binding.stateSpinner.setError(null); + binding.zipCode.requestFocus(); + + if (getActivity() != null) { + getActivity().getWindow() + .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); + } }); } diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/RegisterFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/RegisterFragment.java index 0cd3c45..fb61c4c 100644 --- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/RegisterFragment.java +++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/RegisterFragment.java @@ -6,17 +6,13 @@ import android.content.Intent; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.telephony.PhoneNumberFormattingTextWatcher; -import android.telephony.PhoneNumberUtils; -import android.text.Editable; import android.text.InputFilter; -import android.text.Spanned; -import android.text.TextWatcher; import android.util.Log; import android.util.Patterns; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.WindowManager; import android.widget.Toast; import androidx.annotation.NonNull; @@ -26,7 +22,6 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.navigation.Navigation; -import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.Phonenumber; import com.ssb.simplitend.R; @@ -57,6 +52,8 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif private ProgressDialog progressDialog; + private DatePickerDialog datePickerDialog; + public RegisterFragment() { // required empty const. } @@ -75,10 +72,23 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif return binding.getRoot(); } + @Override + public void onStop() { + super.onStop(); + if (getActivity() != null) { + getActivity().getWindow() + .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN); + } + } + private void initViews() { progressDialog = new ProgressDialog(requireContext()); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + datePickerDialog = new DatePickerDialog(requireContext()); + } + countryCodeList = viewModel.loadCountryCodeDropDown(requireContext()); binding.countryCodes.setLifecycleOwner(this); @@ -93,10 +103,23 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif loadPatientDataSavedState(); + setFocusManager(); + setErrorRemovers(); } + private void setFocusManager() { + binding.name.setOnEditorActionListener((textView, i, keyEvent) -> { + AppUtil.closeKeyboard(requireActivity()); + binding.name.clearFocus(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + pickDate(); + } + return true; + }); + } + // This adds textChangeListener to all the EditTexts available to remove error if available private void setErrorRemovers() { new EditTextErrorRemover( @@ -193,6 +216,7 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif binding.dob.setError(null); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { AppUtil.closeKeyboard(requireActivity()); + pickDate(); } }); @@ -244,8 +268,9 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif } } - if (binding.contactNumber.getText().toString().trim().isEmpty()) { - binding.contactNumber.setError("Required"); + if (binding.contactNumber.getText().toString().trim().isEmpty() || + binding.contactNumber.getText().toString().trim().length() <10) { + binding.contactNumber.setError("Invalid"); allOkay = false; } else if (!Patterns.PHONE.matcher(binding.contactNumber.getText().toString()).matches()) { binding.contactNumber.setError("Invalid contact"); @@ -261,7 +286,14 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif } if (!binding.tncCheck.isChecked() && allOkay) { - Toast.makeText(requireContext(), "Please check terms and conditions to continue.", Toast.LENGTH_SHORT).show(); + AppUtil.showAlert(requireContext(), + "Accept terms and conditions", + "Please check terms and conditions to continue.", + "Ok", + ((dialogInterface, i) -> { + // do nothing + }), null, null + ); allOkay = false; } @@ -306,7 +338,7 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif @RequiresApi(api = Build.VERSION_CODES.N) private void pickDate() { - DatePickerDialog datePickerDialog = new DatePickerDialog(requireContext()); + if (datePickerDialog == null) return; Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) - 18); @@ -314,6 +346,13 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif datePickerDialog.setOnDateSetListener((view, year, month, dayOfMonth) -> { setDOB(year, month, dayOfMonth); + + binding.contactNumber.requestFocus(); + + if (getActivity() != null) { + getActivity().getWindow() + .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); + } }); datePickerDialog.show(); diff --git a/app/src/main/res/drawable-hdpi/img_med_type_1.png b/app/src/main/res/drawable-hdpi/ic_capsules.png similarity index 100% rename from app/src/main/res/drawable-hdpi/img_med_type_1.png rename to app/src/main/res/drawable-hdpi/ic_capsules.png diff --git a/app/src/main/res/drawable-hdpi/img_med_type_2.png b/app/src/main/res/drawable-hdpi/ic_pills.png similarity index 100% rename from app/src/main/res/drawable-hdpi/img_med_type_2.png rename to app/src/main/res/drawable-hdpi/ic_pills.png diff --git a/app/src/main/res/drawable-ldpi/img_med_type_1.png b/app/src/main/res/drawable-ldpi/ic_capsules.png similarity index 100% rename from app/src/main/res/drawable-ldpi/img_med_type_1.png rename to app/src/main/res/drawable-ldpi/ic_capsules.png diff --git a/app/src/main/res/drawable-ldpi/img_med_type_2.png b/app/src/main/res/drawable-ldpi/ic_pills.png similarity index 100% rename from app/src/main/res/drawable-ldpi/img_med_type_2.png rename to app/src/main/res/drawable-ldpi/ic_pills.png diff --git a/app/src/main/res/drawable-mdpi/img_med_type_1.png b/app/src/main/res/drawable-mdpi/ic_capsules.png similarity index 100% rename from app/src/main/res/drawable-mdpi/img_med_type_1.png rename to app/src/main/res/drawable-mdpi/ic_capsules.png diff --git a/app/src/main/res/drawable-mdpi/img_med_type_2.png b/app/src/main/res/drawable-mdpi/ic_pills.png similarity index 100% rename from app/src/main/res/drawable-mdpi/img_med_type_2.png rename to app/src/main/res/drawable-mdpi/ic_pills.png diff --git a/app/src/main/res/drawable-tvdpi/img_med_type_1.png b/app/src/main/res/drawable-tvdpi/ic_capsules.png similarity index 100% rename from app/src/main/res/drawable-tvdpi/img_med_type_1.png rename to app/src/main/res/drawable-tvdpi/ic_capsules.png diff --git a/app/src/main/res/drawable-tvdpi/img_med_type_2.png b/app/src/main/res/drawable-tvdpi/ic_pills.png similarity index 100% rename from app/src/main/res/drawable-tvdpi/img_med_type_2.png rename to app/src/main/res/drawable-tvdpi/ic_pills.png diff --git a/app/src/main/res/drawable-xhdpi/img_med_type_1.png b/app/src/main/res/drawable-xhdpi/ic_capsules.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/img_med_type_1.png rename to app/src/main/res/drawable-xhdpi/ic_capsules.png diff --git a/app/src/main/res/drawable-xhdpi/img_med_type_2.png b/app/src/main/res/drawable-xhdpi/ic_pills.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/img_med_type_2.png rename to app/src/main/res/drawable-xhdpi/ic_pills.png diff --git a/app/src/main/res/drawable-xxhdpi/img_med_type_1.png b/app/src/main/res/drawable-xxhdpi/ic_capsules.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/img_med_type_1.png rename to app/src/main/res/drawable-xxhdpi/ic_capsules.png diff --git a/app/src/main/res/drawable-xxhdpi/img_med_type_2.png b/app/src/main/res/drawable-xxhdpi/ic_pills.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/img_med_type_2.png rename to app/src/main/res/drawable-xxhdpi/ic_pills.png diff --git a/app/src/main/res/drawable-xxxhdpi/img_med_type_1.png b/app/src/main/res/drawable-xxxhdpi/ic_capsules.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/img_med_type_1.png rename to app/src/main/res/drawable-xxxhdpi/ic_capsules.png diff --git a/app/src/main/res/drawable-xxxhdpi/img_med_type_2.png b/app/src/main/res/drawable-xxxhdpi/ic_pills.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/img_med_type_2.png rename to app/src/main/res/drawable-xxxhdpi/ic_pills.png diff --git a/app/src/main/res/drawable/ic_drops.png b/app/src/main/res/drawable/ic_drops.png new file mode 100644 index 0000000000000000000000000000000000000000..b16aaa05597e799dc1e99fd45cd957ead7ae2d21 GIT binary patch literal 19917 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 i&u{ToBjzxAll&j_cQg?iE7|-20000 + tools:text="@string/caregiver_emergency_contact" /> diff --git a/app/src/main/res/layout/contact_view_holder.xml b/app/src/main/res/layout/contact_view_holder.xml index ed33359..bcd3337 100644 --- a/app/src/main/res/layout/contact_view_holder.xml +++ b/app/src/main/res/layout/contact_view_holder.xml @@ -32,9 +32,9 @@ android:id="@+id/image" android:layout_width="30dp" android:layout_height="30dp" - android:src="@drawable/ic_contact" + android:src="@drawable/ic_user_filled" android:contentDescription="@string/onboard_image" - /> + app:tint="@color/color_primary" /> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/profile_progress_fragment.xml b/app/src/main/res/layout/profile_progress_fragment.xml index 9be5e7b..0a92c98 100644 --- a/app/src/main/res/layout/profile_progress_fragment.xml +++ b/app/src/main/res/layout/profile_progress_fragment.xml @@ -361,29 +361,25 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/layout/registeration_done_fragment.xml b/app/src/main/res/layout/registeration_done_fragment.xml new file mode 100644 index 0000000..fd38078 --- /dev/null +++ b/app/src/main/res/layout/registeration_done_fragment.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/reminder_viewholder.xml b/app/src/main/res/layout/reminder_viewholder.xml index 6c4c76b..707b3b7 100644 --- a/app/src/main/res/layout/reminder_viewholder.xml +++ b/app/src/main/res/layout/reminder_viewholder.xml @@ -159,7 +159,7 @@ android:layout_gravity="center_vertical" - tools:srcCompat="@drawable/img_med_type_1" + tools:srcCompat="@drawable/ic_capsules" /> diff --git a/app/src/main/res/navigation/welcome_nav_graph.xml b/app/src/main/res/navigation/welcome_nav_graph.xml index 7f08cfc..48399ec 100644 --- a/app/src/main/res/navigation/welcome_nav_graph.xml +++ b/app/src/main/res/navigation/welcome_nav_graph.xml @@ -2,7 +2,7 @@ + app:startDestination="@id/splashFragment"> @@ -122,7 +122,10 @@ app:destination="@id/contactInfoFragment" /> + app:destination="@id/profileProgressFragment" + app:popUpTo="@id/addContactFragment" + app:popUpToInclusive="true" + /> + + \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index c5b738e..6df073d 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -4,11 +4,11 @@ @color/color_primary @color/color_accent - @color/black + @color/white - @color/teal_200 - @color/teal_200 - @color/black + @color/color_primary + @color/color_accent + @color/color_accent @color/cg_dash_bg diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8517b3f..da16524 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -15,9 +15,9 @@ onboard_image Avoid unwanted phone calls! Continue using your Smartphone without the annoying robocalls and spam text messages. - Have a worry\nfree stroll!! - Get direction to home with a push a button from your smartphone home screen - Never miss a med or forget a refill again + Have a worry\nfree stroll! + Get direction to home with a push a button from your smartphone home screen. + Never miss a med or forget a refill again! Configure medication reminders and alerts. Include the dosage, instructions, and refill date. Register Login @@ -243,5 +243,8 @@ FAQs Contact admin Settings + Your profile is 100% complete! + Sync with Caregiver App to proceed. + Your setup is in proceed \ No newline at end of file