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 9d9f13c..231149e 100644 --- a/app/src/main/java/com/app/simplitend/apputils/BottomNotificationActivity.java +++ b/app/src/main/java/com/app/simplitend/apputils/BottomNotificationActivity.java @@ -13,6 +13,7 @@ import static com.app.simplitend.apputils.Constants.MEDICATION_REFILL; import static com.app.simplitend.apputils.Constants.REMINDER_EXTRA_KEY; import static com.app.simplitend.apputils.NotificationService.CONTENT_TYPE_KEY; import static com.app.simplitend.apputils.NotificationService.NOTIFICATION_CONTENT_ID_KEY; +import static com.app.simplitend.apputils.NotificationService.NOTIFICATION_MEAL_TYPE_KEY; import static com.app.simplitend.apputils.NotificationService.NOTIFICATION_SENIOR_ADDRESS_KEY; import static com.app.simplitend.locationupdates.LocationService.EXTRA_BATTERY_PERCENTAGE; import static com.app.simplitend.patient_dashboard.foodreminders.FoodReminderYesReceiver.WHICH_FOOD_REMINDER; @@ -445,9 +446,14 @@ public class BottomNotificationActivity extends AppCompatActivity { break; case MEAL_REMINDER: + String mealType = intent.getStringExtra(NOTIFICATION_MEAL_TYPE_KEY); + + if (mealType == null) body = patient_name + " skipped their meal!"; + else body = patient_name + " skipped " + mealType + "!"; + setUpCgBottomSheet(binding, R.drawable.img_meal_reminder, - patient_name + " has skipped their meal!", body, + "Meal reminder", body, null, "Call senior", v -> { CaregiverDataCache.getCaregiverData(context, (careGiverData -> { 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 3dbf90e..3b07259 100644 --- a/app/src/main/java/com/app/simplitend/apputils/NotificationService.java +++ b/app/src/main/java/com/app/simplitend/apputils/NotificationService.java @@ -37,6 +37,8 @@ public class NotificationService implements INotificationServiceExtension { public static final String NOTIFICATION_SENIOR_ADDRESS_KEY = "notification_senior_address"; + public static final String NOTIFICATION_MEAL_TYPE_KEY = "notification_meal_type_key"; + @Override public void onNotificationReceived(@NonNull INotificationReceivedEvent iNotificationReceivedEvent) { // Log.d("aditya testing", "onNotificationReceived: " + iNotificationReceivedEvent.getNotification()); @@ -114,6 +116,7 @@ public class NotificationService implements INotificationServiceExtension { intent.putExtra(NOTIFICATION_TITLE_KEY, iNotificationReceivedEvent.getNotification().getTitle()); intent.putExtra(NOTIFICATION_CONTENT_ID_KEY, id); intent.putExtra(NOTIFICATION_SENIOR_ADDRESS_KEY, senior_current_address); + intent.putExtra(NOTIFICATION_MEAL_TYPE_KEY, senior_current_address); // showing bottom sheet try { diff --git a/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java b/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java index 3229582..f54efa6 100644 --- a/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java +++ b/app/src/main/java/com/app/simplitend/cg_geofencing/CgGeoFencingActivity.java @@ -179,6 +179,14 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead double lng = Double.parseDouble(patientData.lng); mHomeLatLng = new LatLng(lat, lng); + + if (patientData.profile_photo != null){ + Glide.with(binding.patCurLoc) + .load(IMAGE_BASE_URL + patientData.profile_photo) + .error(R.drawable.img_pat_curr_location) + .placeholder(android.R.color.darker_gray) + .into(binding.patCurLoc); + } } catch (Exception e) { // do nothing } @@ -785,7 +793,7 @@ public class CgGeoFencingActivity extends AppCompatActivity implements OnMapRead .position(pat_cur_latLng) .title(name) .draggable(false); - if (showLocationUpdates && patientData != null && patientData.profile_photo != null) { + if (patientData != null && patientData.profile_photo != null) { MarkerBgBinding markerBgBinding = MarkerBgBinding.inflate(getLayoutInflater()); diff --git a/app/src/main/res/layout/activity_cg_geofencing.xml b/app/src/main/res/layout/activity_cg_geofencing.xml index 03be508..052d323 100644 --- a/app/src/main/res/layout/activity_cg_geofencing.xml +++ b/app/src/main/res/layout/activity_cg_geofencing.xml @@ -369,7 +369,8 @@ app:cardCornerRadius="30dp" app:cardElevation="5dp"> - - @@ -22,6 +22,6 @@ android:layout_height="60dp" android:layout_marginTop="30dp" android:src="@drawable/ic_marker_bg" - /> + app:tint="#D2042D" /> \ No newline at end of file diff --git a/app/src/main/res/layout/marker_bg_small.xml b/app/src/main/res/layout/marker_bg_small.xml index 4283541..e80b1c1 100644 --- a/app/src/main/res/layout/marker_bg_small.xml +++ b/app/src/main/res/layout/marker_bg_small.xml @@ -11,8 +11,8 @@ android:layout_height="40dp" android:translationZ="1dp" android:src="@drawable/senior_img" - app:civ_circle_background_color="@color/color_primary" - app:civ_border_color="@color/color_primary" + app:civ_circle_background_color="#D2042D" + app:civ_border_color="#D2042D" app:civ_border_width="2dp"/> \ No newline at end of file