From 4204e2ed5440446c8a397a5107daeafd3fdac8ac Mon Sep 17 00:00:00 2001 From: 14Sandee Date: Wed, 22 Nov 2023 13:55:26 +0530 Subject: [PATCH] , --- .idea/deploymentTargetDropDown.xml | 6 ++--- .../simplitend/appblocking/FUAActivity.java | 3 ++- .../com/app/simplitend/apputils/AppUtil.java | 13 +++++++---- .../apputils/NotificationService.java | 6 +++++ .../simplitend/apputils/RetrofitHelper.java | 2 ++ .../simplitend/articles/ArticlesAdapter.java | 6 ++--- .../activities/CaregiverDashActivity.java | 12 +++++----- .../activities/CaregiverProfileActivity.java | 11 +++++---- .../activities/EditProfileInfoActivity.java | 23 ++++++++++--------- .../fragments/CgDashBoardFragment.java | 7 +++--- .../fragments/MyPatientFragment.java | 3 ++- .../app/simplitend/chats/ChatsActivity.java | 10 ++++---- .../fragments/PatientDashboardFragment.java | 12 ++++++---- .../fragments/PatientProfileInfoFragment.java | 6 ++--- .../GeoFenceBroadcastReceiver.java | 10 ++++---- .../contacts/ContactInfoFragment.java | 7 +++--- .../contacts/CreateContactFragment.java | 4 ++-- .../contacts/mvvm/AddContactAdapter.java | 3 ++- 18 files changed, 82 insertions(+), 62 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index f53a877..9e79574 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -6,13 +6,13 @@ - - + + - + diff --git a/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java b/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java index f14c051..1bfa383 100644 --- a/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java +++ b/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java @@ -33,6 +33,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.app.simplitend.R; import com.app.simplitend.apputils.AppUtil; import com.app.simplitend.apputils.PatientDataCache; +import com.app.simplitend.apputils.RetrofitHelper; import com.app.simplitend.databinding.FuaEduDialogBinding; import com.bumptech.glide.Glide; @@ -84,7 +85,7 @@ public class FUAActivity extends AppCompatActivity { PatientDataCache.getPatientData(this, (patientData -> { if (patientData != null && patientData.profile_photo != null){ Glide.with(this) - .load(AppUtil.IMAGE_BASE_URL + patientData.profile_photo) + .load(RetrofitHelper.IMAGE_BASE_URL + patientData.profile_photo) .placeholder(R.drawable.senior_img) .error(R.drawable.senior_img) .fitCenter() diff --git a/app/src/main/java/com/app/simplitend/apputils/AppUtil.java b/app/src/main/java/com/app/simplitend/apputils/AppUtil.java index c5de240..7557ddc 100644 --- a/app/src/main/java/com/app/simplitend/apputils/AppUtil.java +++ b/app/src/main/java/com/app/simplitend/apputils/AppUtil.java @@ -75,7 +75,6 @@ import java.util.TimeZone; public abstract class AppUtil { - public static final String IMAGE_BASE_URL = "https://simplitend.betadelivery.com/storage/upload/"; private static final String TAG = "AppUtil"; public static final String NOTIFICATION_ACTION = "com.simplitend.NOTIFICATION_ACTION"; @@ -438,7 +437,7 @@ public abstract class AppUtil { // geofence details clear updatePatientGeofence(context, null, null, null, null, null); - updatePatientGeofenceChatsCred(context, -1, -1); + updatePatientGeofenceChatsCred(context, -1, -1, -1); // removing geofence of same tag removeGeofence(context); @@ -450,7 +449,7 @@ public abstract class AppUtil { } public static void removeGeofence(Context context) { - Log.d(GEOFENCE_TAG, "REMOVING GEOFENCE ID:" + GEOFENCE_ID); + Log.d(GEOFENCE_TAG, "REMOVING GEOFENCE ID: " + GEOFENCE_ID); GeofencingClient geofencingClient = LocationServices.getGeofencingClient(context); geofencingClient.removeGeofences(Collections.singletonList(GEOFENCE_ID)).addOnSuccessListener(v -> { Log.d(GEOFENCE_TAG, "patientSignOut: GEOFENCE REMOVED"); @@ -570,15 +569,17 @@ public abstract class AppUtil { private static final String PATIENT_GEOFENCE_CG_ID = "pg_cg_uid"; private static final String PATIENT_GEOFENCE_CHANNEL_ID = "pg_channel_uid"; + private static final String PATIENT_GEOFENCE_PATIENT_PRINCIPLE_ID = "pg_channel_uid"; public static void updatePatientGeofenceChatsCred(Context context, int cg_id, - int channel_id){ + int channel_id, int patient_principal_id){ SharedPreferences sp = context.getSharedPreferences(PATIENT_DETAILS, Context.MODE_PRIVATE); SharedPreferences.Editor editor = sp.edit(); editor.putInt(PATIENT_GEOFENCE_CG_ID, cg_id); editor.putInt(PATIENT_GEOFENCE_CHANNEL_ID, channel_id); + editor.putInt(PATIENT_GEOFENCE_PATIENT_PRINCIPLE_ID, patient_principal_id); editor.apply(); } @@ -588,12 +589,14 @@ public abstract class AppUtil { // 0 -> patient_id // 1 -> caregiver_id // 2 -> channel_id + // 3 -> patient_principal_id @NonNull public static int[] getPatientGeofenceChatCred(Context context){ SharedPreferences sp = context.getSharedPreferences(PATIENT_DETAILS, Context.MODE_PRIVATE); return new int[]{sp.getInt(PATIENT_UID, -1), sp.getInt(PATIENT_GEOFENCE_CG_ID, -1), - sp.getInt(PATIENT_GEOFENCE_CHANNEL_ID, -1)}; + sp.getInt(PATIENT_GEOFENCE_CHANNEL_ID, -1), + sp.getInt(PATIENT_GEOFENCE_PATIENT_PRINCIPLE_ID, -1)}; } public static void updatePatientGeofence(Context context, diff --git a/app/src/main/java/com/app/simplitend/apputils/NotificationService.java b/app/src/main/java/com/app/simplitend/apputils/NotificationService.java index 9f8cba4..e674241 100644 --- a/app/src/main/java/com/app/simplitend/apputils/NotificationService.java +++ b/app/src/main/java/com/app/simplitend/apputils/NotificationService.java @@ -60,6 +60,12 @@ public class NotificationService implements INotificationServiceExtension { } } + if (Constants.CHATS_NOTIFICATIONS.equals(content_type)){ + // chat notifications doesn't need to be handled for bottom sheet + // or broadcasts + return; + } + Intent intent = new Intent(iNotificationReceivedEvent.getContext(), BottomNotificationActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setAction(NOTIFICATION_ACTION); diff --git a/app/src/main/java/com/app/simplitend/apputils/RetrofitHelper.java b/app/src/main/java/com/app/simplitend/apputils/RetrofitHelper.java index 7af21f3..1f07b5d 100644 --- a/app/src/main/java/com/app/simplitend/apputils/RetrofitHelper.java +++ b/app/src/main/java/com/app/simplitend/apputils/RetrofitHelper.java @@ -18,6 +18,8 @@ public abstract class RetrofitHelper { // Staging BASE URL // private static final String BASE_URL = "https://simplitendapp.betadelivery.com/"; + public static final String IMAGE_BASE_URL = BASE_URL + "storage/upload/"; + public static final String CREATE_CONTACT = "api/contact-create"; public static final String UPDATE_CONTACT = "api/patient-contact-update/"; diff --git a/app/src/main/java/com/app/simplitend/articles/ArticlesAdapter.java b/app/src/main/java/com/app/simplitend/articles/ArticlesAdapter.java index b845cf9..1467cfa 100644 --- a/app/src/main/java/com/app/simplitend/articles/ArticlesAdapter.java +++ b/app/src/main/java/com/app/simplitend/articles/ArticlesAdapter.java @@ -8,9 +8,9 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.ListAdapter; import androidx.recyclerview.widget.RecyclerView; -import com.bumptech.glide.Glide; -import com.app.simplitend.apputils.AppUtil; +import com.app.simplitend.apputils.RetrofitHelper; import com.app.simplitend.databinding.ArticleViewHolderBinding; +import com.bumptech.glide.Glide; import java.text.SimpleDateFormat; import java.util.Date; @@ -75,7 +75,7 @@ public class ArticlesAdapter extends ListAdapter { @NonNull private final String message; - private final int patientId, cg_id, channel_id; + private final int patientId, cg_id, channel_id, patient_principal_id; - public SendMessageTask(@NonNull String message, int patientId, int cg_id, int channel_id) { + public SendMessageTask(@NonNull String message, int patientId, int cg_id, int channel_id, int patient_principal_id) { this.patientId = patientId; this.cg_id = cg_id; this.channel_id = channel_id; this.message = message; + this.patient_principal_id = patient_principal_id; } @Override @@ -129,7 +130,8 @@ public class GeoFenceBroadcastReceiver extends BroadcastReceiver { @Override public void onSocketConnected() { Log.d(GEOFENCE_TAG, "doInBackground: SOCKET CONNECTED"); - socketHelper.sendMessage(message, cg_id + "", patientId + "", channel_id + "", null); + socketHelper.sendMessage(message, cg_id + "", patientId + "", channel_id + "", + patient_principal_id < 0?null:patient_principal_id+""); } @Override diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/ContactInfoFragment.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/ContactInfoFragment.java index 34c2078..80f6a41 100644 --- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/ContactInfoFragment.java +++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/ContactInfoFragment.java @@ -19,14 +19,15 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.navigation.Navigation; -import com.bumptech.glide.Glide; -import com.skydoves.powerspinner.OnSpinnerItemSelectedListener; import com.app.simplitend.R; import com.app.simplitend.apputils.AppUtil; +import com.app.simplitend.apputils.RetrofitHelper; import com.app.simplitend.databinding.ContactInfoFragmentBinding; import com.app.simplitend.welcome.welcomepatient.fragments.contacts.mvvm.ContactViewModel; import com.app.simplitend.welcome.welcomepatient.fragments.contacts.mvvm.models.ContactData; import com.app.simplitend.welcome.welcomepatient.mvvm.WelcomeContracts; +import com.bumptech.glide.Glide; +import com.skydoves.powerspinner.OnSpinnerItemSelectedListener; import java.util.ArrayList; import java.util.Arrays; @@ -109,7 +110,7 @@ public class ContactInfoFragment extends Fragment implements WelcomeContracts.De private void loadUserData() { if (contactData.contact_photo != null){ Glide.with(requireContext()) - .load(AppUtil.IMAGE_BASE_URL + contactData.contact_photo) + .load(RetrofitHelper.IMAGE_BASE_URL + contactData.contact_photo) .placeholder(android.R.color.darker_gray) .error(R.drawable.ic_contact) .fitCenter().into(binding.image); diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java index 1d60d7e..5ce112b 100644 --- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java +++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java @@ -30,6 +30,7 @@ import androidx.navigation.Navigation; import com.app.simplitend.R; import com.app.simplitend.apputils.AppUtil; +import com.app.simplitend.apputils.RetrofitHelper; import com.app.simplitend.apputils.TextUtils; import com.app.simplitend.databinding.CreateContactViewHolderBinding; import com.app.simplitend.databinding.CreateEditContactFragmentBinding; @@ -50,7 +51,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.regex.Pattern; import okhttp3.MediaType; import okhttp3.MultipartBody; @@ -498,7 +498,7 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts. if (contactData.contact_photo != null) { Glide.with(requireContext()) - .load(AppUtil.IMAGE_BASE_URL + contactData.contact_photo) + .load(RetrofitHelper.IMAGE_BASE_URL + contactData.contact_photo) .placeholder(android.R.color.darker_gray) .error(R.drawable.ic_contact) .fitCenter().into(binding.image); diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/AddContactAdapter.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/AddContactAdapter.java index c66abfd..aeca4a2 100644 --- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/AddContactAdapter.java +++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/AddContactAdapter.java @@ -14,6 +14,7 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.ListAdapter; import androidx.recyclerview.widget.RecyclerView; +import com.app.simplitend.apputils.RetrofitHelper; import com.bumptech.glide.Glide; import com.app.simplitend.R; import com.app.simplitend.apputils.AppUtil; @@ -120,7 +121,7 @@ public class AddContactAdapter extends ListAdapter