From 371e6bb6bbe109c3b789638978d54ef58e767dc7 Mon Sep 17 00:00:00 2001 From: meet2711 Date: Wed, 13 Mar 2024 20:04:44 +0530 Subject: [PATCH] . --- .../apputils/BottomNotificationActivity.java | 2 +- .../PatSettingsActivity.java | 3 ++ .../foodreminders/FoodScheduler.java | 6 ++-- .../fragments/PatientDashboardFragment.java | 14 +++++----- app/src/main/res/drawable/ic_block.xml | 5 ++++ .../main/res/layout/activity_pat_settings.xml | 28 +++++++++++++++++++ app/src/main/res/values/strings.xml | 1 + 7 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable/ic_block.xml diff --git a/app/src/main/java/com/app/simplitend/apputils/BottomNotificationActivity.java b/app/src/main/java/com/app/simplitend/apputils/BottomNotificationActivity.java index 89b91ea..8a846c7 100644 --- a/app/src/main/java/com/app/simplitend/apputils/BottomNotificationActivity.java +++ b/app/src/main/java/com/app/simplitend/apputils/BottomNotificationActivity.java @@ -447,7 +447,7 @@ public class BottomNotificationActivity extends AppCompatActivity { case MEAL_REMINDER: setUpCgBottomSheet(binding, R.drawable.img_out_of_geo, - title, body, + patient_name + " has skipped their meal!", body, null, "Call senior", v -> { CaregiverDataCache.getCaregiverData(context, (careGiverData -> { diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/PatSettingsActivity.java b/app/src/main/java/com/app/simplitend/patient_dashboard/PatSettingsActivity.java index ad8a6db..272aa7a 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/PatSettingsActivity.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/PatSettingsActivity.java @@ -57,6 +57,9 @@ public class PatSettingsActivity extends AppCompatActivity implements CgHomeCont OneSignal.getUser().getPushSubscription().optOut(); } }); + + binding.callBlockCheck.setChecked(AppUtil.isCallBlockingEnabled(this)); + binding.callBlockCheck.setOnCheckedChangeListener(((compoundButton, b) -> AppUtil.setIsCallBlockingEnabled(this, b))); } private void clickEvents() { diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/foodreminders/FoodScheduler.java b/app/src/main/java/com/app/simplitend/patient_dashboard/foodreminders/FoodScheduler.java index f4faeb2..d2a4d38 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/foodreminders/FoodScheduler.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/foodreminders/FoodScheduler.java @@ -43,9 +43,9 @@ public abstract class FoodScheduler { , lunchMeal, dinnerMeal; static { - breakFastMeal = new Meal(FOOD_TIME.BREAK_FAST, 18, 56); - lunchMeal = new Meal(FOOD_TIME.LUNCH, 18, 57); - dinnerMeal = new Meal(FOOD_TIME.DINNER, 19, 17); + breakFastMeal = new Meal(FOOD_TIME.BREAK_FAST, 9, 0); + lunchMeal = new Meal(FOOD_TIME.LUNCH, 13, 0); + dinnerMeal = new Meal(FOOD_TIME.DINNER, 20, 0); } public static void scheduleFoodReminders(Context context){ diff --git a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java index dd87597..060f6f4 100644 --- a/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java +++ b/app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java @@ -93,6 +93,8 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac private ActivityResultLauncher callPermissionLauncher; + private String sos_phone_number = "911"; + // date suffixes String[] suffixes = // 0 1 2 3 4 5 6 7 8 9 @@ -131,9 +133,9 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac callPermissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> { - if (patientData == null) return; + if (sos_phone_number == null) return; - AppUtil.callPhone(requireActivity(), patientData.phone_number); + AppUtil.callPhone(requireActivity(), sos_phone_number); }); initViews(); @@ -360,18 +362,16 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac viewModel.notifyRequestedSOS(AppUtil.getPatientUid(requireContext()) + "", AppUtil.getPatientToken(requireContext())); - String phone_number = "911"; - for (ContactData contactData : contactList1) { if (contactData.is_sos.equals("1")) { - phone_number = contactData.phone_number; + sos_phone_number = contactData.phone_number; } } - if ("911".equals(phone_number)){ + if ("911".equals(sos_phone_number)){ WorkManager.getInstance(requireContext()).cancelAllWorkByTag(CALL_BLOCKING_WORk); WorkRequest workRequest = new OneTimeWorkRequest.Builder(CallUnBlockingWorker.class) - .setInitialDelay(1, TimeUnit.MINUTES) + .setInitialDelay(30, TimeUnit.MINUTES) .addTag(CALL_BLOCKING_WORk) .build(); diff --git a/app/src/main/res/drawable/ic_block.xml b/app/src/main/res/drawable/ic_block.xml new file mode 100644 index 0000000..398aa40 --- /dev/null +++ b/app/src/main/res/drawable/ic_block.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/layout/activity_pat_settings.xml b/app/src/main/res/layout/activity_pat_settings.xml index 63c4e85..509e4c7 100644 --- a/app/src/main/res/layout/activity_pat_settings.xml +++ b/app/src/main/res/layout/activity_pat_settings.xml @@ -161,6 +161,34 @@ app:showText="false" /> + + Update to 50 contacts Proceed to the payment website to select a subscription option and pay Proceed to website + Call blocking \ No newline at end of file