diff --git a/app/build.gradle b/app/build.gradle index 60f97ff..f65803c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { applicationId "com.app.simplitend" minSdk 24 targetSdk 33 - versionCode 4 + versionCode 5 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/PatientProfileShowerActivity.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/PatientProfileShowerActivity.java index b8c7549..0f219fc 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/PatientProfileShowerActivity.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/activities/PatientProfileShowerActivity.java @@ -70,6 +70,7 @@ public class PatientProfileShowerActivity extends AppCompatActivity { switch (which_f){ case CONTACTS_F: fragment = new AddContactFragment(); + ((AddContactFragment) fragment).setIsSetupComplete(true); break; case MED_REMINDER_F: fragment = new ReminderFragment(); diff --git a/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java b/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java index f2510f1..f395674 100644 --- a/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java +++ b/app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java @@ -57,6 +57,9 @@ import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.MarkerOptions; +import com.onesignal.OneSignal; +import com.onesignal.notifications.INotificationLifecycleListener; +import com.onesignal.notifications.INotificationWillDisplayEvent; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -67,7 +70,7 @@ import java.util.Locale; import java.util.TimeZone; public class CgDashBoardFragment extends Fragment implements - OnMapReadyCallback, ArticleContracts.GetArticleCallback, CgHomeContracts.GetGeoFenceCallback, ProfileContracts.GetRemindersListCallback, CaregiverMainViewModel.GetNearestResultCallback, ProfileContracts.GetRoutinesCallback, CaregiverMainViewModel.GetNearestActivityCallback { + OnMapReadyCallback, ArticleContracts.GetArticleCallback, CgHomeContracts.GetGeoFenceCallback, ProfileContracts.GetRemindersListCallback, CaregiverMainViewModel.GetNearestResultCallback, ProfileContracts.GetRoutinesCallback, CaregiverMainViewModel.GetNearestActivityCallback, INotificationLifecycleListener { // view binding protected CaregiverDashFragmentBinding binding; @@ -141,12 +144,15 @@ public class CgDashBoardFragment extends Fragment implements loadArticles(); + OneSignal.getNotifications().addForegroundLifecycleListener(this); + return binding.getRoot(); } @Override public void onResume() { super.onResume(); + updateNotificationsCount(); CaregiverDataCache.getCaregiverData(requireActivity(), (careGiverData1 -> { this.careGiverData = careGiverData1; @@ -162,6 +168,18 @@ public class CgDashBoardFragment extends Fragment implements } catch (Exception e) { // do nothing } + + OneSignal.getNotifications().removeForegroundLifecycleListener(this); + } + + private void updateNotificationsCount() { + int notificationsCount = AppUtil.getNoOfNotificationsCount(requireContext()); + if (notificationsCount > 0){ + binding.notificationCount.setText(String.valueOf(notificationsCount)); + binding.notificationCount.setVisibility(View.VISIBLE); + }else { + binding.notificationCount.setVisibility(View.GONE); + } } private void loadActivities() { @@ -639,4 +657,13 @@ public class CgDashBoardFragment extends Fragment implements viewModel.ongoingActivityText = binding.onGoingActivity.getText().toString(); viewModel.upcomingActivityText = binding.upcomingActivity.getText().toString(); } + + @Override + public void onWillDisplay(@NonNull INotificationWillDisplayEvent iNotificationWillDisplayEvent) { + try { + requireActivity().runOnUiThread(this::updateNotificationsCount); + } catch (Exception e) { + // do nothing + } + } } diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/AddContactFragment.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/AddContactFragment.java index 8a08289..ef139c0 100644 --- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/AddContactFragment.java +++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/AddContactFragment.java @@ -49,10 +49,16 @@ public class AddContactFragment extends Fragment implements WelcomeContracts.Con private int contacts_count; private boolean is_doctor_set; + private boolean isSetupComplete; + public AddContactFragment(){ // required empty const. } + public void setIsSetupComplete(boolean isSetupComplete){ + this.isSetupComplete = isSetupComplete; + } + @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { @@ -60,6 +66,10 @@ public class AddContactFragment extends Fragment implements WelcomeContracts.Con contactViewModel = new ViewModelProvider(requireActivity()).get(ContactViewModel.class); + if (isSetupComplete) { + binding.titleTxt.setText("Contacts"); + } + initViews(); clickEvents(); diff --git a/app/src/main/res/layout/add_contact_fragment.xml b/app/src/main/res/layout/add_contact_fragment.xml index fa94aa1..d20a3ed 100644 --- a/app/src/main/res/layout/add_contact_fragment.xml +++ b/app/src/main/res/layout/add_contact_fragment.xml @@ -24,6 +24,7 @@ android:src="@drawable/arrow_back" /> - - /> + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d1ccb26..36c331d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -98,7 +98,7 @@ Changes successful Details added successfully Let\'s make a list of your 10 favorite contacts - Spam calls and calls from anyone not on this list will be blocked + Calls from other contacts not in this list will be blocked Contact information static_12345@gmail.com 12-02-2001