From 9ac106d605b317b09ea73755715f783fe59cc32d Mon Sep 17 00:00:00 2001 From: Viresh Gupta Date: Tue, 5 Nov 2019 22:00:41 +0530 Subject: [PATCH 1/2] Add notification when app is running as well --- .../java/com/mobilecomputing/sahayak/FireBaseFCMService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/mobilecomputing/sahayak/FireBaseFCMService.java b/app/src/main/java/com/mobilecomputing/sahayak/FireBaseFCMService.java index 1818a24..703677a 100644 --- a/app/src/main/java/com/mobilecomputing/sahayak/FireBaseFCMService.java +++ b/app/src/main/java/com/mobilecomputing/sahayak/FireBaseFCMService.java @@ -71,6 +71,7 @@ public void onMessageReceived(RemoteMessage remoteMessage) { // Check if message contains a notification payload. if (remoteMessage.getNotification() != null) { Log.d(TAG, "Message Notification Body: " + remoteMessage.getNotification().getBody()); + sendNotification(remoteMessage.getNotification().getBody(), remoteMessage.getNotification().getTitle()); } // Also if you intend on generating your own notifications as a result of a received FCM @@ -130,7 +131,7 @@ public static void sendRegistrationToServer(String token) { * * @param messageBody FCM message body received. */ - private void sendNotification(String messageBody) { + private void sendNotification(String messageBody, String messageTitle) { Intent intent = new Intent(this, MainActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); PendingIntent pendingIntent = PendingIntent.getActivity(this, 0 /* Request code */, intent, @@ -141,7 +142,7 @@ private void sendNotification(String messageBody) { NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, channelId) .setSmallIcon(R.drawable.app_logo) - .setContentTitle(getString(R.string.fcm_message)) + .setContentTitle(messageTitle) .setContentText(messageBody) .setAutoCancel(true) .setSound(defaultSoundUri) From eca6f11c691e3537bed9e9add9f98c0472dbee54 Mon Sep 17 00:00:00 2001 From: Taejas Gupta Date: Tue, 5 Nov 2019 22:05:12 +0530 Subject: [PATCH 2/2] Update Time icon --- app/src/main/res/layout/activity_mentor_options.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_mentor_options.xml b/app/src/main/res/layout/activity_mentor_options.xml index b7457e8..ed07c1b 100644 --- a/app/src/main/res/layout/activity_mentor_options.xml +++ b/app/src/main/res/layout/activity_mentor_options.xml @@ -107,7 +107,7 @@ android:background="@color/colorPrimary" android:textColor="@color/white" android:layout_gravity="center" - android:drawableLeft="@drawable/ic_date_range_black_24dp" + android:drawableLeft="@drawable/ic_access_time_black_24dp" android:drawablePadding="8dp" android:text="Select Time" />