Aditya.Gaikwad/SimpliTend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

,

Browse Source
This commit is contained in:
14Sandee
2023-11-22 13:55:26 +05:30
parent c9964bba14
commit 4204e2ed54
18 changed files with 82 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/deploymentTargetDropDown.xml generated
View File

@@ -6,13 +6,13 @@
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="RZCW41EJRPN" />
<type value="VIRTUAL_DEVICE_PATH" />
<value value="$USER_HOME$/.android/avd/Pixel_7_Pro_API_33.avd" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-11-21T15:39:20.583874Z" />
<timeTargetWasSelectedWithDropDown value="2023-11-22T07:34:23.403084Z" />
<targetsSelectedWithDialog>
<Target>
<type value="QUICK_BOOT_TARGET" />

3
app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java
View File

@@ -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()

13
app/src/main/java/com/app/simplitend/apputils/AppUtil.java
View File

@@ -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,

6
app/src/main/java/com/app/simplitend/apputils/NotificationService.java
View File

@@ -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);

2
app/src/main/java/com/app/simplitend/apputils/RetrofitHelper.java
View File

@@ -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/";

6
app/src/main/java/com/app/simplitend/articles/ArticlesAdapter.java
View File

@@ -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<ArticleResult, ArticlesAdapter.
if (articleResult == null) return;
Glide.with(binding.articleImg)
.load(AppUtil.IMAGE_BASE_URL + articleResult.large_image)
.load(RetrofitHelper.IMAGE_BASE_URL + articleResult.large_image)
.placeholder(android.R.color.darker_gray)
.error(android.R.color.darker_gray)
.into(binding.articleImg);

12
app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
View File

@@ -12,20 +12,20 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import com.app.simplitend.R;
import com.app.simplitend.apputils.AppUtil;
import com.app.simplitend.apputils.CaregiverDataCache;
import com.app.simplitend.apputils.RetrofitHelper;
import com.app.simplitend.articles.ArticlesActivity;
import com.app.simplitend.caregiverdashboard.fragments.CgDashBoardFragment;
import com.app.simplitend.caregiverdashboard.fragments.MyPatientFragment;
import com.app.simplitend.caregiverdashboard.mvvm.CaregiverMainViewModel;
import com.app.simplitend.cg_subscription.CgSubscriptionActivity;
import com.app.simplitend.chats.ChatFragment;
import com.app.simplitend.chats.SocketHelper;
import com.app.simplitend.customsviews.HomeBottomNav;
import com.app.simplitend.customsviews.MenuItem;
import com.app.simplitend.databinding.CaregiverDashboardActivityBinding;
import com.app.simplitend.databinding.CaregiverDashboardMenuBinding;
import com.app.simplitend.faqs.FAQ_Activity;
import com.app.simplitend.chats.ChatFragment;
import com.app.simplitend.chats.SocketHelper;
import com.app.simplitend.welcome.welcomecg.mvvm.CareGiverData;
import com.bumptech.glide.Glide;
import com.yarolegovich.slidingrootnav.SlidingRootNavBuilder;
@@ -188,7 +188,7 @@ public class CaregiverDashActivity extends AppCompatActivity implements
if (careGiverData.profile_photo != null) {
Glide.with(this)
.load(AppUtil.IMAGE_BASE_URL + careGiverData.profile_photo)
.load(RetrofitHelper.IMAGE_BASE_URL + careGiverData.profile_photo)
.placeholder(android.R.color.darker_gray)
.error(R.drawable.caregiver_img)
.into(menuBinding.cgImage);
@@ -290,14 +290,14 @@ public class CaregiverDashActivity extends AppCompatActivity implements
if (careGiverData1.profile_photo == null){
sender_image = String.valueOf(R.drawable.caregiver_img);
}else{
sender_image = AppUtil.IMAGE_BASE_URL + careGiverData1.profile_photo;
sender_image = RetrofitHelper.IMAGE_BASE_URL + careGiverData1.profile_photo;
}
String receiver_image;
if (careGiverData1.patientDetails.profile_photo == null){
receiver_image = String.valueOf(R.drawable.senior_img);
}else{
receiver_image = AppUtil.IMAGE_BASE_URL + careGiverData1.patientDetails.profile_photo;
receiver_image = RetrofitHelper.IMAGE_BASE_URL + careGiverData1.patientDetails.profile_photo;
}
replaceFragment(new ChatFragment(

11
app/src/main/java/com/app/simplitend/caregiverdashboard/activities/CaregiverProfileActivity.java
View File

@@ -3,9 +3,6 @@ package com.app.simplitend.caregiverdashboard.activities;
import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG;
import static com.app.simplitend.caregiverdashboard.activities.EditProfileInfoActivity.IS_CAREGIVER;
import androidx.appcompat.app.AppCompatActivity;
import androidx.biometric.BiometricManager;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
@@ -14,12 +11,16 @@ import android.view.View;
import android.widget.CompoundButton;
import android.widget.Toast;
import com.bumptech.glide.Glide;
import androidx.appcompat.app.AppCompatActivity;
import androidx.biometric.BiometricManager;
import com.app.simplitend.R;
import com.app.simplitend.apputils.AppUtil;
import com.app.simplitend.apputils.CaregiverDataCache;
import com.app.simplitend.apputils.RetrofitHelper;
import com.app.simplitend.databinding.ActivityCaregiverProfileBinding;
import com.app.simplitend.welcome.welcomecg.mvvm.CareGiverData;
import com.bumptech.glide.Glide;
public class CaregiverProfileActivity extends AppCompatActivity implements CompoundButton.OnCheckedChangeListener {
@@ -65,7 +66,7 @@ public class CaregiverProfileActivity extends AppCompatActivity implements Compo
if (careGiverData.profile_photo != null) {
// image
Glide.with(this)
.load(AppUtil.IMAGE_BASE_URL + careGiverData.profile_photo)
.load(RetrofitHelper.IMAGE_BASE_URL + careGiverData.profile_photo)
.placeholder(android.R.color.darker_gray)
.error(R.drawable.caregiver_img)
.into(binding.image);

23
app/src/main/java/com/app/simplitend/caregiverdashboard/activities/EditProfileInfoActivity.java
View File

@@ -23,23 +23,24 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.ViewModelProvider;
import com.app.simplitend.R;
import com.app.simplitend.apputils.AppUtil;
import com.app.simplitend.apputils.CaregiverDataCache;
import com.app.simplitend.apputils.EditTextErrorRemover;
import com.app.simplitend.apputils.PatientDataCache;
import com.app.simplitend.apputils.RetrofitHelper;
import com.app.simplitend.apputils.TextUtils;
import com.app.simplitend.caregiverdashboard.mvvm.CaregiverMainViewModel;
import com.app.simplitend.caregiverdashboard.mvvm.CgHomeContracts;
import com.app.simplitend.databinding.ActivityPersonalInfoBinding;
import com.app.simplitend.welcome.welcomecg.mvvm.CareGiverData;
import com.app.simplitend.welcome.welcomepatient.mvvm.models.PatientData;
import com.bumptech.glide.Glide;
import com.github.dhaval2404.imagepicker.ImagePicker;
import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.Phonenumber;
import com.skydoves.powerspinner.OnSpinnerItemSelectedListener;
import com.app.simplitend.R;
import com.app.simplitend.apputils.AppUtil;
import com.app.simplitend.apputils.CaregiverDataCache;
import com.app.simplitend.apputils.PatientDataCache;
import com.app.simplitend.caregiverdashboard.mvvm.CaregiverMainViewModel;
import com.app.simplitend.caregiverdashboard.mvvm.CgHomeContracts;
import com.app.simplitend.databinding.ActivityPersonalInfoBinding;
import com.app.simplitend.welcome.welcomecg.mvvm.CareGiverData;
import com.app.simplitend.welcome.welcomepatient.mvvm.models.PatientData;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -170,7 +171,7 @@ public class EditProfileInfoActivity extends AppCompatActivity implements
if (careGiverData.profile_photo != null){
Glide.with(this)
.load(AppUtil.IMAGE_BASE_URL + careGiverData.profile_photo)
.load(RetrofitHelper.IMAGE_BASE_URL + careGiverData.profile_photo)
.placeholder(android.R.color.darker_gray)
.error(R.drawable.caregiver_img)
.into(binding.image);
@@ -184,7 +185,7 @@ public class EditProfileInfoActivity extends AppCompatActivity implements
// load patient data
if (patientData.profile_photo != null){
Glide.with(this)
.load(AppUtil.IMAGE_BASE_URL + patientData.profile_photo)
.load(RetrofitHelper.IMAGE_BASE_URL + patientData.profile_photo)
.placeholder(android.R.color.darker_gray)
.error(R.drawable.caregiver_img)
.into(binding.image);

7
app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/CgDashBoardFragment.java
View File

@@ -29,6 +29,7 @@ import com.app.simplitend.R;
import com.app.simplitend.apputils.AppUtil;
import com.app.simplitend.apputils.CaregiverDataCache;
import com.app.simplitend.apputils.Constants;
import com.app.simplitend.apputils.RetrofitHelper;
import com.app.simplitend.articles.ArticleContracts;
import com.app.simplitend.articles.ArticleResult;
import com.app.simplitend.articles.ArticleShowerActivity;
@@ -55,7 +56,6 @@ import com.google.android.gms.maps.OnMapReadyCallback;
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.Marker;
import com.google.android.gms.maps.model.MarkerOptions;
import java.text.SimpleDateFormat;
@@ -64,7 +64,6 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.TimeZone;
public class CgDashBoardFragment extends Fragment implements
@@ -270,7 +269,7 @@ public class CgDashBoardFragment extends Fragment implements
if (articleResult == null) return;
Glide.with(binding.articleImg)
.load(AppUtil.IMAGE_BASE_URL + articleResult.large_image)
.load(RetrofitHelper.IMAGE_BASE_URL + articleResult.large_image)
.centerCrop()
.placeholder(android.R.color.darker_gray)
.error(android.R.color.darker_gray)
@@ -288,7 +287,7 @@ public class CgDashBoardFragment extends Fragment implements
if (articleResult.article_author_img != null){
Glide.with(binding.authorImg)
.load(AppUtil.IMAGE_BASE_URL + articleResult.article_author_img)
.load(RetrofitHelper.IMAGE_BASE_URL + articleResult.article_author_img)
.centerCrop()
.placeholder(android.R.color.darker_gray)
.error(R.drawable.static_3)

3
app/src/main/java/com/app/simplitend/caregiverdashboard/fragments/MyPatientFragment.java
View File

@@ -24,6 +24,7 @@ import androidx.lifecycle.ViewModelProvider;
import com.app.simplitend.R;
import com.app.simplitend.apputils.AppUtil;
import com.app.simplitend.apputils.CaregiverDataCache;
import com.app.simplitend.apputils.RetrofitHelper;
import com.app.simplitend.caregiverdashboard.activities.EditProfileInfoActivity;
import com.app.simplitend.caregiverdashboard.activities.PatientProfileShowerActivity;
import com.app.simplitend.caregiverdashboard.mvvm.CaregiverMainViewModel;
@@ -82,7 +83,7 @@ public class MyPatientFragment extends Fragment implements CgHomeContracts.GetGe
if (careGiverData1.patientDetails.profile_photo != null){
Glide.with(requireContext())
.load(AppUtil.IMAGE_BASE_URL + careGiverData1.patientDetails.profile_photo)
.load(RetrofitHelper.IMAGE_BASE_URL + careGiverData1.patientDetails.profile_photo)
.placeholder(android.R.color.darker_gray)
.error(R.drawable.caregiver_img)
.into(binding.profileImg);

10
app/src/main/java/com/app/simplitend/chats/ChatsActivity.java
View File

@@ -1,12 +1,12 @@
package com.app.simplitend.chats;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import com.app.simplitend.R;
import com.app.simplitend.apputils.AppUtil;
import com.app.simplitend.apputils.CaregiverDataCache;
import com.app.simplitend.apputils.RetrofitHelper;
public class ChatsActivity extends AppCompatActivity {
@@ -22,14 +22,14 @@ public class ChatsActivity extends AppCompatActivity {
if (careGiverData1.profile_photo == null){
sender_image = String.valueOf(R.drawable.caregiver_img);
}else{
sender_image = AppUtil.IMAGE_BASE_URL + careGiverData1.profile_photo;
sender_image = RetrofitHelper.IMAGE_BASE_URL + careGiverData1.profile_photo;
}
String receiver_image;
if (careGiverData1.patientDetails.profile_photo == null){
receiver_image = String.valueOf(R.drawable.senior_img);
}else{
receiver_image = AppUtil.IMAGE_BASE_URL + careGiverData1.patientDetails.profile_photo;
receiver_image = RetrofitHelper.IMAGE_BASE_URL + careGiverData1.patientDetails.profile_photo;
}
getSupportFragmentManager().beginTransaction()

12
app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientDashboardFragment.java
View File

@@ -34,12 +34,13 @@ import com.app.simplitend.appblocking.FUAActivity;
import com.app.simplitend.apputils.AppUtil;
import com.app.simplitend.apputils.Constants;
import com.app.simplitend.apputils.PatientDataCache;
import com.app.simplitend.apputils.RetrofitHelper;
import com.app.simplitend.caregiverdashboard.mvvm.CaregiverMainViewModel;
import com.app.simplitend.chats.ChatFragment;
import com.app.simplitend.databinding.PatientDashboardFragmentBinding;
import com.app.simplitend.patient_dashboard.DirectionToHomeActivity;
import com.app.simplitend.patient_dashboard.NotificationsActivity;
import com.app.simplitend.patient_dashboard.PatientMainViewModel;
import com.app.simplitend.chats.ChatFragment;
import com.app.simplitend.patientprofile.ProfileContracts;
import com.app.simplitend.patientprofile.medreminder.mvvm.ReminderViewModel;
import com.app.simplitend.patientprofile.medreminder.mvvm.models.NearestActivity;
@@ -156,7 +157,8 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac
AppUtil.updatePatientGeofenceChatsCred(
requireContext(),
cg_id,
channel_id
channel_id,
patientData.id
);
}
@@ -193,7 +195,7 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac
if (patientData.profile_photo != null) {
Glide.with(requireContext())
.load(AppUtil.IMAGE_BASE_URL + patientData.profile_photo)
.load(RetrofitHelper.IMAGE_BASE_URL + patientData.profile_photo)
.diskCacheStrategy(DiskCacheStrategy.DATA)
.fitCenter()
.placeholder(android.R.color.darker_gray)
@@ -259,14 +261,14 @@ public class PatientDashboardFragment extends Fragment implements ProfileContrac
if (patientData1.profile_photo == null){
sender_image = String.valueOf(R.drawable.senior_img);
}else{
sender_image = AppUtil.IMAGE_BASE_URL + patientData.profile_photo;
sender_image = RetrofitHelper.IMAGE_BASE_URL + patientData.profile_photo;
}
String receiver_image;
if (patientData.caregiver_profile_photo == null){
receiver_image = String.valueOf(R.drawable.caregiver_img);
}else{
receiver_image = AppUtil.IMAGE_BASE_URL + patientData.caregiver_profile_photo;
receiver_image = RetrofitHelper.IMAGE_BASE_URL + patientData.caregiver_profile_photo;
}
getParentFragmentManager().beginTransaction()

6
app/src/main/java/com/app/simplitend/patient_dashboard/fragments/PatientProfileInfoFragment.java
View File

@@ -19,16 +19,16 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.bumptech.glide.Glide;
import com.app.simplitend.R;
import com.app.simplitend.appblocking.FUAActivity;
import com.app.simplitend.apputils.AppUtil;
import com.app.simplitend.apputils.PatientDataCache;
import com.app.simplitend.apputils.RetrofitHelper;
import com.app.simplitend.caregiverdashboard.activities.EditProfileInfoActivity;
import com.app.simplitend.caregiverdashboard.activities.PatientProfileShowerActivity;
import com.app.simplitend.databinding.ActivityPatProfileInfoBinding;
import com.app.simplitend.patient_dashboard.PatSettingsActivity;
import com.app.simplitend.welcome.welcomepatient.mvvm.models.PatientData;
import com.bumptech.glide.Glide;
public class PatientProfileInfoFragment extends Fragment {
@@ -71,7 +71,7 @@ public class PatientProfileInfoFragment extends Fragment {
if (patientData.profile_photo != null) {
// image
Glide.with(this)
.load(AppUtil.IMAGE_BASE_URL + patientData.profile_photo)
.load(RetrofitHelper.IMAGE_BASE_URL + patientData.profile_photo)
.placeholder(android.R.color.darker_gray)
.error(R.drawable.senior_img)
.into(binding.image);

10
app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java
View File

@@ -104,19 +104,20 @@ public class GeoFenceBroadcastReceiver extends BroadcastReceiver {
}
// sending message
new SendMessageTask(message, chatsCred[0], chatsCred[1], chatsCred[2]).execute();
new SendMessageTask(message, chatsCred[0], chatsCred[1], chatsCred[2], chatsCred[3]).execute();
}
public static class SendMessageTask extends AsyncTask<Void, Void, Void> {
@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

7
app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/ContactInfoFragment.java
View File

@@ -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);

4
app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
View File

@@ -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);

3
app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/AddContactAdapter.java
View File

@@ -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<ContactData, AddContactAdapte
binding.imag.setVisibility(View.VISIBLE);
Glide.with(itemView.getContext())
.load(AppUtil.IMAGE_BASE_URL + contact.contact_photo)
.load(RetrofitHelper.IMAGE_BASE_URL + contact.contact_photo)
.placeholder(android.R.color.darker_gray)
.error(R.drawable.ic_contact)
.fitCenter().into(binding.imag);