Update notifications

Author: MarkNjunge

app/src/main/java/com/marknkamau/justjava/data/network/MyFirebaseMessagingService.kt

@@ -28,32 +28,24 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
         remoteMessage.notification?.let {
             notificationHelper.showNotification(it.title ?: "JustJava", it.body ?: "")
         }
+
         remoteMessage.data?.let {
             Timber.d(it.toString())
-            if (it["reason"] == "completed-order") {
-                notificationHelper.showCompletedOrderNotification("Your order has been completed.")
-            }
-
-            when (it["reason"]) {
+            when(it["reason"]){
                 "completed-order" -> {
-                    notificationHelper.showCompletedOrderNotification("Your order has been completed.")
+                    notificationHelper.showCompletedOrderNotification()
                 }
                 "mpesa" -> {
-                    it["body"]?.let { body ->
-                        notificationHelper.showNotification("Payment", body)
-                    }
-                    it["status"]?.let { status ->
-                        it["orderId"]?.let { orderId ->
-                            if (status == "completed") {
-                                val intent = Intent(MPESA_ORDER_PAID_ACTION)
-                                intent.putExtra(ORDER_ID, orderId)
-                                broadcastManager.sendBroadcast(intent)
-                            }
-                        }
+                    // Show notification
+                    notificationHelper.showPaymentNotification(it["body"]!!)
+
+                    // Send local broadcast so that if the user is on the order's page, the status updates
+                    if (it["status"] == "completed") {
+                        val intent = Intent(MPESA_ORDER_PAID_ACTION)
+                        intent.putExtra(ORDER_ID,  it["orderId"])
+                        broadcastManager.sendBroadcast(intent)
                     }
                 }
-                else -> {
-                }
             }
         }
     }

app/src/main/java/com/marknkamau/justjava/utils/NotificationHelper.kt

@@ -3,12 +3,12 @@ package com.marknkamau.justjava.utils
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
-import android.graphics.Color
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import com.marknkamau.justjava.R
+import kotlin.random.Random
 
 /**
  * Created by Mark Njung'e.
@@ -18,50 +18,49 @@ import com.marknkamau.justjava.R
 
 class NotificationHelper(private val context: Context) {
 
+    private val defaultChannelId = "defaultNotificationChannel"
+    private val ordersChannelId = "ordersNotificationChannel"
+    private val paymentsChannelId = "ordersNotificationChannel"
+
     private val notificationManager by lazy {
         context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
     }
 
     init {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            createDefaultChannel()
+            createChannel(defaultChannelId, "Default channel", "Notifications")
+            createChannel(ordersChannelId, "Orders channel", "Notifications for orders")
+            createChannel(paymentsChannelId, "Payments channel", "Notifications for payments")
         }
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
-    private fun createDefaultChannel() {
-        val id = context.getString(R.string.default_notification_channel)
-        val channel = NotificationChannel(id, "Default notification channel", NotificationManager.IMPORTANCE_DEFAULT)
+    private fun createChannel(id: String, name: String, description: String) {
+        val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_DEFAULT)
 
-        channel.description = "Default notifications"
+        channel.description = description
         channel.enableLights(true)
-        channel.lightColor = Color.RED
         channel.enableVibration(true)
 
         notificationManager.createNotificationChannel(channel)
     }
 
-    fun showCompletedOrderNotification(text: String) {
-        val channelId = context.getString(R.string.default_notification_channel)
-        val notification = NotificationCompat.Builder(context, channelId)
-                .setSmallIcon(R.drawable.ic_just_java_logo_black)
-                .setContentTitle("Completed order")
-                .setContentText(text)
-                .setColor(ContextCompat.getColor(context, R.color.colorAccent))
-                .build()
+    fun showCompletedOrderNotification() {
+        showNotification("Completed Order", "Your order has been completed.", ordersChannelId)
+    }
 
-        notificationManager.notify(1, notification)
+    fun showPaymentNotification(body: String) {
+        showNotification("Order Payment", body, paymentsChannelId)
     }
 
-    fun showNotification(title: String, body: String) {
-        val channelId = context.getString(R.string.default_notification_channel)
+    fun showNotification(title: String, body: String, channelId: String = defaultChannelId) {
         val notification = NotificationCompat.Builder(context, channelId)
                 .setSmallIcon(R.drawable.ic_just_java_logo_black)
                 .setContentTitle(title)
                 .setContentText(body)
                 .setColor(ContextCompat.getColor(context, R.color.colorAccent))
                 .build()
 
-        notificationManager.notify(2, notification)
+        notificationManager.notify(Random.nextInt(), notification)
     }
 }

app/src/main/res/values/strings.xml

@@ -73,7 +73,6 @@
     <item name="masked" type="id" />
 
     <!--Notifications-->
-    <string name="default_notification_channel">defaultNotificationChannel</string>
     <string name="drink_image_content_desc">Drink Image</string>
     <string name="visibility_icon_content_desc">Visibility icon</string>
     <string name="app_icon_content_desc">App icon</string>